2009-04-14 Alberto Garcia <agarcia@igalia.com>
[hildon] / src / hildon-button.c
index e9e2bfa..7123152 100644 (file)
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2008 Nokia Corporation, all rights reserved.
  *
- * Contact: Karl Lattimer <karl.lattimer@nokia.com>
+ * Contact: Rodrigo Novo <rodrigo.novo@nokia.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser Public License as published by
  * @short_description: Widget representing a button in the Hildon framework.
  *
  * The #HildonButton is a GTK widget which represents a clickable
- * button. It is derived from the GtkButton widget and provides
+ * button. It is derived from the #GtkButton widget and provides
  * additional commodities specific to the Hildon framework.
  *
  * The height of a #HildonButton can be set to either "finger" height
  * or "thumb" height. It can also be configured to use halfscreen or
  * fullscreen width. Alternatively, either dimension can be set to
- * "auto" so it behaves like a standard GtkButton.
+ * "auto" so it behaves like a standard #GtkButton.
  *
  * The #HildonButton can hold any valid child widget, but it usually
- * contains two labels: title and value (the latter being
- * optional). To change the alignment of the labels, use
- * gtk_button_set_alignment()
+ * contains two labels, named title and value, and it can also contain
+ * an image. The contents of the button are packed together inside a
+ * #GtkAlignment and they do not expand by default (they don't use the
+ * full space of the button).
+ *
+ * To change the alignment of both labels, use gtk_button_set_alignment()
+ *
+ * To make them expand and use the full space of the button, use
+ * hildon_button_set_alignment().
+ *
+ * To change the relative alignment of each label, use
+ * hildon_button_set_title_alignment() and
+ * hildon_button_set_value_alignment().
+ *
+ * In hildon-button-example.c included in the Hildon distribution you
+ * can see examples of how to create the most common button
+ * layouts.
+ *
+ * If only one label is needed, #GtkButton can be used as well, see
+ * also hildon_gtk_button_new().
+ *
+ * <example>
+ * <title>Creating a HildonButton</title>
+ * <programlisting>
+ * void
+ * button_clicked (HildonButton *button, gpointer user_data)
+ * {
+ *     const gchar *title, *value;
+ * <!-- -->
+ *     title = hildon_button_get_title (button);
+ *     value = hildon_button_get_value (button);
+ *     g_debug ("Button clicked with title '&percnt;s' and value '&percnt;s'", title, value);
+ * }
+ * <!-- -->
+ * GtkWidget *
+ * create_button (void)
+ * {
+ *     GtkWidget *button;
+ *     GtkWidget *image;
+ * <!-- -->
+ *     button = hildon_button_new (HILDON_SIZE_AUTO_WIDTH | HILDON_SIZE_FINGER_HEIGHT,
+ *                                 HILDON_BUTTON_ARRANGEMENT_VERTICAL);
+ *     hildon_button_set_text (HILDON_BUTTON (button), "Some title", "Some value");
+ * <!-- -->
+ *     image = gtk_image_new_from_stock (GTK_STOCK_INFO, GTK_ICON_SIZE_BUTTON);
+ *     hildon_button_set_image (HILDON_BUTTON (button), image);
+ *     hildon_button_set_image_position (HILDON_BUTTON (button), GTK_POS_RIGHT);
+ * <!-- -->
+ *     gtk_button_set_alignment (GTK_BUTTON (button), 0.0, 0.5);
+ * <!-- -->
+ *     g_signal_connect (button, "clicked", G_CALLBACK (button_clicked), NULL);
+ * <!-- -->
+ *     return button;
+ * }
+ * </programlisting>
+ * </example>
  */
 
 #include                                        "hildon-button.h"
 #include                                        "hildon-enum-types.h"
-
-#define FINGER_BUTTON_HEIGHT                    70
-#define THUMB_BUTTON_HEIGHT                     105
-#define HALFSCREEN_BUTTON_WIDTH                 400
-#define FULLSCREEN_BUTTON_WIDTH                 800
+#include                                        "hildon-gtk.h"
+#include                                        "hildon-helper.h"
 
 G_DEFINE_TYPE                                   (HildonButton, hildon_button, GTK_TYPE_BUTTON);
 
@@ -55,14 +105,22 @@ struct                                          _HildonButtonPrivate
 {
     GtkLabel *title;
     GtkLabel *value;
+    GtkBox *hbox;
+    GtkWidget *label_box;
     GtkWidget *alignment;
+    GtkWidget *image;
+    GtkPositionType image_position;
+    gfloat image_xalign;
+    gfloat image_yalign;
+    HildonButtonStyle style;
 };
 
 enum {
-  PROP_TITLE = 1,
-  PROP_VALUE,
-  PROP_SIZE_FLAGS,
-  PROP_ARRANGEMENT
+    PROP_TITLE = 1,
+    PROP_VALUE,
+    PROP_SIZE,
+    PROP_ARRANGEMENT,
+    PROP_STYLE
 };
 
 static void
