fix: zotero 8 menu registration

windingwind · windingwind · commit 17e62f8fd680 · 2025-09-24T21:38:28.000+02:00
chore: use official menu api
diff --git a/addon/chrome/content/lib/js/ztypes.d.ts b/addon/chrome/content/lib/js/ztypes.d.ts
diff --git a/addon/locale/en-US/addon.ftl b/addon/locale/en-US/addon.ftl
@@ -1,24 +1,10 @@
 pref-title = Better Notes
 
-menuEdit-exportTemplate = Export Template to File...
-menuEdit-templateEditor = Template Editor
-menuEdit-importTemplate = New Template from Clipboard
-
-menuTools-syncManager = Sync Manager
-
-menuAddNote-newTemplateStandaloneNote = New Standalone Note from Template
-menuAddNote-newTemplateItemNote = New Item Note from Template
-menuAddNote-importMD = Import MarkDown File as Note
-
-menuAddReaderNote-newTemplateNote = New Item Note from Template
-
 menuEditor-resizeImage = Resize Image
 menuEditor-copy = Copy Note Link...
 menuEditor-copyLine = Copy Link of Line { $line }
 menuEditor-copySection = Copy Link of Section { $section }
 
-menuHelp-openUserGuide = Open Better Notes User Guide
-
 templateEditor-templateType = Type
 templateEditor-templateName = Name
 
diff --git a/addon/locale/en-US/mainWindow.ftl b/addon/locale/en-US/mainWindow.ftl
@@ -0,0 +1,19 @@
+menuTools-syncManager =
+    .label = Sync Manager
+menuTools-templateEditor =
+    .label = Template Editor
+menuTools-importTemplateFromClipboard =
+    .label = New Template from Clipboard
+
+menuFile-exportTemplate =
+    .label = Export Template...
+
+menuHelp-openUserGuide =
+    .label = Open Better Notes User Guide
+
+menuAddNote-importMD =
+    .label = Import from MarkDown File
+menuAddNote-newTemplateStandaloneNote =
+    .label = New Standalone Note from Template
+menuAddNote-newTemplateItemNote =
+    .label = New Item Note from Template
diff --git a/addon/locale/it-IT/addon.ftl b/addon/locale/it-IT/addon.ftl
@@ -1,24 +1,10 @@
 pref-title = Better Notes
 
-menuEdit-exportTemplate = Esporta il template su file...
-menuEdit-templateEditor = Editor dei template
-menuEdit-importTemplate = Nuovo template dagli appunti
-
-menuTools-syncManager = Manager di sincronizzazione
-
-menuAddNote-newTemplateStandaloneNote = Nuova nota indipendente da template
-menuAddNote-newTemplateItemNote = Nuova nota dell'elemento da template
-menuAddNote-importMD = Importa file MarkDown come nota
-
-menuAddReaderNote-newTemplateNote = Nuova nota dell'elemento da template
-
 menuEditor-resizeImage = Ridimensiona immagine
 menuEditor-copy =  Copia link della nota...
 menuEditor-copyLine = Copia link della riga { $line }
 menuEditor-copySection = Copia link della sezione { $section }
 
-menuHelp-openUserGuide = Apri la guida utente di Better Notes
-
 templateEditor-templateType = Tipo
 templateEditor-templateName = Nome
 
diff --git a/addon/locale/it-IT/mainWindow.ftl b/addon/locale/it-IT/mainWindow.ftl
@@ -0,0 +1,19 @@
+menuTools-syncManager =
+    .label = Gestione Sincronizzazione
+menuTools-templateEditor =
+    .label = Editor Template
+menuTools-importTemplateFromClipboard =
+    .label = Nuovo Template dagli Appunti
+
+menuFile-exportTemplate =
+    .label = Esporta Template...
+
+menuHelp-openUserGuide =
+    .label = Apri Guida Utente Better Notes
+
+menuAddNote-importMD =
+    .label = Importa da File MarkDown
+menuAddNote-newTemplateStandaloneNote =
+    .label = Nuova Nota Indipendente da Template
+menuAddNote-newTemplateItemNote =
+    .label = Nuova Nota Elemento da Template
diff --git a/addon/locale/ru-RU/addon.ftl b/addon/locale/ru-RU/addon.ftl
@@ -1,24 +1,10 @@
 pref-title=Better Notes
 
