Added Dropbox options to Zotero 6

bootstrap.js

@@ -7,6 +7,7 @@ var Zotero_File_Exporter;
 var Zotero_File_Interface;
 var ZoteroPane_Local;
 var Zotero_File_Interface;
+var FilePicker;
 var fflate;
 var ZeNotes;
 var setImmediate = function(){};
@@ -253,6 +254,7 @@ async function startup({ id, version, resourceURI, rootURI = resourceURI.spec })
 
 	Services.scriptloader.loadSubScript(rootURI + 'lib/fflate/index.js');
 	Services.scriptloader.loadSubScript(rootURI + 'lib/CryptoJS 3.1.2/aes.js');
+	Services.scriptloader.loadSubScript(rootURI + 'core/filepicker6.js');
 	Services.scriptloader.loadSubScript(rootURI + 'core/settings.js');
 	Services.scriptloader.loadSubScript(rootURI + 'core/dropbox.js');
 	Services.scriptloader.loadSubScript(rootURI + 'core/zenotes.js');
@@ -282,6 +284,7 @@ async function startup({ id, version, resourceURI, rootURI = resourceURI.spec })
 	Zotero_File_Interface = Zotero.getMainWindow().Zotero_File_Interface;
 	ZoteroPane_Local = Zotero.getMainWindow().ZoteroPane_Local;
 	Zotero_File_Interface  = Zotero.getMainWindow().Zotero_File_Interface;
+	FilePicker  = Zotero.getMainWindow().FilePicker;
 	Menu.addToAllWindows();
 	ZeNotes.Prefs = Prefs;
 	ZeNotes.Database = Database;

content/settings/preferences.js

