r557 - in trunk/src/target/OM-2007/examples/openmoko-panel-demo-simple: . src

mickey at gta01.hmw-consulting.de mickey at gta01.hmw-consulting.de
Mon Jan 15 19:45:53 CET 2007


Author: mickey
Date: 2007-01-15 19:45:51 +0100 (Mon, 15 Jan 2007)
New Revision: 557

Added:
   trunk/src/target/OM-2007/examples/openmoko-panel-demo-simple/src/demo-panel-applet.c
Removed:
   trunk/src/target/OM-2007/examples/openmoko-panel-demo-simple/src/panel.c
Modified:
   trunk/src/target/OM-2007/examples/openmoko-panel-demo-simple/openmoko-panel-demo-simple.pro
   trunk/src/target/OM-2007/examples/openmoko-panel-demo-simple/src/Makefile.am
Log:
openmoko-panel-demo: fix building (really)


Modified: trunk/src/target/OM-2007/examples/openmoko-panel-demo-simple/openmoko-panel-demo-simple.pro
===================================================================
--- trunk/src/target/OM-2007/examples/openmoko-panel-demo-simple/openmoko-panel-demo-simple.pro	2007-01-15 18:38:51 UTC (rev 556)
+++ trunk/src/target/OM-2007/examples/openmoko-panel-demo-simple/openmoko-panel-demo-simple.pro	2007-01-15 18:45:51 UTC (rev 557)
@@ -1,4 +1,4 @@
-SOURCES = src/panel.c
+SOURCES = src/demo-panel-applet.c
 
 MOKOCONFIG = mokoui
 include ( $(OPENMOKODIR)/devel/qmake/openmoko-include.pro )

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-15 18:38:51 UTC (rev 556)
+++ trunk/src/target/OM-2007/examples/openmoko-panel-demo-simple/src/Makefile.am	2007-01-15 18:45:51 UTC (rev 557)
@@ -2,7 +2,7 @@
 
 bin_PROGRAMS = openmoko-panel-demo-simple
 
-openmoko_panel_demo_simple_SOURCES = panel.c
+openmoko_panel_demo_simple_SOURCES = demo-panel-applet.c
 
 openmoko_panel_demo_simple_LDADD = @OPENMOKO_LIBS@
 

Copied: trunk/src/target/OM-2007/examples/openmoko-panel-demo-simple/src/demo-panel-applet.c (from rev 554, trunk/src/target/OM-2007/examples/openmoko-panel-demo-simple/src/panel.c)

Deleted: trunk/src/target/OM-2007/examples/openmoko-panel-demo-simple/src/panel.c
===================================================================
--- trunk/src/target/OM-2007/examples/openmoko-panel-demo-simple/src/panel.c	2007-01-15 18:38:51 UTC (rev 556)
+++ trunk/src/target/OM-2007/examples/openmoko-panel-demo-simple/src/panel.c	2007-01-15 18:45:51 UTC (rev 557)
@@ -1,65 +0,0 @@
-/*
- *  Panel-Demo -- OpenMoko Demo Panel Applet
- *
- *  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 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 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 );
-
-    // 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" );
-
-    // you can add a menu
-    GtkMenu* panelmenu = GTK_MENU(gtk_menu_new());
-    GtkMenuItem* fooitem = GTK_MENU_ITEM(gtk_menu_item_new_with_label( "Foo" ));
-    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_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!" );
-    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 );
-
-
-    gtk_main();
-
-    g_debug( "openmoko-panel-demo-simple ending" );
-    return 0;
-}





More information about the commitlog mailing list