Index: /trunk/src/target/OM-2007/applications/applications.pro =================================================================== --- /trunk/src/target/OM-2007/applications/applications.pro (revision 447) +++ /trunk/src/target/OM-2007/applications/applications.pro (revision 448) @@ -2,6 +2,5 @@ SUBDIRS = \ openmoko-chordmaster \ - openmoko-footer \ - openmoko-mainmenu \ + openmoko-footer #openmoko-appmanager openmoko-dialer Index: /trunk/src/target/OM-2007/examples/examples.pro =================================================================== --- /trunk/src/target/OM-2007/examples/examples.pro (revision 447) +++ /trunk/src/target/OM-2007/examples/examples.pro (revision 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 Index: /trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-panel-applet.c =================================================================== --- /trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-panel-applet.c (revision 447) +++ /trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-panel-applet.c (revision 448) @@ -135,8 +135,16 @@ 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; } @@ -144,5 +152,5 @@ { 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" ); @@ -151,5 +159,5 @@ 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 ); @@ -158,4 +166,5 @@ 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 ); Index: /trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-panel-applet.h =================================================================== --- /trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-panel-applet.h (revision 447) +++ /trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-panel-applet.h (revision 448) @@ -40,4 +40,5 @@ MBPixbuf* mb_pixbuf; MBPixbufImage* mb_pixbuf_image; + MBPixbufImage* mb_pixbuf_image_scaled; int* argc; char*** argv; @@ -54,4 +55,6 @@ MokoPanelApplet* moko_panel_applet_new(); +void moko_panel_applet_set_icon(MokoPanelApplet* self, const gchar* filename); + G_END_DECLS Index: /trunk/src/target/OM-2007/panel-plugins/panel-plugins.pro =================================================================== --- /trunk/src/target/OM-2007/panel-plugins/panel-plugins.pro (revision 447) +++ /trunk/src/target/OM-2007/panel-plugins/panel-plugins.pro (revision 448) @@ -1,4 +1,4 @@ TEMPLATE = subdirs -SUBDIRS = +SUBDIRS = # SUBDIRS = openmoko-panel-search Index: /trunk/src/target/OM-2007/devel/qmake/openmoko-include.pro =================================================================== --- /trunk/src/target/OM-2007/devel/qmake/openmoko-include.pro (revision 447) +++ /trunk/src/target/OM-2007/devel/qmake/openmoko-include.pro (revision 448) @@ -28,5 +28,5 @@ mokoui { INCLUDEPATH += $(OPENMOKODIR)/openmoko-libs - PKGCONFIG += gtk+-2.0 + PKGCONFIG += gtk+-2.0 libmb LIBS += -lmokoui -L$(OPENMOKODIR)/lib } Index: /trunk/src/target/OM-2007/devel/scripts/launch-xoo =================================================================== --- /trunk/src/target/OM-2007/devel/scripts/launch-xoo (revision 447) +++ /trunk/src/target/OM-2007/devel/scripts/launch-xoo (revision 448) @@ -20,21 +20,12 @@ 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 \ @@ -44,8 +35,11 @@ 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 & Index: /trunk/src/target/OM-2007/makevars.sh =================================================================== --- /trunk/src/target/OM-2007/makevars.sh (revision 447) +++ /trunk/src/target/OM-2007/makevars.sh (revision 448) @@ -8,4 +8,4 @@ make -export LD_LIBRARY_PATH=$OPENMOKODIR/lib - +export LD_LIBRARY_PATH=$OPENMOKODIR/lib:/usr/local/lib +export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig