r402 - in trunk/src/target/OM-2007/applications/openmoko-mainmenu: . data src

tongsong_li at gta01.hmw-consulting.de tongsong_li at gta01.hmw-consulting.de
Wed Dec 13 10:28:25 CET 2006


Author: tongsong_li
Date: 2006-12-13 10:28:14 +0100 (Wed, 13 Dec 2006)
New Revision: 402

Modified:
   trunk/src/target/OM-2007/applications/openmoko-mainmenu/configure.ac
   trunk/src/target/OM-2007/applications/openmoko-mainmenu/data/Makefile.am
   trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/Makefile.am
   trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/main.c
   trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/main.h
   trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mainmenu.c
   trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mainmenu.h
Log:
update


Modified: trunk/src/target/OM-2007/applications/openmoko-mainmenu/configure.ac
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-mainmenu/configure.ac	2006-12-13 09:21:36 UTC (rev 401)
+++ trunk/src/target/OM-2007/applications/openmoko-mainmenu/configure.ac	2006-12-13 09:28:14 UTC (rev 402)
@@ -1,5 +1,5 @@
 AC_PREREQ(2.53)
-AC_INIT(%(APPNAME), %(APPVERSION), %(APPCONTACT))
+AC_INIT(%(openmoko-mainmenu), %(0.0.1), %(http://www.openmoko.org))
 AM_INIT_AUTOMAKE()
 AC_CONFIG_SRCDIR(src/main.c)
 AM_CONFIG_HEADER(config.h)

Modified: trunk/src/target/OM-2007/applications/openmoko-mainmenu/data/Makefile.am
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-mainmenu/data/Makefile.am	2006-12-13 09:21:36 UTC (rev 401)
+++ trunk/src/target/OM-2007/applications/openmoko-mainmenu/data/Makefile.am	2006-12-13 09:28:14 UTC (rev 402)
@@ -1,5 +1,5 @@
-EXTRA_DIST = 
+EXTRA_DIST = bg_mainmenu.png
 
 resourcedir = $(pkgdatadir)
-resource_DATA = 
+resource_DATA = bg_mainmenu.png
 

Modified: trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/Makefile.am
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/Makefile.am	2006-12-13 09:21:36 UTC (rev 401)
+++ trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/Makefile.am	2006-12-13 09:28:14 UTC (rev 402)
@@ -1,8 +1,11 @@
-INCLUDES = -DPKGDATADIR=\"$(pkgdatadir)\" @OPENMOKO_CFLAGS@ -Wall -std=c99 -pedantic
+#INCLUDES = -DPKGDATADIR=\"$(pkgdatadir)\" @OPENMOKO_CFLAGS@ -Wall -std=c99 -pedantic
+AM_CPPFLAGS = -DDATADIR=\"$(datadir)\" \
+              -DPKGDATADIR=\"$(pkgdatadir)\"
+AM_CFLAGS = -Wall -std=c99 -pedantic @OPENMOKO_CFLAGS@
 
 bin_PROGRAMS = openmoko-mainmenu
 
-openmoko_mainmenu_SOURCES = main.c mainmenu.c callbacks.c menu-list.c support.c 
+openmoko_mainmenu_SOURCES = main.c mainmenu.c callbacks.c menu-list.c support.c mokoiconview.c
 
 openmoko_mainmenu_LDADD = @OPENMOKO_LIBS@
 

Modified: trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/main.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/main.c	2006-12-13 09:21:36 UTC (rev 401)
+++ trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/main.c	2006-12-13 09:28:14 UTC (rev 402)
@@ -66,6 +66,14 @@
 
 int main( int argc, char** argv ) {
     MokoMainmenuApp *mma;
+
+    GError* err = NULL;
+    GdkPixbuf *pixbuf;
+    GtkStyle *style;    
+    GdkPixmap *pixmap;
+    GdkBitmap *bitmap;
+    int i;
+
     mma = g_malloc0 (sizeof (MokoMainmenuApp));
     if (!mma) {
     	fprintf (stderr, "openmoko-mainmenu application initialize FAILED");
@@ -75,23 +83,52 @@
 
     gtk_init( &argc, &argv );
     
-    //add_pixmap_directory (PACKAGE_DATA_DIR "/pixmaps");
-    //add_pixmap_directory (PACKAGE_DATA_DIR "/" PACKAGE "/pixmaps");
-    //add_pixmap_directory ("/usr/share/pixmaps");
-    /* application object */
+   /* application object */
     mma->app = MOKO_APPLICATION(moko_application_get_instance());
     g_set_application_name( "OpenMoko Main Menu" );
     
     /* main window */
     mma->window = MOKO_FINGER_WINDOW(moko_finger_window_new());
+    mma->wheel = moko_finger_window_get_wheel (mma->window);
+    mma->toolbox = moko_finger_window_get_toolbox(mma->window);
+
+    for (i=0; i<4; i++)
+    	{
+    	    mma->history[i] =  moko_finger_tool_box_add_button( mma->toolbox );
+           gtk_widget_show (mma->history[i]);
+    	}
+   
+    mma->mm = MAINMENU(moko_main_menu_new());
+    gtk_widget_show (mma->mm);
     
-    mma->mm = MAINMENU(moko_main_menu_new());
     //gtk_icon_view_selected_foreach (mm->icon_view, moko_item_select_cb, NULL);
    // g_signal_connect (mm->icon_view, "toggle-cursor-item", 
 		//G_CALLBACK (moko_toggle_cursor_item_cb), NULL);
     moko_finger_window_set_contents( mma->window, GTK_WIDGET(mma->mm) );
+    
+    pixbuf = gdk_pixbuf_new_from_file ( PKGDATADIR"/bg_mainmenu.png", &err );
+    gdk_pixbuf_render_pixmap_and_mask (pixbuf, &pixmap, &bitmap, NULL);
+    //style = gtk_rc_get_style (mm->scrolled);
+    //style->bg_pixmap[GTK_STATE_NORMAL] = pixmap;
+    //gtk_style_set_background (style, gtk_widget_get_parent_window (mm->scrolled), GTK_STATE_NORMAL);
+ 
     /* show everything and run main loop */
     gtk_widget_show_all( GTK_WIDGET(mma->window) );
+
+    gtk_widget_show (GTK_WIDGET (mma->wheel));
+    gtk_widget_show (GTK_WIDGET (mma->toolbox));
+
+    //g_debug ("**************");
+    //gdk_window_set_back_pixmap (gtk_widget_get_parent_window (mma->mm->icon_view), pixmap, FALSE);
+    //style = gtk_rc_get_style (mma->mm->icon_view);
+    //style->bg_pixmap[GTK_STATE_NORMAL] = pixmap;
+    //gtk_style_set_background (style, mma->mm->icon_view->window, GTK_STATE_NORMAL);
+
+    //if (GTK_WIDGET_NO_WINDOW(mma->mm->icon_view)) 
+    	  //g_debug ("no window");
+   //g_debug ("**************");
+    //sleep (2);
+
     //g_debug( "openmoko-finger-demo entering main loop" );
     gtk_main();
     //g_debug( "openmoko-finger-demo left main loop" );

Modified: trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/main.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/main.h	2006-12-13 09:21:36 UTC (rev 401)
+++ trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/main.h	2006-12-13 09:28:14 UTC (rev 402)
@@ -44,9 +44,12 @@
     
     MokoFingerWindow *window;
     MokoFingerWheel *wheel;
+    MokoFingerToolBox *toolbox;
     MokoMainMenu *mm;
     MokoMenuList *list;
 
+    GtkButton *history[3];
+
 };
 
 #endif /*main.h*/

Modified: trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mainmenu.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mainmenu.c	2006-12-13 09:21:36 UTC (rev 401)
+++ trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mainmenu.c	2006-12-13 09:28:14 UTC (rev 402)
@@ -59,14 +59,16 @@
         };
 
         menu_type = g_type_register_static (GTK_TYPE_VBOX, "MokoMainMenu", &menu_info, 0);
+        //menu_type = g_type_register_static (GTK_TYPE_WIDGET, "MokoMainMenu", &menu_info, 0);
+
     }
 
     return menu_type;
 }
 
 /**
-*@brief initialize List class.
-*@param klass	List Class
+*@brief initialize	MokoMainMenu class.
+*@param klass	MokoMainMenu Class
 *@return none
 */
 static void 
