fix: annotationColors

MuiseDestiny · Feb 23, 2023 · e10258f · e10258f
1 parent e380250
commit e10258f
Show file tree

Hide file tree

Showing 3 changed files with 122 additions and 56 deletions.
diff --git a/addon/prefs.js b/addon/prefs.js
@@ -1,63 +1,66 @@
 pref("extensions.zotero.__addonRef__.enable", true);
-pref("extensions.zotero.__addonRef__.graphView.enable", true);
-pref("extensions.zotero.__addonRef__.graphView.height", "50%");
 
+pref("extensions.zotero.__addonRef__.function.graphView.enable", true);
+pref("extensions.zotero.__addonRef__.graphView.show", false);
+pref("extensions.zotero.__addonRef__.graphView.height", "50%");
 
+pref("extensions.zotero.__addonRef__.function.tagsColumn.enable", true);
 pref("extensions.zotero.__addonRef__.tagsColumn.margin", "0.35");
 pref("extensions.zotero.__addonRef__.tagsColumn.align", "left");
 
+pref("extensions.zotero.__addonRef__.function.textTagsColumn.enable", true);
 pref("extensions.zotero.__addonRef__.textTagsColumn.prefix", "#");
 pref("extensions.zotero.__addonRef__.textTagsColumn.opacity", "0.5");
 pref("extensions.zotero.__addonRef__.textTagsColumn.backgroundColor", "#fadec9");
 pref("extensions.zotero.__addonRef__.textTagsColumn.textColor", "black");
 pref("extensions.zotero.__addonRef__.textTagsColumn.margin", "0.2");
 pref("extensions.zotero.__addonRef__.textTagsColumn.padding", "0.5");
 
-
-
-
+pref("extensions.zotero.__addonRef__.function.titleColumn.enable", true);
 pref("extensions.zotero.__addonRef__.titleColumn.color", "#FFC6D3");
 pref("extensions.zotero.__addonRef__.titleColumn.tags", false);
 pref("extensions.zotero.__addonRef__.titleColumn.opacity", "0.7");
 pref("extensions.zotero.__addonRef__.titleColumn.odd", "");
 pref("extensions.zotero.__addonRef__.titleColumn.even", "");
 
 
-
+pref("extensions.zotero.__addonRef__.function.IFColumn.enable", true);
 pref("extensions.zotero.__addonRef__.IFColumn.field", "sciif");
 pref("extensions.zotero.__addonRef__.IFColumn.color", "#A8D1D1");
 pref("extensions.zotero.__addonRef__.IFColumn.opacity", "0.7");
 pref("extensions.zotero.__addonRef__.IFColumn.max", "15");
 pref("extensions.zotero.__addonRef__.IFColumn.progress", true);
 pref("extensions.zotero.__addonRef__.IFColumn.info", false);
 
+pref("extensions.zotero.__addonRef__.function.PublicationTagsColumn.enable", true);
 pref("extensions.zotero.__addonRef__.PublicationTagsColumn.fields", "sci, sciif5, eii");
 pref("extensions.zotero.__addonRef__.PublicationTagsColumn.rankColors", '#ff9999, #86dad1, #ffe78f, #ffd4a9, #cce5ff');
 pref("extensions.zotero.__addonRef__.PublicationTagsColumn.defaultColor", "#86dad1");
 pref("extensions.zotero.__addonRef__.PublicationTagsColumn.textColor", 'black');
 pref("extensions.zotero.__addonRef__.PublicationTagsColumn.sortBy", 'sci, -sciif');
 pref("extensions.zotero.__addonRef__.PublicationTagsColumn.map", "北大中文核心=北核, SCIIF=IF, SCIIF(5)=IF(5)");
-
 pref("extensions.zotero.__addonRef__.PublicationTagsColumn.margin", "0.2");
 pref("extensions.zotero.__addonRef__.PublicationTagsColumn.padding", "0.5");
 pref("extensions.zotero.__addonRef__.PublicationTagsColumn.opacity", "0.5");
 
+pref("extensions.zotero.__addonRef__.function.progressColumn.enable", true);
 pref("extensions.zotero.__addonRef__.progressColumn.style", "bar");
 pref("extensions.zotero.__addonRef__.progressColumn.color", "#86C8BC");
 pref("extensions.zotero.__addonRef__.progressColumn.opacity", "0.7");
 pref("extensions.zotero.__addonRef__.progressColumn.circle", true);
 
+pref("extensions.zotero.__addonRef__.function.ratingColumn.enable", true);
 pref("extensions.zotero.__addonRef__.ratingColumn.mark", "★");
 pref("extensions.zotero.__addonRef__.ratingColumn.option", "•");
 pref("extensions.zotero.__addonRef__.ratingColumn.color", "#808080");
 pref("extensions.zotero.__addonRef__.ratingColumn.padding", "0.1");
 pref("extensions.zotero.__addonRef__.ratingColumn.size", "1");
 
 
-
-
+pref("extensions.zotero.__addonRef__.function.columnsViews.enable", true);
 pref("extensions.zotero.__addonRef__.columnsViews", "[]");
 
+pref("extensions.zotero.__addonRef__.function.annotationColors.enable", true);
 pref("extensions.zotero.__addonRef__.annotationColors", '[["general.yellow","#ffd400"],["general.red","#ff6666"],["general.green","#5fb236"],["general.blue","#2ea8e5"],["general.purple","#a28ae5"],["general.magenta","#e56eee"],["general.orange","#f19837"],["general.gray","#aaaaaa"]]');
 pref("extensions.zotero.__addonRef__.annotationColorsGroups", '[["Untitled",[["general.yellow","#ffd400"],["general.red","#ff6666"],["general.green","#5fb236"],["general.blue","#2ea8e5"],["general.purple","#a28ae5"],["general.magenta","#e56eee"],["general.orange","#f19837"],["general.gray","#aaaaaa"]]]]');
 

diff --git a/src/hooks.ts b/src/hooks.ts
@@ -3,7 +3,6 @@ import { getString, initLocale } from "./modules/locale";
 import Views from "./modules/views"; 
 import Events from "./modules/events";
 import AddonItem from "./modules/item";
-import Record from "./modules/record";
 
 Zotero._AddonItemGlobal = Zotero._AddonItemGlobal || new AddonItem()
 const addonItem = Zotero._AddonItemGlobal
@@ -15,6 +14,10 @@ async function onStartup() {
  { notify: onNotify },
  ["tab"]
  );
+ ztoolkit.ProgressWindow.setIconURI(
+ "default",
+ `chrome:https://${config.addonRef}/content/icons/favicon.png`
+ );
  // Unregister callback when the window closes (important to avoid a memory leak)
  window.addEventListener(
  "unload",
@@ -29,22 +32,16 @@ async function onStartup() {
  Zotero.uiReadyPromise,
  ]);
  initLocale();
-
-
  ztoolkit.UI.basicOptions.ui.enableElementRecord = false
  ztoolkit.UI.basicOptions.ui.enableElementJSONLog = false
-
- // 测试
- // Zotero[config.addonInstance].data.record = new Record()
- // 测试
-
  if (!addonItem.item) { await addonItem.init() }
 
  const events = new Events(addonItem)
  events.onInit()
 
  const views = new Views(addonItem)
  Zotero.ZoteroStyle.data.views = views
+
  await views.renderTitleProgress()
  await views.createTagsColumn()
  await views.createTextTagsColumn()