diff options
| author | Adolfo Jayme Barrientos <fitojb@ubuntu.com> | 2014-11-22 14:52:37 -0600 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-11-25 11:34:17 +0000 |
| commit | a4536921f663fe3dcf7361362f7990286f24c3f2 (patch) | |
| tree | 1559636206951960c19d004bb604da2703c81b3a /dbaccess | |
| parent | ccbddf9210ad65465da5bf36a9ad36a5f59bf125 (diff) | |
HIG fixes for dbaccess
Change-Id: Ib9ce9a28eec4343850158541375608d63fda8d19
Reviewed-on: https://gerrit.libreoffice.org/13050
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'dbaccess')
55 files changed, 563 insertions, 1083 deletions
diff --git a/dbaccess/uiconfig/ui/admindialog.ui b/dbaccess/uiconfig/ui/admindialog.ui index 53e1a0a78fdd..72040da64410 100644 --- a/dbaccess/uiconfig/ui/admindialog.ui +++ b/dbaccess/uiconfig/ui/admindialog.ui @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.16.0 on Wed Jan 29 09:37:35 2014 --> +<!-- Generated with glade 3.18.3 --> <interface> - <!-- interface-requires gtk+ 3.0 --> + <requires lib="gtk+" version="3.0"/> <object class="GtkDialog" id="AdminDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> - <property name="title" translatable="yes">Database properties</property> + <property name="title" translatable="yes">Database Properties</property> + <property name="resizable">False</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> @@ -58,6 +59,7 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="position">2</property> + <property name="secondary">True</property> </packing> </child> </object> diff --git a/dbaccess/uiconfig/ui/advancedsettingsdialog.ui b/dbaccess/uiconfig/ui/advancedsettingsdialog.ui index aeb85b484691..8a49dd6d1048 100644 --- a/dbaccess/uiconfig/ui/advancedsettingsdialog.ui +++ b/dbaccess/uiconfig/ui/advancedsettingsdialog.ui @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.16.0 on Mon Jan 20 16:15:12 2014 --> +<!-- Generated with glade 3.18.3 --> <interface> - <!-- interface-requires gtk+ 3.0 --> + <requires lib="gtk+" version="3.0"/> <object class="GtkDialog" id="AdvancedSettingsDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> <property name="title" translatable="yes">Advanced Settings</property> + <property name="resizable">False</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> @@ -58,6 +59,7 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="position">2</property> + <property name="secondary">True</property> </packing> </child> </object> diff --git a/dbaccess/uiconfig/ui/autocharsetpage.ui b/dbaccess/uiconfig/ui/autocharsetpage.ui index 4ef3ae8b82b2..327e1153e849 100644 --- a/dbaccess/uiconfig/ui/autocharsetpage.ui +++ b/dbaccess/uiconfig/ui/autocharsetpage.ui @@ -1,7 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.18.3 --> <interface> - <!-- interface-requires LibreOffice 1.0 --> - <!-- interface-requires gtk+ 3.0 --> + <requires lib="gtk+" version="3.0"/> + <requires lib="LibreOffice" version="1.0"/> <object class="GtkBox" id="AutoCharset"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -29,12 +30,12 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="spacing">6</property> + <property name="spacing">12</property> <child> <object class="GtkLabel" id="charsetlabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">_Character set</property> + <property name="label" translatable="yes">_Character set:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">charset</property> </object> @@ -64,7 +65,7 @@ <object class="GtkLabel" id="charsetheader"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Data conversion</property> + <property name="label" translatable="yes">Data Conversion</property> <attributes> <attribute name="weight" value="bold"/> </attributes> diff --git a/dbaccess/uiconfig/ui/backuppage.ui b/dbaccess/uiconfig/ui/backuppage.ui index b7df59c5a717..f76b1f71d766 100644 --- a/dbaccess/uiconfig/ui/backuppage.ui +++ b/dbaccess/uiconfig/ui/backuppage.ui @@ -1,21 +1,21 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.16.1 --> +<!-- Generated with glade 3.18.3 --> <interface> <requires lib="gtk+" version="3.0"/> - <!-- interface-requires LibreOffice 1.0 --> + <requires lib="LibreOffice" version="1.0"/> <object class="GtkGrid" id="BackupPage"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="border_width">6</property> - <property name="row_spacing">24</property> + <property name="row_spacing">12</property> <child> <object class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Backup your Document</property> + <property name="label" translatable="yes">Backup Your Document</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -23,8 +23,6 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -41,8 +39,6 @@ <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> @@ -59,8 +55,6 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">3</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -79,15 +73,13 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Save To:</property> + <property name="label" translatable="yes">Save to:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">location</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -105,16 +97,12 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -128,16 +116,12 @@ <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> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> </object> diff --git a/dbaccess/uiconfig/ui/choosedatasourcedialog.ui b/dbaccess/uiconfig/ui/choosedatasourcedialog.ui index c2278afe3c11..db9ebc386c3a 100644 --- a/dbaccess/uiconfig/ui/choosedatasourcedialog.ui +++ b/dbaccess/uiconfig/ui/choosedatasourcedialog.ui @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.16.1 --> +<!-- Generated with glade 3.18.3 --> <interface> <requires lib="gtk+" version="3.0"/> <object class="GtkDialog" id="ChooseDataSourceDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> <property name="title" translatable="yes">Data Source</property> + <property name="resizable">False</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> @@ -47,12 +48,12 @@ </packing> </child> <child> - <object class="GtkButton" id="organize"> - <property name="label" translatable="yes">Or_ganize...</property> + <object class="GtkButton" id="help"> + <property name="label">gtk-help</property> + <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="no_show_all">True</property> - <property name="use_underline">True</property> + <property name="use_stock">True</property> </object> <packing> <property name="expand">False</property> @@ -62,17 +63,18 @@ </packing> </child> <child> - <object class="GtkButton" id="help"> - <property name="label">gtk-help</property> - <property name="visible">True</property> + <object class="GtkButton" id="organize"> + <property name="label" translatable="yes">Or_ganize...</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_stock">True</property> + <property name="no_show_all">True</property> + <property name="use_underline">True</property> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> <property name="position">3</property> + <property name="secondary">True</property> </packing> </child> </object> @@ -84,43 +86,40 @@ </packing> </child> <child> - <object class="GtkFrame" id="frame1"> + <object class="GtkGrid" id="grid1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> + <property name="row_spacing">6</property> <child> - <object class="GtkAlignment" id="alignment1"> + <object class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> - <child> - <object class="GtkTreeView" id="treeview:border"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <child internal-child="selection"> - <object class="GtkTreeSelection" id="treeview-selection1"/> - </child> - </object> - </child> + <property name="xalign">0</property> + <property name="label" translatable="yes">Choose a data source:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">treeview:border</property> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> </child> - <child type="label"> - <object class="GtkLabel" id="label1"> + <child> + <object class="GtkTreeView" id="treeview:border"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Choose a Data Source:</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <child internal-child="selection"> + <object class="GtkTreeSelection" id="treeview-selection1"/> + </child> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> </child> </object> <packing> diff --git a/dbaccess/uiconfig/ui/collectionviewdialog.ui b/dbaccess/uiconfig/ui/collectionviewdialog.ui index b34397e2f4cd..d51688aeb4a3 100644 --- a/dbaccess/uiconfig/ui/collectionviewdialog.ui +++ b/dbaccess/uiconfig/ui/collectionviewdialog.ui @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.16.1 --> +<!-- Generated with glade 3.18.3 --> <interface> <requires lib="gtk+" version="3.0"/> - <!-- interface-requires LibreOffice 1.0 --> + <requires lib="LibreOffice" version="1.0"/> <object class="GtkDialog" id="CollectionView"> <property name="can_focus">False</property> <property name="hexpand">True</property> @@ -70,6 +70,7 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="position">2</property> + <property name="secondary">True</property> </packing> </child> </object> diff --git a/dbaccess/uiconfig/ui/colwidthdialog.ui b/dbaccess/uiconfig/ui/colwidthdialog.ui index 89fe59f440a9..86dd9b3b9c9a 100644 --- a/dbaccess/uiconfig/ui/colwidthdialog.ui +++ b/dbaccess/uiconfig/ui/colwidthdialog.ui @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.18.3 --> <interface> - <!-- interface-requires gtk+ 3.0 --> + <requires lib="gtk+" version="3.0"/> <object class="GtkAdjustment" id="adjustment1"> <property name="lower">0.10000000000000001</property> <property name="upper">200</property> @@ -12,6 +13,7 @@ <property name="can_focus">False</property> <property name="border_width">6</property> <property name="title" translatable="yes">Column Width</property> + <property name="resizable">False</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> @@ -64,6 +66,7 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="position">2</property> + <property name="secondary">True</property> </packing> </child> </object> @@ -87,16 +90,14 @@ <object class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">_Width</property> + <property name="xalign">1</property> + <property name="label" translatable="yes">_Width:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">value:0.00cm</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -111,8 +112,6 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -128,8 +127,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> diff --git a/dbaccess/uiconfig/ui/connectionpage.ui b/dbaccess/uiconfig/ui/connectionpage.ui index 537fc71d629e..e8ef60d53ecc 100644 --- a/dbaccess/uiconfig/ui/connectionpage.ui +++ b/dbaccess/uiconfig/ui/connectionpage.ui @@ -1,7 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.18.3 --> <interface> - <!-- interface-requires gtk+ 3.0 --> - <!-- interface-requires LibreOffice 1.0 --> + <requires lib="gtk+" version="3.0"/> + <requires lib="LibreOffice" version="1.0"/> <object class="GtkBox" id="ConnectionPage"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -30,20 +31,20 @@ <object class="GtkGrid" id="grid1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="row_spacing">2</property> - <property name="column_spacing">6</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> <child> <object class="GtkLabel" id="browseurllabel"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> - <property name="label" translatable="yes">Path to the dBASE files</property> + <property name="label" translatable="yes">Path to the dBASE files:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">browseurl</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -52,13 +53,10 @@ <property name="can_focus">True</property> <property name="hexpand">True</property> <property name="invisible_char">•</property> - <property name="invisible_char_set">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> @@ -73,13 +71,11 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> <object class="GtkButton" id="browse"> - <property name="label" translatable="yes">_Browse</property> + <property name="label" translatable="yes">_Browse…</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -89,8 +85,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> </object> @@ -137,24 +131,19 @@ <property name="hexpand">True</property> <property name="vexpand">True</property> <property name="row_spacing">6</property> - <property name="column_spacing">6</property> - <child> - <placeholder/> - </child> + <property name="column_spacing">12</property> <child> <object class="GtkLabel" id="userNameLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes">_User name</property> + <property name="xalign">1</property> + <property name="label" translatable="yes">_User name:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">userNameEntry</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -166,8 +155,6 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -183,10 +170,11 @@ <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> + <placeholder/> + </child> </object> </child> </object> @@ -195,7 +183,7 @@ <object class="GtkLabel" id="userlabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">User authentication</property> + <property name="label" translatable="yes">User Authentication</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -230,12 +218,13 @@ <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="spacing">6</property> + <property name="spacing">12</property> <child> <object class="GtkLabel" id="javaDriverLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">_JDBC driver class</property> + <property name="xalign">1</property> + <property name="label" translatable="yes">_JDBC driver class:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">driverEntry</property> </object> @@ -280,7 +269,7 @@ <object class="GtkLabel" id="JDBCLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">JDBC properties</property> + <property name="label" translatable="yes">JDBC Properties</property> <attributes> <attribute name="weight" value="bold"/> </attributes> diff --git a/dbaccess/uiconfig/ui/copytablepage.ui b/dbaccess/uiconfig/ui/copytablepage.ui index 65a8c1a70682..ca94cde15e00 100644 --- a/dbaccess/uiconfig/ui/copytablepage.ui +++ b/dbaccess/uiconfig/ui/copytablepage.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.16.1 --> +<!-- Generated with glade 3.18.3 --> <interface> <requires lib="gtk+" version="3.0"/> <object class="GtkGrid" id="CopyTablePage"> @@ -45,8 +45,6 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -63,8 +61,6 @@ <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> @@ -81,8 +77,6 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -99,8 +93,6 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">3</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -116,8 +108,6 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">4</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -133,8 +123,6 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">5</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -151,16 +139,14 @@ <object class="GtkLabel" id="keynamelabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Name</property> + <property name="xalign">1</property> + <property name="label" translatable="yes">Name:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">keyname</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -171,8 +157,6 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> </object> @@ -181,8 +165,6 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">6</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> </object> @@ -203,8 +185,6 @@ <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> @@ -217,16 +197,14 @@ <object class="GtkLabel" id="label2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Ta_ble name</property> + <property name="xalign">1</property> + <property name="label" translatable="yes">Ta_ble name:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">name</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -238,16 +216,12 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> </object> diff --git a/dbaccess/uiconfig/ui/dbaseindexdialog.ui b/dbaccess/uiconfig/ui/dbaseindexdialog.ui index 3f8ea8394e5b..1fd8fa59db74 100644 --- a/dbaccess/uiconfig/ui/dbaseindexdialog.ui +++ b/dbaccess/uiconfig/ui/dbaseindexdialog.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.16.1 --> +<!-- Generated with glade 3.18.3 --> <interface> <requires lib="gtk+" version="3.0"/> <object class="GtkImage" id="image1"> @@ -78,6 +78,7 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="position">2</property> + <property name="secondary">True</property> </packing> </child> </object> @@ -103,15 +104,13 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">_Table</property> + <property name="label" translatable="yes">_Table:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">table</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -129,16 +128,12 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -171,8 +166,6 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -187,8 +180,6 @@ <packing> <property name="left_attach">2</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -204,8 +195,6 @@ <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> @@ -221,8 +210,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> @@ -291,8 +278,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> @@ -316,8 +301,6 @@ <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> </object> diff --git a/dbaccess/uiconfig/ui/dbasepage.ui b/dbaccess/uiconfig/ui/dbasepage.ui index cfc83eb1cc51..1d45b963129b 100644 --- a/dbaccess/uiconfig/ui/dbasepage.ui +++ b/dbaccess/uiconfig/ui/dbasepage.ui @@ -1,7 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.18.3 --> <interface> - <!-- interface-requires gtk+ 3.0 --> - <!-- interface-requires LibreOffice 1.0 --> + <requires lib="gtk+" version="3.0"/> + <requires lib="LibreOffice" version="1.0"/> <object class="GtkBox" id="DbasePage"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -29,12 +30,12 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="spacing">6</property> + <property name="spacing">12</property> <child> <object class="GtkLabel" id="charsetlabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">_Character set</property> + <property name="label" translatable="yes">_Character set:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">charset</property> </object> @@ -64,7 +65,7 @@ <object class="GtkLabel" id="charsetheader"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Data conversion</property> + <property name="label" translatable="yes">Data Conversion</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -97,7 +98,7 @@ <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="orientation">vertical</property> - <property name="spacing">2</property> + <property name="spacing">6</property> <child> <object class="GtkCheckButton" id="showDelRowsCheckbutton"> <property name="label" translatable="yes">Display deleted records as well</property> @@ -137,7 +138,7 @@ <object class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Optional settings</property> + <property name="label" translatable="yes">Optional Settings</property> <attributes> <attribute name="weight" value="bold"/> </attributes> diff --git a/dbaccess/uiconfig/ui/dbwizconnectionpage.ui b/dbaccess/uiconfig/ui/dbwizconnectionpage.ui index 89203608fbfc..5b3916d424f8 100644 --- a/dbaccess/uiconfig/ui/dbwizconnectionpage.ui +++ b/dbaccess/uiconfig/ui/dbwizconnectionpage.ui @@ -1,7 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.18.3 --> <interface> - <!-- interface-requires gtk+ 3.0 --> - <!-- interface-requires LibreOffice 1.0 --> + <requires lib="gtk+" version="3.0"/> + <requires lib="LibreOffice" version="1.0"/> <object class="GtkBox" id="ConnectionPage"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -46,20 +47,20 @@ <object class="GtkGrid" id="grid1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="row_spacing">2</property> - <property name="column_spacing">6</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> <child> <object class="GtkLabel" id="browseurllabel"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> - <property name="label" translatable="yes">Path to the dBASE files</property> + <property name="label" translatable="yes">Path to the dBASE files:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">browseurl</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -68,13 +69,10 @@ <property name="can_focus">True</property> <property name="hexpand">True</property> <property name="invisible_char">•</property> - <property name="invisible_char_set">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> @@ -84,31 +82,25 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> <property name="use_underline">True</property> </object> <packing> <property name="left_attach">1</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> <object class="GtkButton" id="browse"> - <property name="label" translatable="yes">_Browse</property> + <property name="label" translatable="yes">_Browse…</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> <property name="use_underline">True</property> </object> <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> </object> diff --git a/dbaccess/uiconfig/ui/dbwizmysqlintropage.ui b/dbaccess/uiconfig/ui/dbwizmysqlintropage.ui index 6c98251557ba..3d9d43f6a11c 100644 --- a/dbaccess/uiconfig/ui/dbwizmysqlintropage.ui +++ b/dbaccess/uiconfig/ui/dbwizmysqlintropage.ui @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.18.3 --> <interface> - <!-- interface-requires gtk+ 3.0 --> + <requires lib="gtk+" version="3.0"/> <object class="GtkBox" id="DBWizMysqlIntroPage"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -70,7 +71,6 @@ Please contact your system administrator if you are unsure about the following s <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> @@ -87,7 +87,6 @@ Please contact your system administrator if you are unsure about the following s <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="xalign">0</property> <property name="active">True</property> <property name="draw_indicator">True</property> @@ -105,7 +104,6 @@ Please contact your system administrator if you are unsure about the following s <property name="use_action_appearance">False</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> <property name="group">odbc</property> @@ -125,9 +123,6 @@ Please contact your system administrator if you are unsure about the following s <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">How do you want to connect to your MySQL database?</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> </object> </child> </object> @@ -145,7 +140,7 @@ Please contact your system administrator if you are unsure about the following s <object class="GtkLabel" id="header"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Set up a connection to a MySQL database</property> + <property name="label" translatable="yes">Set Up a Connection to a MySQL Database</property> <attributes> <attribute name="weight" value="bold"/> </attributes> diff --git a/dbaccess/uiconfig/ui/dbwizmysqlnativepage.ui b/dbaccess/uiconfig/ui/dbwizmysqlnativepage.ui index df5b59c9dc83..4e8a2895c376 100644 --- a/dbaccess/uiconfig/ui/dbwizmysqlnativepage.ui +++ b/dbaccess/uiconfig/ui/dbwizmysqlnativepage.ui @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.18.3 --> <interface> - <!-- interface-requires gtk+ 3.0 --> + <requires lib="gtk+" version="3.0"/> <object class="GtkBox" id="DBWizMysqlNativePage"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -72,7 +73,7 @@ <object class="GtkLabel" id="header"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Set up connection to a MySQL database</property> + <property name="label" translatable="yes">Set Up a Connection to a MySQL Database</property> <attributes> <attribute name="weight" value="bold"/> </attributes> diff --git a/dbaccess/uiconfig/ui/deleteallrowsdialog.ui b/dbaccess/uiconfig/ui/deleteallrowsdialog.ui index 31cc24eecb8e..9b263be4b01c 100644 --- a/dbaccess/uiconfig/ui/deleteallrowsdialog.ui +++ b/dbaccess/uiconfig/ui/deleteallrowsdialog.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.16.1 --> +<!-- Generated with glade 3.18.3 --> <interface> <requires lib="gtk+" version="3.0"/> <object class="GtkMessageDialog" id="DeleteAllRowsDialog"> @@ -14,7 +14,7 @@ <object class="GtkBox" id="messagedialog-vbox"> <property name="can_focus">False</property> <property name="orientation">vertical</property> - <property name="spacing">24</property> + <property name="spacing">12</property> <child internal-child="action_area"> <object class="GtkButtonBox" id="messagedialog-action_area"> <property name="can_focus">False</property> diff --git a/dbaccess/uiconfig/ui/designsavemodifieddialog.ui b/dbaccess/uiconfig/ui/designsavemodifieddialog.ui index 54ae0f80141a..a3bb08e5eaa9 100644 --- a/dbaccess/uiconfig/ui/designsavemodifieddialog.ui +++ b/dbaccess/uiconfig/ui/designsavemodifieddialog.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.16.1 --> +<!-- Generated with glade 3.18.3 --> <interface> <requires lib="gtk+" version="3.0"/> <object class="GtkMessageDialog" id="DesignSaveModifiedDialog"> @@ -15,7 +15,7 @@ <object class="GtkBox" id="messagedialog-vbox"> <property name="can_focus">False</property> <property name="orientation">vertical</property> - <property name="spacing">24</property> + <property name="spacing">12</property> <child internal-child="action_area"> <object class="GtkButtonBox" id="messagedialog-action_area"> <property name="can_focus">False</property> diff --git a/dbaccess/uiconfig/ui/directsqldialog.ui b/dbaccess/uiconfig/ui/directsqldialog.ui index 0f37c67844a5..96979d66ff93 100644 --- a/dbaccess/uiconfig/ui/directsqldialog.ui +++ b/dbaccess/uiconfig/ui/directsqldialog.ui @@ -1,11 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.18.3 --> <interface> - <!-- interface-requires gtk+ 3.0 --> - <!-- interface-requires LibreOffice 1.0 --> + <requires lib="gtk+" version="3.0"/> + <requires lib="LibreOffice" version="1.0"/> <object class="GtkDialog" id="DirectSQLDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> <property name="title" translatable="yes">Execute SQL Statement</property> + <property name="resizable">False</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> @@ -29,6 +31,7 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="position">0</property> + <property name="secondary">True</property> </packing> </child> <child> @@ -79,8 +82,6 @@ <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> @@ -88,15 +89,13 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">_Command to execute</property> + <property name="label" translatable="yes">_Command to execute:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">sql:border</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -117,8 +116,6 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -134,16 +131,12 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -155,8 +148,6 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">4</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -164,15 +155,13 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">_Previous commands</property> + <property name="label" translatable="yes">_Previous commands:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">sqlhistory</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">3</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> </object> diff --git a/dbaccess/uiconfig/ui/fielddialog.ui b/dbaccess/uiconfig/ui/fielddialog.ui index dc44d2f0bc7a..dd47d82a8fd0 100644 --- a/dbaccess/uiconfig/ui/fielddialog.ui +++ b/dbaccess/uiconfig/ui/fielddialog.ui @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.16.0 on Fri Jan 17 14:37:18 2014 --> +<!-- Generated with glade 3.18.3 --> <interface> - <!-- interface-requires gtk+ 3.0 --> + <requires lib="gtk+" version="3.0"/> <object class="GtkDialog" id="FieldDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> <property name="title" translatable="yes">Field Format</property> + <property name="resizable">False</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> @@ -58,6 +59,7 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="position">2</property> + <property name="secondary">True</property> </packing> </child> <child> diff --git a/dbaccess/uiconfig/ui/finalpagewizard.ui b/dbaccess/uiconfig/ui/finalpagewizard.ui index 252491d41be6..765d165f0a46 100644 --- a/dbaccess/uiconfig/ui/finalpagewizard.ui +++ b/dbaccess/uiconfig/ui/finalpagewizard.ui @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.16.0 on Fri Jan 24 10:58:39 2014 --> +<!-- Generated with glade 3.18.3 --> <interface> - <!-- interface-requires gtk+ 3.0 --> + <requires lib="gtk+" version="3.0"/> <object class="GtkBox" id="PageFinal"> <property name="width_request">400</property> <property name="visible">True</property> @@ -30,7 +30,7 @@ <object class="GtkGrid" id="grid1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="row_spacing">24</property> + <property name="row_spacing">12</property> <child> <object class="GtkGrid" id="grid2"> <property name="visible">True</property> @@ -49,8 +49,6 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -69,8 +67,6 @@ <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> @@ -88,16 +84,12 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -117,8 +109,6 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -135,8 +125,6 @@ <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> @@ -152,16 +140,12 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> </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> @@ -174,8 +158,6 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> </object> diff --git a/dbaccess/uiconfig/ui/generalpagedialog.ui b/dbaccess/uiconfig/ui/generalpagedialog.ui index 3832cb6ed72d..12578f72435e 100644 --- a/dbaccess/uiconfig/ui/generalpagedialog.ui +++ b/dbaccess/uiconfig/ui/generalpagedialog.ui @@ -1,17 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.18.3 --> <interface> - <!-- interface-requires gtk+ 3.0 --> + <requires lib="gtk+" version="3.0"/> <object class="GtkGrid" id="PageGeneral"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="border_width">16</property> - <property name="row_spacing">8</property> - <property name="column_spacing">8</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> <child> <object class="GtkLabel" id="datasourceTypePre"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_bottom">24</property> <property name="xalign">0</property> <property name="yalign">0</property> <property name="label" translatable="yes">Select the type of database to which you want to establish a connection.</property> @@ -20,7 +20,6 @@ <property name="left_attach">0</property> <property name="top_attach">0</property> <property name="width">2</property> - <property name="height">1</property> </packing> </child> <child> @@ -36,8 +35,6 @@ <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> @@ -46,21 +43,17 @@ <property name="can_focus">False</property> <property name="halign">start</property> <property name="hexpand">True</property> - <property name="entry_text_column">0</property> - <property name="id_column">1</property> </object> <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> <object class="GtkLabel" id="datasourceTypeHelp"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_top">24</property> + <property name="margin_top">6</property> <property name="xalign">0</property> <property name="yalign">0</property> <property name="label" translatable="yes">On the following pages, you can make detailed settings for the connection. @@ -71,7 +64,6 @@ The new settings you make will overwrite your existing settings.</property> <property name="left_attach">0</property> <property name="top_attach">2</property> <property name="width">2</property> - <property name="height">1</property> </packing> </child> <child> @@ -83,7 +75,6 @@ The new settings you make will overwrite your existing settings.</property> <property name="left_attach">0</property> <property name="top_attach">3</property> <property name="width">2</property> - <property name="height">1</property> </packing> </child> </object> diff --git a/dbaccess/uiconfig/ui/generalpagewizard.ui b/dbaccess/uiconfig/ui/generalpagewizard.ui index bd1fc0b6e51d..ea43f35d5d38 100644 --- a/dbaccess/uiconfig/ui/generalpagewizard.ui +++ b/dbaccess/uiconfig/ui/generalpagewizard.ui @@ -1,15 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.16.0 on Fri Jan 24 10:59:11 2014 --> +<!-- Generated with glade 3.18.3 --> <interface> - <!-- interface-requires gtk+ 3.0 --> - <!-- interface-requires LibreOffice 1.0 --> + <requires lib="gtk+" version="3.0"/> + <requires lib="LibreOffice" version="1.0"/> <object class="GtkBox" id="PageGeneral"> <property name="width_request">400</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="border_width">8</property> <property name="orientation">vertical</property> - <property name="spacing">12</property> + <property name="spacing">6</property> <child> <object class="GtkLabel" id="headerText"> <property name="visible">True</property> @@ -46,7 +46,6 @@ <object class="GtkLabel" id="sourceTypeHeader"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_bottom">12</property> <property name="xalign">0</property> <property name="label" translatable="yes">What do you want to do?</property> <property name="wrap">True</property> @@ -79,14 +78,14 @@ <object class="GtkBox" id="embeddeddbBox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_left">48</property> - <property name="spacing">8</property> + <property name="margin_left">24</property> + <property name="spacing">12</property> <child> <object class="GtkLabel" id="embeddeddbLabel"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">_Embedded Database:</property> + <property name="label" translatable="yes">_Embedded database:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">embeddeddbList</property> </object> @@ -137,8 +136,8 @@ <object class="GtkBox" id="docListBox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_left">48</property> - <property name="spacing">8</property> + <property name="margin_left">24</property> + <property name="spacing">12</property> <child> <object class="GtkLabel" id="docListLabel"> <property name="visible">True</property> @@ -182,7 +181,7 @@ <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="halign">start</property> - <property name="margin_left">48</property> + <property name="margin_left">24</property> <property name="always_show_image">True</property> </object> <packing> @@ -215,7 +214,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> - <property name="margin_left">48</property> + <property name="margin_left">24</property> </object> <packing> <property name="expand">False</property> diff --git a/dbaccess/uiconfig/ui/generalspecialjdbcdetailspage.ui b/dbaccess/uiconfig/ui/generalspecialjdbcdetailspage.ui index 27d7400de0a7..d4655620df6c 100644 --- a/dbaccess/uiconfig/ui/generalspecialjdbcdetailspage.ui +++ b/dbaccess/uiconfig/ui/generalspecialjdbcdetailspage.ui @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.16.1 --> +<!-- Generated with glade 3.18.3 --> <interface> <requires lib="gtk+" version="3.0"/> - <!-- interface-requires LibreOffice 1.0 --> + <requires lib="LibreOffice" version="1.0"/> <object class="GtkBox" id="GeneralSpecialJDBCDetails"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -35,32 +35,28 @@ <object class="GtkLabel" id="label2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes">_Host name</property> + <property name="xalign">1</property> + <property name="label" translatable="yes">_Host name:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">hostNameEntry</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> <object class="GtkLabel" id="label3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes">_Port number</property> + <property name="xalign">1</property> + <property name="label" translatable="yes">_Port number:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">portNumberSpinbutton</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> @@ -72,38 +68,32 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> <object class="GtkLabel" id="socketLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes">Socket</property> + <property name="xalign">1</property> + <property name="label" translatable="yes">Socket:</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> <object class="GtkLabel" id="driverClassLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes">MySQL JDBC d_river class</property> + <property name="xalign">1</property> + <property name="label" translatable="yes">MySQL JDBC d_river class:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">jdbcDriverClassEntry</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">3</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -115,13 +105,11 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">3</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> <object class="GtkButton" id="testDriverClassButton"> - <property name="label" translatable="yes">Test class</property> + <property name="label" translatable="yes">Test Class</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -130,8 +118,6 @@ <packing> <property name="left_attach">2</property> <property name="top_attach">3</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -143,8 +129,6 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -156,8 +140,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> @@ -214,7 +196,7 @@ <object class="GtkLabel" id="charsetlabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">_Character set</property> + <property name="label" translatable="yes">_Character set:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">charset</property> </object> @@ -244,7 +226,7 @@ <object class="GtkLabel" id="charsetheader"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Data conversion</property> + <property name="label" translatable="yes">Data Conversion</property> <attributes> <attribute name="weight" value="bold"/> </attributes> diff --git a/dbaccess/uiconfig/ui/generatedvaluespage.ui b/dbaccess/uiconfig/ui/generatedvaluespage.ui index a0cfbfaec967..88cefb1e7a8c 100644 --- a/dbaccess/uiconfig/ui/generatedvaluespage.ui +++ b/dbaccess/uiconfig/ui/generatedvaluespage.ui @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.16.0 on Wed Jan 29 14:06:26 2014 --> +<!-- Generated with glade 3.18.3 --> <interface> - <!-- interface-requires gtk+ 3.0 --> + <requires lib="gtk+" version="3.0"/> <object class="GtkFrame" id="GeneratedValuesPage"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -37,8 +37,6 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -64,15 +62,13 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">_Auto-increment statement</property> + <property name="label" translatable="yes">_Auto-increment statement:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">statement</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -85,16 +81,12 @@ <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> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -108,15 +100,13 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">_Query of generated values</property> + <property name="label" translatable="yes">_Query of generated values:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">query</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -129,16 +119,12 @@ <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> </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> </object> @@ -147,8 +133,6 @@ <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> </object> diff --git a/dbaccess/uiconfig/ui/indexdesigndialog.ui b/dbaccess/uiconfig/ui/indexdesigndialog.ui index 3068894d5df2..a0d34a83f70e 100644 --- a/dbaccess/uiconfig/ui/indexdesigndialog.ui +++ b/dbaccess/uiconfig/ui/indexdesigndialog.ui @@ -1,12 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.16.1 --> +<!-- Generated with glade 3.18.3 --> <interface> - <requires lib="gtk+" version="3.0"/> - <!-- interface-requires LibreOffice 1.0 --> + <requires lib="gtk+" version="3.4"/> + <requires lib="LibreOffice" version="1.0"/> <object class="GtkDialog" id="IndexDesignDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> <property name="title" translatable="yes">Indexes</property> + <property name="resizable">False</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> @@ -45,6 +46,7 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="position">1</property> + <property name="secondary">True</property> </packing> </child> </object> @@ -148,8 +150,6 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -169,8 +169,6 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -182,8 +180,6 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -195,8 +191,6 @@ <packing> <property name="left_attach">2</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -208,8 +202,6 @@ <packing> <property name="left_attach">3</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -221,16 +213,12 @@ <packing> <property name="left_attach">4</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> </object> <packing> <property name="left_attach">1</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> </object> @@ -245,137 +233,132 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="row_spacing">6</property> - <property name="column_spacing">6</property> + <property name="column_spacing">12</property> <child> - <object class="GtkBox" id="box2"> + <object class="dbulo-DbaIndexList" id="INDEX_LIST"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> - <child> - <object class="GtkLabel" id="INDEX_DETAILS"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes">Index details</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> + <child internal-child="selection"> + <object class="GtkTreeSelection" id="DbaIndexList-selection1"/> </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkFrame" id="frame1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> <child> - <object class="GtkBox" id="box3"> + <object class="GtkAlignment" id="alignment1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">6</property> - <child> - <object class="GtkLabel" id="DESC_LABEL"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes">Index identifier:</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> + <property name="top_padding">6</property> + <property name="left_padding">12</property> <child> - <object class="GtkLabel" id="DESCRIPTION"> + <object class="GtkGrid" id="grid5"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">start</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <child> + <object class="GtkLabel" id="DESC_LABEL"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Index identifier:</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="DESCRIPTION"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="UNIQUE"> + <property name="label" translatable="yes">_Unique</property> + <property name="use_action_appearance">False</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="halign">start</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="FIELDS_LABEL"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Fields:</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="dbulo-DbaIndexFieldsControl" id="FIELDS"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <child internal-child="selection"> + <object class="GtkTreeSelection" id="IndexFieldsControl-selection"/> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + <property name="width">2</property> + </packing> + </child> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> </child> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="UNIQUE"> - <property name="label" translatable="yes">_Unique</property> - <property name="use_action_appearance">False</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="halign">start</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> </child> - <child> - <object class="GtkLabel" id="FIELDS_LABEL"> + <child type="label"> + <object class="GtkLabel" id="INDEX_DETAILS"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes">Fields</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">FIELDS</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="dbulo-DbaIndexFieldsControl" id="FIELDS"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <child internal-child="selection"> - <object class="GtkTreeSelection" id="IndexFieldsControl-selection1"/> - </child> + <property name="label" translatable="yes">Index Details</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">4</property> - </packing> </child> </object> <packing> <property name="left_attach">1</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="dbulo-DbaIndexList" id="INDEX_LIST"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <child internal-child="selection"> - <object class="GtkTreeSelection" id="DbaIndexList-selection1"/> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> </object> diff --git a/dbaccess/uiconfig/ui/jdbcconnectionpage.ui b/dbaccess/uiconfig/ui/jdbcconnectionpage.ui index 67282594299e..945bae1895b8 100644 --- a/dbaccess/uiconfig/ui/jdbcconnectionpage.ui +++ b/dbaccess/uiconfig/ui/jdbcconnectionpage.ui @@ -1,7 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.18.3 --> <interface> - <!-- interface-requires gtk+ 3.0 --> - <!-- interface-requires LibreOffice 1.0 --> + <requires lib="gtk+" version="3.0"/> + <requires lib="LibreOffice" version="1.0"/> <object class="GtkBox" id="JDBCConnectionPage"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -15,8 +16,8 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> - <property name="margin_bottom">12</property> - <property name="label" translatable="yes">Set up a connection to a JDBC database</property> + <property name="margin_bottom">6</property> + <property name="label" translatable="yes">Set Up a Connection to a JDBC Database</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -31,7 +32,6 @@ <object class="GtkLabel" id="helptext"> <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">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> @@ -47,20 +47,20 @@ <object class="GtkGrid" id="grid1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="row_spacing">2</property> - <property name="column_spacing">6</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> <child> <object class="GtkLabel" id="browseurllabel"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> - <property name="label" translatable="yes">Path to the dBASE files</property> + <property name="label" translatable="yes">Path to the dBASE files:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">browseurl</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -69,13 +69,10 @@ <property name="can_focus">True</property> <property name="hexpand">True</property> <property name="invisible_char">•</property> - <property name="invisible_char_set">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> @@ -90,13 +87,11 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> <object class="GtkButton" id="browse"> - <property name="label" translatable="yes">_Browse</property> + <property name="label" translatable="yes">_Browse…</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -106,8 +101,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> </object> @@ -130,7 +123,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> - <property name="label" translatable="yes">JDBC d_river class</property> + <property name="label" translatable="yes">JDBC d_river class:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">jdbcEntry</property> </object> @@ -145,13 +138,12 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="spacing">6</property> + <property name="spacing">12</property> <child> <object class="GtkEntry" id="jdbcEntry"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="hexpand">True</property> - <property name="invisible_char_set">True</property> </object> <packing> <property name="expand">False</property> @@ -161,7 +153,7 @@ </child> <child> <object class="GtkButton" id="jdbcButton"> - <property name="label" translatable="yes">_Test class</property> + <property name="label" translatable="yes">_Test Class</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> diff --git a/dbaccess/uiconfig/ui/joindialog.ui b/dbaccess/uiconfig/ui/joindialog.ui index a7375e4355a5..c2695e7f5c07 100644 --- a/dbaccess/uiconfig/ui/joindialog.ui +++ b/dbaccess/uiconfig/ui/joindialog.ui @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.16.1 --> +<!-- Generated with glade 3.18.3 --> <interface> <requires lib="gtk+" version="3.0"/> - <!-- interface-requires LibreOffice 1.0 --> + <requires lib="LibreOffice" version="1.0"/> <object class="GtkListStore" id="liststore1"> <columns> <!-- column-name gchararray1 --> @@ -37,6 +37,7 @@ <property name="can_focus">False</property> <property name="border_width">6</property> <property name="title" translatable="yes">Join Properties</property> + <property name="resizable">False</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> @@ -90,6 +91,7 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="position">2</property> + <property name="secondary">True</property> </packing> </child> </object> @@ -136,8 +138,6 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -149,8 +149,6 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> </object> @@ -171,8 +169,6 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -204,8 +200,6 @@ <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> @@ -221,8 +215,6 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> </object> @@ -243,8 +235,6 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -270,15 +260,14 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">_Type</property> + <property name="xalign">1</property> + <property name="label" translatable="yes">_Type:</property> <property name="use_underline">True</property> + <property name="mnemonic_widget">type</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -291,8 +280,6 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -308,8 +295,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> @@ -333,8 +318,6 @@ <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> </object> diff --git a/dbaccess/uiconfig/ui/ldapconnectionpage.ui b/dbaccess/uiconfig/ui/ldapconnectionpage.ui index f92e2d62748c..43763f251d17 100644 --- a/dbaccess/uiconfig/ui/ldapconnectionpage.ui +++ b/dbaccess/uiconfig/ui/ldapconnectionpage.ui @@ -1,20 +1,21 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.18.3 --> <interface> - <!-- interface-requires gtk+ 3.0 --> + <requires lib="gtk+" version="3.0"/> <object class="GtkBox" id="LDAPConnectionPage"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="border_width">6</property> <property name="orientation">vertical</property> - <property name="spacing">12</property> + <property name="spacing">6</property> <child> <object class="GtkLabel" id="header"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> - <property name="margin_bottom">12</property> - <property name="label" translatable="yes">Set up a connection to an LDAP directory</property> + <property name="margin_bottom">6</property> + <property name="label" translatable="yes">Set Up a Connection to an LDAP Directory</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -46,38 +47,34 @@ <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="row_spacing">2</property> - <property name="column_spacing">6</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> <child> <object class="GtkLabel" id="hostNameLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes">_Server</property> + <property name="xalign">1</property> + <property name="label" translatable="yes">_Server:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">hostNameEntry</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> <object class="GtkLabel" id="portNumLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes">_Port number</property> + <property name="xalign">1</property> + <property name="label" translatable="yes">_Port number:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">portNumEntry</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -89,8 +86,6 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -98,7 +93,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="spacing">6</property> + <property name="spacing">12</property> <child> <object class="GtkSpinButton" id="portNumEntry"> <property name="visible">True</property> @@ -127,24 +122,20 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> <object class="GtkLabel" id="baseDNLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes">Base _DN</property> + <property name="xalign">1</property> + <property name="label" translatable="yes">Base _DN:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">baseDNEntry</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> @@ -156,8 +147,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> </object> diff --git a/dbaccess/uiconfig/ui/ldappage.ui b/dbaccess/uiconfig/ui/ldappage.ui index 2f21ba4d49f1..686faf8061b6 100644 --- a/dbaccess/uiconfig/ui/ldappage.ui +++ b/dbaccess/uiconfig/ui/ldappage.ui @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.18.3 --> <interface> - <!-- interface-requires gtk+ 3.0 --> + <requires lib="gtk+" version="3.0"/> <object class="GtkBox" id="LDAP"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -28,24 +29,20 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="row_spacing">2</property> - <child> - <placeholder/> - </child> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> <child> <object class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes">_Base DN</property> + <property name="xalign">1</property> + <property name="label" translatable="yes">_Base DN:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">baseDNEntry</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -57,8 +54,6 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -74,24 +69,21 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">1</property> - <property name="width">1</property> - <property name="height">1</property> + <property name="width">2</property> </packing> </child> <child> <object class="GtkLabel" id="label2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes">_Port number</property> + <property name="xalign">1</property> + <property name="label" translatable="yes">_Port number:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">portNumberSpinbutton</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -103,24 +95,20 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> <object class="GtkLabel" id="label3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes">Maximum number of _records</property> + <property name="xalign">1</property> + <property name="label" translatable="yes">Maximum number of _records:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">LDAPRowCountspinbutton</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">3</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -132,8 +120,6 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">3</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> </object> diff --git a/dbaccess/uiconfig/ui/migratepage.ui b/dbaccess/uiconfig/ui/migratepage.ui index d95e30ca2902..a4f47ee23759 100644 --- a/dbaccess/uiconfig/ui/migratepage.ui +++ b/dbaccess/uiconfig/ui/migratepage.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.16.1 --> +<!-- Generated with glade 3.18.3 --> <interface> <requires lib="gtk+" version="3.0"/> <object class="GtkGrid" id="MigratePage"> @@ -7,7 +7,7 @@ <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="border_width">6</property> - <property name="row_spacing">24</property> + <property name="row_spacing">12</property> <child> <object class="GtkLabel" id="label1"> <property name="visible">True</property> @@ -22,8 +22,6 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -40,8 +38,6 @@ <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> @@ -58,8 +54,6 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">5</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -79,8 +73,6 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -93,8 +85,6 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -107,8 +97,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> @@ -118,8 +106,6 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">4</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -139,8 +125,6 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -152,8 +136,6 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -166,8 +148,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> @@ -177,8 +157,6 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">3</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -198,8 +176,6 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -212,16 +188,12 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> </object> diff --git a/dbaccess/uiconfig/ui/mysqlnativepage.ui b/dbaccess/uiconfig/ui/mysqlnativepage.ui index a45be0b0d6b8..d124b52c7f1f 100644 --- a/dbaccess/uiconfig/ui/mysqlnativepage.ui +++ b/dbaccess/uiconfig/ui/mysqlnativepage.ui @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.16.1 --> +<!-- Generated with glade 3.18.3 --> <interface> <requires lib="gtk+" version="3.0"/> - <!-- interface-requires LibreOffice 1.0 --> + <requires lib="LibreOffice" version="1.0"/> <object class="GtkBox" id="MysqlNativePage"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -81,21 +81,19 @@ <property name="hexpand">True</property> <property name="vexpand">True</property> <property name="row_spacing">6</property> - <property name="column_spacing">6</property> + <property name="column_spacing">12</property> <child> <object class="GtkLabel" id="usernamelabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">_User name</property> + <property name="xalign">1</property> + <property name="label" translatable="yes">_User name:</property> <property name="use_underline">True</property> + <property name="mnemonic_widget">username</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -108,8 +106,6 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -125,8 +121,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> @@ -140,7 +134,7 @@ <object class="GtkLabel" id="userheader"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">User authentication</property> + <property name="label" translatable="yes">User Authentication</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -173,14 +167,13 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="spacing">6</property> + <property name="spacing">12</property> <child> <object class="GtkLabel" id="charsetlabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">_Character set</property> + <property name="xalign">1</property> + <property name="label" translatable="yes">_Character set:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">charset</property> </object> @@ -210,7 +203,7 @@ <object class="GtkLabel" id="charsetheader"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Data conversion</property> + <property name="label" translatable="yes">Data Conversion</property> <attributes> <attribute name="weight" value="bold"/> </attributes> diff --git a/dbaccess/uiconfig/ui/mysqlnativesettings.ui b/dbaccess/uiconfig/ui/mysqlnativesettings.ui index 5b2f1dc1f200..4e7dff50fab6 100644 --- a/dbaccess/uiconfig/ui/mysqlnativesettings.ui +++ b/dbaccess/uiconfig/ui/mysqlnativesettings.ui @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.18.3 --> <interface> - <!-- interface-requires gtk+ 3.0 --> + <requires lib="gtk+" version="3.0"/> <object class="GtkBox" id="MysqlNativeSettings"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -14,15 +15,16 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="spacing">6</property> + <property name="spacing">12</property> <child> <object class="GtkLabel" id="dbnamelabel"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> <property name="xalign">0</property> - <property name="label" translatable="yes">_Database name</property> + <property name="label" translatable="yes">_Database name:</property> <property name="use_underline">True</property> + <property name="mnemonic_widget">dbname</property> </object> <packing> <property name="expand">False</property> @@ -56,15 +58,13 @@ <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="row_spacing">6</property> - <property name="column_spacing">6</property> <child> <object class="GtkRadioButton" id="hostport"> - <property name="label" translatable="yes">Se_rver / Port</property> + <property name="label" translatable="yes">Se_rver/port</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="use_underline">True</property> <property name="xalign">0</property> <property name="active">True</property> @@ -73,8 +73,6 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -82,7 +80,6 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="top_padding">6</property> <property name="left_padding">12</property> <child> <object class="GtkGrid" id="grid1"> @@ -90,37 +87,33 @@ <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="row_spacing">6</property> - <property name="column_spacing">6</property> + <property name="column_spacing">12</property> <child> <object class="GtkLabel" id="serverlabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">_Server</property> + <property name="xalign">1</property> + <property name="label" translatable="yes">_Server:</property> <property name="use_underline">True</property> + <property name="mnemonic_widget">server</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> <object class="GtkLabel" id="portlabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">_Port</property> + <property name="xalign">1</property> + <property name="label" translatable="yes">_Port:</property> <property name="use_underline">True</property> + <property name="mnemonic_widget">port</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> @@ -129,13 +122,11 @@ <property name="can_focus">True</property> <property name="hexpand">True</property> <property name="invisible_char">•</property> - <property name="invisible_char_set">True</property> </object> <packing> <property name="left_attach">1</property> <property name="top_attach">0</property> <property name="width">2</property> - <property name="height">1</property> </packing> </child> <child> @@ -149,8 +140,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> @@ -159,14 +148,11 @@ <property name="can_focus">True</property> <property name="hexpand">True</property> <property name="invisible_char">•</property> - <property name="invisible_char_set">True</property> <property name="numeric">True</property> </object> <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> </object> @@ -175,8 +161,6 @@ <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> </object> @@ -192,15 +176,14 @@ <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="row_spacing">6</property> - <property name="column_spacing">6</property> + <property name="column_spacing">12</property> <child> <object class="GtkRadioButton" id="socketlabel"> - <property name="label" translatable="yes">So_cket</property> + <property name="label" translatable="yes">So_cket:</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="use_underline">True</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> @@ -209,8 +192,6 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -223,8 +204,6 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> </object> @@ -240,15 +219,14 @@ <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="row_spacing">6</property> - <property name="column_spacing">6</property> + <property name="column_spacing">12</property> <child> <object class="GtkRadioButton" id="namedpipelabel"> - <property name="label" translatable="yes">Named p_ipe</property> + <property name="label" translatable="yes">Named p_ipe:</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="use_underline">True</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> @@ -257,8 +235,6 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -271,8 +247,6 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> </object> diff --git a/dbaccess/uiconfig/ui/odbcpage.ui b/dbaccess/uiconfig/ui/odbcpage.ui index 48b43f1bd920..d399cf792201 100644 --- a/dbaccess/uiconfig/ui/odbcpage.ui +++ b/dbaccess/uiconfig/ui/odbcpage.ui @@ -1,7 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.18.3 --> <interface> - <!-- interface-requires gtk+ 3.0 --> - <!-- interface-requires LibreOffice 1.0 --> + <requires lib="gtk+" version="3.0"/> + <requires lib="LibreOffice" version="1.0"/> <object class="GtkBox" id="ODBC"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -29,12 +30,12 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="spacing">6</property> + <property name="spacing">12</property> <child> <object class="GtkLabel" id="charsetlabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">_Character set</property> + <property name="label" translatable="yes">_Character set:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">charset</property> </object> @@ -64,7 +65,7 @@ <object class="GtkLabel" id="charsetheader"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Data conversion</property> + <property name="label" translatable="yes">Data Conversion</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -97,18 +98,18 @@ <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="orientation">vertical</property> - <property name="spacing">2</property> + <property name="spacing">6</property> <child> <object class="GtkBox" id="box3"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="spacing">6</property> + <property name="spacing">12</property> <child> <object class="GtkLabel" id="optionslabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">ODBC _options</property> + <property name="label" translatable="yes">ODBC _options:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">options</property> </object> diff --git a/dbaccess/uiconfig/ui/parametersdialog.ui b/dbaccess/uiconfig/ui/parametersdialog.ui index 844754c71e57..d7b4f17ab02b 100644 --- a/dbaccess/uiconfig/ui/parametersdialog.ui +++ b/dbaccess/uiconfig/ui/parametersdialog.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.16.1 --> +<!-- Generated with glade 3.18.3 --> <interface> <requires lib="gtk+" version="3.0"/> <object class="GtkDialog" id="Parameters"> @@ -8,17 +8,18 @@ <property name="vexpand">True</property> <property name="border_width">6</property> <property name="title" translatable="yes">Parameter Input</property> + <property name="resizable">False</property> <property name="type_hint">dialog</property> <property name="gravity">north</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> <property name="can_focus">False</property> + <property name="orientation">vertical</property> <property name="spacing">12</property> <child internal-child="action_area"> <object class="GtkButtonBox" id="dialog-action_area1"> <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <property name="layout_style">start</property> + <property name="layout_style">end</property> <child> <object class="GtkButton" id="ok"> <property name="label">gtk-ok</property> @@ -63,6 +64,7 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="position">2</property> + <property name="secondary">True</property> </packing> </child> </object> @@ -96,6 +98,7 @@ <property name="hexpand">True</property> <property name="vexpand">True</property> <property name="orientation">vertical</property> + <property name="spacing">6</property> <child> <object class="GtkTreeView" id="allParamTreeview"> <property name="visible">True</property> @@ -117,7 +120,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> - <property name="label" translatable="yes">_Value</property> + <property name="label" translatable="yes">_Value:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">paramEntry</property> </object> @@ -132,7 +135,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="spacing">6</property> + <property name="spacing">12</property> <child> <object class="GtkEntry" id="paramEntry"> <property name="visible">True</property> diff --git a/dbaccess/uiconfig/ui/password.ui b/dbaccess/uiconfig/ui/password.ui index 6e8ae8790a79..aedf72255f94 100644 --- a/dbaccess/uiconfig/ui/password.ui +++ b/dbaccess/uiconfig/ui/password.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.16.1 --> +<!-- Generated with glade 3.18.3 --> <interface> <requires lib="gtk+" version="3.0"/> <object class="GtkDialog" id="PasswordDialog"> @@ -58,6 +58,7 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="position">2</property> + <property name="secondary">True</property> </packing> </child> </object> @@ -97,8 +98,6 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -111,56 +110,48 @@ <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> <object class="GtkLabel" id="label2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Old p_assword</property> + <property name="xalign">1</property> + <property name="label" translatable="yes">Old p_assword:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">oldpassword</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> <object class="GtkLabel" id="label3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">_Password</property> + <property name="xalign">1</property> + <property name="label" translatable="yes">_Password:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">newpassword</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="GtkLabel" id="label4"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">_Confirm password</property> + <property name="xalign">1</property> + <property name="label" translatable="yes">_Confirm password:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">confirmpassword</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -173,8 +164,6 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> </object> @@ -185,7 +174,7 @@ <object class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">User "$name$: $"</property> + <property name="label" translatable="yes">User “$name$: $”</property> <attributes> <attribute name="weight" value="bold"/> </attributes> diff --git a/dbaccess/uiconfig/ui/preparepage.ui b/dbaccess/uiconfig/ui/preparepage.ui index 3ecf860bef55..b8fc6261ab76 100644 --- a/dbaccess/uiconfig/ui/preparepage.ui +++ b/dbaccess/uiconfig/ui/preparepage.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.16.1 --> +<!-- Generated with glade 3.18.3 --> <interface> <requires lib="gtk+" version="3.0"/> <object class="GtkGrid" id="PreparePage"> @@ -7,7 +7,7 @@ <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="border_width">6</property> - <property name="row_spacing">24</property> + <property name="row_spacing">12</property> <child> <object class="GtkLabel" id="label1"> <property name="visible">True</property> @@ -22,8 +22,6 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -46,8 +44,6 @@ Before the migration can start, all forms, reports, queries and tables belonging <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> @@ -64,8 +60,6 @@ Before the migration can start, all forms, reports, queries and tables belonging <packing> <property name="left_attach">0</property> <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> </object> diff --git a/dbaccess/uiconfig/ui/queryfilterdialog.ui b/dbaccess/uiconfig/ui/queryfilterdialog.ui index bf2ba3aa855a..5497b1ff3d4a 100644 --- a/dbaccess/uiconfig/ui/queryfilterdialog.ui +++ b/dbaccess/uiconfig/ui/queryfilterdialog.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.16.1 --> +<!-- Generated with glade 3.18.3 --> <interface> <requires lib="gtk+" version="3.0"/> <object class="GtkDialog" id="QueryFilterDialog"> @@ -58,6 +58,7 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="position">2</property> + <property name="secondary">True</property> </packing> </child> </object> @@ -98,8 +99,6 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -112,8 +111,6 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -126,8 +123,6 @@ <packing> <property name="left_attach">2</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -142,8 +137,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> @@ -167,8 +160,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> @@ -183,8 +174,6 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -199,8 +188,6 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">3</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -212,8 +199,6 @@ <packing> <property name="left_attach">2</property> <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -225,8 +210,6 @@ <packing> <property name="left_attach">2</property> <property name="top_attach">3</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -239,8 +222,6 @@ <packing> <property name="left_attach">3</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -251,8 +232,6 @@ <packing> <property name="left_attach">3</property> <property name="top_attach">1</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -263,8 +242,6 @@ <packing> <property name="left_attach">3</property> <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -275,8 +252,6 @@ <packing> <property name="left_attach">3</property> <property name="top_attach">3</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -292,8 +267,6 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -309,8 +282,6 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">3</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> diff --git a/dbaccess/uiconfig/ui/querypropertiesdialog.ui b/dbaccess/uiconfig/ui/querypropertiesdialog.ui index ddd59367bde0..fd709fd32acb 100644 --- a/dbaccess/uiconfig/ui/querypropertiesdialog.ui +++ b/dbaccess/uiconfig/ui/querypropertiesdialog.ui @@ -1,11 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.18.3 --> <interface> - <!-- interface-requires gtk+ 3.0 --> - <!-- interface-requires LibreOffice 1.0 --> + <requires lib="gtk+" version="3.0"/> + <requires lib="LibreOffice" version="1.0"/> <object class="GtkDialog" id="QueryPropertiesDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> <property name="title" translatable="yes">Query Properties</property> + <property name="resizable">False</property> <property name="modal">True</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> @@ -60,6 +62,7 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="position">2</property> + <property name="secondary">True</property> </packing> </child> </object> @@ -71,152 +74,90 @@ </packing> </child> <child> - <object class="GtkFrame" id="frame1"> + <object class="GtkGrid" id="grid1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> <child> - <object class="GtkAlignment" id="alignment1"> + <object class="dbulo-LimitBox" id="limitbox"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="limit-label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">1</property> + <property name="label" translatable="yes">Limit:</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkButtonBox" id="distinct-buttons"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="layout_style">start</property> + <child> + <object class="GtkRadioButton" id="distinct"> + <property name="label" translatable="yes">Yes</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <property name="group">nondistinct</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> <child> - <object class="GtkGrid" id="grid1"> + <object class="GtkRadioButton" id="nondistinct"> + <property name="label" translatable="yes">No</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="row_spacing">12</property> - <child> - <object class="GtkGrid" id="grid2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkLabel" id="distinctvalues"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes">Distinct Values</property> - <property name="mnemonic_widget">distinct-buttons</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkButtonBox" id="distinct-buttons"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="layout_style">start</property> - <child> - <object class="GtkRadioButton" id="distinct"> - <property name="label" translatable="yes">Yes</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <property name="group">nondistinct</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="nondistinct"> - <property name="label" translatable="yes">No</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <property name="group">distinct</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkGrid" id="grid3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="column_spacing">24</property> - <child> - <object class="GtkLabel" id="limit-label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes">Limit</property> - <property name="mnemonic_widget">limitbox</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="dbulo-LimitBox" id="limitbox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - </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> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <property name="group">distinct</property> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> </child> </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> </child> - <child type="label"> - <object class="GtkLabel" id="label1"> + <child> + <object class="GtkLabel" id="distinctvalues"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Properties:</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> + <property name="xalign">1</property> + <property name="label" translatable="yes">Distinct values:</property> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> </child> </object> <packing> diff --git a/dbaccess/uiconfig/ui/relationdialog.ui b/dbaccess/uiconfig/ui/relationdialog.ui index 6deada164092..1ff9948b965e 100644 --- a/dbaccess/uiconfig/ui/relationdialog.ui +++ b/dbaccess/uiconfig/ui/relationdialog.ui @@ -1,12 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.16.1 --> +<!-- Generated with glade 3.18.3 --> <interface> <requires lib="gtk+" version="3.0"/> - <!-- interface-requires LibreOffice 1.0 --> + <requires lib="LibreOffice" version="1.0"/> <object class="GtkDialog" id="RelationDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> <property name="title" translatable="yes">Relations</property> + <property name="resizable">False</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> @@ -60,6 +61,7 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="position">2</property> + <property name="secondary">True</property> </packing> </child> </object> @@ -106,8 +108,6 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -119,8 +119,6 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> </object> @@ -141,8 +139,6 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -184,8 +180,6 @@ <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> @@ -227,8 +221,6 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -245,8 +237,6 @@ <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> @@ -263,8 +253,6 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -281,8 +269,6 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">3</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> </object> @@ -303,8 +289,6 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -340,8 +324,6 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -357,8 +339,6 @@ <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> @@ -374,8 +354,6 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -391,8 +369,6 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">3</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> </object> @@ -413,16 +389,12 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> </object> diff --git a/dbaccess/uiconfig/ui/rowheightdialog.ui b/dbaccess/uiconfig/ui/rowheightdialog.ui index 9d98a3f7b45a..a7dd46b4a9fe 100644 --- a/dbaccess/uiconfig/ui/rowheightdialog.ui +++ b/dbaccess/uiconfig/ui/rowheightdialog.ui @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.18.3 --> <interface> - <!-- interface-requires gtk+ 3.0 --> + <requires lib="gtk+" version="3.0"/> <object class="GtkAdjustment" id="adjustment1"> <property name="lower">0.10000000000000001</property> <property name="upper">160</property> @@ -12,6 +13,7 @@ <property name="can_focus">False</property> <property name="border_width">6</property> <property name="title" translatable="yes">Row Height</property> + <property name="resizable">False</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> @@ -64,6 +66,7 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="position">2</property> + <property name="secondary">True</property> </packing> </child> </object> @@ -87,16 +90,14 @@ <object class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">_Height</property> + <property name="xalign">1</property> + <property name="label" translatable="yes">_Height:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">value:0.00cm</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -111,8 +112,6 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -128,8 +127,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> diff --git a/dbaccess/uiconfig/ui/savedialog.ui b/dbaccess/uiconfig/ui/savedialog.ui index 11274624af86..86f95ca061b5 100644 --- a/dbaccess/uiconfig/ui/savedialog.ui +++ b/dbaccess/uiconfig/ui/savedialog.ui @@ -1,12 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.16.0 on Tue Feb 4 11:57:25 2014 --> +<!-- Generated with glade 3.18.3 --> <interface> - <!-- interface-requires LibreOffice 1.0 --> - <!-- interface-requires gtk+ 3.0 --> + <requires lib="gtk+" version="3.0"/> + <requires lib="LibreOffice" version="1.0"/> <object class="GtkDialog" id="SaveDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> <property name="title" translatable="yes">Save As</property> + <property name="resizable">False</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> @@ -59,6 +60,7 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="position">2</property> + <property name="secondary">True</property> </packing> </child> </object> @@ -88,39 +90,34 @@ <property name="left_attach">0</property> <property name="top_attach">0</property> <property name="width">2</property> - <property name="height">1</property> </packing> </child> <child> <object class="GtkLabel" id="catalogft"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">_Catalog</property> + <property name="xalign">1</property> + <property name="label" translatable="yes">_Catalog:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">catalog</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="GtkLabel" id="schemaft"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">_Schema</property> + <property name="xalign">1</property> + <property name="label" translatable="yes">_Schema:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">schema</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -132,23 +129,19 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> <object class="GtkLabel" id="titleft"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> + <property name="xalign">1</property> <property name="use_underline">True</property> <property name="mnemonic_widget">title</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">3</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -160,8 +153,6 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">3</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -173,8 +164,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> </object> diff --git a/dbaccess/uiconfig/ui/saveindexdialog.ui b/dbaccess/uiconfig/ui/saveindexdialog.ui index e546ab58981f..6e198346243a 100644 --- a/dbaccess/uiconfig/ui/saveindexdialog.ui +++ b/dbaccess/uiconfig/ui/saveindexdialog.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.16.1 --> +<!-- Generated with glade 3.18.3 --> <interface> <requires lib="gtk+" version="3.0"/> <object class="GtkMessageDialog" id="SaveIndexDialog"> @@ -15,7 +15,7 @@ <object class="GtkBox" id="messagedialog-vbox"> <property name="can_focus">False</property> <property name="orientation">vertical</property> - <property name="spacing">24</property> + <property name="spacing">12</property> <child internal-child="action_area"> <object class="GtkButtonBox" id="messagedialog-action_area"> <property name="can_focus">False</property> diff --git a/dbaccess/uiconfig/ui/savemodifieddialog.ui b/dbaccess/uiconfig/ui/savemodifieddialog.ui index 8cbfec373f37..e33b1530fd5a 100644 --- a/dbaccess/uiconfig/ui/savemodifieddialog.ui +++ b/dbaccess/uiconfig/ui/savemodifieddialog.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.16.1 --> +<!-- Generated with glade 3.18.3 --> <interface> <requires lib="gtk+" version="3.0"/> <object class="GtkMessageDialog" id="SaveModifiedDialog"> @@ -15,7 +15,7 @@ <object class="GtkBox" id="messagedialog-vbox"> <property name="can_focus">False</property> <property name="orientation">vertical</property> - <property name="spacing">24</property> + <property name="spacing">12</property> <child internal-child="action_area"> <object class="GtkButtonBox" id="messagedialog-action_area"> <property name="can_focus">False</property> diff --git a/dbaccess/uiconfig/ui/sortdialog.ui b/dbaccess/uiconfig/ui/sortdialog.ui index 0b91f236e7e9..202910e65013 100644 --- a/dbaccess/uiconfig/ui/sortdialog.ui +++ b/dbaccess/uiconfig/ui/sortdialog.ui @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.16.0 on Thu Jan 9 09:23:55 2014 --> +<!-- Generated with glade 3.18.3 --> <interface> - <!-- interface-requires gtk+ 3.0 --> + <requires lib="gtk+" version="3.0"/> <object class="GtkDialog" id="SortDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> <property name="title" translatable="yes">Sort Order</property> + <property name="resizable">False</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> @@ -58,6 +59,7 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="position">2</property> + <property name="secondary">True</property> </packing> </child> </object> @@ -91,45 +93,38 @@ <object class="GtkLabel" id="label2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes">Operator</property> <property name="ellipsize">end</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> <object class="GtkLabel" id="label3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> + <property name="xalign">1</property> <property name="label" translatable="yes">and then</property> <property name="ellipsize">end</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> <object class="GtkLabel" id="label4"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> + <property name="xalign">1</property> <property name="label" translatable="yes">and then</property> <property name="ellipsize">end</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">3</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -142,8 +137,6 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -156,8 +149,6 @@ <packing> <property name="left_attach">2</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -169,8 +160,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> @@ -186,8 +175,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> @@ -199,8 +186,6 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -212,8 +197,6 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">3</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -229,8 +212,6 @@ <packing> <property name="left_attach">2</property> <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -246,8 +227,6 @@ <packing> <property name="left_attach">2</property> <property name="top_attach">3</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> diff --git a/dbaccess/uiconfig/ui/specialjdbcconnectionpage.ui b/dbaccess/uiconfig/ui/specialjdbcconnectionpage.ui index c0c51898f8cb..a5c73cc4453c 100644 --- a/dbaccess/uiconfig/ui/specialjdbcconnectionpage.ui +++ b/dbaccess/uiconfig/ui/specialjdbcconnectionpage.ui @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.18.3 --> <interface> - <!-- interface-requires gtk+ 3.0 --> + <requires lib="gtk+" version="3.0"/> <object class="GtkBox" id="SpecialJDBCConnectionPage"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -14,7 +15,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> - <property name="margin_bottom">12</property> + <property name="margin_bottom">6</property> <property name="label" translatable="yes">Set up connection to a MySQL database using JDBC</property> <attributes> <attribute name="weight" value="bold"/> @@ -47,54 +48,48 @@ <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="row_spacing">2</property> - <property name="column_spacing">6</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> <child> <object class="GtkLabel" id="dbNameLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes">_Database name</property> + <property name="xalign">1</property> + <property name="label" translatable="yes">_Database name:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">dbNameEntry</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> <object class="GtkLabel" id="hostNameLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes">_Server</property> + <property name="xalign">1</property> + <property name="label" translatable="yes">_Server:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">hostNameEntry</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="GtkLabel" id="portNumLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes">_Port number</property> + <property name="xalign">1</property> + <property name="label" translatable="yes">_Port number:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">portNumEntry</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -106,8 +101,6 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -119,8 +112,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> @@ -128,7 +119,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="spacing">6</property> + <property name="spacing">12</property> <child> <object class="GtkSpinButton" id="portNumEntry"> <property name="visible">True</property> @@ -157,8 +148,6 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> </object> @@ -174,8 +163,8 @@ <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="row_spacing">2</property> - <property name="column_spacing">6</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> <child> <object class="GtkLabel" id="jdbcDriverLabel"> <property name="visible">True</property> @@ -188,8 +177,6 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -201,13 +188,11 @@ <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="testDriverButton"> - <property name="label" translatable="yes">_Test class</property> + <property name="label" translatable="yes">_Test Class</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -217,8 +202,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> diff --git a/dbaccess/uiconfig/ui/specialsettingspage.ui b/dbaccess/uiconfig/ui/specialsettingspage.ui index 8dfb18416af2..41ff83b119fd 100644 --- a/dbaccess/uiconfig/ui/specialsettingspage.ui +++ b/dbaccess/uiconfig/ui/specialsettingspage.ui @@ -263,7 +263,7 @@ <object class="GtkLabel" id="comparisonft"> <property name="can_focus">False</property> <property name="no_show_all">True</property> - <property name="xalign">0</property> + <property name="xalign">1</property> <property name="label" translatable="yes">Comparison of Boolean values:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">comparison</property> @@ -293,7 +293,7 @@ <object class="GtkLabel" id="rowsft"> <property name="can_focus">False</property> <property name="no_show_all">True</property> - <property name="xalign">0</property> + <property name="xalign">1</property> <property name="label" translatable="yes">Rows to scan column types:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">rows</property> diff --git a/dbaccess/uiconfig/ui/summarypage.ui b/dbaccess/uiconfig/ui/summarypage.ui index 23af7ad54ad6..d0e9461a8574 100644 --- a/dbaccess/uiconfig/ui/summarypage.ui +++ b/dbaccess/uiconfig/ui/summarypage.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.16.1 --> +<!-- Generated with glade 3.18.3 --> <interface> <requires lib="gtk+" version="3.0"/> <object class="GtkGrid" id="SummaryPage"> @@ -7,7 +7,7 @@ <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="border_width">6</property> - <property name="row_spacing">24</property> + <property name="row_spacing">12</property> <child> <object class="GtkLabel" id="label1"> <property name="visible">True</property> @@ -22,8 +22,6 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -40,8 +38,6 @@ <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> @@ -58,8 +54,6 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -82,8 +76,6 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">3</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> </object> diff --git a/dbaccess/uiconfig/ui/tabledesignsavemodifieddialog.ui b/dbaccess/uiconfig/ui/tabledesignsavemodifieddialog.ui index 0615d45e2855..9c5129757bc3 100644 --- a/dbaccess/uiconfig/ui/tabledesignsavemodifieddialog.ui +++ b/dbaccess/uiconfig/ui/tabledesignsavemodifieddialog.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.16.1 --> +<!-- Generated with glade 3.18.3 --> <interface> <requires lib="gtk+" version="3.0"/> <object class="GtkMessageDialog" id="TableDesignSaveModifiedDialog"> @@ -15,7 +15,7 @@ <object class="GtkBox" id="messagedialog-vbox"> <property name="can_focus">False</property> <property name="orientation">vertical</property> - <property name="spacing">24</property> + <property name="spacing">12</property> <child internal-child="action_area"> <object class="GtkButtonBox" id="messagedialog-action_area"> <property name="can_focus">False</property> diff --git a/dbaccess/uiconfig/ui/tablesfilterdialog.ui b/dbaccess/uiconfig/ui/tablesfilterdialog.ui index b311189c7ab8..7d7f93a31a99 100644 --- a/dbaccess/uiconfig/ui/tablesfilterdialog.ui +++ b/dbaccess/uiconfig/ui/tablesfilterdialog.ui @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.16.0 on Tue Jan 21 09:32:06 2014 --> +<!-- Generated with glade 3.18.3 --> <interface> - <!-- interface-requires gtk+ 3.0 --> + <requires lib="gtk+" version="3.0"/> <object class="GtkDialog" id="TablesFilterDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> <property name="title" translatable="yes">Tables Filter</property> + <property name="resizable">False</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> @@ -58,6 +59,7 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="position">2</property> + <property name="secondary">True</property> </packing> </child> </object> diff --git a/dbaccess/uiconfig/ui/tablesjoindialog.ui b/dbaccess/uiconfig/ui/tablesjoindialog.ui index 9cae194c876d..e074c563e5d2 100644 --- a/dbaccess/uiconfig/ui/tablesjoindialog.ui +++ b/dbaccess/uiconfig/ui/tablesjoindialog.ui @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.16.1 --> +<!-- Generated with glade 3.18.3 --> <interface> <requires lib="gtk+" version="3.0"/> - <!-- interface-requires LibreOffice 1.0 --> + <requires lib="LibreOffice" version="1.0"/> <object class="GtkDialog" id="TablesJoinDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> + <property name="resizable">False</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> @@ -58,6 +59,7 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="position">2</property> + <property name="secondary">True</property> </packing> </child> </object> @@ -90,8 +92,6 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -108,8 +108,6 @@ <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> @@ -125,8 +123,6 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -138,8 +134,6 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">4</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -151,8 +145,6 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">5</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -168,8 +160,6 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">3</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> </object> diff --git a/dbaccess/uiconfig/ui/textconnectionsettings.ui b/dbaccess/uiconfig/ui/textconnectionsettings.ui index b4b6acaa96f8..b8fb81fe4129 100644 --- a/dbaccess/uiconfig/ui/textconnectionsettings.ui +++ b/dbaccess/uiconfig/ui/textconnectionsettings.ui @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.16.1 --> +<!-- Generated with glade 3.18.3 --> <interface> <requires lib="gtk+" version="3.0"/> <object class="GtkDialog" id="TextConnectionSettingsDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> <property name="title" translatable="yes">Text Connection Settings</property> + <property name="resizable">False</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> @@ -59,6 +60,7 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="position">2</property> + <property name="secondary">True</property> </packing> </child> </object> diff --git a/dbaccess/uiconfig/ui/textpage.ui b/dbaccess/uiconfig/ui/textpage.ui index e76dc2800a7c..d4a5bd6e8c6b 100644 --- a/dbaccess/uiconfig/ui/textpage.ui +++ b/dbaccess/uiconfig/ui/textpage.ui @@ -1,7 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.18.3 --> <interface> - <!-- interface-requires gtk+ 3.0 --> - <!-- interface-requires LibreOffice 1.0 --> + <requires lib="gtk+" version="3.6"/> + <requires lib="LibreOffice" version="1.0"/> <object class="GtkBox" id="TextPage"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -32,7 +33,7 @@ <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="row_spacing">6</property> - <property name="column_spacing">6</property> + <property name="column_spacing">12</property> <child> <object class="GtkRadioButton" id="textfile"> <property name="label" translatable="yes">Plain text files (*.txt)</property> @@ -40,7 +41,6 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="xalign">0</property> <property name="active">True</property> <property name="draw_indicator">True</property> @@ -49,17 +49,15 @@ <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="GtkRadioButton" id="csvfile"> - <property name="label" translatable="yes">'Comma separated value' files (*.csv)</property> + <property name="label" translatable="yes">Comma-separated value files (*.csv)</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> <property name="group">textfile</property> @@ -68,7 +66,6 @@ <property name="left_attach">0</property> <property name="top_attach">1</property> <property name="width">3</property> - <property name="height">1</property> </packing> </child> <child> @@ -78,17 +75,14 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> + <property name="use_underline">True</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> <property name="group">textfile</property> - <property name="mnemonic_widget">extension</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -102,8 +96,6 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -116,8 +108,6 @@ <packing> <property name="left_attach">2</property> <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> </object> @@ -128,7 +118,7 @@ <object class="GtkLabel" id="extensionheader"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Specify the type of files you want to access</property> + <property name="label" translatable="yes">Specify the Type of Files You Want to Access</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -163,7 +153,7 @@ <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="row_spacing">6</property> - <property name="column_spacing">6</property> + <property name="column_spacing">12</property> <child> <object class="GtkCheckButton" id="containsheaders"> <property name="label" translatable="yes">_Text contains headers</property> @@ -172,7 +162,6 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="hexpand">True</property> - <property name="use_action_appearance">False</property> <property name="use_underline">True</property> <property name="xalign">0</property> <property name="active">True</property> @@ -182,71 +171,62 @@ <property name="left_attach">0</property> <property name="top_attach">4</property> <property name="width">2</property> - <property name="height">1</property> </packing> </child> <child> <object class="GtkLabel" id="fieldlabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Field separator</property> + <property name="xalign">1</property> + <property name="label" translatable="yes">Field separator:</property> + <property name="use_underline">True</property> <property name="mnemonic_widget">fieldseparator</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> <object class="GtkLabel" id="textlabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Text separator</property> + <property name="xalign">1</property> + <property name="label" translatable="yes">Text separator:</property> + <property name="use_underline">True</property> <property name="mnemonic_widget">textseparator</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="GtkLabel" id="decimallabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Decimal separator</property> + <property name="xalign">1</property> + <property name="label" translatable="yes">Decimal separator:</property> + <property name="use_underline">True</property> <property name="mnemonic_widget">decimalseparator</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> <object class="GtkLabel" id="thousandslabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Thousands separator</property> + <property name="xalign">1</property> + <property name="label" translatable="yes">Thousands separator:</property> + <property name="use_underline">True</property> <property name="mnemonic_widget">thousandsseparator</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">3</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -264,8 +244,6 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -283,8 +261,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> @@ -308,8 +284,6 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -331,8 +305,6 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">3</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> </object> @@ -377,14 +349,14 @@ <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="spacing">6</property> + <property name="spacing">12</property> <child> <object class="GtkLabel" id="charsetlabel"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> <property name="xalign">0</property> - <property name="label" translatable="yes">_Character set</property> + <property name="label" translatable="yes">_Character set:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">charset</property> </object> @@ -414,7 +386,7 @@ <object class="GtkLabel" id="charsetheader"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Data conversion</property> + <property name="label" translatable="yes">Data Conversion</property> <attributes> <attribute name="weight" value="bold"/> </attributes> diff --git a/dbaccess/uiconfig/ui/typeselectpage.ui b/dbaccess/uiconfig/ui/typeselectpage.ui index 373c78eea9a1..0b4ef073b34f 100644 --- a/dbaccess/uiconfig/ui/typeselectpage.ui +++ b/dbaccess/uiconfig/ui/typeselectpage.ui @@ -1,7 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.18.3 --> <interface> - <!-- interface-requires gtk+ 3.0 --> - <!-- interface-requires LibreOffice 1.0 --> + <requires lib="gtk+" version="3.0"/> + <requires lib="LibreOffice" version="1.0"/> <object class="GtkBox" id="TypeSelect"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -67,7 +68,7 @@ <object class="GtkLabel" id="columns"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Column information</property> + <property name="label" translatable="yes">Column Information</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -99,22 +100,20 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="row_spacing">6</property> - <property name="column_spacing">6</property> + <property name="column_spacing">12</property> <child> <object class="GtkLabel" id="autolabel"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Lines (ma_x)</property> + <property name="label" translatable="yes">Lines (ma_x.):</property> <property name="use_underline">True</property> <property name="mnemonic_widget">auto</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -124,14 +123,11 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> <property name="use_underline">True</property> </object> <packing> <property name="left_attach">2</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -144,8 +140,6 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> </object> @@ -156,7 +150,7 @@ <object class="GtkLabel" id="autotype"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Automatic type recognition</property> + <property name="label" translatable="yes">Automatic Type Recognition</property> <attributes> <attribute name="weight" value="bold"/> </attributes> diff --git a/dbaccess/uiconfig/ui/useradmindialog.ui b/dbaccess/uiconfig/ui/useradmindialog.ui index f3649ea3c813..2538acc2a361 100644 --- a/dbaccess/uiconfig/ui/useradmindialog.ui +++ b/dbaccess/uiconfig/ui/useradmindialog.ui @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.16.0 on Wed Jan 29 14:36:32 2014 --> +<!-- Generated with glade 3.18.3 --> <interface> - <!-- interface-requires gtk+ 3.0 --> + <requires lib="gtk+" version="3.0"/> <object class="GtkDialog" id="UserAdminDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> - <property name="title" translatable="yes">User administration</property> + <property name="title" translatable="yes">User Administration</property> + <property name="resizable">False</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> @@ -58,6 +59,7 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="position">2</property> + <property name="secondary">True</property> </packing> </child> </object> diff --git a/dbaccess/uiconfig/ui/useradminpage.ui b/dbaccess/uiconfig/ui/useradminpage.ui index 58907e6f0a23..6962482e14d5 100644 --- a/dbaccess/uiconfig/ui/useradminpage.ui +++ b/dbaccess/uiconfig/ui/useradminpage.ui @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.18.3 --> <interface> - <!-- interface-requires gtk+ 3.0 --> + <requires lib="gtk+" version="3.0"/> <object class="GtkBox" id="UserAdminPage"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -35,7 +36,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="spacing">6</property> + <property name="spacing">12</property> <child> <object class="GtkLabel" id="label3"> <property name="visible">True</property> @@ -76,7 +77,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="spacing">6</property> + <property name="spacing">12</property> <child> <object class="GtkButton" id="add"> <property name="label" translatable="yes">_Add User...</property> @@ -84,7 +85,6 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> <property name="use_underline">True</property> </object> <packing> @@ -100,7 +100,6 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> <property name="use_underline">True</property> </object> <packing> @@ -116,7 +115,6 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> <property name="use_underline">True</property> </object> <packing> @@ -140,7 +138,7 @@ <object class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">User selection</property> + <property name="label" translatable="yes">User Selection</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -179,7 +177,7 @@ <object class="GtkLabel" id="label2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Access rights for selected user</property> + <property name="label" translatable="yes">Access Rights for Selected User</property> <attributes> <attribute name="weight" value="bold"/> </attributes> diff --git a/dbaccess/uiconfig/ui/userdetailspage.ui b/dbaccess/uiconfig/ui/userdetailspage.ui index ee85ae6dd050..e4edec5cbde2 100644 --- a/dbaccess/uiconfig/ui/userdetailspage.ui +++ b/dbaccess/uiconfig/ui/userdetailspage.ui @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.16.1 --> +<!-- Generated with glade 3.18.3 --> <interface> <requires lib="gtk+" version="3.0"/> - <!-- interface-requires LibreOffice 1.0 --> + <requires lib="LibreOffice" version="1.0"/> <object class="GtkBox" id="UserDetailsPage"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -36,8 +36,8 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">_Hostname</property> + <property name="xalign">1</property> + <property name="label" translatable="yes">_Host name:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">hostname</property> <property name="ellipsize">end</property> @@ -45,8 +45,6 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -54,16 +52,14 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">_Port number</property> + <property name="xalign">1</property> + <property name="label" translatable="yes">_Port number:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">portnumber</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> @@ -75,8 +71,6 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -88,8 +82,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> @@ -106,7 +98,6 @@ <property name="left_attach">0</property> <property name="top_attach">3</property> <property name="width">2</property> - <property name="height">1</property> </packing> </child> <child> @@ -114,16 +105,14 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">_Driver settings</property> + <property name="xalign">1</property> + <property name="label" translatable="yes">_Driver settings:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">options</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -135,8 +124,6 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> </object> @@ -184,8 +171,8 @@ <object class="GtkLabel" id="charsetlabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">_Character set</property> + <property name="xalign">1</property> + <property name="label" translatable="yes">_Character set:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">charset</property> </object> |