diff options
author | Tor Lillqvist <tml@collabora.com> | 2016-08-23 15:24:23 +0300 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2016-08-23 20:13:12 +0300 |
commit | db231633af4667e24281e0be69ab63ad3081fdc3 (patch) | |
tree | d86ed8c80fd6e16db2368c896787430a595db9a7 /cui/uiconfig | |
parent | use PushTempTokenWithoutError() instead of PushWithoutError() (diff) | |
download | core-db231633af4667e24281e0be69ab63ad3081fdc3.tar.gz core-db231633af4667e24281e0be69ab63ad3081fdc3.zip |
Simplify user name option GUI: Just a single "name" field
See https://www.kalzumeus.com/2010/06/17/falsehoods-programmers-believe-about-names/
And it makes the code simpler. Win-win.
It is just a single full name that is stored in ODF and OOXML anyway.
Take care of migrating separate given names, father's names and
surnames from older user profiles if modifying the data. Handle the
"Eastern" (as the code calls it) case, too.
Change-Id: Iebf59f224995f722669f844d03053a55c088bc6e
Diffstat (limited to 'cui/uiconfig')
-rw-r--r-- | cui/uiconfig/ui/optuserpage.ui | 204 |
1 files changed, 5 insertions, 199 deletions
diff --git a/cui/uiconfig/ui/optuserpage.ui b/cui/uiconfig/ui/optuserpage.ui index 93a7db478f96..009ec6ec73be 100644 --- a/cui/uiconfig/ui/optuserpage.ui +++ b/cui/uiconfig/ui/optuserpage.ui @@ -39,9 +39,9 @@ <property name="can_focus">False</property> <property name="no_show_all">True</property> <property name="halign">end</property> - <property name="label" translatable="yes">First/last _name/initials:</property> + <property name="label" translatable="yes">Name/initials:</property> <property name="use_underline">True</property> - <property name="mnemonic_widget">firstname</property> + <property name="mnemonic_widget">lastname</property> </object> <packing> <property name="left_attach">0</property> @@ -143,24 +143,6 @@ <property name="no_show_all">True</property> <property name="column_spacing">6</property> <child> - <object class="GtkEntry" id="firstname"> - <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="invisible_char">•</property> - <child internal-child="accessible"> - <object class="AtkObject" id="firstname-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes">First 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="lastname"> <property name="can_focus">True</property> <property name="no_show_all">True</property> @@ -169,12 +151,12 @@ <property name="invisible_char">•</property> <child internal-child="accessible"> <object class="AtkObject" id="lastname-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes">Last name</property> + <property name="AtkObject::accessible-name" translatable="yes">Name</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> @@ -192,7 +174,7 @@ </child> </object> <packing> - <property name="left_attach">2</property> + <property name="left_attach">1</property> <property name="top_attach">0</property> </packing> </child> @@ -425,182 +407,6 @@ </packing> </child> <child> - <object class="GtkLabel" id="rusnameft"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="halign">end</property> - <property name="label" translatable="yes">Last name/first _name/father’s name/initials:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">ruslastname</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <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="ruslastname"> - <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="invisible_char">•</property> - <child internal-child="accessible"> - <object class="AtkObject" id="ruslastname-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes">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="rusfathersname"> - <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="invisible_char">•</property> - <child internal-child="accessible"> - <object class="AtkObject" id="rusfathersname-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes">Father's name</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <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="invisible_char">•</property> - <property name="width_chars">7</property> - <child internal-child="accessible"> - <object class="AtkObject" id="russhortname-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes">Initials</property> - </object> - </child> - </object> - <packing> - <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="invisible_char">•</property> - <child internal-child="accessible"> - <object class="AtkObject" id="rusfirstname-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes">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">1</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">end</property> - <property name="label" translatable="yes">Last/first _name/initials:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">eastlastname</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> - </packing> - </child> - <child> - <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="invisible_char">•</property> - <child internal-child="accessible"> - <object class="AtkObject" id="eastlastname-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes">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="invisible_char">•</property> - <child internal-child="accessible"> - <object class="AtkObject" id="eastfirstname-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes">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"> - <property name="can_focus">True</property> - <property name="no_show_all">True</property> - <property name="valign">center</property> - <property name="invisible_char">•</property> - <property name="width_chars">7</property> - <child internal-child="accessible"> - <object class="AtkObject" id="eastshortname-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes">Initials</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> - </packing> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">3</property> - </packing> - </child> - <child> <object class="GtkLabel" id="russtreetft"> <property name="can_focus">False</property> <property name="no_show_all">True</property> |