@@ -75,7 +77,7 @@
     menu_signals[MENU_SIGNAL] = g_signal_new ("MokoMainMenu",
             G_TYPE_FROM_CLASS (Klass),
             G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
-            G_STRUCT_OFFSET (MokoMainMenuClass, menu),
+            G_STRUCT_OFFSET (MokoMainMenuClass, moko_main_menu_function),
             NULL,
             NULL,
             g_cclosure_marshal_VOID__VOID,
@@ -84,7 +86,7 @@
 }
 
 
-/*@brief initialize MokoManiMenu instance
+/*@brief initialize 	MokoManiMenu instance
  *@param mm	MokoMainMenu*
  *@return none
  */
@@ -119,13 +121,14 @@
     	  g_debug("FAILED to load FONT ");
     	  }
 */
-    mm->icon_view = gtk_icon_view_new ();
+   /* mm->icon_view = gtk_icon_view_new ();
     gtk_icon_view_set_columns (mm->icon_view, COLUMN_NUM);
     //gtk_icon_view_set_margin (mm->icon_view, ICON_MARGIN);
     //gtk_icon_view_set_row_spacing (mm->icon_view, ROW_SPACING);
     //gtk_icon_view_set_column_spacing (mm->icon_view, COLUMN_SPACING);
-    gtk_icon_view_set_selection_mode (mm->icon_view, GTK_SELECTION_SINGLE);
+    //gtk_icon_view_set_selection_mode (mm->icon_view, GTK_SELECTION_SINGLE);
     gtk_widget_show (mm->icon_view);
+
     mm->list_store = gtk_list_store_new (3, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_POINTER);
 
     gtk_icon_view_set_pixbuf_column (GTK_ICON_VIEW (mm->icon_view), PIXBUF_COLUMN);
@@ -135,22 +138,29 @@
     mm->scrolled = gtk_scrolled_window_new (NULL, NULL);
     gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (mm->scrolled),
 				  GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+    gtk_widget_show (mm->scrolled);
+   // gtk_scrolled_window_add_with_viewport (GTK_CONTAINER (mm->scrolled),
+    //						mm->icon_view);
     gtk_container_add (GTK_CONTAINER (mm->scrolled), mm->icon_view);
-
+*/
+    mm->icon_view = MOKO_ICON_VIEW(moko_icon_view_new());
+    gtk_widget_show (mm->icon_view);
+ 
     mm->hbox = gtk_hbox_new (FALSE, FALSE);
     gtk_widget_show (mm->hbox);
 
     gtk_box_pack_start (mm, mm->hbox, FALSE, FALSE, 0);
     gtk_box_pack_start (mm->hbox, mm->section_name, TRUE, TRUE, 10);
     gtk_box_pack_end (mm->hbox, mm->item_total, FALSE, FALSE, 10);
