[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - 2 commits - cui/uiconfig
andreas kainz (via logerrit)
logerrit at kemper.freedesktop.org
Wed Nov 20 07:50:40 UTC 2019
cui/uiconfig/ui/optlingupage.ui | 466 ++++++++++++++++++++--------------------
cui/uiconfig/ui/optuserpage.ui | 66 ++++-
2 files changed, 284 insertions(+), 248 deletions(-)
New commits:
commit ea9d094a086d2d8ee73e39d1c5a53c848a2a546b
Author: andreas kainz <kainz.a at gmail.com>
AuthorDate: Mon Nov 18 21:57:29 2019 +0100
Commit: Heiko Tietze <heiko.tietze at documentfoundation.org>
CommitDate: Wed Nov 20 08:49:56 2019 +0100
Options - Language Aid Dialog make usefull section names
Change-Id: I1afc30d7d1a52e8b862bcbfb3632a193ee3253e6
Reviewed-on: https://gerrit.libreoffice.org/83129
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kainz.a at gmail.com>
(cherry picked from commit fa1fa095039f0d4acdab6cf689a6637cb3019054)
Reviewed-on: https://gerrit.libreoffice.org/83235
Reviewed-by: Heiko Tietze <heiko.tietze at documentfoundation.org>
diff --git a/cui/uiconfig/ui/optlingupage.ui b/cui/uiconfig/ui/optlingupage.ui
index 215c8f67549c..114bfde51ca2 100644
--- a/cui/uiconfig/ui/optlingupage.ui
+++ b/cui/uiconfig/ui/optlingupage.ui
@@ -73,7 +73,6 @@
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="row_spacing">12</property>
<property name="column_spacing">12</property>
<child>
<object class="GtkGrid" id="grid1">
@@ -81,23 +80,8 @@
<property name="can_focus">False</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="lingumodulesft">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="optlingupage|lingumodulesft">_Available language modules:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">lingumodules</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="GtkScrolledWindow">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -149,7 +133,7 @@
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">1</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
@@ -168,284 +152,303 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="top_attach">1</property>
+ <property name="top_attach">0</property>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
</packing>
</child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="lingumodulesft">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes" context="optlingupage|lingumodulesft">_Available language modules</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">lingumodules</property>
+ <property name="xalign">0</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment">
+ <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="GtkGrid" id="grid3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="column_spacing">12</property>
<child>
- <object class="GtkGrid" id="grid3">
+ <object class="GtkScrolledWindow">
<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="row_spacing">6</property>
- <property name="column_spacing">12</property>
+ <property name="shadow_type">in</property>
<child>
- <object class="GtkLabel" id="lingudictsft">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="optlingupage|lingudictsft">_User-defined dictionaries:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">lingudicts</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="GtkScrolledWindow">
+ <object class="GtkTreeView" id="lingudicts">
<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">liststore3</property>
+ <property name="headers_visible">False</property>
+ <property name="search_column">1</property>
+ <property name="show_expanders">False</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="Macro Library List-selection1"/>
+ </child>
<child>
- <object class="GtkTreeView" id="lingudicts">
- <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">liststore3</property>
- <property name="headers_visible">False</property>
- <property name="search_column">1</property>
- <property name="show_expanders">False</property>
- <child internal-child="selection">
- <object class="GtkTreeSelection" id="Macro Library List-selection1"/>
- </child>
- <child>
- <object class="GtkTreeViewColumn" id="treeviewcolumn44">
- <property name="resizable">True</property>
- <property name="spacing">6</property>
- <property name="alignment">0.5</property>
- <child>
- <object class="GtkCellRendererToggle" id="cellrenderer55"/>
- <attributes>
- <attribute name="visible">3</attribute>
- <attribute name="active">0</attribute>
- </attributes>
- </child>
- </object>
- </child>
+ <object class="GtkTreeViewColumn" id="treeviewcolumn44">
+ <property name="resizable">True</property>
+ <property name="spacing">6</property>
+ <property name="alignment">0.5</property>
<child>
- <object class="GtkTreeViewColumn" id="treeviewcolumn55">
- <property name="resizable">True</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkCellRendererText" id="cellrenderer44"/>
- <attributes>
- <attribute name="text">1</attribute>
- </attributes>
- </child>
- </object>
+ <object class="GtkCellRendererToggle" id="cellrenderer55"/>
+ <attributes>
+ <attribute name="visible">3</attribute>
+ <attribute name="active">0</attribute>
+ </attributes>
</child>
</object>
</child>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkButtonBox" id="buttonbox1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <property name="layout_style">start</property>
- <child>
- <object class="GtkButton" id="lingudictsnew">
- <property name="label" translatable="yes" context="optlingupage|lingudictsnew">_New...</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="lingudictsedit">
- <property name="label" translatable="yes" context="optlingupage|lingudictsedit">Ed_it...</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_underline">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="lingudictsedit-atkobject">
- <property name="AtkObject::accessible-name" translatable="yes" context="optlingupage|lingudictsedit-atkobject">Edit User-defined dictionaries</property>
- </object>
+ <object class="GtkTreeViewColumn" id="treeviewcolumn55">
+ <property name="resizable">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkCellRendererText" id="cellrenderer44"/>
+ <attributes>
+ <attribute name="text">1</attribute>
+ </attributes>
</child>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="lingudictsdelete">
- <property name="label" translatable="yes" context="optlingupage|lingudictsdelete">_Delete</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="left_attach">1</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <placeholder/>
</child>
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">1</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
- <object class="GtkGrid" id="grid4">
+ <object class="GtkButtonBox" id="buttonbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">12</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <property name="layout_style">start</property>
+ <child>
+ <object class="GtkButton" id="lingudictsnew">
+ <property name="label" translatable="yes" context="optlingupage|lingudictsnew">_New...</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="GtkLabel" id="label4">
+ <object class="GtkButton" id="lingudictsedit">
+ <property name="label" translatable="yes" context="optlingupage|lingudictsedit">Ed_it...</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="optlingupage|label4">_Options:</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">linguoptions</property>
- <property name="xalign">0</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="lingudictsedit-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes" context="optlingupage|lingudictsedit-atkobject">Edit User-defined dictionaries</property>
+ </object>
+ </child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
- <object class="GtkLinkButton" id="moredictslink">
- <property name="label" translatable="yes" context="optlingupage|moredictslink">Get more dictionaries online...</property>
+ <object class="GtkButton" id="lingudictsdelete">
+ <property name="label" translatable="yes" context="optlingupage|lingudictsdelete">_Delete</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="has_tooltip">True</property>
- <property name="relief">none</property>
- <property name="xalign">0</property>
- <property name="uri">https://extensions.libreoffice.org/dictionaries/</property>
+ <property name="use_underline">True</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
- <property name="width">2</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
</packing>
</child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="lingudictsft">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes" context="optlingupage|lingudictsft">_User-defined dictionaries</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">lingudicts</property>
+ <property name="xalign">0</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment">
+ <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="GtkGrid" id="grid4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="row_spacing">3</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkLinkButton" id="moredictslink">
+ <property name="label" translatable="yes" context="optlingupage|moredictslink">Get more dictionaries online...</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="relief">none</property>
+ <property name="xalign">0</property>
+ <property name="uri">https://extensions.libreoffice.org/dictionaries/</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="GtkScrolledWindow">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="shadow_type">in</property>
<child>
- <object class="GtkScrolledWindow">
+ <object class="GtkTreeView" id="linguoptions">
<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">liststore4</property>
+ <property name="headers_visible">False</property>
+ <property name="search_column">1</property>
+ <property name="show_expanders">False</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="Macro Library List-selection3"/>
+ </child>
<child>
- <object class="GtkTreeView" id="linguoptions">
- <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">liststore4</property>
- <property name="headers_visible">False</property>
- <property name="search_column">1</property>
- <property name="show_expanders">False</property>
- <child internal-child="selection">
- <object class="GtkTreeSelection" id="Macro Library List-selection3"/>
- </child>
+ <object class="GtkTreeViewColumn" id="treeviewcolumn444">
+ <property name="resizable">True</property>
+ <property name="spacing">6</property>
+ <property name="alignment">0.5</property>
<child>
- <object class="GtkTreeViewColumn" id="treeviewcolumn444">
- <property name="resizable">True</property>
- <property name="spacing">6</property>
- <property name="alignment">0.5</property>
- <child>
- <object class="GtkCellRendererToggle" id="cellrenderer555"/>
- <attributes>
- <attribute name="visible">3</attribute>
- <attribute name="active">0</attribute>
- </attributes>
- </child>
- </object>
+ <object class="GtkCellRendererToggle" id="cellrenderer555"/>
+ <attributes>
+ <attribute name="visible">3</attribute>
+ <attribute name="active">0</attribute>
+ </attributes>
</child>
+ </object>
+ </child>
+ <child>
+ <object class="GtkTreeViewColumn" id="treeviewcolumn555">
+ <property name="resizable">True</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkTreeViewColumn" id="treeviewcolumn555">
- <property name="resizable">True</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkCellRendererText" id="cellrenderer444"/>
- <attributes>
- <attribute name="text">1</attribute>
- </attributes>
- </child>
- </object>
+ <object class="GtkCellRendererText" id="cellrenderer444"/>
+ <attributes>
+ <attribute name="text">1</attribute>
+ </attributes>
</child>
</object>
</child>
</object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- </packing>
</child>
- <child>
- <object class="GtkButton" id="linguoptionsedit">
- <property name="label" translatable="yes" context="optlingupage|linguoptionsedit">Edi_t...</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="valign">start</property>
- <property name="use_underline">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="linguoptionsedit-atkobject">
- <property name="AtkObject::accessible-name" translatable="yes" context="optlingupage|linguoptionsedit-atkobject">Edit Options</property>
- </object>
- </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="linguoptionsedit">
+ <property name="label" translatable="yes" context="optlingupage|linguoptionsedit">Edi_t...</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="valign">start</property>
+ <property name="use_underline">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="linguoptionsedit-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes" context="optlingupage|linguoptionsedit-atkobject">Edit Options</property>
</object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <placeholder/>
</child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
</packing>
</child>
</object>
@@ -453,10 +456,13 @@
</object>
</child>
<child type="label">
- <object class="GtkLabel" id="label1">
+ <object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes" context="optlingupage|label1">Writing Aids</property>
+ <property name="label" translatable="yes" context="optlingupage|label4">_Options</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">linguoptions</property>
+ <property name="xalign">0</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -465,7 +471,7 @@
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">0</property>
+ <property name="top_attach">2</property>
</packing>
</child>
</object>
commit 4d7a66f24dfbe4b97f88dd79b020025ebcd48f1c
Author: andreas kainz <kainz.a at gmail.com>
AuthorDate: Mon Nov 18 21:24:31 2019 +0100
Commit: Heiko Tietze <heiko.tietze at documentfoundation.org>
CommitDate: Wed Nov 20 08:49:38 2019 +0100
Options - User Data Dialog labels left align
Change-Id: If18abdb3e6d23ada149a9cfc7b2744db9ec3b5f8
Reviewed-on: https://gerrit.libreoffice.org/83124
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kainz.a at gmail.com>
(cherry picked from commit ec93706a9eea072e25f5caad47505cb5293e7071)
Reviewed-on: https://gerrit.libreoffice.org/83247
Reviewed-by: Heiko Tietze <heiko.tietze at documentfoundation.org>
diff --git a/cui/uiconfig/ui/optuserpage.ui b/cui/uiconfig/ui/optuserpage.ui
index 24616760fbb9..e770410c04b1 100644
--- a/cui/uiconfig/ui/optuserpage.ui
+++ b/cui/uiconfig/ui/optuserpage.ui
@@ -7,11 +7,11 @@
<property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="orientation">vertical</property>
+ <property name="spacing">12</property>
<child>
<object class="GtkFrame" id="frame1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="border_width">6</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
@@ -25,15 +25,16 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="row_spacing">6</property>
- <property name="column_spacing">12</property>
+ <property name="column_spacing">6</property>
<child>
<object class="GtkLabel" id="companyft">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
- <property name="halign">end</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes" context="optuserpage|companyft">_Company:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">company</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -44,10 +45,11 @@
<object class="GtkLabel" id="nameft">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
- <property name="halign">end</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes" context="optuserpage|nameft">First/last _name/initials:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">firstname</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -58,10 +60,11 @@
<object class="GtkLabel" id="streetft">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
- <property name="halign">end</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes" context="optuserpage|streetft">_Street:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">street</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -72,10 +75,11 @@
<object class="GtkLabel" id="cityft">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
- <property name="halign">end</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes" context="optuserpage|cityft">City/state/_zip:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">city</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -86,10 +90,11 @@
<object class="GtkLabel" id="countryft">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
- <property name="halign">end</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes" context="optuserpage|countryft">Country/re_gion:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">country</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -100,10 +105,11 @@
<object class="GtkLabel" id="titleft">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
- <property name="halign">end</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes" context="optuserpage|titleft">_Title/position:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">title</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -114,10 +120,11 @@
<object class="GtkLabel" id="phoneft">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
- <property name="halign">end</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes" context="optuserpage|phoneft">Telephone (home/_work):</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">home</property>
+ <property name="xalign">0</property>
<child internal-child="accessible">
<object class="AtkObject" id="phoneft-atkobject">
<property name="AtkObject::accessible-description" translatable="yes" context="phoneft-atkobject">Home telephone number</property>
@@ -133,10 +140,11 @@
<object class="GtkLabel" id="faxft">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
- <property name="halign">end</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes" context="optuserpage|faxft">Fa_x/email:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">fax</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -435,10 +443,11 @@
<object class="GtkLabel" id="rusnameft">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
- <property name="halign">end</property>
- <property name="label" translatable="yes" context="optuserpage|rusnameft">Last name/first _name/father’s name/initials:</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes" context="optuserpage|rusnameft">Last/first/father’s _name/initials:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">ruslastname</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -532,10 +541,11 @@
<object class="GtkLabel" id="eastnameft">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
- <property name="halign">end</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes" context="optuserpage|eastnameft">Last/first _name/initials:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">eastlastname</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -611,10 +621,11 @@
<object class="GtkLabel" id="russtreetft">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
- <property name="halign">end</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes" context="optuserpage|russtreetft">_Street/apartment number:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">russtreet</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -672,10 +683,11 @@
<object class="GtkLabel" id="icityft">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
- <property name="halign">end</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes" context="optuserpage|icityft">_Zip/city:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">izip</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -842,15 +854,15 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="row_spacing">6</property>
- <property name="column_spacing">12</property>
+ <property name="column_spacing">6</property>
<child>
<object class="GtkLabel" id="signingkeylabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="halign">end</property>
<property name="label" translatable="yes" context="optuserpage|signingkeylabel">OpenPGP signing key:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">signingkey</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -861,10 +873,10 @@
<object class="GtkLabel" id="encryptionkeylabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="halign">end</property>
<property name="label" translatable="yes" context="optuserpage|encryptionkeylabel">OpenPGP encryption key:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">encryptionkey</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -940,4 +952,22 @@
</packing>
</child>
</object>
+ <object class="GtkSizeGroup" id="sizegroupLabel">
+ <widgets>
+ <widget name="companyft"/>
+ <widget name="nameft"/>
+ <widget name="streetft"/>
+ <widget name="cityft"/>
+ <widget name="countryft"/>
+ <widget name="titleft"/>
+ <widget name="phoneft"/>
+ <widget name="faxft"/>
+ <widget name="rusnameft"/>
+ <widget name="eastnameft"/>
+ <widget name="russtreetft"/>
+ <widget name="icityft"/>
+ <widget name="signingkeylabel"/>
+ <widget name="encryptionkeylabel"/>
+ </widgets>
+ </object>
</interface>
More information about the Libreoffice-commits
mailing list