r445 - trunk/src/target/OM-2007/openmoko-libs/libmokoui

ken_zhao at gta01.hmw-consulting.de ken_zhao at gta01.hmw-consulting.de
Fri Dec 22 02:26:17 CET 2006


Author: ken_zhao
Date: 2006-12-22 02:26:12 +0100 (Fri, 22 Dec 2006)
New Revision: 445

Modified:
   trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-pixmap-button.c
   trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-pixmap-button.h
Log:
mokoui:modify interface to set image in the center of moko-pixmap-button


Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-pixmap-button.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-pixmap-button.c	2006-12-22 01:24:04 UTC (rev 444)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-pixmap-button.c	2006-12-22 01:26:12 UTC (rev 445)
@@ -40,6 +40,7 @@
     GtkWidget *buttonvbox;
     GtkWidget *actionbtnlowerlabel;
     GtkWidget *actionbtnstockimage;
+    GtkWidget *centerimage;
     GtkWidget *fingertoolboxbtnimage;
     GtkWidget *fingertoolboxbtnloweralignment;
 } MokoPixmapButtonPrivate;
@@ -253,24 +254,42 @@
 }
 
 void
-moko_pixmap_button_set_action_btn_center_stock (MokoPixmapButton* self, const gchar *stock_name)
+moko_pixmap_button_set_center_stock (MokoPixmapButton* self, const gchar *stock_name)
 {
     MokoPixmapButtonPrivate* priv = MOKO_PIXMAP_BUTTON_GET_PRIVATE (self);
 	  
-    if ( priv->actionbtnstockimage )
+    if ( priv->centerimage )
         return;
 
     GtkWidget *loweralignment = gtk_alignment_new (0.5, 0.5, 0, 0);
     gtk_box_pack_start (GTK_BOX (priv->buttonvbox), loweralignment, TRUE, TRUE, 0);
 
-    priv->actionbtnstockimage = gtk_image_new_from_stock (stock_name, GTK_ICON_SIZE_DND);
-    gtk_container_add (GTK_CONTAINER (loweralignment), priv->actionbtnstockimage);
+    priv->centerimage = gtk_image_new_from_stock (stock_name, GTK_ICON_SIZE_DND);
+    gtk_container_add (GTK_CONTAINER (loweralignment), priv->centerimage);
 	  
     gtk_widget_show_all (GTK_WIDGET (priv->buttonvbox));
 }
 
 
+void
+moko_pixmap_button_set_center_image (MokoPixmapButton* self, GtkWidget* image)
+{
+    MokoPixmapButtonPrivate* priv = MOKO_PIXMAP_BUTTON_GET_PRIVATE (self);
+	  
+    if ( priv->centerimage )
+        return;
 
+    GtkWidget *loweralignment = gtk_alignment_new (0.43, 0.43, 0, 0);
+    gtk_box_pack_start (GTK_BOX (priv->buttonvbox), loweralignment, TRUE, TRUE, 0);
+
+    priv->centerimage = image;
+    gtk_container_add (GTK_CONTAINER (loweralignment), priv->centerimage);
+	  
+    gtk_widget_show_all (GTK_WIDGET (priv->buttonvbox));
+}
+
+
+
 void
 moko_pixmap_button_set_finger_toolbox_btn_center_image (MokoPixmapButton* self, GtkWidget* image)
 {

Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-pixmap-button.h
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-pixmap-button.h	2006-12-22 01:24:04 UTC (rev 444)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-pixmap-button.h	2006-12-22 01:26:12 UTC (rev 445)
@@ -52,7 +52,8 @@
 
 void moko_pixmap_button_set_action_btn_upper_stock (MokoPixmapButton* self, const gchar *stock_name);
 void moko_pixmap_button_set_action_btn_lower_label (MokoPixmapButton* self, const gchar *label);
-void moko_pixmap_button_set_action_btn_center_stock (MokoPixmapButton* self, const gchar *stock_name);
+void moko_pixmap_button_set_center_stock (MokoPixmapButton* self, const gchar *stock_name);
+void moko_pixmap_button_set_center_image (MokoPixmapButton* self, GtkWidget* image);
 void moko_pixmap_button_set_finger_toolbox_btn_center_image (MokoPixmapButton* self, GtkWidget* image);
 void moko_pixmap_button_set_finger_toolbox_btn_center_image_pixbuf (MokoPixmapButton* self, GdkPixbuf* pixbuf);
 





More information about the commitlog mailing list