r60 - in trunk/src/target/OM-2007: . libraries/mokoui qmake

mickey at gta01.hmw-consulting.de mickey at gta01.hmw-consulting.de
Wed Sep 27 15:28:23 CEST 2006


Author: mickey
Date: 2006-09-27 13:28:22 +0000 (Wed, 27 Sep 2006)
New Revision: 60

Added:
   trunk/src/target/OM-2007/libraries/mokoui/moko-toolbar.c
   trunk/src/target/OM-2007/libraries/mokoui/moko-toolbar.h
Modified:
   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-window.h
   trunk/src/target/OM-2007/libraries/mokoui/mokoui.pro
   trunk/src/target/OM-2007/makevars.sh
   trunk/src/target/OM-2007/qmake/openmoko-include.pro
Log:
add moko-toolbar to mokoui


Modified: trunk/src/target/OM-2007/libraries/mokoui/moko-menubar.c
===================================================================
--- trunk/src/target/OM-2007/libraries/mokoui/moko-menubar.c	2006-09-27 12:40:33 UTC (rev 59)
+++ trunk/src/target/OM-2007/libraries/mokoui/moko-menubar.c	2006-09-27 13:28:22 UTC (rev 60)
@@ -20,7 +20,7 @@
 
 /* add your signals here */
 enum {
-    MYOBJECT_SIGNAL,
+    MOKO_MENUBAR_SIGNAL,
     LAST_SIGNAL
 };
 
