r1646 - in trunk/src/target/OM-2007/openmoko-libs: . libmokoui

[rob at sita.openmoko.org]

Author: rob
Date: 2007-04-03 15:36:14 +0200 (Tue, 03 Apr 2007)
New Revision: 1646

Modified:
   trunk/src/target/OM-2007/openmoko-libs/ChangeLog
   trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-dialog.c
   trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-dialog.h
Log:
2007-04-03  Rob Bradford  <rob at openedhand.com>

	* libmokoui/moko-dialog.c: (moko_dialog_add_button),
	(moko_dialog_add_button_secondary),
	(moko_dialog_set_button_secondary),
	(moko_dialog_get_button_secondary):
	Provide framework for easily dealing with secondary buttons.

	* libmokoui/moko-dialog.h:
	Add moko_dialog_set_title prototype to the header file.
	Add prototypes for new functions.



Modified: trunk/src/target/OM-2007/openmoko-libs/ChangeLog
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/ChangeLog	2007-04-03 04:36:41 UTC (rev 1645)
+++ trunk/src/target/OM-2007/openmoko-libs/ChangeLog	2007-04-03 13:36:14 UTC (rev 1646)
@@ -1,3 +1,15 @@
+2007-04-03  Rob Bradford  <rob at openedhand.com>
+
+	* libmokoui/moko-dialog.c: (moko_dialog_add_button),
+	(moko_dialog_add_button_secondary),
+	(moko_dialog_set_button_secondary),
+	(moko_dialog_get_button_secondary):
+	Provide framework for easily dealing with secondary buttons.
+
+	* libmokoui/moko-dialog.h:
+	Add moko_dialog_set_title prototype to the header file.
+	Add prototypes for new functions.
+
 2007-04-02 Dodji Seketeli
 
 	* openmoko-libs/libmokojournal/moko-journal.[c|h]: went forward with the

Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-dialog.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-dialog.c	2007-04-03 04:36:41 UTC (rev 1645)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-dialog.c	2007-04-03 13:36:14 UTC (rev 1646)
@@ -280,7 +280,7 @@
 }
 
 GtkWidget*
-moko_dialog_add_button (MokoDialog *self, gchar *text, gint response_id)
+moko_dialog_add_button (MokoDialog *self, const gchar *text, gint response_id)
 {
   GtkWidget *button;
 
@@ -291,8 +291,33 @@
   return button;
 }
 
+GtkWidget*
+moko_dialog_add_button_secondary (MokoDialog *self, gchar *text, gint response_id)
+{
+  GtkWidget *button;
 
+  button = gtk_button_new_from_stock (text);
+  moko_dialog_add_button_widget (self, GTK_BUTTON (button), response_id);
+  gtk_widget_show (button);
+  moko_dialog_set_button_secondary (self, GTK_BUTTON (button), TRUE);
+
+  return button;
+}
+
 void
+moko_dialog_set_button_secondary (MokoDialog *self, GtkButton *button, gboolean is_secondary)
+{
+  gtk_button_box_set_child_secondary (GTK_BUTTON_BOX (self->action_area), GTK_WIDGET (button), is_secondary);
+}
+
+gboolean
+moko_dialog_get_button_secondary (MokoDialog *self, GtkButton *button)
+{
+  return gtk_button_box_get_child_secondary (GTK_BUTTON_BOX (self->action_area), GTK_WIDGET (button));
+}
+
+
+void
 moko_dialog_add_buttons (MokoDialog *self, gchar *first_button_text, ...)
 {
   va_list args;

Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-dialog.h
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-dialog.h	2007-04-03 04:36:41 UTC (rev 1645)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-dialog.h	2007-04-03 13:36:14 UTC (rev 1646)
@@ -61,14 +61,17 @@
 GType moko_dialog_get_type (void);
 
 gint moko_dialog_get_button_response_id (MokoDialog *self, GtkButton *button);
-
-
+void moko_dialog_set_title (MokoDialog* self, const gchar* title);
 void moko_dialog_add_buttons (MokoDialog *self, gchar *first_button_text, ...);
-GtkWidget* moko_dialog_add_button (MokoDialog *self, gchar *text, gint response_id);
+GtkWidget* moko_dialog_add_button (MokoDialog *self, const gchar *text, gint response_id);
+GtkWidget* moko_dialog_add_button_secondary (MokoDialog *self, gchar *text, gint response_id);
 void moko_dialog_add_button_widget (MokoDialog *self, GtkButton *button, gint response_id);
+void moko_dialog_set_button_secondary (MokoDialog *self, GtkButton *button, gboolean is_secondary);
+gboolean moko_dialog_get_button_secondary (MokoDialog *self, GtkButton *button);
 void moko_dialog_response (MokoDialog *self, gint response_id);
 gint moko_dialog_run (MokoDialog *self);
 
+
 GtkWidget* moko_dialog_new (void);
 
 G_END_DECLS