cui/uiconfig/ui/optuserpage.ui | 406 ++++++++++++++++-------------- sw/uiconfig/swriter/ui/privateuserpage.ui | 21 - 2 files changed, 233 insertions(+), 194 deletions(-)
New commits: commit c1055df632614016fb7690743d665f86a0266e26 Author: Sampath-1984 <[email protected]> AuthorDate: Sat Dec 20 01:51:39 2025 +0530 Commit: Heiko Tietze <[email protected]> CommitDate: Tue Dec 23 11:48:40 2025 +0100 tdf#169123 Change order of fields in user data tab The fields in the user data tab have been rearranged into two sections. The first section is labelled Introduction and contains name, company and title. The second section is labbeled Contact Information and contains the address, phone, fax and mail. Following files have been changed: - cui/uiconfig/ui/optuserpage.ui - sw/uiconfig/swriter/ui/privateuserpage.ui Change-Id: I239ca907c4e865ecc79dec01649ccb906e2d1c91 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195941 Reviewed-by: Heiko Tietze <[email protected]> Tested-by: Jenkins diff --git a/cui/uiconfig/ui/optuserpage.ui b/cui/uiconfig/ui/optuserpage.ui index 4ce8c7c3ecc6..c893f47631ed 100644 --- a/cui/uiconfig/ui/optuserpage.ui +++ b/cui/uiconfig/ui/optuserpage.ui @@ -19,13 +19,13 @@ <property name="orientation">vertical</property> <property name="spacing">12</property> <child> - <object class="GtkFrame" id="frame1"> + <object class="GtkFrame" id="identification"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="label-xalign">0</property> <property name="shadow-type">none</property> <child> - <!-- n-columns=3 n-rows=13 --> + <!-- n-columns=3 n-rows=5 --> <object class="GtkGrid" id="grid1"> <property name="visible">True</property> <property name="can-focus">False</property> @@ -33,65 +33,6 @@ <property name="margin-top">6</property> <property name="row-spacing">6</property> <property name="column-spacing">6</property> - <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="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|companyft">Co_mpany:</property> - <property name="use-underline">True</property> - <property name="mnemonic-widget">company</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left-attach">1</property> - <property name="top-attach">0</property> - </packing> - </child> - <child> - <!-- 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="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">2</property> - <property name="top-attach">0</property> - </packing> - </child> <child> <object class="GtkImage" id="locknameft"> <property name="can-focus">False</property> @@ -102,7 +43,7 @@ </object> <packing> <property name="left-attach">0</property> - <property name="top-attach">1</property> + <property name="top-attach">0</property> </packing> </child> <child> @@ -117,7 +58,7 @@ </object> <packing> <property name="left-attach">1</property> - <property name="top-attach">1</property> + <property name="top-attach">0</property> </packing> </child> <child> @@ -189,7 +130,7 @@ </object> <packing> <property name="left-attach">2</property> - <property name="top-attach">1</property> + <property name="top-attach">0</property> </packing> </child> <child> @@ -202,7 +143,7 @@ </object> <packing> <property name="left-attach">0</property> - <property name="top-attach">2</property> + <property name="top-attach">1</property> </packing> </child> <child> @@ -217,12 +158,12 @@ </object> <packing> <property name="left-attach">1</property> - <property name="top-attach">2</property> + <property name="top-attach">1</property> </packing> </child> <child> <!-- n-columns=4 n-rows=1 --> - <object class="GtkGrid" id="grid8"> + <object class="GtkGrid" id="grid3"> <property name="can-focus">False</property> <property name="no-show-all">True</property> <property name="column-spacing">6</property> @@ -309,7 +250,7 @@ </object> <packing> <property name="left-attach">2</property> - <property name="top-attach">2</property> + <property name="top-attach">1</property> </packing> </child> <child> @@ -322,7 +263,7 @@ </object> <packing> <property name="left-attach">0</property> - <property name="top-attach">3</property> + <property name="top-attach">2</property> </packing> </child> <child> @@ -337,12 +278,12 @@ </object> <packing> <property name="left-attach">1</property> - <property name="top-attach">3</property> + <property name="top-attach">2</property> </packing> </child> <child> <!-- n-columns=3 n-rows=1 --> - <object class="GtkGrid" id="grid9"> + <object class="GtkGrid" id="grid4"> <property name="can-focus">False</property> <property name="no-show-all">True</property> <property name="column-spacing">6</property> @@ -409,11 +350,92 @@ </object> <packing> <property name="left-attach">2</property> + <property name="top-attach">2</property> + </packing> + </child> + <child> + <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">3</property> </packing> </child> <child> - <object class="GtkImage" id="lockstreetft"> + <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|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">1</property> + <property name="top-attach">3</property> + </packing> + </child> + <child> + <!-- n-columns=2 n-rows=1 --> + <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="title"> + <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="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">0</property> + <property name="top-attach">0</property> + </packing> + </child> + <child> + <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="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> + <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">3</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> @@ -425,6 +447,99 @@ <property name="top-attach">4</property> </packing> </child> + <child> + <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|companyft">Co_mpany:</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">company</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="grid6"> + <property name="can-focus">False</property> + <property name="no-show-all">True</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">2</property> + <property name="top-attach">4</property> + </packing> + </child> + </object> + </child> + <child type="label"> + <object class="GtkLabel" id="identificationlabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes" context="optuserpage|identificationlabel">Identification</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkFrame" id="contact_information"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label-xalign">0</property> + <property name="shadow-type">none</property> + <child> + <!-- n-columns=3 n-rows=8 --> + <object class="GtkGrid" id="grid7"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> + <property name="row-spacing">6</property> + <property name="column-spacing">6</property> + <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">0</property> + </packing> + </child> <child> <object class="GtkLabel" id="streetft"> <property name="can-focus">False</property> @@ -437,12 +552,12 @@ </object> <packing> <property name="left-attach">1</property> - <property name="top-attach">4</property> + <property name="top-attach">0</property> </packing> </child> <child> <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid4"> + <object class="GtkGrid" id="grid8"> <property name="can-focus">False</property> <property name="no-show-all">True</property> <property name="hexpand">True</property> @@ -468,7 +583,7 @@ </object> <packing> <property name="left-attach">2</property> - <property name="top-attach">4</property> + <property name="top-attach">0</property> </packing> </child> <child> @@ -481,7 +596,7 @@ </object> <packing> <property name="left-attach">0</property> - <property name="top-attach">5</property> + <property name="top-attach">1</property> </packing> </child> <child> @@ -496,12 +611,12 @@ </object> <packing> <property name="left-attach">1</property> - <property name="top-attach">5</property> + <property name="top-attach">1</property> </packing> </child> <child> <!-- n-columns=2 n-rows=1 --> - <object class="GtkGrid" id="grid10"> + <object class="GtkGrid" id="grid9"> <property name="can-focus">False</property> <property name="no-show-all">True</property> <property name="column-spacing">6</property> @@ -548,7 +663,7 @@ </object> <packing> <property name="left-attach">2</property> - <property name="top-attach">5</property> + <property name="top-attach">1</property> </packing> </child> <child> @@ -561,7 +676,7 @@ </object> <packing> <property name="left-attach">0</property> - <property name="top-attach">6</property> + <property name="top-attach">2</property> </packing> </child> <child> @@ -576,12 +691,12 @@ </object> <packing> <property name="left-attach">1</property> - <property name="top-attach">6</property> + <property name="top-attach">2</property> </packing> </child> <child> <!-- n-columns=2 n-rows=1 --> - <object class="GtkGrid" id="grid11"> + <object class="GtkGrid" id="grid10"> <property name="can-focus">False</property> <property name="no-show-all">True</property> <property name="column-spacing">6</property> @@ -628,7 +743,7 @@ </object> <packing> <property name="left-attach">2</property> - <property name="top-attach">6</property> + <property name="top-attach">2</property> </packing> </child> <child> @@ -641,7 +756,7 @@ </object> <packing> <property name="left-attach">0</property> - <property name="top-attach">7</property> + <property name="top-attach">3</property> </packing> </child> <child> @@ -656,12 +771,12 @@ </object> <packing> <property name="left-attach">1</property> - <property name="top-attach">7</property> + <property name="top-attach">3</property> </packing> </child> <child> <!-- n-columns=3 n-rows=1 --> - <object class="GtkGrid" id="grid3"> + <object class="GtkGrid" id="grid11"> <property name="can-focus">False</property> <property name="no-show-all">True</property> <property name="column-spacing">6</property> @@ -728,7 +843,7 @@ </object> <packing> <property name="left-attach">2</property> - <property name="top-attach">7</property> + <property name="top-attach">3</property> </packing> </child> <child> @@ -741,7 +856,7 @@ </object> <packing> <property name="left-attach">0</property> - <property name="top-attach">8</property> + <property name="top-attach">4</property> </packing> </child> <child> @@ -756,7 +871,7 @@ </object> <packing> <property name="left-attach">1</property> - <property name="top-attach">8</property> + <property name="top-attach">4</property> </packing> </child> <child> @@ -787,88 +902,7 @@ </object> <packing> <property name="left-attach">2</property> - <property name="top-attach">8</property> - </packing> - </child> - <child> - <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|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">1</property> - <property name="top-attach">9</property> - </packing> - </child> - <child> - <!-- n-columns=2 n-rows=1 --> - <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="title"> - <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="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">0</property> - <property name="top-attach">0</property> - </packing> - </child> - <child> - <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="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> - <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> + <property name="top-attach">4</property> </packing> </child> <child> @@ -881,7 +915,7 @@ </object> <packing> <property name="left-attach">0</property> - <property name="top-attach">10</property> + <property name="top-attach">5</property> </packing> </child> <child> @@ -901,12 +935,12 @@ </object> <packing> <property name="left-attach">1</property> - <property name="top-attach">10</property> + <property name="top-attach">5</property> </packing> </child> <child> <!-- n-columns=2 n-rows=1 --> - <object class="GtkGrid" id="grid6"> + <object class="GtkGrid" id="grid13"> <property name="can-focus">False</property> <property name="no-show-all">True</property> <property name="column-spacing">6</property> @@ -953,7 +987,7 @@ </object> <packing> <property name="left-attach">2</property> - <property name="top-attach">10</property> + <property name="top-attach">5</property> </packing> </child> <child> @@ -966,7 +1000,7 @@ </object> <packing> <property name="left-attach">0</property> - <property name="top-attach">11</property> + <property name="top-attach">6</property> </packing> </child> <child> @@ -981,12 +1015,12 @@ </object> <packing> <property name="left-attach">1</property> - <property name="top-attach">11</property> + <property name="top-attach">6</property> </packing> </child> <child> <!-- n-columns=2 n-rows=1 --> - <object class="GtkGrid" id="grid7"> + <object class="GtkGrid" id="grid14"> <property name="can-focus">False</property> <property name="no-show-all">True</property> <property name="hexpand">True</property> @@ -1034,7 +1068,7 @@ </object> <packing> <property name="left-attach">2</property> - <property name="top-attach">11</property> + <property name="top-attach">6</property> </packing> </child> <child> @@ -1047,7 +1081,7 @@ </object> <packing> <property name="left-attach">0</property> - <property name="top-attach">12</property> + <property name="top-attach">7</property> </packing> </child> <child> @@ -1066,17 +1100,17 @@ </object> <packing> <property name="left-attach">1</property> - <property name="top-attach">12</property> + <property name="top-attach">7</property> <property name="width">2</property> </packing> </child> </object> </child> <child type="label"> - <object class="GtkLabel" id="label1"> + <object class="GtkLabel" id="contact_informationlabel"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="label" translatable="yes" context="optuserpage|label1">Address</property> + <property name="label" translatable="yes" context="optuserpage|contact_informationlabel">Contact Information</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -1086,7 +1120,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> <child> @@ -1097,7 +1131,7 @@ <property name="shadow-type">none</property> <child> <!-- n-columns=5 n-rows=3 --> - <object class="GtkGrid" id="grid14"> + <object class="GtkGrid" id="grid15"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="margin-start">12</property> @@ -1291,7 +1325,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">2</property> </packing> </child> <child internal-child="accessible"> diff --git a/sw/uiconfig/swriter/ui/privateuserpage.ui b/sw/uiconfig/swriter/ui/privateuserpage.ui index f992a472914c..4ac7daaf6542 100644 --- a/sw/uiconfig/swriter/ui/privateuserpage.ui +++ b/sw/uiconfig/swriter/ui/privateuserpage.ui @@ -44,7 +44,7 @@ </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">2</property> + <property name="top_attach">3</property> </packing> </child> <child> @@ -58,7 +58,7 @@ </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">4</property> + <property name="top_attach">5</property> </packing> </child> <child> @@ -72,7 +72,7 @@ </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">5</property> + <property name="top_attach">2</property> </packing> </child> <child> @@ -220,7 +220,7 @@ </object> <packing> <property name="left_attach">1</property> - <property name="top_attach">5</property> + <property name="top_attach">2</property> </packing> </child> <child> @@ -400,7 +400,7 @@ </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">3</property> + <property name="top_attach">4</property> </packing> </child> <child> @@ -450,7 +450,7 @@ </object> <packing> <property name="left_attach">1</property> - <property name="top_attach">3</property> + <property name="top_attach">4</property> </packing> </child> <child> @@ -481,7 +481,7 @@ </object> <packing> <property name="left_attach">1</property> - <property name="top_attach">2</property> + <property name="top_attach">3</property> </packing> </child> <child> @@ -532,7 +532,7 @@ </object> <packing> <property name="left_attach">1</property> - <property name="top_attach">4</property> + <property name="top_attach">5</property> </packing> </child> <child> @@ -611,6 +611,11 @@ <attribute name="weight" value="bold"/> </attributes> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> </child> <child internal-child="accessible"> <object class="AtkObject" id="PrivateUserPage-atkobject">
