Fix UI and Upgrade ztoolkit

ChenglongMa · Feb 6, 2024 · 66d6cdb · 66d6cdb
1 parent 9f0c243
commit 66d6cdb
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 29 deletions.
diff --git a/addon/chrome/content/preferences.xhtml b/addon/chrome/content/preferences.xhtml
@@ -5,14 +5,14 @@
 </linkset>
 <vbox id="zotero-prefpane-__addonRef__" onload="Zotero.__addonInstance__.hooks.onPrefsEvent('load', {window})">
 
-<label>
-    <html:h1>__addonName__</html:h1>
-</label>
+<!--<label>-->
+<!--    <html:h1>__addonName__</html:h1>-->
+<!--</label>-->
 <vbox class="pref-section">
     <groupbox>
-        <label>
-            <html:h1 data-l10n-id="pref-duplicate-detection-title"></html:h1>
-        </label>
+<!--        <label>-->
+<!--            <html:h1 data-l10n-id="pref-duplicate-detection-title"></html:h1>-->
+<!--        </label>-->
 
         <label>
             <html:h2 data-l10n-id="pref-action-title"></html:h2>

diff --git a/package.json b/package.json
@@ -33,7 +33,7 @@
   },
   "homepage": "https://chenglongma.com/zoplicate/",
   "dependencies": {
-    "zotero-plugin-toolkit": "^2.3.16"
+    "zotero-plugin-toolkit": "^2.3.19"
   },
   "devDependencies": {
     "@types/node": "^20.10.4",

diff --git a/src/modules/preferenceScript.ts b/src/modules/preferenceScript.ts
@@ -2,13 +2,12 @@ import { config, homepage } from "../../package.json";
 import { getString } from "../utils/locale";
 
 export function registerPrefs() {
-  ztoolkit.PreferencePane.register({
+  Zotero.PreferencePanes.register({
     pluginID: config.addonID,
     src: rootURI + "chrome/content/preferences.xhtml",
     label: getString("prefs-title"),
     image: `chrome://${config.addonRef}/content/icons/favicon.png`,
     helpURL: homepage,
-    defaultXUL: true,
   });
 }
 

diff --git a/src/utils/ztoolkit.ts b/src/utils/ztoolkit.ts
@@ -4,12 +4,12 @@ import { config } from "../../package.json";
 export { createZToolkit };
 
 function createZToolkit() {
-  const _ztoolkit = new ZoteroToolkit();
+  // const _ztoolkit = new ZoteroToolkit();
   /**
    * Alternatively, import toolkit modules you use to minify the plugin size.
    * You can add the modules under the `MyToolkit` class below and uncomment the following line.
    */
-  // const _ztoolkit = new MyToolkit();
+  const _ztoolkit = new MyToolkit();
   initZToolkit(_ztoolkit);
   return _ztoolkit;
 }
@@ -29,21 +29,28 @@ function initZToolkit(_ztoolkit: ReturnType<typeof createZToolkit>) {
   );
 }
 
-// import { BasicTool, unregister } from "zotero-plugin-toolkit/dist/basic";
-// import { UITool } from "zotero-plugin-toolkit/dist/tools/ui";
-// import { PreferencePaneManager } from "zotero-plugin-toolkit/dist/managers/preferencePane";
-//
-// class MyToolkit extends BasicTool {
-//   UI: UITool;
-//   PreferencePane: PreferencePaneManager;
-//
-//   constructor() {
-//     super();
-//     this.UI = new UITool(this);
-//     this.PreferencePane = new PreferencePaneManager(this);
-//   }
-//
-//   unregisterAll() {
-//     unregister(this);
-//   }
-// }
+import {
+  BasicTool,
+  makeHelperTool,
+  unregister,
+} from "zotero-plugin-toolkit/dist/basic";
+import { UITool } from "zotero-plugin-toolkit/dist/tools/ui";
+import { DialogHelper } from "zotero-plugin-toolkit/dist/helpers/dialog";
+import { ProgressWindowHelper } from "zotero-plugin-toolkit/dist/helpers/progressWindow";
+
+class MyToolkit extends BasicTool {
+  UI: UITool;
+  Dialog: typeof DialogHelper;
+  ProgressWindow: typeof ProgressWindowHelper;
+
+  constructor() {
+    super();
+    this.UI = new UITool(this);
+    this.ProgressWindow = makeHelperTool(ProgressWindowHelper, this);
+    this.Dialog = makeHelperTool(DialogHelper, this);
+  }
+
+  unregisterAll() {
+    unregister(this);
+  }
+}