From 9d06ffadbec8c3b2281f3e04b6c612b86965c146 Mon Sep 17 00:00:00 2001 From: Katarina Behrens Date: Thu, 23 Nov 2017 13:37:26 +0100 Subject: [PATCH] gpg4libre: UI and config for adding GPG keys to user's identity Change-Id: I1a176ca998f49b68c6ca8129fba4eb56445892a2 Reviewed-on: https://gerrit.libreoffice.org/45145 Tested-by: Thorsten Behrens Reviewed-by: Siegmund Gorr Reviewed-by: Thorsten Behrens --- cui/uiconfig/ui/optuserpage.ui | 1581 +++++++++-------- .../schema/org/openoffice/UserProfile.xcs | 21 + 2 files changed, 866 insertions(+), 736 deletions(-) diff --git a/cui/uiconfig/ui/optuserpage.ui b/cui/uiconfig/ui/optuserpage.ui index 61245f6fb3b8..ad893936cb0f 100644 --- a/cui/uiconfig/ui/optuserpage.ui +++ b/cui/uiconfig/ui/optuserpage.ui @@ -1,460 +1,39 @@ - + - + True False 6 - 0 - none + vertical - + True False - 6 - 12 + 6 + 0 + none - + True False - 6 - 12 + 6 + 12 - - False - True - end - _Company: - True - company - - - 0 - 0 - - - - - False - True - end - First/last _name/initials: - True - firstname - - - 0 - 1 - - - - - False - True - end - _Street: - True - street - - - 0 - 4 - - - - - False - True - end - City/state/_zip: - True - city - - - 0 - 7 - - - - - False - True - end - Country/re_gion: - True - country - - - 0 - 8 - - - - - False - True - end - _Title/position: - True - title - - - 0 - 9 - - - - - False - True - end - Telephone (home/_work): - True - home - - - Home telephone number - - - - - 0 - 10 - - - - - False - True - end - Fa_x/e-mail: - True - fax - - - 0 - 11 - - - - - False - True - 6 - - - True - True - center - True - • - - - First name - - - - - 0 - 0 - - - - - True - True - center - True - • - - - Last name - - - - - 1 - 0 - - - - - True - True - center - • - 7 - - - Initials - - - - - 2 - 0 - - - - - 1 - 1 - - - - - False - True - 6 - - - True - True - center - True - • - - - City - - - - - 0 - 0 - - - - - True - True - center - True - • - - - State - - - - - 1 - 0 - - - - - True - True - center - • - 15 - - - Zip code - - - - - 2 - 0 - - - - - 1 - 7 - - - - - False - True - True - 6 - - - True - True - center - True - • - - - Title - - - - - 0 - 0 - - - - - True - True - center - True - • - - - Position - - - - - 1 - 0 - - - - - 1 - 9 - - - - - False - True - 6 - - - True - True - center - True - • - - - Home telephone number - - - - - 0 - 0 - - - - - True - True - center - True - • - - - Work telephone number - - - - - 1 - 0 - - - - - 1 - 10 - - - - - False - True - True - 6 - - - True - True - center - True - • - - - FAX number - - - - - 0 - 0 - - - - - True - True - center - True - • - - - email address - - - - - 1 - 0 - - - - - 1 - 11 - - - - - Use data for document properties + True - True - False - 0 - True - - - 1 - 12 - - - - False - True - end - Last name/first _name/father’s name/initials: - True - ruslastname - - - 0 - 2 - - - - - False - True - 6 + 6 + 12 - - True + + False True - center - True - • - - - Last name - - + end + _Company: + True + company 0 @@ -462,113 +41,758 @@ - - True + + False True - center - True - • + end + First/last _name/initials: + True + firstname + + + 0 + 1 + + + + + False + True + end + _Street: + True + street + + + 0 + 4 + + + + + False + True + end + City/state/_zip: + True + city + + + 0 + 7 + + + + + False + True + end + Country/re_gion: + True + country + + + 0 + 8 + + + + + False + True + end + _Title/position: + True + title + + + 0 + 9 + + + + + False + True + end + Telephone (home/_work): + True + home - - Father's name + + Home telephone number - 2 - 0 + 0 + 10 - - True + + False True - center - • - 7 - - - Initials - - + end + Fa_x/e-mail: + True + fax - 3 - 0 + 0 + 11 - - True + + False True - center - True - • - - - First name + 6 + + + True + True + center + True + • + + + First name + + + + 0 + 0 + + + + + True + True + center + True + • + + + Last name + + + + + 1 + 0 + + + + + True + True + center + • + 7 + + + Initials + + + + + 2 + 0 + 1 - 0 + 1 - - - 1 - 2 - - - - - False - True - end - Last/first _name/initials: - True - eastlastname - - - 0 - 3 - - - - - False - True - 6 - - True + + False True - center - True - • - - - Last name + 6 + + + True + True + center + True + • + + + City + + + + 0 + 0 + + + + + True + True + center + True + • + + + State + + + + + 1 + 0 + + + + + True + True + center + • + 15 + + + Zip code + + + + + 2 + 0 + - 0 - 0 + 1 + 7 - - True + + False True - center True - • - - - First name + 6 + + + True + True + center + True + • + + + Title + + + + 0 + 0 + + + + + True + True + center + True + • + + + Position + + + + + 1 + 0 + + + + + 1 + 9 + + + + + False + True + 6 + + + True + True + center + True + • + + + Home telephone number + + + + + 0 + 0 + + + + + True + True + center + True + • + + + Work telephone number + + + + + 1 + 0 + + + + + 1 + 10 + + + + + False + True + True + 6 + + + True + True + center + True + • + + + FAX number + + + + + 0 + 0 + + + + + True + True + center + True + • + + + email address + + + + + 1 + 0 + + + + + 1 + 11 + + + + + Use data for document properties + True + True + False + 0 + True + + + 1 + 12 + + + + + False + True + end + Last name/first _name/father’s name/initials: + True + ruslastname + + + 0 + 2 + + + + + False + True + 6 + + + True + True + center + True + • + + + Last name + + + + + 0 + 0 + + + + + True + True + center + True + • + + + Father's name + + + + + 2 + 0 + + + + + True + True + center + • + 7 + + + Initials + + + + + 3 + 0 + + + + + True + True + center + True + • + + + First name + + + + + 1 + 0 + + + + + 1 + 2 + + + + + False + True + end + Last/first _name/initials: + True + eastlastname + + + 0 + 3 + + + + + False + True + 6 + + + True + True + center + True + • + + + Last name + + + + + 0 + 0 + + + + + True + True + center + True + • + + + First name + + + + + 1 + 0 + + + + + True + True + center + • + 7 + + + Initials + + + + + 2 + 0 + + + + + 1 + 3 + + + + + False + True + end + _Street/apartment number: + True + russtreet + + + 0 + 5 + + + + + False + True + 6 + + + True + True + center + True + • + + + Street + + + + + 0 + 0 + + + + + True + True + center + • + 15 + + + Apartment number + + + + + 1 + 0 + + + + + 1 + 5 + + + + + False + True + end + _Zip/city: + True + izip + + + 0 + 6 + + + + + False + True + 6 + + + True + True + center + True + • + + + City + + + + + 1 + 0 + + + + + True + True + center + • + 15 + + + Zip code + + + + + 0 + 0 + + + + + 1 + 6 + + + + + False + True + True + + + True + True + center + True + • + + + 0 + 0 + + + + + 1 + 4 + + + + + False + True + True + + + True + True + center + True + • + + + 0 + 0 + + + + + 1 + 8 + + + + + False + True + True + + + True + True + center + True + • + + + 0 + 0 + @@ -577,239 +801,124 @@ - - True - True - center - • - 7 - - - Initials - - - - - 2 - 0 - + - - 1 - 3 - - - - - False - True - end - _Street/apartment number: - True - russtreet - - - 0 - 5 - - - - - False - True - 6 - - - True - True - center - True - • - - - Street - - - - - 0 - 0 - - - - - True - True - center - • - 15 - - - Apartment number - - - - - 1 - 0 - - - - - 1 - 5 - - - - - False - True - end - _Zip/city: - True - izip - - - 0 - 6 - - - - - False - True - 6 - - - True - True - center - True - • - - - City - - - - - 1 - 0 - - - - - True - True - center - • - 15 - - - Zip code - - - - - 0 - 0 - - - - - 1 - 6 - - - - - False - True - True - - - True - True - center - True - • - - - 0 - 0 - - - - - 1 - 4 - - - - - False - True - True - - - True - True - center - True - • - - - 0 - 0 - - - - - 1 - 8 - - - - - False - True - True - - - True - True - center - True - • - - - 0 - 0 - - - - - 1 - 0 - - - - + + + True + False + Address + + + + + + + False + True + 0 + - - - True + + False - Address - - - + 0 + none + + + True + False + 6 + 12 + + + False + 6 + 12 + + + False + end + OpenPGP signing key: + True + encryptionkey + + + 0 + 0 + + + + + False + end + OpenPGP encryption key: + True + encryptionkey + + + 0 + 1 + + + + + False + + + 1 + 1 + + + + + False + + + 1 + 0 + + + + + When encrypting documents, always encrypt to self + True + False + True + + + 1 + 2 + + + + + + + + + + + + False + Cryptography + True + + + + + + + False + True + 1 + diff --git a/officecfg/registry/schema/org/openoffice/UserProfile.xcs b/officecfg/registry/schema/org/openoffice/UserProfile.xcs index 4398968b8774..014a6ac18c4f 100644 --- a/officecfg/registry/schema/org/openoffice/UserProfile.xcs +++ b/officecfg/registry/schema/org/openoffice/UserProfile.xcs @@ -199,6 +199,27 @@ + + + + Specifies user's preferred OpenPGP key used for document signing + + + + + + + Specifies user's preferred OpenPGP key used for document encryption + + + + + + + Whether to encrypt documents for recipient(s) and also for the user with their preferred encryption key + + true +