r2892 - in trunk/src/target/OM-2007.2/libraries/libmokopanelui2: . libmokopanelui
mickey at sita.openmoko.org
mickey at sita.openmoko.org
Sun Sep 2 20:03:40 CEST 2007
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);
More information about the commitlog
mailing list
