Send commitlog mailing list submissions to
[email protected]
To subscribe or unsubscribe via the World Wide Web, visit
http://lists.openmoko.org/mailman/listinfo/commitlog
or, via email, send a message with subject or body 'help' to
[EMAIL PROTECTED]
You can reach the person managing the list at
[EMAIL PROTECTED]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of commitlog digest..."
Today's Topics:
1. r2889 -
trunk/src/target/OM-2007.2/artwork/themes/openmoko-standard-2-qvga/gtk-2.0
([EMAIL PROTECTED])
2. r2890 -
trunk/src/target/OM-2007.2/artwork/themes/openmoko-standard-2-qvga/gtk-2.0
([EMAIL PROTECTED])
3. r2891 - in
trunk/src/target/OM-2007.2/applications/openmoko-today2: . src
([EMAIL PROTECTED])
4. r2892 - in
trunk/src/target/OM-2007.2/libraries/libmokopanelui2: .
libmokopanelui ([EMAIL PROTECTED])
5. r2893 - in trunk/src/target/OM-2007.2/panel-plugins:
openmoko-panel-gps openmoko-panel-gps/src openmoko-panel-usb
openmoko-panel-usb/src ([EMAIL PROTECTED])
6. r2894 - in
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-gsm: .
src ([EMAIL PROTECTED])
7. r2895 - in
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-bt: . src
([EMAIL PROTECTED])
--- Begin Message ---
Author: mickey
Date: 2007-09-02 13:03:40 +0200 (Sun, 02 Sep 2007)
New Revision: 2889
Modified:
trunk/src/target/OM-2007.2/artwork/themes/openmoko-standard-2-qvga/gtk-2.0/gtkprogressbar
trunk/src/target/OM-2007.2/artwork/themes/openmoko-standard-2-qvga/gtk-2.0/openmoko-calculator
Log:
openmoko-standard-theme-2-qvga: sync a bit w/ vga theme
Modified:
trunk/src/target/OM-2007.2/artwork/themes/openmoko-standard-2-qvga/gtk-2.0/gtkprogressbar
===================================================================
---
trunk/src/target/OM-2007.2/artwork/themes/openmoko-standard-2-qvga/gtk-2.0/gtkprogressbar
2007-09-02 11:01:12 UTC (rev 2888)
+++
trunk/src/target/OM-2007.2/artwork/themes/openmoko-standard-2-qvga/gtk-2.0/gtkprogressbar
2007-09-02 11:03:40 UTC (rev 2889)
@@ -1,8 +1,7 @@
-#FIXME sizing is totally off, probably needs patching Gtk to honor style
properties as in GtkScrollBar
#FIXME add missing vertical progress bar styling
style "gtkprogressbar" {
-
+ ythickness = 6
engine "pixmap" {
image {
function = BOX
Modified:
trunk/src/target/OM-2007.2/artwork/themes/openmoko-standard-2-qvga/gtk-2.0/openmoko-calculator
===================================================================
---
trunk/src/target/OM-2007.2/artwork/themes/openmoko-standard-2-qvga/gtk-2.0/openmoko-calculator
2007-09-02 11:01:12 UTC (rev 2888)
+++
trunk/src/target/OM-2007.2/artwork/themes/openmoko-standard-2-qvga/gtk-2.0/openmoko-calculator
2007-09-02 11:03:40 UTC (rev 2889)
@@ -14,3 +14,8 @@
ythickness = 5
}
widget "*calculator-display-background*" style "calc-display-bg"
+
+style "calculator-button-label" {
+ font_name = "Sans 12"
+}
+widget "*calculator-table.GtkButton.*" style "calculator-button-label"
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-09-02 13:06:55 +0200 (Sun, 02 Sep 2007)
New Revision: 2890
Added:
trunk/src/target/OM-2007.2/artwork/themes/openmoko-standard-2-qvga/gtk-2.0/gtkpaned
Modified:
trunk/src/target/OM-2007.2/artwork/themes/openmoko-standard-2-qvga/gtk-2.0/gtkrc
Log:
openmoko-theme-standard-2-qvga: sync gtkpaned w/ vga theme
Added:
trunk/src/target/OM-2007.2/artwork/themes/openmoko-standard-2-qvga/gtk-2.0/gtkpaned
===================================================================
---
trunk/src/target/OM-2007.2/artwork/themes/openmoko-standard-2-qvga/gtk-2.0/gtkpaned
2007-09-02 11:03:40 UTC (rev 2889)
+++
trunk/src/target/OM-2007.2/artwork/themes/openmoko-standard-2-qvga/gtk-2.0/gtkpaned
2007-09-02 11:06:55 UTC (rev 2890)
@@ -0,0 +1,8 @@
+style "gtkpaned"
+{
+ GtkPaned::handle-size = 8
+}
+class "GtkPaned" style "gtkpaned"
+widget_class "*.GtkPaned" style "gtkpaned"
+
+
Modified:
trunk/src/target/OM-2007.2/artwork/themes/openmoko-standard-2-qvga/gtk-2.0/gtkrc
===================================================================
---
trunk/src/target/OM-2007.2/artwork/themes/openmoko-standard-2-qvga/gtk-2.0/gtkrc
2007-09-02 11:03:40 UTC (rev 2889)
+++
trunk/src/target/OM-2007.2/artwork/themes/openmoko-standard-2-qvga/gtk-2.0/gtkrc
2007-09-02 11:06:55 UTC (rev 2890)
@@ -99,7 +99,7 @@
include "gtkmenu"
include "gtkmenuitem"
include "gtknotebook"
-#include "gtkpaned"
+include "gtkpaned"
include "gtkprogressbar"
include "gtkradiobutton"
include "gtkscale"
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-09-02 15:26:47 +0200 (Sun, 02 Sep 2007)
New Revision: 2891
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-pim-summary.c
Log:
openmoko-today2: Switch to textual display of date, remove time (it's in panel
anyways). Thanks Rod Whitby.
Modified: trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog
2007-09-02 11:06:55 UTC (rev 2890)
+++ trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog
2007-09-02 13:26:47 UTC (rev 2891)
@@ -1,3 +1,8 @@
+2007-09-02 Michael Lauer <[EMAIL PROTECTED]>
+
+ * src/today-pim-summary.c: (today_pim_summary_update_date):
+ Set textual display of date, don't show time (it's in the panel anyways)
+
2007-08-31 Thomas Wood <[EMAIL PROTECTED]>
* src/today-pim-journal.c: (today_pim_journal_box_new): Fix some
compiler
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-pim-summary.c
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-pim-summary.c
2007-09-02 11:06:55 UTC (rev 2890)
+++
trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-pim-summary.c
2007-09-02 13:26:47 UTC (rev 2891)
@@ -25,8 +25,7 @@
time (&t);
if (!(tmp = localtime (&t))) return TRUE;
- strftime (date_str, sizeof (date_str),
- "%I:%M%p %x", tmp);
+ strftime (date_str, sizeof (date_str), "%A, %d. %B %Y", tmp);
gtk_tree_view_column_set_title (column, date_str);
return TRUE;
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-09-02 20:03:39 +0200 (Sun, 02 Sep 2007)
New Revision: 2892
Modified:
trunk/src/target/OM-2007.2/libraries/libmokopanelui2/configure.ac
trunk/src/target/OM-2007.2/libraries/libmokopanelui2/libmokopanelui/Makefile.am
trunk/src/target/OM-2007.2/libraries/libmokopanelui2/libmokopanelui/Makefile.in
trunk/src/target/OM-2007.2/libraries/libmokopanelui2/libmokopanelui/moko-panel-applet.c
trunk/src/target/OM-2007.2/libraries/libmokopanelui2/libmokopanelui/moko-panel-applet.h
Log:
libmokopanelui2: use MBPanelScalingImage as icon
Modified: trunk/src/target/OM-2007.2/libraries/libmokopanelui2/configure.ac
===================================================================
--- trunk/src/target/OM-2007.2/libraries/libmokopanelui2/configure.ac
2007-09-02 13:26:47 UTC (rev 2891)
+++ trunk/src/target/OM-2007.2/libraries/libmokopanelui2/configure.ac
2007-09-02 18:03:39 UTC (rev 2892)
@@ -1,5 +1,5 @@
AC_PREREQ(2.53)
-AC_INIT(libmokopanelui2, 0.0.1, http://www.openmoko.org/)
+AC_INIT(libmokopanelui2, 0.3.0, http://www.openmoko.org/)
AM_INIT_AUTOMAKE()
AC_CONFIG_SRCDIR(libmokopanelui/moko-panel-applet.c)
AM_CONFIG_HEADER(config.h)
@@ -10,8 +10,6 @@
AC_STDC_HEADERS
AC_PROG_LIBTOOL
-GTK_VERSION=2.6
-
dnl i18n support
GETTEXT_PACKAGE=libmokopanelui2
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext package])
@@ -19,7 +17,7 @@
AM_GLIB_GNU_GETTEXT
# base deps
-PKG_CHECK_MODULES(DEPS, gtk+-2.0)
+PKG_CHECK_MODULES(DEPS, matchbox-panel )
if test x$MOKO_DEVEL = xon ; then
AC_MSG_NOTICE([removing -O2 from CFLAGS])
Modified:
trunk/src/target/OM-2007.2/libraries/libmokopanelui2/libmokopanelui/Makefile.am
===================================================================
---
trunk/src/target/OM-2007.2/libraries/libmokopanelui2/libmokopanelui/Makefile.am
2007-09-02 13:26:47 UTC (rev 2891)
+++
trunk/src/target/OM-2007.2/libraries/libmokopanelui2/libmokopanelui/Makefile.am
2007-09-02 18:03:39 UTC (rev 2892)
@@ -14,7 +14,7 @@
lib_LTLIBRARIES = libmokopanelui2.la
libmokopanelui2_la_SOURCES = $(source_c) $(source_h)
libmokopanelui2_la_LIBADD =
-libmokopanelui2_la_LDFLAGS = -version-info 0:2:0
+libmokopanelui2_la_LDFLAGS = -version-info 0:3:0
libmokopanelui2headersdir = $(includedir)/libmokopanelui2
libmokopanelui2headers_DATA = $(source_h)
Modified:
trunk/src/target/OM-2007.2/libraries/libmokopanelui2/libmokopanelui/Makefile.in
===================================================================
---
trunk/src/target/OM-2007.2/libraries/libmokopanelui2/libmokopanelui/Makefile.in
2007-09-02 13:26:47 UTC (rev 2891)
+++
trunk/src/target/OM-2007.2/libraries/libmokopanelui2/libmokopanelui/Makefile.in
2007-09-02 18:03:39 UTC (rev 2892)
@@ -217,7 +217,7 @@
lib_LTLIBRARIES = libmokopanelui2.la
libmokopanelui2_la_SOURCES = $(source_c) $(source_h)
libmokopanelui2_la_LIBADD =
-libmokopanelui2_la_LDFLAGS = -version-info 0:2:0
+libmokopanelui2_la_LDFLAGS = -version-info 0:3:0
libmokopanelui2headersdir = $(includedir)/libmokopanelui2
libmokopanelui2headers_DATA = $(source_h)
all: all-am
Modified:
trunk/src/target/OM-2007.2/libraries/libmokopanelui2/libmokopanelui/moko-panel-applet.c
===================================================================
---
trunk/src/target/OM-2007.2/libraries/libmokopanelui2/libmokopanelui/moko-panel-applet.c
2007-09-02 13:26:47 UTC (rev 2891)
+++
trunk/src/target/OM-2007.2/libraries/libmokopanelui2/libmokopanelui/moko-panel-applet.c
2007-09-02 18:03:39 UTC (rev 2892)
@@ -18,9 +18,12 @@
#include "moko-panel-applet.h"
+#include <matchbox-panel/mb-panel-scaling-image.h>
#include <gtk/gtkmenu.h>
#undef DEBUG_THIS_FILE
+#define DEBUG_THIS_FILE
+
#ifdef DEBUG_THIS_FILE
#define moko_debug(fmt,...) g_debug(fmt,##__VA_ARGS__)
#define moko_debug_minder(predicate) moko_debug( __FUNCTION__ );
g_return_if_fail(predicate)
@@ -37,7 +40,6 @@
{
gboolean is_initialized;
gboolean hold_timeout_triggered;
- gboolean scaling_requested;
} MokoPanelAppletPrivate;
enum {
@@ -197,17 +199,16 @@
////////////////
// PUBLIC API //
////////////////
-void moko_panel_applet_set_icon(MokoPanelApplet* self, const gchar* filename,
gboolean request_scaling)
+void moko_panel_applet_set_icon(MokoPanelApplet* self, const gchar* filename)
{
if ( !self->icon )
{
- self->icon = gtk_image_new_from_file( filename );
- g_return_if_fail( self->icon );
+ self->icon = mb_panel_scaling_image_new( GTK_ORIENTATION_HORIZONTAL,
NULL );
+ mb_panel_scaling_image_set_caching(
MB_PANEL_SCALING_IMAGE(self->icon), TRUE );
gtk_container_add( GTK_CONTAINER(self->eventbox), self->icon );
gtk_widget_show( self->icon );
}
- else
- gtk_image_set_from_file( GTK_IMAGE (self->icon), filename );
+ mb_panel_scaling_image_set_icon( MB_PANEL_SCALING_IMAGE(self->icon),
filename );
}
void moko_panel_applet_set_pixbuf(MokoPanelApplet* self, GdkPixbuf* pixbuf)
Modified:
trunk/src/target/OM-2007.2/libraries/libmokopanelui2/libmokopanelui/moko-panel-applet.h
===================================================================
---
trunk/src/target/OM-2007.2/libraries/libmokopanelui2/libmokopanelui/moko-panel-applet.h
2007-09-02 13:26:47 UTC (rev 2891)
+++
trunk/src/target/OM-2007.2/libraries/libmokopanelui2/libmokopanelui/moko-panel-applet.h
2007-09-02 18:03:39 UTC (rev 2892)
@@ -48,7 +48,7 @@
typedef struct {
GtkAlignment parent;
- GtkWidget* icon; /* GtkImage */
+ GtkWidget* icon; /* MBPanelScalingImage */
GtkWidget* popup[LAST_POPUP_TYPE];
GtkWidget* toplevelwindow; /* GtkWindow */
GtkWidget* eventbox; /* GtkEventBox */
@@ -68,7 +68,7 @@
void moko_panel_system_init( int* argc, char*** argv );
/* simple interface */
-void moko_panel_applet_set_icon(MokoPanelApplet* self, const gchar* filename,
gboolean scaling);
+void moko_panel_applet_set_icon(MokoPanelApplet* self, const gchar* filename);
void moko_panel_applet_set_pixbuf(MokoPanelApplet* self, GdkPixbuf* pixbuf);
void moko_panel_applet_set_widget(MokoPanelApplet* self, GtkWidget* widget);
void moko_panel_applet_get_positioning_hint(MokoPanelApplet* self, GtkWidget*
popup, int* x, int* y);
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-09-02 20:15:06 +0200 (Sun, 02 Sep 2007)
New Revision: 2893
Modified:
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-gps/ChangeLog
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-gps/src/openmoko-panel-gps.c
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-usb/ChangeLog
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-usb/src/openmoko-panel-usb.c
Log:
openmoko-panel-usb: catch up with libmokopanelui2 changes
openmoko-panel-gps: catch up with libmokopanelui2 changes
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-09-02 18:03:39 UTC (rev 2892)
+++ trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-gps/ChangeLog
2007-09-02 18:15:06 UTC (rev 2893)
@@ -1,5 +1,10 @@
+2007-09-02 Michael Lauer <[EMAIL PROTECTED]>
+
+ * src/openmoko-panel-gps:
+ Use moko_panel_applet_set_icon to set the icon.
+
2007-07-30 Michael Lauer <[EMAIL PROTECTED]>
- * configure.ac:
- Import panel-plugin into 2007.2 and refer to libmokopanelui2.
+ * configure.ac:
+ Import panel-plugin into 2007.2 and refer to libmokopanelui2.
Modified:
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-gps/src/openmoko-panel-gps.c
===================================================================
---
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-gps/src/openmoko-panel-gps.c
2007-09-02 18:03:39 UTC (rev 2892)
+++
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-gps/src/openmoko-panel-gps.c
2007-09-02 18:15:06 UTC (rev 2893)
@@ -1,6 +1,6 @@
/* openmoko-panel-gps.c
*
- * Authored by
+ * Authored by Michael 'Mickey' Lauer <[EMAIL PROTECTED]>
* Copyright (C) 2007 OpenMoko Inc.
*
* This program is free software; you can redistribute it and/or modify
@@ -20,7 +20,7 @@
#include <time.h>
typedef struct {
- GtkImage *image;
+ int dummy;
} GpsApplet;
static void
@@ -29,7 +29,7 @@
g_slice_free (GpsApplet, applet);
}
-G_MODULE_EXPORT GtkWidget*
+G_MODULE_EXPORT GtkWidget*
mb_panel_applet_create(const char* id, GtkOrientation orientation)
{
MokoPanelApplet* mokoapplet = moko_panel_applet_new();
@@ -40,11 +40,7 @@
applet = g_slice_new (GpsApplet);
- applet->image = GTK_IMAGE(gtk_image_new_from_file ( PKGDATADIR
"/GPS.png"));
- gtk_widget_set_name( applet->image, "openmoko-gps-applet" );
- g_object_weak_ref( G_OBJECT(applet->image), (GWeakNotify) gps_applet_free,
applet );
-
- moko_panel_applet_set_widget( GTK_CONTAINER(mokoapplet), applet->image );
+ moko_panel_applet_set_icon( GTK_CONTAINER(mokoapplet), PKGDATADIR
"/GPS.png" );
gtk_widget_show_all( GTK_WIDGET(mokoapplet) );
return GTK_WIDGET(mokoapplet);
};
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-09-02 18:03:39 UTC (rev 2892)
+++ trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-usb/ChangeLog
2007-09-02 18:15:06 UTC (rev 2893)
@@ -1,5 +1,9 @@
-2007-07-30 Michael Lauer <[EMAIL PROTECTED]>
+2007-09-02 Michael Lauer <[EMAIL PROTECTED]>
- * configure.ac:
- Import panel-plugin into 2007.2 and refer to libmokopanelui2.
+ * src/openmoko-panel-gps:
+ Use moko_panel_applet_set_icon to set the icon.
+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/src/openmoko-panel-usb.c
===================================================================
---
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-usb/src/openmoko-panel-usb.c
2007-09-02 18:03:39 UTC (rev 2892)
+++
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-usb/src/openmoko-panel-usb.c
2007-09-02 18:15:06 UTC (rev 2893)
@@ -20,7 +20,7 @@
#include <time.h>
typedef struct {
- GtkImage *image;
+ int dummy;
} UsbApplet;
static void
@@ -29,7 +29,7 @@
g_slice_free (UsbApplet, applet);
}
-G_MODULE_EXPORT GtkWidget*
+G_MODULE_EXPORT GtkWidget*
mb_panel_applet_create(const char* id, GtkOrientation orientation)
{
MokoPanelApplet* mokoapplet = moko_panel_applet_new();
@@ -40,11 +40,8 @@
applet = g_slice_new (UsbApplet);
- applet->image = GTK_IMAGE(gtk_image_new_from_file ( PKGDATADIR
"/Usb.png"));
- gtk_widget_set_name( applet->image, "openmoko-usb-applet" );
- g_object_weak_ref( G_OBJECT(applet->image), (GWeakNotify) usb_applet_free,
applet );
+ moko_panel_applet_set_icon( mokoapplet, PKGDATADIR "/Usb.png" );
- moko_panel_applet_set_widget( GTK_CONTAINER(mokoapplet), applet->image );
gtk_widget_show_all( GTK_WIDGET(mokoapplet) );
return GTK_WIDGET(mokoapplet);
};
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-09-02 21:52:27 +0200 (Sun, 02 Sep 2007)
New Revision: 2894
Modified:
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-gsm/ChangeLog
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-gsm/src/openmoko-panel-gsm.c
Log:
openmoko-panel-gsm: catch up with libmokopanelui2
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-09-02 18:15:06 UTC (rev 2893)
+++ trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-gsm/ChangeLog
2007-09-02 19:52:27 UTC (rev 2894)
@@ -1,17 +1,23 @@
+2007-09-02 Michael Lauer <[EMAIL PROTECTED]>
+
+ * src/openmoko-panel-gsm.c:
+ (mb_panel_applet_create):
+ Catch up with libmokopanelui2, use simple way to set icon
+
2007-08-20 Stefan Schmidt <[EMAIL PROTECTED]>
- * src/openmoko-panel-gsm.c:
- (mb_panel_applet_create):
- Use the right items for the signals.
+ * src/openmoko-panel-gsm.c:
+ (mb_panel_applet_create):
+ Use the right items for the signals.
2007-07-31 Michael Lauer <[EMAIL PROTECTED]>
- * src/openmoko-panel-gsm.c:
- * configure.ac:
- Catch up with libmokogsmd2
+ * src/openmoko-panel-gsm.c:
+ * configure.ac:
+ Catch up with libmokogsmd2
2007-07-30 Michael Lauer <[EMAIL PROTECTED]>
- * configure.ac:
- Import panel-plugin into 2007.2 and refer to libmokopanelui2.
+ * configure.ac:
+ Import panel-plugin into 2007.2 and refer to libmokopanelui2.
Modified:
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-gsm/src/openmoko-panel-gsm.c
===================================================================
---
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-gsm/src/openmoko-panel-gsm.c
2007-09-02 18:15:06 UTC (rev 2893)
+++
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-gsm/src/openmoko-panel-gsm.c
2007-09-02 19:52:27 UTC (rev 2894)
@@ -26,27 +26,27 @@
#define _MAX_SIGNAL 30.0
typedef struct {
- GtkWidget* image;
+ MokoPanelApplet* mokoapplet;
gboolean gprs_mode;
MokoGsmdConnection* gsm;
} GsmApplet;
-static void
+static void
gsm_applet_free(GsmApplet *applet)
{
g_slice_free( GsmApplet, applet );
}
-static void
-gsm_applet_update_signal_strength(MokoGsmdConnection* connection,
- int strength,
+static void
+gsm_applet_update_signal_strength(MokoGsmdConnection* connection,
+ int strength,
GsmApplet* applet)
{
gfloat percent;
gint pixmap = 0;
gchar *image = NULL;
- g_debug( "gsm_applet_update_signal_strength: signal strength = %d",
+ g_debug( "gsm_applet_update_signal_strength: signal strength = %d",
strength );
percent = (strength / _MAX_SIGNAL) * 100;
@@ -64,46 +64,44 @@
else
pixmap = 5;
- image = g_strdup_printf( "%s/SignalStrength%s%02d.png",
- PKGDATADIR,
+ image = g_strdup_printf( "%s/SignalStrength%s%02d.png",
+ PKGDATADIR,
applet->gprs_mode ? "25g_" : "_", pixmap );
- gtk_image_set_from_file( GTK_IMAGE(applet->image), image );
+ moko_panel_applet_set_icon( applet->mokoapplet, image );
+
g_free (image);
}
-static void
+static void
gsm_applet_power_up_antenna(GtkWidget* menu, GsmApplet* applet)
{
//TODO notify user
moko_gsmd_connection_set_antenna_power( applet->gsm, TRUE );
}
-static void
+static void
gsm_applet_autoregister_network(GtkWidget* menu, GsmApplet* applet)
{
moko_gsmd_connection_network_register( applet->gsm );
}
-static void
+static void
gsm_applet_power_down_antenna(GtkWidget* menu, GsmApplet* applet)
{
//TODO notify user
moko_gsmd_connection_set_antenna_power( applet->gsm, FALSE );
}
-G_MODULE_EXPORT GtkWidget*
+G_MODULE_EXPORT GtkWidget*
mb_panel_applet_create(const char* id, GtkOrientation orientation)
{
- MokoPanelApplet* mokoapplet = MOKO_PANEL_APPLET(moko_panel_applet_new());
+ GsmApplet* applet = g_slice_new(GsmApplet);
+ MokoPanelApplet* mokoapplet = applet->mokoapplet =
MOKO_PANEL_APPLET(moko_panel_applet_new());
- GsmApplet* applet;
- applet = g_slice_new(GsmApplet);
- applet->image = gtk_image_new_from_file( PKGDATADIR
"/SignalStrength_NR.png" );
+ moko_panel_applet_set_icon( mokoapplet, PKGDATADIR
"/SignalStrength_NR.png" );
+
applet->gprs_mode = FALSE;
- gtk_widget_set_name( GTK_WIDGET(applet->image), "openmoko-gsm-applet" );
- g_object_weak_ref( G_OBJECT(applet->image), (GWeakNotify) gsm_applet_free,
applet );
- moko_panel_applet_set_widget( mokoapplet, GTK_WIDGET(applet->image) );
gtk_widget_show_all( GTK_WIDGET(mokoapplet) );
applet->gsm = moko_gsmd_connection_new();
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-09-02 22:02:12 +0200 (Sun, 02 Sep 2007)
New Revision: 2895
Modified:
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-bt/ChangeLog
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-bt/src/openmoko-panel-bt.c
Log:
openmoko-panel-bt: catch up with libmokopanelui2, reindent
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-09-02 19:52:27 UTC (rev 2894)
+++ trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-bt/ChangeLog
2007-09-02 20:02:12 UTC (rev 2895)
@@ -1,11 +1,16 @@
+2007-09-02 Michael Lauer <[EMAIL PROTECTED]>
+
+ * src/openmoko-panel-bt.c:
+ Catch up with libmokopanelui2, reindent contribution to match rest of
file
+
2007-08-29 Stefan Schmidt <[EMAIL PROTECTED]>
- * src/openmoko-panel-bt.c:
- Allow applet to turn the bt radio on and off. Patch from Alexandre
- d'Alton <[EMAIL PROTECTED]> (Closes #639)
+ * src/openmoko-panel-bt.c:
+ Allow applet to turn the bt radio on and off. Patch from Alexandre
+ d'Alton <[EMAIL PROTECTED]> (Closes #639)
2007-07-30 Michael Lauer <[EMAIL PROTECTED]>
- * configure.ac:
- Import panel-plugin into 2007.2 and refer to libmokopanelui2.
+ * configure.ac:
+ Import panel-plugin into 2007.2 and refer to libmokopanelui2.
Modified:
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-bt/src/openmoko-panel-bt.c
===================================================================
---
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-bt/src/openmoko-panel-bt.c
2007-09-02 19:52:27 UTC (rev 2894)
+++
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-bt/src/openmoko-panel-bt.c
2007-09-02 20:02:12 UTC (rev 2895)
@@ -1,6 +1,6 @@
/* openmoko-panel-bt.c
*
- * Authored by
+ * Authored by Michael Lauer <[EMAIL PROTECTED]>
* Copyright (C) 2007 OpenMoko Inc.
*
* This program is free software; you can redistribute it and/or modify
@@ -12,7 +12,6 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser Public License for more details.
*
- * Current Version: $Rev$ ($Date$) [$Author: mickey $]
*/
#include <libmokopanelui2/moko-panel-applet.h>
@@ -23,25 +22,25 @@
#include <stdlib.h>
#include <stdio.h>
+#define BT_POWERON_FILENAME
"/sys/class/i2c-dev/i2c-0/device/0-0008/gta01-pm-bt.0/power_on"
typedef struct {
MokoPanelApplet *mokoapplet;
- GtkImage *image;
int state;
} BtApplet;
void quick_message(gchar *message) {
GtkWidget *dialog, *label, *okay_button;
-
+
/* Create the widgets */
-
+
dialog = gtk_dialog_new();
label = gtk_label_new (message);
okay_button = gtk_button_new_with_label("Okay");
-
+
/* Ensure that the dialog box is destroyed when the user clicks ok. */
-
+
gtk_signal_connect_object (GTK_OBJECT (okay_button), "clicked",
GTK_SIGNAL_FUNC (gtk_widget_destroy), dialog);
gtk_container_add (GTK_CONTAINER (GTK_DIALOG(dialog)->action_area),
@@ -56,9 +55,7 @@
gtk_widget_show_all (dialog);
}
-#define BT_POWERON_FILENAME
"/sys/class/i2c-dev/i2c-0/device/0-0008/gta01-pm-bt.0/power_on"
-
-static int
+static int
read_bt_power(void)
{
FILE * f = fopen(BT_POWERON_FILENAME, "r+");
@@ -71,7 +68,7 @@
return val;
}
-static int
+static int
set_bt_power(int val)
{
FILE * f = fopen(BT_POWERON_FILENAME, "w");
@@ -88,50 +85,43 @@
static void
mb_panel_update(BtApplet *applet, int state)
{
-
- if(applet->state != state) {
- printf("Will change the image ... \n");
- if (state == 1)
- gtk_image_set_from_file(applet->image, PKGDATADIR "/Bluetooth_On.png");
- else
- gtk_image_set_from_file(applet->image, PKGDATADIR "/Bluetooth_Off.png");
- applet->state = state;
- }
+ if ( applet->state != state )
+ {
+ moko_panel_applet_set_icon( applet->mokoapplet, state == 1 ?
PKGDATADIR "/Bluetooth_On.png" : PKGDATADIR "/Bluetooth_Off.png");
+ applet->state = state;
+ }
}
-
-
-static void
+static void
bt_applet_power_on(GtkWidget* menu, BtApplet* applet)
{
- int ret;
- ret = set_bt_power(1);
- mb_panel_update(applet, 1);
- quick_message(" Bluetooth turned on \n\n");
+ int ret;
+ ret = set_bt_power(1);
+ mb_panel_update(applet, 1);
+ quick_message(" Bluetooth turned on \n\n");
}
-static void
+static void
bt_applet_power_off(GtkWidget* menu, BtApplet* applet)
{
- int ret;
- ret = set_bt_power(0);
- mb_panel_update(applet, 0);
- quick_message(" Bluetooth turned off \n\n");
+ int ret;
+ ret = set_bt_power(0);
+ mb_panel_update(applet, 0);
+ quick_message(" Bluetooth turned off \n\n");
}
-static void
+static void
bt_applet_status(GtkWidget* menu, BtApplet* applet)
{
- int ret;
- char tmp_string[256];
+ int ret;
+ char tmp_string[256];
- ret = read_bt_power();
+ ret = read_bt_power();
- sprintf(tmp_string, " Bluetooth is %s \n\n", ret ? "on" : "off");
+ sprintf(tmp_string, " Bluetooth is %s \n\n", ret ? "on" : "off");
- quick_message(tmp_string);
-
+ quick_message(tmp_string);
}
static void
@@ -140,9 +130,7 @@
g_slice_free (BtApplet, applet);
}
-
-
-G_MODULE_EXPORT GtkWidget*
+G_MODULE_EXPORT GtkWidget*
mb_panel_applet_create(const char* id, GtkOrientation orientation)
{
MokoPanelApplet* mokoapplet = moko_panel_applet_new();
@@ -153,19 +141,11 @@
applet = g_slice_new (BtApplet);
- applet->state = read_bt_power();
+ applet->state = -1;
applet->mokoapplet = mokoapplet;
-
- if (applet->state == 0) {
- applet->image = GTK_IMAGE(gtk_image_new_from_file ( PKGDATADIR
"/Bluetooth_Off.png"));
- } else {
- applet->image = GTK_IMAGE(gtk_image_new_from_file ( PKGDATADIR
"/Bluetooth_On.png"));
- }
- gtk_widget_set_name( applet->image, "openmoko-bt-applet" );
- g_object_weak_ref( G_OBJECT(applet->image), (GWeakNotify) bt_applet_free,
applet );
- moko_panel_applet_set_widget( GTK_CONTAINER(applet->mokoapplet),
applet->image );
+
+ mb_panel_update( applet, read_bt_power() );
gtk_widget_show_all( GTK_WIDGET(applet->mokoapplet) );
-
GtkMenu* menu = GTK_MENU(gtk_menu_new());
GtkWidget* item1 = gtk_menu_item_new_with_label("Power-Up Bluetooth
radio");
@@ -177,9 +157,9 @@
GtkWidget* item3 = gtk_menu_item_new_with_label("Bluetooth status");
g_signal_connect(G_OBJECT(item3), "activate",
G_CALLBACK(bt_applet_status), applet);
gtk_menu_shell_append(GTK_MENU_SHELL(menu), item3);
-
+
gtk_widget_show_all(GTK_WIDGET(menu));
moko_panel_applet_set_popup( mokoapplet, GTK_WIDGET(menu),
MOKO_PANEL_APPLET_CLICK_POPUP);
return GTK_WIDGET(mokoapplet);
-};
+}
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
