r71 - in trunk/src/target/OM-2007: . examples/openmoko-paned-demo libraries/mokoui panel-plugins qmake

[mickey at gta01.hmw-consulting.de]

Author: mickey
Date: 2006-10-13 10:15:54 +0000 (Fri, 13 Oct 2006)
New Revision: 71

Modified:
   trunk/src/target/OM-2007/README
   trunk/src/target/OM-2007/examples/openmoko-paned-demo/openmoko-paned-demo.pro
   trunk/src/target/OM-2007/libraries/mokoui/moko-finger-window.c
   trunk/src/target/OM-2007/libraries/mokoui/moko-finger-window.h
   trunk/src/target/OM-2007/makevars.sh
   trunk/src/target/OM-2007/panel-plugins/panel-plugins.pro
   trunk/src/target/OM-2007/qmake/openmoko-include.pro
Log:
various OpenMoko updates. MokoFingerWindow will probably not stay
in this form, but rather use a non-rectangular shaped window to
display the finger scroller


Modified: trunk/src/target/OM-2007/README
===================================================================
--- trunk/src/target/OM-2007/README	2006-10-09 21:00:45 UTC (rev 70)
+++ trunk/src/target/OM-2007/README	2006-10-13 10:15:54 UTC (rev 71)
@@ -1,2 +1,11 @@
 This is the SVN repository for the OpenMoko Phone Platform 2007
+----------------------------------------------------------------
+Dependencies:
+* Gtk+ >= 2.6.10
+* dbus >= 0.92
+* dbus-glib >= 0.72
 
+
+Steps to build everything in one run using qmake (from Qt4):
+1.) . makevars.sh
+2.) make

Modified: trunk/src/target/OM-2007/examples/openmoko-paned-demo/openmoko-paned-demo.pro
===================================================================
--- trunk/src/target/OM-2007/examples/openmoko-paned-demo/openmoko-paned-demo.pro	2006-10-09 21:00:45 UTC (rev 70)
+++ trunk/src/target/OM-2007/examples/openmoko-paned-demo/openmoko-paned-demo.pro	2006-10-13 10:15:54 UTC (rev 71)
@@ -3,4 +3,4 @@
 HEADERS = demo-main.h
 SOURCES = demo-main.c
 
-include ( ../../qmake/openmoko-include.pro )
+include ( $(OPENMOKODIR)/qmake/openmoko-include.pro )

Modified: trunk/src/target/OM-2007/libraries/mokoui/moko-finger-window.c
===================================================================
--- trunk/src/target/OM-2007/libraries/mokoui/moko-finger-window.c	2006-10-09 21:00:45 UTC (rev 70)
+++ trunk/src/target/OM-2007/libraries/mokoui/moko-finger-window.c	2006-10-13 10:15:54 UTC (rev 71)
@@ -1,5 +1,4 @@
-
-/*  moko_finger_window.c
+/*  moko-finger-window.c
  *
  *  Authored By Michael 'Mickey' Lauer <mlauer at vanille-media.de>
  *
@@ -18,6 +17,10 @@
  */
 
 #include "moko-finger-window.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);
 
@@ -27,6 +30,10 @@
 
 struct _MokoFingerWindowPrivate
 {
+    GtkVBox* vbox;
+    GtkHBox* hbox;
+    GtkLabel* label;
+    GtkButton* scroller;
 };
 
 static void
@@ -56,6 +63,17 @@
 static void
 moko_finger_window_init (MokoFingerWindow *self)
 {
+    g_debug( "moko_finger_window_init" );
+
+    MokoFingerWindowPrivate* priv = 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 );
+    gtk_container_add( GTK_CONTAINER(self), GTK_WIDGET(priv->vbox) );
 }
 
 MokoFingerWindow*
@@ -63,3 +81,12 @@
 {
   return g_object_new (MOKO_TYPE_FINGER_WINDOW, NULL);
 }
+
+static void
+moko_finger_window_set_contents (MokoFingerWindow* self, GtkWidget* child )
+{
+    g_debug( "moko_finger_window_init" );
+    MokoFingerWindowPrivate* priv = FINGER_WINDOW_PRIVATE(self);
+
+    gtk_box_pack_start( GTK_BOX(priv->vbox), GTK_WIDGET(child), TRUE, TRUE, 0 );
+}

Modified: trunk/src/target/OM-2007/libraries/mokoui/moko-finger-window.h
===================================================================
--- trunk/src/target/OM-2007/libraries/mokoui/moko-finger-window.h	2006-10-09 21:00:45 UTC (rev 70)
+++ trunk/src/target/OM-2007/libraries/mokoui/moko-finger-window.h	2006-10-13 10:15:54 UTC (rev 71)
@@ -1,4 +1,4 @@
-/*  moko_finger_window.h
+/*  moko-finger-window.h
  *
  *  Authored By Michael 'Mickey' Lauer <mlauer at vanille-media.de>
  *

Modified: trunk/src/target/OM-2007/makevars.sh
===================================================================
--- trunk/src/target/OM-2007/makevars.sh	2006-10-09 21:00:45 UTC (rev 70)
+++ trunk/src/target/OM-2007/makevars.sh	2006-10-13 10:15:54 UTC (rev 71)
@@ -1,9 +1,10 @@
 export OPENMOKODIR=$PWD
 
 find . -name "Makefile"|xargs rm -f
-rm -rf ./lib/*
-rm -rf ./bin/*
+rm -rf ./lib/lib*
+rm -rf ./bin/*-*
 /usr/lib/qt4/bin/qmake
+make clean
 
 export LD_LIBRARY_PATH=$OPENMOKODIR/lib
 

Modified: trunk/src/target/OM-2007/panel-plugins/panel-plugins.pro
===================================================================
--- trunk/src/target/OM-2007/panel-plugins/panel-plugins.pro	2006-10-09 21:00:45 UTC (rev 70)
+++ trunk/src/target/OM-2007/panel-plugins/panel-plugins.pro	2006-10-13 10:15:54 UTC (rev 71)
@@ -1,3 +1,4 @@
 TEMPLATE = subdirs
-SUBDIRS = 
+SUBDIRS = openmoko-panel-search
 
+

Modified: trunk/src/target/OM-2007/qmake/openmoko-include.pro
===================================================================
--- trunk/src/target/OM-2007/qmake/openmoko-include.pro	2006-10-09 21:00:45 UTC (rev 70)
+++ trunk/src/target/OM-2007/qmake/openmoko-include.pro	2006-10-13 10:15:54 UTC (rev 71)
@@ -55,3 +55,5 @@
 	DESTDIR = $(OPENMOKODIR)/lib
 }
 
+DEFINES += G_LOG_DOMAIN=\"$$TARGET\"
+