r1450 - trunk/src/target/OM-2007/applications/openmoko-mainmenu/src

[zhiyong_sun at sita.openmoko.org]

Author: zhiyong_sun
Date: 2007-03-21 02:00:18 +0100 (Wed, 21 Mar 2007)
New Revision: 1450

Modified:
   trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/callbacks.c
   trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/fingermenu.c
Log:
make figner wheel and toolbox show

Modified: trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/callbacks.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/callbacks.c	2007-03-20 22:41:16 UTC (rev 1449)
+++ trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/callbacks.c	2007-03-21 01:00:18 UTC (rev 1450)
@@ -40,17 +40,18 @@
   
   current = moko_finger_menu_get_current_item (fm);
 
-    if (current->type != ITEM_TYPE_ROOT)
-    {
-        current = mokodesktop_item_get_parent(current);
-        moko_finger_menu_update_content (fm, current);
-    }
-    else 
-    {
-		//gtk_window_iconify (GTK_WINDOW (mma->window));
-		g_debug ("Call moko finger menu hide");
-	    moko_dbus_send_message ("");
-	}
+  if (current->type != ITEM_TYPE_ROOT)
+  {
+    current = mokodesktop_item_get_parent(current);
+    moko_finger_menu_update_content (fm, current);
+  }
+  else 
+  {
+    //gtk_window_iconify (GTK_WINDOW (mma->window));
+	moko_finger_menu_hide(fm);
+	g_debug ("Call moko finger menu hide");
+	moko_dbus_send_message ("");
+  }
    
 }
 

Modified: trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/fingermenu.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/fingermenu.c	2007-03-20 22:41:16 UTC (rev 1449)
+++ trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/fingermenu.c	2007-03-21 01:00:18 UTC (rev 1450)
@@ -99,8 +99,8 @@
   gtk_widget_show_all (self->mm);
 
     //gtk_widget_show (GTK_WIDGET(self->window));
- // gtk_widget_show (GTK_WIDGET(self->toolbox));
- // gtk_widget_show (GTK_WIDGET(self->wheel));
+  gtk_widget_show (GTK_WIDGET(self->toolbox));
+  gtk_widget_show (GTK_WIDGET(self->wheel));
 
   gtk_window_present (GTK_WINDOW (self->window));
 }
@@ -108,13 +108,11 @@
 void
 moko_finger_menu_hide (MokoFingerMenu *self)
 {
-    if (!self)
-    	return;
-    if (GTK_WIDGET_VISIBLE (GTK_WIDGET(self->window)))
-        //gtk_widget_hide (GTK_WIDGET(self->window));
-        //gtk_widget_hide (GTK_WIDGET(self->toolbox));
-        //gtk_widget_hide (GTK_WIDGET(self->wheel));
-        gtk_window_iconify (GTK_WINDOW (self->window));
+  if (!self)
+    return;
+
+  if (GTK_WIDGET_VISIBLE (GTK_WIDGET(self->window)))
+    gtk_window_iconify (GTK_WINDOW (self->window));
 }
 
 void