r219 - in trunk/src/target/OM-2007: . devel/qmake examples/openmoko-finger-demo openmoko-libs openmoko-libs/libmokoui
mickey at gta01.hmw-consulting.de
mickey at gta01.hmw-consulting.de
Mon Nov 13 17:46:19 CET 2006
Author: mickey
Date: 2006-11-13 16:46:17 +0000 (Mon, 13 Nov 2006)
New Revision: 219
Added:
trunk/src/target/OM-2007/openmoko-libs/TODO
trunk/src/target/OM-2007/openmoko-libs/openmoko-libs.pro
Removed:
trunk/src/target/OM-2007/openmoko-libs/libopenmoko.pro
Modified:
trunk/src/target/OM-2007/OM-2007.pro
trunk/src/target/OM-2007/devel/qmake/openmoko-include.pro
trunk/src/target/OM-2007/examples/openmoko-finger-demo/demo-main.c
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-window.c
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-window.h
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-paned-window.c
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-window.c
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-window.h
Log:
mokoui: more work on moko-finger-window. start w/ a real example for a finger-demo-app
Modified: trunk/src/target/OM-2007/OM-2007.pro
===================================================================
--- trunk/src/target/OM-2007/OM-2007.pro 2006-11-13 15:09:20 UTC (rev 218)
+++ trunk/src/target/OM-2007/OM-2007.pro 2006-11-13 16:46:17 UTC (rev 219)
@@ -1,4 +1,3 @@
TEMPLATE = subdirs
-SUBDIRS = libraries applications panel-plugins daemons examples
+SUBDIRS = openmoko-libs examples applications panel-plugins daemons
-
Modified: trunk/src/target/OM-2007/devel/qmake/openmoko-include.pro
===================================================================
--- trunk/src/target/OM-2007/devel/qmake/openmoko-include.pro 2006-11-13 15:09:20 UTC (rev 218)
+++ trunk/src/target/OM-2007/devel/qmake/openmoko-include.pro 2006-11-13 16:46:17 UTC (rev 219)
@@ -21,23 +21,23 @@
QMAKE_EXTRA_UNIX_COMPILERS += dbus-binding-tool
mokocore {
- INCLUDEPATH += $(OPENMOKODIR)/libraries
+ INCLUDEPATH += $(OPENMOKODIR)/openmoko-libs
LIBS += -lmokocore -L$(OPENMOKODIR)/lib
}
mokoui {
- INCLUDEPATH += $(OPENMOKODIR)/libraries
+ INCLUDEPATH += $(OPENMOKODIR)/openmoko-libs
PKGCONFIG += gtk+-2.0
LIBS += -lmokoui -L$(OPENMOKODIR)/lib
}
mokopim {
- INCLUDEPATH += $(OPENMOKODIR)/libraries
+ INCLUDEPATH += $(OPENMOKODIR)/openmoko-libs
LIBS += -lmokopim -L$(OPENMOKODIR)/lib
}
mokonet {
- INCLUDEPATH += $(OPENMOKODIR)/libraries
+ INCLUDEPATH += $(OPENMOKODIR)/openmoko-libs
LIBS += -lmokonet -L$(OPENMOKODIR)/lib
}
@@ -59,12 +59,12 @@
}
contains( CONFIG, debug ) {
- APPDIR = $(OPENMOKODIR)/applications/$$TARGET
- DEFINES += RESOURCE_PATH=\\\"$$APPDIR/\\\"
+ APPDIR = $(OPENMOKODIR)/applications/$$TARGET/data
+ DEFINES += PKGDATADIR=\\\"$$APPDIR/\\\"
}
!contains( CONFIG, debug ) {
APPDIR = /usr/share/$$TARGET
- DEFINES += RESOURCE_PATH=\\\"$$APPDIR/\\\"
+ DEFINES += PKGDATADIR=\\\"$$APPDIR/\\\"
}
Modified: trunk/src/target/OM-2007/examples/openmoko-finger-demo/demo-main.c
===================================================================
--- trunk/src/target/OM-2007/examples/openmoko-finger-demo/demo-main.c 2006-11-13 15:09:20 UTC (rev 218)
+++ trunk/src/target/OM-2007/examples/openmoko-finger-demo/demo-main.c 2006-11-13 16:46:17 UTC (rev 219)
@@ -45,50 +45,29 @@
/* application object */
MokoApplication* app = MOKO_APPLICATION(moko_application_get_instance());
- g_set_application_name( "OpenMoko-Finger-Demo" );
+ g_set_application_name( "Finger-Demo" );
/* main window */
- //MokoFingerWindow* window = MOKO_FINGER_WINDOW(moko_finger_window_new());
- GtkWindow* window = gtk_window_new( GTK_WINDOW_TOPLEVEL );
+ MokoFingerWindow* window = MOKO_FINGER_WINDOW(moko_finger_window_new());
/* application menu */
GtkMenu* appmenu = GTK_MENU(gtk_menu_new());
GtkMenuItem* closeitem = GTK_MENU_ITEM(gtk_menu_item_new_with_label( "Close" ));
g_signal_connect( G_OBJECT(closeitem), "activate", G_CALLBACK(gtk_main_quit), NULL );
gtk_menu_shell_append( appmenu, closeitem );
- //moko_finger_window_set_application_menu( window, appmenu );
+ moko_finger_window_set_application_menu( window, appmenu );
- GtkVBox* vbox = gtk_vbox_new( TRUE, 10 );
-
- gtk_container_add( GTK_CONTAINER(window), vbox );
/* connect close event */
g_signal_connect( G_OBJECT(window), "delete_event", G_CALLBACK( gtk_main_quit ), NULL );
-#if 0
-
- g_print( "gdkwindow for vbox = %p", GTK_WIDGET(vbox)->window );
- gtk_widget_set_name( GTK_WIDGET(vbox), "mywidget" );
-
-
- /* navigation area */
-
- GtkNotebook* nb = gtk_notebook_new();
- gtk_notebook_append_page( nb, button1, NULL );
- gtk_notebook_append_page( nb, button2, NULL );
-
- gtk_box_pack_start( vbox, GTK_WIDGET(nb), TRUE, TRUE, 20 );
-#endif
-
+ /* contents */
+ GtkVBox* vbox = gtk_vbox_new( TRUE, 10 );
GtkEntry* entry = gtk_entry_new();
gtk_entry_set_text( entry, "This is a line of text" );
+ gtk_box_pack_start( vbox, GTK_WIDGET(entry), TRUE, TRUE, 10 );
- MokoPixmapContainer* fixed = moko_pixmap_container_new();
- moko_pixmap_container_set_cargo( fixed, GTK_WIDGET(entry) );
+ moko_finger_window_set_contents( window, GTK_WIDGET(vbox) );
- gtk_box_pack_start( vbox, GTK_WIDGET(fixed), TRUE, TRUE, 10 );
-
- //moko_finger_window_set_contents( window, GTK_WIDGET(nb) );
-
/* show everything and run main loop */
gtk_widget_show_all( GTK_WIDGET(window) );
g_debug( "openmoko-finger-demo entering main loop" );
Added: trunk/src/target/OM-2007/openmoko-libs/TODO
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/TODO 2006-11-13 15:09:20 UTC (rev 218)
+++ trunk/src/target/OM-2007/openmoko-libs/TODO 2006-11-13 16:46:17 UTC (rev 219)
@@ -0,0 +1,12 @@
+(Ordered by Priority)
+
+- FingerWindow
+
+- Theming for Dialogs
+
+- MokoBanner (see HildonBanner)
+
+- Refactor moko_paned_window_set_application_menu and moko_finger_window_set_application_menu
+ into common MokoWindow class (moko_window_set_application_menu) and make it a virtual method.
+
+- Maemo Interoperability Interface (MII)
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-window.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-window.c 2006-11-13 15:09:20 UTC (rev 218)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-window.c 2006-11-13 16:46:17 UTC (rev 219)
@@ -17,76 +17,86 @@
*/
#include "moko-finger-window.h"
+
+#include "moko-menu-box.h"
+
#include <gtk/gtkhbox.h>
#include <gtk/gtkvbox.h>
#include <gtk/gtklabel.h>
#include <gtk/gtkbutton.h>
-G_DEFINE_TYPE (MokoFingerWindow, moko_finger_window, MOKO_TYPE_WINDOW);
+G_DEFINE_TYPE (MokoFingerWindow, moko_finger_window, MOKO_TYPE_WINDOW)
-#define FINGER_WINDOW_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), MOKO_TYPE_FINGER_WINDOW, MokoFingerWindowPrivate))
+#define MOKO_FINGER_WINDOW_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), MOKO_TYPE_FINGER_WINDOW, MokoFingerWindowPriv))
-typedef struct _MokoFingerWindowPrivate MokoFingerWindowPrivate;
-
-struct _MokoFingerWindowPrivate
+typedef struct _MokoFingerWindowPriv
{
GtkVBox* vbox;
GtkHBox* hbox;
GtkLabel* label;
GtkButton* scroller;
-};
+ MokoMenuBox* menubox;
+} MokoFingerWindowPriv;
-static void
-moko_finger_window_dispose (GObject *object)
+static void moko_finger_window_dispose (GObject *object)
{
- if (G_OBJECT_CLASS (moko_finger_window_parent_class)->dispose)
- G_OBJECT_CLASS (moko_finger_window_parent_class)->dispose (object);
+ if (G_OBJECT_CLASS (moko_finger_window_parent_class)->dispose)
+ G_OBJECT_CLASS (moko_finger_window_parent_class)->dispose (object);
}
-static void
-moko_finger_window_finalize (GObject *object)
+static void moko_finger_window_finalize (GObject *object)
{
- G_OBJECT_CLASS (moko_finger_window_parent_class)->finalize (object);
+ G_OBJECT_CLASS (moko_finger_window_parent_class)->finalize (object);
}
-static void
-moko_finger_window_class_init (MokoFingerWindowClass *klass)
+static void moko_finger_window_class_init (MokoFingerWindowClass *klass)
{
- GObjectClass *object_class = G_OBJECT_CLASS (klass);
+ g_debug( "moko_finger_window_class_init" );
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
- g_type_class_add_private (klass, sizeof (MokoFingerWindowPrivate));
+ g_type_class_add_private (klass, sizeof (MokoFingerWindowPriv));
- object_class->dispose = moko_finger_window_dispose;
- object_class->finalize = moko_finger_window_finalize;
+ object_class->dispose = moko_finger_window_dispose;
+ object_class->finalize = moko_finger_window_finalize;
}
-static void
-moko_finger_window_init (MokoFingerWindow *self)
+static void moko_finger_window_init (MokoFingerWindow *self)
{
g_debug( "moko_finger_window_init" );
- MokoFingerWindowPrivate* priv = FINGER_WINDOW_PRIVATE(self);
+ MokoFingerWindowPriv* priv = MOKO_FINGER_WINDOW_PRIVATE(self);
priv->vbox = gtk_vbox_new( FALSE, 0 );
- priv->hbox = gtk_hbox_new( FALSE, 0 );
- priv->scroller = gtk_button_new_with_label( "Hello" );
- priv->label = gtk_label_new( "Yo Yo" );
- gtk_box_pack_end( GTK_BOX(priv->vbox), GTK_WIDGET(priv->hbox), FALSE, FALSE, 0 );
- gtk_box_pack_start( GTK_BOX(priv->hbox), GTK_WIDGET(priv->scroller), FALSE, FALSE, 0 );
- gtk_box_pack_start( GTK_BOX(priv->hbox), GTK_WIDGET(priv->label), FALSE, FALSE, 0 );
+// priv->hbox = gtk_hbox_new( FALSE, 0 );
+// priv->scroller = gtk_button_new_with_label( "Hello" );
+// priv->label = gtk_label_new( "Yo Yo" );
+// gtk_box_pack_end( GTK_BOX(priv->vbox), GTK_WIDGET(priv->hbox), FALSE, FALSE, 0 );
+// gtk_box_pack_start( GTK_BOX(priv->hbox), GTK_WIDGET(priv->scroller), FALSE, FALSE, 0 );
+// gtk_box_pack_start( GTK_BOX(priv->hbox), GTK_WIDGET(priv->label), FALSE, FALSE, 0 );
gtk_container_add( GTK_CONTAINER(self), GTK_WIDGET(priv->vbox) );
}
-MokoFingerWindow*
-moko_finger_window_new (void)
+GtkWidget* moko_finger_window_new() /* Construction */
{
- return g_object_new (MOKO_TYPE_FINGER_WINDOW, NULL);
+ return GTK_WIDGET(g_object_new(moko_finger_window_get_type(), NULL));
}
-static void
-moko_finger_window_set_contents (MokoFingerWindow* self, GtkWidget* child )
+void moko_finger_window_set_application_menu(MokoFingerWindow* self, GtkMenu* menu)
{
- g_debug( "moko_finger_window_init" );
- MokoFingerWindowPrivate* priv = FINGER_WINDOW_PRIVATE(self);
+ g_debug( "moko_finger_window_set_application_menu" );
+ MokoFingerWindowPriv* priv = MOKO_FINGER_WINDOW_PRIVATE(self);
+ if (!priv->menubox )
+ {
+ priv->menubox = moko_menu_box_new();
+ gtk_box_pack_start( GTK_BOX(priv->vbox), GTK_WIDGET(priv->menubox), FALSE, FALSE, 0 );
+ }
+ moko_menu_box_set_application_menu( priv->menubox, menu );
+}
+
+void moko_finger_window_set_contents (MokoFingerWindow* self, GtkWidget* child )
+{
+ g_debug( "moko_finger_window_set_contents" );
+ MokoFingerWindowPriv* priv = MOKO_FINGER_WINDOW_PRIVATE(self);
+
gtk_box_pack_start( GTK_BOX(priv->vbox), GTK_WIDGET(child), TRUE, TRUE, 0 );
}
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-window.h
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-window.h 2006-11-13 15:09:20 UTC (rev 218)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-window.h 2006-11-13 16:46:17 UTC (rev 219)
@@ -19,21 +19,19 @@
#ifndef _MOKO_FINGER_WINDOW_H_
#define _MOKO_FINGER_WINDOW_H_
-#include <glib-object.h>
#include "moko-window.h"
+#include <gtk/gtkmenu.h>
+
+#include <glib-object.h>
+
G_BEGIN_DECLS
#define MOKO_TYPE_FINGER_WINDOW moko_finger_window_get_type()
-
#define MOKO_FINGER_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MOKO_TYPE_FINGER_WINDOW, MokoFingerWindow))
-
#define MOKO_FINGER_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), MOKO_TYPE_FINGER_WINDOW, MokoFingerWindowClass))
-
#define MOKO_IS_FINGER_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MOKO_TYPE_FINGER_WINDOW))
-
#define MOKO_IS_FINGER_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), MOKO_TYPE_FINGER_WINDOW))
-
#define MOKO_FINGER_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), MOKO_TYPE_FINGER_WINDOW, MokoFingerWindowClass))
typedef struct {
@@ -45,9 +43,10 @@
} MokoFingerWindowClass;
GType moko_finger_window_get_type (void);
+GtkWidget* moko_finger_window_new (void);
+void moko_finger_window_set_application_menu(MokoFingerWindow* self, GtkMenu* menu);
+void moko_finger_window_set_contents (MokoFingerWindow* self, GtkWidget* child );
-MokoFingerWindow* moko_finger_window_new (void);
-
G_END_DECLS
#endif // _MOKO_FINGER_WINDOW_H_
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-paned-window.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-paned-window.c 2006-11-13 15:09:20 UTC (rev 218)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-paned-window.c 2006-11-13 16:46:17 UTC (rev 219)
@@ -23,6 +23,8 @@
#include <gtk/gtkvbox.h>
#include <gtk/gtkvpaned.h>
+G_DEFINE_TYPE (MokoPanedWindow, moko_paned_window, MOKO_TYPE_WINDOW)
+
#define MOKO_PANED_WINDOW_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), MOKO_TYPE_PANED_WINDOW, MokoPanedWindowPriv));
typedef struct _MokoPanedWindowPriv
@@ -48,32 +50,6 @@
static guint moko_paned_window_signals[LAST_SIGNAL] = { 0 };
-GType moko_paned_window_get_type (void) /* Typechecking */
-{
- static GType self_type = 0;
-
- if (!self_type)
- {
- static const GTypeInfo f_info =
- {
- sizeof (MokoPanedWindowClass),
- NULL, /* base_init */
- NULL, /* base_finalize */
- (GClassInitFunc) moko_paned_window_class_init,
- NULL, /* class_finalize */
- NULL, /* class_data */
- sizeof (MokoPanedWindow),
- 0,
- (GInstanceInitFunc) moko_paned_window_init,
- };
-
- /* add the type of your parent class here */
- self_type = g_type_register_static(MOKO_TYPE_WINDOW, "MokoPanedWindow", &f_info, 0);
- }
-
- return self_type;
-}
-
static void moko_paned_window_class_init (MokoPanedWindowClass *klass) /* Class Initialization */
{
g_type_class_add_private(klass, sizeof(MokoPanedWindowPriv));
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-window.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-window.c 2006-11-13 15:09:20 UTC (rev 218)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-window.c 2006-11-13 16:46:17 UTC (rev 219)
@@ -29,32 +29,8 @@
static guint moko_window_signals[LAST_SIGNAL] = { 0 };
-GType moko_window_get_type (void) /* Typechecking */
-{
- static GType self_type = 0;
+G_DEFINE_TYPE (MokoWindow, moko_window, GTK_TYPE_WINDOW)
- if (!self_type)
- {
- static const GTypeInfo f_info =
- {
- sizeof (MokoWindowClass),
- NULL, /* base_init */
- NULL, /* base_finalize */
- (GClassInitFunc) moko_window_class_init,
- NULL, /* class_finalize */
- NULL, /* class_data */
- sizeof (MokoWindow),
- 0,
- (GInstanceInitFunc) moko_window_init,
- };
-
- /* add the type of your parent class here */
- self_type = g_type_register_static(GTK_TYPE_WINDOW, "MokoWindow", &f_info, 0);
- }
-
- return self_type;
-}
-
static void moko_window_class_init (MokoWindowClass *klass) /* Class Initialization */
{
moko_window_signals[MOKO_WINDOW_SIGNAL] = g_signal_new ("moko_window",
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-window.h
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-window.h 2006-11-13 15:09:20 UTC (rev 218)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-window.h 2006-11-13 16:46:17 UTC (rev 219)
@@ -19,10 +19,10 @@
#ifndef _MOKO_WINDOW_H_
#define _MOKO_WINDOW_H_
-#include <glib.h>
-#include <glib-object.h>
#include <gtk/gtkwindow.h>
+#include <glib-object.h>
+
G_BEGIN_DECLS
#define MOKO_TYPE_WINDOW (moko_window_get_type())
@@ -31,22 +31,18 @@
#define MOKO_IS_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MOKO_TYPE_WINDOW))
#define MOKO_IS_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), MOKO_TYPE_WINDOW))
-typedef struct _MokoWindow MokoWindow;
-typedef struct _MokoWindowClass MokoWindowClass;
-
-struct _MokoWindow
+typedef struct _MokoWindow
{
GtkWindow parent;
/* add pointers to new members here */
+} MokoWindow;
-};
-
-struct _MokoWindowClass
+typedef struct _MokoWindowClass
{
/* add your parent class here */
GtkWindowClass parent_class;
void (*moko_window) (MokoWindow *self);
-};
+} MokoWindowClass;
GType moko_window_get_type (void);
GtkWidget* moko_window_new (void);
Deleted: trunk/src/target/OM-2007/openmoko-libs/libopenmoko.pro
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libopenmoko.pro 2006-11-13 15:09:20 UTC (rev 218)
+++ trunk/src/target/OM-2007/openmoko-libs/libopenmoko.pro 2006-11-13 16:46:17 UTC (rev 219)
@@ -1,3 +0,0 @@
-TEMPLATE = subdirs
-# SUBDIRS = libgsm mokocore mokonet mokoui mokopim
-SUBDIRS = libmokocore libmokonet libmokoui libmokopim
Copied: trunk/src/target/OM-2007/openmoko-libs/openmoko-libs.pro (from rev 211, trunk/src/target/OM-2007/openmoko-libs/libopenmoko.pro)
More information about the commitlog
mailing list
