5.1 maintenance release

RealRaven2000 · Dec 10, 2020 · 11db602 · 11db602
1 parent 9eb3cd3
commit 11db602
Show file tree

Hide file tree

Showing 37 changed files with 356 additions and 1,265 deletions.
diff --git a/build.bat b/build.bat
@@ -4,9 +4,8 @@ set /a oldRev=%quickFoldersRev%
 set /a quickFoldersRev+=1
 REM replace previous rev with new
 pwsh -Command "(gc -en UTF8NoBOM manifest.json) -replace 'pre%oldRev%', 'pre%quickFoldersRev%' | Out-File manifest.json"
-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 _locales chrome popup license.txt *.js release-notes.html
 echo %quickFoldersRev% > revision.txt
-move QuickFolders*.xpi "..\..\..\Release\_Test Versions\5.0\"
+move QuickFolders*.xpi "..\..\..\Release\_Test Versions\5.1\"
 pwsh -Command "Start-Sleep -m 150"
-rename QuickFoldersWeb.zip QuickFolders-wx-5.0pre%quickFoldersRev%.xpi
+rename QuickFoldersWeb.zip QuickFolders-wx-5.1pre%quickFoldersRev%.xpi
diff --git a/chrome.manifest b/chrome.manifest
diff --git a/chrome/content/api/Utilities/implementation.js b/chrome/content/api/Utilities/implementation.js
@@ -42,6 +42,13 @@ var Utilities = class extends ExtensionCommon.ExtensionAPI {
           return  win.QuickFolders.Util.hasPremiumLicense(false);
         },
 
+        LicensedDaysLeft() {
+          let today = new Date(),
+              licensedDate = new Date(win.QuickFolders.Licenser.DecryptedDate),
+              daysLeft = parseInt((licensedDate - today) / (1000 * 60 * 60 * 24)); 
+          return daysLeft;
+        },
+
         getAddonVersion: function() {
           return win.QuickFolders.Util.Version;
         },

diff --git a/chrome/content/api/Utilities/schema.json b/chrome/content/api/Utilities/schema.json
@@ -29,6 +29,13 @@
         "parameters": []
       },
 
+      {
+        "name": "LicensedDaysLeft",
+        "type": "function",
+        "async": true,
+        "parameters": []
+      },
+
       {
         "name": "isLicensed",
         "type": "function",

diff --git a/chrome/content/change-order.css b/chrome/content/change-order.css
@@ -1,6 +1,6 @@
 
 hbox#qf-header:before {
-	content: url("chrome://quickfolders/content/skin/ico/quickfolders-Icon.png");
+	content: url("chrome://quickfolders/content/skin/ico/QuickFolders_32.svg");
 	margin: 0.2em 0.5em 0em 0.2em;
 }
 hbox#qf-header {
@@ -9,7 +9,7 @@ hbox#qf-header {
 	background-color: rgb(154,201,244);
 	color: #fff;
 	padding: 5px 8px;
-	border-radius: 0.8em;
+	border-radius: 0.1em;
 	border: 1px solid #aaa;
 	box-shadow: inset 0px 0px 10px #666;
 }
@@ -19,6 +19,7 @@ description#Explain-Drag {
 }
 
 #qf-options-header {
+  display: inline-block;
 	vertical-align: top;
 	margin-top: 0.5em;
 }
@@ -30,9 +31,6 @@ description#Explain-Drag {
 	color: none;
 }
 
-
-
-
 vbox#myscrollbox {
   overflow: auto;
   max-height:650px;
@@ -51,20 +49,32 @@ hbox.drag-image {
   margin-bottom: 20px;
 }
 