-    gtk_box_pack_end (mm, mm->scrolled, TRUE, TRUE, 0);
+    //gtk_box_pack_end (mm, mm->scrolled, TRUE, TRUE, 0);
+    gtk_box_pack_end (mm, mm->icon_view, TRUE, TRUE, 0);
 
+
     moko_sample_model_fill(mm->list_store);
     gtk_widget_show (mm);
 
     if (PangoFont)
     	  pango_font_description_free (PangoFont);
-    
 }
 
 

Modified: trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mainmenu.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mainmenu.h	2006-12-13 09:21:36 UTC (rev 401)
+++ trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mainmenu.h	2006-12-13 09:28:14 UTC (rev 402)
@@ -26,6 +26,8 @@
 #include <gtk/gtkiconview.h>
 #include <gtk/gtkliststore.h>
 
+#include "mokoiconview.h"
+
 enum { 
     PIXBUF_COLUMN,
     TEXT_COLUMN,
@@ -65,8 +67,11 @@
 
 struct _MokoMainMenu {
     GtkVBox vbox;
+    //GtkWidget widget;
 
-    GtkIconView *icon_view;
+    //GtkIconView *icon_view;
+    //GtkWidget *icon_view;
+    MokoIconView *icon_view;
     GtkListStore *list_store;
     GtkWidget *scrolled;
     GtkHBox *hbox;
@@ -77,7 +82,8 @@
 
 struct _MokoMainMenuClass {
     GtkVBoxClass parent_class;
-    void(*menu) (MokoMainMenu *mm);
+    //GtkWidgetClass parent_class;
+    void(*moko_main_menu_function)(MokoMainMenu *mm);
     };
 
 GType 





More information about the commitlog mailing list