r460 - trunk/src/target/OM-2007/applications/openmoko-mainmenu/src
tongsong_li at gta01.hmw-consulting.de
tongsong_li at gta01.hmw-consulting.de
Fri Dec 22 10:43:56 CET 2006
Author: tongsong_li
Date: 2006-12-22 10:43:47 +0100 (Fri, 22 Dec 2006)
New Revision: 460
Added:
trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/close-page.c
trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/close-page.h
Modified:
trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/Makefile.am
trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/callbacks.c
trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/callbacks.h
trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/main.c
trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/main.h
trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mainmenu.c
trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mainmenu.h
Log:
add mokoclosepage.c update src/Makefiel.am
Modified: trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/Makefile.am
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/Makefile.am 2006-12-22 09:34:05 UTC (rev 459)
+++ trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/Makefile.am 2006-12-22 09:43:47 UTC (rev 460)
@@ -4,7 +4,7 @@
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@
Modified: trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/callbacks.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/callbacks.c 2006-12-22 09:34:05 UTC (rev 459)
+++ trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/callbacks.c 2006-12-22 09:43:47 UTC (rev 460)
@@ -19,8 +19,39 @@
#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*/
void
moko_item_select_cb(GtkIconView *icon_view, GtkTreePath *path, gpointer data) {
Modified: trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/callbacks.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/callbacks.h 2006-12-22 09:34:05 UTC (rev 459)
+++ trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/callbacks.h 2006-12-22 09:43:47 UTC (rev 460)
@@ -20,8 +20,19 @@
#ifndef _MAIN_MENU_CALLBACKS_H
#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
moko_item_select_cb(GtkIconView *icon_view, GtkTreePath *path, gpointer data);
gboolean /*will be call when Enter key pressed*/
Added: trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/close-page.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/close-page.c 2006-12-22 09:34:05 UTC (rev 459)
+++ trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/close-page.c 2006-12-22 09:43:47 UTC (rev 460)
@@ -0,0 +1,101 @@
+/*
+ * openmoko-mainmenu
+ *
+ * Authored by Sun Zhiyong <sunzhiyong at fic-sh.com.cn>
+ *
+ * Copyright (C) 2006 First International Computer Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Public License as published by
+ * the Free Software Foundation; version 2.1 of the license.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Public License for more details.
+ *
+ * Current Version: $Rev$ ($Date$) [$Author$]
+ */
+
+#include <gtk/gtkhbox.h>
+
+#include "close-page.h"
+
+ enum {
+ close_page_signal,
+ last_signal
+ };
+
+static void
+moko_close_page_class_init(MokoClosePageClass *self);
+
+static void
+moko_close_page_init(MokoClosePage *self);
+
+/**
+*@brief retrun MokoClosePage type.
+*@param none
+*@return GType
+*/
+GType
+moko_close_page_get_type (void) /* Typechecking */
+{
+ static GType close_page = 0;
+
+ if (!close_page)
+ {
+ static const GTypeInfo type_info =
+ {
+ sizeof (MokoClosePageClass),
+ NULL, /* base_init */
+ NULL, /* base_finalize */
+ (GClassInitFunc) moko_close_page_class_init,
+ NULL, /* class_finalize */
+ NULL, /* class_data */
+ sizeof (MokoClosePage),
+ 0,
+ (GInstanceInitFunc) moko_close_page_init,
+ NULL
+ };
+
+ close_page = g_type_register_static (GTK_TYPE_VBOX, "MokoClosePage", &type_info, 0);
+ }
+
+ return close_page;
+}
+
+static void
+moko_close_page_class_init(MokoClosePageClass *self) {
+
+}
+
+static void
+moko_close_page_init(MokoClosePage *self){
+ GtkHBox *hbox1 = gtk_hbox_new (FALSE, 0);
+ GtkHBox *hbox2 = gtk_hbox_new (FALSE, 0);
+
+ self->close_btn = gtk_button_new ();
+ gtk_widget_set_name( GTK_WIDGET(self->close_btn), "mokofingerbutton-black" );
+ gtk_widget_show (self->close_btn);
+
+ self->info = gtk_label_new ("Close main menu and turn to the last application");
+ gtk_widget_show (self->info);
+ gtk_label_set_justify (self->info, GTK_JUSTIFY_CENTER);
+ gtk_label_set_line_wrap (self->info, TRUE);
+
+ gtk_misc_set_alignment (GTK_MISC (self->close_btn), 0.5, 1);
+ gtk_misc_set_alignment (GTK_MISC (self->info), 0.5, 0);
+
+ gtk_box_pack_start (GTK_BOX (self), GTK_WIDGET (hbox1), TRUE, TRUE, 150);
+ gtk_box_pack_start (GTK_BOX (hbox1), GTK_WIDGET (self->close_btn), TRUE, TRUE, 150);
+ gtk_box_pack_start (GTK_BOX (self), GTK_WIDGET (hbox2), TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox2), GTK_WIDGET (self->info), TRUE, FALSE, 100);
+
+
+}
+
+GtkWidget *
+moko_close_page_new () {
+ return g_object_new (MOKO_CLOSE_PAGE_TYPE, NULL);
+}
+
Added: trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/close-page.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/close-page.h 2006-12-22 09:34:05 UTC (rev 459)
+++ trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/close-page.h 2006-12-22 09:43:47 UTC (rev 460)
@@ -0,0 +1,52 @@
+/*
+ * openmoko-mainmenu
+ *
+ * Authored by Sun Zhiyong <sunzhiyong at fic-sh.com.cn>
+ *
+ * Copyright (C) 2006 First International Computer Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Public License as published by
+ * the Free Software Foundation; version 2.1 of the license.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Public License for more details.
+ *
+ * Current Version: $Rev$ ($Date$) [$Author$]
+ */
+ #ifndef _MOKO_MAIN_MENU_CLOSE_PAGE_H_
+#define _MOKO_MAIN_MENU_CLOSE_PAGE_H_
+
+#include <gtk/gtkbutton.h>
+#include <gtk/gtklabel.h>
+#include <gtk/gtkvbox.h>
+
+#define MOKO_CLOSE_PAGE_TYPE (moko_close_page_get_type())
+#define MOKO_CLOSE_PAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MOKO_CLOSE_PAGE_TYPE, MokoClosePage))
+#define MOKO_CLOSE_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), MOKO_CLOSE_PAGE_TYPE, MokoClosePageClass))
+#define IS_MOKO_CLOSE_PAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MOKO_CLOSE_PAGE_TYPE))
+#define IS_MOKO_CLOSE_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), MOKO_CLOSE_PAGE_TYPE))
+
+typedef struct _MokoClosePage MokoClosePage;
+typedef struct _MokoClosePageClass MokoClosePageClass;
+
+struct _MokoClosePage {
+ GtkVBox vbox;
+
+ GtkButton *close_btn;
+ GtkLabel *info;
+};
+
+struct _MokoClosePageClass {
+ GtkVBoxClass parent_class;
+};
+
+GType
+moko_close_page_get_type(void);
+
+GtkWidget *
+moko_close_page_new ();
+
+#endif /*close-page.h*/
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-22 09:34:05 UTC (rev 459)
+++ trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/main.c 2006-12-22 09:43:47 UTC (rev 460)
@@ -17,6 +17,10 @@
* Current Version: $Rev$ ($Date$) [$Author$]
*/
+#include "callbacks.h"
+
+
+
#include "main.h"
int
@@ -49,19 +53,31 @@
gtk_widget_show (mma->history[i]);
}
- 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 */
gtk_widget_show_all( GTK_WIDGET(mma->window) );
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]);
Modified: trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/main.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/main.h 2006-12-22 09:34:05 UTC (rev 459)
+++ trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/main.h 2006-12-22 09:43:47 UTC (rev 460)
@@ -19,24 +19,16 @@
#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;
@@ -48,10 +40,8 @@
MokoFingerToolBox *toolbox;
MokoMainMenu *mm;
MokoMenuList *list;
-
- //GtkButton *history[3];
+ MokoClosePage *close;
MokoPixmapButton *history[4]
-
};
#endif /*main.h*/
Modified: trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mainmenu.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mainmenu.c 2006-12-22 09:34:05 UTC (rev 459)
+++ trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mainmenu.c 2006-12-22 09:43:47 UTC (rev 460)
@@ -33,7 +33,7 @@
static guint menu_signals[LAST_SIGNAL] = { 0 };
/**
-*@brief retrun List type.
+*@brief retrun MokoMainMenu type.
*@param none
*@return GType
*/
@@ -190,3 +190,4 @@
}
+
Modified: trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mainmenu.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mainmenu.h 2006-12-22 09:34:05 UTC (rev 459)
+++ trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mainmenu.h 2006-12-22 09:43:47 UTC (rev 460)
@@ -20,11 +20,12 @@
#ifndef _OPEN_MOKO_MAIN_MENU_H
#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"
@@ -70,11 +71,8 @@
struct _MokoMainMenu {
GtkVBox vbox;
- //GtkWidget widget;
- //GtkIconView *icon_view;
- GtkWidget *icon_view;
- //MokoIconView *icon_view;
+ MokoIconView *icon_view;
GtkListStore *list_store;
GtkWidget *scrolled;
GtkHBox *hbox;
@@ -92,6 +90,9 @@
GType
moko_main_menu_get_type (void);
+GtkWidget*
+moko_main_menu_new ();
+
G_END_DECLS
#endif /*main_menu.h*/
More information about the commitlog
mailing list
