r112 - trunk/src/target/OM-2007/libraries/mokoui

mickey at gta01.hmw-consulting.de mickey at gta01.hmw-consulting.de
Mon Oct 23 16:40:29 CEST 2006


Author: mickey
Date: 2006-10-23 14:40:29 +0000 (Mon, 23 Oct 2006)
New Revision: 112

Modified:
   trunk/src/target/OM-2007/libraries/mokoui/moko-menubox.c
   trunk/src/target/OM-2007/libraries/mokoui/moko-menubox.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:
mokoui: consistency


Modified: trunk/src/target/OM-2007/libraries/mokoui/moko-menubox.c
===================================================================
--- trunk/src/target/OM-2007/libraries/mokoui/moko-menubox.c	2006-10-23 13:02:19 UTC (rev 111)
+++ trunk/src/target/OM-2007/libraries/mokoui/moko-menubox.c	2006-10-23 14:40:29 UTC (rev 112)
@@ -22,7 +22,7 @@
 #include <gtk/gtkmenubar.h>
 #include <gtk/gtkmenuitem.h>
 
-#define MOKO_MENU_BOX_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), MOKO_TYPE_MENUBOX, MokoMenuBoxPriv));
+#define MOKO_MENU_BOX_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), MOKO_TYPE_MENU_BOX, MokoMenuBoxPriv));
 
 typedef struct _MokoMenuBoxPriv
 {
@@ -32,16 +32,16 @@
 
 /* add your signals here */
 enum {
-    MOKO_MENUBOX_SIGNAL,
+    MOKO_MENU_BOX_SIGNAL,
     LAST_SIGNAL
 };
 
-static void moko_menubox_class_init          (MokoMenuBoxClass *klass);
-static void moko_menubox_init                (MokoMenuBox      *f);
+static void moko_menu_box_class_init          (MokoMenuBoxClass *klass);
+static void moko_menu_box_init                (MokoMenuBox      *f);
 
-static guint moko_menubox_signals[LAST_SIGNAL] = { 0 };
+static guint moko_menu_box_signals[LAST_SIGNAL] = { 0 };
 
-GType moko_menubox_get_type (void) /* Typechecking */
+GType moko_menu_box_get_type (void) /* Typechecking */
 {
     static GType self_type = 0;
 
@@ -52,12 +52,12 @@
             sizeof (MokoMenuBoxClass),
             NULL, /* base_init */
             NULL, /* base_finalize */
-            (GClassInitFunc) moko_menubox_class_init,
+            (GClassInitFunc) moko_menu_box_class_init,
             NULL, /* class_finalize */
             NULL, /* class_data */
             sizeof (MokoMenuBox),
             0,
-            (GInstanceInitFunc) moko_menubox_init,
+            (GInstanceInitFunc) moko_menu_box_init,
         };
 
         /* add the type of your parent class here */
@@ -67,21 +67,21 @@
     return self_type;
 }
 
