Changeset 407

Timestamp:

12/14/06 02:15:54 (6 years ago)

Author:

tongsong_li

Message:

insert mokoiconview object

Location:

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

Files:

• Makefile.am (modified) (1 diff)
• main.c (modified) (2 diffs)
• mokoiconview.c (added)
• mokoiconview.h (added)

trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/Makefile.am

@@ -1 @@
-#INCLUDES = -DPKGDATADIR=\"$(pkgdatadir)\" @OPENMOKO_CFLAGS@ -Wall -std=c99 -pedantic
 AM_CPPFLAGS = -DDATADIR=\"$(datadir)\" \
               -DPKGDATADIR=\"$(pkgdatadir)\"

trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/main.c

@@ -20 +20 @@
 #include "main.h"
 
-static GtkVBox* vbox = NULL;
-static MokoFingerToolBox* tools = NULL;
-
-void cb_orange_button_clicked( GtkButton* button, MokoFingerWindow* window )
-{
-    g_debug( "openmoko-finger-demo: orange button clicked" );
-    static gboolean show = TRUE;
-    static MokoFingerWheel* wheel = NULL;
-
-    if (!wheel) wheel = moko_finger_wheel_new();
-
-    if ( show )
-        gtk_widget_show( GTK_WIDGET(wheel) );
-    else
-        gtk_widget_hide( GTK_WIDGET(wheel) );
-
-    show = !show;
-}
-
-void cb_black_button_clicked( GtkButton* button, MokoFingerWindow* window )
-{
-    g_debug( "openmoko-finger-demo: black button clicked" );
-    static gboolean show = TRUE;
-
-    if (!tools)
-    {
-        tools = moko_finger_tool_box_new();
-        for ( int i = 0; i < 1; ++i )
-            moko_finger_tool_box_add_button( tools );
-    }
-
-    if ( show )
-        gtk_widget_show( GTK_WIDGET(tools) );
-    else
-        gtk_widget_hide( GTK_WIDGET(tools) );
-
-    show = !show;
-}
-
-void cb_dialer_button_clicked( GtkButton* button, MokoFingerWindow* window )
-{
-    if (!tools) return;
-    moko_finger_tool_box_add_button( tools );
-}
-
-int main( int argc, char** argv ) {
+int 
+main( int argc, char** argv ) {
     MokoMainmenuApp *mma;
 
@@ -117 +73 @@
 
     gtk_widget_show (GTK_WIDGET (mma->wheel));
+    //gtk_widget_reparent (GTK_WIDGET (mma->wheel), GTK_WIDGET (mma->window));
     gtk_widget_show (GTK_WIDGET (mma->toolbox));
+    //gtk_widget_reparent (GTK_WIDGET (mma->toolbox), GTK_WIDGET (mma->window));
 
     //g_debug ("**************");