diff options
author | Caolán McNamara <caolanm@redhat.com> | 2012-04-27 10:50:08 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2012-04-27 11:12:41 +0100 |
commit | 207313157688d79cb0d53e920a03423c81a7bc23 (patch) | |
tree | 3a736cb0b7362fb3fff156b36fea1f76542a70ec /cui/source/options/optinet2.src | |
parent | 70115479f1775788ffedf6e0436b09d539491c89 (diff) |
Resolves: fdo#39825 Make detection of certificate folder ui-configurable
Display in the (unix) options gui the NSS cert dir that has been auto-detected
for use with digital signatures. Show the other detected possibilities and
allow it to be overridden.
The autodetection should basically work out of the box, but if there's some
bustage at least the UI can be used to sort it out and/or let developers
debug it.
This removes the need for the horrible MOZILLA_CERTIFICATE_FOLDER hack,
though that's still supported.
Diffstat (limited to 'cui/source/options/optinet2.src')
-rw-r--r-- | cui/source/options/optinet2.src | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/cui/source/options/optinet2.src b/cui/source/options/optinet2.src index 353ededbb016..029c46e311bb 100644 --- a/cui/source/options/optinet2.src +++ b/cui/source/options/optinet2.src @@ -371,6 +371,25 @@ TabPage RID_SVXPAGE_INET_SECURITY Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ); Text [ en-US ] = "Macro Security..."; }; + FixedLine FL_SEC_CERTPATH + { + Pos = MAP_APPFONT( COL_0, ROW_7 ); + Size = MAP_APPFONT( COL_4-COL_0, RSC_CD_FIXEDLINE_HEIGHT ); + Text [ en-US ] = "Certificate Path"; + }; + FixedText FI_SEC_CERTPATH + { + Pos = MAP_APPFONT( COL_1, ROW_8 ); + Size = MAP_APPFONT( COL_2-COL_1, 3*RSC_CD_FIXEDLINE_HEIGHT ); + Wordbreak = TRUE; + Text [ en-US ] = "Select the Network Security Services certificate directory to use for digital signatures."; + }; + PushButton PB_SEC_CERTPATH + { + Pos = MAP_APPFONT( COL_3, ROW_9a ); + Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ); + Text [ en-US ] = "Certificate..."; + }; String STR_SEC_NOPASSWDSAVE { Text [ en-US ] = "Disabling the function to persistently store passwords deletes the list of passwords stored and resets the master password.\n\nDo you want to delete password list and reset master password?"; @@ -478,4 +497,3 @@ TabPage RID_SVXPAGE_INET_MAIL }; // ******************************************************************* EOF - |