r321 - in trunk/src/target/OM-2007: applications/openmoko-chordmaster/src artwork/themes/openmoko-standard/gtk-2.0 openmoko-libs/data openmoko-libs/libmokoui

mickey at gta01.hmw-consulting.de mickey at gta01.hmw-consulting.de
Wed Dec 6 14:13:06 CET 2006


Author: mickey
Date: 2006-12-06 13:13:05 +0000 (Wed, 06 Dec 2006)
New Revision: 321

Added:
   trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/openmoko-application-menu-icon.png
   trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/openmoko-filter-menu-icon.png
Removed:
   trunk/src/target/OM-2007/openmoko-libs/data/openmoko-default-application.png
Modified:
   trunk/src/target/OM-2007/applications/openmoko-chordmaster/src/Makefile.am
   trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/mokomenubox
   trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/openmoko-filter-menu-bg.png
   trunk/src/target/OM-2007/openmoko-libs/data/Makefile.am
   trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-application.c
   trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-menu-box.c
Log:
mokoui: MokoMenuBox / filter menu is now a GtkImageMenuItem
Next step: add API for setting the filter menu item from program


Modified: trunk/src/target/OM-2007/applications/openmoko-chordmaster/src/Makefile.am
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-chordmaster/src/Makefile.am	2006-12-06 13:12:22 UTC (rev 320)
+++ trunk/src/target/OM-2007/applications/openmoko-chordmaster/src/Makefile.am	2006-12-06 13:13:05 UTC (rev 321)
@@ -1,5 +1,8 @@
-INCLUDES = -DPKGDATADIR=\"$(pkgdatadir)\" @OPENMOKO_CFLAGS@ -Wall -std=c99 -pedantic
+AM_CPPFLAGS = -DDATADIR=\"$(datadir)\" \
+              -DPKGDATADIR=\"$(pkgdatadir)\"
 
+AM_CFLAGS = -Wall -pedantic -std=c99 @OPENMOKO_CFLAGS@
+
 bin_PROGRAMS = openmoko-chordmaster
 
 openmoko_chordmaster_SOURCES = callbacks.c  chordsdb.c  fretboard-widget.c  main.c

Modified: trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/mokomenubox
===================================================================
--- trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/mokomenubox	2006-12-06 13:12:22 UTC (rev 320)
+++ trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/mokomenubox	2006-12-06 13:13:05 UTC (rev 321)
@@ -19,11 +19,11 @@
             function        = BOX
             recolorable     = TRUE
             file            = "openmoko-filter-menu-bg.png"
-            border          = { 30, 30, 0, 0 }
+            border          = { 0, 30, 0, 0 }
             stretch         = TRUE
         }
     }
-    xthickness = 30
+    xthickness = 5
 }
 widget "*.mokomenubox-filter-menubar" style "mokomenubox-filter-menubar"
 

Added: trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/openmoko-application-menu-icon.png
===================================================================
(Binary files differ)


Property changes on: trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/openmoko-application-menu-icon.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Modified: trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/openmoko-filter-menu-bg.png
===================================================================
(Binary files differ)

Added: trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/openmoko-filter-menu-icon.png
===================================================================
(Binary files differ)


Property changes on: trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/openmoko-filter-menu-icon.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Modified: trunk/src/target/OM-2007/openmoko-libs/data/Makefile.am
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/data/Makefile.am	2006-12-06 13:12:22 UTC (rev 320)
+++ trunk/src/target/OM-2007/openmoko-libs/data/Makefile.am	2006-12-06 13:13:05 UTC (rev 321)
@@ -1,5 +1,5 @@
 icondir = $(datadir)/icons/
-icon_DATA = openmoko-default-application.png
+icon_DATA = 
 
 EXTRA_DIST = $(icon_DATA)
 

Deleted: trunk/src/target/OM-2007/openmoko-libs/data/openmoko-default-application.png
===================================================================
(Binary files differ)

Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-application.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-application.c	2006-12-06 13:12:22 UTC (rev 320)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-application.c	2006-12-06 13:13:05 UTC (rev 321)
@@ -78,9 +78,11 @@
     priv->icon_factory = gtk_icon_factory_new();
     gtk_icon_factory_add_default( priv->icon_factory );
 
+#if 0
     moko_application_add_stock_icons( self,
                                       "openmoko-default-application",
                                       NULL );
+#endif
 
     // cruft necessary?
     priv->killable = FALSE;

Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-menu-box.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-menu-box.c	2006-12-06 13:12:22 UTC (rev 320)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-menu-box.c	2006-12-06 13:13:05 UTC (rev 321)
@@ -39,7 +39,7 @@
     GtkImageMenuItem* appitem;
     GtkMenu* appmenu;
     GtkMenuBar* menubar_r;
-    GtkMenuItem* filteritem;
+    GtkImageMenuItem* filteritem;
     GtkMenu* filtermenu;
 } MokoMenuBoxPriv;
 
@@ -156,8 +156,7 @@
 
     }
     GtkImageMenuItem* appitem = gtk_image_menu_item_new_with_label( g_get_application_name() );
-    //FIXME implement icon handling properly in moko_application
-    GtkImage* appicon = gtk_image_new_from_stock( "openmoko-default-application", GTK_ICON_SIZE_MENU );
+    GtkImage* appicon = gtk_image_new_from_stock( "openmoko-application-menu-icon", GTK_ICON_SIZE_MENU );
     gtk_image_menu_item_set_image( appitem, appicon );
     gtk_widget_set_name( GTK_WIDGET(appitem), "transparent" );
     priv->appitem = appitem;
@@ -180,7 +179,9 @@
         gtk_widget_set_name( GTK_WIDGET(priv->menubar_r), "mokomenubox-filter-menubar" );
         gtk_box_pack_end( GTK_BOX(self), GTK_WIDGET(priv->menubar_r), TRUE, TRUE, 0 );
     }
-    GtkMenuItem* filtitem = gtk_menu_item_new_with_label( "Filter Menu" );
+    GtkImageMenuItem* filtitem = gtk_image_menu_item_new_with_label( "Filter Menu" );
+    GtkImage* filticon = gtk_image_new_from_stock( "openmoko-filter-menu-icon", GTK_ICON_SIZE_MENU );
+    gtk_image_menu_item_set_image( filtitem, filticon );
     gtk_widget_set_name( GTK_WIDGET(filtitem), "transparent" );
     priv->filteritem = filtitem;
     priv->filtermenu = menu;





More information about the commitlog mailing list