-static void moko_menubox_class_init (MokoMenuBoxClass *klass) /* Class Initialization */
+static void moko_menu_box_class_init (MokoMenuBoxClass *klass) /* Class Initialization */
 {
     g_type_class_add_private(klass, sizeof(MokoMenuBoxPriv));
 
-    moko_menubox_signals[MOKO_MENUBOX_SIGNAL] = g_signal_new ("moko_menubox",
+    moko_menu_box_signals[MOKO_MENU_BOX_SIGNAL] = g_signal_new ("moko_menu_box",
             G_TYPE_FROM_CLASS (klass),
             G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
-            G_STRUCT_OFFSET (MokoMenuBoxClass, moko_menubox),
+            G_STRUCT_OFFSET (MokoMenuBoxClass, moko_menu_box),
             NULL,
             NULL,
             g_cclosure_marshal_VOID__VOID,
             G_TYPE_NONE, 0);
 }
 
-static void moko_menubox_init (MokoMenuBox *self) /* Instance Construction */
+static void moko_menu_box_init (MokoMenuBox *self) /* Instance Construction */
 {
     g_debug( "moko_paned_window_init" );
     MokoMenuBoxPriv* priv = MOKO_MENU_BOX_GET_PRIVATE(self);
@@ -91,19 +91,19 @@
 
 }
 
-GtkWidget* moko_menubox_new() /* Construction */
+GtkWidget* moko_menu_box_new() /* Construction */
 {
-    return GTK_WIDGET(g_object_new(moko_menubox_get_type(), NULL));
+    return GTK_WIDGET(g_object_new(moko_menu_box_get_type(), NULL));
 }
 
-void moko_menubox_clear(MokoMenuBox *f) /* Destruction */
+void moko_menu_box_clear(MokoMenuBox *f) /* Destruction */
 {
     /* destruct your widgets here */
 }
 
-void moko_menubox_set_application_menu(MokoMenuBox* self, GtkMenu* menu)
+void moko_menu_box_set_application_menu(MokoMenuBox* self, GtkMenu* menu)
 {
-    g_debug( "moko_menubox_set_application_menu" );
+    g_debug( "moko_menu_box_set_application_menu" );
 
     MokoMenuBoxPriv* priv = MOKO_MENU_BOX_GET_PRIVATE(self);
     if (!priv->menubar_l )
@@ -117,7 +117,7 @@
     gtk_menu_shell_append( GTK_MENU_BAR(priv->menubar_l), appitem );
 }
 
-void moko_menubox_set_filter_menu(MokoMenuBox* self, GtkMenu* menu)
+void moko_menu_box_set_filter_menu(MokoMenuBox* self, GtkMenu* menu)
 {
     void filter_menu_update( GtkMenu* menu, GtkMenuItem* filtitem )
     {
@@ -138,7 +138,7 @@
             g_debug(" selection done. menu label updated." );
         }
     }
-    g_debug( "moko_menubox_set_filter_menu" );
+    g_debug( "moko_menu_box_set_filter_menu" );
 
     MokoMenuBoxPriv* priv = MOKO_MENU_BOX_GET_PRIVATE(self);
     if (!priv->menubar_r )

Modified: trunk/src/target/OM-2007/libraries/mokoui/moko-menubox.h
===================================================================
--- trunk/src/target/OM-2007/libraries/mokoui/moko-menubox.h	2006-10-23 13:02:19 UTC (rev 111)
+++ trunk/src/target/OM-2007/libraries/mokoui/moko-menubox.h	2006-10-23 14:40:29 UTC (rev 112)
@@ -16,8 +16,8 @@
  *
  *  Current Version: $Rev$ ($Date$) [$Author$]
  */
-#ifndef _MOKO_MENUBOX_H_
-#define _MOKO_MENUBOX_H_
+#ifndef _MOKO_MENU_BOX_H_
+#define _MOKO_MENU_BOX_H_
 
 #include <glib.h>
 #include <glib-object.h>
@@ -26,11 +26,11 @@
 
 G_BEGIN_DECLS
 
-#define MOKO_TYPE_MENUBOX            (moko_menubox_get_type())
-#define MOKO_MENUBOX(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), MOKO_TYPE_MENUBOX, MokoMenuBox))
-#define MOKO_MENUBOX_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), MOKO_TYPE_MENUBOX, MokoMenuBoxClass))
-#define IS_MOKO_MENUBOX(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MOKO_TYPE_MENUBOX))
-#define IS_MOKO_MENUBOX_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), MOKO_TYPE_MENUBOX))
+#define MOKO_TYPE_MENU_BOX            (moko_menu_box_get_type())
+#define MOKO_MENU_BOX(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), MOKO_TYPE_MENU_BOX, MokoMenuBox))
+#define MOKO_MENU_BOX_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), MOKO_TYPE_MENU_BOX, MokoMenuBoxClass))
+#define IS_MOKO_MENU_BOX(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MOKO_TYPE_MENU_BOX))
+#define IS_MOKO_MENU_BOX_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), MOKO_TYPE_MENU_BOX))
 
 typedef struct _MokoMenuBox       MokoMenuBox;
 typedef struct _MokoMenuBoxClass  MokoMenuBoxClass;
@@ -45,16 +45,16 @@
 {
     /* add your parent class here */
     GtkHBoxClass parent_class;
-    void (*moko_menubox) (MokoMenuBox *self);
+    void (*moko_menu_box) (MokoMenuBox *self);
 };
 
-GType          moko_menubox_get_type    (void);
-GtkWidget*     moko_menubox_new         (void);
-void           moko_menubox_clear       (MokoMenuBox *self);
+GType          moko_menu_box_get_type    (void);
+GtkWidget*     moko_menu_box_new         (void);
+void           moko_menu_box_clear       (MokoMenuBox *self);
 
-void           moko_menubox_set_application_menu(MokoMenuBox* self, GtkMenu* menu);
-void           moko_menubox_set_filter_menu(MokoMenuBox* self, GtkMenu* menu);
+void           moko_menu_box_set_application_menu(MokoMenuBox* self, GtkMenu* menu);
+void           moko_menu_box_set_filter_menu(MokoMenuBox* self, GtkMenu* menu);
 
 G_END_DECLS
 
-#endif /* _MOKO_MENUBOX_H_ */
+#endif /* _MOKO_MENU_BOX_H_ */

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-23 13:02:19 UTC (rev 111)
+++ trunk/src/target/OM-2007/libraries/mokoui/moko-paned-window.c	2006-10-23 14:40:29 UTC (rev 112)
@@ -31,7 +31,7 @@
     GtkVBox* upper;
     GtkVBox* lower;
     MokoMenuBox* menubox;
-    MokoToolBar* toolbar;
+    MokoToolBox* toolbar;
 
 } MokoPanedWindowPriv;
 
