Skip to content

Commit

Permalink
4.20 - Published 22/02/21
Browse files Browse the repository at this point in the history
  • Loading branch information
@RealRaven2000
RealRaven2000 committed Feb 22, 2021
1 parent ac43360 commit 3f8332e
Show file tree
Hide file tree
Showing 32 changed files with 352 additions and 315 deletions.
4 changes: 2 additions & 2 deletions build.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ pwsh -Command "(gc -en UTF8NoBOM manifest.json) -replace 'pre%oldRev%', 'pre%qui
rem "C:\Program Files\7-Zip\7z" a -xr!.svn quickFolders.zip install.rdf chrome.manifest chrome defaults license.txt
"C:\Program Files\7-Zip\7z" a -xr!.svn QuickFoldersWeb.zip manifest.json install.rdf chrome.manifest chrome defaults license.txt
echo %quickFoldersRev% > revision.txt
move QuickFolders*.xpi "..\..\Release\_Test Versions\4.19\"
move QuickFolders*.xpi "..\..\Release\_Test Versions\4.20\"
pwsh -Command "Start-Sleep -m 150"
rename QuickFoldersWeb.zip QuickFolders-wx-4.19.1pre%quickFoldersRev%.xpi
rename QuickFoldersWeb.zip QuickFolders-wx-4.20pre%quickFoldersRev%.xpi
120 changes: 0 additions & 120 deletions chrome-min.manifest
View file

This file was deleted.

129 changes: 60 additions & 69 deletions chrome/content/options.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ QuickFolders.Options = {
QF_PREF_LAYOUT : 2,
QF_PREF_ADVANCED : 1,
QF_PREF_GENERAL : 0,
prefMap : {},

// save space, for visually impaired
collapseHead: function collapseHead() {
Expand All @@ -47,10 +48,8 @@ QuickFolders.Options = {
rememberLastTab: function rememberLastTab() {
let tabbox = document.getElementById("QuickFolders-Options-Tabbox");
QuickFolders.Preferences.setIntPref('lastSelectedOptionsTab', tabbox.selectedIndex);
let observerService = Components.classes["@mozilla.org/observer-service;1"].getService(Components.interfaces.nsIObserverService);
observerService.notifyObservers(null, "quickfolders-options-saved", null);
} ,
accept: function accept(evt) {
const prefs = QuickFolders.Preferences;

Expand Down Expand Up @@ -97,6 +96,7 @@ QuickFolders.Options = {
Services.prompt.alert(null,"QuickFolders","Error in QuickFolders:\n" + e);
};
this.rememberLastTab();
QuickFolders.Interface.updateObserver(); // update the main window layout
return true;
} ,

Expand Down Expand Up @@ -208,17 +208,33 @@ QuickFolders.Options = {
util.logDebug("Skipping loadPreferences - Preferences object not defined");
return; // older versions of Thunderbird do not need this.
}
}
}
util.logDebug("loadPreferences - start:");

let myprefElements = document.querySelectorAll("[preference]");
let foundElements = {};
for (let myprefElement of myprefElements) {
let legacyPrefId = myprefElement.getAttribute("preference");
foundElements[legacyPrefId] = myprefElement;
}
let myprefs = document.getElementsByTagName("preference");
if (myprefs.length) {
let prefArray = [];
for (let it of myprefs) {
let p = new Object({ id: it.id,
name: it.getAttribute('name'),
type: it.getAttribute('type') });
if (it.getAttribute('instantApply') == "true") p.instantApply = true;
let p = new Object(
{
id: it.getAttribute('name'),
name: it.getAttribute('name'),
type: it.getAttribute('type')
}
);
this.prefMap[it.getAttribute('name')] = it.getAttribute('id'); // store original Id!
// not supported
// if (it.getAttribute('instantApply') == "true") p.instantApply = true;
prefArray.push(p);
// manually change the shortname in the preference attribute to the actual
// preference "id" (as in the preference manager)
foundElements[it.id].setAttribute("preference", it.getAttribute("name"));
}
util.logDebug("Adding " + prefArray.length + " preferences to Preferences loader…")
if (Preferences)
Expand Down Expand Up @@ -333,15 +349,7 @@ QuickFolders.Options = {
break;
}

// .0 private license, .1 domain license
// these are only for testing, so normal users shouldn't need them, default to '' via code
let EncryptionKey = prefs.getStringPref('premium.encryptionKey.' + QuickFolders.Crypto.key_type.toString());
/*
if (EncryptionKey) {
getElement('boxKeyGenerator').collapsed = false;
licenser.RSA_encryption = EncryptionKey;
}
*/


if (earlyExit) return;
if (licenser.isValidated)
Expand Down Expand Up @@ -414,14 +422,8 @@ QuickFolders.Options = {
}
);
});
try {
let selectOptionsPane = prefs.getIntPref('lastSelectedOptionsTab');
if (selectOptionsPane >=0) {
panels.selectedIndex = selectOptionsPane; // for some reason the tab doesn't get selected
panels.tabbox.selectedTab = panels.tabbox.tabs.childNodes[selectOptionsPane];
}
}
catch(e) { ; }
options.selectPane (prefs.getIntPref('lastSelectedOptionsTab'));

panels.addEventListener('select', function(evt) { QuickFolders.Options.onTabSelect(panels,evt); } );
options.configExtra2Button();

Expand All @@ -430,6 +432,18 @@ QuickFolders.Options = {

},

selectPane: function(selectOptionsPane) {
try {
let panels = document.getElementById('QuickFolders-Panels');
if (selectOptionsPane >=0) {
panels.selectedIndex = selectOptionsPane;
let firstTabOffset = (panels.tabbox.tabs.children[0].tagName == 'tab') ? 0 : 1;
panels.tabbox.selectedTab = panels.tabbox.tabs.children[selectOptionsPane + firstTabOffset];
}
}
catch(e) { ; }
} ,