@@ -588,7 +588,7 @@ Zotero_Preferences.ZeNotes = {
 		var isdark = Zotero.Prefs.get('general.theme')=="dark" || window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches;
 
 		if (isdark) {
-			var filename = "chrome://ze-notes/content/settings/preferences-dark.css";
+			var filename = "chrome://zenotes/content/settings/preferences-dark.css";
 			var pi = document.createProcessingInstruction(
 				'xml-stylesheet',
 				`type="text/css" href="${filename}"`

content/settings/preferences.xul

@@ -18,7 +18,7 @@
 
 	<script src="chrome://zotero/content/include.js"></script>
 	<script src="chrome://zotero/content/charsetMenu.js"></script>
-	<script src="chrome://ze-notes/content/settings/preferences.js" type="application/javascript"/>
+	<script src="chrome://zenotes/content/settings/preferences.js" type="application/javascript"/>
 
 	<script type="application/javascript">
 	<![CDATA[		
@@ -28,8 +28,8 @@
 			var znpref = document.createElement("prefpane");
 			znpref.setAttribute("id", "zotero-prefpane-zenotes");
 			znpref.setAttribute("label", "Ze Notes");
-			znpref.setAttribute("image", "chrome://ze-notes/content/images/zenotes-settings.png");
-			znpref.setAttribute("src", "chrome://ze-notes/content/settings/preferences6.xul");
+			znpref.setAttribute("image", "chrome://zenotes/content/images/zenotes-settings.png");
+			znpref.setAttribute("src", "chrome://zenotes/content/settings/preferences6.xul");
 			prefwindow.addPane(znpref);
 			prefwindow.showPane(znpref);
 			this.addEventListener("resize", function(e){

content/settings/preferences6.xul

@@ -21,6 +21,7 @@
 				<tab id="zn-custom-api-settings" label="Custom Generative AI"/>
 				<tab id="zn-prompt-settings" label="Custom prompts"/>
 				<tab id="zn-prompt-data-settings" label="Prompts data"/>
+				<tab id="zn-dropbox-panel" label="Dropbox settings"/>
 				<tab id="zn-global-settings" label="Global setting"/>
 				<tab id="zn-advanced-settings" label="Advanced"/>
 			</tabs>
@@ -67,6 +68,13 @@
 						<box class="zn-include" src="exclude-from-prompt.xhtml" onload="Zotero_Preferences.ZeNotes.initpanel('exclude-from-prompt')"> </box>
 					</groupbox>
 				</tabpanel>
+
+				<tabpanel orient="vertical" id="zn-dropbox-panel">
+					<groupbox>
+						<caption label="Dropbox settings"/>
+						<box class="zn-include" src="dropbox.xhtml" onload="Zotero_Preferences.ZeNotes.initpanel('dropbox')"> </box>
+					</groupbox>
+				</tabpanel>
 				<tabpanel orient="vertical" id="zn-global-panel">
 					<groupbox>
 						<caption label="Global display"/>
@@ -95,18 +103,18 @@
 		</html:div>
 
 	</prefpane>
-	<html:link rel="stylesheet" type="text/css" href="chrome://ze-notes/content/lib/jquery-contextmenu/2.9.2/jquery.contextMenu.min.css" />
-	<html:link rel="stylesheet" type="text/css" href="chrome://ze-notes/content/lib/fontawesome/6.1.1/css/all.min.css" />
-	<html:link rel="stylesheet" type="text/css" href="chrome://ze-notes/content/settings/preferences.css" />
-	<html:link rel="stylesheet" type="text/css" href="chrome://ze-notes/content/settings/preferences6.css" />
+	<html:link rel="stylesheet" type="text/css" href="chrome://zenotes/content/lib/jquery-contextmenu/2.9.2/jquery.contextMenu.min.css" />
+	<html:link rel="stylesheet" type="text/css" href="chrome://zenotes/content/lib/fontawesome/6.1.1/css/all.min.css" />
+	<html:link rel="stylesheet" type="text/css" href="chrome://zenotes/content/settings/preferences.css" />
+	<html:link rel="stylesheet" type="text/css" href="chrome://zenotes/content/settings/preferences6.css" />
 
-	<script src="chrome://ze-notes/content/lib/jquery/3.6.0/jquery.min.js" type="application/javascript"></script>
-	<script src="chrome://ze-notes/content/lib/jquery-ui/1.13.2/jquery-ui.min.js" type="application/javascript"></script>
-	<script src="chrome://ze-notes/content/lib/jquery-contextmenu/2.9.2/jquery.ui.position.min.js" type="application/javascript"></script>
-	<script src="chrome://ze-notes/content/lib/jquery-contextmenu/2.9.2/jquery.contextMenu.min.js" type="application/javascript"></script>
-	<script src="chrome://ze-notes/content/settings/zotero.js" type="application/javascript"></script>
-	<script src="chrome://ze-notes/content/settings/zntable.js" type="application/javascript"></script>
-	<script src="chrome://ze-notes/content/settings/languages.js" type="application/javascript"></script>
-	<script src="chrome://ze-notes/content/settings/preferences.js" type="application/javascript"></script>
-	<script src="chrome://ze-notes/content/settings/preferences6.js" type="application/javascript"/>
+	<script src="chrome://zenotes/content/lib/jquery/3.6.0/jquery.min.js" type="application/javascript"></script>
+	<script src="chrome://zenotes/content/lib/jquery-ui/1.13.2/jquery-ui.min.js" type="application/javascript"></script>
+	<script src="chrome://zenotes/content/lib/jquery-contextmenu/2.9.2/jquery.ui.position.min.js" type="application/javascript"></script>
+	<script src="chrome://zenotes/content/lib/jquery-contextmenu/2.9.2/jquery.contextMenu.min.js" type="application/javascript"></script>
+	<script src="chrome://zenotes/content/settings/zotero.js" type="application/javascript"></script>
+	<script src="chrome://zenotes/content/settings/zntable.js" type="application/javascript"></script>
+	<script src="chrome://zenotes/content/settings/languages.js" type="application/javascript"></script>
+	<script src="chrome://zenotes/content/settings/preferences.js" type="application/javascript"></script>
+	<script src="chrome://zenotes/content/settings/preferences6.js" type="application/javascript"/>
 </overlay>

core/filepicker6.js

@@ -0,0 +1,28 @@
+function FilePicker6() 
+{
+	this.defaultExtension = "";
+	this.returnOK = 0;
+	this.returnReplace = 2;
+	this.nsIFilePicker = Components.interfaces.nsIFilePicker;
+	this.fp = Components.classes["@mozilla.org/filepicker;1"].createInstance(this.nsIFilePicker);
+    this.modeSave = this.nsIFilePicker.modeSave;
+    this.modeOpen = this.nsIFilePicker.modeOpen;
+}
+
+FilePicker6.prototype.init = function(w, title, mode) {
+    return this.fp.init(w, title, mode);
+};
+
+FilePicker6.prototype.appendFilter = function(filter, extension) {
+    return this.fp.appendFilter(filter, extension);
+};
+
+FilePicker6.prototype.show = function() {
+    var wm = this;
+    return new Promise(function(resolve, reject) {
+        wm.fp.open(function(result) {
+			wm.file = wm.fp.file.path;
+			resolve(result);
+        });
+    });
+};

core/io.js

@@ -1,9 +1,11 @@
-var { OS } = ChromeUtils.importESModule("chrome://zotero/content/osfile.mjs");
-var { FilePicker } = ChromeUtils.importESModule('chrome://zotero/content/modules/filePicker.mjs');
-
 Io = {
 	async savedialog(title, filter, extension, defaultstring, contents)
 	{
+		if(!FilePicker)
+		{
+			FilePicker = FilePicker6;
+		}
+
 		let fp = new FilePicker();
 		fp.init(window, title, fp.modeSave);
 		fp.appendFilter(filter, extension);
@@ -17,6 +19,11 @@ Io = {
 	},
 	async loaddialog(title, filter, extension, defaultstring)
 	{
+		if(!FilePicker)
+		{
+			FilePicker = FilePicker6;
+		}
+
 		let fp = new FilePicker();
 		fp.init(window, title, fp.modeOpen);
 		fp.appendFilter(filter, extension);
@@ -28,4 +35,4 @@ Io = {
 			return await Zotero.File.getContentsAsync("file:///"+outputFile);
 		}
 	}
-}
+}

core/settings.js

@@ -4,8 +4,8 @@ Settings = {
 		var znpref = win.document.createElement("prefpane");
 		znpref.setAttribute("id", "zotero-prefpane-zenotes");
 		znpref.setAttribute("label", "Ze Notes");
-		znpref.setAttribute("image", "chrome://ze-notes/content/images/zenotes-settings.png");
-		znpref.setAttribute("src", "chrome://ze-notes/content/settings/preferences6.xul");
+		znpref.setAttribute("image", "chrome://zenotes/content/images/zenotes-settings.png");
+		znpref.setAttribute("src", "chrome://zenotes/content/settings/preferences6.xul");
 		prefwindow.addPane(znpref);
 	},
 	inject(){

core/ui.js

@@ -26,7 +26,7 @@ Ui = {
         {
             Zotero.ZeNotes.collection = "All documents";
         }
-        var url = "chrome://ze-notes/content/settings/preferences.xul";
+        var url = "chrome://zenotes/content/settings/preferences.xul";
         var io = {collection: Zotero.ZeNotes.collection};
         var name = "settingswin";
 		let width = Zotero.ZeNotes.Prefs.get("prefs-window-width", "775");

core/zenotes.js

@@ -62,7 +62,7 @@ ZeNotes = {
 		// Use strings from zenotes.properties (legacy properties format) in Zotero 6
 		else {
 			let stringBundle = Services.strings.createBundle(
-				'chrome://ze-notes/locale/zenotes.properties'
+				'chrome://zenotes/locale/zenotes.properties'
 			);
 		}
 	},

install.rdf

@@ -5,7 +5,7 @@
     <Description about="urn:mozilla:install-manifest">
         <em:id>zenotes@alefa.net</em:id>
         <em:name>ZeNotes</em:name>
-        <em:version>0.9.5</em:version>
+        <em:version>0.9.6</em:version>
         <em:multiprocessCompatible>true</em:multiprocessCompatible>
         <em:updateURL>https://github.com/frianasoa/Ze-Notes/releases/download/release/zenotes-update.rdf</em:updateURL>
         <em:homepageURL>https://github.com/frianasoa/zenotes</em:homepageURL>

manifest.json

@@ -1,7 +1,7 @@
 {
     "manifest_version": 2,
     "name": "Ze Notes",
-    "version": "0.9.5",
+    "version": "0.9.6",
     "description": "Advanced notes manager",
     "author": "Fanantenana Rianasoa Andriariniaina",
     "homepage_url": "https://github.com/frianasoa/zenotes",

zenotes-update.json

@@ -3,9 +3,9 @@
     "zenotes@alefa.net": {
       "updates": [
         {
-          "version": "0.9.5",
-          "update_link": "https://github.com/frianasoa/Ze-Notes/releases/download/v0.9.5/zenotes-v0.9.5.xpi",
-          "update_hash": "sha512:7e1c7631c12b5dd9c1649527d4f1673baf03efe47529af97a29f3b0297771cf90a2587e14a8a7eccd7647ab90dec89363814ad7d9a83575a1021d16714b57dc0",
+          "version": "0.9.6",
+          "update_link": "https://github.com/frianasoa/Ze-Notes/releases/download/v0.9.6/zenotes-v0.9.6.xpi",
+          "update_hash": "sha512:747e0346ddfe9e9e150580de58992708f06ffc2ab90d64f1523c068be8d3df56c9d5ce8b869321f49c9770c631d138c658a8b15385940fb695d373e4a2801696",
           "applications": {
             "gecko": {
               "strict_min_version": "6.0",

zenotes-update.rdf

@@ -5,13 +5,13 @@
             <rdf:Seq>
                 <rdf:li>
                     <rdf:Description>
-                        <ns1:version>0.9.5</ns1:version>
+                        <ns1:version>0.9.6</ns1:version>
                         <ns1:targetApplication>
                             <rdf:Description>
                                 <ns1:id>zotero@chnm.gmu.edu</ns1:id>
                                 <ns1:minVersion>5.0.0</ns1:minVersion>
                                 <ns1:maxVersion>6.*</ns1:maxVersion>
-                                <ns1:updateLink>https://github.com/frianasoa/Ze-Notes/releases/download/v0.9.5/zenotes-v0.9.5.xpi</ns1:updateLink>
+                                <ns1:updateLink>https://github.com/frianasoa/Ze-Notes/releases/download/v0.9.6/zenotes-v0.9.6.xpi</ns1:updateLink>
                             </rdf:Description>
                         </ns1:targetApplication> 
 
@@ -20,7 +20,7 @@
                                 <ns1:id>juris-m@juris-m.github.io</ns1:id>
                                 <ns1:minVersion>4.999</ns1:minVersion>
                                 <ns1:maxVersion>6.*</ns1:maxVersion>
-                                <ns1:updateLink>https://github.com/frianasoa/Ze-Notes/releases/download/v0.9.5/zenotes-v0.9.5.xpi</ns1:updateLink>
+                                <ns1:updateLink>https://github.com/frianasoa/Ze-Notes/releases/download/v0.9.6/zenotes-v0.9.6.xpi</ns1:updateLink>
                             </rdf:Description>
                         </ns1:targetApplication>