r661 - in trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu: . src

mickey at sita.openmoko.org mickey at sita.openmoko.org
Sat Feb 3 20:59:18 CET 2007


Author: mickey
Date: 2007-02-03 20:59:17 +0100 (Sat, 03 Feb 2007)
New Revision: 661

Removed:
   trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/main.c
Modified:
   trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/AUTHORS
   trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/README
   trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/configure.ac
   trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/openmoko-panel-mainmenu.pro
   trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/Makefile.am
Log:
openmoko-panel-mainmenu: convert to matchbox-panel-2


Modified: trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/AUTHORS
===================================================================
--- trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/AUTHORS	2007-02-03 13:08:53 UTC (rev 660)
+++ trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/AUTHORS	2007-02-03 19:59:17 UTC (rev 661)
@@ -1 +1 @@
-Sun Zhiyong <sunzhiyong at fic-sh.com.cn>
+Michael 'Mickey' Lauer <mlauer at vanille-media.de>

Modified: trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/README
===================================================================
--- trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/README	2007-02-03 13:08:53 UTC (rev 660)
+++ trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/README	2007-02-03 19:59:17 UTC (rev 661)
@@ -1,6 +1,8 @@
 OpenMoko Panel Plugin: openmoko-panel-mainmenu
-Only run figure based openmoko-mainmenu now.
-actions:
-1.tab (click): run openmoko-mainmenu stylus based application.
-2.tab with hold: run opemoko-mainmenu figure based application.
 
+Specification:
+	On Tap: Toggle OpenMoko mainmenu visibility
+	On Hold: Show Root Window
+
+Todo:
+	Integrate main menu instead of just exec'ing / kill'ing

Modified: trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/configure.ac
===================================================================
--- trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/configure.ac	2007-02-03 13:08:53 UTC (rev 660)
+++ trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/configure.ac	2007-02-03 19:59:17 UTC (rev 661)
@@ -1,7 +1,7 @@
 AC_PREREQ(2.53)
 AC_INIT(openmoko-panel-mainmenu, %(1.0.0), http://www.openmoko.org/)
 AM_INIT_AUTOMAKE()
-AC_CONFIG_SRCDIR(src/main.c)
+AC_CONFIG_SRCDIR(src/openmoko-panel-mainmenu.c)
 AM_CONFIG_HEADER(config.h)
 AM_MAINTAINER_MODE
 
@@ -11,15 +11,12 @@
 AC_PROG_LIBTOOL
 
 # base deps
-PKG_CHECK_MODULES(OPENMOKO, openmoko-libs >= 0.0.1,,
-                 AC_MSG_ERROR([*** Required OpenMoko Libraries >= 0.0.1 not installed ***]))
+PKG_CHECK_MODULES(OPENMOKO, openmoko-libs >= 0.0.2,,
+                 AC_MSG_ERROR([*** Required OpenMoko Libraries >= 0.0.2 not installed ***]))
 
-PKG_CHECK_MODULES(LIBMB, libmb,,
-                 exit)
+LIBS="$LIBS $OPENMOKO_LIBS"
+CFLAGS="$CFLAGS $OPENMOKO_CFLAGS"
 
-LIBS="$LIBS $GTK_LIBS $LIBMB_LIBS"
-CFLAGS="$CFLAGS $OPENMOKO_CFLAGS $LIBMB_CFALGS" 
-
 # output stuff
 AC_OUTPUT([
 Makefile

Modified: trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/openmoko-panel-mainmenu.pro
===================================================================
--- trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/openmoko-panel-mainmenu.pro	2007-02-03 13:08:53 UTC (rev 660)
+++ trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/openmoko-panel-mainmenu.pro	2007-02-03 19:59:17 UTC (rev 661)
@@ -2,7 +2,7 @@
 MOKOCONFIG = mokoui
 
 SOURCES = \
-  src/main.c
+  src/openmoko-panel-mainmenu.c
 
 include ( $(OPENMOKODIR)/devel/qmake/openmoko-include.pro )
 

Modified: trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/Makefile.am
===================================================================
--- trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/Makefile.am	2007-02-03 13:08:53 UTC (rev 660)
+++ trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/Makefile.am	2007-02-03 19:59:17 UTC (rev 661)
@@ -1,10 +1,11 @@
-AM_CPPFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\"
-AM_CFLAGS = @OPENMOKO_CFLAGS@ -Wall -std=c99 -pedantic
+AM_CPPFLAGS=-DPKGDATADIR=\"$(pkgdatadir)\" -DGETTEXT_PACKAGE=\"matchbox-panel\"
+AM_CFLAGS = -Wall -std=c99 -pedantic @OPENMOKO_CFLAGS@
 
-bin_PROGRAMS = openmoko-panel-mainmenu
+appletdir = $(libdir)/matchbox-panel/
+applet_LTLIBRARIES = libopenmoko-panel-mainmenu.la
 
-openmoko_panel_mainmenu_SOURCES = \
-  main.c
+libopenmoko_panel_mainmenu_la_SOURCES = openmoko-panel-mainmenu.c
+libopenmoko_panel_mainmenu_la_LIBADD = @OPENMOKO_LIBS@
 
-openmoko_panel_mainmenu_LDADD = @OPENMOKO_LIBS@
+MAINTAINERCLEANFILES = Makefile.in
 

Deleted: trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/main.c
===================================================================
--- trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/main.c	2007-02-03 13:08:53 UTC (rev 660)
+++ trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/main.c	2007-02-03 19:59:17 UTC (rev 661)
@@ -1,44 +0,0 @@
-/*
- *  OpenMoko Main Menu + Panel Applet
- *
- *  Copyright (C) 2007 First International Computer Inc.
- *
- *  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 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$]
- */
-
-#include <libmokoui/moko-panel-applet.h>
-
-#include <gtk/gtk.h>
-#include <glib.h>
-
-static void button_callback( GtkButton* button, MokoPanelApplet* applet )
-{
-    moko_panel_applet_close_popup( applet );
-}
-
-int main( int argc, char** argv )
-{
-    g_debug( "openmoko-panel-demo-simple starting" );
-
-    moko_panel_system_init( &argc, &argv );
-
-    MokoPanelApplet* applet = moko_panel_applet_new();
-    moko_panel_applet_set_icon( applet, PKGDATADIR "/btn_menu.png", TRUE );
-    //moko_panel_applet_request_size( applet, 79, 32 );
-    moko_panel_applet_request_size( applet, 40, 32 );
-    moko_panel_applet_show( applet );
-
-    gtk_main();
-
-    g_debug( "openmoko-panel-demo-simple ending" );
-    return 0;
-}





More information about the commitlog mailing list