diff --git a/build.bat b/build.bat index 22fb3e894..fe6d8a347 100644 --- 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 \ No newline at end of file +rename QuickFoldersWeb.zip QuickFolders-wx-5.1pre%quickFoldersRev%.xpi \ No newline at end of file diff --git a/chrome.manifest b/chrome.manifest deleted file mode 100644 index 66d964691..000000000 --- a/chrome.manifest +++ /dev/null @@ -1,65 +0,0 @@ -content quickfolders chrome/content/ - -locale quickfolders en-US chrome/locale/en-US/ -locale quickfolders ca chrome/locale/ca/ -locale quickfolders de chrome/locale/de/ -locale quickfolders es-MX chrome/locale/es-MX/ -locale quickfolders es chrome/locale/es/ -locale quickfolders fr chrome/locale/fr/ -locale quickfolders hu-HU chrome/locale/hu-HU/ -locale quickfolders it chrome/locale/it/ -locale quickfolders ja-JP chrome/locale/ja-JP/ -locale quickfolders nl chrome/locale/nl/ -locale quickfolders pl chrome/locale/pl/ -locale quickfolders pt-BR chrome/locale/pt-BR/ -locale quickfolders ru chrome/locale/ru/ -locale quickfolders sl-SI chrome/locale/sl-SI/ -locale quickfolders sr chrome/locale/sr/ -locale quickfolders sv-SE chrome/locale/sv-SE/ -locale quickfolders vi chrome/locale/vi/ -locale quickfolders zh-CN chrome/locale/zh-CN/ -locale quickfolders zh-CHS chrome/locale/zh-CN/ -locale quickfolders zh chrome/locale/zh/ -locale quickfolders zh-CHT chrome/locale/zh/ -locale quickfolders zh-TW chrome/locale/zh/ - -#ALL -#overlay chrome://messenger/content/messenger.xul chrome://quickfolders/content/overlayCurrentfolder.xul -#overlay chrome://messenger/content/messageWindow.xul chrome://quickfolders/content/currentFolderSingleMessage.xul -#overlay chrome://messenger/content/SearchDialog.xul chrome://quickfolders/content/overlaySearchDialog.xul -#overlay chrome://messenger/content/FilterListDialog.xul chrome://quickfolders/content/overlayFilterList.xul - -# messengercompose.xul (MailCompose Window) -#overlay chrome://messenger/content/messengercompose/messengercompose.xul chrome://quickfolders/content/overlayComposer.xul - -# replace mailWindowOverlay.xul with messenger.xul! -#TB3+ -overlay chrome://messenger/content/mailWindowOverlay.xul chrome://quickfolders/content/scrollPatch/scrollMenus.xul application={3550f703-e582-4d05-9a08-453d09bdfdc6} -#overlay chrome://messenger/content/messenger.xul chrome://quickfolders/content/overlay.xul - - -#Toolbox - moved to separate file to re-implement quickmove in Tb70+ -# TB 68: -#overlay chrome://quickfolders/content/overlay.xul chrome://quickfolders/content/qf-tools.xul -// TB 78: -#overlay chrome://quickfolders/content/overlay.xul chrome://quickfolders/content/qf-tools69.xul platformversion>=69.0 - -##Style Tweaks -#All -#style chrome://messenger/content/customizeToolbar.xul chrome://quickfolders/content/quickfolders-layout.css -#style chrome://messenger/content/messenger.xul chrome://quickfolders/content/quickfolders-68.css - -# hidden option for revealing small icons checkbox: -#overlay chrome://messenger/content/customizeToolbar.xul chrome://quickfolders/content/overlayCustomizeToolbar.xul - - -## modern styles - new monochrome icons for Thunderbird 60 -style chrome://messenger/content/customizeToolbar.xul chrome://quickfolders/content/quickfolders-mods.css - -style chrome://global/content/alerts/alert.xul chrome://quickfolders/content/quickfolders-alert.css -style chrome://quickfolders/content/register.xhtml chrome://quickfolders/content/skin/quickfolders-widgets.css -#style chrome://quickfolders/content/overlay.xul chrome://quickfolders/content/skin/quickfolders-widgets.css -#style chrome://quickfolders/content/overlay.xul chrome://quickfolders/content/quickfolders-filters.css -#style chrome://messenger/content/messenger.xul chrome://quickfolders/content/qf-foldertree.css - - diff --git a/chrome/content/api/Utilities/implementation.js b/chrome/content/api/Utilities/implementation.js index 751d850d4..65c179fd1 100644 --- 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 index 1a47c4f8f..8307816f2 100644 --- 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 index b8204f415..952c5d5a9 100644 --- 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 index b5c6d9a6e..522f9d55b 100644 --- a/chrome/content/change-order.xhtml +++ b/chrome/content/change-order.xhtml @@ -1,7 +1,15 @@ - + + + + + + + + + @@ -16,18 +24,19 @@ var QuickFolders = window.arguments[0]; - - - - - &qf.description.dragexplain; - + &qf.description.dragexplain; + @@ -54,5 +63,5 @@ - + \ No newline at end of file diff --git a/chrome/content/currentFolderSingleMessage.xul b/chrome/content/currentFolderSingleMessage.xul deleted file mode 100644 index ff8aa5836..000000000 --- a/chrome/content/currentFolderSingleMessage.xul +++ /dev/null @@ -1,115 +0,0 @@ - - - - - - - - - - - diff --git a/chrome/content/overlayComposer.xul b/chrome/content/overlayComposer.xul deleted file mode 100644 index 4e5adfe8f..000000000 --- a/chrome/content/overlayComposer.xul +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/chrome/content/overlayFilterList.xul b/chrome/content/overlayFilterList.xul deleted file mode 100644 index 4aa336cb2..000000000 --- a/chrome/content/overlayFilterList.xul +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - -