r448 - in trunk/src/target/OM-2007: . applications devel/qmake devel/scripts examples openmoko-libs/libmokoui panel-plugins
mickey at gta01.hmw-consulting.de
mickey at gta01.hmw-consulting.de
Fri Dec 22 02:34:10 CET 2006
Author: mickey
Date: 2006-12-22 02:34:09 +0100 (Fri, 22 Dec 2006)
New Revision: 448
Modified:
trunk/src/target/OM-2007/applications/applications.pro
trunk/src/target/OM-2007/devel/qmake/openmoko-include.pro
trunk/src/target/OM-2007/devel/scripts/launch-xoo
trunk/src/target/OM-2007/examples/examples.pro
trunk/src/target/OM-2007/makevars.sh
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-panel-applet.c
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-panel-applet.h
trunk/src/target/OM-2007/panel-plugins/panel-plugins.pro
Log:
libmokoui/MokoPanelApplet: add API for setting an icon
Modified: trunk/src/target/OM-2007/applications/applications.pro
===================================================================
--- trunk/src/target/OM-2007/applications/applications.pro 2006-12-22 01:32:48 UTC (rev 447)
+++ trunk/src/target/OM-2007/applications/applications.pro 2006-12-22 01:34:09 UTC (rev 448)
@@ -1,8 +1,7 @@
TEMPLATE = subdirs
SUBDIRS = \
openmoko-chordmaster \
- openmoko-footer \
- openmoko-mainmenu \
+ openmoko-footer
#openmoko-appmanager openmoko-dialer
Modified: trunk/src/target/OM-2007/devel/qmake/openmoko-include.pro
===================================================================
--- trunk/src/target/OM-2007/devel/qmake/openmoko-include.pro 2006-12-22 01:32:48 UTC (rev 447)
+++ trunk/src/target/OM-2007/devel/qmake/openmoko-include.pro 2006-12-22 01:34:09 UTC (rev 448)
@@ -27,7 +27,7 @@
mokoui {
INCLUDEPATH += $(OPENMOKODIR)/openmoko-libs
- PKGCONFIG += gtk+-2.0
+ PKGCONFIG += gtk+-2.0 libmb
LIBS += -lmokoui -L$(OPENMOKODIR)/lib
}
Modified: trunk/src/target/OM-2007/devel/scripts/launch-xoo
===================================================================
--- trunk/src/target/OM-2007/devel/scripts/launch-xoo 2006-12-22 01:32:48 UTC (rev 447)
+++ trunk/src/target/OM-2007/devel/scripts/launch-xoo 2006-12-22 01:34:09 UTC (rev 448)
@@ -19,23 +19,14 @@
export DISPLAY=:1
-matchbox-panel -display $DISPLAY \
- --id 1 \
- --orientation north \
- --default-apps '' \
- --no-session \
- --no-menu \
- --no-flip \
- --bgpixmap $SVN_TRUNK/OM-2007/artwork/images/pixmaps/openmoko-header-background.png &
+matchbox-window-manager -display $DISPLAY \
+ -use_titlebar no \
+ -use_super_modal yes \
+ -use_lowlight yes \
+ -use_dialog_mode static \
+ -use_cursor yes &
-matchbox-panel -display $DISPLAY \
- --id 2 \
- --orientation south \
- --default-apps '' \
- --no-session \
- --no-menu \
- --no-flip \
- --bgpixmap $SVN_TRUNK/OM-2007/artwork/images/pixmaps/openmoko-footer-background.png &
+sleep 2
matchbox-desktop --icon-size 100 \
--icon-padding 60 \
@@ -43,9 +34,12 @@
--titlefont sans-20:bold --bg \
img-tiled:/local/pkg/openmoko/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/mokopanedwindow-upper-enclosing.png &
-exec matchbox-window-manager -display $DISPLAY \
- -use_titlebar no \
- -use_super_modal yes \
- -use_lowlight yes \
- -use_dialog_mode static \
- -use_cursor yes
+sleep 2
+
+matchbox-panel -display $DISPLAY \
+ --orientation north \
+ --default-apps '' \
+ --no-session \
+ --no-menu \
+ --no-flip \
+ --bgpixmap $SVN_TRUNK/OM-2007/artwork/images/pixmaps/openmoko-header-background.png &
Modified: trunk/src/target/OM-2007/examples/examples.pro
===================================================================
--- trunk/src/target/OM-2007/examples/examples.pro 2006-12-22 01:32:48 UTC (rev 447)
+++ trunk/src/target/OM-2007/examples/examples.pro 2006-12-22 01:34:09 UTC (rev 448)
@@ -1,3 +1,7 @@
TEMPLATE = subdirs
-SUBDIRS = openmoko-stylus-demo-simple openmoko-stylus-demo openmoko-finger-demo
+SUBDIRS = \
+ openmoko-stylus-demo-simple \
+ openmoko-stylus-demo \
+ openmoko-finger-demo \
+ openmoko-panel-demo
Modified: trunk/src/target/OM-2007/makevars.sh
===================================================================
--- trunk/src/target/OM-2007/makevars.sh 2006-12-22 01:32:48 UTC (rev 447)
+++ trunk/src/target/OM-2007/makevars.sh 2006-12-22 01:34:09 UTC (rev 448)
@@ -7,5 +7,5 @@
make clean
make
-export LD_LIBRARY_PATH=$OPENMOKODIR/lib
-
+export LD_LIBRARY_PATH=$OPENMOKODIR/lib:/usr/local/lib
+export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-panel-applet.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-panel-applet.c 2006-12-22 01:32:48 UTC (rev 447)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-panel-applet.c 2006-12-22 01:34:09 UTC (rev 448)
@@ -134,29 +134,38 @@
{
moko_debug( "moko_panel_applet_resize_callback" );
moko_debug( "-- size = %d, %d", w, h );
- if ( self->mb_pixbuf_image && self->mb_pixbuf_image->width == w && self->mb_pixbuf_image->height == h ) return;
+ if ( !self->mb_pixbuf_image )
+ {
+ g_warning( "no valid icon for panel application during resize callback" );
+ return;
+ }
+ if ( self->mb_pixbuf_image_scaled && self->mb_pixbuf_image_scaled->width == w && self->mb_pixbuf_image_scaled->height == h )
+ return;
+ moko_debug( "-- new size, scaling pixbuf" );
MBPixbufImage* scaled = mb_pixbuf_img_scale( self->mb_pixbuf, self->mb_pixbuf_image, w, h );
- mb_pixbuf_img_free( self->mb_pixbuf, self->mb_pixbuf_image );
- self->mb_pixbuf_image = scaled;
+ if ( self->mb_pixbuf_image_scaled )
+ mb_pixbuf_img_free( self->mb_pixbuf, self->mb_pixbuf_image_scaled );
+ self->mb_pixbuf_image_scaled = scaled;
}
void moko_panel_applet_real_paint_callback(MokoPanelApplet* self, Drawable drw)
{
moko_debug( "moko_panel_applet_paint_callback" );
- if ( !self->mb_pixbuf_image )
+ if ( !self->mb_pixbuf_image_scaled )
{
g_warning( "no valid icon for panel application during paint callback" );
return;
}
MBPixbufImage* background = mb_tray_app_get_background( self->mb_applet, self->mb_pixbuf );
- mb_pixbuf_img_composite( self->mb_pixbuf, background, self->mb_pixbuf_image, 0, 0 );
+ mb_pixbuf_img_composite( self->mb_pixbuf, background, self->mb_pixbuf_image_scaled, 0, 0 );
mb_pixbuf_img_render_to_drawable( self->mb_pixbuf, background, drw, 0, 0 );
mb_pixbuf_img_free( self->mb_pixbuf, background );
}
void moko_panel_applet_set_icon(MokoPanelApplet* self, const gchar* filename)
{
+ moko_debug( "moko_panel_applet_set_icon" );
g_assert( self->mb_pixbuf );
if ( self->mb_pixbuf_image ) mb_pixbuf_img_free( self->mb_pixbuf, self->mb_pixbuf_image );
self->mb_pixbuf_image = mb_pixbuf_img_new_from_file( self->mb_pixbuf, filename );
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-panel-applet.h
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-panel-applet.h 2006-12-22 01:32:48 UTC (rev 447)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-panel-applet.h 2006-12-22 01:34:09 UTC (rev 448)
@@ -39,6 +39,7 @@
MBTrayApp* mb_applet;
MBPixbuf* mb_pixbuf;
MBPixbufImage* mb_pixbuf_image;
+ MBPixbufImage* mb_pixbuf_image_scaled;
int* argc;
char*** argv;
} MokoPanelApplet;
@@ -53,6 +54,8 @@
GType moko_panel_applet_get_type();
MokoPanelApplet* moko_panel_applet_new();
+void moko_panel_applet_set_icon(MokoPanelApplet* self, const gchar* filename);
+
G_END_DECLS
#endif // _MOKO_PANEL_APPLET_H_
Modified: trunk/src/target/OM-2007/panel-plugins/panel-plugins.pro
===================================================================
--- trunk/src/target/OM-2007/panel-plugins/panel-plugins.pro 2006-12-22 01:32:48 UTC (rev 447)
+++ trunk/src/target/OM-2007/panel-plugins/panel-plugins.pro 2006-12-22 01:34:09 UTC (rev 448)
@@ -1,5 +1,5 @@
TEMPLATE = subdirs
-SUBDIRS =
+SUBDIRS =
# SUBDIRS = openmoko-panel-search
More information about the commitlog
mailing list
