Changeset 298

Timestamp:

12/05/06 02:34:22 (6 years ago)

Author:

mickey

Message:

mokoui: application menu item now is a GtkImageMenuItem?. next step is to implement generic icon handling in the framework

Location:

trunk/src/target/OM-2007

Files:

• artwork/themes/openmoko-standard/gtk-2.0/mokomenubox (modified) (1 diff)
• artwork/themes/openmoko-standard/gtk-2.0/openmoko-application-menu-bg.png (modified) (previous)
• devel/qmake/openmoko-include.pro (modified) (1 diff)
• examples/openmoko-finger-demo/src/demo-main.c (modified) (4 diffs)
• openmoko-libs/libmokoui/moko-menu-box.c (modified) (4 diffs)

trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/mokomenubox

@@ -5 +5 @@
             recolorable     = TRUE
             file            = "openmoko-application-menu-bg.png"
-            border          = { 40, 20, 0, 0 }
+            border          = { 0, 20, 0, 0 }
             stretch         = TRUE
         }
     }
-    xthickness = 30
+    xthickness = 5
 }
 widget "*.mokomenubox-application-menubar" style "mokomenubox-application-menubar"

trunk/src/target/OM-2007/devel/qmake/openmoko-include.pro

@@ -60 +60 @@
 
 contains( CONFIG, debug ) {
-        APPDIR = $(OPENMOKODIR)/applications/$$TARGET/data
-        DEFINES += PKGDATADIR=\\\"$$APPDIR/\\\"
+        !contains( TEMPLATE, lib ) {
+                APPDIR = $(OPENMOKODIR)/applications/$$TARGET/data
+                DEFINES += PKGDATADIR=\\\"$$APPDIR/\\\"
+        }
+    contains( TEMPLATE, lib ) {
+                APPDIR = $(OPENMOKODIR)/openmoko-libs/data
+                DEFINES += PKGDATADIR=\\\"$$APPDIR/\\\"
+        }
 }
 !contains( CONFIG, debug ) {

trunk/src/target/OM-2007/examples/openmoko-finger-demo/src/demo-main.c

@@ -48 +48 @@
 }
 
+void cb_tool_button_clicked( GtkButton* button, MokoFingerWindow* window )
+{
+    if (!tools) return;
+    GtkButton* newbutton = moko_finger_tool_box_add_button( tools );
+    g_signal_connect( G_OBJECT(newbutton), "clicked", G_CALLBACK(cb_tool_button_clicked), window );
+}
+
 void cb_black_button_clicked( GtkButton* button, MokoFingerWindow* window )
 {
@@ -56 +63 @@
     {
         tools = moko_finger_window_get_toolbox(window);
-        for ( int i = 0; i < 1; ++i )
-            moko_finger_tool_box_add_button( tools );
+        for ( int i = 0; i < 4; ++i )
+        {
+            GtkButton* newbutton = moko_finger_tool_box_add_button( tools );
+            g_signal_connect( G_OBJECT(newbutton), "clicked", G_CALLBACK(cb_tool_button_clicked), window );
+        }
     }
 
@@ -70 +80 @@
 void cb_dialer_button_clicked( GtkButton* button, MokoFingerWindow* window )
 {
-    if (!tools) return;
-    moko_finger_tool_box_add_button( tools );
+    // ...
 }
 
@@ -101 +110 @@
     GtkLabel* label1 = gtk_label_new( "Populate this area with finger widgets\n \nThere are three types of finger buttons:" );
 
-    GtkLabel* label2 = gtk_label_new( "Orange button toggles finger scrolling wheel\nBlack button toggles finger toolbar\nDialer Button adds a tool button" );
+    GtkLabel* label2 = gtk_label_new( "Orange button toggles finger scrolling wheel\nBlack button toggles finger toolbar\nDialer Button shows a dialog\n \n \n" );
 
     GtkHBox* hbox = gtk_hbox_new( TRUE, 10 );

trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-menu-box.c

@@ -19 +19 @@
 #include "moko-menu-box.h"
 
+#include <gtk/gtkimage.h>
+#include <gtk/gtkimagemenuitem.h>
 #include <gtk/gtklabel.h>
 #include <gtk/gtkmenubar.h>
@@ -35 +37 @@
 {
     GtkMenuBar* menubar_l;
-    GtkMenuItem* appitem;
+    GtkImageMenuItem* appitem;
     GtkMenu* appmenu;
     GtkMenuBar* menubar_r;
@@ -154 +156 @@
 
     }
-    GtkMenuItem* appitem = gtk_menu_item_new_with_label( g_get_application_name() );
+    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_file( PKGDATADIR "/unknown" ); // openmoko-logo-alpha.png" );
+    gtk_image_menu_item_set_image( appitem, appicon );
     gtk_widget_set_name( GTK_WIDGET(appitem), "transparent" );
     priv->appitem = appitem;
@@ -188 +193 @@
 }
 
-void
-moko_menu_box_set_active_filter(MokoMenuBox* self, gchar* text)
+void moko_menu_box_set_active_filter(MokoMenuBox* self, gchar* text)
 {
     //FIXME this only works with text labels