@@ -88,12 +146,15 @@ hildon_button_set_property                      (GObject      *object,
     case PROP_VALUE:
         hildon_button_set_value (button, g_value_get_string (value));
         break;
-    case PROP_SIZE_FLAGS:
-        hildon_helper_set_theme_size (GTK_WIDGET (button), g_value_get_flags (value));
+    case PROP_SIZE:
+        hildon_gtk_widget_set_theme_size (GTK_WIDGET (button), g_value_get_flags (value));
         break;
     case PROP_ARRANGEMENT:
         hildon_button_set_arrangement (button, g_value_get_enum (value));
         break;
+    case PROP_STYLE:
+        hildon_button_set_style (button, g_value_get_enum (value));
+        break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
         break;
@@ -107,15 +168,17 @@ hildon_button_get_property                      (GObject    *object,
                                                  GParamSpec *pspec)
 {
     HildonButton *button = HILDON_BUTTON (object);
-    HildonButtonPrivate *priv = HILDON_BUTTON_GET_PRIVATE (button);
 
     switch (prop_id)
     {
     case PROP_TITLE:
-        g_value_set_string (value, gtk_label_get_text (priv->title));
+        g_value_set_string (value, hildon_button_get_title (button));
         break;
     case PROP_VALUE:
-        g_value_set_string (value, gtk_label_get_text (priv->value));
+        g_value_set_string (value, hildon_button_get_value (button));
+        break;
+    case PROP_STYLE:
+        g_value_set_enum (value, hildon_button_get_style (button));
         break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -124,6 +187,44 @@ hildon_button_get_property                      (GObject    *object,
 }
 
 static void
+hildon_button_style_set                         (GtkWidget *widget,
+                                                 GtkStyle  *previous_style)
+{
+    guint horizontal_spacing, vertical_spacing, image_spacing;
+    HildonButtonPrivate *priv = HILDON_BUTTON_GET_PRIVATE (widget);
+
+    if (GTK_WIDGET_CLASS (hildon_button_parent_class)->style_set)
+        GTK_WIDGET_CLASS (hildon_button_parent_class)->style_set (widget, previous_style);
+
+    gtk_widget_style_get (widget,
+                          "horizontal-spacing", &horizontal_spacing,
+                          "vertical-spacing", &vertical_spacing,
+                          "image-spacing", &image_spacing,
+                          NULL);
+
+    if (GTK_IS_HBOX (priv->label_box)) {
+        gtk_box_set_spacing (GTK_BOX (priv->label_box), horizontal_spacing);
+    } else {
+        gtk_box_set_spacing (GTK_BOX (priv->label_box), vertical_spacing);
+    }
+
+    if (GTK_IS_BOX (priv->hbox)) {
+        gtk_box_set_spacing (priv->hbox, image_spacing);
+    }
+}
+
+static void
+hildon_button_finalize                          (GObject *object)
+{
+    HildonButtonPrivate *priv = HILDON_BUTTON_GET_PRIVATE (object);
+
+    g_object_unref (priv->alignment);
+    g_object_unref (priv->label_box);
+
+    G_OBJECT_CLASS (hildon_button_parent_class)->finalize (object);
+}
+
+static void
 hildon_button_class_init                        (HildonButtonClass *klass)
 {
     GObjectClass *gobject_class = (GObjectClass *)klass;
@@ -131,6 +232,8 @@ hildon_button_class_init                        (HildonButtonClass *klass)
 
     gobject_class->set_property = hildon_button_set_property;
     gobject_class->get_property = hildon_button_get_property;
+    gobject_class->finalize = hildon_button_finalize;
+    widget_class->style_set = hildon_button_style_set;
 
     g_object_class_install_property (
         gobject_class,
@@ -140,7 +243,7 @@ hildon_button_class_init                        (HildonButtonClass *klass)
             "Title",
             "Text of the title label inside the button",
             NULL,
-            G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+            G_PARAM_READWRITE));
 
     g_object_class_install_property (
         gobject_class,
@@ -150,14 +253,14 @@ hildon_button_class_init                        (HildonButtonClass *klass)
             "Value",
             "Text of the value label inside the button",
             NULL,
-            G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+            G_PARAM_READWRITE));
 
     g_object_class_install_property (
         gobject_class,
-        PROP_SIZE_FLAGS,
+        PROP_SIZE,
         g_param_spec_flags (
-            "size-flags",
-            "Size flags",
+            "size",
+            "Size",
             "Size request for the button",
             HILDON_TYPE_SIZE_TYPE,
             HILDON_SIZE_AUTO,
@@ -174,6 +277,17 @@ hildon_button_class_init                        (HildonButtonClass *klass)
             HILDON_BUTTON_ARRANGEMENT_HORIZONTAL,
             G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
 
+    g_object_class_install_property (
+        gobject_class,
+        PROP_STYLE,
+        g_param_spec_enum (
+            "style",
+            "Style",
+            "Visual style of the button",
+            HILDON_TYPE_BUTTON_STYLE,
+            HILDON_BUTTON_STYLE_NORMAL,
+            G_PARAM_READWRITE));
+
     gtk_widget_class_install_style_property (
         widget_class,
         g_param_spec_uint (
@@ -203,44 +317,128 @@ hildon_button_init                              (HildonButton *self)
     priv->title = GTK_LABEL (gtk_label_new (NULL));
     priv->value = GTK_LABEL (gtk_label_new (NULL));
     priv->alignment = gtk_alignment_new (0.5, 0.5, 0, 0);
+    priv->image = NULL;
+    priv->image_position = GTK_POS_LEFT;
+    priv->image_xalign = 0.5;
+    priv->image_yalign = 0.5;
+    priv->hbox = NULL;
+    priv->label_box = NULL;
 
     gtk_widget_set_name (GTK_WIDGET (priv->title), "hildon-button-title");
     gtk_widget_set_name (GTK_WIDGET (priv->value), "hildon-button-value");
 
+    hildon_button_set_style (self, HILDON_BUTTON_STYLE_NORMAL);
+
     gtk_misc_set_alignment (GTK_MISC (priv->title), 0, 0.5);
     gtk_misc_set_alignment (GTK_MISC (priv->value), 0, 0.5);
 
-    /* The value label is not shown automatically, see hildon_button_set_value() */
+    g_object_ref_sink (priv->alignment);
+
+    /* The labels are not shown automatically, see hildon_button_set_(title|value) */
+    gtk_widget_set_no_show_all (GTK_WIDGET (priv->title), TRUE);
     gtk_widget_set_no_show_all (GTK_WIDGET (priv->value), TRUE);
+
+    gtk_button_set_focus_on_click (GTK_BUTTON (self), FALSE);
 }
 
 /**
- * hildon_button_set_size_groups:
+ * hildon_button_add_title_size_group:
  * @button: a #HildonButton
- * @title_size_group: A #GtkSizeGroup for the button title (main label), or %NULL
- * @value_size_group: A #GtkSizeGroup group for the button value (secondary label), or %NULL
+ * @size_group: A #GtkSizeGroup for the button title (main label)
+ *
+ * Adds the title label of @button to @size_group.
  *
- * Adds the title and value labels of @button to @title_size_group and
- * @value_size_group respectively. %NULL size groups will be ignored.
+ * Since: 2.2
  **/
 void
-hildon_button_set_size_groups                   (HildonButton *button,
-                                                 GtkSizeGroup *title_size_group,
-                                                 GtkSizeGroup *value_size_group)
+hildon_button_add_title_size_group              (HildonButton *button,
+                                                 GtkSizeGroup *size_group)
+{
+    HildonButtonPrivate *priv;
+
+    g_return_if_fail (HILDON_IS_BUTTON (button));
+    g_return_if_fail (GTK_IS_SIZE_GROUP (size_group));
+
+    priv = HILDON_BUTTON_GET_PRIVATE (button);
+
+    gtk_size_group_add_widget (size_group, GTK_WIDGET (priv->title));
+}
+
+/**
+ * hildon_button_add_value_size_group:
+ * @button: a #HildonButton
+ * @size_group: A #GtkSizeGroup for the button value (secondary label)
+ *
+ * Adds the value label of @button to @size_group.
+ *
+ * Since: 2.2
+ **/
+void
+hildon_button_add_value_size_group              (HildonButton *button,
+                                                 GtkSizeGroup *size_group)
 {
     HildonButtonPrivate *priv;
 
     g_return_if_fail (HILDON_IS_BUTTON (button));
-    g_return_if_fail (!title_size_group || GTK_IS_SIZE_GROUP (title_size_group));
-    g_return_if_fail (!value_size_group || GTK_IS_SIZE_GROUP (value_size_group));
+    g_return_if_fail (GTK_IS_SIZE_GROUP (size_group));
 
     priv = HILDON_BUTTON_GET_PRIVATE (button);
 
+    gtk_size_group_add_widget (size_group, GTK_WIDGET (priv->value));
+}
+
+/**
+ * hildon_button_add_image_size_group:
+ * @button: a #HildonButton
+ * @size_group: A #GtkSizeGroup for the button image
+ *
+ * Adds the image of @button to @size_group. You must add an image
+ * using hildon_button_set_image() before calling this function.
+ *
+ * Since: 2.2
+ **/
+void
+hildon_button_add_image_size_group              (HildonButton *button,
+                                                 GtkSizeGroup *size_group)
+{
+    HildonButtonPrivate *priv;
+
+    g_return_if_fail (HILDON_IS_BUTTON (button));
+    g_return_if_fail (GTK_IS_SIZE_GROUP (size_group));
+
+    priv = HILDON_BUTTON_GET_PRIVATE (button);
+
+    g_return_if_fail (GTK_IS_WIDGET (priv->image));
+
+    gtk_size_group_add_widget (size_group, GTK_WIDGET (priv->image));
+}
+
+/**
+ * hildon_button_add_size_groups:
+ * @button: a #HildonButton
+ * @title_size_group: A #GtkSizeGroup for the button title (main label), or %NULL
+ * @value_size_group: A #GtkSizeGroup group for the button value (secondary label), or %NULL
+ * @image_size_group: A #GtkSizeGroup group for the button image, or %NULL
+ *
+ * Convenience function to add title, value and image to size
+ * groups. %NULL size groups will be ignored.
+ *
+ * Since: 2.2
+ **/
+void
+hildon_button_add_size_groups                   (HildonButton *button,
+                                                 GtkSizeGroup *title_size_group,
+                                                 GtkSizeGroup *value_size_group,
+                                                 GtkSizeGroup *image_size_group)
+{
     if (title_size_group)
-        gtk_size_group_add_widget (title_size_group, GTK_WIDGET (priv->title));
+        hildon_button_add_title_size_group (button, title_size_group);
 
     if (value_size_group)
-        gtk_size_group_add_widget (value_size_group, GTK_WIDGET (priv->value));
+        hildon_button_add_value_size_group (button, value_size_group);
+
+    if (image_size_group)
+        hildon_button_add_image_size_group (button, image_size_group);
 }
 
 /**
@@ -248,15 +446,20 @@ hildon_button_set_size_groups                   (HildonButton *button,
  * @size: Flags to set the size of the button.
  * @arrangement: How the labels must be arranged.
  *
- * Creates a new #HildonButton. To add a child widget use gtk_container_add().
+ * Creates a new #HildonButton. To set text in the labels, use
+ * hildon_button_set_title() and
+ * hildon_button_set_value(). Alternatively, you can add a custom
+ * child widget using gtk_container_add().
  *
  * Returns: a new #HildonButton
+ *
+ * Since: 2.2
  **/
 GtkWidget *
 hildon_button_new                               (HildonSizeType          size,
                                                  HildonButtonArrangement arrangement)
 {
-    return hildon_button_new_full (size, arrangement, NULL, NULL, NULL, NULL);
+    return hildon_button_new_with_text (size, arrangement, NULL, NULL);
 }
 
 /**
@@ -269,9 +472,12 @@ hildon_button_new                               (HildonSizeType          size,
  * Creates a new #HildonButton with two labels, @title and @value.
  *
  * If you just don't want to use one of the labels, set it to
- * %NULL. You can set it to a non-%NULL value at any time later.
+ * %NULL. You can set it to a non-%NULL value at any time later using
+ * hildon_button_set_title() or hildon_button_set_value() .
  *
  * Returns: a new #HildonButton
+ *
+ * Since: 2.2
  **/
 GtkWidget *
 hildon_button_new_with_text                     (HildonSizeType           size,
@@ -279,50 +485,15 @@ hildon_button_new_with_text                     (HildonSizeType           size,
                                                  const gchar             *title,
                                                  const gchar             *value)
 {
-    return hildon_button_new_full (size, arrangement, title, value, NULL, NULL);
-}
-
-/**
- * hildon_button_new_full:
- * @size: Flags to set the size of the button.
- * @arrangement: How the labels must be arranged.
- * @title: Title of the button (main label)
- * @value: Value of the button (secondary label), or %NULL
- * @title_size_group: a #GtkSizeGroup for the @title label, or %NULL
- * @value_size_group: a #GtkSizeGroup for the @value label, or %NULL
- *
- * Creates a new #HildonButton with two labels, @title and @value, and
- * their respective size groups.
- *
- * If you just don't want to use one of the labels, set it to
- * %NULL. You can set it to a non-%NULL value at any time later.
- *
- * @title and @value will be added to @title_size_group and
- * @value_size_group, respectively, if present.
- *
- * Returns: a new #HildonButton
- **/
-GtkWidget *
-hildon_button_new_full                          (HildonSizeType           size,
-                                                 HildonButtonArrangement  arrangement,
-                                                 const gchar             *title,
-                                                 const gchar             *value,
-                                                 GtkSizeGroup            *title_size_group,
-                                                 GtkSizeGroup            *value_size_group)
-{
     GtkWidget *button;
 
     /* Create widget */
     button = g_object_new (HILDON_TYPE_BUTTON,
-                           "size-flags", size,
-                           "arrangement", arrangement,
+                           "size", size,
                            "title", title,
                            "value", value,
-                           "name", "hildon-button",
+                           "arrangement", arrangement,
                            NULL);
-    /* Set size groups */
-    if (title_size_group || value_size_group)
-        hildon_button_set_size_groups (HILDON_BUTTON (button), title_size_group, value_size_group);
 
     return button;
 }
@@ -331,39 +502,42 @@ static void
 hildon_button_set_arrangement                   (HildonButton            *button,
                                                  HildonButtonArrangement  arrangement)
 {
-    GtkWidget *box;
     HildonButtonPrivate *priv;
-    guint horizontal_spacing;
-    guint vertical_spacing;
 
     priv = HILDON_BUTTON_GET_PRIVATE (button);
 
     /* Pack everything */
-    gtk_widget_style_get (GTK_WIDGET (button),
-                          "horizontal-spacing", &horizontal_spacing,
-                          "vertical-spacing", &vertical_spacing,
-                          NULL);
-
     if (arrangement == HILDON_BUTTON_ARRANGEMENT_VERTICAL) {
-        box = gtk_vbox_new (FALSE, vertical_spacing);
+        priv->label_box = gtk_vbox_new (FALSE, 0);
+        hildon_helper_set_logical_font (GTK_WIDGET (priv->value), "SmallSystemFont");
     } else {
-        box = gtk_hbox_new (FALSE, horizontal_spacing);
+        priv->label_box = gtk_hbox_new (FALSE, 0);
     }
 
-    gtk_box_pack_start (GTK_BOX (box), GTK_WIDGET (priv->title), TRUE, TRUE, 0);
-    gtk_box_pack_start (GTK_BOX (box), GTK_WIDGET (priv->value), TRUE, TRUE, 0);
+    g_object_ref_sink (priv->label_box);
+
+    /* If we pack both labels with (TRUE, TRUE) or (FALSE, FALSE) they
+     * can be painted outside of the button in some situations, see
+     * NB#88126 and NB#110689 */
+    gtk_box_pack_start (GTK_BOX (priv->label_box), GTK_WIDGET (priv->title), FALSE, FALSE, 0);
+    gtk_box_pack_start (GTK_BOX (priv->label_box), GTK_WIDGET (priv->value), TRUE, TRUE, 0);
 
-    gtk_container_add (GTK_CONTAINER (priv->alignment), box);
+    hildon_button_construct_child (button);
 }
 
 /**
  * hildon_button_set_title:
  * @button: a #HildonButton
- * @title: a new title (main label) for the button.
+ * @title: a new title (main label) for the button, or %NULL
  *
  * Sets the title (main label) of @button to @title.
  *
- * This will clear the previously set title.
+ * This will clear any previously set title.
+ *
+ * If @title is set to %NULL, the title label will be hidden and the
+ * value label will be realigned.
+ *
+ * Since: 2.2
  **/
 void
 hildon_button_set_title                         (HildonButton *button,
@@ -376,8 +550,14 @@ hildon_button_set_title                         (HildonButton *button,
     priv = HILDON_BUTTON_GET_PRIVATE (button);
     gtk_label_set_text (priv->title, title);
 
-    if (title)
+    /* If the button has no title, hide the label so the value is
+     * properly aligned */
+    if (title) {
         hildon_button_construct_child (button);
+        gtk_widget_show (GTK_WIDGET (priv->title));
+    } else {
+        gtk_widget_hide (GTK_WIDGET (priv->title));
+    }
 
     g_object_notify (G_OBJECT (button), "title");
 }
@@ -389,11 +569,12 @@ hildon_button_set_title                         (HildonButton *button,
  *
  * Sets the value (secondary label) of @button to @value.
  *
- * This will clear the previously set value.
+ * This will clear any previously set value.
  *
  * If @value is set to %NULL, the value label will be hidden and the
  * title label will be realigned.
  *
+ * Since: 2.2
  **/
 void
 hildon_button_set_value                         (HildonButton *button,
@@ -408,10 +589,12 @@ hildon_button_set_value                         (HildonButton *button,
 
     /* If the button has no value, hide the label so the title is
      * properly aligned */
-    if (value)
+    if (value) {
+        hildon_button_construct_child (button);
         gtk_widget_show (GTK_WIDGET (priv->value));
-    else
+    } else {
         gtk_widget_hide (GTK_WIDGET (priv->value));
+    }
 
     g_object_notify (G_OBJECT (button), "value");
 }
@@ -420,11 +603,16 @@ hildon_button_set_value                         (HildonButton *button,
  * hildon_button_get_title:
  * @button: a #HildonButton
  *
- * Gets the text from the main label (title) of @button, or %NULL if
- * none has been set.
+ * Fetches the text from the main label (title) of @button,
+ * as set by hildon_button_set_title() or hildon_button_set_text().
+ * If the label text has not been set the return value will be %NULL.
+ * This will be the case if you create an empty button with
+ * hildon_button_new() to use as a container.
  *
  * Returns: The text of the title label. This string is owned by the
  * widget and must not be modified or freed.
+ *
+ * Since: 2.2
  **/
 const gchar *
 hildon_button_get_title                         (HildonButton *button)
@@ -442,11 +630,16 @@ hildon_button_get_title                         (HildonButton *button)
  * hildon_button_get_value:
  * @button: a #HildonButton
  *
- * Gets the text from the secondary label (value) of @button, or %NULL
- * if none has been set.
+ * Fetches the text from the secondary label (value) of @button,
+ * as set by hildon_button_set_value() or hildon_button_set_text().
+ * If the label text has not been set the return value will be %NULL.
+ * This will be the case if you create an empty button with hildon_button_new()
+ * to use as a container.
  *
  * Returns: The text of the value label. This string is owned by the
  * widget and must not be modified or freed.
+ *
+ * Since: 2.2
  **/
 const gchar *
 hildon_button_get_value                         (HildonButton *button)
@@ -467,6 +660,8 @@ hildon_button_get_value                         (HildonButton *button)
  * @value: new text for the button value (secondary label)
  *
  * Convenience function to change both labels of a #HildonButton
+ *
+ * Since: 2.2
  **/
 void
 hildon_button_set_text                          (HildonButton *button,
@@ -477,20 +672,351 @@ hildon_button_set_text                          (HildonButton *button,
     hildon_button_set_value (button, value);
 }
 
+/**
+ * hildon_button_set_image:
+ * @button: a #HildonButton
+ * @image: a widget to set as the button image
+ *
+ * Sets the image of @button to the given widget. The previous image
+ * (if any) will be removed.
+ *
+ * Since: 2.2
+ **/
+void
+hildon_button_set_image                         (HildonButton *button,
+                                                 GtkWidget    *image)
+{
+    HildonButtonPrivate *priv;
+
+    g_return_if_fail (HILDON_IS_BUTTON (button));
+    g_return_if_fail (!image || GTK_IS_WIDGET (image));
+
+    priv = HILDON_BUTTON_GET_PRIVATE (button);
+
+    /* Return if there's nothing to do */
+    if (image == priv->image)
+        return;
+
+    if (priv->image && priv->image->parent)
+        gtk_container_remove (GTK_CONTAINER (priv->image->parent), priv->image);
+
+    priv->image = image;
+
+    hildon_button_construct_child (button);
+}
+
+/**
+ * hildon_button_get_image:
+ * @button: a #HildonButton
+ *
+ * Gets the widget that is currenty set as the image of @button,
+ * previously set with hildon_button_set_image()
+ *
+ * Returns: a #GtkWidget or %NULL in case there is no image
+ *
+ * Since: 2.2
+ **/
+GtkWidget *
+hildon_button_get_image                         (HildonButton *button)
+{
+    HildonButtonPrivate *priv;
+
+    g_return_val_if_fail (HILDON_IS_BUTTON (button), NULL);
+
+    priv = HILDON_BUTTON_GET_PRIVATE (button);
+
+    return priv->image;
+}
+
+/**
+ * hildon_button_set_image_position:
+ * @button: a #HildonButton
+ * @position: the position of the image (%GTK_POS_LEFT or %GTK_POS_RIGHT)
+ *
+ * Sets the position of the image inside @button. Only %GTK_POS_LEFT
+ * and %GTK_POS_RIGHT are currently supported.
+ *
+ * Since: 2.2
+ **/
+void
+hildon_button_set_image_position                (HildonButton    *button,
+                                                 GtkPositionType  position)
+{
+    HildonButtonPrivate *priv;
+
+    g_return_if_fail (HILDON_IS_BUTTON (button));
+    g_return_if_fail (position == GTK_POS_LEFT || position == GTK_POS_RIGHT);
+
+    priv = HILDON_BUTTON_GET_PRIVATE (button);
+
+    /* Return if there's nothing to do */
+    if (priv->image_position == position)
+        return;
+
+    priv->image_position = position;
+
+    hildon_button_construct_child (button);
+}
+
+/**
+ * hildon_button_set_alignment:
+ * @button: a #HildonButton
+ * @xalign: the horizontal alignment of the contents, from 0 (left) to 1 (right).
+ * @yalign: the vertical alignment of the contents, from 0 (top) to 1 (bottom).
+ * @xscale: the amount that the child widget expands horizontally to fill up unused space, from 0 to 1
+ * @yscale: the amount that the child widget expands vertically to fill up unused space, from 0 to 1
+ *
+ * Sets the alignment of the contents of the widget. If you don't need
+ * to change @xscale or @yscale you can just use
+ * gtk_button_set_alignment() instead.
+ *
+ * Note that for this method to work properly the, child widget of
+ * @button must be a #GtkAlignment. That's what #HildonButton uses by
+ * default, so this function will work unless you add a custom widget
+ * to @button.
+ *
+ * Since: 2.2
+ **/
+void
+hildon_button_set_alignment                     (HildonButton *button,
+                                                 gfloat        xalign,
+                                                 gfloat        yalign,
+                                                 gfloat        xscale,
+                                                 gfloat        yscale)
+{
+    HildonButtonPrivate *priv;
+    GtkWidget *child;
+
+    g_return_if_fail (HILDON_IS_BUTTON (button));
+
+    priv = HILDON_BUTTON_GET_PRIVATE (button);
+
+    child = gtk_bin_get_child (GTK_BIN (button));
+
+    /* If the button has no child, use priv->alignment, which is the default one */
+    if (child == NULL)
+        child = priv->alignment;
+
+    if (GTK_IS_ALIGNMENT (child)) {
+        gtk_alignment_set (GTK_ALIGNMENT (priv->alignment), xalign, yalign, xscale, yscale);
+    }
+}
+
+/**
+ * hildon_button_set_title_alignment:
+ * @button: a #HildonButton
+ * @xalign: the horizontal alignment of the title label, from 0 (left) to 1 (right).
+ * @yalign: the vertical alignment of the title label, from 0 (top) to 1 (bottom).
+ *
+ * Sets the alignment of the title label. See also
+ * hildon_button_set_alignment() to set the alignment of the whole
+ * contents of the button.
+ *
+ * Since: 2.2
+ **/
+void
+hildon_button_set_title_alignment               (HildonButton *button,
+                                                 gfloat        xalign,
+                                                 gfloat        yalign)
+{
+    HildonButtonPrivate *priv;
+
+    g_return_if_fail (HILDON_IS_BUTTON (button));
+
+    priv = HILDON_BUTTON_GET_PRIVATE (button);
+
+    gtk_misc_set_alignment (GTK_MISC (priv->title), xalign, yalign);
+}
+
+/**
+ * hildon_button_set_value_alignment:
+ * @button: a #HildonButton
+ * @xalign: the horizontal alignment of the value label, from 0 (left) to 1 (right).
+ * @yalign: the vertical alignment of the value label, from 0 (top) to 1 (bottom).
+ *
+ * Sets the alignment of the value label. See also
+ * hildon_button_set_alignment() to set the alignment of the whole
+ * contents of the button.
+ *
+ * Since: 2.2
+ **/
+void
+hildon_button_set_value_alignment               (HildonButton *button,
+                                                 gfloat        xalign,
+                                                 gfloat        yalign)
+{
+    HildonButtonPrivate *priv;
+
+    g_return_if_fail (HILDON_IS_BUTTON (button));
+
+    priv = HILDON_BUTTON_GET_PRIVATE (button);
+
+    gtk_misc_set_alignment (GTK_MISC (priv->value), xalign, yalign);
+}
+
+/**
+ * hildon_button_set_image_alignment:
+ * @button: a #HildonButton
+ * @xalign: the horizontal alignment of the image, from 0 (left) to 1 (right).
+ * @yalign: the vertical alignment of the image, from 0 (top) to 1 (bottom).
+ *
+ * Sets the alignment of the image. See also
+ * hildon_button_set_alignment() to set the alignment of the whole
+ * contents of the button.
+ *
+ * Since: 2.2
+ **/
+void
+hildon_button_set_image_alignment               (HildonButton *button,
+                                                 gfloat        xalign,
+                                                 gfloat        yalign)
+{
+    HildonButtonPrivate *priv;
+
+    g_return_if_fail (HILDON_IS_BUTTON (button));
+
+    priv = HILDON_BUTTON_GET_PRIVATE (button);
+
+    /* Return if there's nothing to do */
+    if (priv->image_xalign == xalign && priv->image_yalign == yalign)
+        return;
+
+    priv->image_xalign = xalign;
+    priv->image_yalign = yalign;
+
+    hildon_button_construct_child (button);
+}
+
+/**
+ * hildon_button_set_style:
+ * @button: A #HildonButton
+ * @style: A #HildonButtonStyle for @button
+ *
+ * Sets the style of @button to @style. This changes the visual
+ * appearance of the button (colors, font sizes) according to the
+ * particular style chosen, but the general layout is not altered.
+ *
+ * Use %HILDON_BUTTON_STYLE_NORMAL to make it look like a normal
+ * #HildonButton, or %HILDON_BUTTON_STYLE_PICKER to make it look like
+ * a #HildonPickerButton.
+ *
+ * Since: 2.2
+ */
+void
+hildon_button_set_style                         (HildonButton      *button,
+                                                 HildonButtonStyle  style)
+{
+    HildonButtonPrivate *priv;
+    const gchar *color;
+
+    g_return_if_fail (HILDON_IS_BUTTON (button));
+
+    switch (style) {
+    case HILDON_BUTTON_STYLE_NORMAL:
+        color = "SecondaryTextColor";
+        break;
+    case HILDON_BUTTON_STYLE_PICKER:
+        color = "ActiveTextColor";
+        break;
+    default:
+        g_return_if_reached ();
+    }
+
+    priv = HILDON_BUTTON_GET_PRIVATE (button);
+
+    hildon_helper_set_logical_color (GTK_WIDGET (priv->value), GTK_RC_FG, GTK_STATE_NORMAL, color);
+    hildon_helper_set_logical_color (GTK_WIDGET (priv->value), GTK_RC_FG, GTK_STATE_PRELIGHT, color);
+
+    priv->style = style;
+
+    g_object_notify (G_OBJECT (button), "style");
+}
+
+/**
+ * hildon_button_get_style:
+ * @button: A #HildonButton
+ *
+ * Gets the visual style of the button.
+ *
+ * Returns: a #HildonButtonStyle
+ *
+ * Since: 2.2
+ */
+HildonButtonStyle
+hildon_button_get_style                         (HildonButton *button)
+{
+    HildonButtonPrivate *priv;
+
+    g_return_val_if_fail (HILDON_IS_BUTTON (button), HILDON_BUTTON_STYLE_NORMAL);
+
+    priv = HILDON_BUTTON_GET_PRIVATE (button);
+
+    return priv->style;
+}
+
 static void
 hildon_button_construct_child                   (HildonButton *button)
 {
     HildonButtonPrivate *priv = HILDON_BUTTON_GET_PRIVATE (button);
-    GtkBin *bin = GTK_BIN (button);
+    GtkWidget *child;
+    gint image_spacing;
+    const gchar *title, *value;
 
-    /* Return if there's nothing to do */
-    if (bin->child == priv->alignment)
+    /* Don't do anything if the button is not constructed yet */
+    if (G_UNLIKELY (priv->label_box == NULL))
+        return;
+
+    /* Don't do anything if the button has no contents */
+    title = gtk_label_get_text (priv->title);
+    value = gtk_label_get_text (priv->value);
+    if (!priv->image && !title[0] && !value[0])
         return;
 
-    if (bin->child) {
-        gtk_container_remove (GTK_CONTAINER (button), bin->child);
+    /* Save a ref to the image, and remove it from its container if necessary */
+    if (priv->image) {
+        g_object_ref (priv->image);
+        if (priv->image->parent != NULL)
+            gtk_container_remove (GTK_CONTAINER (priv->image->parent), priv->image);
+    }
+
+    if (priv->label_box->parent != NULL) {
+        gtk_container_remove (GTK_CONTAINER (priv->label_box->parent), priv->label_box);
+    }
+
+    /* Remove the child from the container and add priv->alignment */
+    child = gtk_bin_get_child (GTK_BIN (button));
+    if (child != NULL && child != priv->alignment) {
+        gtk_container_remove (GTK_CONTAINER (button), child);
+        child = NULL;
+    }
+
+    if (child == NULL) {
+        gtk_container_add (GTK_CONTAINER (button), GTK_WIDGET (priv->alignment));
+    }
+
+    /* Create a new hbox */
+    if (priv->hbox) {
+        gtk_container_remove (GTK_CONTAINER (priv->alignment), GTK_WIDGET (priv->hbox));
+    }
+    gtk_widget_style_get (GTK_WIDGET (button), "image-spacing", &image_spacing, NULL);
+    priv->hbox = GTK_BOX (gtk_hbox_new (FALSE, image_spacing));
+    gtk_container_add (GTK_CONTAINER (priv->alignment), GTK_WIDGET (priv->hbox));
+
+    /* Pack the image and the alignment in the new hbox */
+    if (priv->image && priv->image_position == GTK_POS_LEFT)
+        gtk_box_pack_start (priv->hbox, priv->image, FALSE, FALSE, 0);
+
+    gtk_box_pack_start (priv->hbox, priv->label_box, TRUE, TRUE, 0);
+
+    if (priv->image && priv->image_position == GTK_POS_RIGHT)
+        gtk_box_pack_start (priv->hbox, priv->image, FALSE, FALSE, 0);
+
+    /* Set image alignment and remove previously set ref */
+    if (priv->image) {
+        gtk_misc_set_alignment (GTK_MISC (priv->image), priv->image_xalign, priv->image_yalign);
+        g_object_unref (priv->image);
     }
 
-    gtk_container_add (GTK_CONTAINER (button), priv->alignment);
-    gtk_widget_show_all (priv->alignment);
+    /* Show everything */
+    gtk_widget_show_all (GTK_WIDGET (priv->alignment));
 }