diff options
author | Carlos Soriano <csoriano@redhat.com> | 2018-10-03 10:58:06 +0200 |
---|---|---|
committer | Carlos Soriano <csoriano@redhat.com> | 2018-10-03 11:53:15 +0200 |
commit | 9797243fb6e6741569ba65d0a8532ae03d03111c (patch) | |
tree | 09a4f3d60f2d48469371e3265b2ce5f5abf5053c | |
parent | b8db53c94ec99ff037d77dd73e65c2b86fab6c9f (diff) | |
download | glade-wip/csoriano/gtk4.tar.gz |
general: Initial support for gtk4wip/csoriano/gtk4
-rw-r--r-- | org.gnome.Glade.json | 2 | ||||
-rw-r--r-- | plugins/gtk+/glade-gtk-header-bar.c | 2 | ||||
-rw-r--r-- | plugins/gtk+/glade-header-bar-editor.c | 4 | ||||
-rw-r--r-- | plugins/gtk+/gtk+.xml.in | 32 |
4 files changed, 7 insertions, 33 deletions
diff --git a/org.gnome.Glade.json b/org.gnome.Glade.json index 085b431f..1da9de88 100644 --- a/org.gnome.Glade.json +++ b/org.gnome.Glade.json @@ -56,4 +56,4 @@ ] } ] -} +}
\ No newline at end of file diff --git a/plugins/gtk+/glade-gtk-header-bar.c b/plugins/gtk+/glade-gtk-header-bar.c index d48bd226..0540921b 100644 --- a/plugins/gtk+/glade-gtk-header-bar.c +++ b/plugins/gtk+/glade-gtk-header-bar.c @@ -290,7 +290,7 @@ glade_gtk_header_bar_set_property (GladeWidgetAdaptor *adaptor, { if (!strcmp (id, "use-custom-title")) glade_gtk_header_bar_set_use_custom_title (object, g_value_get_boolean (value)); - else if (!strcmp (id, "show-close-button")) + else if (!strcmp (id, "show-tittle-buttons")) { GladeWidget *gwidget = glade_widget_get_from_gobject (object); diff --git a/plugins/gtk+/glade-header-bar-editor.c b/plugins/gtk+/glade-header-bar-editor.c index db36388d..0706aaa2 100644 --- a/plugins/gtk+/glade-header-bar-editor.c +++ b/plugins/gtk+/glade-header-bar-editor.c @@ -93,7 +93,7 @@ glade_header_bar_editor_load (GladeEditable *editable, glade_widget_property_get (gwidget, "use-custom-title", &setting); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->use_custom_title_check), setting); - glade_widget_property_get (gwidget, "show-close-button", &setting); + glade_widget_property_get (gwidget, "show-tittle-buttons", &setting); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->show_decoration_check), setting); } } @@ -202,7 +202,7 @@ show_decoration_toggled (GtkWidget *widget, glade_command_set_property (property, NULL); } - property = glade_widget_get_property (gwidget, "show-close-button"); + property = glade_widget_get_property (gwidget, "show-tittle-buttons"); glade_command_set_property (property, show_decoration); glade_command_pop_group (); diff --git a/plugins/gtk+/gtk+.xml.in b/plugins/gtk+/gtk+.xml.in index 004add81..88658f51 100644 --- a/plugins/gtk+/gtk+.xml.in +++ b/plugins/gtk+/gtk+.xml.in @@ -684,8 +684,6 @@ <!-- position needs to be always saved in case of using pack end --> <property id="position" weight="0" save-always="True"/> <property id="padding" transfer-on-paste="True" weight="0.5"/> - <property id="expand" transfer-on-paste="True" save-always="True"/> - <property id="fill" transfer-on-paste="True" save-always="True"/> <property id="pack-type" transfer-on-paste="True"> <displayable-values> <!-- GtkPackType enumeration value --> @@ -1077,9 +1075,6 @@ </property> </properties> <packing-defaults> - <parent-class name="GtkVBox"> - <child-property id="expand" default="false"/> - </parent-class> </packing-defaults> </glade-widget-class> @@ -1153,14 +1148,10 @@ </parameter-spec> <_tooltip>The position of the tool item in the toolbar</_tooltip> </property> - <property id="expand" transfer-on-paste="True" save-always="True"/> <property id="homogeneous" transfer-on-paste="True" save-always="True"/> </packing-properties> <packing-defaults> - <parent-class name="GtkVBox"> - <child-property id="expand" default="false"/> - </parent-class> </packing-defaults> </glade-widget-class> @@ -1208,7 +1199,6 @@ </parameter-spec> <_tooltip>The position of the tool item group in the palette</_tooltip> </property> - <property id="expand" transfer-on-paste="True" save-always="True"/> <property id="exclusive" transfer-on-paste="True"/> </packing-properties> </glade-widget-class> @@ -1263,8 +1253,6 @@ </properties> <packing-properties> - <property id="expand" transfer-on-paste="True"/> - <property id="fill" transfer-on-paste="True"/> <property id="row-new" transfer-on-paste="True"/> <property id="homogeneous" transfer-on-paste="True"/> </packing-properties> @@ -1687,7 +1675,7 @@ <replace-child-function>glade_gtk_search_bar_replace_child</replace-child-function> <properties> <property id="search-mode-enabled" save="True" ignore="True"/> - <property id="show-close-button" save="True" ignore="True"/> + <property id="show-tittle-buttons" save="True" ignore="True"/> </properties> </glade-widget-class> @@ -2355,8 +2343,6 @@ <property id="x-options" transfer-on-paste="True"> <displayable-values> <!-- GtkAttachOptions enumeration value --> - <value id="GTK_EXPAND" _name="Expand"/> - <!-- GtkAttachOptions enumeration value --> <value id="GTK_SHRINK" _name="Shrink"/> <!-- GtkAttachOptions enumeration value --> <value id="GTK_FILL" _name="Fill"/> @@ -2543,7 +2529,7 @@ <property id="has-subtitle" _name="Reserve space for subtitle" custom-layout="True"> <_tooltip>Keep the headerbar height the same as the subtitle changes dynamically.</_tooltip> </property> - <property id="show-close-button" custom-layout="True" needs-sync="True"/> + <property id="show-tittle-buttons" custom-layout="True" needs-sync="True"/> <property id="spacing" custom-layout="True"/> <property id="decoration-layout" custom-layout="True"/> <property id="decoration-layout-set" disabled="True"/> @@ -2978,9 +2964,6 @@ <glade-widget-class name="GtkSeparator" generic-name="separator" _title="Separator"> <packing-defaults> - <parent-class name="GtkBox"> - <child-property id="expand" default="false"/> - </parent-class> </packing-defaults> </glade-widget-class> <glade-widget-class name="GtkHSeparator" deprecated="True" generic-name="hseparator" _title="Horizontal Separator"> @@ -2988,9 +2971,6 @@ <property id="orientation" disabled="True"/> </properties> <packing-defaults> - <parent-class name="GtkVBox"> - <child-property id="expand" default="false"/> - </parent-class> </packing-defaults> </glade-widget-class> <glade-widget-class name="GtkVSeparator" deprecated="True" generic-name="vseparator" _title="Vertical Separator"> @@ -2998,9 +2978,6 @@ <property id="orientation" disabled="True"/> </properties> <packing-defaults> - <parent-class name="GtkHBox"> - <child-property id="expand" default="false"/> - </parent-class> </packing-defaults> </glade-widget-class> @@ -3010,9 +2987,6 @@ <property id="size" default="1" query="False"/> </properties> <packing-defaults> - <parent-class name="GtkVBox"> - <child-property id="expand" default="false"/> - </parent-class> </packing-defaults> </glade-widget-class> @@ -5722,4 +5696,4 @@ <glade-widget-class-ref name="GtkRecentAction"/> </glade-widget-group> - </glade-catalog> + </glade-catalog>
\ No newline at end of file |