@@ -118,10 +118,10 @@
     MokoPanedWindowPriv* priv = MOKO_PANED_WINDOW_GET_PRIVATE(self);
     if (!priv->menubox )
     {
-        priv->menubox = moko_menubox_new();
+        priv->menubox = moko_menu_box_new();
         gtk_box_pack_start( GTK_BOX(priv->upper), GTK_WIDGET(priv->menubox), FALSE, FALSE, 0 );
     }
-    moko_menubox_set_application_menu( priv->menubox, menu );
+    moko_menu_box_set_application_menu( priv->menubox, menu );
 }
 
 void moko_paned_window_set_filter_menu(MokoPanedWindow* self, GtkMenu* menu)
@@ -131,10 +131,10 @@
     MokoPanedWindowPriv* priv = MOKO_PANED_WINDOW_GET_PRIVATE(self);
     if (!priv->menubox )
     {
-        priv->menubox = moko_menubox_new();
+        priv->menubox = moko_menu_box_new();
         gtk_box_pack_start( GTK_BOX(priv->upper), GTK_WIDGET(priv->menubox), FALSE, FALSE, 0 );
     }
-    moko_menubox_set_filter_menu( priv->menubox, menu );
+    moko_menu_box_set_filter_menu( priv->menubox, menu );
 }
 
 void moko_paned_window_set_upper_pane(MokoPanedWindow* self, GtkWidget* child)

Modified: trunk/src/target/OM-2007/libraries/mokoui/moko-toolbar.c
===================================================================
--- trunk/src/target/OM-2007/libraries/mokoui/moko-toolbar.c	2006-10-23 13:02:19 UTC (rev 111)
+++ trunk/src/target/OM-2007/libraries/mokoui/moko-toolbar.c	2006-10-23 14:40:29 UTC (rev 112)
@@ -20,16 +20,16 @@
 
 /* add your signals here */
 enum {
-    MOKO_TOOLBAR_SIGNAL,
+    MOKO_TOOL_BOX_SIGNAL,
     LAST_SIGNAL
 };
 
-static void moko_toolbar_class_init          (MokoToolBarClass *klass);
-static void moko_toolbar_init                (MokoToolBar      *f);
+static void moko_tool_box_class_init          (MokoToolBoxClass *klass);
+static void moko_tool_box_init                (MokoToolBox      *f);
 
-static guint moko_toolbar_signals[LAST_SIGNAL] = { 0 };
+static guint moko_tool_box_signals[LAST_SIGNAL] = { 0 };
 
-GType moko_toolbar_get_type (void) /* Typechecking */
+GType moko_tool_box_get_type (void) /* Typechecking */
 {
     static GType self_type = 0;
 
@@ -37,47 +37,47 @@
     {
         static const GTypeInfo f_info =
         {
-            sizeof (MokoToolBarClass),
+            sizeof (MokoToolBoxClass),
             NULL, /* base_init */
             NULL, /* base_finalize */
-            (GClassInitFunc) moko_toolbar_class_init,
+            (GClassInitFunc) moko_tool_box_class_init,
             NULL, /* class_finalize */
             NULL, /* class_data */
-            sizeof (MokoToolBar),
+            sizeof (MokoToolBox),
             0,
-            (GInstanceInitFunc) moko_toolbar_init,
+            (GInstanceInitFunc) moko_tool_box_init,
         };
 
         /* add the type of your parent class here */
-        self_type = g_type_register_static(GTK_TYPE_TOOLBAR, "MokoToolBar", &f_info, 0);
+        self_type = g_type_register_static(GTK_TYPE_TOOLBAR, "MokoToolBox", &f_info, 0);
     }
 
     return self_type;
 }
 
