r322 - in trunk/src/target/OM-2007: artwork/themes/openmoko-standard/gtk-2.0 examples/openmoko-paned-demo/src openmoko-libs/libmokoui
mickey at gta01.hmw-consulting.de
mickey at gta01.hmw-consulting.de
Thu Dec 7 01:20:14 CET 2006
Author: mickey
Date: 2006-12-07 00:20:12 +0000 (Thu, 07 Dec 2006)
New Revision: 322
Added:
trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/mokodetailswindow
trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/openmoko-scroll-fullscreen-btn-off-pressed.png
trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/openmoko-scroll-fullscreen-btn-off.png
trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/openmoko-scroll-fullscreen-btn-on-pressed.png
trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/openmoko-scroll-fullscreen-btn-on.png
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-details-window.c
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-details-window.h
Modified:
trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/gtkrc
trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/gtkscrollbar
trunk/src/target/OM-2007/examples/openmoko-paned-demo/src/demo-main.c
trunk/src/target/OM-2007/openmoko-libs/libmokoui/Makefile.am
trunk/src/target/OM-2007/openmoko-libs/libmokoui/libmokoui.pro
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-paned-window.c
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-paned-window.h
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-tool-box.c
Log:
mokoui major breakthrough:
* add MokoDetailsWindow, a GtkScrolledWindow with our special scrollbar + fullscreen button
* make toggling fullscreen mode work
Modified: trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/gtkrc
===================================================================
--- trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/gtkrc 2006-12-06 13:13:05 UTC (rev 321)
+++ trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/gtkrc 2006-12-07 00:20:12 UTC (rev 322)
@@ -100,6 +100,7 @@
include "gtktreeview"
include "gtkbutton"
+include "mokodetailswindow"
include "mokofingerbutton"
include "mokofingertoolbox"
include "mokofingerwheel"
Modified: trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/gtkscrollbar
===================================================================
--- trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/gtkscrollbar 2006-12-06 13:13:05 UTC (rev 321)
+++ trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/gtkscrollbar 2006-12-07 00:20:12 UTC (rev 322)
@@ -2,8 +2,8 @@
#
# properties
#
- GtkScrollbar::slider_width = 32
- GtkScrollbar::stepper_size = 24
+ GtkScrollbar::slider_width = 37
+ GtkScrollbar::stepper_size = 26
GtkScrollbar::stepper_spacing = 0
GtkScrollbar::has_backward_stepper = 0
Added: trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/mokodetailswindow
===================================================================
--- trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/mokodetailswindow 2006-12-06 13:13:05 UTC (rev 321)
+++ trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/mokodetailswindow 2006-12-07 00:20:12 UTC (rev 322)
@@ -0,0 +1,65 @@
+style "mokodetailswindow-fullscreen-button" {
+ engine "pixmap" {
+ image {
+ function = BOX
+ recolorable = TRUE
+ state = NORMAL
+ file = "openmoko-scroll-fullscreen-btn-off.png"
+ border = { 0, 0, 0, 0 }
+ stretch = TRUE
+ }
+ image {
+ function = BOX
+ recolorable = TRUE
+ state = PRELIGHT
+ file = "openmoko-scroll-fullscreen-btn-off.png"
+ border = { 0, 0, 0, 0 }
+ stretch = TRUE
+ }
+ image {
+ function = BOX
+ recolorable = TRUE
+ state = ACTIVE
+ file = "openmoko-scroll-fullscreen-btn-off-pressed.png"
+ border = { 0, 0, 0, 0 }
+ stretch = TRUE
+ }
+ }
+ MokoPixmapButton::size-request = { 0, 37, 0, 26 }
+ GtkButton::focus-line-width = 0
+}
+widget "*.mokodetailswindow-fullscreen-button" style "mokodetailswindow-fullscreen-button"
+
+style "mokodetailswindow-fullscreen-button-on" {
+ engine "pixmap" {
+ image {
+ function = BOX
+ recolorable = TRUE
+ state = NORMAL
+ shadow = OUT
+ file = "openmoko-scroll-fullscreen-btn-on.png"
+ border = { 0, 0, 0, 0 }
+ stretch = TRUE
+ }
+ image {
+ function = BOX
+ recolorable = TRUE
+ state = PRELIGHT
+ file = "openmoko-scroll-fullscreen-btn-on.png"
+ border = { 0, 0, 0, 0 }
+ stretch = TRUE
+ }
+ image {
+ function = BOX
+ recolorable = TRUE
+ state = ACTIVE
+ file = "openmoko-scroll-fullscreen-btn-on-pressed.png"
+ border = { 0, 0, 0, 0 }
+ stretch = TRUE
+ }
+ }
+ MokoPixmapButton::size-request = { 0, 37, 0, 26 }
+ GtkButton::focus-line-width = 0
+}
+widget "*.mokodetailswindow-fullscreen-button-on" style "mokodetailswindow-fullscreen-button-on"
+
Added: trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/openmoko-scroll-fullscreen-btn-off-pressed.png
===================================================================
(Binary files differ)
Property changes on: trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/openmoko-scroll-fullscreen-btn-off-pressed.png
___________________________________________________________________
Name: svn:mime-type
+ image/png
Added: trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/openmoko-scroll-fullscreen-btn-off.png
===================================================================
(Binary files differ)
Property changes on: trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/openmoko-scroll-fullscreen-btn-off.png
___________________________________________________________________
Name: svn:mime-type
+ image/png
Added: trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/openmoko-scroll-fullscreen-btn-on-pressed.png
===================================================================
(Binary files differ)
Property changes on: trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/openmoko-scroll-fullscreen-btn-on-pressed.png
___________________________________________________________________
Name: svn:mime-type
+ image/png
Added: trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/openmoko-scroll-fullscreen-btn-on.png
===================================================================
(Binary files differ)
Property changes on: trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/openmoko-scroll-fullscreen-btn-on.png
___________________________________________________________________
Name: svn:mime-type
+ image/png
Modified: trunk/src/target/OM-2007/examples/openmoko-paned-demo/src/demo-main.c
===================================================================
--- trunk/src/target/OM-2007/examples/openmoko-paned-demo/src/demo-main.c 2006-12-06 13:13:05 UTC (rev 321)
+++ trunk/src/target/OM-2007/examples/openmoko-paned-demo/src/demo-main.c 2006-12-07 00:20:12 UTC (rev 322)
@@ -18,16 +18,19 @@
*/
#include <libmokoui/moko-application.h>
+#include <libmokoui/moko-details-window.h>
#include <libmokoui/moko-paned-window.h>
#include <libmokoui/moko-tool-box.h>
#include <libmokoui/moko-navigation-list.h>
#include <gtk/gtkactiongroup.h>
#include <gtk/gtkbutton.h>
+#include <gtk/gtktogglebutton.h>
#include <gtk/gtklabel.h>
#include <gtk/gtkcheckmenuitem.h>
#include <gtk/gtkmain.h>
#include <gtk/gtkmenu.h>
+#include <gtk/gtktable.h>
#include <gtk/gtktreeview.h>
@@ -59,7 +62,7 @@
{ "jeff", "02133333333" } };
/* create list store */
-
+
store = gtk_list_store_new (2,
G_TYPE_STRING,
G_TYPE_STRING);
@@ -93,7 +96,7 @@
gtk_tree_view_column_set_sort_column_id(column, 0);
gtk_tree_view_append_column(clist, column);
gtk_tree_view_column_set_min_width(column, 142);
-
+
renderer = gtk_cell_renderer_text_new();
column = gtk_tree_view_column_new_with_attributes("Cell Phone",
@@ -206,21 +209,21 @@
/* navigation area */
//GtkLabel* navigation = gtk_label_new( "Add your widget for navigating\nthrough appplication specific\ndata here" );
-
+
MokoTreeView *moko_treeview;
GtkTreeModel *model = create_model ();
MokoNavigationList *moko_navigation_list;
-
- moko_navigation_list = moko_navigation_list_new ();
+
+ moko_navigation_list = moko_navigation_list_new();
moko_treeview = moko_navigation_list_get_tree_view (moko_navigation_list);
gtk_tree_view_set_model (moko_treeview, GTK_TREE_MODEL (model) );
clist_insert(moko_treeview);
-
+
//moko_paned_window_set_upper_pane( window, GTK_WIDGET(navigation) );
moko_paned_window_set_upper_pane( window, GTK_WIDGET(moko_navigation_list) );
-
-
+
+
GtkButton* button1;
GtkButton* button2;
GtkButton* button3;
@@ -266,9 +269,15 @@
gtk_widget_show_all( actionmenu );
/* details area */
- GtkLabel* details = gtk_label_new( "Add your widget for showing\ndetails for the selected\ndata entry here" );
- moko_paned_window_set_lower_pane( window, GTK_WIDGET(details) );
+ GtkLabel* details = gtk_label_new( "\n \n \nAdd your widget for showing\n \ndetails for the selected\n"
+ "\ndata entry here\n \n \n \n \n \n \n \nThis particular label\n \nis very long\n"
+ "\nto make the fullscreen\n \ntrigger more interesting\n \n \n" );
+ MokoDetailsWindow* detailswindow = moko_details_window_new();
+ gtk_scrolled_window_add_with_viewport( GTK_SCROLLED_WINDOW(detailswindow), GTK_WIDGET(details) );
+
+ moko_paned_window_set_lower_pane( window, GTK_WIDGET(moko_details_window_put_in_box(detailswindow) ) );
+
/* show everything and run main loop */
gtk_widget_show_all( GTK_WIDGET(window) );
g_debug( "openmoko-paned-demo entering main loop" );
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/Makefile.am
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/Makefile.am 2006-12-06 13:13:05 UTC (rev 321)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/Makefile.am 2006-12-07 00:20:12 UTC (rev 322)
@@ -1,6 +1,7 @@
source_h = \
moko-alignment.h \
moko-application.h \
+ moko-details-window.h \
moko-finger-tool-box.h \
moko-finger-wheel.h \
moko-finger-window.h \
@@ -17,6 +18,7 @@
source_c = \
moko-alignment.c \
moko-application.c \
+ moko-details-window.c \
moko-finger-tool-box.c \
moko-finger-wheel.c \
moko-finger-window.c \
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/libmokoui.pro
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/libmokoui.pro 2006-12-06 13:13:05 UTC (rev 321)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/libmokoui.pro 2006-12-07 00:20:12 UTC (rev 322)
@@ -5,6 +5,7 @@
HEADERS = \
moko-alignment.h \
moko-application.h \
+ moko-details-window.h \
moko-finger-tool-box.h \
moko-finger-wheel.h \
moko-finger-window.h \
@@ -21,6 +22,7 @@
SOURCES = \
moko-alignment.c \
moko-application.c \
+ moko-details-window.c \
moko-finger-tool-box.c \
moko-finger-wheel.c \
moko-finger-window.c \
Added: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-details-window.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-details-window.c 2006-12-06 13:13:05 UTC (rev 321)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-details-window.c 2006-12-07 00:20:12 UTC (rev 322)
@@ -0,0 +1,131 @@
+/* moko-details-window.c
+ *
+ * Authored By Michael 'Mickey' Lauer <mlauer at vanille-media.de>
+ *
+ * Copyright (C) 2006 Vanille-Media
+ *
+ * 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: mickey $]
+ */
+
+#include "moko-details-window.h"
+
+#include "moko-application.h"
+#include "moko-paned-window.h"
+#include "moko-pixmap-button.h"
+
+#include <gtk/gtkbutton.h>
+#include <gtk/gtkhbox.h>
+#include <gtk/gtkvbox.h>
+
+#undef DEBUG_THIS_FILE
+#ifdef DEBUG_THIS_FILE
+#define moko_debug(fmt,...) g_debug(fmt,##__VA_ARGS__)
+#else
+#define moko_debug(fmt,...)
+#endif
+
+G_DEFINE_TYPE (MokoDetailsWindow, moko_details_window, GTK_TYPE_SCROLLED_WINDOW)
+
+#define DETAILS_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), MOKO_TYPE_DETAILS_WINDOW, MokoDetailsWindowPrivate))
+
+typedef struct _MokoDetailsWindowPrivate
+{
+} MokoDetailsWindowPrivate;
+
+/* parent class pointer */
+GtkScrolledWindowClass* parent_class = NULL;
+
+/* forward declarations */
+static void _cb_fullscreen_clicked(GtkButton* button, MokoDetailsWindow* self);
+
+static void
+moko_details_window_dispose (GObject *object)
+{
+ if (G_OBJECT_CLASS (moko_details_window_parent_class)->dispose)
+ G_OBJECT_CLASS (moko_details_window_parent_class)->dispose (object);
+}
+
+static void
+moko_details_window_finalize (GObject *object)
+{
+ G_OBJECT_CLASS (moko_details_window_parent_class)->finalize (object);
+}
+
+static void
+moko_details_window_class_init (MokoDetailsWindowClass *klass)
+{
+ /* hook parent */
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
+ parent_class = g_type_class_peek_parent(klass);
+
+ /* register private data */
+ g_type_class_add_private (klass, sizeof (MokoDetailsWindowPrivate));
+
+ /* hook virtual methods */
+ /* ... */
+
+ /* install properties */
+ /* ... */
+
+ object_class->dispose = moko_details_window_dispose;
+ object_class->finalize = moko_details_window_finalize;
+}
+
+static void
+moko_details_window_init (MokoDetailsWindow *self)
+{
+ moko_debug( "moko_details_window_init" );
+ gtk_scrolled_window_set_policy( self, GTK_POLICY_NEVER, GTK_POLICY_NEVER );
+}
+
+MokoDetailsWindow*
+moko_details_window_new (void)
+{
+ return g_object_new(MOKO_TYPE_DETAILS_WINDOW, NULL );
+}
+
+GtkBox* moko_details_window_put_in_box(MokoDetailsWindow* self)
+{
+ moko_debug( "moko_details_window_put_in_box" );
+ //FIXME perfect place to add portrait/landscape switch
+ GtkHBox* hbox = gtk_hbox_new( FALSE, 0 );
+ GtkVBox* vbox = gtk_vbox_new( FALSE, 0 );
+ gtk_box_pack_start( GTK_BOX(hbox), GTK_WIDGET(self), TRUE, TRUE, 0 );
+ MokoPixmapButton* fullscreen = moko_pixmap_button_new();
+ gtk_widget_set_name( GTK_WIDGET(fullscreen), "mokodetailswindow-fullscreen-button-on" );
+ gtk_box_pack_start( GTK_BOX(vbox), GTK_WIDGET(fullscreen), FALSE, FALSE, 0 );
+ GtkVScrollbar* bar = gtk_vscrollbar_new( gtk_scrolled_window_get_vadjustment( GTK_SCROLLED_WINDOW(self) ) );
+ gtk_box_pack_start( GTK_BOX(vbox), GTK_WIDGET(bar), TRUE, TRUE, 0 );
+ gtk_box_pack_start( GTK_BOX(hbox), GTK_WIDGET(vbox), FALSE, FALSE, 0 );
+ g_signal_connect( G_OBJECT(fullscreen), "clicked", G_CALLBACK(_cb_fullscreen_clicked), self );
+ return hbox;
+}
+
+static void _cb_fullscreen_clicked(GtkButton* button, MokoDetailsWindow* self)
+{
+ g_debug( "openmoko-paned-demo: fullscreen clicked" );
+ static gboolean on = TRUE;
+ if ( on )
+ {
+ gtk_widget_set_name( GTK_WIDGET(button), "mokodetailswindow-fullscreen-button" );
+ gtk_widget_queue_draw( GTK_WIDGET(button) ); //FIXME necessary?
+ }
+ else
+ {
+ gtk_widget_set_name( GTK_WIDGET(button), "mokodetailswindow-fullscreen-button-on" );
+ gtk_widget_queue_draw( GTK_WIDGET(button) ); //FIXME necessary?
+ }
+ MokoPanedWindow* mainwindow = moko_application_get_main_window( moko_application_get_instance() );
+ g_return_if_fail( MOKO_IS_PANED_WINDOW(mainwindow) );
+ moko_paned_window_set_fullscreen( mainwindow, on );
+ on = !on;
+}
Property changes on: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-details-window.c
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-details-window.h
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-details-window.h 2006-12-06 13:13:05 UTC (rev 321)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-details-window.h 2006-12-07 00:20:12 UTC (rev 322)
@@ -0,0 +1,52 @@
+/* moko-details-window.h
+ *
+ * Authored By Michael 'Mickey' Lauer <mlauer at vanille-media.de>
+ *
+ * Copyright (C) 2006 Vanille-Media
+ *
+ * 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: mickey $]
+ */
+
+#ifndef _MOKO_DETAILS_WINDOW_H_
+#define _MOKO_DETAILS_WINDOW_H_
+
+#include <gtk/gtkbox.h>
+#include <gtk/gtkscrolledwindow.h>
+
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+#define MOKO_TYPE_DETAILS_WINDOW moko_details_window_get_type()
+#define MOKO_DETAILS_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MOKO_TYPE_DETAILS_WINDOW, MokoDetailsWindow))
+#define MOKO_DETAILS_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), MOKO_TYPE_DETAILS_WINDOW, MokoDetailsWindowClass))
+#define MOKO_IS_DETAILS_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MOKO_TYPE_DETAILS_WINDOW))
+#define MOKO_IS_DETAILS_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), MOKO_TYPE_DETAILS_WINDOW))
+#define MOKO_DETAILS_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), MOKO_TYPE_DETAILS_WINDOW, MokoDetailsWindowClass))
+
+typedef struct {
+ GtkScrolledWindow parent;
+} MokoDetailsWindow;
+
+typedef struct {
+ GtkScrolledWindowClass parent_class;
+} MokoDetailsWindowClass;
+
+GType moko_details_window_get_type();
+MokoDetailsWindow* moko_details_window_new();
+
+GtkBox* moko_details_window_put_in_box(MokoDetailsWindow* self);
+
+G_END_DECLS
+
+#endif // _MOKO_DETAILS_WINDOW_H_
+
Property changes on: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-details-window.h
___________________________________________________________________
Name: svn:eol-style
+ native
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-12-06 13:13:05 UTC (rev 321)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-paned-window.c 2006-12-07 00:20:12 UTC (rev 322)
@@ -166,3 +166,17 @@
gtk_box_pack_end( GTK_BOX(priv->upper), toolbox, FALSE, FALSE, 0 );
gtk_box_reorder_child( GTK_BOX(priv->upper), toolbox, 1 );
}
+
+void moko_paned_window_set_fullscreen(MokoPanedWindow* self, gboolean b)
+{
+ moko_debug( "moko_paned_window_set_fullscreen" );
+ MokoPanedWindowPriv* priv = MOKO_PANED_WINDOW_GET_PRIVATE(self);
+ if ( b )
+ {
+ gtk_widget_hide( GTK_WIDGET(priv->upper) );
+ }
+ else
+ {
+ gtk_widget_show( GTK_WIDGET(priv->upper) );
+ }
+}
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-paned-window.h
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-paned-window.h 2006-12-06 13:13:05 UTC (rev 321)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-paned-window.h 2006-12-07 00:20:12 UTC (rev 322)
@@ -68,6 +68,9 @@
void moko_paned_window_set_upper_pane(MokoPanedWindow* self, GtkWidget* child);
void moko_paned_window_set_lower_pane(MokoPanedWindow* self, GtkWidget* child);
+/* fullscreen */
+void moko_paned_window_set_fullscreen(MokoPanedWindow* self, gboolean b);
+
G_END_DECLS
#endif /* _MOKO_PANED_WINDOW_H_ */
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-tool-box.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-tool-box.c 2006-12-06 13:13:05 UTC (rev 321)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-tool-box.c 2006-12-07 00:20:12 UTC (rev 322)
@@ -29,6 +29,8 @@
#define moko_debug(fmt,...)
#endif
+G_DEFINE_TYPE (MokoToolBox, moko_tool_box, GTK_TYPE_NOTEBOOK)
+
#define MOKO_TOOL_BOX_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), MOKO_TYPE_TOOL_BOX, MokoToolBoxPriv));
typedef struct _MokoToolBoxPriv
@@ -66,8 +68,7 @@
}
-
-gboolean _entry_focus_in(GtkWidget *widget, GdkEventFocus *event, MokoToolBox* self)
+static gboolean _entry_focus_in(GtkWidget *widget, GdkEventFocus *event, MokoToolBox* self)
{
MokoToolBoxPriv* priv = MOKO_TOOL_BOX_GET_PRIVATE(self);
gtk_widget_set_name( widget, "mokotoolbox-search-entry" );
@@ -75,7 +76,7 @@
return FALSE;
}
-gboolean _entry_focus_out(GtkWidget *widget, GdkEventFocus *event, MokoToolBox* self)
+static gboolean _entry_focus_out(GtkWidget *widget, GdkEventFocus *event, MokoToolBox* self)
{
MokoToolBoxPriv* priv = MOKO_TOOL_BOX_GET_PRIVATE(self);
gtk_widget_set_name( widget, "mokotoolbox-search-entry-focusout" );
@@ -83,33 +84,6 @@
return FALSE;
}
-
-GType moko_tool_box_get_type (void) /* Typechecking */
-{
- static GType self_type = 0;
-
- if (!self_type)
- {
- static const GTypeInfo self_info =
- {
- sizeof (MokoToolBoxClass),
- NULL, /* base_init */
- NULL, /* base_finalize */
- (GClassInitFunc) moko_tool_box_class_init,
- NULL, /* class_finalize */
- NULL, /* class_data */
- sizeof (MokoToolBox),
- 0,
- (GInstanceInitFunc) moko_tool_box_init,
- };
-
- /* add the type of your parent class here */
- self_type = g_type_register_static(GTK_TYPE_NOTEBOOK, "MokoToolBox", &self_info, 0);
- }
-
- return self_type;
-}
-
static void moko_tool_box_class_init (MokoToolBoxClass *klass) /* Class Initialization */
{
g_type_class_add_private(klass, sizeof(MokoToolBoxPriv));
More information about the commitlog
mailing list
