diff options
author | Tristan Van Berkom <tristan@upstairslabs.com> | 2014-11-21 13:48:54 +0900 |
---|---|---|
committer | Tristan Van Berkom <tristan@upstairslabs.com> | 2014-11-21 14:42:15 +0900 |
commit | e08dace13bc73b8abf948d88cda88f88f76f7401 (patch) | |
tree | cc16e8e62f6047fe16f6588bc5496a17e5713eab | |
parent | 71395cc69f50c6ac23a8d14688e13065b62a056e (diff) | |
download | glade-e08dace13bc73b8abf948d88cda88f88f76f7401.tar.gz |
Adding 3.14 and 3.16 version targets to the GTK+ plugin
Updated GTK+ widget catalog for new properties and signals
Updated for GTK+ 3.14 and 3.16 (so far), this patch also modifies
the scrolled window editor to place the overlay-scrollbars property
nicely into the custom editor.
Also set GtkSidebar target version 3.16 (we dont encode odd numbers here)
-rw-r--r-- | plugins/gtk+/glade-scrolled-window-editor.ui | 57 | ||||
-rw-r--r-- | plugins/gtk+/gtk+.xml.in | 41 |
2 files changed, 62 insertions, 36 deletions
diff --git a/plugins/gtk+/glade-scrolled-window-editor.ui b/plugins/gtk+/glade-scrolled-window-editor.ui index c527d685..0242a5d1 100644 --- a/plugins/gtk+/glade-scrolled-window-editor.ui +++ b/plugins/gtk+/glade-scrolled-window-editor.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.16.0 +<!-- Generated with glade 3.18.1 libgladegtk - Glade UI Designer Gtk+ support plugin Copyright (C) 2013 Tristan Van Berkom <tvb@gnome.org> @@ -43,7 +43,6 @@ Author: Tristan Van Berkom <tvb@gnome.org> <property name="left_attach">0</property> <property name="top_attach">0</property> <property name="width">6</property> - <property name="height">1</property> </packing> </child> <child> @@ -61,7 +60,6 @@ Author: Tristan Van Berkom <tvb@gnome.org> <property name="left_attach">0</property> <property name="top_attach">1</property> <property name="width">6</property> - <property name="height">1</property> </packing> </child> <child> @@ -76,7 +74,6 @@ Author: Tristan Van Berkom <tvb@gnome.org> <property name="left_attach">0</property> <property name="top_attach">2</property> <property name="width">3</property> - <property name="height">1</property> </packing> </child> <child> @@ -90,7 +87,6 @@ Author: Tristan Van Berkom <tvb@gnome.org> <property name="left_attach">3</property> <property name="top_attach">2</property> <property name="width">2</property> - <property name="height">1</property> </packing> </child> <child> @@ -107,7 +103,6 @@ Author: Tristan Van Berkom <tvb@gnome.org> <property name="left_attach">0</property> <property name="top_attach">3</property> <property name="width">3</property> - <property name="height">1</property> </packing> </child> <child> @@ -120,7 +115,6 @@ Author: Tristan Van Berkom <tvb@gnome.org> <property name="left_attach">3</property> <property name="top_attach">3</property> <property name="width">2</property> - <property name="height">1</property> </packing> </child> <child> @@ -135,8 +129,7 @@ Author: Tristan Van Berkom <tvb@gnome.org> <packing> <property name="left_attach">0</property> <property name="top_attach">4</property> - <property name="width">5</property> - <property name="height">1</property> + <property name="width">3</property> </packing> </child> <child> @@ -151,7 +144,6 @@ Author: Tristan Van Berkom <tvb@gnome.org> <property name="left_attach">0</property> <property name="top_attach">5</property> <property name="width">3</property> - <property name="height">1</property> </packing> </child> <child> @@ -165,7 +157,6 @@ Author: Tristan Van Berkom <tvb@gnome.org> <property name="left_attach">3</property> <property name="top_attach">5</property> <property name="width">2</property> - <property name="height">1</property> </packing> </child> <child> @@ -180,7 +171,6 @@ Author: Tristan Van Berkom <tvb@gnome.org> <property name="left_attach">0</property> <property name="top_attach">6</property> <property name="width">3</property> - <property name="height">1</property> </packing> </child> <child> @@ -194,7 +184,6 @@ Author: Tristan Van Berkom <tvb@gnome.org> <property name="left_attach">3</property> <property name="top_attach">6</property> <property name="width">2</property> - <property name="height">1</property> </packing> </child> <child> @@ -214,7 +203,6 @@ Author: Tristan Van Berkom <tvb@gnome.org> <property name="left_attach">0</property> <property name="top_attach">7</property> <property name="width">2</property> - <property name="height">1</property> </packing> </child> <child> @@ -233,7 +221,6 @@ Author: Tristan Van Berkom <tvb@gnome.org> <property name="left_attach">3</property> <property name="top_attach">7</property> <property name="width">2</property> - <property name="height">1</property> </packing> </child> <child> @@ -248,7 +235,6 @@ Author: Tristan Van Berkom <tvb@gnome.org> <property name="left_attach">0</property> <property name="top_attach">8</property> <property name="width">2</property> - <property name="height">1</property> </packing> </child> <child> @@ -260,8 +246,6 @@ Author: Tristan Van Berkom <tvb@gnome.org> <packing> <property name="left_attach">2</property> <property name="top_attach">8</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -275,8 +259,6 @@ Author: Tristan Van Berkom <tvb@gnome.org> <packing> <property name="left_attach">3</property> <property name="top_attach">8</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -288,8 +270,6 @@ Author: Tristan Van Berkom <tvb@gnome.org> <packing> <property name="left_attach">4</property> <property name="top_attach">8</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -304,7 +284,6 @@ Author: Tristan Van Berkom <tvb@gnome.org> <property name="left_attach">0</property> <property name="top_attach">9</property> <property name="width">2</property> - <property name="height">1</property> </packing> </child> <child> @@ -318,8 +297,6 @@ Author: Tristan Van Berkom <tvb@gnome.org> <packing> <property name="left_attach">3</property> <property name="top_attach">9</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -331,8 +308,6 @@ Author: Tristan Van Berkom <tvb@gnome.org> <packing> <property name="left_attach">2</property> <property name="top_attach">9</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -344,8 +319,30 @@ Author: Tristan Van Berkom <tvb@gnome.org> <packing> <property name="left_attach">4</property> <property name="top_attach">9</property> - <property name="width">1</property> - <property name="height">1</property> + </packing> + </child> + <child> + <object class="GladePropertyLabel" id="overlay_scrolling_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">False</property> + <property name="property_name">overlay-scrolling</property> + </object> + <packing> + <property name="left_attach">3</property> + <property name="top_attach">4</property> + </packing> + </child> + <child> + <object class="GladePropertyShell" id="overlay_scrolling_editor"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">False</property> + <property name="property_name">overlay-scrolling</property> + </object> + <packing> + <property name="left_attach">4</property> + <property name="top_attach">4</property> </packing> </child> <child> @@ -401,6 +398,8 @@ Author: Tristan Van Berkom <tvb@gnome.org> <editor id="vadj_label"/> <editor id="hadj_editor"/> <editor id="vadj_editor"/> + <editor id="overlay_scrolling_label"/> + <editor id="overlay_scrolling_editor"/> </child-editors> </template> </interface> diff --git a/plugins/gtk+/gtk+.xml.in b/plugins/gtk+/gtk+.xml.in index 9493fbad..51e66e03 100644 --- a/plugins/gtk+/gtk+.xml.in +++ b/plugins/gtk+/gtk+.xml.in @@ -1,6 +1,6 @@ <glade-catalog name="gtk+" - version="3.12" - targetable="3.10,3.8,3.6,3.4,3.2,3.0" + version="3.16" + targetable="3.14,3.12,3.10,3.8,3.6,3.4,3.2,3.0" icon-prefix="gtk" library="gladegtk" domain="glade" @@ -1174,6 +1174,11 @@ <properties> <property id="label" translatable="True" multiline="True" default="toolitemgroup" custom-layout="True"/> <property id="label-widget" parentless-widget="True" create-type="GtkLabel" custom-layout="True"/> + + <!-- + Note xalign and yalign properties were added here, but they do the same as GtkMisc:xalign/yalign does, + so no need to 'since' them, if you target < 3.16, you will hit the misc properties + --> <!-- Virtual label type property --> <property id="custom-label" default="False" visible="False" save="False"> @@ -1770,6 +1775,9 @@ <post-create-function>glade_gtk_switch_post_create</post-create-function> <create-editable-function>glade_gtk_switch_create_editable</create-editable-function> <properties> + + <!-- The GtkSwitch state is meant to be set in a state-set signal --> + <property id="state" disabled="True" since="3.14"/> <!-- GtkActivatable --> <property id="related-action" _name="Related Action" custom-layout="True" save="False" needs-sync="True" @@ -1786,9 +1794,9 @@ <property id="action-name" _name="Action Name" custom-layout="True" since="3.4"/> </properties> - <!-- GtkActionable --> - <property id="action-name" _name="Action Name" custom-layout="True" since="3.4"/> - + <signals> + <signal id="state-set" since="3.14"/> + </signals> </glade-widget-class> <glade-widget-class name="GtkFileChooserButton" generic-name="filechooserbutton" _title="File Chooser Button"> @@ -2325,6 +2333,8 @@ <packing-properties> <property id="resize" transfer-on-paste="True" save-always="True"/> <property id="shrink" transfer-on-paste="True" save-always="True"/> + + <property id="wide-handle" since="3.16"/> <!-- Whether to add the child to the top/left or bottom/right pane. This virtual property is used to remember child position in undo/redo. @@ -2537,7 +2547,7 @@ </glade-widget-class> - <glade-widget-class name="GtkSidebar" generic-name="sidebar" _title="Sidebar" since="3.15"/> + <glade-widget-class name="GtkSidebar" generic-name="sidebar" _title="Sidebar" since="3.16"/> <glade-widget-class name="GtkRevealer" generic-name="revealer" _title="Revealer" since="3.10"> <post-create-function>glade_gtk_revealer_post_create</post-create-function> @@ -2632,9 +2642,19 @@ </property> </packing-properties> + <signals> + <signal id="select-all" since="3.14"/> + <signal id="unselect-all" since="3.14"/> + <signal id="selected-rows-changed" since="3.14"/> + </signals> </glade-widget-class> - <glade-widget-class name="GtkListBoxRow" generic-name="listboxrow" _title="List Box Row" since="3.10"/> + <glade-widget-class name="GtkListBoxRow" generic-name="listboxrow" _title="List Box Row" since="3.10"> + <properties> + <property id="activatable" since="3.14"/> + <property id="selectable" since="3.14"/> + </properties> + </glade-widget-class> <glade-widget-class name="GtkRange" _title="Range"> <properties> @@ -3056,8 +3076,12 @@ <value id="GTK_CORNER_BOTTOM_RIGHT" _name="Bottom Right"/> </displayable-values> </property> + <property id="overlay-scrolling" optional="True" optional-default="False" since="3.16" custom-layout="True"/> </properties> + <signals> + <signal id="edge-overshoot" since="3.16"/> + </signals> </glade-widget-class> <!-- NOT AVAILABLES ON WIN32 @@ -3549,6 +3573,9 @@ <actions> <action id="launch_editor" _name="Edit…" stock="gtk-edit" important="True"/> </actions> + <signals> + <signal id="no-matches" since="3.14"/> + </signals> </glade-widget-class> <glade-widget-class name="GtkIconFactory" generic-name="iconfactory" _title="Icon Factory" |