[gtk+/composite-widget-templates] Made GtkDialog and GtkMessageDialog composite widgets using gtk_container_class_set_template().
- From: Tristan Van Berkom <tvb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/composite-widget-templates] Made GtkDialog and GtkMessageDialog composite widgets using gtk_container_class_set_template().
- Date: Mon, 7 Jun 2010 18:45:34 +0000 (UTC)
commit 67310786cbf00930aeb991ca1a438421e9666e23
Author: Tristan Van Berkom <tristan van berkom gmail com>
Date: Mon Jun 7 14:44:17 2010 -0400
Made GtkDialog and GtkMessageDialog composite widgets using
gtk_container_class_set_template().
gtk/gtkdialog.c | 141 ++++++++++++++++++++-------
gtk/gtkmessagedialog.c | 253 +++++++++++++++++++++++++++++++++++-------------
2 files changed, 289 insertions(+), 105 deletions(-)
---
diff --git a/gtk/gtkdialog.c b/gtk/gtkdialog.c
index d6b7bcd..e2f5fbe 100644
--- a/gtk/gtkdialog.c
+++ b/gtk/gtkdialog.c
@@ -81,9 +81,6 @@ static ResponseData * get_response_data (GtkWidget *widget,
gboolean create);
static void gtk_dialog_buildable_interface_init (GtkBuildableIface *iface);
-static GObject * gtk_dialog_buildable_get_internal_child (GtkBuildable *buildable,
- GtkBuilder *builder,
- const gchar *childname);
static gboolean gtk_dialog_buildable_custom_tag_start (GtkBuildable *buildable,
GtkBuilder *builder,
GObject *child,
@@ -97,9 +94,44 @@ static void gtk_dialog_buildable_custom_finished (GtkBuildable *buildab
gpointer user_data);
+static const gchar *gtk_dialog_template =
+ "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
+ "<interface>"
+ " <requires lib=\"gtk+\" version=\"2.20\"/>"
+ " <child>"
+ " <object class=\"GtkVBox\" id=\"vbox\">"
+ " <property name=\"visible\">True</property>"
+ " <child>"
+ " <object class=\"GtkHSeparator\" id=\"separator\">"
+ " <property name=\"visible\">True</property>"
+ " </object>"
+ " <packing>"
+ " <property name=\"expand\">False</property>"
+ " <property name=\"pack_type\">end</property>"
+ " <property name=\"position\">1</property>"
+ " </packing>"
+ " </child>"
+ " <child>"
+ " <object class=\"GtkHButtonBox\" id=\"action-area\">"
+ " <property name=\"visible\">True</property>"
+ " <property name=\"layout_style\">end</property>"
+ " </object>"
+ " <packing>"
+ " <property name=\"expand\">False</property>"
+ " <property name=\"pack_type\">end</property>"
+ " <property name=\"position\">0</property>"
+ " </packing>"
+ " </child>"
+ " </object>"
+ " </child>"
+ "</interface>";
+
enum {
PROP_0,
- PROP_HAS_SEPARATOR
+ PROP_HAS_SEPARATOR,
+ PROP_SEPARATOR,
+ PROP_VBOX,
+ PROP_ACTION_AREA
};
enum {
@@ -148,6 +180,51 @@ gtk_dialog_class_init (GtkDialogClass *class)
GTK_PARAM_READWRITE));
/**
+ * GtkDialog:separator:
+ *
+ * The separator above the action buttons.
+ *
+ * Since: 3.0
+ */
+ g_object_class_install_property (gobject_class,
+ PROP_SEPARATOR,
+ gtk_param_spec_composite ("separator",
+ P_("Separator"),
+ P_("The separator above the action buttons"),
+ GTK_TYPE_SEPARATOR,
+ GTK_PARAM_WRITABLE));
+
+ /**
+ * GtkDialog:vbox:
+ *
+ * The dialog content area.
+ *
+ * Since: 3.0
+ */
+ g_object_class_install_property (gobject_class,
+ PROP_VBOX,
+ gtk_param_spec_composite ("vbox",
+ P_("Content Area"),
+ P_("The dialog content area"),
+ GTK_TYPE_BOX,
+ GTK_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+
+ /**
+ * GtkDialog:action-area:
+ *
+ * The dialog action area.
+ *
+ * Since: 3.0
+ */
+ g_object_class_install_property (gobject_class,
+ PROP_ACTION_AREA,
+ gtk_param_spec_composite ("action-area",
+ P_("Action Area"),
+ P_("The dialog action area"),
+ GTK_TYPE_BUTTON_BOX,
+ GTK_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+
+ /**
* GtkDialog::response:
* @dialog: the object on which the signal is emitted
* @response_id: the response ID
@@ -233,6 +310,8 @@ gtk_dialog_class_init (GtkDialogClass *class)
binding_set = gtk_binding_set_by_class (class);
gtk_binding_entry_add_signal (binding_set, GDK_Escape, 0, "close", 0);
+
+ gtk_container_class_set_template (GTK_CONTAINER_CLASS (class), gtk_dialog_template);
}
static void
@@ -280,24 +359,6 @@ gtk_dialog_init (GtkDialog *dialog)
G_CALLBACK (gtk_dialog_delete_event_handler),
NULL);
- dialog->vbox = gtk_vbox_new (FALSE, 0);
-
- gtk_container_add (GTK_CONTAINER (dialog), dialog->vbox);
- gtk_widget_show (dialog->vbox);
-
- dialog->action_area = gtk_hbutton_box_new ();
-
- gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog->action_area),
- GTK_BUTTONBOX_END);
-
- gtk_box_pack_end (GTK_BOX (dialog->vbox), dialog->action_area,
- FALSE, TRUE, 0);
- gtk_widget_show (dialog->action_area);
-
- dialog->separator = gtk_hseparator_new ();
- gtk_box_pack_end (GTK_BOX (dialog->vbox), dialog->separator, FALSE, TRUE, 0);
- gtk_widget_show (dialog->separator);
-
gtk_window_set_type_hint (GTK_WINDOW (dialog),
GDK_WINDOW_TYPE_HINT_DIALOG);
gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER_ON_PARENT);
@@ -309,26 +370,10 @@ static void
gtk_dialog_buildable_interface_init (GtkBuildableIface *iface)
{
parent_buildable_iface = g_type_interface_peek_parent (iface);
- iface->get_internal_child = gtk_dialog_buildable_get_internal_child;
iface->custom_tag_start = gtk_dialog_buildable_custom_tag_start;
iface->custom_finished = gtk_dialog_buildable_custom_finished;
}
-static GObject *
-gtk_dialog_buildable_get_internal_child (GtkBuildable *buildable,
- GtkBuilder *builder,
- const gchar *childname)
-{
- if (strcmp (childname, "vbox") == 0)
- return G_OBJECT (GTK_DIALOG (buildable)->vbox);
- else if (strcmp (childname, "action_area") == 0)
- return G_OBJECT (GTK_DIALOG (buildable)->action_area);
-
- return parent_buildable_iface->get_internal_child (buildable,
- builder,
- childname);
-}
-
static void
gtk_dialog_set_property (GObject *object,
guint prop_id,
@@ -345,6 +390,18 @@ gtk_dialog_set_property (GObject *object,
gtk_dialog_set_has_separator (dialog, g_value_get_boolean (value));
break;
+ case PROP_SEPARATOR:
+ dialog->separator = g_value_get_object (value);
+ break;
+
+ case PROP_VBOX:
+ dialog->vbox = g_value_get_object (value);
+ break;
+
+ case PROP_ACTION_AREA:
+ dialog->action_area = g_value_get_object (value);
+ break;
+
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@@ -367,6 +424,14 @@ gtk_dialog_get_property (GObject *object,
g_value_set_boolean (value, dialog->separator != NULL);
break;
+ case PROP_VBOX:
+ g_value_set_object (value, dialog->vbox);
+ break;
+
+ case PROP_ACTION_AREA:
+ g_value_set_object (value, dialog->action_area);
+ break;
+
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
diff --git a/gtk/gtkmessagedialog.c b/gtk/gtkmessagedialog.c
index 18adeea..f79933f 100644
--- a/gtk/gtkmessagedialog.c
+++ b/gtk/gtkmessagedialog.c
@@ -95,23 +95,100 @@ struct _GtkMessageDialogPrivate
{
GtkWidget *secondary_label;
guint message_type : 3;
+ guint buttons_type : 3;
guint has_primary_markup : 1;
guint has_secondary_text : 1;
};
-static void gtk_message_dialog_style_set (GtkWidget *widget,
- GtkStyle *prev_style);
-
-static void gtk_message_dialog_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec);
-static void gtk_message_dialog_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec);
-static void gtk_message_dialog_add_buttons (GtkMessageDialog *message_dialog,
- GtkButtonsType buttons);
+static void gtk_message_dialog_style_set (GtkWidget *widget,
+ GtkStyle *prev_style);
+static GObject *gtk_message_dialog_constructor (GType type,
+ guint n_construct_properties,
+ GObjectConstructParam *construct_params);
+static void gtk_message_dialog_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec);
+static void gtk_message_dialog_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec);
+static void gtk_message_dialog_add_buttons (GtkMessageDialog *message_dialog,
+ GtkButtonsType buttons);
+
+static const gchar *gtk_message_dialog_template =
+ "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
+ "<interface>"
+ " <requires lib=\"gtk+\" version=\"2.20\"/>"
+ " <child internal-child=\"vbox\">"
+ " <object class=\"GtkVBox\" id=\"vbox\">"
+ " <property name=\"spacing\">14</property>"
+ " <child>"
+ " <object class=\"GtkHBox\" id=\"hbox1\">"
+ " <property name=\"visible\">True</property>"
+ " <property name=\"border_width\">5</property>"
+ " <property name=\"spacing\">12</property>"
+ " <child>"
+ " <object class=\"GtkImage\" id=\"image\">"
+ " <property name=\"visible\">True</property>"
+ " <property name=\"yalign\">0</property>"
+ " <property name=\"icon-size\">6</property>"
+ " </object>"
+ " <packing>"
+ " <property name=\"expand\">False</property>"
+ " <property name=\"fill\">False</property>"
+ " <property name=\"position\">0</property>"
+ " </packing>"
+ " </child>"
+ " <child>"
+ " <object class=\"GtkVBox\" id=\"vbox1\">"
+ " <property name=\"visible\">True</property>"
+ " <property name=\"spacing\">12</property>"
+ " <child>"
+ " <object class=\"GtkLabel\" id=\"label\">"
+ " <property name=\"visible\">True</property>"
+ " <property name=\"xalign\">0</property>"
+ " <property name=\"yalign\">0</property>"
+ " <property name=\"label\" translatable=\"yes\">primary message</property>"
+ " <property name=\"wrap\">True</property>"
+ " <property name=\"selectable\">True</property>"
+ " </object>"
+ " <packing>"
+ " <property name=\"expand\">False</property>"
+ " <property name=\"fill\">False</property>"
+ " <property name=\"position\">0</property>"
+ " </packing>"
+ " </child>"
+ " <child>"
+ " <object class=\"GtkLabel\" id=\"secondary-label\">"
+ " <property name=\"visible\">False</property>"
+ " <property name=\"no_show_all\">True</property>"
+ " <property name=\"xalign\">0</property>"
+ " <property name=\"yalign\">0</property>"
+ " <property name=\"label\" translatable=\"yes\">secondary message</property>"
+ " <property name=\"wrap\">True</property>"
+ " <property name=\"selectable\">True</property>"
+ " </object>"
+ " <packing>"
+ " <property name=\"position\">1</property>"
+ " </packing>"
+ " </child>"
+ " </object>"
+ " <packing>"
+ " <property name=\"position\">1</property>"
+ " </packing>"
+ " </child>"
+ " </object>"
+ " </child>"
+ " </object>"
+ " </child>"
+ " <child internal-child=\"action-area\">"
+ " <object class=\"GtkHButtonBox\" id=\"action-area\">"
+ " <property name=\"border_width\">5</property>"
+ " <property name=\"spacing\">6</property>"
+ " </object>"
+ " </child>"
+ "</interface>";
enum {
PROP_0,
@@ -121,7 +198,9 @@ enum {
PROP_USE_MARKUP,
PROP_SECONDARY_TEXT,
PROP_SECONDARY_USE_MARKUP,
- PROP_IMAGE
+ PROP_IMAGE,
+ PROP_LABEL,
+ PROP_SECONDARY_LABEL
};
G_DEFINE_TYPE (GtkMessageDialog, gtk_message_dialog, GTK_TYPE_DIALOG)
@@ -137,6 +216,7 @@ gtk_message_dialog_class_init (GtkMessageDialogClass *class)
widget_class->style_set = gtk_message_dialog_style_set;
+ gobject_class->constructor = gtk_message_dialog_constructor;
gobject_class->set_property = gtk_message_dialog_set_property;
gobject_class->get_property = gtk_message_dialog_get_property;
@@ -176,7 +256,7 @@ gtk_message_dialog_class_init (GtkMessageDialogClass *class)
P_("The type of message"),
GTK_TYPE_MESSAGE_TYPE,
GTK_MESSAGE_INFO,
- GTK_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+ GTK_PARAM_READWRITE));
g_object_class_install_property (gobject_class,
PROP_BUTTONS,
g_param_spec_enum ("buttons",
@@ -258,20 +338,54 @@ gtk_message_dialog_class_init (GtkMessageDialogClass *class)
*/
g_object_class_install_property (gobject_class,
PROP_IMAGE,
- g_param_spec_object ("image",
- P_("Image"),
- P_("The image"),
- GTK_TYPE_WIDGET,
- GTK_PARAM_READWRITE));
+ gtk_param_spec_composite ("image",
+ P_("Image"),
+ P_("The image"),
+ GTK_TYPE_WIDGET,
+ GTK_PARAM_READWRITE));
+
+
+ /**
+ * GtkMessageDialog:label:
+ *
+ * The message label for this dialog.
+ *
+ * Since: 3.0
+ */
+ g_object_class_install_property (gobject_class,
+ PROP_LABEL,
+ gtk_param_spec_composite ("label",
+ P_("Label"),
+ P_("The label"),
+ GTK_TYPE_LABEL,
+ GTK_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+
+ /**
+ * GtkMessageDialog:secondary-label:
+ *
+ * The secondary message label for this dialog.
+ *
+ * Since: 3.0
+ */
+ g_object_class_install_property (gobject_class,
+ PROP_SECONDARY_LABEL,
+ gtk_param_spec_composite ("secondary-label",
+ P_("Secondary Label"),
+ P_("The secondary message label"),
+ GTK_TYPE_LABEL,
+ GTK_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+
g_type_class_add_private (gobject_class,
sizeof (GtkMessageDialogPrivate));
+
+ gtk_container_class_set_template (GTK_CONTAINER_CLASS (class), gtk_message_dialog_template);
+
}
static void
gtk_message_dialog_init (GtkMessageDialog *dialog)
{
- GtkWidget *hbox, *vbox;
GtkMessageDialogPrivate *priv;
priv = GTK_MESSAGE_DIALOG_GET_PRIVATE (dialog);
@@ -282,47 +396,8 @@ gtk_message_dialog_init (GtkMessageDialog *dialog)
priv->has_primary_markup = FALSE;
priv->has_secondary_text = FALSE;
- priv->secondary_label = gtk_label_new (NULL);
- gtk_widget_set_no_show_all (priv->secondary_label, TRUE);
-
- dialog->label = gtk_label_new (NULL);
- dialog->image = gtk_image_new_from_stock (NULL, GTK_ICON_SIZE_DIALOG);
- gtk_misc_set_alignment (GTK_MISC (dialog->image), 0.5, 0.0);
-
- gtk_label_set_line_wrap (GTK_LABEL (dialog->label), TRUE);
- gtk_label_set_selectable (GTK_LABEL (dialog->label), TRUE);
- gtk_misc_set_alignment (GTK_MISC (dialog->label), 0.0, 0.0);
-
- gtk_label_set_line_wrap (GTK_LABEL (priv->secondary_label), TRUE);
- gtk_label_set_selectable (GTK_LABEL (priv->secondary_label), TRUE);
- gtk_misc_set_alignment (GTK_MISC (priv->secondary_label), 0.0, 0.0);
-
- hbox = gtk_hbox_new (FALSE, 12);
- vbox = gtk_vbox_new (FALSE, 12);
-
- gtk_box_pack_start (GTK_BOX (vbox), dialog->label,
- FALSE, FALSE, 0);
-
- gtk_box_pack_start (GTK_BOX (vbox), priv->secondary_label,
- TRUE, TRUE, 0);
-
- gtk_box_pack_start (GTK_BOX (hbox), dialog->image,
- FALSE, FALSE, 0);
-
- gtk_box_pack_start (GTK_BOX (hbox), vbox,
- TRUE, TRUE, 0);
-
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox),
- hbox,
- FALSE, FALSE, 0);
gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
- gtk_container_set_border_width (GTK_CONTAINER (hbox), 5);
- gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 14); /* 14 + 2 * 5 = 24 */
- gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->action_area), 5);
- gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->action_area), 6);
-
- gtk_widget_show_all (hbox);
_gtk_dialog_set_ignore_separator (GTK_DIALOG (dialog), TRUE);
}
@@ -404,6 +479,30 @@ setup_type (GtkMessageDialog *dialog,
}
}
+static GObject *
+gtk_message_dialog_constructor (GType type,
+ guint n_construct_properties,
+ GObjectConstructParam *construct_params)
+{
+ GObject *object;
+ GtkMessageDialog *dialog;
+ GtkMessageDialogPrivate *priv;
+
+ object =
+ G_OBJECT_CLASS (gtk_message_dialog_parent_class)->constructor (type,
+ n_construct_properties,
+ construct_params);
+
+ dialog = GTK_MESSAGE_DIALOG (object);
+ priv = GTK_MESSAGE_DIALOG_GET_PRIVATE (dialog);
+
+ /* Setup widget's now that they've been built */
+ setup_type (dialog, priv->message_type);
+ gtk_message_dialog_add_buttons (dialog, priv->buttons_type);
+
+ return object;
+}
+
static void
gtk_message_dialog_set_property (GObject *object,
guint prop_id,
@@ -419,10 +518,17 @@ gtk_message_dialog_set_property (GObject *object,
switch (prop_id)
{
case PROP_MESSAGE_TYPE:
- setup_type (dialog, g_value_get_enum (value));
+
+ if (dialog->image)
+ setup_type (dialog, g_value_get_enum (value));
+ else
+ /* Deffer assignment at construct time until image is built */
+ priv->message_type = g_value_get_enum (value);
+
break;
+
case PROP_BUTTONS:
- gtk_message_dialog_add_buttons (dialog, g_value_get_enum (value));
+ priv->buttons_type = g_value_get_enum (value);
break;
case PROP_TEXT:
if (priv->has_primary_markup)
@@ -467,6 +573,12 @@ gtk_message_dialog_set_property (GObject *object,
case PROP_IMAGE:
gtk_message_dialog_set_image (dialog, g_value_get_object (value));
break;
+ case PROP_LABEL:
+ dialog->label = g_value_get_object (value);
+ break;
+ case PROP_SECONDARY_LABEL:
+ priv->secondary_label = g_value_get_object (value);
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -685,12 +797,19 @@ gtk_message_dialog_set_image (GtkMessageDialog *dialog,
priv = GTK_MESSAGE_DIALOG_GET_PRIVATE (dialog);
- priv->message_type = GTK_MESSAGE_OTHER;
+ /* Only change the message type and the image if
+ * the image is not already in the dialog (which is
+ * the case when GtkBuilder builds the image).
+ */
+ if (dialog->image && dialog->image != image)
+ {
+ priv->message_type = GTK_MESSAGE_OTHER;
- parent = dialog->image->parent;
- gtk_container_add (GTK_CONTAINER (parent), image);
- gtk_container_remove (GTK_CONTAINER (parent), dialog->image);
- gtk_box_reorder_child (GTK_BOX (parent), image, 0);
+ parent = dialog->image->parent;
+ gtk_container_add (GTK_CONTAINER (parent), image);
+ gtk_container_remove (GTK_CONTAINER (parent), dialog->image);
+ gtk_box_reorder_child (GTK_BOX (parent), image, 0);
+ }
dialog->image = image;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
