[glade] * glade/gladeui/glade-widget.c: o glade_widget_constructor() do not set catalog defaults for int
- From: Juan Pablo Ugarte <jpu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glade] * glade/gladeui/glade-widget.c: o glade_widget_constructor() do not set catalog defaults for int
- Date: Tue, 5 Apr 2011 05:19:39 +0000 (UTC)
commit bc2b7577a8a38977173d5aa197110e492d895d34
Author: Juan Pablo Ugarte <juanpablougarte gmail com>
Date: Thu Mar 17 17:30:32 2011 -0300
* glade/gladeui/glade-widget.c:
o glade_widget_constructor() do not set catalog defaults for internal widgets.
(Fixes GtkDialog action area orientation)
* plugins/gtk+/glade-gtk.c:
o Fixed GtkBox virtual property size ()
o Fixed GtkDialog derived classes placeholders creation.
o Set GtkButton::stock property from "label" is "use-stok" is true.
(Fixes bug in internal buttons with stock icons)
gladeui/glade-widget-adaptor.c | 2 +-
gladeui/glade-widget.c | 7 +-
plugins/gtk+/glade-gtk.c | 158 ++++++++++++++++++++--------------------
plugins/gtk+/gtk+.xml.in | 2 +-
4 files changed, 87 insertions(+), 82 deletions(-)
---
diff --git a/gladeui/glade-widget-adaptor.c b/gladeui/glade-widget-adaptor.c
index 419a0f0..7fa61d4 100644
--- a/gladeui/glade-widget-adaptor.c
+++ b/gladeui/glade-widget-adaptor.c
@@ -89,7 +89,7 @@ struct _GladeWidgetAdaptorPrivate
GList *child_packings; /* Default packing property values */
GList *actions; /* A list of GWActionClass */
GList *packing_actions; /* A list of GWActionClass for child objects */
- GList *internal_children; /* A list of GladeInternalChild */
+ GList *internal_children; /* A list of GladeInternalChild */
gchar *catalog; /* The name of the widget catalog this class
* was declared by.
*/
diff --git a/gladeui/glade-widget.c b/gladeui/glade-widget.c
index 4afaf05..fcd0b30 100644
--- a/gladeui/glade-widget.c
+++ b/gladeui/glade-widget.c
@@ -903,8 +903,11 @@ glade_widget_constructor (GType type,
for (list = gwidget->priv->properties; list; list = list->next)
glade_property_load (GLADE_PROPERTY (list->data));
- /* We only use catalog defaults when the widget was created by the user! */
- if (gwidget->priv->construct_reason == GLADE_CREATE_USER)
+ /* We only use catalog defaults when the widget was created by the user!
+ * and or is not an internal widget.
+ */
+ if (gwidget->priv->construct_reason == GLADE_CREATE_USER &&
+ gwidget->priv->internal == NULL)
glade_widget_set_catalog_defaults (gwidget->priv->properties);
/* Only call this once the GladeWidget is completely built
diff --git a/plugins/gtk+/glade-gtk.c b/plugins/gtk+/glade-gtk.c
index 0204e51..1e6be65 100644
--- a/plugins/gtk+/glade-gtk.c
+++ b/plugins/gtk+/glade-gtk.c
@@ -1718,7 +1718,7 @@ glade_gtk_box_set_size (GObject * object, const GValue * value)
/* The box has shrunk. Remove the widgets that are on those slots */
for (child = g_list_last (children);
- child && old_size > new_size; child = g_list_last (children), old_size--)
+ child && old_size > new_size; child = g_list_previous (child))
{
GtkWidget *child_widget = child->data;
@@ -1728,11 +1728,12 @@ glade_gtk_box_set_size (GObject * object, const GValue * value)
*/
if (glade_widget_get_from_gobject (child_widget) ||
GLADE_IS_PLACEHOLDER (child_widget) == FALSE)
- break;
+ continue;
g_object_ref (G_OBJECT (child_widget));
gtk_container_remove (GTK_CONTAINER (box), child_widget);
gtk_widget_destroy (child_widget);
+ old_size--;
}
g_list_free (children);
@@ -1751,33 +1752,29 @@ glade_gtk_box_set_property (GladeWidgetAdaptor * adaptor,
}
static gboolean
-glade_gtk_box_verify_size (GObject * object, const GValue * value)
+glade_gtk_box_verify_size (GObject *object, const GValue *value)
{
- GtkBox *box = GTK_BOX (object);
GList *child, *children;
- gboolean will_orphan = FALSE;
- gint old_size;
+ gint old_size, count = 0;
gint new_size = g_value_get_int (value);
-
- children = gtk_container_get_children (GTK_CONTAINER (box));
+
+ children = gtk_container_get_children (GTK_CONTAINER (object));
old_size = g_list_length (children);
for (child = g_list_last (children);
child && old_size > new_size;
- child = g_list_previous (child), old_size--)
+ child = g_list_previous (child))
{
GtkWidget *widget = child->data;
if (glade_widget_get_from_gobject (widget) != NULL)
- {
- /* In this case, refuse to shrink */
- will_orphan = TRUE;
- break;
- }
+ count++;
+ else
+ old_size--;
}
g_list_free (children);
- return will_orphan ? FALSE : new_size >= 0;
+ return count > new_size ? FALSE : new_size >= 0;
}
@@ -3877,7 +3874,7 @@ void
glade_gtk_dialog_post_create (GladeWidgetAdaptor *adaptor,
GObject *object, GladeCreateReason reason)
{
- GladeWidget *widget;
+ GladeWidget *widget, *vbox_widget, *actionarea_widget;
GtkDialog *dialog;
g_return_if_fail (GTK_IS_DIALOG (object));
@@ -3894,77 +3891,70 @@ glade_gtk_dialog_post_create (GladeWidgetAdaptor *adaptor,
glade_widget_property_set (widget, "border-width", 5);
}
- if (GTK_IS_COLOR_SELECTION_DIALOG (object))
- {
- GtkWidget *child = gtk_color_selection_dialog_get_color_selection (GTK_COLOR_SELECTION_DIALOG (dialog));
- GladeWidget *colorsel = glade_widget_get_from_gobject (child);
+ vbox_widget = glade_widget_get_from_gobject (gtk_dialog_get_content_area (dialog));
+ actionarea_widget = glade_widget_get_from_gobject (gtk_dialog_get_action_area (dialog));
- /* Set this to 1 at load time, if there are any children then
- * size will adjust appropriately (otherwise the default "3" gets
- * set and we end up with extra placeholders).
- */
- if (reason == GLADE_CREATE_LOAD)
- glade_widget_property_set (colorsel, "size", 1);
+ /* We need to stop default emissions of "hierarchy-changed" and
+ * "screen-changed" of GtkFileChooserDefault to avoid an abort()
+ * when doing a reparent.
+ * GtkFileChooserDialog packs a GtkFileChooserWidget in
+ * his internal vbox.
+ */
+ if (GTK_IS_FILE_CHOOSER_DIALOG (object))
+ gtk_container_forall (GTK_CONTAINER
+ (gtk_dialog_get_content_area (dialog)),
+ glade_gtk_file_chooser_forall, NULL);
+
+ /* These properties are controlled by the GtkDialog style properties:
+ * "content-area-border", "button-spacing" and "action-area-border",
+ * so we must disable thier use.
+ */
+ glade_widget_remove_property (vbox_widget, "border-width");
+ glade_widget_remove_property (actionarea_widget, "border-width");
+ glade_widget_remove_property (actionarea_widget, "spacing");
- }
- else if (GTK_IS_FONT_SELECTION_DIALOG (object))
+ if (reason == GLADE_CREATE_LOAD || reason == GLADE_CREATE_USER)
{
- GtkWidget *child = gtk_font_selection_dialog_get_cancel_button (GTK_FONT_SELECTION_DIALOG (dialog));
- GladeWidget *fontsel = glade_widget_get_from_gobject (child);
+ GObject *child;
+ gint size;
+
+ if (GTK_IS_COLOR_SELECTION_DIALOG (object))
+ {
+ child = glade_widget_adaptor_get_internal_child (adaptor, object, "color_selection");
+ size = 1;
+ }
+ else if (GTK_IS_FONT_SELECTION_DIALOG (object))
+ {
+ child = glade_widget_adaptor_get_internal_child (adaptor, object, "font_selection");
+ size = 2;
+ }
+ else
+ size = -1;
- /* Set this to 1 at load time, if there are any children then
+ /* Set this to a sane value. At load time, if there are any children then
* size will adjust appropriately (otherwise the default "3" gets
* set and we end up with extra placeholders).
*/
- if (reason == GLADE_CREATE_LOAD)
- glade_widget_property_set (fontsel, "size", 2);
+ if (size > -1)
+ glade_widget_property_set (glade_widget_get_from_gobject (child),
+ "size", size);
}
- else
- {
- GladeWidget *vbox_widget, *actionarea_widget;
-
- vbox_widget = glade_widget_get_from_gobject (gtk_dialog_get_content_area (dialog));
- actionarea_widget = glade_widget_get_from_gobject (gtk_dialog_get_action_area (dialog));
-
- /* We need to stop default emissions of "hierarchy-changed" and
- * "screen-changed" of GtkFileChooserDefault to avoid an abort()
- * when doing a reparent.
- * GtkFileChooserDialog packs a GtkFileChooserWidget in
- * his internal vbox.
- */
- if (GTK_IS_FILE_CHOOSER_DIALOG (object))
- gtk_container_forall (GTK_CONTAINER
- (gtk_dialog_get_content_area (dialog)),
- glade_gtk_file_chooser_forall, NULL);
-
- /* These properties are controlled by the GtkDialog style properties:
- * "content-area-border", "button-spacing" and "action-area-border",
- * so we must disable thier use.
- */
- glade_widget_remove_property (vbox_widget, "border-width");
- glade_widget_remove_property (actionarea_widget, "border-width");
- glade_widget_remove_property (actionarea_widget, "spacing");
-
- /* Only set these on the original create. */
- if (reason == GLADE_CREATE_USER)
- {
- /* HIG complient spacing defaults on dialogs */
- glade_widget_property_set (vbox_widget, "spacing", 2);
+ /* Only set these on the original create. */
+ if (reason == GLADE_CREATE_USER)
+ {
+ /* HIG complient spacing defaults on dialogs */
+ glade_widget_property_set (vbox_widget, "spacing", 2);
- if (GTK_IS_MESSAGE_DIALOG (object))
- glade_widget_property_set (vbox_widget, "size", 2);
- else if (GTK_IS_ABOUT_DIALOG (object))
- glade_widget_property_set (vbox_widget, "size", 3);
- else if (GTK_IS_FILE_CHOOSER_DIALOG (object))
- glade_widget_property_set (vbox_widget, "size", 3);
- else
- glade_widget_property_set (vbox_widget, "size", 2);
+ if (GTK_IS_ABOUT_DIALOG (object) ||
+ GTK_IS_FILE_CHOOSER_DIALOG (object))
+ glade_widget_property_set (vbox_widget, "size", 3);
+ else
+ glade_widget_property_set (vbox_widget, "size", 2);
- glade_widget_property_set (actionarea_widget, "size", 2);
- glade_widget_property_set (actionarea_widget, "layout-style",
- GTK_BUTTONBOX_END);
- }
+ glade_widget_property_set (actionarea_widget, "size", 2);
+ glade_widget_property_set (actionarea_widget, "layout-style",
+ GTK_BUTTONBOX_END);
}
}
@@ -4372,13 +4362,16 @@ evaluate_activatable_property_sensitivity (GObject * object,
static void
sync_use_appearance (GladeWidget *gwidget)
{
- GladeProperty *prop = glade_widget_get_property (gwidget, "use-action-appearance");
- gboolean use_appearance = FALSE;
+ GladeProperty *prop;
+ gboolean use_appearance;
/* This is the kind of thing we avoid doing at project load time ;-) */
if (glade_widget_superuser ())
return;
+ prop = glade_widget_get_property (gwidget, "use-action-appearance");
+ use_appearance = FALSE;
+
glade_property_get (prop, &use_appearance);
if (use_appearance)
{
@@ -4463,9 +4456,18 @@ glade_gtk_button_set_property (GladeWidgetAdaptor * adaptor,
{
gboolean use_stock = FALSE;
glade_widget_property_get (widget, "use-stock", &use_stock);
+
if (use_stock)
gtk_button_set_label (GTK_BUTTON (object), g_value_get_string (value));
}
+ else if (strcmp (id, "label") == 0)
+ {
+ gboolean use_stock = FALSE;
+ glade_widget_property_get (widget, "use-stock", &use_stock);
+
+ if (use_stock)
+ glade_widget_property_set (widget, "stock", g_value_get_string (value));
+ }
else if (strcmp (id, "use-stock") == 0)
{
/* I guess its my bug in GTK+, we need to resync the appearance property
diff --git a/plugins/gtk+/gtk+.xml.in b/plugins/gtk+/gtk+.xml.in
index 9a13297..cdeb883 100644
--- a/plugins/gtk+/gtk+.xml.in
+++ b/plugins/gtk+/gtk+.xml.in
@@ -985,7 +985,7 @@ embedded in another object</_tooltip>
<property id="receives-default" save-always="True"></property>
<property id="image" parentless-widget="True" create-type="GtkImage" custom-layout="True"></property>
<property id="use-stock" visible="False" custom-layout="True"></property>
- <property id="label" default="button" translatable="True" custom-layout="True" save="False" multiline="True"></property>
+ <property id="label" default="button" translatable="True" custom-layout="True" save="False" multiline="True" needs-sync="True"></property>
<property id="use-underline" custom-layout="True"></property>
<property id="stock" _name="Stock Button" stock="True" save="False" custom-layout="True">
<parameter-spec>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
