Changeset 448

Timestamp:

12/22/06 02:34:09 (6 years ago)

Author:

mickey

Message:

libmokoui/MokoPanelApplet: add API for setting an icon

Location:

trunk/src/target/OM-2007

Files:

• applications/applications.pro (modified) (1 diff)
• devel/qmake/openmoko-include.pro (modified) (1 diff)
• devel/scripts/launch-xoo (modified) (2 diffs)
• examples/examples.pro (modified) (1 diff)
• makevars.sh (modified) (1 diff)
• openmoko-libs/libmokoui/moko-panel-applet.c (modified) (4 diffs)
• openmoko-libs/libmokoui/moko-panel-applet.h (modified) (2 diffs)
• panel-plugins/panel-plugins.pro (modified) (1 diff)

trunk/src/target/OM-2007/applications/applications.pro

@@ -2 +2 @@
 SUBDIRS = \
   openmoko-chordmaster \
-  openmoko-footer \
-  openmoko-mainmenu \
+  openmoko-footer
 
 #openmoko-appmanager openmoko-dialer

trunk/src/target/OM-2007/devel/qmake/openmoko-include.pro

@@ -28 +28 @@
 mokoui {
         INCLUDEPATH += $(OPENMOKODIR)/openmoko-libs
-        PKGCONFIG += gtk+-2.0
+        PKGCONFIG += gtk+-2.0 libmb
         LIBS += -lmokoui -L$(OPENMOKODIR)/lib
 }

trunk/src/target/OM-2007/devel/scripts/launch-xoo

@@ -20 +20 @@
 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 +35 @@
 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 &

trunk/src/target/OM-2007/examples/examples.pro

@@ -1 +1 @@
 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
 

trunk/src/target/OM-2007/makevars.sh

@@ -8 +8 @@
 make
 
-export LD_LIBRARY_PATH=$OPENMOKODIR/lib
-
+export LD_LIBRARY_PATH=$OPENMOKODIR/lib:/usr/local/lib
+export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig

trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-panel-applet.c

@@ -135 +135 @@
     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 +152 @@
 {
     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 +159 @@
 
     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 +166 @@
 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 );

trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-panel-applet.h

@@ -40 +40 @@
     MBPixbuf* mb_pixbuf;
     MBPixbufImage* mb_pixbuf_image;
+    MBPixbufImage* mb_pixbuf_image_scaled;
     int* argc;
     char*** argv;
@@ -54 +55 @@
 MokoPanelApplet* moko_panel_applet_new();
 
+void moko_panel_applet_set_icon(MokoPanelApplet* self, const gchar* filename);
+
 G_END_DECLS
 

trunk/src/target/OM-2007/panel-plugins/panel-plugins.pro

@@ -1 +1 @@
 TEMPLATE = subdirs
-SUBDIRS = 
+SUBDIRS =
 # SUBDIRS = openmoko-panel-search