-static void moko_toolbar_class_init (MokoToolBarClass *klass) /* Class Initialization */
+static void moko_tool_box_class_init (MokoToolBoxClass *klass) /* Class Initialization */
 {
-    moko_toolbar_signals[MOKO_TOOLBAR_SIGNAL] = g_signal_new ("moko_toolbar",
+    moko_tool_box_signals[MOKO_TOOL_BOX_SIGNAL] = g_signal_new ("moko_tool_box",
             G_TYPE_FROM_CLASS (klass),
             G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
-            G_STRUCT_OFFSET (MokoToolBarClass, moko_toolbar),
+            G_STRUCT_OFFSET (MokoToolBoxClass, moko_tool_box),
             NULL,
             NULL,
             g_cclosure_marshal_VOID__VOID,
             G_TYPE_NONE, 0);
 }
 
-static void moko_toolbar_init (MokoToolBar *f) /* Instance Construction */
+static void moko_tool_box_init (MokoToolBox *f) /* Instance Construction */
 {
     /* populate your widget here */
 }
 
-GtkWidget* moko_toolbar_new() /* Construction */
+GtkWidget* moko_tool_box_new() /* Construction */
 {
-    return GTK_WIDGET(g_object_new(moko_toolbar_get_type(), NULL));
+    return GTK_WIDGET(g_object_new(moko_tool_box_get_type(), NULL));
 }
 
-void moko_toolbar_clear(MokoToolBar *f) /* Destruction */
+void moko_tool_box_clear(MokoToolBox *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-23 13:02:19 UTC (rev 111)
+++ trunk/src/target/OM-2007/libraries/mokoui/moko-toolbar.h	2006-10-23 14:40:29 UTC (rev 112)
@@ -16,8 +16,8 @@
  *
  *  Current Version: $Rev$ ($Date$) [$Author$]
  */
-#ifndef _MOKO_TOOLBAR_H_
-#define _MOKO_TOOLBAR_H_
+#ifndef _MOKO_TOOL_BOX_H_
+#define _MOKO_TOOL_BOX_H_
 
 #include <glib.h>
 #include <glib-object.h>
@@ -25,34 +25,34 @@
 
 G_BEGIN_DECLS
 
-#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))
-#define IS_MOKO_TOOLBAR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), MOKO_TYPE_TOOLBAR))
+#define MOKO_TYPE_TOOLBAR            (moko_tool_box_get_type())
+#define MOKO_TOOL_BOX(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), MOKO_TYPE_TOOLBAR, MokoToolBox))
+#define MOKO_TOOL_BOX_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), MOKO_TYPE_TOOLBAR, MokoToolBoxClass))
+#define IS_MOKO_TOOL_BOX(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MOKO_TYPE_TOOLBAR))
+#define IS_MOKO_TOOL_BOX_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), MOKO_TYPE_TOOLBAR))
 
-typedef struct _MokoToolBar       MokoToolBar;
-typedef struct _MokoToolBarClass  MokoToolBarClass;
+typedef struct _MokoToolBox       MokoToolBox;
+typedef struct _MokoToolBoxClass  MokoToolBoxClass;
 
-struct _MokoToolBar
+struct _MokoToolBox
 {
     GtkToolbar parent;
     /* add pointers to new members here */
 };
 
-struct _MokoToolBarClass
+struct _MokoToolBoxClass
 {
     /* add your parent class here */
     GtkToolbarClass parent_class;
-    void (*moko_toolbar) (MokoToolBar *self);
+    void (*moko_tool_box) (MokoToolBox *self);
 };
 
-GType          moko_toolbar_get_type    (void);
-GtkWidget*     moko_toolbar_new         (void);
-void           moko_toolbar_clera       (MokoToolBar *self);
+GType          moko_tool_box_get_type    (void);
+GtkWidget*     moko_tool_box_new         (void);
+void           moko_tool_box_clear       (MokoToolBox *self);
 
 /* add additional methods here */
 
 G_END_DECLS
 
-#endif /* _MOKO_TOOLBAR_H_ */
+#endif /* _MOKO_TOOL_BOX_H_ */





More information about the commitlog mailing list