Changeset 460

Timestamp:

12/22/06 10:43:47 (6 years ago)

Author:

tongsong_li

Message:

add mokoclosepage.c update src/Makefiel.am

Location:

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

Files:

• Makefile.am (modified) (1 diff)
• callbacks.c (modified) (1 diff)
• callbacks.h (modified) (1 diff)
• close-page.c (added)
• close-page.h (added)
• main.c (modified) (3 diffs)
• main.h (modified) (2 diffs)
• mainmenu.c (modified) (2 diffs)
• mainmenu.h (modified) (3 diffs)

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

@@ -5 +5 @@
 bin_PROGRAMS = openmoko-mainmenu
 
-openmoko_mainmenu_SOURCES = main.c mainmenu.c callbacks.c menu-list.c support.c mokoiconview.c app-history.c
+openmoko_mainmenu_SOURCES = main.c mainmenu.c callbacks.c menu-list.c support.c mokoiconview.c app-history.c close-page.c
 
 openmoko_mainmenu_LDADD = @OPENMOKO_LIBS@

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

@@ -20 +20 @@
  #include "callbacks.h"
 
+gboolean test = FALSE;
+void
+moko_wheel_bottom_press_cb (GtkWidget *self, MokoMainmenuApp *mma)
+{
+  if (test) {
+    //moko_finger_window_set_contents( mma->window, GTK_WIDGET(mma->mm));
+    gtk_widget_hide (mma->close);
+    gtk_widget_show (mma->mm);
+  }
+  else {
+    //moko_finger_window_set_contents( mma->window, GTK_WIDGET(mma->close));
+    gtk_widget_hide (mma->mm);
+    gtk_widget_show (mma->close);
+  }
+  
+  g_debug ("test for wheel bottom pressed _________________________");
+test = !test;
 
+}
+
+void
+moko_wheel_left_up_press_cb (GtkWidget *self, MokoMainmenuApp *mma)
+{
+  g_debug ("test for wheel left_up pressed _________________________");
+}
+
+void
+moko_wheel_right_down_press_cb (GtkWidget *self, MokoMainmenuApp *mma)
+{
+  g_debug ("test for wheel rifht_down pressed _________________________");
+
+}
 
 /*test*/ 

trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/callbacks.h

@@ -21 +21 @@
  #define _MAIN_MENU_CALLBACKS_H
  #include <gtk/gtk.h>
+ #include "main.h"
+
+void
+moko_wheel_bottom_press_cb (GtkWidget *self, MokoMainmenuApp *mma);
+
+void
+moko_wheel_left_up_press_cb (GtkWidget *self, MokoMainmenuApp *mma);
+
+void
+moko_wheel_right_down_press_cb (GtkWidget *self, MokoMainmenuApp *mma);
+
 
 void

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

@@ -17 +17 @@
  *  Current Version: $Rev$ ($Date$) [$Author$]
  */
+
+#include "callbacks.h"
+
+
 
 #include "main.h"
@@ -50 +54 @@
         }
    
-    mma->mm = MAINMENU(moko_main_menu_new());
+    mma->mm = moko_main_menu_new();
     gtk_widget_show (mma->mm);
-    
+
+    mma->close = moko_close_page_new ();
+    gtk_widget_show (mma->close);
     //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) );
+    g_signal_connect (mma->wheel, "press_bottom",
+                        G_CALLBACK ( moko_wheel_bottom_press_cb), mma);
+    g_signal_connect (mma->wheel, "press_left_up",
+                        G_CALLBACK ( moko_wheel_left_up_press_cb), mma);
+    g_signal_connect (mma->wheel, "press_right_down",
+                        G_CALLBACK ( moko_wheel_right_down_press_cb), mma);
+
+                        
+    moko_finger_window_set_contents( mma->window, GTK_WIDGET(mma->mm));
+    moko_finger_window_set_contents( mma->window, GTK_WIDGET(mma->close));
     
     /* show everything and run main loop */
@@ -63 +78 @@
     gtk_widget_show (GTK_WIDGET (mma->wheel));
     gtk_widget_show (GTK_WIDGET (mma->toolbox));
+    gtk_widget_hide (GTK_WIDGET (mma->close));
 
     moko_sample_hisory_app_fill (mma->history[0]);

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

@@ -20 +20 @@
 #ifndef _MAIN_MENU_MAIN_H
 #define _MAIN_MENU_MAIN_H
+
 #include <libmokoui/moko-application.h>
-#include <libmokoui/moko-finger-tool-box.h>
 #include <libmokoui/moko-finger-window.h>
 #include <libmokoui/moko-finger-wheel.h>
+#include <libmokoui/moko-finger-tool-box.h>
 #include <libmokoui/moko-pixmap-button.h>
 
-#include <gtk/gtkalignment.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkvbox.h>
-
 #include "mainmenu.h"
-#include "callbacks.h"
 #include "menu-list.h"
+#include "close-page.h"
 
 typedef struct _MokoMainmenuApp MokoMainmenuApp;
@@ -49 +41 @@
     MokoMainMenu *mm;
     MokoMenuList *list;
-
-    //GtkButton *history[3];
+    MokoClosePage *close;
     MokoPixmapButton *history[4]
-
 };
 

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

@@ -34 +34 @@
 
 /**
-*@brief retrun List type.
+*@brief retrun MokoMainMenu type.
 *@param none
 *@return GType
@@ -191 +191 @@
 }
 
+

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

@@ -21 +21 @@
 #define _OPEN_MOKO_MAIN_MENU_H
 
-#include <gtk/gtk.h>
-#include <glib.h>
+#include <gtk/gtkwidget.h>
 #include <glib-object.h>
-#include <gtk/gtkiconview.h>
 #include <gtk/gtkliststore.h>
+#include <gtk/gtklabel.h>
+#include <gtk/gtkvbox.h>
+#include <gtk/gtkhbox.h>
 
 #include "mokoiconview.h"
@@ -71 +72 @@
 struct _MokoMainMenu {
     GtkVBox vbox;
-    //GtkWidget widget;
 
-    //GtkIconView *icon_view;
-    GtkWidget *icon_view;
-    //MokoIconView *icon_view;
+    MokoIconView *icon_view;
     GtkListStore *list_store;
     GtkWidget *scrolled;
@@ -93 +91 @@
 moko_main_menu_get_type (void);
 
+GtkWidget*
+moko_main_menu_new ();
+
 G_END_DECLS