diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-10-24 16:11:46 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-10-25 09:56:45 +0200 |
| commit | c9e55e2b9e5c9a536e512151be91b1d73e0ee6e9 (patch) | |
| tree | ac23571128ee5a57375e3f4a688d45a4bb296600 /dbaccess/uiconfig | |
| parent | 08402a81e55ab43bf079a9c91df8b9494634ef52 (diff) | |
weld OJDBCConnectionPageSetup
Change-Id: I8c194c8efa17079253c857e171af203c17d3aff3
Reviewed-on: https://gerrit.libreoffice.org/62323
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'dbaccess/uiconfig')
| -rw-r--r-- | dbaccess/uiconfig/ui/dbwizspreadsheetpage.ui | 1 | ||||
| -rw-r--r-- | dbaccess/uiconfig/ui/jdbcconnectionpage.ui | 48 |
2 files changed, 35 insertions, 14 deletions
diff --git a/dbaccess/uiconfig/ui/dbwizspreadsheetpage.ui b/dbaccess/uiconfig/ui/dbwizspreadsheetpage.ui index b104f4d664c1..2dbe3dd2eb6b 100644 --- a/dbaccess/uiconfig/ui/dbwizspreadsheetpage.ui +++ b/dbaccess/uiconfig/ui/dbwizspreadsheetpage.ui @@ -104,6 +104,7 @@ <object class="GtkEntry" id="browseurl"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="activates_default">True</property> </object> <packing> <property name="left_attach">1</property> diff --git a/dbaccess/uiconfig/ui/jdbcconnectionpage.ui b/dbaccess/uiconfig/ui/jdbcconnectionpage.ui index 70075da1f9f2..8f62f3f821c1 100644 --- a/dbaccess/uiconfig/ui/jdbcconnectionpage.ui +++ b/dbaccess/uiconfig/ui/jdbcconnectionpage.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="JDBCConnectionPage"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -32,10 +31,10 @@ <object class="GtkLabel" id="helptext"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes" context="jdbcconnectionpage|helptext">Please enter the required information to connect to a JDBC database. Please contact your system administrator if you are unsure about the following settings.</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="jdbcconnectionpage|create">_Create New</property> <property name="visible">True</property> @@ -100,6 +88,37 @@ <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> + </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> @@ -141,6 +160,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="expand">False</property> |