diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-12-24 15:13:51 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-12-28 20:41:41 +0100 |
| commit | 82094065a134f00db11db870c0c378943cd18e98 (patch) | |
| tree | 2fc92294484362eec0eae5bd67db63fd2c74e5cf /dbaccess | |
| parent | 2b824fa229a8095f9509f8305fe81ae86bb1a52d (diff) | |
drop deprecated GtkAlignment, move left/top-padding into child margin-start/top
for dbaccess part b
Change-Id: I31e7bd41923f8167db50da4701990ba20fc582de
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108383
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'dbaccess')
| -rw-r--r-- | dbaccess/uiconfig/ui/generatedvaluespage.ui | 178 | ||||
| -rw-r--r-- | dbaccess/uiconfig/ui/indexdesigndialog.ui | 148 | ||||
| -rw-r--r-- | dbaccess/uiconfig/ui/joindialog.ui | 221 | ||||
| -rw-r--r-- | dbaccess/uiconfig/ui/ldappage.ui | 199 | ||||
| -rw-r--r-- | dbaccess/uiconfig/ui/mysqlnativepage.ui | 173 | ||||
| -rw-r--r-- | dbaccess/uiconfig/ui/mysqlnativesettings.ui | 141 | ||||
| -rw-r--r-- | dbaccess/uiconfig/ui/odbcpage.ui | 132 | ||||
| -rw-r--r-- | dbaccess/uiconfig/ui/parametersdialog.ui | 142 | ||||
| -rw-r--r-- | dbaccess/uiconfig/ui/password.ui | 176 | ||||
| -rw-r--r-- | dbaccess/uiconfig/ui/queryfilterdialog.ui | 482 | ||||
| -rw-r--r-- | dbaccess/uiconfig/ui/relationdialog.ui | 339 | ||||
| -rw-r--r-- | dbaccess/uiconfig/ui/sortdialog.ui | 294 | ||||
| -rw-r--r-- | dbaccess/uiconfig/ui/tablesfilterpage.ui | 122 | ||||
| -rw-r--r-- | dbaccess/uiconfig/ui/textpage.ui | 520 | ||||
| -rw-r--r-- | dbaccess/uiconfig/ui/titlewindow.ui | 22 | ||||
| -rw-r--r-- | dbaccess/uiconfig/ui/typeselectpage.ui | 108 | ||||
| -rw-r--r-- | dbaccess/uiconfig/ui/useradminpage.ui | 175 | ||||
| -rw-r--r-- | dbaccess/uiconfig/ui/userdetailspage.ui | 263 |
18 files changed, 1809 insertions, 2026 deletions
diff --git a/dbaccess/uiconfig/ui/generatedvaluespage.ui b/dbaccess/uiconfig/ui/generatedvaluespage.ui index a3674c7687e1..c7e99c0bcc47 100644 --- a/dbaccess/uiconfig/ui/generatedvaluespage.ui +++ b/dbaccess/uiconfig/ui/generatedvaluespage.ui @@ -11,29 +11,72 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment4"> + <!-- n-columns=1 n-rows=1 --> + <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="top_padding">6</property> - <property name="left_padding">12</property> + <property name="row_spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> + <child> + <object class="GtkCheckButton" id="autoretrieve"> + <property name="label" translatable="yes" context="generatedvaluespage|autoretrieve">Re_trieve generated values</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</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">0</property> + </packing> + </child> <child> <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid1"> + <object class="GtkGrid" id="grid"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="row_spacing">12</property> + <property name="margin-start">12</property> <child> - <object class="GtkCheckButton" id="autoretrieve"> - <property name="label" translatable="yes" context="generatedvaluespage|autoretrieve">Re_trieve generated values</property> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid3"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="row_spacing">6</property> + <child> + <object class="GtkLabel" id="statementft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="generatedvaluespage|statementft">_Auto-increment statement:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">statement</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="statement"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + <property name="width_chars">34</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> </object> <packing> <property name="left_attach">0</property> @@ -41,99 +84,38 @@ </packing> </child> <child> - <object class="GtkAlignment" id="alignment1"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid4"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="left_padding">12</property> + <property name="row_spacing">6</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid"> + <object class="GtkLabel" id="queryft"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="label" translatable="yes" context="generatedvaluespage|queryft">_Query of generated values:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">query</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="query"> + <property name="visible">True</property> + <property name="can_focus">True</property> <property name="hexpand">True</property> - <property name="row_spacing">12</property> - <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="row_spacing">6</property> - <child> - <object class="GtkLabel" id="statementft"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="generatedvaluespage|statementft">_Auto-increment statement:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">statement</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="statement"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <property name="width_chars">34</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid4"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="row_spacing">6</property> - <child> - <object class="GtkLabel" id="queryft"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="generatedvaluespage|queryft">_Query of generated values:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">query</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="query"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <property name="width_chars">34</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> + <property name="activates_default">True</property> + <property name="width_chars">34</property> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> </child> </object> <packing> @@ -142,6 +124,10 @@ </packing> </child> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> </child> </object> </child> diff --git a/dbaccess/uiconfig/ui/indexdesigndialog.ui b/dbaccess/uiconfig/ui/indexdesigndialog.ui index 22892be880bb..4e2b0cf60484 100644 --- a/dbaccess/uiconfig/ui/indexdesigndialog.ui +++ b/dbaccess/uiconfig/ui/indexdesigndialog.ui @@ -228,89 +228,83 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment1"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid5"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid5"> + <object class="GtkLabel" id="DESC_LABEL"> <property name="visible">True</property> <property name="can_focus">False</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="label" translatable="yes" context="indexdesigndialog|DESC_LABEL">Index identifier:</property> - <property name="xalign">0</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" context="indexdesigndialog|UNIQUE">_Unique</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="label" translatable="yes" context="indexdesigndialog|FIELDS_LABEL">Fields:</property> - <property name="use_underline">True</property> - <property name="xalign">0</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="GtkBox" id="FIELDS"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> - <property name="width">2</property> - </packing> - </child> + <property name="halign">start</property> + <property name="label" translatable="yes" context="indexdesigndialog|DESC_LABEL">Index identifier:</property> + <property name="xalign">0</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" context="indexdesigndialog|UNIQUE">_Unique</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="label" translatable="yes" context="indexdesigndialog|FIELDS_LABEL">Fields:</property> + <property name="use_underline">True</property> + <property name="xalign">0</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="GtkBox" id="FIELDS"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + <property name="width">2</property> + </packing> </child> </object> </child> diff --git a/dbaccess/uiconfig/ui/joindialog.ui b/dbaccess/uiconfig/ui/joindialog.ui index 69dfd9fdf871..b2ac4c949dc7 100644 --- a/dbaccess/uiconfig/ui/joindialog.ui +++ b/dbaccess/uiconfig/ui/joindialog.ui @@ -91,43 +91,36 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment1"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid2"> <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> + <property name="column_spacing">12</property> + <property name="column_homogeneous">True</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid2"> + <object class="GtkComboBoxText" id="table1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="column_spacing">12</property> - <property name="column_homogeneous">True</property> - <child> - <object class="GtkComboBoxText" id="table1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="table2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="table2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> </child> </object> </child> @@ -154,45 +147,39 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment2"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid4"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="row_spacing">6</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid4"> + <object class="GtkLabel" id="helptext"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="row_spacing">6</property> - <child> - <object class="GtkLabel" id="helptext"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="wrap">True</property> - <property name="width_chars">48</property> - <property name="max_width_chars">48</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkBox" id="relations"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> + <property name="wrap">True</property> + <property name="width_chars">48</property> + <property name="max_width_chars">48</property> + <property name="xalign">0</property> + <property name="yalign">0</property> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkBox" id="relations"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> </child> </object> </child> @@ -219,70 +206,64 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment5"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid7"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid7"> + <object class="GtkLabel" id="label5"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkLabel" id="label5"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="label" translatable="yes" context="joindialog|label5">_Type:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">type</property> - <property name="xalign">1</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="type"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <items> - <item id="1" translatable="yes" context="joindialog|liststore1">Inner join</item> - <item id="2" translatable="yes" context="joindialog|liststore1">Left join</item> - <item id="3" translatable="yes" context="joindialog|liststore1">Right join</item> - <item id="4" translatable="yes" context="joindialog|liststore1">Full (outer) join</item> - <item id="5" translatable="yes" context="joindialog|liststore1">Cross join</item> - </items> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="natural"> - <property name="label" translatable="yes" context="joindialog|natural">Natural</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <placeholder/> - </child> + <property name="hexpand">True</property> + <property name="label" translatable="yes" context="joindialog|label5">_Type:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">type</property> + <property name="xalign">1</property> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="type"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <items> + <item id="1" translatable="yes" context="joindialog|liststore1">Inner join</item> + <item id="2" translatable="yes" context="joindialog|liststore1">Left join</item> + <item id="3" translatable="yes" context="joindialog|liststore1">Right join</item> + <item id="4" translatable="yes" context="joindialog|liststore1">Full (outer) join</item> + <item id="5" translatable="yes" context="joindialog|liststore1">Cross join</item> + </items> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="natural"> + <property name="label" translatable="yes" context="joindialog|natural">Natural</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <placeholder/> </child> </object> </child> diff --git a/dbaccess/uiconfig/ui/ldappage.ui b/dbaccess/uiconfig/ui/ldappage.ui index cad54ccf62e4..7a0caf87aded 100644 --- a/dbaccess/uiconfig/ui/ldappage.ui +++ b/dbaccess/uiconfig/ui/ldappage.ui @@ -28,117 +28,110 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment1"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid1"> <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> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid1"> + <object class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="label" translatable="yes" context="ldappage|label1">_Base DN:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">baseDNEntry</property> + <property name="xalign">1</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="baseDNEntry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="useSSLCheckbutton"> + <property name="label" translatable="yes" context="ldappage|useSSLCheckbutton">Use secure connection (SSL)</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</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="label2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="ldappage|label2">_Port number:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">portNumberSpinbutton</property> + <property name="xalign">1</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="portNumberSpinbutton"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + <property name="adjustment">adjustment1</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="ldappage|label3">Maximum number of _records:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">LDAPRowCountspinbutton</property> + <property name="xalign">1</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="LDAPRowCountspinbutton"> + <property name="visible">True</property> + <property name="can_focus">True</property> <property name="hexpand">True</property> - <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="label" translatable="yes" context="ldappage|label1">_Base DN:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">baseDNEntry</property> - <property name="xalign">1</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="baseDNEntry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="useSSLCheckbutton"> - <property name="label" translatable="yes" context="ldappage|useSSLCheckbutton">Use secure connection (SSL)</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</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="label2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="ldappage|label2">_Port number:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">portNumberSpinbutton</property> - <property name="xalign">1</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="portNumberSpinbutton"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <property name="adjustment">adjustment1</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="ldappage|label3">Maximum number of _records:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">LDAPRowCountspinbutton</property> - <property name="xalign">1</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="LDAPRowCountspinbutton"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <property name="adjustment">adjustment2</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">3</property> - </packing> - </child> + <property name="activates_default">True</property> + <property name="adjustment">adjustment2</property> </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">3</property> + </packing> </child> </object> </child> diff --git a/dbaccess/uiconfig/ui/mysqlnativepage.ui b/dbaccess/uiconfig/ui/mysqlnativepage.ui index c1132d240624..440b8f5dcd8d 100644 --- a/dbaccess/uiconfig/ui/mysqlnativepage.ui +++ b/dbaccess/uiconfig/ui/mysqlnativepage.ui @@ -19,24 +19,16 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment1"> + <object class="GtkBox" id="MySQLSettingsContainer"> <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> + <property name="orientation">vertical</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <object class="GtkBox" id="MySQLSettingsContainer"> - <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> - <child> - <placeholder/> - </child> - </object> + <placeholder/> </child> </object> </child> @@ -66,67 +58,59 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment2"> + <!-- n-columns=1 n-rows=1 --> + <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="top_padding">6</property> - <property name="left_padding">12</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid1"> + <object class="GtkLabel" id="usernamelabel"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="label" translatable="yes" context="mysqlnativepage|usernamelabel">_User name:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">username</property> + <property name="xalign">1</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="username"> + <property name="visible">True</property> + <property name="can_focus">True</property> <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="row_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="label" translatable="yes" context="mysqlnativepage|usernamelabel">_User name:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">username</property> - <property name="xalign">1</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="username"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="passwordrequired"> - <property name="label" translatable="yes" context="mysqlnativepage|passwordrequired">Password required</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <placeholder/> - </child> + <property name="activates_default">True</property> </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="passwordrequired"> + <property name="label" translatable="yes" context="mysqlnativepage|passwordrequired">Password required</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <placeholder/> </child> </object> </child> @@ -155,47 +139,40 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment3"> + <object class="GtkBox" id="box1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">start</property> <property name="hexpand">True</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="valign">start</property> + <property name="spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> + <child> + <object class="GtkLabel" id="charsetlabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="mysqlnativepage|charsetlabel">_Character set:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">charset</property> + <property name="xalign">1</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> <child> - <object class="GtkBox" id="box1"> + <object class="GtkComboBoxText" id="charset"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</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" context="mysqlnativepage|charsetlabel">_Character set:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">charset</property> - <property name="xalign">1</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="charset"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - </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> </object> </child> diff --git a/dbaccess/uiconfig/ui/mysqlnativesettings.ui b/dbaccess/uiconfig/ui/mysqlnativesettings.ui index 9c39f4dd17fa..ec2720183b76 100644 --- a/dbaccess/uiconfig/ui/mysqlnativesettings.ui +++ b/dbaccess/uiconfig/ui/mysqlnativesettings.ui @@ -81,88 +81,81 @@ </packing> </child> <child> - <object class="GtkAlignment" id="alignment1"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="left_padding">12</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <property name="margin-start">12</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid1"> + <object class="GtkLabel" id="serverlabel"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="label" translatable="yes" context="mysqlnativesettings|serverlabel">_Server:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">server</property> + <property name="xalign">1</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="portlabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="mysqlnativesettings|portlabel">_Port:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">port</property> + <property name="xalign">1</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="server"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="defaultport"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes" context="mysqlnativesettings|defaultport">Default: 3306</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="port"> + <property name="visible">True</property> + <property name="can_focus">True</property> <property name="hexpand">True</property> - <property name="row_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="label" translatable="yes" context="mysqlnativesettings|serverlabel">_Server:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">server</property> - <property name="xalign">1</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="portlabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="mysqlnativesettings|portlabel">_Port:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">port</property> - <property name="xalign">1</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="server"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - <property name="width">2</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="defaultport"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes" context="mysqlnativesettings|defaultport">Default: 3306</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="port"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <property name="adjustment">adjustment1</property> - <property name="numeric">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> + <property name="activates_default">True</property> + <property name="adjustment">adjustment1</property> + <property name="numeric">True</property> </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> </child> </object> <packing> diff --git a/dbaccess/uiconfig/ui/odbcpage.ui b/dbaccess/uiconfig/ui/odbcpage.ui index 58ac34b1ac7e..223b21bc4d8b 100644 --- a/dbaccess/uiconfig/ui/odbcpage.ui +++ b/dbaccess/uiconfig/ui/odbcpage.ui @@ -18,45 +18,38 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment1"> + <object class="GtkBox" id="box1"> <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> + <property name="spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <object class="GtkBox" id="box1"> + <object class="GtkLabel" id="charsetlabel"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="label" translatable="yes" context="odbcpage|charsetlabel">_Character set:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">charset</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="charset"> + <property name="visible">True</property> + <property name="can_focus">True</property> <property name="hexpand">True</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" context="odbcpage|charsetlabel">_Character set:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">charset</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="charset"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - </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> </object> </child> @@ -85,52 +78,27 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment2"> + <object class="GtkBox" id="box2"> <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> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <object class="GtkBox" id="box2"> + <object class="GtkBox" id="box3"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> + <property name="spacing">12</property> <child> - <object class="GtkBox" id="box3"> + <object class="GtkLabel" id="optionslabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="hexpand">True</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" context="odbcpage|optionslabel">ODBC _options:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">options</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="options"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> + <property name="label" translatable="yes" context="odbcpage|optionslabel">ODBC _options:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">options</property> </object> <packing> <property name="expand">False</property> @@ -139,14 +107,11 @@ </packing> </child> <child> - <object class="GtkCheckButton" id="useCatalogCheckbutton"> - <property name="label" translatable="yes" context="odbcpage|useCatalogCheckbutton">Use catalog for file-based databases</property> + <object class="GtkEntry" id="options"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> </object> <packing> <property name="expand">False</property> @@ -155,6 +120,27 @@ </packing> </child> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="useCatalogCheckbutton"> + <property name="label" translatable="yes" context="odbcpage|useCatalogCheckbutton">Use catalog for file-based databases</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</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">1</property> + </packing> </child> </object> </child> diff --git a/dbaccess/uiconfig/ui/parametersdialog.ui b/dbaccess/uiconfig/ui/parametersdialog.ui index 5e63b638e97b..e54eaba32a7a 100644 --- a/dbaccess/uiconfig/ui/parametersdialog.ui +++ b/dbaccess/uiconfig/ui/parametersdialog.ui @@ -95,118 +95,110 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment1"> + <object class="GtkBox" id="box1"> <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> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <object class="GtkBox" id="box1"> + <object class="GtkScrolledWindow"> <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> + <property name="shadow_type">in</property> <child> - <object class="GtkScrolledWindow"> + <object class="GtkTreeView" id="allParamTreeview"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="shadow_type">in</property> + <property name="model">liststore1</property> + <property name="headers_visible">False</property> + <property name="headers_clickable">False</property> + <property name="search_column">0</property> + <property name="show_expanders">False</property> + <child internal-child="selection"> + <object class="GtkTreeSelection" id="treeview-selection1"/> + </child> <child> - <object class="GtkTreeView" id="allParamTreeview"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="model">liststore1</property> - <property name="headers_visible">False</property> - <property name="headers_clickable">False</property> - <property name="search_column">0</property> - <property name="show_expanders">False</property> - <child internal-child="selection"> - <object class="GtkTreeSelection" id="treeview-selection1"/> - </child> + <object class="GtkTreeViewColumn" id="treeviewcolumn1"> <child> - <object class="GtkTreeViewColumn" id="treeviewcolumn1"> - <child> - <object class="GtkCellRendererText" id="cellrenderertext1"/> - <attributes> - <attribute name="text">0</attribute> - </attributes> - </child> - </object> + <object class="GtkCellRendererText" id="cellrenderertext1"/> + <attributes> + <attribute name="text">0</attribute> + </attributes> </child> </object> </child> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</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" context="parametersdialog|label2">_Value:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">paramEntry</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="spacing">12</property> <child> - <object class="GtkLabel" id="label2"> + <object class="GtkEntry" id="paramEntry"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes" context="parametersdialog|label2">_Value:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">paramEntry</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkBox" id="box2"> + <object class="GtkButton" id="next"> + <property name="label" translatable="yes" context="parametersdialog|next">_Next</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="spacing">12</property> - <child> - <object class="GtkEntry" id="paramEntry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="next"> - <property name="label" translatable="yes" context="parametersdialog|next">_Next</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="receives_default">True</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">True</property> + <property name="use_underline">True</property> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">1</property> </packing> </child> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> </child> </object> </child> diff --git a/dbaccess/uiconfig/ui/password.ui b/dbaccess/uiconfig/ui/password.ui index f69fd50174c6..b275253cf784 100644 --- a/dbaccess/uiconfig/ui/password.ui +++ b/dbaccess/uiconfig/ui/password.ui @@ -82,104 +82,98 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment1"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="hexpand">True</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid1"> + <object class="GtkEntry" id="oldpassword"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="visibility">False</property> + <property name="activates_default">True</property> + <property name="input_purpose">password</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="newpassword"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="visibility">False</property> + <property name="activates_default">True</property> + <property name="input_purpose">password</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="password|label2">Old p_assword:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">oldpassword</property> + <property name="xalign">1</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="password|label3">_Password:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">newpassword</property> + <property name="xalign">1</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label4"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="label" translatable="yes" context="password|label4">_Confirm password:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">confirmpassword</property> + <property name="xalign">1</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="confirmpassword"> + <property name="visible">True</property> + <property name="can_focus">True</property> <property name="hexpand">True</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkEntry" id="oldpassword"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="visibility">False</property> - <property name="activates_default">True</property> - <property name="input_purpose">password</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="newpassword"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="visibility">False</property> - <property name="activates_default">True</property> - <property name="input_purpose">password</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="password|label2">Old p_assword:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">oldpassword</property> - <property name="xalign">1</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="password|label3">_Password:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">newpassword</property> - <property name="xalign">1</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label4"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="password|label4">_Confirm password:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">confirmpassword</property> - <property name="xalign">1</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="confirmpassword"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="visibility">False</property> - <property name="activates_default">True</property> - <property name="input_purpose">password</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - </packing> - </child> + <property name="visibility">False</property> + <property name="activates_default">True</property> + <property name="input_purpose">password</property> </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + </packing> </child> </object> </child> diff --git a/dbaccess/uiconfig/ui/queryfilterdialog.ui b/dbaccess/uiconfig/ui/queryfilterdialog.ui index 3ce721c5701c..4c2ea3266fa9 100644 --- a/dbaccess/uiconfig/ui/queryfilterdialog.ui +++ b/dbaccess/uiconfig/ui/queryfilterdialog.ui @@ -80,278 +80,272 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment2"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid2"> + <object class="GtkLabel" id="label2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkLabel" id="label2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="queryfilterdialog|label2">Operator</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label5"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="queryfilterdialog|label5">Field name</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label6"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="queryfilterdialog|label6">Condition</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="field1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="active">0</property> - <items> - <item translatable="yes" context="queryfilterdialog|field1">- none -</item> - </items> - <child internal-child="accessible"> - <object class="AtkObject" id="field1-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="queryfilterdialog|extended_tip|field1">Specifies the field names from the current table to set them in the argument.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="cond1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="active">0</property> - <items> - <item translatable="yes" context="queryfilterdialog|cond1">=</item> - <item translatable="yes" context="queryfilterdialog|cond1"><></item> - <item translatable="yes" context="queryfilterdialog|cond1"><</item> - <item translatable="yes" context="queryfilterdialog|cond1"><=</item> - <item translatable="yes" context="queryfilterdialog|cond1">></item> - <item translatable="yes" context="queryfilterdialog|cond1">>=</item> - <item translatable="yes" context="queryfilterdialog|cond1">like</item> - <item translatable="yes" context="queryfilterdialog|cond1">not like</item> - <item translatable="yes" context="queryfilterdialog|cond1">null</item> - <item translatable="yes" context="queryfilterdialog|cond1">not null</item> - </items> - <child internal-child="accessible"> - <object class="AtkObject" id="cond1-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="queryfilterdialog|extended_tip|cond1">Specifies the comparative operators through which the entries in the Field name and Value fields can be linked.</property> - </object> - </child> + <property name="label" translatable="yes" context="queryfilterdialog|label2">Operator</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label5"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="queryfilterdialog|label5">Field name</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label6"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="queryfilterdialog|label6">Condition</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="field1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="active">0</property> + <items> + <item translatable="yes" context="queryfilterdialog|field1">- none -</item> + </items> + <child internal-child="accessible"> + <object class="AtkObject" id="field1-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="queryfilterdialog|extended_tip|field1">Specifies the field names from the current table to set them in the argument.</property> </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkComboBoxText" id="field2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="active">0</property> - <items> - <item translatable="yes" context="queryfilterdialog|field2">- none -</item> - </items> - <child internal-child="accessible"> - <object class="AtkObject" id="field2-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="queryfilterdialog|extended_tip|field2">Specifies the field names from the current table to set them in the argument.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="cond1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="active">0</property> + <items> + <item translatable="yes" context="queryfilterdialog|cond1">=</item> + <item translatable="yes" context="queryfilterdialog|cond1"><></item> + <item translatable="yes" context="queryfilterdialog|cond1"><</item> + <item translatable="yes" context="queryfilterdialog|cond1"><=</item> + <item translatable="yes" context="queryfilterdialog|cond1">></item> + <item translatable="yes" context="queryfilterdialog|cond1">>=</item> + <item translatable="yes" context="queryfilterdialog|cond1">like</item> + <item translatable="yes" context="queryfilterdialog|cond1">not like</item> + <item translatable="yes" context="queryfilterdialog|cond1">null</item> + <item translatable="yes" context="queryfilterdialog|cond1">not null</item> + </items> + <child internal-child="accessible"> + <object class="AtkObject" id="cond1-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="queryfilterdialog|extended_tip|cond1">Specifies the comparative operators through which the entries in the Field name and Value fields can be linked.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - </packing> </child> - <child> - <object class="GtkComboBoxText" id="field3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="active">0</property> - <items> - <item translatable="yes" context="queryfilterdialog|field3">- none -</item> - </items> - <child internal-child="accessible"> - <object class="AtkObject" id="field3-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="queryfilterdialog|extended_tip|field3">Specifies the field names from the current table to set them in the argument.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="field2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="active">0</property> + <items> + <item translatable="yes" context="queryfilterdialog|field2">- none -</item> + </items> + <child internal-child="accessible"> + <object class="AtkObject" id="field2-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="queryfilterdialog|extended_tip|field2">Specifies the field names from the current table to set them in the argument.</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">3</property> - </packing> </child> - <child> - <object class="GtkComboBoxText" id="cond2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="active">0</property> - <child internal-child="accessible"> - <object class="AtkObject" id="cond2-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="queryfilterdialog|extended_tip|cond2">Specifies the comparative operators through which the entries in the Field name and Value fields can be linked.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="field3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="active">0</property> + <items> + <item translatable="yes" context="queryfilterdialog|field3">- none -</item> + </items> + <child internal-child="accessible"> + <object class="AtkObject" id="field3-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="queryfilterdialog|extended_tip|field3">Specifies the field names from the current table to set them in the argument.</property> </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">2</property> - </packing> </child> - <child> - <object class="GtkComboBoxText" id="cond3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="active">0</property> - <child internal-child="accessible"> - <object class="AtkObject" id="cond3-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="queryfilterdialog|extended_tip|cond3">Specifies the comparative operators through which the entries in the Field name and Value fields can be linked.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="cond2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="active">0</property> + <child internal-child="accessible"> + <object class="AtkObject" id="cond2-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="queryfilterdialog|extended_tip|cond2">Specifies the comparative operators through which the entries in the Field name and Value fields can be linked.</property> </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">3</property> - </packing> </child> - <child> - <object class="GtkLabel" id="label7"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="queryfilterdialog|label7">Value</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="cond3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="active">0</property> + <child internal-child="accessible"> + <object class="AtkObject" id="cond3-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="queryfilterdialog|extended_tip|cond3">Specifies the comparative operators through which the entries in the Field name and Value fields can be linked.</property> </object> - <packing> - <property name="left_attach">3</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkEntry" id="value1"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="value1-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="queryfilterdialog|extended_tip|value1">Specifies a value to filter the field.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label7"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="queryfilterdialog|label7">Value</property> + </object> + <packing> + <property name="left_attach">3</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="value1"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="value1-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="queryfilterdialog|extended_tip|value1">Specifies a value to filter the field.</property> </object> - <packing> - <property name="left_attach">3</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkEntry" id="value2"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="value2-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="queryfilterdialog|extended_tip|value2">Specifies a value to filter the field.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">3</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="value2"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="value2-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="queryfilterdialog|extended_tip|value2">Specifies a value to filter the field.</property> </object> - <packing> - <property name="left_attach">3</property> - <property name="top_attach">2</property> - </packing> </child> - <child> - <object class="GtkEntry" id="value3"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="value3-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="queryfilterdialog|extended_tip|value3">Specifies a value to filter the field.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">3</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="value3"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="value3-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="queryfilterdialog|extended_tip|value3">Specifies a value to filter the field.</property> </object> - <packing> - <property name="left_attach">3</property> - <property name="top_attach">3</property> - </packing> </child> - <child> - <object class="GtkComboBoxText" id="op2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="active">0</property> - <items> - <item translatable="yes" context="queryfilterdialog|op2">AND</item> - <item translatable="yes" context="queryfilterdialog|op2">OR</item> - </items> - <child internal-child="accessible"> - <object class="AtkObject" id="op2-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="queryfilterdialog|extended_tip|op2">For the following arguments, you can choose between the logical operators AND / OR.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">3</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="op2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="active">0</property> + <items> + <item translatable="yes" context="queryfilterdialog|op2">AND</item> + <item translatable="yes" context="queryfilterdialog|op2">OR</item> + </items> + <child internal-child="accessible"> + <object class="AtkObject" id="op2-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="queryfilterdialog|extended_tip|op2">For the following arguments, you can choose between the logical operators AND / OR.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> </child> - <child> - <object class="GtkComboBoxText" id="op3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="active">0</property> - <items> - <item translatable="yes" context="queryfilterdialog|op3">AND</item> - <item translatable="yes" context="queryfilterdialog|op3">OR</item> - </items> - <child internal-child="accessible"> - <object class="AtkObject" id="op3-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="queryfilterdialog|extended_tip|op3">For the following arguments, you can choose between the logical operators AND / OR.</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="op3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="active">0</property> + <items> + <item translatable="yes" context="queryfilterdialog|op3">AND</item> + <item translatable="yes" context="queryfilterdialog|op3">OR</item> + </items> + <child internal-child="accessible"> + <object class="AtkObject" id="op3-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="queryfilterdialog|extended_tip|op3">For the following arguments, you can choose between the logical operators AND / OR.</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> - </packing> - </child> - <child> - <placeholder/> </child> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <placeholder/> </child> </object> </child> diff --git a/dbaccess/uiconfig/ui/relationdialog.ui b/dbaccess/uiconfig/ui/relationdialog.ui index ea06bfe91742..e91f629b6c0e 100644 --- a/dbaccess/uiconfig/ui/relationdialog.ui +++ b/dbaccess/uiconfig/ui/relationdialog.ui @@ -91,43 +91,36 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment1"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid2"> <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> + <property name="column_spacing">12</property> + <property name="column_homogeneous">True</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid2"> + <object class="GtkComboBoxText" id="table1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="column_spacing">12</property> - <property name="column_homogeneous">True</property> - <child> - <object class="GtkComboBoxText" id="table1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="table2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="table2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> </child> </object> </child> @@ -154,19 +147,13 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment2"> + <object class="GtkBox" id="relations"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> - <child> - <object class="GtkBox" id="relations"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - </object> - </child> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> </object> </child> <child type="label"> @@ -199,83 +186,77 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment3"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid5"> <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> + <property name="row_spacing">6</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> + <child> + <object class="GtkRadioButton" id="addaction"> + <property name="label" translatable="yes" context="relationdialog|addaction">_No action</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="active">True</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid5"> + <object class="GtkRadioButton" id="addcascade"> + <property name="label" translatable="yes" context="relationdialog|addcascade">_Update cascade</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="row_spacing">6</property> - <child> - <object class="GtkRadioButton" id="addaction"> - <property name="label" translatable="yes" context="relationdialog|addaction">_No action</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="active">True</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="addcascade"> - <property name="label" translatable="yes" context="relationdialog|addcascade">_Update cascade</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <property name="group">addaction</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="addnull"> - <property name="label" translatable="yes" context="relationdialog|addnull">_Set NULL</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <property name="group">addaction</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="adddefault"> - <property name="label" translatable="yes" context="relationdialog|adddefault">Set _default</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <property name="group">addaction</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> - </packing> - </child> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <property name="group">addaction</property> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="addnull"> + <property name="label" translatable="yes" context="relationdialog|addnull">_Set NULL</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <property name="group">addaction</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="adddefault"> + <property name="label" translatable="yes" context="relationdialog|adddefault">Set _default</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <property name="group">addaction</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + </packing> </child> </object> </child> @@ -303,83 +284,77 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment4"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid6"> <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> + <property name="row_spacing">6</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> + <child> + <object class="GtkRadioButton" id="delaction"> + <property name="label" translatable="yes" context="relationdialog|delaction">_No action</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="active">True</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="delcascade"> + <property name="label" translatable="yes" context="relationdialog|delcascade">Delete _cascade</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <property name="group">delaction</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid6"> + <object class="GtkRadioButton" id="delnull"> + <property name="label" translatable="yes" context="relationdialog|delnull">_Set NULL</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="row_spacing">6</property> - <child> - <object class="GtkRadioButton" id="delaction"> - <property name="label" translatable="yes" context="relationdialog|delaction">_No action</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="active">True</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="delcascade"> - <property name="label" translatable="yes" context="relationdialog|delcascade">Delete _cascade</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <property name="group">delaction</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="delnull"> - <property name="label" translatable="yes" context="relationdialog|delnull">_Set NULL</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <property name="group">delaction</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="deldefault"> - <property name="label" translatable="yes" context="relationdialog|deldefault">Set _default</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <property name="group">delaction</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> - </packing> - </child> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <property name="group">delaction</property> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="deldefault"> + <property name="label" translatable="yes" context="relationdialog|deldefault">Set _default</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <property name="group">delaction</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + </packing> </child> </object> </child> diff --git a/dbaccess/uiconfig/ui/sortdialog.ui b/dbaccess/uiconfig/ui/sortdialog.ui index 67075cbfcf4e..c7ebd5071d7a 100644 --- a/dbaccess/uiconfig/ui/sortdialog.ui +++ b/dbaccess/uiconfig/ui/sortdialog.ui @@ -81,162 +81,156 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment2"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid2"> + <object class="GtkLabel" id="label2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkLabel" id="label2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="sortdialog|label2">Operator</property> - <property name="ellipsize">end</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="sortdialog|label3">and then</property> - <property name="ellipsize">end</property> - <property name="xalign">1</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label4"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="sortdialog|label4">and then</property> - <property name="ellipsize">end</property> - <property name="xalign">1</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label5"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="sortdialog|label5">Field name</property> - <property name="ellipsize">end</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label6"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="sortdialog|label6">Order</property> - <property name="ellipsize">end</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="field1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="value1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <items> - <item translatable="yes" context="sortdialog|value1">ascending</item> - <item translatable="yes" context="sortdialog|value1">descending</item> - </items> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="field2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="field3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">3</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="value2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <items> - <item translatable="yes" context="sortdialog|value2">ascending</item> - <item translatable="yes" context="sortdialog|value2">descending</item> - </items> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="value3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <items> - <item translatable="yes" context="sortdialog|value3">ascending</item> - <item translatable="yes" context="sortdialog|value3">descending</item> - </items> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">3</property> - </packing> - </child> - <child> - <placeholder/> - </child> + <property name="label" translatable="yes" context="sortdialog|label2">Operator</property> + <property name="ellipsize">end</property> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="sortdialog|label3">and then</property> + <property name="ellipsize">end</property> + <property name="xalign">1</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="sortdialog|label4">and then</property> + <property name="ellipsize">end</property> + <property name="xalign">1</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label5"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="sortdialog|label5">Field name</property> + <property name="ellipsize">end</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label6"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="sortdialog|label6">Order</property> + <property name="ellipsize">end</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="field1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="value1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <items> + <item translatable="yes" context="sortdialog|value1">ascending</item> + <item translatable="yes" context="sortdialog|value1">descending</item> + </items> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="field2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="field3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="value2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <items> + <item translatable="yes" context="sortdialog|value2">ascending</item> + <item translatable="yes" context="sortdialog|value2">descending</item> + </items> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="value3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <items> + <item translatable="yes" context="sortdialog|value3">ascending</item> + <item translatable="yes" context="sortdialog|value3">descending</item> + </items> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <placeholder/> </child> </object> </child> diff --git a/dbaccess/uiconfig/ui/tablesfilterpage.ui b/dbaccess/uiconfig/ui/tablesfilterpage.ui index 138979863035..1d7a082c3be4 100644 --- a/dbaccess/uiconfig/ui/tablesfilterpage.ui +++ b/dbaccess/uiconfig/ui/tablesfilterpage.ui @@ -28,94 +28,86 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment4"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid10"> <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> + <property name="row_spacing">6</property> + <property name="column_spacing">18</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid10"> + <object class="GtkLabel" id="label2"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="label" translatable="yes" context="tablesfilterpage|label2">Mark the tables that should be visible for the applications.</property> + <property name="wrap">True</property> + <property name="max_width_chars">56</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkScrolledWindow"> + <property name="visible">True</property> + <property name="can_focus">True</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="row_spacing">6</property> - <property name="column_spacing">18</property> - <child> - <object class="GtkLabel" id="label2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="tablesfilterpage|label2">Mark the tables that should be visible for the applications.</property> - <property name="wrap">True</property> - <property name="max_width_chars">56</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> + <property name="shadow_type">in</property> <child> - <object class="GtkScrolledWindow"> + <object class="GtkTreeView" id="treeview"> + <property name="width_request">-1</property> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="receives_default">True</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="shadow_type">in</property> + <property name="model">liststore2</property> + <property name="headers_visible">False</property> + <property name="search_column">2</property> + <property name="enable_tree_lines">True</property> + <property name="show_expanders">True</property> + <child internal-child="selection"> + <object class="GtkTreeSelection" id="Macro Library List-selection2"/> + </child> <child> - <object class="GtkTreeView" id="treeview"> - <property name="width_request">-1</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="model">liststore2</property> - <property name="headers_visible">False</property> - <property name="search_column">2</property> - <property name="enable_tree_lines">True</property> - <property name="show_expanders">True</property> - <child internal-child="selection"> - <object class="GtkTreeSelection" id="Macro Library List-selection2"/> + <object class="GtkTreeViewColumn" id="treeviewcolumn8"> + <property name="spacing">6</property> + <child> + <object class="GtkCellRendererPixbuf" id="cellrenderertext5"/> + <attributes> + <attribute name="pixbuf">0</attribute> + </attributes> + </child> + <child> + <object class="GtkCellRendererToggle" id="cellrenderer5"/> + <attributes> + <attribute name="visible">4</attribute> + <attribute name="active">1</attribute> + <attribute name="inconsistent">5</attribute> + </attributes> </child> <child> - <object class="GtkTreeViewColumn" id="treeviewcolumn8"> - <property name="spacing">6</property> - <child> - <object class="GtkCellRendererPixbuf" id="cellrenderertext5"/> - <attributes> - <attribute name="pixbuf">0</attribute> - </attributes> - </child> - <child> - <object class="GtkCellRendererToggle" id="cellrenderer5"/> - <attributes> - <attribute name="visible">4</attribute> - <attribute name="active">1</attribute> - <attribute name="inconsistent">5</attribute> - </attributes> - </child> - <child> - <object class="GtkCellRendererText" id="cellrenderertext6"/> - <attributes> - <attribute name="text">2</attribute> - <attribute name="weight">6</attribute> - </attributes> - </child> - </object> + <object class="GtkCellRendererText" id="cellrenderertext6"/> + <attributes> + <attribute name="text">2</attribute> + <attribute name="weight">6</attribute> + </attributes> </child> </object> </child> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> </child> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> </child> </object> </child> diff --git a/dbaccess/uiconfig/ui/textpage.ui b/dbaccess/uiconfig/ui/textpage.ui index 20ec6e3ac16c..92ba08d4dd4e 100644 --- a/dbaccess/uiconfig/ui/textpage.ui +++ b/dbaccess/uiconfig/ui/textpage.ui @@ -19,97 +19,90 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment1"> + <!-- n-columns=1 n-rows=1 --> + <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="top_padding">6</property> - <property name="left_padding">12</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid1"> + <object class="GtkRadioButton" id="textfile"> + <property name="label" translatable="yes" context="textpage|textfile">Plain text files (*.txt)</property> <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="active">True</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="width">3</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="csvfile"> + <property name="label" translatable="yes" context="textpage|csvfile">Comma-separated value files (*.csv)</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <property name="group">textfile</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + <property name="width">3</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="custom"> + <property name="label" translatable="yes" context="textpage|custom">Custom:</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <property name="group">textfile</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="extension"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="vexpand">True</property> + <property name="activates_default">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="example"> + <property name="visible">True</property> + <property name="sensitive">False</property> <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkRadioButton" id="textfile"> - <property name="label" translatable="yes" context="textpage|textfile">Plain text files (*.txt)</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="active">True</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - <property name="width">3</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="csvfile"> - <property name="label" translatable="yes" context="textpage|csvfile">Comma-separated value files (*.csv)</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <property name="group">textfile</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - <property name="width">3</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="custom"> - <property name="label" translatable="yes" context="textpage|custom">Custom:</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <property name="group">textfile</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="extension"> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">True</property> - <property name="vexpand">True</property> - <property name="activates_default">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="example"> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="textpage|example">Custom: *.abc</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">2</property> - </packing> - </child> + <property name="label" translatable="yes" context="textpage|example">Custom: *.abc</property> </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">2</property> + </packing> </child> </object> </child> @@ -139,178 +132,171 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment2"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid2"> <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> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> + <child> + <object class="GtkCheckButton" id="containsheaders"> + <property name="label" translatable="yes" context="textpage|containsheaders">_Text contains headers</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="hexpand">True</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="active">True</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">4</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="fieldlabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="textpage|fieldlabel">Field separator:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">fieldseparator</property> + <property name="xalign">1</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid2"> + <object class="GtkLabel" id="textlabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="textpage|textlabel">Text separator:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">textseparator</property> + <property name="xalign">1</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="decimallabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="textpage|decimallabel">Decimal separator:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">decimalseparator</property> + <property name="xalign">1</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="thousandslabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="textpage|thousandslabel">Thousands separator:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">thousandsseparator</property> + <property name="xalign">1</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="fieldseparator"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkCheckButton" id="containsheaders"> - <property name="label" translatable="yes" context="textpage|containsheaders">_Text contains headers</property> - <property name="visible">True</property> + <property name="has_entry">True</property> + <child internal-child="entry"> + <object class="GtkEntry" id="comboboxtext-entry2"> <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="hexpand">True</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="active">True</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">4</property> - <property name="width">2</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="fieldlabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="textpage|fieldlabel">Field separator:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">fieldseparator</property> - <property name="xalign">1</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="textlabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="textpage|textlabel">Text separator:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">textseparator</property> - <property name="xalign">1</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="decimallabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="textpage|decimallabel">Decimal separator:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">decimalseparator</property> - <property name="xalign">1</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="thousandslabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="textpage|thousandslabel">Thousands separator:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">thousandsseparator</property> - <property name="xalign">1</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="fieldseparator"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="has_entry">True</property> - <child internal-child="entry"> - <object class="GtkEntry" id="comboboxtext-entry2"> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - </object> - </child> + <property name="activates_default">True</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> </child> - <child> - <object class="GtkComboBoxText" id="textseparator"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="has_entry">True</property> - <child internal-child="entry"> - <object class="GtkEntry" id="comboboxtext-entry4"> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="textseparator"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="has_entry">True</property> + <child internal-child="entry"> + <object class="GtkEntry" id="comboboxtext-entry4"> + <property name="can_focus">True</property> + <property name="activates_default">True</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkComboBoxText" id="decimalseparator"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="has_entry">True</property> - <items> - <item translatable="yes" context="textpage|decimalseparator">.</item> - <item translatable="yes" context="textpage|decimalseparator">,</item> - <item translatable="yes" context="textpage|decimalseparator">;</item> - <item translatable="yes" context="textpage|decimalseparator">:</item> - </items> - <child internal-child="entry"> - <object class="GtkEntry" id="comboboxtext-entry6"> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="decimalseparator"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="has_entry">True</property> + <items> + <item translatable="yes" context="textpage|decimalseparator">.</item> + <item translatable="yes" context="textpage|decimalseparator">,</item> + <item translatable="yes" context="textpage|decimalseparator">;</item> + <item translatable="yes" context="textpage|decimalseparator">:</item> + </items> + <child internal-child="entry"> + <object class="GtkEntry" id="comboboxtext-entry6"> + <property name="can_focus">True</property> + <property name="activates_default">True</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - </packing> </child> - <child> - <object class="GtkComboBoxText" id="thousandsseparator"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="has_entry">True</property> - <items> - <item translatable="yes" context="textpage|thousandsseparator">.</item> - <item translatable="yes" context="textpage|thousandsseparator">,</item> - </items> - <child internal-child="entry"> - <object class="GtkEntry" id="comboboxtext-entry8"> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - </object> - </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="thousandsseparator"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="has_entry">True</property> + <items> + <item translatable="yes" context="textpage|thousandsseparator">.</item> + <item translatable="yes" context="textpage|thousandsseparator">,</item> + </items> + <child internal-child="entry"> + <object class="GtkEntry" id="comboboxtext-entry8"> + <property name="can_focus">True</property> + <property name="activates_default">True</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">3</property> - </packing> </child> </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">3</property> + </packing> </child> </object> </child> @@ -339,49 +325,41 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment3"> + <object class="GtkBox" id="box1"> <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> + <property name="spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</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="label" translatable="yes" context="textpage|charsetlabel">_Character set:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">charset</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> <child> - <object class="GtkBox" id="box1"> + <object class="GtkComboBoxText" id="charset"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="vexpand">True</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="label" translatable="yes" context="textpage|charsetlabel">_Character set:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">charset</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="charset"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - </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> </object> </child> diff --git a/dbaccess/uiconfig/ui/titlewindow.ui b/dbaccess/uiconfig/ui/titlewindow.ui index 6cafad098a8f..a622cac68587 100644 --- a/dbaccess/uiconfig/ui/titlewindow.ui +++ b/dbaccess/uiconfig/ui/titlewindow.ui @@ -35,22 +35,16 @@ <property name="margin-start">1</property> <property name="margin-end">1</property> <child> - <object class="GtkAlignment"> + <object class="GtkLabel" id="title"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="top_padding">6</property> - <property name="bottom_padding">6</property> - <property name="left_padding">12</property> - <child> - <object class="GtkLabel" id="title"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> - </object> - </child> + <property name="xalign">0</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> + <property name="margin-bottom">6</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> </object> <packing> <property name="left_attach">0</property> diff --git a/dbaccess/uiconfig/ui/typeselectpage.ui b/dbaccess/uiconfig/ui/typeselectpage.ui index 208c8abf932d..a041984a3948 100644 --- a/dbaccess/uiconfig/ui/typeselectpage.ui +++ b/dbaccess/uiconfig/ui/typeselectpage.ui @@ -89,24 +89,16 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment1"> + <object class="GtkBox" id="control_container"> <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> + <property name="orientation">vertical</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <object class="GtkBox" id="control_container"> - <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> - <child> - <placeholder/> - </child> - </object> + <placeholder/> </child> </object> </child> @@ -135,61 +127,55 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment2"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid2"> <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> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid2"> + <object class="GtkLabel" id="autolabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="row_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="label" translatable="yes" context="typeselectpage|autolabel">Lines (ma_x.):</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">auto</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="autobutton"> - <property name="label" translatable="yes" context="typeselectpage|autobutton">_Auto</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="auto"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <property name="adjustment">adjustment1</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> + <property name="halign">start</property> + <property name="label" translatable="yes" context="typeselectpage|autolabel">Lines (ma_x.):</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">auto</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="autobutton"> + <property name="label" translatable="yes" context="typeselectpage|autobutton">_Auto</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="auto"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + <property name="adjustment">adjustment1</property> </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> </child> </object> </child> diff --git a/dbaccess/uiconfig/ui/useradminpage.ui b/dbaccess/uiconfig/ui/useradminpage.ui index 6c5576369804..ac425dc5f7f6 100644 --- a/dbaccess/uiconfig/ui/useradminpage.ui +++ b/dbaccess/uiconfig/ui/useradminpage.ui @@ -18,53 +18,29 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment1"> + <object class="GtkBox" id="box1"> <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> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <object class="GtkBox" id="box1"> + <object class="GtkBox" id="box2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> + <property name="spacing">12</property> <child> - <object class="GtkBox" id="box2"> + <object class="GtkLabel" id="label3"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">start</property> <property name="hexpand">True</property> - <property name="spacing">12</property> - <child> - <object class="GtkLabel" id="label3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="hexpand">True</property> - <property name="label" translatable="yes" context="useradminpage|label3">Us_er:</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="user"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> + <property name="label" translatable="yes" context="useradminpage|label3">Us_er:</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> </object> <packing> <property name="expand">False</property> @@ -73,53 +49,10 @@ </packing> </child> <child> - <object class="GtkBox" id="box3"> + <object class="GtkComboBoxText" id="user"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="spacing">12</property> - <child> - <object class="GtkButton" id="add"> - <property name="label" translatable="yes" context="useradminpage|add">_Add User...</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="changepass"> - <property name="label" translatable="yes" context="useradminpage|changepass">Change _Password...</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkButton" id="delete"> - <property name="label" translatable="yes" context="useradminpage|delete">_Delete User...</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> </object> <packing> <property name="expand">False</property> @@ -128,6 +61,66 @@ </packing> </child> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <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">12</property> + <child> + <object class="GtkButton" id="add"> + <property name="label" translatable="yes" context="useradminpage|add">_Add User...</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="changepass"> + <property name="label" translatable="yes" context="useradminpage|changepass">Change _Password...</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="delete"> + <property name="label" translatable="yes" context="useradminpage|delete">_Delete User...</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> </child> </object> </child> @@ -157,23 +150,17 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment"> - <property name="height_request">150</property> - <property name="visible">True</property> - <property name="can_focus">False</property> + <object class="GtkBox" id="table"> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="visible">True</property> + <property name="height_request">150</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <object class="GtkBox" id="table"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <child> - <placeholder/> - </child> - </object> + <placeholder/> </child> </object> </child> diff --git a/dbaccess/uiconfig/ui/userdetailspage.ui b/dbaccess/uiconfig/ui/userdetailspage.ui index 5a92f32defb1..81812e9f2125 100644 --- a/dbaccess/uiconfig/ui/userdetailspage.ui +++ b/dbaccess/uiconfig/ui/userdetailspage.ui @@ -23,119 +23,113 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment2"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid1"> <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> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid1"> + <object class="GtkLabel" id="hostnameft"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkLabel" id="hostnameft"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes" context="userdetailspage|hostnameft">_Host name:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">hostname</property> - <property name="ellipsize">end</property> - <property name="xalign">1</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="portnumberft"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes" context="userdetailspage|portnumberft">_Port number:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">portnumber</property> - <property name="xalign">1</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="hostname"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="portnumber"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <property name="adjustment">adjustment1</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="usecatalog"> - <property name="label" translatable="yes" context="userdetailspage|usecatalog">_Use catalog</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</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">3</property> - <property name="width">2</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="optionslabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes" context="userdetailspage|optionslabel">_Driver settings:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">options</property> - <property name="xalign">1</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="options"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - </packing> - </child> + <property name="halign">start</property> + <property name="label" translatable="yes" context="userdetailspage|hostnameft">_Host name:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">hostname</property> + <property name="ellipsize">end</property> + <property name="xalign">1</property> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="portnumberft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes" context="userdetailspage|portnumberft">_Port number:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">portnumber</property> + <property name="xalign">1</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="hostname"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="portnumber"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + <property name="adjustment">adjustment1</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="usecatalog"> + <property name="label" translatable="yes" context="userdetailspage|usecatalog">_Use catalog</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</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">3</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="optionslabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes" context="userdetailspage|optionslabel">_Driver settings:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">options</property> + <property name="xalign">1</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="options"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + </packing> </child> </object> </child> @@ -164,46 +158,39 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment1"> + <object class="GtkBox" id="box1"> <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> + <property name="spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <object class="GtkBox" id="box1"> + <object class="GtkLabel" id="charsetlabel"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="label" translatable="yes" context="userdetailspage|charsetlabel">_Character set:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">charset</property> + <property name="xalign">1</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="charset"> + <property name="visible">True</property> + <property name="can_focus">True</property> <property name="hexpand">True</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" context="userdetailspage|charsetlabel">_Character set:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">charset</property> - <property name="xalign">1</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="charset"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - </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> </object> </child> |