summaryrefslogtreecommitdiff
path: root/dbaccess
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 /dbaccess
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 'dbaccess')
-rw-r--r--dbaccess/uiconfig/ui/admindialog.ui12
-rw-r--r--dbaccess/uiconfig/ui/advancedsettingsdialog.ui23
-rw-r--r--dbaccess/uiconfig/ui/fielddialog.ui23
-rw-r--r--dbaccess/uiconfig/ui/useradmindialog.ui12
4 files changed, 56 insertions, 14 deletions
diff --git a/dbaccess/uiconfig/ui/admindialog.ui b/dbaccess/uiconfig/ui/admindialog.ui
index c08b37610ebf..13254c2cf0d1 100644
--- a/dbaccess/uiconfig/ui/admindialog.ui
+++ b/dbaccess/uiconfig/ui/admindialog.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="dba">
<requires lib="gtk+" version="3.0"/>
<object class="GtkDialog" id="AdminDialog">
@@ -77,14 +77,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="advanced">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0.4699999988079071</property>
<property name="label" translatable="yes" context="admindialog|advanced">Advanced Properties</property>
+ <property name="xalign">0.4699999988079071</property>
</object>
<packing>
<property name="tab_fill">False</property>
diff --git a/dbaccess/uiconfig/ui/advancedsettingsdialog.ui b/dbaccess/uiconfig/ui/advancedsettingsdialog.ui
index 35eb669b99cb..28a2cfccf6c1 100644
--- a/dbaccess/uiconfig/ui/advancedsettingsdialog.ui
+++ b/dbaccess/uiconfig/ui/advancedsettingsdialog.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="dba">
<requires lib="gtk+" version="3.0"/>
<object class="GtkDialog" id="AdvancedSettingsDialog">
@@ -77,7 +77,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="generated">
@@ -90,14 +96,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="special">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0.4699999988079071</property>
<property name="label" translatable="yes" context="advancedsettingsdialog|special">Special Settings</property>
+ <property name="xalign">0.4699999988079071</property>
</object>
<packing>
<property name="position">1</property>
diff --git a/dbaccess/uiconfig/ui/fielddialog.ui b/dbaccess/uiconfig/ui/fielddialog.ui
index c903fa498d4b..57f930c9503c 100644
--- a/dbaccess/uiconfig/ui/fielddialog.ui
+++ b/dbaccess/uiconfig/ui/fielddialog.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="dba">
<requires lib="gtk+" version="3.0"/>
<object class="GtkDialog" id="FieldDialog">
@@ -96,7 +96,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="format">
@@ -109,14 +115,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="alignment">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0.4699999988079071</property>
<property name="label" translatable="yes" context="fielddialog|alignment">Alignment</property>
+ <property name="xalign">0.4699999988079071</property>
</object>
<packing>
<property name="position">1</property>
diff --git a/dbaccess/uiconfig/ui/useradmindialog.ui b/dbaccess/uiconfig/ui/useradmindialog.ui
index d46db29c5351..83c5b52c9be1 100644
--- a/dbaccess/uiconfig/ui/useradmindialog.ui
+++ b/dbaccess/uiconfig/ui/useradmindialog.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="dba">
<requires lib="gtk+" version="3.0"/>
<object class="GtkDialog" id="UserAdminDialog">
@@ -77,14 +77,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="settings">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0.4699999988079071</property>
<property name="label" translatable="yes" context="useradmindialog|settings">User Settings</property>
+ <property name="xalign">0.4699999988079071</property>
</object>
<packing>
<property name="tab_fill">False</property>