-menuEdit-exportTemplate=Экспорт шаблона в файл...
-menuEdit-templateEditor=Редактор шаблонов
-menuEdit-importTemplate=Новый шаблон из буфера обмена
-
-menuTools-syncManager=Синк менеджер
-
-menuAddNote-newTemplateStandaloneNote=Новая отдельная Заметка из шаблона
-menuAddNote-newTemplateItemNote=Новая элементная Заметка из шаблона
-menuAddNote-importMD = Импорт файла MarkDown в качестве примечания
-
-menuAddReaderNote-newTemplateNote=Новая элементная Заметка из шаблона
-
 menuEditor-resizeImage=Изменить размер изображения
 menuEditor-copy = Копировать ссылку на заметку...
 menuEditor-copyLine = Копировать ссылку на строку { $line }
 menuEditor-copySection = Копировать ссылку на раздел { $section }
 
-menuHelp-openUserGuide = Open Better Notes User Guide
-
 templateEditor-templateType = Type
 templateEditor-templateName = Name
 
diff --git a/addon/locale/ru-RU/mainWindow.ftl b/addon/locale/ru-RU/mainWindow.ftl
@@ -0,0 +1,19 @@
+menuTools-syncManager =
+    .label = Менеджер синхронизации
+menuTools-templateEditor =
+    .label = Редактор шаблонов
+menuTools-importTemplateFromClipboard =
+    .label = Новый шаблон из буфера обмена
+
+menuFile-exportTemplate =
+    .label = Экспорт шаблона...
+
+menuHelp-openUserGuide =
+    .label = Открыть руководство пользователя Better Notes
+
+menuAddNote-importMD =
+    .label = Импорт из файла MarkDown
+menuAddNote-newTemplateStandaloneNote =
+    .label = Новая отдельная заметка из шаблона
+menuAddNote-newTemplateItemNote =
+    .label = Новая заметка элемента из шаблона
diff --git a/addon/locale/tr-TR/addon.ftl b/addon/locale/tr-TR/addon.ftl
@@ -1,24 +1,10 @@
 pref-title = Better Notes
 
-menuEdit-exportTemplate = Şablonu Dosya Olarak Dışa Aktar...
-menuEdit-templateEditor = Şablon Düzenleyici
-menuEdit-importTemplate = Panodan Yeni Şablon Al
-
-menuTools-syncManager = Eşitleme Yönetimi
-
-menuAddNote-newTemplateStandaloneNote = Şablondan Yeni Bağımsız Not
-menuAddNote-newTemplateItemNote = Şablondan Yeni Eser Notu
-menuAddNote-importMD = Markdown Dosyasını Not Olarak İçe Aktar
-
-menuAddReaderNote-newTemplateNote = Şablondan Yeni Eser Notu
-
 menuEditor-resizeImage = Resmi Boyutlandır
 menuEditor-copy = Not Bağlantısını Kopyala...
 menuEditor-copyLine = Bağlantıyı Kopyala (Satır { $line })
 menuEditor-copySection = Bağlantıyı Kopyala (Başlık { $section })
 
-menuHelp-openUserGuide = Better Notes Kullanıcı Rehberini Aç
-
 templateEditor-templateType = Type
 templateEditor-templateName = Name
 
diff --git a/addon/locale/tr-TR/mainWindow.ftl b/addon/locale/tr-TR/mainWindow.ftl
@@ -0,0 +1,19 @@
+menuTools-syncManager =
+    .label = Senkronizasyon Yöneticisi
+menuTools-templateEditor =
+    .label = Şablon Düzenleyici
+menuTools-importTemplateFromClipboard =
+    .label = Panodan Yeni Şablon
+
+menuFile-exportTemplate =
+    .label = Şablonu Dışa Aktar...
+
+menuHelp-openUserGuide =
+    .label = Better Notes Kullanıcı Kılavuzunu Aç
+
+menuAddNote-importMD =
+    .label = MarkDown Dosyasından İçe Aktar
+menuAddNote-newTemplateStandaloneNote =
+    .label = Şablondan Yeni Bağımsız Not
+menuAddNote-newTemplateItemNote =
+    .label = Şablondan Yeni Öğe Notu
diff --git a/addon/locale/zh-CN/addon.ftl b/addon/locale/zh-CN/addon.ftl
@@ -1,24 +1,10 @@
 pref-title=Better Notes
 
