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 /sd/uiconfig/sdraw | |
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 'sd/uiconfig/sdraw')
-rw-r--r-- | sd/uiconfig/sdraw/ui/bulletsandnumbering.ui | 54 | ||||
-rw-r--r-- | sd/uiconfig/sdraw/ui/drawchardialog.ui | 43 | ||||
-rw-r--r-- | sd/uiconfig/sdraw/ui/drawpagedialog.ui | 33 | ||||
-rw-r--r-- | sd/uiconfig/sdraw/ui/drawparadialog.ui | 56 | ||||
-rw-r--r-- | sd/uiconfig/sdraw/ui/drawprtldialog.ui | 175 |
5 files changed, 321 insertions, 40 deletions
diff --git a/sd/uiconfig/sdraw/ui/bulletsandnumbering.ui b/sd/uiconfig/sdraw/ui/bulletsandnumbering.ui index 38bd8f5654ec..da3cfe4dd698 100644 --- a/sd/uiconfig/sdraw/ui/bulletsandnumbering.ui +++ b/sd/uiconfig/sdraw/ui/bulletsandnumbering.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="sd"> <requires lib="gtk+" version="3.0"/> <object class="GtkDialog" id="BulletsAndNumberingDialog"> @@ -90,7 +90,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="bullets"> @@ -103,7 +109,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="singlenum"> @@ -117,7 +132,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="graphics"> @@ -131,7 +155,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="position"> @@ -145,7 +178,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">4</property> + </packing> </child> <child type="tab"> <object class="GtkLabel" id="customize"> diff --git a/sd/uiconfig/sdraw/ui/drawchardialog.ui b/sd/uiconfig/sdraw/ui/drawchardialog.ui index 763ffa3991cf..aac6b6e652a3 100644 --- a/sd/uiconfig/sdraw/ui/drawchardialog.ui +++ b/sd/uiconfig/sdraw/ui/drawchardialog.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="sd"> <requires lib="gtk+" version="3.0"/> <object class="GtkDialog" id="DrawCharDialog"> @@ -90,7 +90,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="RID_SVXPAGE_CHAR_NAME"> @@ -103,7 +109,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="RID_SVXPAGE_CHAR_EFFECTS"> @@ -117,7 +132,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="RID_SVXPAGE_CHAR_POSITION"> @@ -131,7 +155,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="RID_SVXPAGE_BACKGROUND"> diff --git a/sd/uiconfig/sdraw/ui/drawpagedialog.ui b/sd/uiconfig/sdraw/ui/drawpagedialog.ui index e126d52fe413..1340468224ce 100644 --- a/sd/uiconfig/sdraw/ui/drawpagedialog.ui +++ b/sd/uiconfig/sdraw/ui/drawpagedialog.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="sd"> <requires lib="gtk+" version="3.0"/> <object class="GtkDialog" id="DrawPageDialog"> @@ -90,7 +90,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="RID_SVXPAGE_PAGE"> @@ -99,12 +105,20 @@ <property name="label" translatable="yes" context="drawpagedialog|RID_SVXPAGE_PAGE">Page</property> </object> <packing> - <property name="position">0</property> <property name="tab_fill">False</property> </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="RID_SVXPAGE_AREA"> @@ -118,7 +132,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="RID_SVXPAGE_TRANSPARENCE"> diff --git a/sd/uiconfig/sdraw/ui/drawparadialog.ui b/sd/uiconfig/sdraw/ui/drawparadialog.ui index b9ab7f223cd1..f7a0d3796ea3 100644 --- a/sd/uiconfig/sdraw/ui/drawparadialog.ui +++ b/sd/uiconfig/sdraw/ui/drawparadialog.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="sd"> <requires lib="gtk+" version="3.0"/> <object class="GtkDialog" id="DrawParagraphPropertiesDialog"> @@ -90,7 +90,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"> @@ -103,7 +109,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="labelTP_PARA_ASIAN"> @@ -117,7 +132,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_TABULATOR"> @@ -131,14 +155,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">3</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="drawparadialog|labelTP_PARA_ALIGN">Alignment</property> + <property name="xalign">0.4699999988079071</property> </object> <packing> <property name="position">3</property> @@ -146,7 +179,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">4</property> + </packing> </child> <child type="tab"> <object class="GtkLabel" id="labelNUMBERING"> diff --git a/sd/uiconfig/sdraw/ui/drawprtldialog.ui b/sd/uiconfig/sdraw/ui/drawprtldialog.ui index 8508220870b6..3e99ca5241d5 100644 --- a/sd/uiconfig/sdraw/ui/drawprtldialog.ui +++ b/sd/uiconfig/sdraw/ui/drawprtldialog.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="sd"> <requires lib="gtk+" version="3.0"/> <object class="GtkDialog" id="DrawPRTLDialog"> @@ -90,7 +90,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="RID_SVXPAGE_LINE"> @@ -103,7 +109,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="RID_SVXPAGE_AREA"> @@ -117,7 +132,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="RID_SVXPAGE_SHADOW"> @@ -131,7 +155,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="RID_SVXPAGE_TRANSPARENCE"> @@ -145,7 +178,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">4</property> + </packing> </child> <child type="tab"> <object class="GtkLabel" id="RID_SVXPAGE_CHAR_NAME"> @@ -159,7 +201,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">5</property> + </packing> </child> <child type="tab"> <object class="GtkLabel" id="RID_SVXPAGE_CHAR_EFFECTS"> @@ -173,7 +224,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">6</property> + </packing> </child> <child type="tab"> <object class="GtkLabel" id="RID_SVXPAGE_STD_PARAGRAPH"> @@ -187,7 +247,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">7</property> + </packing> </child> <child type="tab"> <object class="GtkLabel" id="RID_SVXPAGE_TEXTATTR"> @@ -201,7 +270,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">8</property> + </packing> </child> <child type="tab"> <object class="GtkLabel" id="RID_SVXPAGE_PICK_BULLET"> @@ -215,7 +293,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">9</property> + </packing> </child> <child type="tab"> <object class="GtkLabel" id="RID_SVXPAGE_PICK_SINGLE_NUM"> @@ -229,7 +316,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">10</property> + </packing> </child> <child type="tab"> <object class="GtkLabel" id="RID_SVXPAGE_PICK_BMP"> @@ -243,7 +339,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">11</property> + </packing> </child> <child type="tab"> <object class="GtkLabel" id="RID_SVXPAGE_NUM_OPTIONS"> @@ -257,7 +362,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">12</property> + </packing> </child> <child type="tab"> <object class="GtkLabel" id="RID_SVXPAGE_ALIGN_PARAGRAPH"> @@ -271,7 +385,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">13</property> + </packing> </child> <child type="tab"> <object class="GtkLabel" id="RID_SVXPAGE_PARA_ASIAN"> @@ -285,7 +408,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">14</property> + </packing> </child> <child type="tab"> <object class="GtkLabel" id="RID_SVXPAGE_TABULATOR"> @@ -299,7 +431,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">15</property> + </packing> </child> <child type="tab"> <object class="GtkLabel" id="RID_SVXPAGE_BACKGROUND"> |