[maemo-commits] [maemo-commits] r11374 - in projects/haf/trunk/hildon-desktop: . src

[From: subversion at stage.maemo.org]

Author: jobi
Date: 2007-04-30 11:21:54 +0300 (Mon, 30 Apr 2007)
New Revision: 11374

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/src/hd-home-window.c
Log:

2007-04-27  Johan Bilien  <johan.bilien at nokia.com>

	* src/hd-home-window.c:
	- new menu layout



Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-04-30 07:53:58 UTC (rev 11373)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-04-30 08:21:54 UTC (rev 11374)
@@ -1,6 +1,11 @@
 2007-04-27  Johan Bilien  <johan.bilien at nokia.com>
 
 	* src/hd-home-window.c:
+	- new menu layout
+
+2007-04-27  Johan Bilien  <johan.bilien at nokia.com>
+
+	* src/hd-home-window.c:
 	- layout mode is now considered to suck again.
 	- added temporary alpha adjustment dialogs
 	* libhildondesktop/hildon-desktop-item.c:

Modified: projects/haf/trunk/hildon-desktop/src/hd-home-window.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hd-home-window.c	2007-04-30 07:53:58 UTC (rev 11373)
+++ projects/haf/trunk/hildon-desktop/src/hd-home-window.c	2007-04-30 08:21:54 UTC (rev 11374)
@@ -208,8 +208,10 @@
                                         const gchar *text);
 #endif
 
+#if 0
 static void
 hd_home_window_adjust_alpha_activate (HDHomeWindow *window);
+#endif
 
 static void
 hd_home_window_class_init (HDHomeWindowClass *window_class)
@@ -668,7 +670,6 @@
 {
   HDHomeWindowPrivate  *priv;
   GtkWidget            *menu;
-  GtkWidget            *tools_menu;
   GtkWidget            *settings_menu;
   GtkWidget            *menu_item;
 
@@ -702,6 +703,42 @@
   priv->settings_item = menu_item;
   priv->settings_menu = settings_menu;
 
+  /* set background */
+  menu_item = gtk_menu_item_new_with_label (HH_MENU_SET_BACKGROUND);
+  g_signal_connect_swapped (menu_item, "activate",
+                            G_CALLBACK (hd_home_window_set_background_activate),
+                            window);
+  gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
+  gtk_widget_show (menu_item);
+
+#ifdef HAVE_LIBOSSO
+  /* personalisation */
+  menu_item = gtk_menu_item_new_with_label (HH_MENU_PERSONALISATION);
+  g_signal_connect_swapped (menu_item, "activate",
+                            G_CALLBACK (hd_home_window_personalisation_activate),
+                            window);
+  gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
+  gtk_widget_show (menu_item);
+
+  /* calibration */
+  menu_item = gtk_menu_item_new_with_label (HH_MENU_CALIBRATION);
+  g_signal_connect_swapped (menu_item, "activate",
+                            G_CALLBACK (hd_home_window_calibration_activate),
+                            window);
+  gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
+  gtk_widget_show (menu_item);
+
+#ifdef HAVE_LIBHILDONHELP
+  /* help */
+  menu_item = gtk_menu_item_new_with_label (HH_MENU_HELP);
+  gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
+  g_signal_connect_swapped (menu_item, "activate",
+                            G_CALLBACK (hd_home_window_help_activate),
+                            window);
+  gtk_widget_show (menu_item);
+#endif
+#endif
+
   if (!priv->layout_mode_sucks)
     {
       /* layout mode */
@@ -722,6 +759,7 @@
       priv->layout_mode_item = menu_item;
     }
 
+#if 0
   else
     {
       GtkWidget *area;
@@ -741,49 +779,7 @@
         }
       gtk_widget_show (menu_item);
     }
-  
-  /* tools sub-menu */
-  tools_menu = gtk_menu_new ();
-  menu_item = gtk_menu_item_new_with_label (HH_MENU_TOOLS);
-  gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_item), tools_menu);
-  gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
-  gtk_widget_show (menu_item);
 
-  /* set background */
-  menu_item = gtk_menu_item_new_with_label (HH_MENU_SET_BACKGROUND);
-  g_signal_connect_swapped (menu_item, "activate",
-                            G_CALLBACK (hd_home_window_set_background_activate),
-                            window);
-  gtk_menu_shell_append (GTK_MENU_SHELL (tools_menu), menu_item);
-  gtk_widget_show (menu_item);
-
-#ifdef HAVE_LIBOSSO
-  /* personalisation */
-  menu_item = gtk_menu_item_new_with_label (HH_MENU_PERSONALISATION);
-  g_signal_connect_swapped (menu_item, "activate",
-                            G_CALLBACK (hd_home_window_personalisation_activate),
-                            window);
-  gtk_menu_shell_append (GTK_MENU_SHELL (tools_menu), menu_item);
-  gtk_widget_show (menu_item);
-
-  /* calibration */
-  menu_item = gtk_menu_item_new_with_label (HH_MENU_CALIBRATION);
-  g_signal_connect_swapped (menu_item, "activate",
-                            G_CALLBACK (hd_home_window_calibration_activate),
-                            window);
-  gtk_menu_shell_append (GTK_MENU_SHELL (tools_menu), menu_item);
-  gtk_widget_show (menu_item);
-
-#ifdef HAVE_LIBHILDONHELP
-  /* help */
-  menu_item = gtk_menu_item_new_with_label (HH_MENU_HELP);
-  gtk_menu_shell_append (GTK_MENU_SHELL (tools_menu), menu_item);
-  g_signal_connect_swapped (menu_item, "activate",
-                            G_CALLBACK (hd_home_window_help_activate),
-                            window);
-  gtk_widget_show (menu_item);
-#endif
-#endif
   
   menu_item = gtk_menu_item_new_with_label ("Adjust transparency");
   gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
@@ -791,7 +787,8 @@
                             G_CALLBACK (hd_home_window_adjust_alpha_activate),
                             window);
   gtk_widget_show (menu_item);
-  
+#endif
+
   return menu;
 
 }
@@ -1328,6 +1325,8 @@
 }
 #endif
 
+
+#if 0
 static void
 scale_changed (GtkRange *range, GtkWidget *area)
 {
@@ -1379,3 +1378,4 @@
   gtk_widget_destroy (dialog);
 }
 
+#endif