r591 - in trunk/src/target/OM-2007/examples/openmoko-panel-demo-simple: . src
mickey at sita.openmoko.org
mickey at sita.openmoko.org
Tue Jan 23 18:02:11 CET 2007
Author: mickey
Date: 2007-01-23 18:02:11 +0100 (Tue, 23 Jan 2007)
New Revision: 591
Modified:
trunk/src/target/OM-2007/examples/openmoko-panel-demo-simple/configure.ac
trunk/src/target/OM-2007/examples/openmoko-panel-demo-simple/src/Makefile.am
trunk/src/target/OM-2007/examples/openmoko-panel-demo-simple/src/demo-panel-applet.c
Log:
openmoko-panel-demo-simple: update for matchbox-panel-2
Modified: trunk/src/target/OM-2007/examples/openmoko-panel-demo-simple/configure.ac
===================================================================
--- trunk/src/target/OM-2007/examples/openmoko-panel-demo-simple/configure.ac 2007-01-23 17:01:41 UTC (rev 590)
+++ trunk/src/target/OM-2007/examples/openmoko-panel-demo-simple/configure.ac 2007-01-23 17:02:11 UTC (rev 591)
@@ -13,8 +13,10 @@
# 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(MATCHBOX_PANEL, matchbox-panel >= 0.1,,
+ AC_MSG_ERROR([*** Required Matchbox Panel 2 >= 0.1 not installed ***]))
LIBS="$LIBS $GTK_LIBS"
-CFLAGS="$CFLAGS $OPENMOKO_CFLAGS"
+CFLAGS="$CFLAGS $OPENMOKO_CFLAGS $MATCHBOX_PANEL_CFLAGS"
# output stuff
AC_OUTPUT([
Modified: trunk/src/target/OM-2007/examples/openmoko-panel-demo-simple/src/Makefile.am
===================================================================
--- trunk/src/target/OM-2007/examples/openmoko-panel-demo-simple/src/Makefile.am 2007-01-23 17:01:41 UTC (rev 590)
+++ trunk/src/target/OM-2007/examples/openmoko-panel-demo-simple/src/Makefile.am 2007-01-23 17:02:11 UTC (rev 591)
@@ -1,8 +1,12 @@
-INCLUDES = -DPKGDATADIR=\"$(pkgdatadir)\" @OPENMOKO_CFLAGS@ -Wall -std=c99 -pedantic
+AM_CPPFLAGS=-DPKGDATADIR=\"$(pkgdatadir)\" -DGETTEXT_PACKAGE=\"matchbox-panel\"
+AM_CFLAGS = -Wall -Werror -g -std=c99 -pedantic @MATCHBOX_PANEL_CFLAGS@ @OPENMOKO_CFLAGS@
-bin_PROGRAMS = openmoko-panel-demo-simple
+appletdir = $(libdir)/matchbox-panel/
+applet_LTLIBRARIES = libopenmoko-panel-demo-simple.la
-openmoko_panel_demo_simple_SOURCES = demo-panel-applet.c
+libopenmoko_panel_demo_simple_la_SOURCES = demo-panel-applet.c
-openmoko_panel_demo_simple_LDADD = @OPENMOKO_LIBS@
+libopenmoko_panel_demo_simple_la_LIBADD = @OPENMOKO_LIBS@
+MAINTAINERCLEANFILES = Makefile.in
+
Modified: trunk/src/target/OM-2007/examples/openmoko-panel-demo-simple/src/demo-panel-applet.c
===================================================================
--- trunk/src/target/OM-2007/examples/openmoko-panel-demo-simple/src/demo-panel-applet.c 2007-01-23 17:01:41 UTC (rev 590)
+++ trunk/src/target/OM-2007/examples/openmoko-panel-demo-simple/src/demo-panel-applet.c 2007-01-23 17:02:11 UTC (rev 591)
@@ -27,17 +27,12 @@
moko_panel_applet_close_popup( applet );
}
-int main( int argc, char** argv )
+G_MODULE_EXPORT GtkWidget* mb_panel_applet_create(const char* id, GtkOrientation orientation)
{
- g_debug( "openmoko-panel-demo-simple starting" );
+ g_debug( "openmoko-panel-demo-simple new" );
- moko_panel_system_init( &argc, &argv );
-
- // usually you should derive an object from the MokoPanelApplet
- // for this demo we go the simple way and just use it...
- // see openmoko-panel-demo-simple for a more sophisticated example
-
MokoPanelApplet* applet = moko_panel_applet_new();
+
moko_panel_applet_set_icon( applet, PKGDATADIR "/icon.png", TRUE );
// you can add a menu
@@ -46,20 +41,19 @@
GtkMenuItem* baritem = GTK_MENU_ITEM(gtk_menu_item_new_with_label( "Bar" ));
gtk_widget_show( GTK_WIDGET(fooitem) );
gtk_widget_show( GTK_WIDGET(baritem) );
- gtk_menu_shell_append( panelmenu, fooitem );
- gtk_menu_shell_append( panelmenu, baritem );
+ gtk_menu_shell_append( GTK_MENU_SHELL(panelmenu), GTK_WIDGET(fooitem) );
+ gtk_menu_shell_append( GTK_MENU_SHELL(panelmenu), GTK_WIDGET(baritem) );
gtk_widget_show_all( GTK_WIDGET(panelmenu) );
moko_panel_applet_set_popup( applet, GTK_WIDGET(panelmenu), MOKO_PANEL_APPLET_TAP_HOLD_POPUP );
// or something else
- GtkButton* button = gtk_button_new_with_label( "Hello Applet World!" );
+ GtkButton* button = GTK_BUTTON(gtk_button_new_with_label( "Hello Applet World!" ));
g_signal_connect( G_OBJECT(button), "clicked", G_CALLBACK(button_callback), applet );
moko_panel_applet_set_popup( applet, GTK_WIDGET(button), MOKO_PANEL_APPLET_CLICK_POPUP );
- moko_panel_applet_show( applet );
- gtk_main();
-
- g_debug( "openmoko-panel-demo-simple ending" );
- return 0;
+ gtk_widget_show_all( GTK_WIDGET(applet) );
+ return GTK_WIDGET(applet);
}
+
+
More information about the commitlog
mailing list