diff options
author | Caolán McNamara <caolanm@redhat.com> | 2017-10-04 12:07:20 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2017-10-17 09:55:31 +0200 |
commit | 9b8828174dca6971d2490844b4c6cab2b9d57b8d (patch) | |
tree | 330a27fa71ad84986ff4c6d88b961efd2b4fa777 /svx/uiconfig | |
parent | 493a7e9932b09ddafd31f443ef2dc03d85f4b12b (diff) |
turn implicit container explicit in buildable notebooks
as in interim measure for SfxTabDialogs we throw
away the TabPage if its not suitable for reuse
Change-Id: Ic5776ca3d2a8cb6bf41f33df01b211f81c62a842
Reviewed-on: https://gerrit.libreoffice.org/43134
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'svx/uiconfig')
-rw-r--r-- | svx/uiconfig/ui/datanavigator.ui | 36 | ||||
-rw-r--r-- | svx/uiconfig/ui/redlinecontrol.ui | 22 | ||||
-rw-r--r-- | svx/uiconfig/ui/textcontrolchardialog.ui | 32 | ||||
-rw-r--r-- | svx/uiconfig/ui/textcontrolparadialog.ui | 45 |
4 files changed, 114 insertions, 21 deletions
diff --git a/svx/uiconfig/ui/datanavigator.ui b/svx/uiconfig/ui/datanavigator.ui index c6eb4bf588d8..dac11caa60cf 100644 --- a/svx/uiconfig/ui/datanavigator.ui +++ b/svx/uiconfig/ui/datanavigator.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.16.1 --> +<!-- Generated with glade 3.20.0 --> <interface domain="svx"> <requires lib="gtk+" version="3.0"/> <object class="GtkBox" id="DataNavigator"> @@ -30,8 +30,6 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -46,8 +44,6 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> </object> @@ -64,7 +60,13 @@ <property name="hexpand">True</property> <property name="vexpand">True</property> <child> - <placeholder/> + <object class="GtkGrid"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <placeholder/> + </child> + </object> </child> <child type="tab"> <object class="GtkLabel" id="instance"> @@ -77,7 +79,16 @@ </packing> </child> <child> - <placeholder/> + <object class="GtkGrid"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="position">1</property> + </packing> </child> <child type="tab"> <object class="GtkLabel" id="submissions"> @@ -91,7 +102,16 @@ </packing> </child> <child> - <placeholder/> + <object class="GtkGrid"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="position">2</property> + </packing> </child> <child type="tab"> <object class="GtkLabel" id="bindings"> diff --git a/svx/uiconfig/ui/redlinecontrol.ui b/svx/uiconfig/ui/redlinecontrol.ui index 31fe905a24e3..e8de321623c1 100644 --- a/svx/uiconfig/ui/redlinecontrol.ui +++ b/svx/uiconfig/ui/redlinecontrol.ui @@ -1,13 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.20.0 --> <interface domain="svx"> - <!-- interface-requires gtk+ 3.0 --> + <requires lib="gtk+" version="3.0"/> <object class="GtkNotebook" id="RedlineControl"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="hexpand">True</property> <property name="vexpand">True</property> <child> - <placeholder/> + <object class="GtkGrid"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <placeholder/> + </child> + </object> </child> <child type="tab"> <object class="GtkLabel" id="view"> @@ -20,7 +27,16 @@ </packing> </child> <child> - <placeholder/> + <object class="GtkGrid"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="position">1</property> + </packing> </child> <child type="tab"> <object class="GtkLabel" id="filter"> diff --git a/svx/uiconfig/ui/textcontrolchardialog.ui b/svx/uiconfig/ui/textcontrolchardialog.ui index a1c76e4d0f61..998f8d4c9f14 100644 --- a/svx/uiconfig/ui/textcontrolchardialog.ui +++ b/svx/uiconfig/ui/textcontrolchardialog.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.18.3 --> +<!-- Generated with glade 3.20.0 --> <interface domain="svx"> <requires lib="gtk+" version="3.0"/> <object class="GtkDialog" id="TextControlCharacterPropertiesDialog"> @@ -91,7 +91,13 @@ <property name="hexpand">True</property> <property name="vexpand">True</property> <child> - <placeholder/> + <object class="GtkGrid"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <placeholder/> + </child> + </object> </child> <child type="tab"> <object class="GtkLabel" id="font"> @@ -104,7 +110,16 @@ </packing> </child> <child> - <placeholder/> + <object class="GtkGrid"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="position">1</property> + </packing> </child> <child type="tab"> <object class="GtkLabel" id="fonteffects"> @@ -118,7 +133,16 @@ </packing> </child> <child> - <placeholder/> + <object class="GtkGrid"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="position">2</property> + </packing> </child> <child type="tab"> <object class="GtkLabel" id="position"> diff --git a/svx/uiconfig/ui/textcontrolparadialog.ui b/svx/uiconfig/ui/textcontrolparadialog.ui index 92b0100f2e6c..fcce7fda27ba 100644 --- a/svx/uiconfig/ui/textcontrolparadialog.ui +++ b/svx/uiconfig/ui/textcontrolparadialog.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.18.3 --> +<!-- Generated with glade 3.20.0 --> <interface domain="svx"> <requires lib="gtk+" version="3.0"/> <object class="GtkDialog" id="TextControlParagraphPropertiesDialog"> @@ -91,7 +91,13 @@ <property name="hexpand">True</property> <property name="vexpand">True</property> <child> - <placeholder/> + <object class="GtkGrid"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <placeholder/> + </child> + </object> </child> <child type="tab"> <object class="GtkLabel" id="labelTP_PARA_STD"> @@ -104,14 +110,23 @@ </packing> </child> <child> - <placeholder/> + <object class="GtkGrid"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="position">1</property> + </packing> </child> <child type="tab"> <object class="GtkLabel" id="labelTP_PARA_ALIGN"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0.4699999988079071</property> <property name="label" translatable="yes" context="textcontrolparadialog|labelTP_PARA_ALIGN">Alignment</property> + <property name="xalign">0.4699999988079071</property> </object> <packing> <property name="position">1</property> @@ -119,7 +134,16 @@ </packing> </child> <child> - <placeholder/> + <object class="GtkGrid"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="position">2</property> + </packing> </child> <child type="tab"> <object class="GtkLabel" id="labelTP_PARA_ASIAN"> @@ -133,7 +157,16 @@ </packing> </child> <child> - <placeholder/> + <object class="GtkGrid"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="position">3</property> + </packing> </child> <child type="tab"> <object class="GtkLabel" id="labelTP_TABULATOR"> |