dbaccess/uiconfig/ui/admindialog.ui | 8 dbaccess/uiconfig/ui/advancedsettingsdialog.ui | 6 dbaccess/uiconfig/ui/autocharsetpage.ui | 11 dbaccess/uiconfig/ui/backuppage.ui | 26 -- dbaccess/uiconfig/ui/choosedatasourcedialog.ui | 69 ++--- dbaccess/uiconfig/ui/collectionviewdialog.ui | 5 dbaccess/uiconfig/ui/colwidthdialog.ui | 15 - dbaccess/uiconfig/ui/connectionpage.ui | 51 +-- dbaccess/uiconfig/ui/copytablepage.ui | 36 -- dbaccess/uiconfig/ui/dbaseindexdialog.ui | 23 - dbaccess/uiconfig/ui/dbasepage.ui | 15 - dbaccess/uiconfig/ui/dbwizconnectionpage.ui | 26 -- dbaccess/uiconfig/ui/dbwizmysqlintropage.ui | 11 dbaccess/uiconfig/ui/dbwizmysqlnativepage.ui | 5 dbaccess/uiconfig/ui/deleteallrowsdialog.ui | 4 dbaccess/uiconfig/ui/designsavemodifieddialog.ui | 4 dbaccess/uiconfig/ui/directsqldialog.ui | 25 - dbaccess/uiconfig/ui/fielddialog.ui | 6 dbaccess/uiconfig/ui/finalpagewizard.ui | 24 - dbaccess/uiconfig/ui/generalpagedialog.ui | 19 - dbaccess/uiconfig/ui/generalpagewizard.ui | 23 - dbaccess/uiconfig/ui/generalspecialjdbcdetailspage.ui | 44 +-- dbaccess/uiconfig/ui/generatedvaluespage.ui | 24 - dbaccess/uiconfig/ui/indexdesigndialog.ui | 231 ++++++++---------- dbaccess/uiconfig/ui/jdbcconnectionpage.ui | 36 +- dbaccess/uiconfig/ui/joindialog.ui | 31 -- dbaccess/uiconfig/ui/ldapconnectionpage.ui | 39 +-- dbaccess/uiconfig/ui/ldappage.ui | 36 -- dbaccess/uiconfig/ui/migratepage.ui | 32 -- dbaccess/uiconfig/ui/mysqlnativepage.ui | 29 -- dbaccess/uiconfig/ui/mysqlnativesettings.ui | 60 +--- dbaccess/uiconfig/ui/odbcpage.ui | 17 - dbaccess/uiconfig/ui/parametersdialog.ui | 13 - dbaccess/uiconfig/ui/password.ui | 29 -- dbaccess/uiconfig/ui/preparepage.ui | 10 dbaccess/uiconfig/ui/queryfilterdialog.ui | 33 -- dbaccess/uiconfig/ui/querypropertiesdialog.ui | 203 +++++---------- dbaccess/uiconfig/ui/relationdialog.ui | 36 -- dbaccess/uiconfig/ui/rowheightdialog.ui | 15 - dbaccess/uiconfig/ui/savedialog.ui | 31 -- dbaccess/uiconfig/ui/saveindexdialog.ui | 4 dbaccess/uiconfig/ui/savemodifieddialog.ui | 4 dbaccess/uiconfig/ui/sortdialog.ui | 33 -- dbaccess/uiconfig/ui/specialjdbcconnectionpage.ui | 47 +-- dbaccess/uiconfig/ui/specialsettingspage.ui | 4 dbaccess/uiconfig/ui/summarypage.ui | 12 dbaccess/uiconfig/ui/tabledesignsavemodifieddialog.ui | 4 dbaccess/uiconfig/ui/tablesfilterdialog.ui | 6 dbaccess/uiconfig/ui/tablesjoindialog.ui | 18 - dbaccess/uiconfig/ui/textconnectionsettings.ui | 4 dbaccess/uiconfig/ui/textpage.ui | 74 +---- dbaccess/uiconfig/ui/typeselectpage.ui | 20 - dbaccess/uiconfig/ui/useradmindialog.ui | 8 dbaccess/uiconfig/ui/useradminpage.ui | 14 - dbaccess/uiconfig/ui/userdetailspage.ui | 33 -- 55 files changed, 563 insertions(+), 1083 deletions(-)
New commits: commit a4536921f663fe3dcf7361362f7990286f24c3f2 Author: Adolfo Jayme Barrientos <fit...@ubuntu.com> Date: Sat Nov 22 14:52:37 2014 -0600 HIG fixes for dbaccess Change-Id: Ib9ce9a28eec4343850158541375608d63fda8d19 Reviewed-on: https://gerrit.libreoffice.org/13050 Reviewed-by: Caolán McNamara <caol...@redhat.com> Tested-by: Caolán McNamara <caol...@redhat.com> diff --git a/dbaccess/uiconfig/ui/admindialog.ui b/dbaccess/uiconfig/ui/admindialog.ui index 53e1a0a..72040da 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 aeb85b4..8a49dd6 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 4ef3ae8..327e115 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 b7df59c..f76b1f7 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 c2278af..db9ebc3 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 b34397e..d51688a 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 89fe59f..86dd9b3b 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 537fc71..e8ef60d 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 65a8c1a..ca94cde 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 3f8ea83..1fd8fa5 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 cfc83eb..1d45b96 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 8920360..5b3916d 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 6c98251..3d9d43f 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 df5b59c..4e8a289 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 31cc24e..9b263be 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 54ae0f8..a3bb08e 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 0f37c67..96979d6 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 dc44d2f..dd47d82 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 252491d..765d165 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 3832cb6..12578f7 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 bd1fc0b..ea43f35 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 27d7400..d465562 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 a0cfbfa..88cefb1 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 3068894..a0d34a8 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 6728259..945bae1 100644 --- a/dbaccess/uiconfig/ui/jdbcconnectionpage.ui ... etc. - the rest is truncated
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits