r66 - in trunk/src/target/OM-2007: examples/openmoko-paned-demo libraries/mokoui
mickey at gta01.hmw-consulting.de
mickey at gta01.hmw-consulting.de
Mon Oct 2 10:59:41 CEST 2006
Author: mickey
Date: 2006-10-02 08:59:40 +0000 (Mon, 02 Oct 2006)
New Revision: 66
Modified:
trunk/src/target/OM-2007/examples/openmoko-paned-demo/demo-main.c
trunk/src/target/OM-2007/libraries/mokoui/moko-menubar.c
trunk/src/target/OM-2007/libraries/mokoui/moko-menubar.h
trunk/src/target/OM-2007/libraries/mokoui/moko-paned-window.c
trunk/src/target/OM-2007/libraries/mokoui/moko-toolbar.c
trunk/src/target/OM-2007/libraries/mokoui/moko-toolbar.h
Log:
s/tool_bar/toolbar/, add toolbar to demo-main, this concludes mokoui first phase demo
Modified: trunk/src/target/OM-2007/examples/openmoko-paned-demo/demo-main.c
===================================================================
--- trunk/src/target/OM-2007/examples/openmoko-paned-demo/demo-main.c 2006-10-02 08:31:24 UTC (rev 65)
+++ trunk/src/target/OM-2007/examples/openmoko-paned-demo/demo-main.c 2006-10-02 08:59:40 UTC (rev 66)
@@ -28,6 +28,7 @@
#include <gtk/gtkmain.h>
#include <gtk/gtkmenu.h>
#include <gtk/gtkstock.h>
+#include <gtk/gtktoolbutton.h>
#include <gtk/gtkuimanager.h>
#include <gtk/gtkvpaned.h>
#include <gtk/gtkvbox.h>
@@ -162,8 +163,23 @@
moko_paned_window_set_upper_pane( window, GTK_WIDGET(navigationlist) );
/* tool bar */
- MokoToolBar* toolbar = MOKO_TOOLBAR(moko_tool_bar_new());
+ MokoToolBar* toolbar = MOKO_TOOLBAR(moko_toolbar_new());
+ GtkToolButton* tool_search = GTK_TOOL_BUTTON(gtk_tool_button_new( NULL, "search" ));
+ gtk_toolbar_insert( GTK_TOOLBAR(toolbar), tool_search, 0 );
+ moko_paned_window_add_toolbar( window, GTK_TOOLBAR(toolbar) );
+ GtkToolButton* tool_action1 = GTK_TOOL_BUTTON(gtk_tool_button_new( NULL, "action1" ));
+ gtk_toolbar_insert( GTK_TOOLBAR(toolbar), tool_action1, 1 );
+
+ GtkToolButton* tool_action2 = GTK_TOOL_BUTTON(gtk_tool_button_new( NULL, "action2" ));
+ gtk_toolbar_insert( GTK_TOOLBAR(toolbar), tool_action2, 2 );
+
+ GtkToolButton* tool_action3 = GTK_TOOL_BUTTON(gtk_tool_button_new( NULL, "action3" ));
+ gtk_toolbar_insert( GTK_TOOLBAR(toolbar), tool_action3, 3 );
+
+ GtkToolButton* tool_action4 = GTK_TOOL_BUTTON(gtk_tool_button_new( NULL, "action4" ));
+ gtk_toolbar_insert( GTK_TOOLBAR(toolbar), tool_action4, 4 );
+
/* details area */
GtkButton* detailslist = gtk_button_new_with_label( "Hello Details Area!" );
moko_paned_window_set_lower_pane( window, GTK_WIDGET(detailslist) );
Modified: trunk/src/target/OM-2007/libraries/mokoui/moko-menubar.c
===================================================================
--- trunk/src/target/OM-2007/libraries/mokoui/moko-menubar.c 2006-10-02 08:31:24 UTC (rev 65)
+++ trunk/src/target/OM-2007/libraries/mokoui/moko-menubar.c 2006-10-02 08:59:40 UTC (rev 66)
@@ -24,12 +24,12 @@
LAST_SIGNAL
};
-static void moko_menu_bar_class_init (MokoMenuBarClass *klass);
-static void moko_menu_bar_init (MokoMenuBar *f);
+static void moko_menubar_class_init (MokoMenuBarClass *klass);
+static void moko_menubar_init (MokoMenuBar *f);
-static guint moko_menu_bar_signals[LAST_SIGNAL] = { 0 };
+static guint moko_menubar_signals[LAST_SIGNAL] = { 0 };
-GType moko_menu_bar_get_type (void) /* Typechecking */
+GType moko_menubar_get_type (void) /* Typechecking */
{
static GType self_type = 0;
@@ -40,12 +40,12 @@
sizeof (MokoMenuBarClass),
NULL, /* base_init */
NULL, /* base_finalize */
- (GClassInitFunc) moko_menu_bar_class_init,
+ (GClassInitFunc) moko_menubar_class_init,
NULL, /* class_finalize */
NULL, /* class_data */
sizeof (MokoMenuBar),
0,
- (GInstanceInitFunc) moko_menu_bar_init,
+ (GInstanceInitFunc) moko_menubar_init,
};
/* add the type of your parent class here */
@@ -55,29 +55,29 @@
return self_type;
}
-static void moko_menu_bar_class_init (MokoMenuBarClass *klass) /* Class Initialization */
+static void moko_menubar_class_init (MokoMenuBarClass *klass) /* Class Initialization */
{
- moko_menu_bar_signals[MOKO_MENUBAR_SIGNAL] = g_signal_new ("moko_menu_bar",
+ moko_menubar_signals[MOKO_MENUBAR_SIGNAL] = g_signal_new ("moko_menubar",
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
- G_STRUCT_OFFSET (MokoMenuBarClass, moko_menu_bar),
+ G_STRUCT_OFFSET (MokoMenuBarClass, moko_menubar),
NULL,
NULL,
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
}
-static void moko_menu_bar_init (MokoMenuBar *f) /* Instance Construction */
+static void moko_menubar_init (MokoMenuBar *f) /* Instance Construction */
{
/* populate your widget here */
}
-GtkWidget* moko_menu_bar_new() /* Construction */
+GtkWidget* moko_menubar_new() /* Construction */
{
- return GTK_WIDGET(g_object_new(moko_menu_bar_get_type(), NULL));
+ return GTK_WIDGET(g_object_new(moko_menubar_get_type(), NULL));
}
-void moko_menu_bar_clear(MokoMenuBar *f) /* Destruction */
+void moko_menubar_clear(MokoMenuBar *f) /* Destruction */
{
/* destruct your widgets here */
}
Modified: trunk/src/target/OM-2007/libraries/mokoui/moko-menubar.h
===================================================================
--- trunk/src/target/OM-2007/libraries/mokoui/moko-menubar.h 2006-10-02 08:31:24 UTC (rev 65)
+++ trunk/src/target/OM-2007/libraries/mokoui/moko-menubar.h 2006-10-02 08:59:40 UTC (rev 66)
@@ -25,7 +25,7 @@
G_BEGIN_DECLS
-#define MOKO_TYPE_MENUBAR (moko_menu_bar_get_type())
+#define MOKO_TYPE_MENUBAR (moko_menubar_get_type())
#define MOKO_MENUBAR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MOKO_TYPE_MENUBAR, MokoMenuBar))
#define MOKO_MENUBAR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), MOKO_TYPE_MENUBAR, MokoMenuBarClass))
#define IS_MOKO_MENUBAR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MOKO_TYPE_MENUBAR))
@@ -44,12 +44,12 @@
{
/* add your parent class here */
GtkMenuBarClass parent_class;
- void (*moko_menu_bar) (MokoMenuBar *self);
+ void (*moko_menubar) (MokoMenuBar *self);
};
-GType moko_menu_bar_get_type (void);
-GtkWidget* moko_menu_bar_new (void);
-void moko_menu_bar_clera (MokoMenuBar *self);
+GType moko_menubar_get_type (void);
+GtkWidget* moko_menubar_new (void);
+void moko_menubar_clera (MokoMenuBar *self);
/* add additional methods here */
Modified: trunk/src/target/OM-2007/libraries/mokoui/moko-paned-window.c
===================================================================
--- trunk/src/target/OM-2007/libraries/mokoui/moko-paned-window.c 2006-10-02 08:31:24 UTC (rev 65)
+++ trunk/src/target/OM-2007/libraries/mokoui/moko-paned-window.c 2006-10-02 08:59:40 UTC (rev 66)
@@ -118,7 +118,7 @@
MokoPanedWindowPriv* priv = MOKO_PANED_WINDOW_GET_PRIVATE(self);
if (!priv->menubar )
{
- priv->menubar = moko_menu_bar_new();
+ priv->menubar = moko_menubar_new();
gtk_box_pack_start( GTK_BOX(priv->upper), GTK_WIDGET(priv->menubar), FALSE, FALSE, 0 );
}
GtkMenuItem* appitem = gtk_menu_item_new_with_label( g_get_application_name() );
@@ -129,7 +129,7 @@
void moko_paned_window_set_upper_pane(MokoPanedWindow* self, GtkWidget* child)
{
g_debug( "moko_paned_window_set_upper_pane" );
-
+
MokoPanedWindowPriv* priv = MOKO_PANED_WINDOW_GET_PRIVATE(self);
gtk_box_pack_end( GTK_BOX(priv->upper), child, TRUE, TRUE, 0 );
}
@@ -137,7 +137,15 @@
void moko_paned_window_set_lower_pane(MokoPanedWindow* self, GtkWidget* child)
{
g_debug( "moko_paned_window_set_lower_pane" );
-
+
MokoPanedWindowPriv* priv = MOKO_PANED_WINDOW_GET_PRIVATE(self);
gtk_box_pack_start( GTK_BOX(priv->lower), child, TRUE, TRUE, 0 );
}
+
+void moko_paned_window_add_toolbar(MokoPanedWindow* self, GtkToolbar* toolbar)
+{
+ g_debug( "moko_paned_window_add_toolbar" );
+ MokoPanedWindowPriv* priv = MOKO_PANED_WINDOW_GET_PRIVATE(self);
+ gtk_box_pack_end( GTK_BOX(priv->upper), toolbar, FALSE, FALSE, 0 );
+ gtk_box_reorder_child( GTK_BOX(priv->upper), toolbar, 1 );
+}
Modified: trunk/src/target/OM-2007/libraries/mokoui/moko-toolbar.c
===================================================================
--- trunk/src/target/OM-2007/libraries/mokoui/moko-toolbar.c 2006-10-02 08:31:24 UTC (rev 65)
+++ trunk/src/target/OM-2007/libraries/mokoui/moko-toolbar.c 2006-10-02 08:59:40 UTC (rev 66)
@@ -24,12 +24,12 @@
LAST_SIGNAL
};
-static void moko_tool_bar_class_init (MokoToolBarClass *klass);
-static void moko_tool_bar_init (MokoToolBar *f);
+static void moko_toolbar_class_init (MokoToolBarClass *klass);
+static void moko_toolbar_init (MokoToolBar *f);
-static guint moko_tool_bar_signals[LAST_SIGNAL] = { 0 };
+static guint moko_toolbar_signals[LAST_SIGNAL] = { 0 };
-GType moko_tool_bar_get_type (void) /* Typechecking */
+GType moko_toolbar_get_type (void) /* Typechecking */
{
static GType self_type = 0;
@@ -40,12 +40,12 @@
sizeof (MokoToolBarClass),
NULL, /* base_init */
NULL, /* base_finalize */
- (GClassInitFunc) moko_tool_bar_class_init,
+ (GClassInitFunc) moko_toolbar_class_init,
NULL, /* class_finalize */
NULL, /* class_data */
sizeof (MokoToolBar),
0,
- (GInstanceInitFunc) moko_tool_bar_init,
+ (GInstanceInitFunc) moko_toolbar_init,
};
/* add the type of your parent class here */
@@ -55,29 +55,29 @@
return self_type;
}
-static void moko_tool_bar_class_init (MokoToolBarClass *klass) /* Class Initialization */
+static void moko_toolbar_class_init (MokoToolBarClass *klass) /* Class Initialization */
{
- moko_tool_bar_signals[MOKO_TOOLBAR_SIGNAL] = g_signal_new ("moko_tool_bar",
+ moko_toolbar_signals[MOKO_TOOLBAR_SIGNAL] = g_signal_new ("moko_toolbar",
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
- G_STRUCT_OFFSET (MokoToolBarClass, moko_tool_bar),
+ G_STRUCT_OFFSET (MokoToolBarClass, moko_toolbar),
NULL,
NULL,
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
}
-static void moko_tool_bar_init (MokoToolBar *f) /* Instance Construction */
+static void moko_toolbar_init (MokoToolBar *f) /* Instance Construction */
{
/* populate your widget here */
}
-GtkWidget* moko_tool_bar_new() /* Construction */
+GtkWidget* moko_toolbar_new() /* Construction */
{
- return GTK_WIDGET(g_object_new(moko_tool_bar_get_type(), NULL));
+ return GTK_WIDGET(g_object_new(moko_toolbar_get_type(), NULL));
}
-void moko_tool_bar_clear(MokoToolBar *f) /* Destruction */
+void moko_toolbar_clear(MokoToolBar *f) /* Destruction */
{
/* destruct your widgets here */
}
Modified: trunk/src/target/OM-2007/libraries/mokoui/moko-toolbar.h
===================================================================
--- trunk/src/target/OM-2007/libraries/mokoui/moko-toolbar.h 2006-10-02 08:31:24 UTC (rev 65)
+++ trunk/src/target/OM-2007/libraries/mokoui/moko-toolbar.h 2006-10-02 08:59:40 UTC (rev 66)
@@ -25,7 +25,7 @@
G_BEGIN_DECLS
-#define MOKO_TYPE_TOOLBAR (moko_tool_bar_get_type())
+#define MOKO_TYPE_TOOLBAR (moko_toolbar_get_type())
#define MOKO_TOOLBAR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MOKO_TYPE_TOOLBAR, MokoToolBar))
#define MOKO_TOOLBAR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), MOKO_TYPE_TOOLBAR, MokoToolBarClass))
#define IS_MOKO_TOOLBAR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MOKO_TYPE_TOOLBAR))
@@ -44,12 +44,12 @@
{
/* add your parent class here */
GtkToolbarClass parent_class;
- void (*moko_tool_bar) (MokoToolBar *self);
+ void (*moko_toolbar) (MokoToolBar *self);
};
-GType moko_tool_bar_get_type (void);
-GtkWidget* moko_tool_bar_new (void);
-void moko_tool_bar_clera (MokoToolBar *self);
+GType moko_toolbar_get_type (void);
+GtkWidget* moko_toolbar_new (void);
+void moko_toolbar_clera (MokoToolBar *self);
/* add additional methods here */
More information about the commitlog
mailing list