-menuEdit-exportTemplate=运行模板并导出为文件...
-menuEdit-templateEditor=模板编辑器
-menuEdit-importTemplate=从剪贴板导入笔记模板
-
-menuTools-syncManager=同步管理器
-
-menuAddNote-newTemplateStandaloneNote=从模板新建独立笔记
-menuAddNote-newTemplateItemNote=从模板新建条目子笔记
-menuAddNote-importMD = 导入MarkDown为笔记
-
-menuAddReaderNote-newTemplateNote=从模板新建条目子笔记
-
 menuEditor-resizeImage=缩放图片
 menuEditor-copy = 复制笔记链接...
 menuEditor-copyLine = 复制行链接 (L{ $line })
 menuEditor-copySection = 复制节链接 (Sec. { $section })
 
-menuHelp-openUserGuide = 打开Better Notes用户指南
-
 templateEditor-templateType = 类型
 templateEditor-templateName = 名称
 
diff --git a/addon/locale/zh-CN/mainWindow.ftl b/addon/locale/zh-CN/mainWindow.ftl
@@ -0,0 +1,19 @@
+menuTools-syncManager =
+    .label = 同步管理器
+menuTools-templateEditor =
+    .label = 模板编辑器
+menuTools-importTemplateFromClipboard =
+    .label = 从剪贴板新建模板
+
+menuFile-exportTemplate =
+    .label = 导出模板...
+
+menuHelp-openUserGuide =
+    .label = 打开 Better Notes 用户指南
+
+menuAddNote-importMD =
+    .label = 从 MarkDown 文件导入
+menuAddNote-newTemplateStandaloneNote =
+    .label = 从模板新建独立笔记
+menuAddNote-newTemplateItemNote =
+    .label = 从模板新建条目笔记
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -91,7 +91,7 @@
     "typescript": "^5.9.2",
     "xslt3": "^2.7.0",
     "zotero-plugin-scaffold": "^0.8.0",
-    "zotero-types": "^4.1.0-beta.1"
+    "zotero-types": "^4.1.0-beta.3"
   },
   "eslintConfig": {
     "env": {
diff --git a/src/hooks.ts b/src/hooks.ts
@@ -67,6 +67,8 @@ async function onStartup() {
     `chrome://${config.addonRef}/content/icons/favicon.png`,
   );
 
+  registerMenus();
+
   registerNoteLinkProxyHandler();
 
   registerEditorInstanceHook();
@@ -97,13 +99,14 @@ async function onMainWindowLoad(win: _ZoteroTypes.MainWindow): Promise<void> {
     `chrome://${config.addonRef}/content/scripts/customElements.js`,
     win,
   );
+
+  win.MozXULElement.insertFTLIfNeeded(`${config.addonRef}-mainWindow.ftl`);
+
   // Create ztoolkit for every window
   addon.data.ztoolkit = createZToolkit();
 
   registerNotify(["tab", "item", "item-tag"], win);
 
-  registerMenus(win);
-
   initTemplates();
 
   patchViewItems(win);
@@ -119,6 +122,9 @@ async function onMainWindowLoad(win: _ZoteroTypes.MainWindow): Promise<void> {
 }
 
 async function onMainWindowUnload(win: Window): Promise<void> {
+  win.document
+    .querySelector(`[href="${config.addonRef}-mainWindow.ftl"]`)
+    ?.remove();
   ztoolkit.unregisterAll();
 }
 
@@ -128,6 +134,11 @@ function onShutdown(): void {
   closeConvertServer();
 
   unregisterEditorInstanceHook();
+
+  Zotero.getMainWindows().forEach((win) => {
+    onMainWindowUnload(win);
+  });
+
   ztoolkit.unregisterAll();
   // Remove addon object
   addon.data.alive = false;
diff --git a/src/modules/menu.ts b/src/modules/menu.ts
diff --git a/typings/i10n.d.ts b/typings/i10n.d.ts