initBling: function initBling (tabbox) {
const util = QuickFolders.Util,
prefs = QuickFolders.Preferences,
Expand Down Expand Up @@ -523,18 +537,16 @@ QuickFolders.Options = {

selectQuickMoveFormat: function selectQuickMoveFormat(menuList) {
let prefString1 = menuList.getAttribute('preference'),
prefName1 = document.getElementById(prefString1).getAttribute('name'),
val = menuList.value;
QuickFolders.Util.logDebug('Setting quick move format pref[' + prefName1 + ']: ' + val + '…');
QuickFolders.Preferences.setIntPreference(prefName1, parseInt(val));
QuickFolders.Util.logDebug('Setting quick move format pref[' + prefString1 + ']: ' + val + '…');
QuickFolders.Preferences.setIntPreference(prefString1, parseInt(val));
} ,

selectFolderCrossing: function selectFolderCrossing(menuList) {
let prefString = menuList.getAttribute('preference'),
prefName = document.getElementById(prefString).getAttribute('name'),
val = menuList.value;
QuickFolders.Util.logDebug('Setting folder crossing pref[' + prefName1 + ']: ' + val + '…');
QuickFolders.Preferences.setIntPreference(prefName, parseInt(val));
QuickFolders.Util.logDebug('Setting folder crossing pref[' + prefString + ']: ' + val + '…');
QuickFolders.Preferences.setIntPreference(prefString, parseInt(val));
} ,

enablePremiumConfig: function enablePremiumConfig(isEnabled) {
Expand Down Expand Up @@ -912,20 +924,6 @@ QuickFolders.Options = {
lightweight: 4
} ,

toggleMutexCheckbox: function toggleMutexCheckbox(cbox, cbox2Name) {
const prefs = QuickFolders.Preferences;
let prefString1 = cbox.getAttribute('preference'),
prefName1 = document.getElementById(prefString1).getAttribute('name'),
cbox2 = document.getElementById(cbox2Name);
if(!prefs.getBoolPrefVerbose(prefName1)) { // not yet checked but will be after event is propagated.
let prefString2 = cbox2.getAttribute('preference'),
prefName2 = document.getElementById(prefString2).getAttribute('name');
// uncheck the other checkbox
if (prefs.getBoolPrefVerbose(prefName2))
prefs.setBoolPrefVerbose(prefName2, false);
}
},

setDefaultButtonRadius: function setDefaultButtonRadius() {
const prefs = QuickFolders.Preferences;
document.getElementById('QuickFolders-Options-CustomTopRadius').value = "4";
Expand Down Expand Up @@ -1016,7 +1014,7 @@ QuickFolders.Options = {
prefs.setStringPref('currentFolderBar.background', styleValue);
prefs.setStringPref('currentFolderBar.background.selection', choice);
if (Preferences) {
Preferences.get('qfpa-CurrentFolder-Background')._value=styleValue;
Preferences.get('extensions.quickfolders.currentFolderBar.background')._value=styleValue;
}
//if (withUpdate)
// QuickFolders.Interface.updateMainWindow();
Expand Down Expand Up @@ -1222,36 +1220,32 @@ QuickFolders.Options = {
},

changeTextPreference: function changeTextPreference(txtBox) {
let prefString = txtBox.getAttribute("preference"),
pref = document.getElementById(prefString);
let prefString = txtBox.getAttribute("preference");

if (pref) {
let name = pref.getAttribute('name');
if(name)
QuickFolders.Preferences.setIntPreference(name, txtBox.value);
else
QuickFolders.Util.logToConsole('changeTextPreference could not find pref string: ' + prefString);
}
if (Preferences.get(prefString))
QuickFolders.Preferences.setIntPreference(prefString, txtBox.value);
else
QuickFolders.Util.logToConsole('changeTextPreference could not find pref string: ' + prefString);
return QuickFolders.Interface.updateMainWindow(false);
},

// doing what instantApply really should provide...
toggleBoolPreference: function toggleBoolPreference(cb, noUpdate) {
const util = QuickFolders.Util,
QI = util.getMail3PaneWindow().QuickFolders.Interface;
let prefString = cb.getAttribute("preference"),
pref = document.getElementById(prefString);
let prefString = cb.getAttribute("preference");

if (pref)
QuickFolders.Preferences.setBoolPrefVerbose(pref.getAttribute('name'), cb.checked);
if (prefString)
QuickFolders.Preferences.setBoolPrefVerbose(prefString, cb.checked);
if (noUpdate)
return true;
switch (pref) {
return false;
switch (prefString) {
case 'extensions.quickfolders.collapseCategories':
QI.updateCategoryLayout();
return;
return false;
}
return QI.updateMainWindow(false); // force full updated
QI.updateMainWindow(false); // force full updated
return false;
},

toggleColorTranslucent: function toggleColorTranslucent(cb, pickerId, label, userStyle) {
Expand All @@ -1261,12 +1255,9 @@ QuickFolders.Options = {
if (userStyle)
QuickFolders.Preferences.setUserStyle(userStyle, 'background-color', picker.value);

// problems with instantapply?
let prefString = cb.getAttribute("preference"),
pref = document.getElementById(prefString);

if (pref)
QuickFolders.Preferences.setBoolPrefVerbose(pref.getAttribute('name'), cb.checked);
let prefString = cb.getAttribute("preference");
if (prefString)
QuickFolders.Preferences.setBoolPrefVerbose(prefString, cb.checked);

return QuickFolders.Interface.updateMainWindow(true);
},
Expand Down
Loading

0 comments on commit 3f8332e

Please sign in to comment.