--- Begin Message ---
Author: thomas
Date: 2007-07-30 12:46:34 +0200 (Mon, 30 Jul 2007)
New Revision: 2562
Added:
trunk/src/target/OM-2007.2/applications/openmoko-calculator/
trunk/src/target/OM-2007.2/applications/openmoko-calculator/AUTHORS
trunk/src/target/OM-2007.2/applications/openmoko-calculator/Makefile.am
trunk/src/target/OM-2007.2/applications/openmoko-calculator/README
trunk/src/target/OM-2007.2/applications/openmoko-calculator/autogen.sh
trunk/src/target/OM-2007.2/applications/openmoko-calculator/configure.ac
trunk/src/target/OM-2007.2/applications/openmoko-calculator/data/
trunk/src/target/OM-2007.2/applications/openmoko-calculator/openmoko-calculator.pro
trunk/src/target/OM-2007.2/applications/openmoko-calculator/po/
trunk/src/target/OM-2007.2/applications/openmoko-calculator/src/
trunk/src/target/OM-2007.2/artwork/themes/openmoko-standard-2/gtk-2.0/openmoko-calculator
Removed:
trunk/src/target/OM-2007.2/applications/openmoko-calculator/AUTHORS
trunk/src/target/OM-2007.2/applications/openmoko-calculator/Makefile.am
trunk/src/target/OM-2007.2/applications/openmoko-calculator/README
trunk/src/target/OM-2007.2/applications/openmoko-calculator/autogen.sh
trunk/src/target/OM-2007.2/applications/openmoko-calculator/configure.ac
trunk/src/target/OM-2007.2/applications/openmoko-calculator/data/
trunk/src/target/OM-2007.2/applications/openmoko-calculator/openmoko-calculator.pro
trunk/src/target/OM-2007.2/applications/openmoko-calculator/po/
trunk/src/target/OM-2007.2/applications/openmoko-calculator/src/
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-calculator/po/Makefile.in.in
trunk/src/target/OM-2007.2/applications/openmoko-calculator/src/calc-main.c
trunk/src/target/OM-2007.2/artwork/themes/openmoko-standard-2/gtk-2.0/gtkrc
Log:
* Update openmoko-calculator for OM-2007.2
Copied: trunk/src/target/OM-2007.2/applications/openmoko-calculator (from rev
2558, trunk/src/target/OM-2007/applications/openmoko-calculator)
Deleted: trunk/src/target/OM-2007.2/applications/openmoko-calculator/AUTHORS
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-calculator/AUTHORS
2007-07-28 12:36:08 UTC (rev 2558)
+++ trunk/src/target/OM-2007.2/applications/openmoko-calculator/AUTHORS
2007-07-30 10:46:34 UTC (rev 2562)
@@ -1,6 +0,0 @@
-Rodolphe Ortalo <[EMAIL PROTECTED]>
-Michael 'Mickey' Lauer <[EMAIL PROTECTED]>
-Tony Guan <[EMAIL PROTECTED]>
-
-Thanks for bugfixes:
-dando <[EMAIL PROTECTED]>
Copied: trunk/src/target/OM-2007.2/applications/openmoko-calculator/AUTHORS
(from rev 2561,
trunk/src/target/OM-2007/applications/openmoko-calculator/AUTHORS)
Deleted: trunk/src/target/OM-2007.2/applications/openmoko-calculator/Makefile.am
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-calculator/Makefile.am
2007-07-28 12:36:08 UTC (rev 2558)
+++ trunk/src/target/OM-2007.2/applications/openmoko-calculator/Makefile.am
2007-07-30 10:46:34 UTC (rev 2562)
@@ -1,2 +0,0 @@
-AUTOMAKE_OPTIONS=foreign
-SUBDIRS = src data po
\ No newline at end of file
Copied: trunk/src/target/OM-2007.2/applications/openmoko-calculator/Makefile.am
(from rev 2561,
trunk/src/target/OM-2007/applications/openmoko-calculator/Makefile.am)
Deleted: trunk/src/target/OM-2007.2/applications/openmoko-calculator/README
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-calculator/README
2007-07-28 12:36:08 UTC (rev 2558)
+++ trunk/src/target/OM-2007.2/applications/openmoko-calculator/README
2007-07-30 10:46:34 UTC (rev 2562)
@@ -1,11 +0,0 @@
-Simple calculator, started based on the OpenMoko Finger Application
-example and the OpenMoko regular dialer UI, in the hope that it would
-be useful.
-
-Notes:
- * Pango markup is used currently to manage font size for the display
-of for button labels, maybe styles would be more appropriate.
-
-Thank you for your attention,
-
-Rodolphe <[EMAIL PROTECTED]>
Copied: trunk/src/target/OM-2007.2/applications/openmoko-calculator/README
(from rev 2561,
trunk/src/target/OM-2007/applications/openmoko-calculator/README)
Deleted: trunk/src/target/OM-2007.2/applications/openmoko-calculator/autogen.sh
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-calculator/autogen.sh
2007-07-28 12:36:08 UTC (rev 2558)
+++ trunk/src/target/OM-2007.2/applications/openmoko-calculator/autogen.sh
2007-07-30 10:46:34 UTC (rev 2562)
@@ -1,4 +0,0 @@
-#! /bin/sh
-autoreconf -v --install || exit 1
-glib-gettextize --force --copy || exit 1
-./configure --enable-maintainer-mode "$@"
Copied: trunk/src/target/OM-2007.2/applications/openmoko-calculator/autogen.sh
(from rev 2561,
trunk/src/target/OM-2007/applications/openmoko-calculator/autogen.sh)
Deleted:
trunk/src/target/OM-2007.2/applications/openmoko-calculator/configure.ac
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-calculator/configure.ac
2007-07-28 12:36:08 UTC (rev 2558)
+++ trunk/src/target/OM-2007.2/applications/openmoko-calculator/configure.ac
2007-07-30 10:46:34 UTC (rev 2562)
@@ -1,32 +0,0 @@
-AC_PREREQ(2.53)
-AC_INIT(openmoko-calculator, 0.0.5, [EMAIL PROTECTED])
-AM_INIT_AUTOMAKE()
-AC_CONFIG_SRCDIR(src/calc-main.c)
-AM_CONFIG_HEADER(config.h)
-AM_MAINTAINER_MODE
-
-AC_ISC_POSIX
-AC_PROG_CC
-AC_STDC_HEADERS
-AC_PROG_LIBTOOL
-
-dnl i18n support
-GETTEXT_PACKAGE=Calculator
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext package])
-AC_SUBST(GETTEXT_PACKAGE)
-ALL_LINGUAS="fr ru sv"
-AM_GLIB_GNU_GETTEXT
-
-# base deps
-PKG_CHECK_MODULES(OPENMOKO, openmoko-libs >= 0.0.1,,
- AC_MSG_ERROR([*** Required OpenMoko Libraries >= 0.0.1 not
installed ***]))
-LIBS="$LIBS $GTK_LIBS $OPENMOKO_LIBS"
-CFLAGS="$CFLAGS $OPENMOKO_CFLAGS"
-
-# output stuff
-AC_OUTPUT([
-Makefile
-src/Makefile
-po/Makefile.in
-data/Makefile
-])
Copied:
trunk/src/target/OM-2007.2/applications/openmoko-calculator/configure.ac (from
rev 2561,
trunk/src/target/OM-2007/applications/openmoko-calculator/configure.ac)
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-calculator/configure.ac
2007-07-30 09:49:49 UTC (rev 2561)
+++ trunk/src/target/OM-2007.2/applications/openmoko-calculator/configure.ac
2007-07-30 10:46:34 UTC (rev 2562)
@@ -0,0 +1,31 @@
+AC_PREREQ(2.53)
+AC_INIT(openmoko-calculator, 0.0.5, [EMAIL PROTECTED])
+AM_INIT_AUTOMAKE()
+AC_CONFIG_SRCDIR(src/calc-main.c)
+AM_CONFIG_HEADER(config.h)
+AM_MAINTAINER_MODE
+
+AC_ISC_POSIX
+AC_PROG_CC
+AC_STDC_HEADERS
+AC_PROG_LIBTOOL
+
+dnl i18n support
+GETTEXT_PACKAGE=Calculator
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext package])
+AC_SUBST(GETTEXT_PACKAGE)
+ALL_LINGUAS="fr ru sv"
+AM_GLIB_GNU_GETTEXT
+
+# base deps
+PKG_CHECK_MODULES(OPENMOKO, libmokoui2)
+LIBS="$LIBS $GTK_LIBS $OPENMOKO_LIBS"
+CFLAGS="$CFLAGS $OPENMOKO_CFLAGS"
+
+# output stuff
+AC_OUTPUT([
+Makefile
+src/Makefile
+po/Makefile.in
+data/Makefile
+])
Copied: trunk/src/target/OM-2007.2/applications/openmoko-calculator/data (from
rev 2561, trunk/src/target/OM-2007/applications/openmoko-calculator/data)
Deleted:
trunk/src/target/OM-2007.2/applications/openmoko-calculator/openmoko-calculator.pro
===================================================================
---
trunk/src/target/OM-2007/applications/openmoko-calculator/openmoko-calculator.pro
2007-07-28 12:36:08 UTC (rev 2558)
+++
trunk/src/target/OM-2007.2/applications/openmoko-calculator/openmoko-calculator.pro
2007-07-30 10:46:34 UTC (rev 2562)
@@ -1,10 +0,0 @@
-TEMPLATE = app
-DEPENDPATH += src
-INCLUDEPATH += . src
-
-# Input
-HEADERS += src/calc-main.h
-SOURCES += src/calc-main.c
-
-MOKOCONFIG = mokoui
-include ( $(OPENMOKODIR)/devel/qmake/openmoko-include.pro )
Copied:
trunk/src/target/OM-2007.2/applications/openmoko-calculator/openmoko-calculator.pro
(from rev 2561,
trunk/src/target/OM-2007/applications/openmoko-calculator/openmoko-calculator.pro)
Copied: trunk/src/target/OM-2007.2/applications/openmoko-calculator/po (from
rev 2561, trunk/src/target/OM-2007/applications/openmoko-calculator/po)
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-calculator/po/Makefile.in.in
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-calculator/po/Makefile.in.in
2007-07-30 09:49:49 UTC (rev 2561)
+++
trunk/src/target/OM-2007.2/applications/openmoko-calculator/po/Makefile.in.in
2007-07-30 10:46:34 UTC (rev 2562)
@@ -25,6 +25,7 @@
prefix = @prefix@
exec_prefix = @exec_prefix@
+datarootdir = @datarootdir@
datadir = @datadir@
libdir = @libdir@
localedir = $(libdir)/locale
@@ -40,6 +41,7 @@
GENCAT = @GENCAT@
GMSGFMT = @GMSGFMT@
MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
XGETTEXT = @XGETTEXT@
MSGMERGE = msgmerge
@@ -78,7 +80,7 @@
.po.gmo:
file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \
- && rm -f $$file && $(GMSGFMT) -c -o $$file $<
+ && rm -f $$file && $(GMSGFMT) $(MSGFMT_OPTS) -o $$file $<
.po.cat:
sed -f ../intl/po2msg.sed < $< > $*.msg \
Copied: trunk/src/target/OM-2007.2/applications/openmoko-calculator/src (from
rev 2561, trunk/src/target/OM-2007/applications/openmoko-calculator/src)
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-calculator/src/calc-main.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-calculator/src/calc-main.c
2007-07-30 09:49:49 UTC (rev 2561)
+++ trunk/src/target/OM-2007.2/applications/openmoko-calculator/src/calc-main.c
2007-07-30 10:46:34 UTC (rev 2562)
@@ -23,19 +23,7 @@
#include <math.h>
#include <string.h>
-#include <libmokoui/moko-application.h>
-#include <libmokoui/moko-finger-tool-box.h>
-#include <libmokoui/moko-finger-window.h>
-#include <libmokoui/moko-finger-wheel.h>
-
-#include <gtk/gtkalignment.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkvbox.h>
#include <gtk/gtk.h>
-
#include <glib.h>
#include <glib/gi18n.h>
@@ -80,11 +68,11 @@
#define CALC_ROWS 5
#define CALC_COLS 4
static const gchar *label[CALC_ROWS][CALC_COLS] = {
- {N_("Clear All"), N_("Clear"), "<big><b>/</b></big>",
"<big><b>*</b></big>" },
- {"<big><b>7</b></big>", "<big><b>8</b></big>", "<big><b>9</b></big>",
"<big><b>+</b></big>"},
- {"<big><b>4</b></big>", "<big><b>5</b></big>", "<big><b>6</b></big>",
"<big><b>-</b></big>"},
- {"<big><b>1</b></big>", "<big><b>2</b></big>", "<big><b>3</b></big>",
"<big><b>=</b></big>"},
- {"<big><b>0</b></big>", N_("<big><b>.</b></big>"),
"<big><b>+</b></big>/<big><b>-</b></big>", "none"},
+ {N_("Clear All"), N_("Clear"), "/", "*" },
+ {"7", "8", "9", "+"},
+ {"4", "5", "6", "-"},
+ {"1", "2", "3", "="},
+ {"0", N_("."), "+/-", "none"},
};
static enum operation ops[CALC_ROWS][CALC_COLS] = {
{ clearall, clear, div, mult},
@@ -129,20 +117,24 @@
static int toomany = 0;
if ((the_state.func != &noop_func) || (++toomany % 7))
gtk_label_set_markup(GTK_LABEL(displayed_label),
- _("<big>Not a Number</big><span font_desc=\"48\"
> <b>NaN</b></span>"));
+ _("<big>Not a Number</big>"));
else
/* ok, let's have some fun too... */
gtk_label_set_markup(GTK_LABEL(displayed_label),
- _("<big>Not a Number</big> <span
font_desc=\"48\" ><b>NaN</b></span>\n"
+ _("<big>Not a Number</big>\n"
"<span foreground=\"darkgrey\"
size=\"smaller\">covert_channel/ack</span>\n"
"<span foreground=\"orange\"
style=\"italic\">Beam request transmitted...</span>"));
- } else if (isinf(v)>0) {
- /* positive infinity */
- gtk_label_set_markup(GTK_LABEL(displayed_label),"<span font_desc=\"48\"
>∞</span>");
- } else {
- /* only negative infinity remains... */
- gtk_label_set_markup(GTK_LABEL(displayed_label),"<span font_desc=\"48\"
>-∞</span>");
}
+ else if (isinf(v)>0)
+ {
+ /* positive infinity */
+ gtk_label_set_markup(GTK_LABEL(displayed_label),"∞");
+ }
+ else
+ {
+ /* only negative infinity remains... */
+ gtk_label_set_markup(GTK_LABEL(displayed_label),"-∞");
+ }
return; /* short-cut out */
} else {
/* Manually build the display string ala %g */
@@ -152,16 +144,16 @@
expof10 = (int) log10(fabs(value));
value *= pow(10,-expof10);
if (expof10 >= MAX_DISPLAY_CHARS)
- snprintf(dispstring,MAX_DISPLAY_MARKUP,"<span font_desc=\"48\" >%.*g
<small>e</small><sup><big>%d</big></sup></span>",(MAX_DISPLAY_CHARS-2),value,expof10);
+ snprintf(dispstring,MAX_DISPLAY_MARKUP,"%.*g
<small>e</small><sup><big>%d</big></sup>",(MAX_DISPLAY_CHARS-2),value,expof10);
else
- snprintf(dispstring,MAX_DISPLAY_MARKUP,"<span font_desc=\"48\"
>%.*g</span>",MAX_DISPLAY_CHARS,v);
+ snprintf(dispstring,MAX_DISPLAY_MARKUP,"%.*g",MAX_DISPLAY_CHARS,v);
}
} else {
/* We display entered value including trailing 0s */
if (the_state.decimal_point == TRUE)
- snprintf(dispstring,MAX_DISPLAY_MARKUP,"<span font_desc=\"48\"
>%#.*f</span>",the_state.n_fractional,v);
+ snprintf(dispstring,MAX_DISPLAY_MARKUP,"%#.*f",the_state.n_fractional,v);
else
- snprintf(dispstring,MAX_DISPLAY_MARKUP,"<span font_desc=\"48\"
>%.*f</span>",the_state.n_fractional,v);
+ snprintf(dispstring,MAX_DISPLAY_MARKUP,"%.*f",the_state.n_fractional,v);
}
#if 1
calc_debug("cur = %.12lf last = %.12lf", the_state.current_operand,
the_state.last_operand);
@@ -294,38 +286,36 @@
/*
* Convenience static function
*/
-static GtkTable* calc_panel_init (void)
+static GtkWidget*
+calc_panel_init (void)
{
- GtkTable *table;
+ GtkWidget *table;
int i, j;
- table = GTK_TABLE(gtk_table_new (CALC_ROWS, CALC_COLS, TRUE));
- gtk_table_set_row_spacings(table, 10);
- gtk_table_set_col_spacings(table, 10);
+ table = gtk_table_new (CALC_ROWS, CALC_COLS, TRUE);
for (j = 0; j < CALC_COLS; j++)
for (i = 0; i < CALC_ROWS; i++)
{
- GtkButton* button = GTK_BUTTON(gtk_button_new());
+ GtkWidget* button = gtk_button_new();
GtkWidget* blabel = gtk_label_new(NULL);
gtk_label_set_markup(GTK_LABEL(blabel),gettext(label[i][j]));
gtk_container_add(GTK_CONTAINER(button),blabel);
g_signal_connect (G_OBJECT(button), "clicked",
G_CALLBACK(calc_button_pressed),&(ops[i][j]));
/* TODO: Check if this changes the aspect */
- gtk_widget_set_name(GTK_WIDGET(button), wnames[i][j]);
+ gtk_widget_set_name(button, wnames[i][j]);
if ((j == (CALC_COLS-1)) && (i == (CALC_ROWS-2))) {
/* Last button spans two cells vertically */
- gtk_table_attach_defaults (table, GTK_WIDGET(button),
+ gtk_table_attach_defaults (GTK_TABLE (table), button,
j, j + 1, i, i + 2);
i++;
} else {
- gtk_table_attach_defaults (table, GTK_WIDGET(button),
+ gtk_table_attach_defaults (GTK_TABLE (table), button,
j, j + 1, i, i + 1);
}
- gtk_widget_set_size_request (GTK_WIDGET(button), 20, 20);
}
return table;
}
@@ -345,9 +335,8 @@
*/
int main( int argc, char** argv )
{
- GtkHBox* hbox;
- GtkVBox* vbox;
- GtkTable* table;
+ GtkWidget* vbox;
+ GtkWidget* table;
calc_debug( "openmoko-calculator starting up" );
/* Initialize GTK+ */
@@ -369,40 +358,40 @@
bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
textdomain (GETTEXT_PACKAGE);
- /* application object */
- /* MokoApplication* app =
MOKO_APPLICATION(moko_application_get_instance()); */
+ /* application */
g_set_application_name( _("Calculator") );
/* main window */
- MokoFingerWindow* window = MOKO_FINGER_WINDOW(moko_finger_window_new());
+ GtkWidget* window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
- /* application menu */
- GtkMenu* appmenu = GTK_MENU(gtk_menu_new());
- GtkMenuItem* closeitem = GTK_MENU_ITEM(gtk_menu_item_new_with_label(
_("Close") ));
- g_signal_connect( G_OBJECT(closeitem), "activate",
G_CALLBACK(gtk_main_quit), NULL );
- gtk_menu_shell_append( GTK_MENU_SHELL(appmenu), GTK_WIDGET(closeitem) );
- moko_finger_window_set_application_menu( window, appmenu );
-
/* connect close event */
g_signal_connect( G_OBJECT(window), "delete_event",
G_CALLBACK(gtk_main_quit), NULL );
/* contents */
- hbox = GTK_HBOX(gtk_hbox_new(TRUE, 10)); /* The hbox is just to get some
border space...! */
- vbox = GTK_VBOX(gtk_vbox_new(FALSE, 10));
+ vbox = gtk_vbox_new(FALSE, 10);
displayed_label = gtk_label_new("123");
+ gtk_widget_set_name (displayed_label, "calculator-display");
gtk_misc_set_alignment(GTK_MISC(displayed_label), 1, 0);
update_display(0.0);
- GtkWidget *eventbox1 = gtk_event_box_new ();
- gtk_widget_set_name (eventbox1, "gtkeventbox-black");
- gtk_container_add (GTK_CONTAINER (eventbox1), displayed_label);
- gtk_box_pack_start( GTK_BOX(vbox), eventbox1, FALSE, FALSE, 10);
+ GtkWidget *display_frame;
+ display_frame = gtk_frame_new (NULL);
+ gtk_container_add (GTK_CONTAINER (display_frame), displayed_label);
+
+ GtkWidget *display_eventbox = gtk_event_box_new ();
+ gtk_widget_set_name (display_eventbox, "calculator-display-background");
+ gtk_container_add (GTK_CONTAINER (display_eventbox), display_frame);
+ gtk_box_pack_start( GTK_BOX(vbox), display_eventbox, FALSE, FALSE, 0);
+
table = calc_panel_init();
- gtk_box_pack_start( GTK_BOX(vbox), GTK_WIDGET(table), TRUE, TRUE, 10);
+ gtk_box_pack_start( GTK_BOX(vbox), table, TRUE, TRUE, 0);
- gtk_box_pack_start( GTK_BOX(hbox), GTK_WIDGET(vbox), TRUE, TRUE, 10);
- moko_finger_window_set_contents(window, GTK_WIDGET(hbox));
+ GtkWidget *main_frame = gtk_frame_new (NULL);
+ gtk_frame_set_shadow_type (GTK_FRAME (main_frame), GTK_SHADOW_NONE);
+ gtk_widget_set_name (main_frame, "calculator-frame");
+ gtk_container_add (GTK_CONTAINER (main_frame), vbox);
+ gtk_container_add (GTK_CONTAINER (window), main_frame);
/* show everything and run main loop */
gtk_widget_show_all( GTK_WIDGET(window) );
Modified:
trunk/src/target/OM-2007.2/artwork/themes/openmoko-standard-2/gtk-2.0/gtkrc
===================================================================
--- trunk/src/target/OM-2007.2/artwork/themes/openmoko-standard-2/gtk-2.0/gtkrc
2007-07-30 09:49:49 UTC (rev 2561)
+++ trunk/src/target/OM-2007.2/artwork/themes/openmoko-standard-2/gtk-2.0/gtkrc
2007-07-30 10:46:34 UTC (rev 2562)
@@ -128,3 +128,4 @@
#include "openmoko-footer"
#include "mokomessagedialog"
+include "openmoko-calculator"
Added:
trunk/src/target/OM-2007.2/artwork/themes/openmoko-standard-2/gtk-2.0/openmoko-calculator
===================================================================
---
trunk/src/target/OM-2007.2/artwork/themes/openmoko-standard-2/gtk-2.0/openmoko-calculator
2007-07-30 09:49:49 UTC (rev 2561)
+++
trunk/src/target/OM-2007.2/artwork/themes/openmoko-standard-2/gtk-2.0/openmoko-calculator
2007-07-30 10:46:34 UTC (rev 2562)
@@ -0,0 +1,16 @@
+style "calc-window"
+{
+ xthickness = 10
+ ythickness = 10
+}
+widget "*calculator-frame" style "calc-window"
+
+style "calc-display-bg"
+{
+ bg[NORMAL] = "black"
+ fg[NORMAL] = "orange"
+ font_name = "Sans 40"
+ xthickness = 10
+ ythickness = 10
+}
+widget "*calculator-display-background*" style "calc-display-bg"
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-07-30 12:59:29 +0200 (Mon, 30 Jul 2007)
New Revision: 2563
Removed:
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-battery/openmoko-panel-battery.pro
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-bt/openmoko-panel-bt.pro
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-clock/openmoko-panel-clock.pro
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-gps/openmoko-panel-gps.pro
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-gsm/openmoko-panel-gsm.pro
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-mainmenu/openmoko-panel-mainmenu.pro
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-usb/openmoko-panel-usb.pro
trunk/src/target/OM-2007.2/panel-plugins/panel-plugins.pro
Modified:
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-battery/ChangeLog
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-battery/configure.ac
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-bt/ChangeLog
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-bt/configure.ac
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-clock/ChangeLog
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-clock/configure.ac
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-gps/ChangeLog
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-gps/configure.ac
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-gsm/ChangeLog
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-gsm/configure.ac
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-mainmenu/ChangeLog
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-mainmenu/configure.ac
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-usb/ChangeLog
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-usb/configure.ac
Log:
* import panel plugins into OM-2007.2
* remove qmake build system leftovers
* fix build system to use libmokopanelui2
Modified:
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-battery/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-battery/ChangeLog
2007-07-30 10:46:34 UTC (rev 2562)
+++ trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-battery/ChangeLog
2007-07-30 10:59:29 UTC (rev 2563)
@@ -1,3 +1,8 @@
+2007-07-30 Michael Lauer <[EMAIL PROTECTED]>
+
+ * configure.ac:
+ Import panel-plugin into 2007.2 and refer to libmokopanelui2.
+
2007-06-22 Stefan Schmidt <[EMAIL PROTECTED]>
* configure.ac:
Modified:
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-battery/configure.ac
===================================================================
---
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-battery/configure.ac
2007-07-30 10:46:34 UTC (rev 2562)
+++
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-battery/configure.ac
2007-07-30 10:59:29 UTC (rev 2563)
@@ -11,8 +11,7 @@
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, libmokopanelui2)
LIBS="$LIBS $OPENMOKO_LIBS"
CFLAGS="$CFLAGS $OPENMOKO_CFLAGS"
Deleted:
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-battery/openmoko-panel-battery.pro
===================================================================
---
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-battery/openmoko-panel-battery.pro
2007-07-30 10:46:34 UTC (rev 2562)
+++
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-battery/openmoko-panel-battery.pro
2007-07-30 10:59:29 UTC (rev 2563)
@@ -1,6 +0,0 @@
-MOKOCONFIG = mokoui
-MOKOTYPE = panel-plugin
-
-SOURCES = src/openmoko-panel-battery.c
-
-include ( $(OPENMOKODIR)/devel/qmake/openmoko-include.pro )
Modified: trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-bt/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-bt/ChangeLog
2007-07-30 10:46:34 UTC (rev 2562)
+++ trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-bt/ChangeLog
2007-07-30 10:59:29 UTC (rev 2563)
@@ -0,0 +1,5 @@
+2007-07-30 Michael Lauer <[EMAIL PROTECTED]>
+
+ * configure.ac:
+ Import panel-plugin into 2007.2 and refer to libmokopanelui2.
+
Modified:
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-bt/configure.ac
===================================================================
--- trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-bt/configure.ac
2007-07-30 10:46:34 UTC (rev 2562)
+++ trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-bt/configure.ac
2007-07-30 10:59:29 UTC (rev 2563)
@@ -11,8 +11,7 @@
AC_PROG_LIBTOOL
# base deps
-PKG_CHECK_MODULES(OPENMOKO, openmoko-libs >= 0.0.2,,
- AC_MSG_ERROR([*** Required OpenMoko Libraries >= 0.0.2 not
installed ***]))
+PKG_CHECK_MODULES(OPENMOKO, libmokopanelui2)
LIBS="$LIBS $OPENMOKO_LIBS"
CFLAGS="$CFLAGS $OPENMOKO_CFLAGS"
Deleted:
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-bt/openmoko-panel-bt.pro
===================================================================
---
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-bt/openmoko-panel-bt.pro
2007-07-30 10:46:34 UTC (rev 2562)
+++
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-bt/openmoko-panel-bt.pro
2007-07-30 10:59:29 UTC (rev 2563)
@@ -1,6 +0,0 @@
-MOKOCONFIG = mokoui
-MOKOTYPE = panel-plugin
-
-SOURCES = src/openmoko-panel-bt.c
-
-include ( $(OPENMOKODIR)/devel/qmake/openmoko-include.pro )
Modified:
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-clock/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-clock/ChangeLog
2007-07-30 10:46:34 UTC (rev 2562)
+++ trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-clock/ChangeLog
2007-07-30 10:59:29 UTC (rev 2563)
@@ -1,3 +1,8 @@
+2007-07-30 Michael Lauer <[EMAIL PROTECTED]>
+
+ * configure.ac:
+ Import panel-plugin into 2007.2 and refer to libmokopanelui2.
+
2007-06-22 Stefan Schmidt <[EMAIL PROTECTED]>
* configure.ac:
Modified:
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-clock/configure.ac
===================================================================
--- trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-clock/configure.ac
2007-07-30 10:46:34 UTC (rev 2562)
+++ trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-clock/configure.ac
2007-07-30 10:59:29 UTC (rev 2563)
@@ -11,8 +11,7 @@
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, libmokopanelui2)
LIBS="$LIBS $OPENMOKO_LIBS"
CFLAGS="$CFLAGS $OPENMOKO_CFLAGS"
Deleted:
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-clock/openmoko-panel-clock.pro
===================================================================
---
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-clock/openmoko-panel-clock.pro
2007-07-30 10:46:34 UTC (rev 2562)
+++
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-clock/openmoko-panel-clock.pro
2007-07-30 10:59:29 UTC (rev 2563)
@@ -1,6 +0,0 @@
-MOKOCONFIG = mokoui
-MOKOTYPE = panel-plugin
-
-SOURCES = src/openmoko-panel-clock.c
-
-include ( $(OPENMOKODIR)/devel/qmake/openmoko-include.pro )
Modified: trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-gps/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-gps/ChangeLog
2007-07-30 10:46:34 UTC (rev 2562)
+++ trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-gps/ChangeLog
2007-07-30 10:59:29 UTC (rev 2563)
@@ -0,0 +1,5 @@
+2007-07-30 Michael Lauer <[EMAIL PROTECTED]>
+
+ * configure.ac:
+ Import panel-plugin into 2007.2 and refer to libmokopanelui2.
+
Modified:
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-gps/configure.ac
===================================================================
--- trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-gps/configure.ac
2007-07-30 10:46:34 UTC (rev 2562)
+++ trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-gps/configure.ac
2007-07-30 10:59:29 UTC (rev 2563)
@@ -11,8 +11,7 @@
AC_PROG_LIBTOOL
# base deps
-PKG_CHECK_MODULES(OPENMOKO, openmoko-libs >= 0.0.2,,
- AC_MSG_ERROR([*** Required OpenMoko Libraries >= 0.0.2 not
installed ***]))
+PKG_CHECK_MODULES(OPENMOKO, libmokopanelui2)
LIBS="$LIBS $OPENMOKO_LIBS"
CFLAGS="$CFLAGS $OPENMOKO_CFLAGS"
Deleted:
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-gps/openmoko-panel-gps.pro
===================================================================
---
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-gps/openmoko-panel-gps.pro
2007-07-30 10:46:34 UTC (rev 2562)
+++
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-gps/openmoko-panel-gps.pro
2007-07-30 10:59:29 UTC (rev 2563)
@@ -1,6 +0,0 @@
-MOKOCONFIG = mokoui
-MOKOTYPE = panel-plugin
-
-SOURCES = src/openmoko-panel-gps.c
-
-include ( $(OPENMOKODIR)/devel/qmake/openmoko-include.pro )
Modified: trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-gsm/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-gsm/ChangeLog
2007-07-30 10:46:34 UTC (rev 2562)
+++ trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-gsm/ChangeLog
2007-07-30 10:59:29 UTC (rev 2563)
@@ -0,0 +1,5 @@
+2007-07-30 Michael Lauer <[EMAIL PROTECTED]>
+
+ * configure.ac:
+ Import panel-plugin into 2007.2 and refer to libmokopanelui2.
+
Modified:
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-gsm/configure.ac
===================================================================
--- trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-gsm/configure.ac
2007-07-30 10:46:34 UTC (rev 2562)
+++ trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-gsm/configure.ac
2007-07-30 10:59:29 UTC (rev 2563)
@@ -11,8 +11,7 @@
AC_PROG_LIBTOOL
# base deps
-PKG_CHECK_MODULES(OPENMOKO, openmoko-libs >= 0.0.3,,
- AC_MSG_ERROR([*** Required OpenMoko Libraries >= 0.0.3 not
installed ***]))
+PKG_CHECK_MODULES(OPENMOKO, libmokopanelui2)
LIBS="$LIBS $OPENMOKO_LIBS"
CFLAGS="$CFLAGS $OPENMOKO_CFLAGS"
Deleted:
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-gsm/openmoko-panel-gsm.pro
===================================================================
---
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-gsm/openmoko-panel-gsm.pro
2007-07-30 10:46:34 UTC (rev 2562)
+++
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-gsm/openmoko-panel-gsm.pro
2007-07-30 10:59:29 UTC (rev 2563)
@@ -1,6 +0,0 @@
-MOKOCONFIG = mokoui
-MOKOTYPE = panel-plugin
-
-SOURCES = src/openmoko-panel-gsm.c
-
-include ( $(OPENMOKODIR)/devel/qmake/openmoko-include.pro )
Modified:
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-mainmenu/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-mainmenu/ChangeLog
2007-07-30 10:46:34 UTC (rev 2562)
+++ trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-mainmenu/ChangeLog
2007-07-30 10:59:29 UTC (rev 2563)
@@ -1,3 +1,8 @@
+2007-07-30 Michael Lauer <[EMAIL PROTECTED]>
+
+ * configure.ac:
+ Import panel-plugin into 2007.2 and refer to libmokopanelui2.
+
2007-06-24 Stefan Schmidt <[EMAIL PROTECTED]>
* src/buttonactions.c:
Modified:
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-mainmenu/configure.ac
===================================================================
---
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-mainmenu/configure.ac
2007-07-30 10:46:34 UTC (rev 2562)
+++
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-mainmenu/configure.ac
2007-07-30 10:59:29 UTC (rev 2563)
@@ -11,8 +11,7 @@
AC_PROG_LIBTOOL
# base deps
-PKG_CHECK_MODULES(OPENMOKO, openmoko-libs >= 0.0.2,,
- AC_MSG_ERROR([*** Required OpenMoko Libraries >= 0.0.2 not
installed ***]))
+PKG_CHECK_MODULES(OPENMOKO, libmokopanelui2)
PKG_CHECK_MODULES(LIBMB, libmb,,
AC_MSG_ERROR([matchbox-lib required]))
PKG_CHECK_MODULES(LIBSN, libstartup-notification-1.0, ,
Deleted:
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-mainmenu/openmoko-panel-mainmenu.pro
===================================================================
---
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-mainmenu/openmoko-panel-mainmenu.pro
2007-07-30 10:46:34 UTC (rev 2562)
+++
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-mainmenu/openmoko-panel-mainmenu.pro
2007-07-30 10:59:29 UTC (rev 2563)
@@ -1,20 +0,0 @@
-MOKOCONFIG = mokoui
-MOKOTYPE = panel-plugin
-
-HEADERS = \
- src/buttonactions.h \
- src/mokodesktop.h \
- src/mokodesktop_item.h \
- src/stylusmenu.h
-
-SOURCES = \
- src/openmoko-panel-mainmenu.c \
- src/buttonactions.c \
- src/mokodesktop.c \
- src/mokodesktop_item.c \
- src/stylusmenu.c
-
-PKGCONFIG += libstartup-notification-1.0
-
-include ( $(OPENMOKODIR)/devel/qmake/openmoko-include.pro )
-
Modified: trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-usb/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-usb/ChangeLog
2007-07-30 10:46:34 UTC (rev 2562)
+++ trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-usb/ChangeLog
2007-07-30 10:59:29 UTC (rev 2563)
@@ -0,0 +1,5 @@
+2007-07-30 Michael Lauer <[EMAIL PROTECTED]>
+
+ * configure.ac:
+ Import panel-plugin into 2007.2 and refer to libmokopanelui2.
+
Modified:
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-usb/configure.ac
===================================================================
--- trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-usb/configure.ac
2007-07-30 10:46:34 UTC (rev 2562)
+++ trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-usb/configure.ac
2007-07-30 10:59:29 UTC (rev 2563)
@@ -11,8 +11,7 @@
AC_PROG_LIBTOOL
# base deps
-PKG_CHECK_MODULES(OPENMOKO, openmoko-libs >= 0.0.2,,
- AC_MSG_ERROR([*** Required OpenMoko Libraries >= 0.0.2 not
installed ***]))
+PKG_CHECK_MODULES(OPENMOKO, libmokopanelui2)
LIBS="$LIBS $OPENMOKO_LIBS"
CFLAGS="$CFLAGS $OPENMOKO_CFLAGS"
Deleted:
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-usb/openmoko-panel-usb.pro
===================================================================
---
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-usb/openmoko-panel-usb.pro
2007-07-30 10:46:34 UTC (rev 2562)
+++
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-usb/openmoko-panel-usb.pro
2007-07-30 10:59:29 UTC (rev 2563)
@@ -1,5 +0,0 @@
-MOKOCONFIG = mokoui
-
-SOURCES = src/openmoko-panel-usb.c
-
-include ( $(OPENMOKODIR)/devel/qmake/openmoko-include.pro )
Deleted: trunk/src/target/OM-2007.2/panel-plugins/panel-plugins.pro
===================================================================
--- trunk/src/target/OM-2007.2/panel-plugins/panel-plugins.pro 2007-07-30
10:46:34 UTC (rev 2562)
+++ trunk/src/target/OM-2007.2/panel-plugins/panel-plugins.pro 2007-07-30
10:59:29 UTC (rev 2563)
@@ -1,9 +0,0 @@
-TEMPLATE = subdirs
-SUBDIRS = \
- openmoko-panel-battery \
- openmoko-panel-bt \
- openmoko-panel-clock \
- openmoko-panel-gps \
- openmoko-panel-gsm \
- openmoko-panel-mainmenu
-
--- End Message ---
