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

[tongsong_li at gta01.hmw-consulting.de]

Author: tongsong_li
Date: 2006-12-15 03:49:43 +0100 (Fri, 15 Dec 2006)
New Revision: 414

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


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-15 02:32:35 UTC (rev 413)
+++ trunk/src/target/OM-2007/applications/openmoko-mainmenu/data/Makefile.am	2006-12-15 02:49:43 UTC (rev 414)
@@ -1,5 +1,5 @@
-EXTRA_DIST = bg_mainmenu.png
+EXTRA_DIST = 
 
 resourcedir = $(pkgdatadir)
-resource_DATA = bg_mainmenu.png
+resource_DATA = 
 

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-15 02:32:35 UTC (rev 413)
+++ trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/main.c	2006-12-15 02:49:43 UTC (rev 414)
@@ -22,12 +22,6 @@
 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));
@@ -63,11 +57,6 @@
 		//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 (mma->mm->scrolled);
-    //style->bg_pixmap[GTK_STATE_NORMAL] = pixmap;
-   // gtk_style_set_background (style, gtk_widget_get_parent_window (mma->mm->scrolled), GTK_STATE_NORMAL);
     /* show everything and run main loop */
     gtk_widget_show_all( GTK_WIDGET(mma->window) );
 
@@ -76,17 +65,6 @@
     gtk_widget_show (GTK_WIDGET (mma->toolbox));
     //gtk_widget_reparent (GTK_WIDGET (mma->toolbox), GTK_WIDGET (mma->window));
 
-    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/mokoiconview.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mokoiconview.c	2006-12-15 02:32:35 UTC (rev 413)
+++ trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mokoiconview.c	2006-12-15 02:49:43 UTC (rev 414)
@@ -194,44 +194,6 @@
 moko_icon_view_init(MokoIconView *self)
 {
   PangoFontDescription* PangoFont = pango_font_description_new(); //get system default PangoFontDesc
-  GtkWidget *table;
-  gint i,j;
-      GError* err = NULL;
-    GdkPixbuf *pixbuf;
-    GtkStyle *style;    
-    GdkPixmap *pixmap;
-    GdkBitmap *bitmap;
-  
-  g_debug ("**************");
-  //gtk_widget_set_name( GTK_WIDGET(self), "mokofingerwheel" );
-    //pixbuf = gdk_pixbuf_new_from_file ( PKGDATADIR"/bg_mainmenu.png", &err );
-    //gdk_pixbuf_render_pixmap_and_mask (pixbuf, &pixmap, &bitmap, NULL);
-    //gdk_window_set_back_pixmap (gtk_widget_get_parent_window (mma->mm->icon_view), pixmap, FALSE);
-    //style = gtk_rc_get_style (self);
-    //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 ("**************");
- /* table = gtk_table_new (3, 3, TRUE);
-  gtk_container_add (GTK_CONTAINER(self), table);
-  gtk_widget_show (table);
-
-  for (i=0;i<3; i++)
-    for (j=0;j<3; j++)
-      {
-	self->btns[i][j] = gtk_toggle_button_new ();
-	gtk_table_attach_defaults (GTK_TABLE(table), self->btns[i][j], 
-				   i, i+1, j, j+1);
-	gtk_signal_connect (GTK_OBJECT (self->btns[i][j]), "clicked",
-			    GTK_SIGNAL_FUNC (moko_item_select_cb), NULL);
-	gtk_widget_set_size_request (self->btns[i][j], 20, 20);
-	gtk_widget_show (self->btns[i][j]);
-//	gtk_misc_set_padding (GTK_MISC (self->btns[i][j]), 30, 30);
-//	sleep (1);
-      }
-*/
   if (PangoFont)
     pango_font_description_free (PangoFont);
 }