Browse Source

P4TB-400: Improved manual key import. Part 1: UI.

master
Jörg Knobloch 12 months ago
parent
commit
1e3eb51e6c
6 changed files with 46 additions and 5 deletions
  1. +15
    -0
      addon/_locales/de/messages.json
  2. +15
    -0
      addon/_locales/en/messages.json
  3. +7
    -0
      addon/content/dialogs/options.css
  4. +1
    -1
      addon/content/dialogs/options.js
  5. +7
    -3
      addon/content/dialogs/options.xhtml
  6. +1
    -1
      addon/experiments.js

+ 15
- 0
addon/_locales/de/messages.json View File

@ -221,6 +221,21 @@
"optionsBrowse": {
"message": "Durchsuchen..."
},
"optionsPrivateOwnKeep": {
"message": "Nutzung als derzeitiger eigener Schlüssel und als PGP-Schlüssel für weitere eigene Nachrichten"
},
"optionsPrivateOwnSwitch": {
"message": "Nutzung als ehemaliger eigener Schlüssel, zu p≡p’s automatischem Schlüssel-Management wechseln"
},
"optionsPrivateGroup": {
"message": "Nutzung als derzeitiger PGP-Schlüssel für Gruppen oder Listen"
},
"optionsPublic": {
"message": "Nutzung als derzeitiger Schlüssel für Kommunikationspartner"
},
"optionsOther": {
"message": "Andere Nutzung"
},
"optionsImport": {
"message": "Importieren"
},


+ 15
- 0
addon/_locales/en/messages.json View File

@ -221,6 +221,21 @@
"optionsBrowse": {
"message": "Browse..."
},
"optionsPrivateOwnKeep": {
"message": "Use as current own key and keep this PGP key for own messages"
},
"optionsPrivateOwnSwitch": {
"message": "Use as former own key and switch to p≡p’s automated key management"
},
"optionsPrivateGroup": {
"message": "Use as current PGP key for group or list"
},
"optionsPublic": {
"message": "Use as current key for communication partner"
},
"optionsOther": {
"message": "Other use"
},
"optionsImport": {
"message": "Import"
},


+ 7
- 0
addon/content/dialogs/options.css View File

@ -98,6 +98,13 @@ label.donate {
background-color: #03AA4B;
}
#ImportOptions radio {
margin-top: 0;
margin-bottom: 0;
padding-top: 0;
padding-bottom: 0;
}
:root[lwt-tree-brighttext] label.donate {
color: white !important;
}

+ 1
- 1
addon/content/dialogs/options.js View File

@ -473,9 +473,9 @@ Preferences.addAll([
{ id: "extensions.pEp.protectSubjects", type: "bool" },
{ id: "extensions.pEp.passiveMode", type: "bool" },
{ id: "extensions.pEp.pEpSync", type: "bool" },
// { id: "extensions.pEp.keyFingerprint", type: "string" },
{ id: "extensions.pEp.passphraseForNewKeys", type: "bool" },
{ id: "extensions.pEp.keyLocation", type: "string" },
{ id: "extensions.pEp.keyUse", type: "string" },
{ id: "mailnews.database.global.indexer.enabled", type: "bool" },
{ id: "extensions.pEp.searchEncrypted", type: "bool" },
// examples with different types


+ 7
- 3
addon/content/dialogs/options.xhtml View File

@ -123,9 +123,6 @@
<html:b data-localekey="optionsCompatibilityHeaderImport"></html:b>
</html:p>
</html:div>
<html:div class="section">
<html:p data-localekey="optionsCompatibilityDetailImport"></html:p>
</html:div>
<html:div>
<html:label control="ascFile"
data-localekey="optionsASCFile">
@ -144,6 +141,13 @@
onclick="pEpOptions.browseForKey();">
</html:button>
</hbox>
<radiogroup id="ImportOptions" orient="vertical" preference="extensions.pEp.keyUse">
<radio value="keep" label-localekey="optionsPrivateOwnKeep"/>
<radio value="switch" label-localekey="optionsPrivateOwnSwitch"/>
<radio value="group" label-localekey="optionsPrivateGroup"/>
<radio value="public" label-localekey="optionsPublic"/>
<radio value="other" label-localekey="optionsOther"/>
</radiogroup>
<hbox class="button-group">
<html:button id="import"
data-localekey="optionsImport"


+ 1
- 1
addon/experiments.js View File

@ -60,8 +60,8 @@ function setPrefs(prefBranch) {
importRNP: false, // Will be set by the installer.
},
String: {
// keyFingerprint: "",
keyLocation: "",
keyUse: "other",
},
Int: {
// logLevel: 3, // LEVEL_DEBUG.


Loading…
Cancel
Save