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

zhiyong_sun at sita.openmoko.org zhiyong_sun at sita.openmoko.org
Thu Mar 22 06:33:02 CET 2007


Author: zhiyong_sun
Date: 2007-03-22 06:32:52 +0100 (Thu, 22 Mar 2007)
New Revision: 1474

Modified:
   trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/callbacks.c
   trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/fingermenu.c
   trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mainmenu.c
   trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mainmenu.h
Log:
fix warnings

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-22 01:13:32 UTC (rev 1473)
+++ trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/callbacks.c	2007-03-22 05:32:52 UTC (rev 1474)
@@ -52,14 +52,13 @@
 	g_debug ("Call moko finger menu hide");
 	moko_dbus_send_message ("");
   }
-   
 }
 
 void
 moko_wheel_left_up_press_cb (GtkWidget *self, MokoFingerMenu *fm)
 {
     //moko_icon_view_move_cursor_line_up (mma->fm->mm->icon_view);
-	moko_finger_menu_move_cursor_up(fm);
+  moko_finger_menu_move_cursor_up(fm);
 }
 
 void
@@ -83,9 +82,7 @@
   
     if (selected_item->type == ITEM_TYPE_FOLDER)
     {
-       // moko_finger_menu_set_current_item(mma->fm, selected_item);
-        moko_finger_menu_update_content (fm, selected_item);
-       // moko_main_menu_update_content (mma->mm, selected_item);
+      moko_finger_menu_update_content (fm, selected_item);
     }
     else if (selected_item->type == ITEM_TYPE_DOTDESKTOP_ITEM ||selected_item->type == ITEM_TYPE_APP)
     {

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-22 01:13:32 UTC (rev 1473)
+++ trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/fingermenu.c	2007-03-22 05:32:52 UTC (rev 1474)
@@ -67,12 +67,12 @@
   self->window = MOKO_FINGER_WINDOW(moko_finger_window_new());
   gtk_widget_show (GTK_WIDGET (self->window));
 
-  self->wheel = moko_finger_window_get_wheel (self->window);
+  self->wheel = MOKO_FINGER_WHEEL(moko_finger_window_get_wheel (self->window));
 
-  self->toolbox = moko_finger_window_get_toolbox (self->window);
+  self->toolbox = MOKO_FINGER_TOOL_BOX(moko_finger_window_get_toolbox (self->window));
   self->history = moko_app_history_init (self->toolbox);
   self->mm = MAINMENU (moko_main_menu_new());
-  gtk_widget_show (self->mm);
+  gtk_widget_show (GTK_WIDGET(self->mm));
 
   g_signal_connect (self->wheel, "press_bottom", G_CALLBACK ( moko_wheel_bottom_press_cb), self);
   g_signal_connect (self->wheel, "press_left_up", G_CALLBACK ( moko_wheel_left_up_press_cb), self);
@@ -96,7 +96,7 @@
    	return;
     
   gtk_widget_show_all (GTK_WIDGET(self->window));
-  gtk_widget_show_all (self->mm);
+  gtk_widget_show_all (GTK_WIDGET(self->mm));
 
     //gtk_widget_show (GTK_WIDGET(self->window));
   gtk_widget_show (GTK_WIDGET(self->toolbox));

Modified: trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mainmenu.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mainmenu.c	2007-03-22 01:13:32 UTC (rev 1473)
+++ trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mainmenu.c	2007-03-22 05:32:52 UTC (rev 1474)
@@ -32,7 +32,7 @@
 
 static void moko_main_menu_init(MokoMainMenu *mm);
 
-static guint menu_signals[LAST_SIGNAL] = { 0 };
+//static guint menu_signals[LAST_SIGNAL] = { 0 };
 
 /**
 *@brief retrun MokoMainMenu type.
@@ -51,7 +51,7 @@
             sizeof (MokoMainMenuClass),
             NULL, /* base_init */
             NULL, /* base_finalize */
-            NULL, /* class_init *///(GClassInitFunc) moko_main_menu_class_init,
+            (GClassInitFunc) moko_main_menu_class_init,
             NULL, /* class_finalize */
             NULL, /* class_data */
             sizeof (MokoMainMenu),
@@ -85,38 +85,29 @@
 moko_main_menu_init(MokoMainMenu *mm) 
 {
     PangoFontDescription* PangoFont = pango_font_description_new(); //get system default PangoFontDesc
-    GtkEventBox *eventbox;
+    GtkWidget *eventbox;
 	
     mm->top_item = NULL;
     mm->current = NULL;
 
     /*center label of MokoMainMenu head*/
-    mm->section_name =  gtk_label_new ("Main Menu");
+    mm->section_name = gtk_label_new ("Main Menu");
     gtk_widget_show (mm->section_name);
-    gtk_widget_set_name (GTK_WIDGET (mm->section_name), "Section Name");
-    gtk_label_set_single_line_mode (mm->section_name, TRUE);
+    gtk_widget_set_name (mm->section_name, "Section Name");
+    gtk_label_set_single_line_mode (GTK_LABEL(mm->section_name), TRUE);
     gtk_misc_set_alignment (GTK_MISC (mm->section_name), SECTION_ALG_X, SECTION_ALG_Y);
     gtk_misc_set_padding (GTK_MISC (mm->section_name), SECTION_X_PADDING, SECTION_Y_PADDING);
-    gtk_label_set_ellipsize (mm->section_name, PANGO_ELLIPSIZE_END);
-   /* if (PangoFont) {
-    	  pango_font_description_set_size (PangoFont, FONT_SIZE_SECTION);
-	  gtk_widget_modify_font (GTK_WIDGET (mm->section_name), PangoFont);
-	  }
-    else {
-    	  g_debug("FAILED to load FONT ");
-    	  }
-*/
+    gtk_label_set_ellipsize (GTK_LABEL(mm->section_name), PANGO_ELLIPSIZE_END);
 
-
     /*right side label of MokoMainMenu head*/
     mm->item_total = gtk_label_new ("");
     //gtk_widget_show (mm->item_total);
-    gtk_label_set_justify (mm->item_total, GTK_JUSTIFY_RIGHT);
-    gtk_label_set_width_chars (mm->item_total, ITME_TOTAL_WIDTH);
+    gtk_label_set_justify (GTK_LABEL(mm->item_total), GTK_JUSTIFY_RIGHT);
+    gtk_label_set_width_chars (GTK_LABEL(mm->item_total), ITME_TOTAL_WIDTH);
     gtk_misc_set_alignment (GTK_MISC (mm->item_total), ITEM_TOTAL_ALG_X, ITEM_TOTAL_ALG_Y);
     if (PangoFont) {
     	  pango_font_description_set_size (PangoFont, FONT_SIZE_ITEM);
-	  gtk_widget_modify_font (GTK_WIDGET (mm->item_total), PangoFont);
+	  gtk_widget_modify_font (mm->item_total, PangoFont);
 	  }
     else {
     	  g_debug("FAILED to load FONT ");
@@ -124,12 +115,12 @@
 
     //Only used to change background
     eventbox = gtk_event_box_new ();
-    gtk_event_box_set_visible_window (eventbox, TRUE);
+    gtk_event_box_set_visible_window (GTK_EVENT_BOX(eventbox), TRUE);
     gtk_widget_show (eventbox);
     gtk_widget_set_name (eventbox, "gtkeventbox-black");
 
     /*MokoIconView object initialize*/
-    mm->icon_view = moko_icon_view_new();
+    mm->icon_view = MOKO_ICON_VIEW(moko_icon_view_new());
     moko_icon_view_set_item_width(mm->icon_view, ITEM_WIDTH);
     moko_icon_view_set_columns (mm->icon_view, COLUMN_NUM);
     moko_icon_view_set_margin (mm->icon_view, ITEM_MARGIN);
@@ -140,7 +131,7 @@
     moko_icon_view_set_text_bg (mm->icon_view, PKGDATADIR"/main_menu_sel_text.png");
     moko_icon_view_set_decorated (mm->icon_view, TRUE);
     moko_icon_view_set_max_text_length(mm->icon_view, 20);
-    gtk_widget_show (mm->icon_view);
+    gtk_widget_show (GTK_WIDGET(mm->icon_view));
 
     mm->list_store = gtk_list_store_new (3, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_POINTER);
     moko_icon_view_set_pixbuf_column (mm->icon_view, PIXBUF_COLUMN);
@@ -151,16 +142,16 @@
     gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (mm->scrolled),
 				  GTK_POLICY_NEVER, GTK_POLICY_NEVER);
     gtk_widget_show (mm->scrolled);
-    gtk_container_add (GTK_CONTAINER (mm->scrolled), mm->icon_view);
+    gtk_container_add (GTK_CONTAINER (mm->scrolled), GTK_WIDGET(mm->icon_view));
 
     mm->hbox = gtk_hbox_new (FALSE, FALSE);
     gtk_widget_show (mm->hbox);
     
-    gtk_box_pack_start (mm, eventbox, FALSE, FALSE, 0);
-    gtk_container_add (eventbox, mm->hbox); 
-    gtk_box_pack_start (mm->hbox, mm->section_name, TRUE, TRUE, 0);
-    gtk_box_pack_end (mm->hbox, mm->item_total, FALSE, FALSE, 0);
-    gtk_box_pack_end (mm, mm->scrolled, TRUE, TRUE, 0);
+    gtk_box_pack_start (GTK_BOX(mm), eventbox, FALSE, FALSE, 0);
+    gtk_container_add (GTK_CONTAINER(eventbox), mm->hbox); 
+    gtk_box_pack_start (GTK_BOX(mm->hbox), mm->section_name, TRUE, TRUE, 0);
+    gtk_box_pack_end (GTK_BOX(mm->hbox), mm->item_total, FALSE, FALSE, 0);
+    gtk_box_pack_end (GTK_BOX(mm), GTK_WIDGET(mm->scrolled), TRUE, TRUE, 0);
 
 
     if (PangoFont)
@@ -256,7 +247,7 @@
     //g_debug("mokodesktop: item [%d][%s][%s]\n", item->type, item->name, item->icon_name);
     
 	if (!mm)
-        return;
+        return FALSE;
 	mm->current = item;
 
     item_new = item->item_child;
@@ -265,11 +256,11 @@
 
     if (item->type == ITEM_TYPE_ROOT)
     {
-  	  moko_set_label_content (mm->section_name, "Main Menu");
+  	  moko_set_label_content (GTK_LABEL(mm->section_name), "Main Menu");
     }
     else if (item->type == ITEM_TYPE_FOLDER)
     {
-      moko_set_label_content (mm->section_name, item->name);
+      moko_set_label_content (GTK_LABEL(mm->section_name), item->name);
     }
     else 
   	return FALSE; // neither ROOT nor FOLDER
@@ -277,6 +268,8 @@
     if (mm->list_store)
   	  gtk_list_store_clear (mm->list_store);
 
+    moko_icon_view_refresh (mm->icon_view);
+
     mokodesktop_items_enumerate_siblings(item->item_child, item_new)
     { 
         count +=1;
@@ -288,20 +281,20 @@
         else 
         {
             char path[512];
-            snprintf (path, 512, "%s/%s", PIXMAP_PATH, item_new->icon_name);
+            snprintf (path, 512, "%s/%s", PIXMAP_PATH, item_new->icon_name);//FIXME: "PIXMAP_PATH" this path will not find out all icons.
             
 			if (access (path, 0) == 0)
                 moko_fill_model(mm->list_store, path, item_new->name, item_new);
             else
             {
-	        snprintf (path, 512, "%s/%s", PKGDATADIR, "default-app-icon.xpm");
+	            snprintf (path, 512, "%s/%s", PKGDATADIR, "default-app-icon.xpm");
       	        moko_fill_model(mm->list_store, path, item_new->name, item_new);
             }
         }
     }
 
   snprintf (total_item, 6, "00/%.2d", count);
-  moko_set_label_content(mm->item_total, total_item);
+  moko_set_label_content(GTK_LABEL(mm->item_total), total_item);
 
   return TRUE;
 }
@@ -326,7 +319,7 @@
   	return;
 
     snprintf (item_total, 6, "%.2d/%.2d", cursor, total);
-    moko_set_label_content (mm->item_total, item_total);
+    moko_set_label_content (GTK_LABEL(mm->item_total), item_total);
 }
 
 /**
@@ -340,5 +333,5 @@
 void
 moko_main_menu_set_section_name_label (MokoMainMenu *mm, const char *str)
 {
-    moko_set_label_content (mm->section_name, str);
+    moko_set_label_content (GTK_LABEL(mm->section_name), str);
 }

Modified: trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mainmenu.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mainmenu.h	2007-03-22 01:13:32 UTC (rev 1473)
+++ trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mainmenu.h	2007-03-22 05:32:52 UTC (rev 1474)
@@ -81,9 +81,9 @@
     MokoIconView *icon_view;
     GtkListStore *list_store;
     GtkWidget *scrolled;
-    GtkHBox *hbox;
-    GtkLabel *section_name;
-    GtkLabel *item_total;
+    GtkWidget *hbox;
+    GtkWidget *section_name;
+    GtkWidget *item_total;
 };
 
 struct _MokoMainMenuClass {





More information about the commitlog mailing list