diff options
author | Carlos Soriano <csoriano@redhat.com> | 2018-07-27 10:02:19 +0200 |
---|---|---|
committer | Juan Pablo Ugarte <juanpablougarte@gmail.com> | 2018-08-01 13:43:27 +0000 |
commit | 44577c829ad111254169daf289994db02a67f18e (patch) | |
tree | f2e95a27163d0e49e1de7c9a4b92868c675afc4f /plugins | |
parent | 4e9893dfcd6ab20ce5d44290c4007f565cdf1afe (diff) | |
download | glade-44577c829ad111254169daf289994db02a67f18e.tar.gz |
widget-editor: Replace margin right/left for end/start
They have been deprecated for some time now and break RTL languages.
This works implements margin-end and margin-start and deprecates
margin-left and margin-start.
All four properties are shown to be able to upgrade from previous gtk3
versions, ideally this will be gone when Glade moves to gtk4.
Closes https://gitlab.gnome.org/GNOME/glade/issues/319
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/gtk+/glade-widget-editor.ui | 92 | ||||
-rw-r--r-- | plugins/gtk+/gtk+.xml.in | 6 |
2 files changed, 86 insertions, 12 deletions
diff --git a/plugins/gtk+/glade-widget-editor.ui b/plugins/gtk+/glade-widget-editor.ui index e6397248..fead5506 100644 --- a/plugins/gtk+/glade-widget-editor.ui +++ b/plugins/gtk+/glade-widget-editor.ui @@ -561,7 +561,7 @@ Author: Tristan Van Berkom <tvb@gnome.org> </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">22</property> + <property name="top_attach">24</property> <property name="width">2</property> <property name="height">1</property> </packing> @@ -578,7 +578,7 @@ Author: Tristan Van Berkom <tvb@gnome.org> </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">23</property> + <property name="top_attach">25</property> <property name="width">2</property> <property name="height">1</property> </packing> @@ -595,7 +595,7 @@ Author: Tristan Van Berkom <tvb@gnome.org> </object> <packing> <property name="left_attach">2</property> - <property name="top_attach">22</property> + <property name="top_attach">24</property> <property name="width">4</property> <property name="height">1</property> </packing> @@ -611,7 +611,7 @@ Author: Tristan Van Berkom <tvb@gnome.org> </object> <packing> <property name="left_attach">2</property> - <property name="top_attach">23</property> + <property name="top_attach">25</property> <property name="width">4</property> <property name="height">1</property> </packing> @@ -685,7 +685,7 @@ instead of setting a literal tooltip</property> </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">24</property> + <property name="top_attach">26</property> <property name="width">2</property> <property name="height">1</property> </packing> @@ -701,7 +701,7 @@ instead of setting a literal tooltip</property> </object> <packing> <property name="left_attach">2</property> - <property name="top_attach">24</property> + <property name="top_attach">26</property> <property name="width">4</property> <property name="height">1</property> </packing> @@ -1008,6 +1008,24 @@ instead of setting a literal tooltip</property> </packing> </child> <child> + <object class="GladePropertyLabel" id="margin_start_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="has_focus">False</property> + <property name="is_focus">False</property> + <property name="halign">end</property> + <property name="hexpand">False</property> + <property name="property_name">margin-start</property> + <property name="custom_text" translatable="yes">Start:</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">20</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> <object class="GladePropertyLabel" id="margin_left_label"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -1019,8 +1037,26 @@ instead of setting a literal tooltip</property> <property name="custom_text" translatable="yes">Left:</property> </object> <packing> + <property name="left_attach">0</property> + <property name="top_attach">22</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GladePropertyLabel" id="margin_end_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="has_focus">False</property> + <property name="is_focus">False</property> + <property name="halign">end</property> + <property name="hexpand">False</property> + <property name="property_name">margin-end</property> + <property name="custom_text" translatable="yes">End:</property> + </object> + <packing> <property name="left_attach">2</property> - <property name="top_attach">20</property> + <property name="top_attach">21</property> <property name="width">1</property> <property name="height">1</property> </packing> @@ -1038,12 +1074,28 @@ instead of setting a literal tooltip</property> </object> <packing> <property name="left_attach">2</property> - <property name="top_attach">21</property> + <property name="top_attach">22</property> <property name="width">1</property> <property name="height">1</property> </packing> </child> <child> + <object class="GladePropertyShell" id="margin_start_editor"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="has_focus">False</property> + <property name="is_focus">False</property> + <property name="hexpand">False</property> + <property name="property_name">margin-start</property> + </object> + <packing> + <property name="left_attach">3</property> + <property name="top_attach">20</property> + <property name="width">2</property> + <property name="height">1</property> + </packing> + </child> + <child> <object class="GladePropertyShell" id="margin_left_editor"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -1053,8 +1105,24 @@ instead of setting a literal tooltip</property> <property name="property_name">margin-left</property> </object> <packing> + <property name="left_attach">1</property> + <property name="top_attach">22</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GladePropertyShell" id="margin_end_editor"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="has_focus">False</property> + <property name="is_focus">False</property> + <property name="hexpand">False</property> + <property name="property_name">margin-end</property> + </object> + <packing> <property name="left_attach">3</property> - <property name="top_attach">20</property> + <property name="top_attach">21</property> <property name="width">2</property> <property name="height">1</property> </packing> @@ -1070,7 +1138,7 @@ instead of setting a literal tooltip</property> </object> <packing> <property name="left_attach">3</property> - <property name="top_attach">21</property> + <property name="top_attach">22</property> <property name="width">2</property> <property name="height">1</property> </packing> @@ -1176,9 +1244,13 @@ instead of setting a literal tooltip</property> <editor id="margin_bottom_label"/> <editor id="margin_top_editor"/> <editor id="margin_bottom_editor"/> + <editor id="margin_start_label"/> <editor id="margin_left_label"/> + <editor id="margin_end_label"/> <editor id="margin_right_label"/> + <editor id="margin_start_editor"/> <editor id="margin_left_editor"/> + <editor id="margin_end_editor"/> <editor id="margin_right_editor"/> </child-editors> </template> diff --git a/plugins/gtk+/gtk+.xml.in b/plugins/gtk+/gtk+.xml.in index 422b50e2..fea366f1 100644 --- a/plugins/gtk+/gtk+.xml.in +++ b/plugins/gtk+/gtk+.xml.in @@ -80,8 +80,10 @@ <property id="hexpand-set" disabled="True" since="3.0"/> <property id="vexpand-set" disabled="True" since="3.0"/> <property id="margin" disabled="True" since="3.0"/> - <property id="margin-left" custom-layout="True" since="3.0"/> - <property id="margin-right" custom-layout="True" since="3.0"/> + <property id="margin-start" custom-layout="True" since="3.12"/> + <property id="margin-left" custom-layout="True" since="3.0" deprecated="True"/> + <property id="margin-end" custom-layout="True" since="3.12"/> + <property id="margin-right" custom-layout="True" since="3.0" deprecated="True"/> <property id="margin-top" custom-layout="True" since="3.0"/> <property id="margin-bottom" custom-layout="True" since="3.0"/> |