+#QuickFolders-change-order-grid button {
+  -moz-appearance: none;
+  border: 1px solid darkgray !important;
+  border-radius: 3px;
+  padding-left: 1.5em;
+  padding-bottom: 0.1em;
+}
+#QuickFolders-change-order-grid button:hover {
+  color: -moz-dialogtext;
+}
+button * {
+  margin: auto;
+  text-align: center;
+}
+
 button.order-button-up {
-/*    -moz-appearance: button-small; */
-    max-height: 1.9em !important;
-    list-style-image: url("chrome://quickfolders/content/skin/ico/dropUp.gif") !important;
+  max-height: 1.9em !important;
+  list-style-image: url("chrome://quickfolders/content/skin/ico/dropUp.gif") !important;
 }
 button.order-button-down {
-/*    -moz-appearance: button-small; */
-    max-height: 1.9em !important;
-    list-style-image: url("chrome://quickfolders/content/skin/ico/dropDown.gif") !important;
+  max-height: 1.9em !important;
+  list-style-image: url("chrome://quickfolders/content/skin/ico/dropDown.gif") !important;
 }
 
 rows#QuickFolders-change-order-grid-rows row
 {
   line-height: 1.8em !important;
-  /*overflow: auto;*/
 }
 
diff --git a/chrome/content/change-order.xhtml b/chrome/content/change-order.xhtml
@@ -1,7 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<?xml-stylesheet href="change-order.css" type="text/css"?>
+
+<!--  tb 78 -->
+<?xml-stylesheet href="chrome://global/skin/xul.css" type="text/css"?>
+<?xml-stylesheet href="chrome://messenger/skin/input-fields.css" type="text/css" ?>
+<?xml-stylesheet href="chrome://messenger/skin/themeableDialog.css" type="text/css"?>
+<?xml-stylesheet href="chrome://global/content/widgets.css" type="text/css"?>
+
+
+<?xml-stylesheet href="chrome://quickfolders/content/change-order.css" type="text/css"?>
 
 <!DOCTYPE dialog SYSTEM "chrome://quickfolders/locale/change_order.dtd" >
 
@@ -16,18 +24,19 @@
 		var QuickFolders = window.arguments[0];
 	</script>
 
-<hbox id="qf-header" >
-	<hbox id="qf-options-header" flex="12">
-		<label class="dialogheader-title"
-			value="&qf.dialog.changeorder;"
-			flex="1"/>
+  <hbox id="qf-header" >
+    <hbox id="qf-options-header" flex="12">
+      <label class="dialogheader-title"
+        value="&qf.dialog.changeorder;"
+        flex="1"/>
+
+      <label id="qf-options-header-description"/>
+    </hbox>
+  </hbox>
 
-		<label id="qf-options-header-description"/>
-	</hbox>
-</hbox>
  	<description style="max-width:455px" id="Explain-Drag">
-     &qf.description.dragexplain;
-    </description>
+   &qf.description.dragexplain;
+  </description>
 
     <hbox class="drag-image">
       <image src="chrome://quickfolders/content/skin/ico/Drag-Tabs.gif" />
@@ -54,5 +63,5 @@
 		    	</row>
 	    	</rows>
 	    </grid>
-    </vbox >
+    </vbox>
 </dialog>
diff --git a/chrome/content/currentFolderSingleMessage.xul b/chrome/content/currentFolderSingleMessage.xul
diff --git a/chrome/content/options.js b/chrome/content/options.js
@@ -362,8 +362,8 @@ QuickFolders.Options = {
 
     // .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());
 		/*
+    let EncryptionKey = prefs.getStringPref('premium.encryptionKey.' + QuickFolders.Crypto.key_type.toString());
     if (EncryptionKey) {
       getElement('boxKeyGenerator').collapsed = false;
       licenser.RSA_encryption = EncryptionKey;

diff --git a/chrome/content/options.xhtml b/chrome/content/options.xhtml
@@ -251,6 +251,7 @@
 											 tooltiptext="&qf.label.goNextUnread.tip;"
 											 />
 								<menulist sizetopopup="none"
+                          id = "folderCrossing"
 													preference="qfpg-Thunderbird-Preference-FolderCrossing"
 													instantApply="true"
 													oncommand="options.selectFolderCrossing(this);">