summaryrefslogtreecommitdiff
path: root/reportdesign
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-10-04 12:07:20 +0100
committerCaolán McNamara <caolanm@redhat.com>2017-10-17 09:55:31 +0200
commit9b8828174dca6971d2490844b4c6cab2b9d57b8d (patch)
tree330a27fa71ad84986ff4c6d88b961efd2b4fa777 /reportdesign
parent493a7e9932b09ddafd31f443ef2dc03d85f4b12b (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 'reportdesign')
-rw-r--r--reportdesign/uiconfig/dbreport/ui/backgrounddialog.ui12
-rw-r--r--reportdesign/uiconfig/dbreport/ui/chardialog.ui65
-rw-r--r--reportdesign/uiconfig/dbreport/ui/pagedialog.ui23
3 files changed, 86 insertions, 14 deletions
diff --git a/reportdesign/uiconfig/dbreport/ui/backgrounddialog.ui b/reportdesign/uiconfig/dbreport/ui/backgrounddialog.ui
index 81f06b43ac9e..371dcec42a6e 100644
--- a/reportdesign/uiconfig/dbreport/ui/backgrounddialog.ui
+++ b/reportdesign/uiconfig/dbreport/ui/backgrounddialog.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="rpt">
<requires lib="gtk+" version="3.0"/>
<object class="GtkDialog" id="BackgroundDialog">
@@ -90,14 +90,20 @@
<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="background">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0.4699999988079071</property>
<property name="label" translatable="yes" context="backgrounddialog|background">Background</property>
+ <property name="xalign">0.4699999988079071</property>
</object>
<packing>
<property name="tab_fill">False</property>
diff --git a/reportdesign/uiconfig/dbreport/ui/chardialog.ui b/reportdesign/uiconfig/dbreport/ui/chardialog.ui
index 8fc9aa4da781..59ac7cfccb62 100644
--- a/reportdesign/uiconfig/dbreport/ui/chardialog.ui
+++ b/reportdesign/uiconfig/dbreport/ui/chardialog.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="rpt">
<requires lib="gtk+" version="3.0"/>
<object class="GtkDialog" id="CharDialog">
@@ -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="font">
@@ -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="fonteffects">
@@ -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="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="asianlayout">
@@ -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="background">
@@ -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="alignment">
diff --git a/reportdesign/uiconfig/dbreport/ui/pagedialog.ui b/reportdesign/uiconfig/dbreport/ui/pagedialog.ui
index 5fa08b2a48ab..d64acf4cff6b 100644
--- a/reportdesign/uiconfig/dbreport/ui/pagedialog.ui
+++ b/reportdesign/uiconfig/dbreport/ui/pagedialog.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="rpt">
<requires lib="gtk+" version="3.0"/>
<object class="GtkDialog" id="PageDialog">
@@ -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="page">
@@ -103,14 +109,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="background">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0.4699999988079071</property>
<property name="label" translatable="yes" context="pagedialog|background">Background</property>
+ <property name="xalign">0.4699999988079071</property>
</object>
<packing>
<property name="position">1</property>