Browse Source

P4TB-400: Follow-up: Tweak UI, remove some options and rename "Cancel" button to "Other use".

master
Jörg Knobloch 11 months ago
parent
commit
f50bdf2777
5 changed files with 16 additions and 21 deletions
  1. +2
    -5
      addon/_locales/de/messages.json
  2. +2
    -5
      addon/_locales/en/messages.json
  3. +6
    -6
      addon/content/dialogs/options.js
  4. +5
    -4
      addon/content/dialogs/options.xhtml
  5. +1
    -1
      addon/experiments.js

+ 2
- 5
addon/_locales/de/messages.json View File

@ -227,9 +227,6 @@
"optionsPrivateGroup": {
"message": "Nutzung als derzeitiger PGP-Schlüssel für Gruppen oder Listen"
},
"optionsOther": {
"message": "Andere Nutzung"
},
"optionsImport": {
"message": "Importieren"
},
@ -302,8 +299,8 @@
"optionsApply": {
"message": "Anwenden"
},
"optionsCancel": {
"message": "Abbrechen"
"optionsOtherUse": {
"message": "Andere Nutzung"
},
"optionsClose": {
"message": "Schließen"


+ 2
- 5
addon/_locales/en/messages.json View File

@ -227,9 +227,6 @@
"optionsPrivateGroup": {
"message": "Use as current PGP key for group or list"
},
"optionsOther": {
"message": "Other use"
},
"optionsImport": {
"message": "Import"
},
@ -302,8 +299,8 @@
"optionsApply": {
"message": "Apply"
},
"optionsCancel": {
"message": "Cancel"
"optionsOtherUse": {
"message": "Other use"
},
"optionsClose": {
"message": "Close"


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

@ -348,7 +348,7 @@ var pEpOptions = {
},
browseForKey() {
this.cancelKey();
this.clearKey();
let fp = Cc["@mozilla.org/filepicker;1"].createInstance(Ci.nsIFilePicker);
@ -376,7 +376,7 @@ var pEpOptions = {
},
async importKey() {
this.cancelKey();
this.clearKey();
// Workaround for ENGINE-808.
if (Services.prefs.getBoolPref("extensions.pEp.grouped", false)) {
@ -479,7 +479,7 @@ var pEpOptions = {
}
let button1 = document.getElementById("applyKey");
button1.removeAttribute("hidden");
let button2 = document.getElementById("cancelKey");
let button2 = document.getElementById("clearKey");
button2.removeAttribute("hidden");
gImportResult = result;
@ -503,7 +503,7 @@ var pEpOptions = {
}
},
cancelKey() {
clearKey() {
let importResult = document.getElementById("importResult");
importResult.textContent = "";
importResult.setAttribute("hidden", "hidden");
@ -515,7 +515,7 @@ var pEpOptions = {
importOptions.setAttribute("hidden", "true");
let button1 = document.getElementById("applyKey");
button1.setAttribute("hidden", "true");
let button2 = document.getElementById("cancelKey");
let button2 = document.getElementById("clearKey");
button2.setAttribute("hidden", "true");
},
@ -571,7 +571,7 @@ var pEpOptions = {
}
}
this.cancelKey();
this.clearKey();
},
updateGloda() {


+ 5
- 4
addon/content/dialogs/options.xhtml View File

@ -151,9 +151,10 @@
</html:div>
<radiogroup id="importOptions" hidden="true" orient="vertical" preference="extensions.pEp.keyUse">
<radio value="keep" label-localekey="optionsPrivateOwnKeep"/>
<!-- May be implemented later
<radio value="switch" label-localekey="optionsPrivateOwnSwitch"/>
<radio value="group" label-localekey="optionsPrivateGroup"/>
<radio value="other" label-localekey="optionsOther"/>
-->
</radiogroup>
<html:input is="autocomplete-input" id="commPartnerAddress"
hidden="hidden"
@ -172,10 +173,10 @@
data-localekey="optionsApply"
onclick="pEpOptions.applyKey();">
</html:button>
<html:button id="cancelKey"
<html:button id="clearKey"
hidden="true"
data-localekey="optionsCancel"
onclick="pEpOptions.cancelKey();">
data-localekey="optionsOtherUse"
onclick="pEpOptions.clearKey();">
</html:button>
</hbox>
<hbox class="button-group">


+ 1
- 1
addon/experiments.js View File

@ -61,7 +61,7 @@ function setPrefs(prefBranch) {
},
String: {
keyLocation: "",
keyUse: "other",
keyUse: "keep",
},
Int: {
// logLevel: 3, // LEVEL_DEBUG.


Loading…
Cancel
Save