[Libreoffice-commits] core.git: dbaccess/uiconfig extras/source solenv/sanitizers
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Thu Oct 25 07:58:07 UTC 2018
dbaccess/uiconfig/ui/dbwizconnectionpage.ui | 48 +++++++++++++++------
dbaccess/uiconfig/ui/dbwiztextpage.ui | 55 +++++++++++++++----------
dbaccess/uiconfig/ui/jdbcconnectionpage.ui | 1
extras/source/glade/libreoffice-catalog.xml.in | 3 -
solenv/sanitizers/ui/dbaccess.suppr | 4 -
5 files changed, 70 insertions(+), 41 deletions(-)
New commits:
commit de48e3cf707813f1c2e6b5f6663f41382f316011
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Oct 24 16:23:54 2018 +0100
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Oct 25 09:57:38 2018 +0200
fix up wizards pages
Change-Id: Icea2c91d06af4fc5d190186d4f6d624ebfc991ff
Reviewed-on: https://gerrit.libreoffice.org/62325
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/dbaccess/uiconfig/ui/dbwizconnectionpage.ui b/dbaccess/uiconfig/ui/dbwizconnectionpage.ui
index 3a1f1f411a0b..3d022c5307e7 100644
--- a/dbaccess/uiconfig/ui/dbwizconnectionpage.ui
+++ b/dbaccess/uiconfig/ui/dbwizconnectionpage.ui
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.22.1 -->
<interface domain="dba">
<requires lib="gtk+" version="3.18"/>
- <requires lib="LibreOffice" version="1.0"/>
<object class="GtkBox" id="ConnectionPage">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -32,10 +31,10 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_bottom">6</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes" context="dbwizconnectionpage|helptext">label</property>
<property name="wrap">True</property>
<property name="max_width_chars">60</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="expand">False</property>
@@ -64,17 +63,6 @@
</packing>
</child>
<child>
- <object class="dbulo-ConnectionURLEdit" id="browseurl">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hexpand">True</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
<object class="GtkButton" id="create">
<property name="label" translatable="yes" context="dbwizconnectionpage|create">_Create New</property>
<property name="visible">True</property>
@@ -100,6 +88,38 @@
<property name="top_attach">1</property>
</packing>
</child>
+ <child>
+ <object class="GtkGrid">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkEntry" id="browseurl">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="activates_default">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="browselabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
diff --git a/dbaccess/uiconfig/ui/dbwiztextpage.ui b/dbaccess/uiconfig/ui/dbwiztextpage.ui
index 65bcb8fc712f..bbb6600d4232 100644
--- a/dbaccess/uiconfig/ui/dbwiztextpage.ui
+++ b/dbaccess/uiconfig/ui/dbwiztextpage.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.22.1 -->
<interface domain="dba">
- <!-- interface-requires gtk+ 3.0 -->
- <!-- interface-requires LibreOffice 1.0 -->
+ <requires lib="gtk+" version="3.18"/>
<object class="GtkBox" id="DBWizTextPage">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -39,9 +39,9 @@
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="hexpand">True</property>
- <property name="xalign">0</property>
<property name="wrap">True</property>
<property name="max_width_chars">100</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="expand">False</property>
@@ -57,18 +57,6 @@
<property name="row_spacing">6</property>
<property name="column_spacing">6</property>
<child>
- <object class="dbulo-ConnectionURLEdit" id="browseurl">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
<object class="GtkButton" id="browse">
<property name="label" translatable="yes" context="dbwiztextpage|browse">Browse</property>
<property name="visible">True</property>
@@ -78,8 +66,6 @@
<packing>
<property name="left_attach">1</property>
<property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -92,8 +78,6 @@
<packing>
<property name="left_attach">2</property>
<property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -102,13 +86,44 @@
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="hexpand">True</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">browseurl</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
<property name="width">3</property>
- <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkEntry" id="browseurl">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="browselabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
</packing>
</child>
</object>
diff --git a/dbaccess/uiconfig/ui/jdbcconnectionpage.ui b/dbaccess/uiconfig/ui/jdbcconnectionpage.ui
index 8f62f3f821c1..0df26ed00151 100644
--- a/dbaccess/uiconfig/ui/jdbcconnectionpage.ui
+++ b/dbaccess/uiconfig/ui/jdbcconnectionpage.ui
@@ -97,6 +97,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
+ <property name="activates_default">True</property>
</object>
<packing>
<property name="left_attach">1</property>
diff --git a/extras/source/glade/libreoffice-catalog.xml.in b/extras/source/glade/libreoffice-catalog.xml.in
index 15e6e80500fb..01598c883b79 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -45,9 +45,6 @@
<glade-widget-class title="OSQL NameEdit" name="dbulo-OSQLNameEdit"
generic-name="OSQLNameEdit" parent="GtkEntry"
icon-name="widget-gtk-textentry"/>
- <glade-widget-class title="ConnectionURLEdit" name="dbulo-ConnectionURLEdit"
- generic-name="ConnectionURLEdit" parent="GtkEntry"
- icon-name="widget-gtk-entry"/>
<glade-widget-class title="VclComboBoxText" name="VclComboBoxText"
generic-name="ComboBoxText" parent="GtkComboBoxText"
diff --git a/solenv/sanitizers/ui/dbaccess.suppr b/solenv/sanitizers/ui/dbaccess.suppr
index 0b6ced04a3b9..27348d11b5ba 100644
--- a/solenv/sanitizers/ui/dbaccess.suppr
+++ b/solenv/sanitizers/ui/dbaccess.suppr
@@ -20,11 +20,7 @@ dbaccess/uiconfig/ui/dbwizconnectionpage.ui://GtkLabel[@id='helptext'] orphan-la
dbaccess/uiconfig/ui/dbwizmysqlintropage.ui://GtkLabel[@id='label2'] orphan-label
dbaccess/uiconfig/ui/dbwizmysqlnativepage.ui://GtkLabel[@id='helptext'] orphan-label
dbaccess/uiconfig/ui/dbwizspreadsheetpage.ui://GtkLabel[@id='helptext'] orphan-label
-dbaccess/uiconfig/ui/dbwizspreadsheetpage.ui://dbulo-ConnectionURLEdit[@id='browseurl'] no-labelled-by
-dbaccess/uiconfig/ui/dbwizspreadsheetpage.ui://GtkLabel[@id='browseurllabel'] orphan-label
dbaccess/uiconfig/ui/dbwiztextpage.ui://GtkLabel[@id='helptext'] orphan-label
-dbaccess/uiconfig/ui/dbwiztextpage.ui://dbulo-ConnectionURLEdit[@id='browseurl'] no-labelled-by
-dbaccess/uiconfig/ui/dbwiztextpage.ui://GtkLabel[@id='browseurllabel'] orphan-label
dbaccess/uiconfig/ui/fielddialog.ui://GtkLabel[@id='alttitle'] orphan-label
dbaccess/uiconfig/ui/finalpagewizard.ui://GtkLabel[@id='headerText'] orphan-label
dbaccess/uiconfig/ui/finalpagewizard.ui://GtkLabel[@id='helpText'] orphan-label
More information about the Libreoffice-commits
mailing list