r100 - in trunk/src/target/OM-2007: . applications/openmoko-taskmanager devel devel/qmake devel/scripts examples/openmoko-finger-demo examples/openmoko-paned-demo libraries/mokocore libraries/mokonet libraries/mokopim libraries/mokoui
mickey at gta01.hmw-consulting.de
mickey at gta01.hmw-consulting.de
Sun Oct 22 18:30:51 CEST 2006
Author: mickey
Date: 2006-10-22 16:30:50 +0000 (Sun, 22 Oct 2006)
New Revision: 100
Added:
trunk/src/target/OM-2007/devel/
trunk/src/target/OM-2007/devel/qmake/
trunk/src/target/OM-2007/devel/qmake/openmoko-include.pro
trunk/src/target/OM-2007/devel/scripts/
trunk/src/target/OM-2007/devel/scripts/launch-xoo
Removed:
trunk/src/target/OM-2007/devel/qmake/openmoko-include.pro
trunk/src/target/OM-2007/qmake/
Modified:
trunk/src/target/OM-2007/applications/openmoko-taskmanager/openmoko-taskmanager.pro
trunk/src/target/OM-2007/examples/openmoko-finger-demo/openmoko-finger-demo.pro
trunk/src/target/OM-2007/examples/openmoko-paned-demo/openmoko-paned-demo.pro
trunk/src/target/OM-2007/libraries/mokocore/mokocore.pro
trunk/src/target/OM-2007/libraries/mokonet/mokonet.pro
trunk/src/target/OM-2007/libraries/mokopim/mokopim.pro
trunk/src/target/OM-2007/libraries/mokoui/moko-menubox.c
trunk/src/target/OM-2007/libraries/mokoui/mokoui.pro
Log:
move qmake into devel subdir
Modified: trunk/src/target/OM-2007/applications/openmoko-taskmanager/openmoko-taskmanager.pro
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-taskmanager/openmoko-taskmanager.pro 2006-10-22 16:29:33 UTC (rev 99)
+++ trunk/src/target/OM-2007/applications/openmoko-taskmanager/openmoko-taskmanager.pro 2006-10-22 16:30:50 UTC (rev 100)
@@ -7,4 +7,4 @@
DEFINES += DBUS_API_SUBJECT_TO_CHANGE
-include ( ../../qmake/openmoko-include.pro )
+include ( $(OPENMOKODIR)/devel/qmake/openmoko-include.pro )
Copied: trunk/src/target/OM-2007/devel/qmake (from rev 92, trunk/src/target/OM-2007/qmake)
Deleted: trunk/src/target/OM-2007/devel/qmake/openmoko-include.pro
===================================================================
--- trunk/src/target/OM-2007/qmake/openmoko-include.pro 2006-10-19 11:34:32 UTC (rev 92)
+++ trunk/src/target/OM-2007/devel/qmake/openmoko-include.pro 2006-10-22 16:30:50 UTC (rev 100)
@@ -1,59 +0,0 @@
-CONFIG = debug warn_on link_pkgconfig console $$MOKOCONFIG
-
-QMAKE_CFLAGS += -std=c99 -pedantic
-INCLUDEPATH += $(OPENMOKODIR)
-
-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
-dbus-binding-tool.input = SERVICES
-dbus-binding-tool.CONFIG = no_link
-dbus-binding-tool.variable_out = HEADERS
-dbus-binding-tool = SERVICES
-QMAKE_EXTRA_UNIX_COMPILERS += dbus-binding-tool
-
-mokocore {
- INCLUDEPATH += $(OPENMOKODIR)/libraries
- LIBS += -lmokocore -L$(OPENMOKODIR)/lib
-}
-
-mokoui {
- INCLUDEPATH += $(OPENMOKODIR)/libraries
- PKGCONFIG += gtk+-2.0
- LIBS += -lmokoui -L$(OPENMOKODIR)/lib
-}
-
-mokopim {
- INCLUDEPATH += $(OPENMOKODIR)/libraries
- LIBS += -lmokopim -L$(OPENMOKODIR)/lib
-}
-
-mokonet {
- INCLUDEPATH += $(OPENMOKODIR)/libraries
- LIBS += -lmokonet -L$(OPENMOKODIR)/lib
-}
-
-# handle pkg-config files (from qt4)
-for(PKGCONFIG_LIB, $$list($$unique(PKGCONFIG))) {
- QMAKE_CXXFLAGS += $$system(pkg-config --cflags $$PKGCONFIG_LIB)
- QMAKE_CFLAGS += $$system(pkg-config --cflags $$PKGCONFIG_LIB)
- LIBS += $$system(pkg-config --libs $$PKGCONFIG_LIB)
-}
-
-contains( TEMPLATE, app ) {
- message( configuring application $$TARGET )
- DESTDIR = $(OPENMOKODIR)/bin
-}
-
-contains( TEMPLATE, lib ) {
- message( configuring library $$TARGET )
- DESTDIR = $(OPENMOKODIR)/lib
-}
-
-DEFINES += G_LOG_DOMAIN=\"$$TARGET\"
-
Copied: trunk/src/target/OM-2007/devel/qmake/openmoko-include.pro (from rev 99, trunk/src/target/OM-2007/qmake/openmoko-include.pro)
Added: trunk/src/target/OM-2007/devel/scripts/launch-xoo
===================================================================
--- trunk/src/target/OM-2007/devel/scripts/launch-xoo 2006-10-22 16:29:33 UTC (rev 99)
+++ trunk/src/target/OM-2007/devel/scripts/launch-xoo 2006-10-22 16:30:50 UTC (rev 100)
@@ -0,0 +1,54 @@
+#!/bin/bash
+#
+# Dependencies:
+# - Xephyr (xorg)
+# - xoo (ohand svn)
+# - matchbox-panel (ohand svn)
+# - matchbox-window-manager (ohand svn)
+#
+SVN_TRUNK=/local/pkg/openmoko/trunk
+PKG=$SVN_TRUNK/oe/packages
+
+xoo -xd :1 -xn `which Xephyr` -t 'OpenMoko running on FIC GTA01' -d $PKG/xoo/files/gta01.xml &
+
+sleep 2
+
+export DISPLAY=:1
+
+matchbox-panel -display $DISPLAY \
+ --id 1 \
+ --orientation north \
+ --default-apps '' \
+ --no-session \
+ --no-menu \
+ --no-flip \
+ --bgpixmap $PKG/openmoko/openmoko-common/pixmaps/openmoko-header-background.png &
+
+sleep 1
+
+matchbox-panel -display $DISPLAY \
+ --id 2 \
+ --orientation south \
+ --default-apps '' \
+ --no-session \
+ --no-menu \
+ --no-flip \
+ --bgpixmap $PKG/openmoko/openmoko-common/pixmaps/openmoko-footer-background.png &
+
+sleep 1
+
+matchbox-desktop -display $DISPLAY \
+ --icon-size 96 \
+ --icon-padding 128 \
+ --font sans-24:bold \
+ --titlefont sans-24:bold &
+
+sleep 1
+
+matchbox-window-manager -display $DISPLAY \
+ -use_titlebar yes \
+ -use_super_modal yes \
+ -use_lowlight yes \
+ -use_dialog_mode static \
+ -use_desktop_mode plain \
+ -use_cursor no &
Property changes on: trunk/src/target/OM-2007/devel/scripts/launch-xoo
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/src/target/OM-2007/examples/openmoko-finger-demo/openmoko-finger-demo.pro
===================================================================
--- trunk/src/target/OM-2007/examples/openmoko-finger-demo/openmoko-finger-demo.pro 2006-10-22 16:29:33 UTC (rev 99)
+++ trunk/src/target/OM-2007/examples/openmoko-finger-demo/openmoko-finger-demo.pro 2006-10-22 16:30:50 UTC (rev 100)
@@ -3,4 +3,4 @@
HEADERS = demo-main.h
SOURCES = demo-main.c
-include ( $(OPENMOKODIR)/qmake/openmoko-include.pro )
+include ( $(OPENMOKODIR)/devel/qmake/openmoko-include.pro )
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-22 16:29:33 UTC (rev 99)
+++ trunk/src/target/OM-2007/examples/openmoko-paned-demo/openmoko-paned-demo.pro 2006-10-22 16:30:50 UTC (rev 100)
@@ -3,4 +3,4 @@
HEADERS = demo-main.h
SOURCES = demo-main.c
-include ( $(OPENMOKODIR)/qmake/openmoko-include.pro )
+include ( $(OPENMOKODIR)/devel/qmake/openmoko-include.pro )
Modified: trunk/src/target/OM-2007/libraries/mokocore/mokocore.pro
===================================================================
--- trunk/src/target/OM-2007/libraries/mokocore/mokocore.pro 2006-10-22 16:29:33 UTC (rev 99)
+++ trunk/src/target/OM-2007/libraries/mokocore/mokocore.pro 2006-10-22 16:30:50 UTC (rev 100)
@@ -6,4 +6,4 @@
PKGCONFIG += dbus-glib-1
-include ( $(OPENMOKODIR)/qmake/openmoko-include.pro )
+include ( $(OPENMOKODIR)/devel/qmake/openmoko-include.pro )
Modified: trunk/src/target/OM-2007/libraries/mokonet/mokonet.pro
===================================================================
--- trunk/src/target/OM-2007/libraries/mokonet/mokonet.pro 2006-10-22 16:29:33 UTC (rev 99)
+++ trunk/src/target/OM-2007/libraries/mokonet/mokonet.pro 2006-10-22 16:30:50 UTC (rev 100)
@@ -4,4 +4,4 @@
HEADERS =
SOURCES =
-include ( $(OPENMOKODIR)/qmake/openmoko-include.pro )
+include ( $(OPENMOKODIR)/devel/qmake/openmoko-include.pro )
Modified: trunk/src/target/OM-2007/libraries/mokopim/mokopim.pro
===================================================================
--- trunk/src/target/OM-2007/libraries/mokopim/mokopim.pro 2006-10-22 16:29:33 UTC (rev 99)
+++ trunk/src/target/OM-2007/libraries/mokopim/mokopim.pro 2006-10-22 16:30:50 UTC (rev 100)
@@ -4,4 +4,4 @@
HEADERS =
SOURCES =
-include ( $(OPENMOKODIR)/qmake/openmoko-include.pro )
+include ( $(OPENMOKODIR)/devel/qmake/openmoko-include.pro )
Modified: trunk/src/target/OM-2007/libraries/mokoui/moko-menubox.c
===================================================================
--- trunk/src/target/OM-2007/libraries/mokoui/moko-menubox.c 2006-10-22 16:29:33 UTC (rev 99)
+++ trunk/src/target/OM-2007/libraries/mokoui/moko-menubox.c 2006-10-22 16:30:50 UTC (rev 100)
@@ -138,6 +138,9 @@
g_slist_foreach( entries, &_populate_filter_menu, priv->combobox );
g_slist_free( entries );
+ g_object_set( GTK_OBJECT(priv->combobox), "can-focus", 0, NULL );
gtk_combo_box_set_active( priv->combobox, 0 );
+ gtk_combo_box_set_focus_on_click( priv->combobox, FALSE );
+ gtk_widget_set_state( priv->combobox, GTK_STATE_NORMAL );
}
Modified: trunk/src/target/OM-2007/libraries/mokoui/mokoui.pro
===================================================================
--- trunk/src/target/OM-2007/libraries/mokoui/mokoui.pro 2006-10-22 16:29:33 UTC (rev 99)
+++ trunk/src/target/OM-2007/libraries/mokoui/mokoui.pro 2006-10-22 16:30:50 UTC (rev 100)
@@ -1,9 +1,9 @@
TEMPLATE = lib
VERSION = 0.0.1
-HEADERS = moko-application.h moko-window.h moko-finger-window.h moko-paned-window.h moko-menubox.h moko-toolbar.h
-SOURCES = moko-application.c moko-window.c moko-finger-window.c moko-paned-window.c moko-menubox.c moko-toolbar.c
+HEADERS = moko-application.h moko-window.h moko-finger-window.h moko-paned-window.h moko-menubox.h moko-toolbar.h moko-combobox.h
+SOURCES = moko-application.c moko-window.c moko-finger-window.c moko-paned-window.c moko-menubox.c moko-toolbar.c moko-combobox.c
PKGCONFIG += gtk+-2.0
-include ( $(OPENMOKODIR)/qmake/openmoko-include.pro )
+include ( $(OPENMOKODIR)/devel/qmake/openmoko-include.pro )
More information about the commitlog
mailing list
