cui/uiconfig/ui/optuserpage.ui | 1124 ++++++++++++++++++++--------------------- 1 file changed, 562 insertions(+), 562 deletions(-)
New commits: commit 39c534e2ef85622c5e2463fbd6c2b8be2298d209 Author: Michael Weghorn <[email protected]> AuthorDate: Mon Oct 6 12:40:40 2025 +0200 Commit: Michael Weghorn <[email protected]> CommitDate: Mon Oct 6 17:18:08 2025 +0200 tdf#130857 Define widgets in User Data options page in order Switch the order in which the widgets in the .ui file are defined so that the order matches the visual appearance and logical order, which makes sure that tab focus order with the Qt-based VCL plugins is correct as well when using native Qt widgets (SAL_VCL_QT_USE_WELDED_WIDGETS=1), where focus order is (by default) based on widget creation order. Besides being used in "Tools" -> "Options" -> "LibreOfficeDev" -> "User Data", this is also used in a standalone dialog that can be triggered as follows: * start Writer * "Insert" -> "Field" -> "More Fields" * in the "Document" tab, select "Author" and "Name", then "Insert" and close the dialog * double-click on the newly inserted field to open the "Edit Fields" dialog * click on the "Edit" button (None of the two use cases are using native Qt widgets yet. Incorrect focus order was seen in a WIP branch experimenting with adding support for the the standalone dialog.) Change-Id: I0f360f045d3f567f965d24316298bcf4e0194b5b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/191959 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/cui/uiconfig/ui/optuserpage.ui b/cui/uiconfig/ui/optuserpage.ui index 88ec3244f89f..794e173d33cd 100644 --- a/cui/uiconfig/ui/optuserpage.ui +++ b/cui/uiconfig/ui/optuserpage.ui @@ -34,128 +34,90 @@ <property name="row-spacing">6</property> <property name="column-spacing">6</property> <child> - <object class="GtkLabel" id="companyft"> + <object class="GtkImage" id="lockcompanyft"> <property name="can-focus">False</property> <property name="no-show-all">True</property> - <property name="halign">start</property> - <property name="label" translatable="yes" context="optuserpage|companyft">Co_mpany:</property> - <property name="use-underline">True</property> - <property name="mnemonic-widget">company</property> - <property name="xalign">0</property> + <property name="halign">center</property> + <property name="valign">center</property> + <property name="icon-name">res/lock.png</property> </object> <packing> - <property name="left-attach">1</property> + <property name="left-attach">0</property> <property name="top-attach">0</property> </packing> </child> <child> - <object class="GtkLabel" id="nameft"> - <property name="can-focus">False</property> - <property name="no-show-all">True</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">1</property> - <property name="top-attach">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="streetft"> - <property name="can-focus">False</property> - <property name="no-show-all">True</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">1</property> - <property name="top-attach">4</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="cityft"> - <property name="can-focus">False</property> - <property name="no-show-all">True</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">1</property> - <property name="top-attach">7</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="countryft"> + <object class="GtkLabel" id="companyft"> <property name="can-focus">False</property> <property name="no-show-all">True</property> <property name="halign">start</property> - <property name="label" translatable="yes" context="optuserpage|countryft">Country/re_gion:</property> + <property name="label" translatable="yes" context="optuserpage|companyft">Co_mpany:</property> <property name="use-underline">True</property> - <property name="mnemonic-widget">country</property> + <property name="mnemonic-widget">company</property> <property name="xalign">0</property> </object> <packing> <property name="left-attach">1</property> - <property name="top-attach">8</property> + <property name="top-attach">0</property> </packing> </child> <child> - <object class="GtkLabel" id="titleft"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid13"> <property name="can-focus">False</property> <property name="no-show-all">True</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> + <property name="hexpand">True</property> + <child> + <object class="GtkEntry" id="company"> + <property name="can-focus">True</property> + <property name="no-show-all">True</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <property name="activates-default">True</property> + <property name="truncate-multiline">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="company-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended tip | company">Type the name of your company in this field.</property> + </object> + </child> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">0</property> + </packing> + </child> </object> <packing> - <property name="left-attach">1</property> - <property name="top-attach">9</property> + <property name="left-attach">2</property> + <property name="top-attach">0</property> </packing> </child> <child> - <object class="GtkLabel" id="phoneft"> + <object class="GtkImage" id="locknameft"> <property name="can-focus">False</property> <property name="no-show-all">True</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> - </object> - </child> + <property name="halign">center</property> + <property name="valign">center</property> + <property name="icon-name">res/lock.png</property> </object> <packing> - <property name="left-attach">1</property> - <property name="top-attach">10</property> + <property name="left-attach">0</property> + <property name="top-attach">1</property> </packing> </child> <child> - <object class="GtkLabel" id="faxft"> + <object class="GtkLabel" id="nameft"> <property name="can-focus">False</property> <property name="no-show-all">True</property> <property name="halign">start</property> - <property name="label" translatable="yes" context="optuserpage|faxft">Fa_x/email:</property> + <property name="label" translatable="yes" context="optuserpage|nameft">First/last _name/initials:</property> <property name="use-underline">True</property> - <property name="mnemonic-widget">fax</property> + <property name="mnemonic-widget">firstname</property> <property name="xalign">0</property> </object> <packing> <property name="left-attach">1</property> - <property name="top-attach">11</property> + <property name="top-attach">1</property> </packing> </child> <child> @@ -231,13 +193,41 @@ </packing> </child> <child> - <!-- n-columns=3 n-rows=1 --> - <object class="GtkGrid" id="grid3"> + <object class="GtkImage" id="lockrusnameft"> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> + <property name="halign">center</property> + <property name="valign">center</property> + <property name="icon-name">res/lock.png</property> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="rusnameft"> + <property name="can-focus">False</property> + <property name="no-show-all">True</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">1</property> + <property name="top-attach">2</property> + </packing> + </child> + <child> + <!-- n-columns=4 n-rows=1 --> + <object class="GtkGrid" id="grid8"> <property name="can-focus">False</property> <property name="no-show-all">True</property> <property name="column-spacing">6</property> <child> - <object class="GtkEntry" id="city"> + <object class="GtkEntry" id="ruslastname"> <property name="can-focus">True</property> <property name="no-show-all">True</property> <property name="valign">center</property> @@ -245,9 +235,9 @@ <property name="activates-default">True</property> <property name="truncate-multiline">True</property> <child internal-child="accessible"> - <object class="AtkObject" id="city-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="city-atkobject">City</property> - <property name="AtkObject::accessible-description" translatable="yes" context="extended tip | city">Type the city where you live.</property> + <object class="AtkObject" id="ruslastname-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="ruslastname-atkobject">Last name</property> + <property name="AtkObject::accessible-description" translatable="yes" context="extended tip | ruslastname">Type your last name.</property> </object> </child> </object> @@ -257,7 +247,7 @@ </packing> </child> <child> - <object class="GtkEntry" id="state"> + <object class="GtkEntry" id="rusfathersname"> <property name="can-focus">True</property> <property name="no-show-all">True</property> <property name="valign">center</property> @@ -265,52 +255,99 @@ <property name="activates-default">True</property> <property name="truncate-multiline">True</property> <child internal-child="accessible"> - <object class="AtkObject" id="state-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="state-atkobject">State</property> - <property name="AtkObject::accessible-description" translatable="yes" context="extended tip | state">Type your state.</property> + <object class="AtkObject" id="rusfathersname-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="rusfathersname-atkobject">Father's name</property> + <property name="AtkObject::accessible-description" translatable="yes" context="extended tips | rusfathersname">Type your father's name</property> </object> </child> </object> <packing> - <property name="left-attach">1</property> + <property name="left-attach">2</property> <property name="top-attach">0</property> </packing> </child> <child> - <object class="GtkEntry" id="zip"> + <object class="GtkEntry" id="russhortname"> <property name="can-focus">True</property> <property name="no-show-all">True</property> <property name="valign">center</property> <property name="activates-default">True</property> - <property name="width-chars">15</property> + <property name="width-chars">7</property> <property name="truncate-multiline">True</property> <child internal-child="accessible"> - <object class="AtkObject" id="zip-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="zip-atkobject">Zip code</property> - <property name="AtkObject::accessible-description" translatable="yes" context="extended tip | zip">Type your ZIP in this field.</property> + <object class="AtkObject" id="russhortname-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="russhortname-atkobject">Initials</property> + <property name="AtkObject::accessible-description" translatable="yes" context="extended tip | russhortname">Type your initials.</property> </object> </child> </object> <packing> - <property name="left-attach">2</property> + <property name="left-attach">3</property> + <property name="top-attach">0</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="rusfirstname"> + <property name="can-focus">True</property> + <property name="no-show-all">True</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <property name="activates-default">True</property> + <property name="truncate-multiline">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="rusfirstname-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="rusfirstname-atkobject">First name</property> + <property name="AtkObject::accessible-description" translatable="yes" context="extended tip | rusfirstname">Type your first name.</property> + </object> + </child> + </object> + <packing> + <property name="left-attach">1</property> <property name="top-attach">0</property> </packing> </child> </object> <packing> <property name="left-attach">2</property> - <property name="top-attach">7</property> + <property name="top-attach">2</property> </packing> </child> <child> - <!-- n-columns=2 n-rows=1 --> - <object class="GtkGrid" id="grid5"> + <object class="GtkImage" id="lockeastnameft"> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> + <property name="halign">center</property> + <property name="valign">center</property> + <property name="icon-name">res/lock.png</property> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">3</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="eastnameft"> + <property name="can-focus">False</property> + <property name="no-show-all">True</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">1</property> + <property name="top-attach">3</property> + </packing> + </child> + <child> + <!-- n-columns=3 n-rows=1 --> + <object class="GtkGrid" id="grid9"> <property name="can-focus">False</property> <property name="no-show-all">True</property> - <property name="hexpand">True</property> <property name="column-spacing">6</property> <child> - <object class="GtkEntry" id="title"> + <object class="GtkEntry" id="eastlastname"> <property name="can-focus">True</property> <property name="no-show-all">True</property> <property name="valign">center</property> @@ -318,9 +355,9 @@ <property name="activates-default">True</property> <property name="truncate-multiline">True</property> <child internal-child="accessible"> - <object class="AtkObject" id="title-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="title-atkobject">Title</property> - <property name="AtkObject::accessible-description" translatable="yes" context="extended tip | title">Type your title in this field.</property> + <object class="AtkObject" id="eastlastname-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="eastlastname-atkobject">Last name</property> + <property name="AtkObject::accessible-description" translatable="yes" context="extended tip | eastlastname">Type your last name.</property> </object> </child> </object> @@ -330,7 +367,7 @@ </packing> </child> <child> - <object class="GtkEntry" id="position"> + <object class="GtkEntry" id="eastfirstname"> <property name="can-focus">True</property> <property name="no-show-all">True</property> <property name="valign">center</property> @@ -338,51 +375,79 @@ <property name="activates-default">True</property> <property name="truncate-multiline">True</property> <child internal-child="accessible"> - <object class="AtkObject" id="position-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="position-atkobject">Position</property> - <property name="AtkObject::accessible-description" translatable="yes" context="extended tip | position">Type your position in the company in this field.</property> - </object> - </child> + <object class="AtkObject" id="eastfirstname-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="eastfirstname-atkobject">First name</property> + <property name="AtkObject::accessible-description" translatable="yes" context="extended tip | eastfirstname">Type your first name.</property> + </object> + </child> </object> <packing> <property name="left-attach">1</property> <property name="top-attach">0</property> </packing> </child> - </object> - <packing> - <property name="left-attach">2</property> - <property name="top-attach">9</property> - </packing> - </child> - <child> - <!-- n-columns=2 n-rows=1 --> - <object class="GtkGrid" id="grid6"> - <property name="can-focus">False</property> - <property name="no-show-all">True</property> - <property name="column-spacing">6</property> <child> - <object class="GtkEntry" id="home"> + <object class="GtkEntry" id="eastshortname"> <property name="can-focus">True</property> <property name="no-show-all">True</property> <property name="valign">center</property> - <property name="hexpand">True</property> <property name="activates-default">True</property> + <property name="width-chars">7</property> <property name="truncate-multiline">True</property> <child internal-child="accessible"> - <object class="AtkObject" id="home-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="home-atkobject">Home telephone number</property> - <property name="AtkObject::accessible-description" translatable="yes" context="extended tip | home">Type your private telephone number in this field.</property> + <object class="AtkObject" id="eastshortname-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="eastshortname-atkobject">Initials</property> + <property name="AtkObject::accessible-description" translatable="yes" context="extended tip | eastshortname">Type your initials.</property> </object> </child> </object> <packing> - <property name="left-attach">0</property> + <property name="left-attach">2</property> <property name="top-attach">0</property> </packing> </child> + </object> + <packing> + <property name="left-attach">2</property> + <property name="top-attach">3</property> + </packing> + </child> + <child> + <object class="GtkImage" id="lockstreetft"> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> + <property name="halign">center</property> + <property name="valign">center</property> + <property name="icon-name">res/lock.png</property> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">4</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="streetft"> + <property name="can-focus">False</property> + <property name="no-show-all">True</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">1</property> + <property name="top-attach">4</property> + </packing> + </child> + <child> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid4"> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> + <property name="hexpand">True</property> <child> - <object class="GtkEntry" id="work"> + <object class="GtkEntry" id="street"> <property name="can-focus">True</property> <property name="no-show-all">True</property> <property name="valign">center</property> @@ -390,32 +455,58 @@ <property name="activates-default">True</property> <property name="truncate-multiline">True</property> <child internal-child="accessible"> - <object class="AtkObject" id="work-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="work-atkobject">Work telephone number</property> - <property name="AtkObject::accessible-description" translatable="yes" context="extended tip | work">Type your work number in this field.</property> + <object class="AtkObject" id="street-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended tip | street">Type the name of your street in this field.</property> </object> </child> </object> <packing> - <property name="left-attach">1</property> + <property name="left-attach">0</property> <property name="top-attach">0</property> </packing> </child> </object> <packing> <property name="left-attach">2</property> - <property name="top-attach">10</property> + <property name="top-attach">4</property> + </packing> + </child> + <child> + <object class="GtkImage" id="lockrusstreetft"> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> + <property name="halign">center</property> + <property name="valign">center</property> + <property name="icon-name">res/lock.png</property> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">5</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="russtreetft"> + <property name="can-focus">False</property> + <property name="no-show-all">True</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">1</property> + <property name="top-attach">5</property> </packing> </child> <child> <!-- n-columns=2 n-rows=1 --> - <object class="GtkGrid" id="grid7"> + <object class="GtkGrid" id="grid10"> <property name="can-focus">False</property> <property name="no-show-all">True</property> - <property name="hexpand">True</property> <property name="column-spacing">6</property> <child> - <object class="GtkEntry" id="fax"> + <object class="GtkEntry" id="russtreet"> <property name="can-focus">True</property> <property name="no-show-all">True</property> <property name="valign">center</property> @@ -423,9 +514,9 @@ <property name="activates-default">True</property> <property name="truncate-multiline">True</property> <child internal-child="accessible"> - <object class="AtkObject" id="fax-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="fax-atkobject">Fax number</property> - <property name="AtkObject::accessible-description" translatable="yes" context="extended tip | fax">Type your fax number in this field.</property> + <object class="AtkObject" id="russtreet-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="russtreet-atkobject">Street</property> + <property name="AtkObject::accessible-description" translatable="yes" context="extended tips | russrteet">Type the name of your street in this field.</property> </object> </child> </object> @@ -435,17 +526,17 @@ </packing> </child> <child> - <object class="GtkEntry" id="email"> + <object class="GtkEntry" id="apartnum"> <property name="can-focus">True</property> <property name="no-show-all">True</property> <property name="valign">center</property> - <property name="hexpand">True</property> <property name="activates-default">True</property> + <property name="width-chars">15</property> <property name="truncate-multiline">True</property> <child internal-child="accessible"> - <object class="AtkObject" id="email-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="email-atkobject">email address</property> - <property name="AtkObject::accessible-description" translatable="yes" context="extended tip | email">Type your email address.</property> + <object class="AtkObject" id="apartnum-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="ruslastname-atkobject">Apartment number</property> + <property name="AtkObject::accessible-description" translatable="yes" context="extended tips | apartnum">Type your apartment number</property> </object> </child> </object> @@ -457,52 +548,45 @@ </object> <packing> <property name="left-attach">2</property> - <property name="top-attach">11</property> + <property name="top-attach">5</property> </packing> </child> <child> - <object class="GtkCheckButton" id="usefordocprop"> - <property name="label" translatable="yes" context="optuserpage|usefordocprop">_Use data for document properties</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="draw-indicator">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="usefordocprop-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended tips | usefordoprop">Mark to use the data in document properties</property> - </object> - </child> + <object class="GtkImage" id="lockicityft"> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> + <property name="halign">center</property> + <property name="valign">center</property> + <property name="icon-name">res/lock.png</property> </object> <packing> - <property name="left-attach">1</property> - <property name="top-attach">12</property> - <property name="width">2</property> + <property name="left-attach">0</property> + <property name="top-attach">6</property> </packing> </child> <child> - <object class="GtkLabel" id="rusnameft"> + <object class="GtkLabel" id="icityft"> <property name="can-focus">False</property> <property name="no-show-all">True</property> <property name="halign">start</property> - <property name="label" translatable="yes" context="optuserpage|rusnameft">Last/first/father’s _name/initials:</property> + <property name="label" translatable="yes" context="optuserpage|icityft">_Zip/city:</property> <property name="use-underline">True</property> - <property name="mnemonic-widget">ruslastname</property> + <property name="mnemonic-widget">izip</property> <property name="xalign">0</property> </object> <packing> <property name="left-attach">1</property> - <property name="top-attach">2</property> + <property name="top-attach">6</property> </packing> </child> <child> - <!-- n-columns=4 n-rows=1 --> - <object class="GtkGrid" id="grid8"> + <!-- n-columns=2 n-rows=1 --> + <object class="GtkGrid" id="grid11"> <property name="can-focus">False</property> <property name="no-show-all">True</property> <property name="column-spacing">6</property> <child> - <object class="GtkEntry" id="ruslastname"> + <object class="GtkEntry" id="icity"> <property name="can-focus">True</property> <property name="no-show-all">True</property> <property name="valign">center</property> @@ -510,59 +594,99 @@ <property name="activates-default">True</property> <property name="truncate-multiline">True</property> <child internal-child="accessible"> - <object class="AtkObject" id="ruslastname-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="ruslastname-atkobject">Last name</property> - <property name="AtkObject::accessible-description" translatable="yes" context="extended tip | ruslastname">Type your last name.</property> + <object class="AtkObject" id="icity-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="icity-atkobject">City</property> + <property name="AtkObject::accessible-description" translatable="yes" context="extended tip | icity">Type the city where you live.</property> </object> </child> </object> <packing> - <property name="left-attach">0</property> + <property name="left-attach">1</property> <property name="top-attach">0</property> </packing> </child> <child> - <object class="GtkEntry" id="rusfathersname"> + <object class="GtkEntry" id="izip"> <property name="can-focus">True</property> <property name="no-show-all">True</property> <property name="valign">center</property> - <property name="hexpand">True</property> <property name="activates-default">True</property> + <property name="width-chars">15</property> <property name="truncate-multiline">True</property> <child internal-child="accessible"> - <object class="AtkObject" id="rusfathersname-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="rusfathersname-atkobject">Father's name</property> - <property name="AtkObject::accessible-description" translatable="yes" context="extended tips | rusfathersname">Type your father's name</property> + <object class="AtkObject" id="izip-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="izip-atkobject">Zip code</property> + <property name="AtkObject::accessible-description" translatable="yes" context="extended tip | izip">Type your ZIP in this field.</property> </object> </child> </object> <packing> - <property name="left-attach">2</property> + <property name="left-attach">0</property> <property name="top-attach">0</property> </packing> </child> + </object> + <packing> + <property name="left-attach">2</property> + <property name="top-attach">6</property> + </packing> + </child> + <child> + <object class="GtkImage" id="lockcityft"> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> + <property name="halign">center</property> + <property name="valign">center</property> + <property name="icon-name">res/lock.png</property> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">7</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="cityft"> + <property name="can-focus">False</property> + <property name="no-show-all">True</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">1</property> + <property name="top-attach">7</property> + </packing> + </child> + <child> + <!-- n-columns=3 n-rows=1 --> + <object class="GtkGrid" id="grid3"> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> + <property name="column-spacing">6</property> <child> - <object class="GtkEntry" id="russhortname"> + <object class="GtkEntry" id="city"> <property name="can-focus">True</property> <property name="no-show-all">True</property> <property name="valign">center</property> + <property name="hexpand">True</property> <property name="activates-default">True</property> - <property name="width-chars">7</property> <property name="truncate-multiline">True</property> <child internal-child="accessible"> - <object class="AtkObject" id="russhortname-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="russhortname-atkobject">Initials</property> - <property name="AtkObject::accessible-description" translatable="yes" context="extended tip | russhortname">Type your initials.</property> + <object class="AtkObject" id="city-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="city-atkobject">City</property> + <property name="AtkObject::accessible-description" translatable="yes" context="extended tip | city">Type the city where you live.</property> </object> </child> </object> <packing> - <property name="left-attach">3</property> + <property name="left-attach">0</property> <property name="top-attach">0</property> </packing> </child> <child> - <object class="GtkEntry" id="rusfirstname"> + <object class="GtkEntry" id="state"> <property name="can-focus">True</property> <property name="no-show-all">True</property> <property name="valign">center</property> @@ -570,9 +694,9 @@ <property name="activates-default">True</property> <property name="truncate-multiline">True</property> <child internal-child="accessible"> - <object class="AtkObject" id="rusfirstname-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="rusfirstname-atkobject">First name</property> - <property name="AtkObject::accessible-description" translatable="yes" context="extended tip | rusfirstname">Type your first name.</property> + <object class="AtkObject" id="state-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="state-atkobject">State</property> + <property name="AtkObject::accessible-description" translatable="yes" context="extended tip | state">Type your state.</property> </object> </child> </object> @@ -581,85 +705,18 @@ <property name="top-attach">0</property> </packing> </child> - </object> - <packing> - <property name="left-attach">2</property> - <property name="top-attach">2</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="eastnameft"> - <property name="can-focus">False</property> - <property name="no-show-all">True</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">1</property> - <property name="top-attach">3</property> - </packing> - </child> - <child> - <!-- n-columns=3 n-rows=1 --> - <object class="GtkGrid" id="grid9"> - <property name="can-focus">False</property> - <property name="no-show-all">True</property> - <property name="column-spacing">6</property> <child> - <object class="GtkEntry" id="eastlastname"> - <property name="can-focus">True</property> - <property name="no-show-all">True</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <property name="activates-default">True</property> - <property name="truncate-multiline">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="eastlastname-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="eastlastname-atkobject">Last name</property> - <property name="AtkObject::accessible-description" translatable="yes" context="extended tip | eastlastname">Type your last name.</property> - </object> - </child> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">0</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="eastfirstname"> - <property name="can-focus">True</property> - <property name="no-show-all">True</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <property name="activates-default">True</property> - <property name="truncate-multiline">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="eastfirstname-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="eastfirstname-atkobject">First name</property> - <property name="AtkObject::accessible-description" translatable="yes" context="extended tip | eastfirstname">Type your first name.</property> - </object> - </child> - </object> - <packing> - <property name="left-attach">1</property> - <property name="top-attach">0</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="eastshortname"> + <object class="GtkEntry" id="zip"> <property name="can-focus">True</property> <property name="no-show-all">True</property> <property name="valign">center</property> <property name="activates-default">True</property> - <property name="width-chars">7</property> + <property name="width-chars">15</property> <property name="truncate-multiline">True</property> <child internal-child="accessible"> - <object class="AtkObject" id="eastshortname-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="eastshortname-atkobject">Initials</property> - <property name="AtkObject::accessible-description" translatable="yes" context="extended tip | eastshortname">Type your initials.</property> + <object class="AtkObject" id="zip-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="zip-atkobject">Zip code</property> + <property name="AtkObject::accessible-description" translatable="yes" context="extended tip | zip">Type your ZIP in this field.</property> </object> </child> </object> @@ -671,32 +728,45 @@ </object> <packing> <property name="left-attach">2</property> - <property name="top-attach">3</property> + <property name="top-attach">7</property> </packing> </child> <child> - <object class="GtkLabel" id="russtreetft"> + <object class="GtkImage" id="lockcountryft"> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> + <property name="halign">center</property> + <property name="valign">center</property> + <property name="icon-name">res/lock.png</property> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">8</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="countryft"> <property name="can-focus">False</property> <property name="no-show-all">True</property> <property name="halign">start</property> - <property name="label" translatable="yes" context="optuserpage|russtreetft">_Street/apartment number:</property> + <property name="label" translatable="yes" context="optuserpage|countryft">Country/re_gion:</property> <property name="use-underline">True</property> - <property name="mnemonic-widget">russtreet</property> + <property name="mnemonic-widget">country</property> <property name="xalign">0</property> </object> <packing> <property name="left-attach">1</property> - <property name="top-attach">5</property> + <property name="top-attach">8</property> </packing> </child> <child> - <!-- n-columns=2 n-rows=1 --> - <object class="GtkGrid" id="grid10"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid12"> <property name="can-focus">False</property> <property name="no-show-all">True</property> - <property name="column-spacing">6</property> + <property name="hexpand">True</property> <child> - <object class="GtkEntry" id="russtreet"> + <object class="GtkEntry" id="country"> <property name="can-focus">True</property> <property name="no-show-all">True</property> <property name="valign">center</property> @@ -704,9 +774,8 @@ <property name="activates-default">True</property> <property name="truncate-multiline">True</property> <child internal-child="accessible"> - <object class="AtkObject" id="russtreet-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="russtreet-atkobject">Street</property> - <property name="AtkObject::accessible-description" translatable="yes" context="extended tips | russrteet">Type the name of your street in this field.</property> + <object class="AtkObject" id="country-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended tips | country">Type your country and region</property> </object> </child> </object> @@ -715,55 +784,49 @@ <property name="top-attach">0</property> </packing> </child> - <child> - <object class="GtkEntry" id="apartnum"> - <property name="can-focus">True</property> - <property name="no-show-all">True</property> - <property name="valign">center</property> - <property name="activates-default">True</property> - <property name="width-chars">15</property> - <property name="truncate-multiline">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="apartnum-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="ruslastname-atkobject">Apartment number</property> - <property name="AtkObject::accessible-description" translatable="yes" context="extended tips | apartnum">Type your apartment number</property> - </object> - </child> - </object> - <packing> - <property name="left-attach">1</property> - <property name="top-attach">0</property> - </packing> - </child> </object> <packing> <property name="left-attach">2</property> - <property name="top-attach">5</property> + <property name="top-attach">8</property> </packing> </child> <child> - <object class="GtkLabel" id="icityft"> + <object class="GtkImage" id="locktitleft"> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> + <property name="halign">center</property> + <property name="valign">center</property> + <property name="icon-name">res/lock.png</property> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">9</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="titleft"> <property name="can-focus">False</property> <property name="no-show-all">True</property> <property name="halign">start</property> - <property name="label" translatable="yes" context="optuserpage|icityft">_Zip/city:</property> + <property name="label" translatable="yes" context="optuserpage|titleft">_Title/position:</property> <property name="use-underline">True</property> - <property name="mnemonic-widget">izip</property> + <property name="mnemonic-widget">title</property> <property name="xalign">0</property> </object> <packing> <property name="left-attach">1</property> - <property name="top-attach">6</property> + <property name="top-attach">9</property> </packing> </child> <child> <!-- n-columns=2 n-rows=1 --> - <object class="GtkGrid" id="grid11"> + <object class="GtkGrid" id="grid5"> <property name="can-focus">False</property> <property name="no-show-all">True</property> + <property name="hexpand">True</property> <property name="column-spacing">6</property> <child> - <object class="GtkEntry" id="icity"> + <object class="GtkEntry" id="title"> <property name="can-focus">True</property> <property name="no-show-all">True</property> <property name="valign">center</property> @@ -771,113 +834,84 @@ <property name="activates-default">True</property> <property name="truncate-multiline">True</property> <child internal-child="accessible"> - <object class="AtkObject" id="icity-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="icity-atkobject">City</property> - <property name="AtkObject::accessible-description" translatable="yes" context="extended tip | icity">Type the city where you live.</property> + <object class="AtkObject" id="title-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="title-atkobject">Title</property> + <property name="AtkObject::accessible-description" translatable="yes" context="extended tip | title">Type your title in this field.</property> </object> </child> </object> <packing> - <property name="left-attach">1</property> + <property name="left-attach">0</property> <property name="top-attach">0</property> </packing> </child> <child> - <object class="GtkEntry" id="izip"> + <object class="GtkEntry" id="position"> <property name="can-focus">True</property> <property name="no-show-all">True</property> <property name="valign">center</property> + <property name="hexpand">True</property> <property name="activates-default">True</property> - <property name="width-chars">15</property> <property name="truncate-multiline">True</property> <child internal-child="accessible"> - <object class="AtkObject" id="izip-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="izip-atkobject">Zip code</property> - <property name="AtkObject::accessible-description" translatable="yes" context="extended tip | izip">Type your ZIP in this field.</property> + <object class="AtkObject" id="position-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="position-atkobject">Position</property> + <property name="AtkObject::accessible-description" translatable="yes" context="extended tip | position">Type your position in the company in this field.</property> </object> </child> </object> <packing> - <property name="left-attach">0</property> + <property name="left-attach">1</property> <property name="top-attach">0</property> </packing> </child> </object> <packing> <property name="left-attach">2</property> - <property name="top-attach">6</property> + <property name="top-attach">9</property> </packing> </child> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid4"> + <object class="GtkImage" id="lockphoneft"> <property name="can-focus">False</property> <property name="no-show-all">True</property> - <property name="hexpand">True</property> - <child> - <object class="GtkEntry" id="street"> - <property name="can-focus">True</property> - <property name="no-show-all">True</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <property name="activates-default">True</property> - <property name="truncate-multiline">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="street-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended tip | street">Type the name of your street in this field.</property> - </object> - </child> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">0</property> - </packing> - </child> + <property name="halign">center</property> + <property name="valign">center</property> + <property name="icon-name">res/lock.png</property> </object> <packing> - <property name="left-attach">2</property> - <property name="top-attach">4</property> + <property name="left-attach">0</property> + <property name="top-attach">10</property> </packing> </child> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid12"> + <object class="GtkLabel" id="phoneft"> <property name="can-focus">False</property> <property name="no-show-all">True</property> - <property name="hexpand">True</property> - <child> - <object class="GtkEntry" id="country"> - <property name="can-focus">True</property> - <property name="no-show-all">True</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <property name="activates-default">True</property> - <property name="truncate-multiline">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="country-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended tips | country">Type your country and region</property> - </object> - </child> + <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> </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">0</property> - </packing> </child> </object> <packing> - <property name="left-attach">2</property> - <property name="top-attach">8</property> + <property name="left-attach">1</property> + <property name="top-attach">10</property> </packing> </child> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid13"> + <!-- n-columns=2 n-rows=1 --> + <object class="GtkGrid" id="grid6"> <property name="can-focus">False</property> <property name="no-show-all">True</property> - <property name="hexpand">True</property> + <property name="column-spacing">6</property> <child> - <object class="GtkEntry" id="company"> + <object class="GtkEntry" id="home"> <property name="can-focus">True</property> <property name="no-show-all">True</property> <property name="valign">center</property> @@ -885,8 +919,9 @@ <property name="activates-default">True</property> <property name="truncate-multiline">True</property> <child internal-child="accessible"> - <object class="AtkObject" id="company-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended tip | company">Type the name of your company in this field.</property> + <object class="AtkObject" id="home-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="home-atkobject">Home telephone number</property> + <property name="AtkObject::accessible-description" translatable="yes" context="extended tip | home">Type your private telephone number in this field.</property> </object> </child> </object> @@ -895,118 +930,34 @@ <property name="top-attach">0</property> </packing> </child> + <child> + <object class="GtkEntry" id="work"> + <property name="can-focus">True</property> + <property name="no-show-all">True</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <property name="activates-default">True</property> + <property name="truncate-multiline">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="work-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="work-atkobject">Work telephone number</property> + <property name="AtkObject::accessible-description" translatable="yes" context="extended tip | work">Type your work number in this field.</property> + </object> + </child> + </object> + <packing> + <property name="left-attach">1</property> + <property name="top-attach">0</property> + </packing> + </child> </object> <packing> - <property name="left-attach">2</property> - <property name="top-attach">0</property> - </packing> - </child> - <child> - <object class="GtkImage" id="lockcompanyft"> - <property name="can-focus">False</property> - <property name="no-show-all">True</property> - <property name="halign">center</property> - <property name="valign">center</property> - <property name="icon-name">res/lock.png</property> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">0</property> - </packing> - </child> - <child> - <object class="GtkImage" id="locknameft"> - <property name="can-focus">False</property> - <property name="no-show-all">True</property> - <property name="halign">center</property> - <property name="valign">center</property> - <property name="icon-name">res/lock.png</property> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">1</property> - </packing> - </child> - <child> - <object class="GtkImage" id="lockrusnameft"> - <property name="can-focus">False</property> - <property name="no-show-all">True</property> - <property name="halign">center</property> - <property name="valign">center</property> - <property name="icon-name">res/lock.png</property> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">2</property> - </packing> - </child> - <child> - <object class="GtkImage" id="lockeastnameft"> - <property name="can-focus">False</property> - <property name="no-show-all">True</property> - <property name="halign">center</property> - <property name="valign">center</property> - <property name="icon-name">res/lock.png</property> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">3</property> - </packing> - </child> - <child> - <object class="GtkImage" id="lockstreetft"> - <property name="can-focus">False</property> - <property name="no-show-all">True</property> - <property name="halign">center</property> - <property name="valign">center</property> - <property name="icon-name">res/lock.png</property> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">4</property> - </packing> - </child> - <child> - <object class="GtkImage" id="lockrusstreetft"> - <property name="can-focus">False</property> - <property name="no-show-all">True</property> - <property name="halign">center</property> - <property name="valign">center</property> - <property name="icon-name">res/lock.png</property> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">5</property> - </packing> - </child> - <child> - <object class="GtkImage" id="lockicityft"> - <property name="can-focus">False</property> - <property name="no-show-all">True</property> - <property name="halign">center</property> - <property name="valign">center</property> - <property name="icon-name">res/lock.png</property> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">6</property> - </packing> - </child> - <child> - <object class="GtkImage" id="lockcityft"> - <property name="can-focus">False</property> - <property name="no-show-all">True</property> - <property name="halign">center</property> - <property name="valign">center</property> - <property name="icon-name">res/lock.png</property> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">7</property> + <property name="left-attach">2</property> + <property name="top-attach">10</property> </packing> </child> <child> - <object class="GtkImage" id="lockcountryft"> + <object class="GtkImage" id="lockfaxft"> <property name="can-focus">False</property> <property name="no-show-all">True</property> <property name="halign">center</property> @@ -1015,37 +966,79 @@ </object> <packing> <property name="left-attach">0</property> - <property name="top-attach">8</property> + <property name="top-attach">11</property> </packing> </child> <child> - <object class="GtkImage" id="locktitleft"> + <object class="GtkLabel" id="faxft"> <property name="can-focus">False</property> <property name="no-show-all">True</property> - <property name="halign">center</property> - <property name="valign">center</property> - <property name="icon-name">res/lock.png</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> - <property name="top-attach">9</property> + <property name="left-attach">1</property> + <property name="top-attach">11</property> </packing> </child> <child> - <object class="GtkImage" id="lockphoneft"> + <!-- n-columns=2 n-rows=1 --> + <object class="GtkGrid" id="grid7"> <property name="can-focus">False</property> <property name="no-show-all">True</property> - <property name="halign">center</property> - <property name="valign">center</property> - <property name="icon-name">res/lock.png</property> + <property name="hexpand">True</property> + <property name="column-spacing">6</property> + <child> + <object class="GtkEntry" id="fax"> + <property name="can-focus">True</property> + <property name="no-show-all">True</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <property name="activates-default">True</property> + <property name="truncate-multiline">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="fax-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="fax-atkobject">Fax number</property> + <property name="AtkObject::accessible-description" translatable="yes" context="extended tip | fax">Type your fax number in this field.</property> + </object> + </child> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">0</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="email"> + <property name="can-focus">True</property> + <property name="no-show-all">True</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <property name="activates-default">True</property> + <property name="truncate-multiline">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="email-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="email-atkobject">email address</property> + <property name="AtkObject::accessible-description" translatable="yes" context="extended tip | email">Type your email address.</property> + </object> + </child> + </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">10</property> + <property name="left-attach">2</property> + <property name="top-attach">11</property> </packing> </child> <child> - <object class="GtkImage" id="lockfaxft"> + <object class="GtkImage" id="lockusefordocprop"> <property name="can-focus">False</property> <property name="no-show-all">True</property> <property name="halign">center</property> @@ -1054,20 +1047,27 @@ </object> <packing> <property name="left-attach">0</property> - <property name="top-attach">11</property> + <property name="top-attach">12</property> </packing> </child> <child> - <object class="GtkImage" id="lockusefordocprop"> - <property name="can-focus">False</property> - <property name="no-show-all">True</property> - <property name="halign">center</property> - <property name="valign">center</property> - <property name="icon-name">res/lock.png</property> + <object class="GtkCheckButton" id="usefordocprop"> + <property name="label" translatable="yes" context="optuserpage|usefordocprop">_Use data for document properties</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="draw-indicator">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="usefordocprop-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended tips | usefordoprop">Mark to use the data in document properties</property> + </object> + </child> </object> <packing> - <property name="left-attach">0</property> + <property name="left-attach">1</property> <property name="top-attach">12</property> + <property name="width">2</property> </packing> </child> </object> @@ -1105,81 +1105,74 @@ <property name="row-spacing">6</property> <property name="column-spacing">6</property> <child> - <object class="GtkLabel" id="signingkeylabel"> - <property name="visible">True</property> + <object class="GtkImage" id="locksigningkey"> <property name="can-focus">False</property> - <property name="label" translatable="yes" context="optuserpage|signingkeylabel">_Signing key:</property> - <property name="use-underline">True</property> - <property name="mnemonic-widget">signingkey</property> - <property name="xalign">0</property> + <property name="no-show-all">True</property> + <property name="halign">center</property> + <property name="valign">center</property> + <property name="icon-name">res/lock.png</property> </object> <packing> - <property name="left-attach">1</property> + <property name="left-attach">0</property> <property name="top-attach">0</property> </packing> </child> <child> - <object class="GtkLabel" id="encryptionkeylabel"> + <object class="GtkLabel" id="signingkeylabel"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="label" translatable="yes" context="optuserpage|encryptionkeylabel">OpenPGP encryption _key:</property> + <property name="label" translatable="yes" context="optuserpage|signingkeylabel">_Signing key:</property> <property name="use-underline">True</property> - <property name="mnemonic-widget">encryptionkey</property> + <property name="mnemonic-widget">signingkey</property> <property name="xalign">0</property> </object> <packing> <property name="left-attach">1</property> - <property name="top-attach">1</property> + <property name="top-attach">0</property> </packing> </child> <child> - <object class="GtkCheckButton" id="encrypttoself"> - <property name="label" translatable="yes" context="optuserpage|encrypttoself">When _encrypting documents, always encrypt to self</property> + <object class="GtkEntry" id="signingkey"> <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="draw-indicator">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="encrypttoself-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended tip | encrypttoself">Mark this checkbox to also encrypt the file with your public key, so you can open the document with your private key.</property> - </object> - </child> + <property name="hexpand">True</property> + <property name="editable">False</property> + <property name="truncate-multiline">True</property> + <property name="placeholder-text" translatable="yes" context="optuserpage|signingkey">No key</property> </object> <packing> - <property name="left-attach">1</property> - <property name="top-attach">2</property> - <property name="width">3</property> + <property name="left-attach">2</property> + <property name="top-attach">0</property> </packing> </child> <child> - <object class="GtkImage" id="locksigningkey"> - <property name="can-focus">False</property> - <property name="no-show-all">True</property> - <property name="halign">center</property> - <property name="valign">center</property> - <property name="icon-name">res/lock.png</property> + <object class="GtkButton" id="removesigningkey"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes" context="optuserpage|removesigningkey">Clear Signing Key</property> + <property name="image">image1</property> + <property name="always-show-image">True</property> </object> <packing> - <property name="left-attach">0</property> + <property name="left-attach">3</property> <property name="top-attach">0</property> </packing> </child> <child> - <object class="GtkImage" id="lockencryptionkey"> - <property name="can-focus">False</property> - <property name="no-show-all">True</property> - <property name="halign">center</property> - <property name="valign">center</property> - <property name="icon-name">res/lock.png</property> + <object class="GtkButton" id="picksigningkey"> + <property name="label" translatable="yes" context="optuserpage|picksigningkey">Select...</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> </object> <packing> - <property name="left-attach">0</property> - <property name="top-attach">1</property> + <property name="left-attach">4</property> + <property name="top-attach">0</property> </packing> </child> <child> - <object class="GtkImage" id="lockencrypttoself"> + <object class="GtkImage" id="lockencryptionkey"> <property name="can-focus">False</property> <property name="no-show-all">True</property> <property name="halign">center</property> @@ -1188,21 +1181,21 @@ </object> <packing> <property name="left-attach">0</property> - <property name="top-attach">2</property> + <property name="top-attach">1</property> </packing> </child> <child> - <object class="GtkEntry" id="signingkey"> + <object class="GtkLabel" id="encryptionkeylabel"> <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="hexpand">True</property> - <property name="editable">False</property> - <property name="truncate-multiline">True</property> - <property name="placeholder-text" translatable="yes" context="optuserpage|signingkey">No key</property> + <property name="can-focus">False</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">2</property> - <property name="top-attach">0</property> + <property name="left-attach">1</property> + <property name="top-attach">1</property> </packing> </child> <child> @@ -1220,15 +1213,17 @@ </packing> </child> <child> - <object class="GtkButton" id="picksigningkey"> - <property name="label" translatable="yes" context="optuserpage|picksigningkey">Select...</property> + <object class="GtkButton" id="removeencryptionkey"> <property name="visible">True</property> <property name="can-focus">True</property> <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes" context="optuserpage|removeencryptionkey">Clear Encryption Key</property> + <property name="image">image2</property> + <property name="always-show-image">True</property> </object> <packing> - <property name="left-attach">4</property> - <property name="top-attach">0</property> + <property name="left-attach">3</property> + <property name="top-attach">1</property> </packing> </child> <child> @@ -1244,31 +1239,36 @@ </packing> </child> <child> - <object class="GtkButton" id="removesigningkey"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="tooltip-text" translatable="yes" context="optuserpage|removesigningkey">Clear Signing Key</property> - <property name="image">image1</property> - <property name="always-show-image">True</property> + <object class="GtkImage" id="lockencrypttoself"> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> + <property name="halign">center</property> + <property name="valign">center</property> + <property name="icon-name">res/lock.png</property> </object> <packing> - <property name="left-attach">3</property> - <property name="top-attach">0</property> + <property name="left-attach">0</property> + <property name="top-attach">2</property> </packing> </child> <child> - <object class="GtkButton" id="removeencryptionkey"> + <object class="GtkCheckButton" id="encrypttoself"> + <property name="label" translatable="yes" context="optuserpage|encrypttoself">When _encrypting documents, always encrypt to self</property> <property name="visible">True</property> <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="tooltip-text" translatable="yes" context="optuserpage|removeencryptionkey">Clear Encryption Key</property> - <property name="image">image2</property> - <property name="always-show-image">True</property> + <property name="receives-default">False</property> + <property name="use-underline">True</property> + <property name="draw-indicator">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="encrypttoself-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended tip | encrypttoself">Mark this checkbox to also encrypt the file with your public key, so you can open the document with your private key.</property> + </object> + </child> </object> <packing> - <property name="left-attach">3</property> - <property name="top-attach">1</property> + <property name="left-attach">1</property> + <property name="top-attach">2</property> + <property name="width">3</property> </packing> </child> <child>
