2008-11-28 Alberto Garcia <agarcia@igalia.com>

[hildon] / src / hildon-dialog.c

diff --git a/src/hildon-dialog.c b/src/hildon-dialog.c
index 97490d8..8b88292 100644 (file)
--- a/src/hildon-dialog.c
+++ b/src/hildon-dialog.c
@@ -57,16 +57,20 @@
  */
 
 #include                                        "hildon-dialog.h"
+#include                                        "hildon-gtk.h"
 
 G_DEFINE_TYPE (HildonDialog, hildon_dialog, GTK_TYPE_DIALOG);
 
+/* Buttons on a HildonDialog have fixed size */
+#define                                         HILDON_DIALOG_BUTTON_WIDTH 174
+
 static void
-hildon_dialog_class_init                        (HildonDialogClass * dialog_class)
+hildon_dialog_class_init                        (HildonDialogClass *dialog_class)
 {
 }
 
 static void
-hildon_dialog_init (HildonDialog *self)
+hildon_dialog_init                              (HildonDialog *self)
 {
 }
 
@@ -99,55 +103,113 @@ hildon_dialog_new                               (void)
  * Return value: a new #HildonDialog
  */
 GtkWidget*
-hildon_dialog_new_with_buttons (const gchar    *title,
-                                GtkWindow      *parent,
-                                GtkDialogFlags  flags,
-                                const gchar    *first_button_text,
-                                ...)
+hildon_dialog_new_with_buttons                  (const gchar *title,
+                                                 GtkWindow *parent,
+                                                 GtkDialogFlags flags,
+                                                 const gchar *first_button_text,
+                                                 ...)
 {
-  GtkWidget *dialog;
+    GtkWidget *dialog;
 
-  dialog = g_object_new (HILDON_TYPE_DIALOG, NULL);
+    dialog = g_object_new (HILDON_TYPE_DIALOG, NULL);
 
-  /* This code is copied from gtk_dialog_new_empty(), as it's a
-   * private function that we cannot use here */
-  if (title)
-    gtk_window_set_title (GTK_WINDOW (dialog), title);
+    /* This code is copied from gtk_dialog_new_empty(), as it's a
+     * private function that we cannot use here */
+    if (title)
+        gtk_window_set_title (GTK_WINDOW (dialog), title);
 
-  if (parent)
-    gtk_window_set_transient_for (GTK_WINDOW (dialog), parent);
+    if (parent)
+        gtk_window_set_transient_for (GTK_WINDOW (dialog), parent);
 
-  if (flags & GTK_DIALOG_MODAL)
-    gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
+    if (flags & GTK_DIALOG_MODAL)
+        gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
 
-  if (flags & GTK_DIALOG_DESTROY_WITH_PARENT)
-    gtk_window_set_destroy_with_parent (GTK_WINDOW (dialog), TRUE);
+    if (flags & GTK_DIALOG_DESTROY_WITH_PARENT)
+        gtk_window_set_destroy_with_parent (GTK_WINDOW (dialog), TRUE);
 
-  if (flags & GTK_DIALOG_NO_SEPARATOR)
-    gtk_dialog_set_has_separator (dialog, FALSE);
+    if (flags & GTK_DIALOG_NO_SEPARATOR)
+        gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
 
-  /* This is almost copied from gtk_dialog_add_buttons_valist() */
-  if (first_button_text != NULL)
-    {
-      va_list args;
-      const gchar *text;
-      gint response_id;
+    /* This is almost copied from gtk_dialog_add_buttons_valist() */
+    if (first_button_text != NULL) {
+        va_list args;
+        const gchar *text;
+        gint response_id;
 
-      va_start (args, first_button_text);
-      text = first_button_text;
-      response_id = va_arg (args, gint);
+        va_start (args, first_button_text);
+        text = first_button_text;
+        response_id = va_arg (args, gint);
 
-      while (text != NULL)
-        {
-          gtk_dialog_add_button (GTK_DIALOG (dialog), text, response_id);
+        while (text != NULL) {
+            hildon_dialog_add_button (HILDON_DIALOG (dialog), text, response_id);
 
-          text = va_arg (args, gchar*);
-          if (text == NULL)
-             break;
-          response_id = va_arg (args, int);
+            text = va_arg (args, gchar*);
+            if (text == NULL)
+                break;
+            response_id = va_arg (args, int);
         }
-      va_end (args);
+        va_end (args);
+    }
+
+    return dialog;
+}
+
+/**
+ * hildon_dialog_add_button:
+ * @dialog: a #HildonDialog
+ * @button_text: text of the button, or stock ID
+ * @response_id: response ID for the button.
+ *
+ * Adds a button to the dialog. Works exactly like
+ * gtk_dialog_add_button(), the only difference being that the button
+ * has finger size.
+ *
+ * Returns: the button widget that was added
+ */
+GtkWidget *
+hildon_dialog_add_button                        (HildonDialog *dialog,
+                                                 const gchar  *button_text,
+                                                 gint          response_id)
+{
+    GtkWidget *button;
+    button = gtk_dialog_add_button (GTK_DIALOG (dialog), button_text, response_id);
+    hildon_gtk_widget_set_theme_size (button, HILDON_SIZE_AUTO_WIDTH | HILDON_SIZE_FINGER_HEIGHT);
+    g_object_set (button, "width-request", HILDON_DIALOG_BUTTON_WIDTH, NULL);
+    return button;
+}
+
+/**
+ * hildon_dialog_add_buttons:
+ * @dialog: a #HildonDialog
+ * @first_button_text: text of the button, or stock ID
+ * @Varargs: response ID for first button, then more text-response_id pairs
+ *
+ * Adds several buttons to the dialog. Works exactly like
+ * gtk_dialog_add_buttons(), the only difference being that the
+ * buttons have finger size.
+ */
+void
+hildon_dialog_add_buttons                       (HildonDialog *dialog,
+                                                 const gchar  *first_button_text,
+                                                 ...)
+{
+    va_list args;
+    const gchar *text;
+    gint response_id;
+
+    va_start (args, first_button_text);
+    text = first_button_text;
+    response_id = va_arg (args, gint);
+
+    while (text != NULL) {
+        hildon_dialog_add_button (HILDON_DIALOG (dialog), text, response_id);
+
+        text = va_arg (args, gchar*);
+        if (text == NULL)
+            break;
+        response_id = va_arg (args, int);
     }
 
-  return dialog;
+    va_end (args);
 }
+