@@ -57,7 +57,7 @@
 
 static void moko_menu_bar_class_init (MokoMenuBarClass *klass) /* Class Initialization */
 {
-    moko_menu_bar_signals[MYOBJECT_SIGNAL] = g_signal_new ("moko_menu_bar",
+    moko_menu_bar_signals[MOKO_MENUBAR_SIGNAL] = g_signal_new ("moko_menu_bar",
             G_TYPE_FROM_CLASS (klass),
             G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
             G_STRUCT_OFFSET (MokoMenuBarClass, moko_menu_bar),
@@ -82,4 +82,4 @@
     /* destruct your widgets here */
 }
 
-/* add new methods here */
\ No newline at end of file
+/* add new methods here */

Modified: trunk/src/target/OM-2007/libraries/mokoui/moko-menubar.h
===================================================================
--- trunk/src/target/OM-2007/libraries/mokoui/moko-menubar.h	2006-09-27 12:40:33 UTC (rev 59)
+++ trunk/src/target/OM-2007/libraries/mokoui/moko-menubar.h	2006-09-27 13:28:22 UTC (rev 60)
@@ -25,11 +25,11 @@
 
 G_BEGIN_DECLS
 
-#define MENUBAR_TYPE            (moko_menu_bar_get_type())
-#define MENUBAR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), MENUBAR_TYPE, MokoMenuBar))
-#define MENUBAR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), MENUBAR_TYPE, MokoMenuBarClass))
-#define IS_MENUBAR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MENUBAR_TYPE))
-#define IS_MENUBAR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), MENUBAR_TYPE))
+#define MOKO_TYPE_MENUBAR            (moko_menu_bar_get_type())
+#define MENUBAR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), MOKO_TYPE_MENUBAR, MokoMenuBar))
+#define MENUBAR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), MOKO_TYPE_MENUBAR, MokoMenuBarClass))
+#define IS_MENUBAR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MOKO_TYPE_MENUBAR))
+#define IS_MENUBAR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), MOKO_TYPE_MENUBAR))
 
 typedef struct _MokoMenuBar       MokoMenuBar;
 typedef struct _MokoMenuBarClass  MokoMenuBarClass;

Added: trunk/src/target/OM-2007/libraries/mokoui/moko-toolbar.c
===================================================================
--- trunk/src/target/OM-2007/libraries/mokoui/moko-toolbar.c	2006-09-27 12:40:33 UTC (rev 59)
+++ trunk/src/target/OM-2007/libraries/mokoui/moko-toolbar.c	2006-09-27 13:28:22 UTC (rev 60)
@@ -0,0 +1,85 @@
+/*
+ *  libmokoui -- OpenMoko Application Framework UI Library
+ *
+ *  Authored By Michael 'Mickey' Lauer <mlauer at vanille-media.de>
+ *
+ *  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 Lesser 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 Lesser Public License for more details.
+ *
+ *  Current Version: $Rev$ ($Date$) [$Author$]
+ */
+#include "moko-toolbar.h"
+
+/* add your signals here */
+enum {
+    MOKO_TOOLBAR_SIGNAL,
+    LAST_SIGNAL
+};
+
+static void moko_tool_bar_class_init          (MokoToolBarClass *klass);
+static void moko_tool_bar_init                (MokoToolBar      *f);
+
+static guint moko_tool_bar_signals[LAST_SIGNAL] = { 0 };
+
+GType moko_tool_bar_get_type (void) /* Typechecking */
+{
+    static GType self_type = 0;
+
+    if (!self_type)
+    {
+        static const GTypeInfo f_info =
+        {
+            sizeof (MokoToolBarClass),
+            NULL, /* base_init */
+            NULL, /* base_finalize */
+            (GClassInitFunc) moko_tool_bar_class_init,
+            NULL, /* class_finalize */
+            NULL, /* class_data */
+            sizeof (MokoToolBar),
+            0,
+            (GInstanceInitFunc) moko_tool_bar_init,
+        };
+
+        /* add the type of your parent class here */
+        self_type = g_type_register_static(GTK_TYPE_TOOLBAR, "MokoToolBar", &f_info, 0);
+    }
+
+    return self_type;
+}
+
+static void moko_tool_bar_class_init (MokoToolBarClass *klass) /* Class Initialization */
+{
+    moko_tool_bar_signals[MOKO_TOOLBAR_SIGNAL] = g_signal_new ("moko_tool_bar",
+            G_TYPE_FROM_CLASS (klass),
+            G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
+            G_STRUCT_OFFSET (MokoToolBarClass, moko_tool_bar),
+            NULL,
+            NULL,
+            g_cclosure_marshal_VOID__VOID,
+            G_TYPE_NONE, 0);
+}
+
+static void moko_tool_bar_init (MokoToolBar *f) /* Instance Construction */
+{
+    /* populate your widget here */
+}
+
+GtkWidget* moko_tool_bar_new() /* Construction */
+{
+    return GTK_WIDGET(g_object_new(moko_tool_bar_get_type(), NULL));
+}
+
+void moko_tool_bar_clear(MokoToolBar *f) /* Destruction */
+{
+    /* destruct your widgets here */
+}
+
+/* add new methods here */


Property changes on: trunk/src/target/OM-2007/libraries/mokoui/moko-toolbar.c
___________________________________________________________________
Name: svn:eol-style
   + native

Added: trunk/src/target/OM-2007/libraries/mokoui/moko-toolbar.h
===================================================================
--- trunk/src/target/OM-2007/libraries/mokoui/moko-toolbar.h	2006-09-27 12:40:33 UTC (rev 59)
+++ trunk/src/target/OM-2007/libraries/mokoui/moko-toolbar.h	2006-09-27 13:28:22 UTC (rev 60)
@@ -0,0 +1,58 @@
+/*
+ *  libmokoui -- OpenMoko Application Framework UI Library
+ *
+ *  Authored By Michael 'Mickey' Lauer <mlauer at vanille-media.de>
+ *
+ *  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 Lesser 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 Lesser Public License for more details.
+ *
+ *  Current Version: $Rev$ ($Date$) [$Author$]
+ */
+#ifndef _MOKO_TOOLBAR_H_
+#define _MOKO_TOOLBAR_H_
+
+#include <glib.h>
+#include <glib-object.h>
+#include <gtk/gtktoolbar.h>
+
+G_BEGIN_DECLS
+
+#define MOKO_TYPE_TOOLBAR            (moko_tool_bar_get_type())
+#define TOOLBAR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), MOKO_TYPE_TOOLBAR, MokoToolBar))
+#define TOOLBAR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), MOKO_TYPE_TOOLBAR, MokoToolBarClass))
+#define IS_TOOLBAR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MOKO_TYPE_TOOLBAR))
+#define IS_TOOLBAR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), MOKO_TYPE_TOOLBAR))
+
+typedef struct _MokoToolBar       MokoToolBar;
+typedef struct _MokoToolBarClass  MokoToolBarClass;
+
+struct _MokoToolBar
+{
+    GtkToolbar parent;
+    /* add pointers to new members here */
+};
+
+struct _MokoToolBarClass
+{
+    /* add your parent class here */
+    GtkToolbarClass parent_class;
+    void (*moko_tool_bar) (MokoToolBar *self);
+};
+
+GType          moko_tool_bar_get_type    (void);
+GtkWidget*     moko_tool_bar_new         (void);
+void           moko_tool_bar_clera       (MokoToolBar *self);
+
+/* add additional methods here */
+
+G_END_DECLS
+
+#endif /* _MOKO_TOOLBAR_H_ */


Property changes on: trunk/src/target/OM-2007/libraries/mokoui/moko-toolbar.h
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: trunk/src/target/OM-2007/libraries/mokoui/moko-window.h
===================================================================
--- trunk/src/target/OM-2007/libraries/mokoui/moko-window.h	2006-09-27 12:40:33 UTC (rev 59)
+++ trunk/src/target/OM-2007/libraries/mokoui/moko-window.h	2006-09-27 13:28:22 UTC (rev 60)
@@ -25,11 +25,11 @@
 
 G_BEGIN_DECLS
 
-#define MOKO_WINDOW_TYPE            (moko_window_get_type())
-#define MOKO_WINDOW(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), MOKO_WINDOW_TYPE, MokoWindow))
-#define MOKO_WINDOW_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), MOKO_WINDOW_TYPE, MokoWindowClass))
-#define IS_MOKO_WINDOW(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MOKO_WINDOW_TYPE))
-#define IS_MOKO_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), MOKO_WINDOW_TYPE))
+#define MOKO_TYPE_WINDOW            (moko_window_get_type())
+#define MOKO_WINDOW(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), MOKO_TYPE_WINDOW, MokoWindow))
+#define MOKO_WINDOW_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), MOKO_TYPE_WINDOW, MokoWindowClass))
+#define IS_MOKO_WINDOW(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MOKO_TYPE_WINDOW))
+#define IS_MOKO_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), MOKO_TYPE_WINDOW))
 
 typedef struct _MokoWindow       MokoWindow;
 typedef struct _MokoWindowClass  MokoWindowClass;

Modified: trunk/src/target/OM-2007/libraries/mokoui/mokoui.pro
===================================================================
--- trunk/src/target/OM-2007/libraries/mokoui/mokoui.pro	2006-09-27 12:40:33 UTC (rev 59)
+++ trunk/src/target/OM-2007/libraries/mokoui/mokoui.pro	2006-09-27 13:28:22 UTC (rev 60)
@@ -1,8 +1,8 @@
 TEMPLATE = lib
 VERSION = 0.0.1
 
-HEADERS = moko-application.h moko-window.h moko-menubar.h
-SOURCES = moko-application.c moko-window.c moko-menubar.c
+HEADERS = moko-application.h moko-window.h moko-menubar.h moko-toolbar.h
+SOURCES = moko-application.c moko-window.c moko-menubar.c moko-toolbar.c
 
 PKGCONFIG += gtk+-2.0
 

Modified: trunk/src/target/OM-2007/makevars.sh
===================================================================
--- trunk/src/target/OM-2007/makevars.sh	2006-09-27 12:40:33 UTC (rev 59)
+++ trunk/src/target/OM-2007/makevars.sh	2006-09-27 13:28:22 UTC (rev 60)
@@ -1,5 +1,9 @@
 export OPENMOKODIR=$PWD
 
 find . -name "Makefile"|xargs rm -f
-rm -rf lib/*
+rm -rf ./lib/*
+rm -rf ./bin/*
 /usr/lib/qt4/bin/qmake
+
+export LD_LIBRARY_PATH=$OPENMOKODIR/lib
+

Modified: trunk/src/target/OM-2007/qmake/openmoko-include.pro
===================================================================
--- trunk/src/target/OM-2007/qmake/openmoko-include.pro	2006-09-27 12:40:33 UTC (rev 59)
+++ trunk/src/target/OM-2007/qmake/openmoko-include.pro	2006-09-27 13:28:22 UTC (rev 60)
@@ -3,9 +3,11 @@
 QMAKE_CFLAGS += -std=c99 -pedantic
 INCLUDEPATH += $(OPENMOKODIR)
 
-MOC_DIR=.moc/$(PLATFORM)
-OBJECTS_DIR=.obj/$(PLATFORM)
+PLATFORM = $$system(uname -m)
 
+MOC_DIR=.moc/$$PLATFORM
+OBJECTS_DIR=.obj/$$PLATFORM
+
 QMAKE_DBUS_CC  = dbus-binding-tool
 dbus-binding-tool.commands = $${QMAKE_DBUS_CC} --mode=glib-server ${QMAKE_FILE_IN} >${QMAKE_FILE_OUT}
 dbus-binding-tool.output = $$OUT_PWD/${QMAKE_FILE_BASE}.h
@@ -16,24 +18,24 @@
 QMAKE_EXTRA_UNIX_COMPILERS += dbus-binding-tool
 
 mokocore {
-	INCLUDEPATH += ${OPENMOKODIR}/libraries
-	LIBS += -lmokocore -L${OPENMOKODIR}/lib
+	INCLUDEPATH += $(OPENMOKODIR)/libraries
+	LIBS += -lmokocore -L$(OPENMOKODIR)/lib
 }
 
 mokoui {
-	INCLUDEPATH += ${OPENMOKODIR}/libraries
+	INCLUDEPATH += $(OPENMOKODIR)/libraries
 	PKGCONFIG += gtk+-2.0
-	LIBS += -lmokoui -L${OPENMOKODIR}/lib
+	LIBS += -lmokoui -L$(OPENMOKODIR)/lib
 }
 
 mokopim {
-	INCLUDEPATH += ${OPENMOKODIR}/libraries
-	LIBS += -lmokopim -L${OPENMOKODIR}/lib
+	INCLUDEPATH += $(OPENMOKODIR)/libraries
+	LIBS += -lmokopim -L$(OPENMOKODIR)/lib
 }
 
 mokonet {
-	INCLUDEPATH += ${OPENMOKODIR}/libraries
-	LIBS += -lmokonet -L${OPENMOKODIR}/lib
+	INCLUDEPATH += $(OPENMOKODIR)/libraries
+	LIBS += -lmokonet -L$(OPENMOKODIR)/lib
 }
 
 # handle pkg-config files (from qt4)
@@ -45,11 +47,11 @@
 
 contains( TEMPLATE, app ) {
 	message( configuring application $$TARGET )
-	DESTDIR = ${OPENMOKODIR}/bin
+	DESTDIR = $(OPENMOKODIR)/bin
 }
 
 contains( TEMPLATE, lib ) {
 	message( configuring library $$TARGET )
-	DESTDIR = ${OPENMOKODIR}/lib
+	DESTDIR = $(OPENMOKODIR)/lib
 }
 





More information about the commitlog mailing list