Skip to content

Commit

Permalink
Merge branch 'v0.1.2': 1. 部分代码重构; 2. 增加新功能 3.菜单和设置选项UI调整 4.文件名识别优化
Browse files Browse the repository at this point in the history
  • Loading branch information
@l0o0
l0o0 committed Nov 24, 2021
2 parents 23042ab + 1901659 commit 4903232
Show file tree
Hide file tree
Showing 21 changed files with 1,624 additions and 1,802 deletions.
62 changes: 45 additions & 17 deletions chrome/content/overlay.xul
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,31 +5,59 @@
<overlay id="jasminum"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">

<script type="application/x-javascript" src="chrome://jasminum/content/scripts/jasminum.js"/>

<!-- <popup id="zotero-collectionmenu">
<menuseparator/>
<menuitem id="zotero-collectionmenu-jasminum" label="&zotero.jasminum.updateCollection.label;" oncommand="Zotero.Jasminum.updateSelectedEntity()">
</popup> -->

<menupopup id="zotero-itemmenu">
<menuseparator id="id-jasminum-separator"/>
<menu id="zotero-itemmenu-jasminum-namehandler"
label="&jasminum.namehandler.label;"
class="menu-iconic jasminum-name-icon">
<menuseparator id="jasminum-separator"/>
<menu id="jasminum-popup-menu1"
label="&jasminum.menu.CNKI.label;"
class="menu-iconic jasminum-tools-icon">
<menupopup id="jasminum">
<menuitem label="&jasminum.namehandler.split.label;" oncommand="Zotero.Jasminum.splitNameM();"/>
<menuitem label="&jasminum.namehandler.merge.label;" oncommand="Zotero.Jasminum.mergeNameM();"/>
<menuitem label="&jasminum.namehandler.removeDot.label;" oncommand="Zotero.Jasminum.removeDotM();"/>
<menuitem
id="jasminum-itemmenu-search"
label="&jasminum.menu.CNKI.update.label;"
class="menuitem-iconic jasminum-searchCNKI-icon"
oncommand="Zotero.Jasminum.searchSelectedItems();"/>
<menuitem
id="jasminum-itemmenu-bookmark"
label="&jasminum.menu.CNKI.addBookmark.label;"
class="menuitem-iconic jasminum-bookmark-icon"
oncommand="Zotero.Jasminum.addBookmarkItem();"/>
<menuitem
id="jasminum-itemmenu-updateCiteCSSCI"
label="&jasminum.menu.CNKI.updateCiteCSSCI.label;"
class="menuitem-iconic jasminum-cssci-icon"
oncommand="Zotero.Jasminum.updateCiteCSSCIItems();"/>
</menupopup>
</menu>
<menuitem id="zotero-itemmenu-jasminum"
label="&jasminum.update.label;"
class="menuitem-iconic jasminum-searchCNKI-icon"
oncommand="Zotero.Jasminum.updateSelectedItems();"/>
<menuitem id="zotero-itemmenu-jasminum-bookmark"
label="&jasminum.addBookmark.label;"
class="menuitem-iconic jasminum-bookmark-icon"
oncommand="Zotero.Jasminum.addBookmarkItemM();"/>
<menu id="jasminum-popup-menu2"
label="&jasminum.menu.tools.label;"
class="menu-iconic jasminum-tools-icon">
<menupopup>
<menuitem
label="&jasminum.menu.tools.namesplit.label;"
class="menuitem-iconic jasminum-name-icon"
oncommand="Zotero.Jasminum.splitNameM();"/>
<menuitem
label="&jasminum.menu.tools.namemerge.label;"
class="menuitem-iconic jasminum-name-icon"
oncommand="Zotero.Jasminum.mergeNameM();"/>
<menuitem
label="&jasminum.menu.tools.removeDot.label;"
class="menuitem-iconic jasminum-default-icon"
oncommand="Zotero.Jasminum.removeDotM();"/>
<menuitem
label="&jasminum.menu.tools.language.label;"
class="menuitem-iconic jasminum-zh-icon"
oncommand="Zotero.Jasminum.setLanguageItems();"/>
</menupopup>
</menu>

</menupopup>

<script src="chrome://zotero/content/include.js"/>
<script src="chrome://jasminum/content/scripts/include.js"/>
</overlay>
25 changes: 24 additions & 1 deletion chrome/content/preferences.xul
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
<preference id="pref-jasminum.rename" name="extensions.zotero.jasminum.rename" type="bool"/>
<preference id="pref-jasminum.autobookmark" name="extensions.zotero.jasminum.autobookmark" type="bool"/>
<preference id="pref-jasminum.zhnamedot" name="extensions.zotero.jasminum.zhnamedot" type="bool"/>
<preference id="pref-jasminum.language" name="extensions.zotero.jasminum.language" type="string"/>
<preference id="pref-jasminum.autolanguage" name="extensions.zotero.jasminum.autolanguage" type="bool"/>
</preferences>
<tabbox>
<tabs>
Expand All @@ -32,11 +34,31 @@
<checkbox id="jasminum.zhnamesplit" label="&jasminum.zhnamesplit.label;" preference="pref-jasminum.zhnamesplit"/>
<checkbox id="jasminum.rename" label="&jasminum.rename.label;" preference="pref-jasminum.rename"/>
<checkbox id="jasminum.autobookmark" label="&jasminum.autobookmark.label;" preference="pref-jasminum.autobookmark"/>
<hbox>
<checkbox id="jasminum.autolanguage" label="&jasminum.autolanguage.label;" preference="pref-jasminum.autolanguage"/>
<label value="&jasminum.language.label;"/>
<menulist flex="1" editable="true" id="jasminum.language" preference="pref-jasminum.language" maxwidth="100" >
<menupopup>
<menuitem label="zh-CN"/>
<menuitem label="cn"/>
</menupopup>
</menulist>

</hbox>
<!-- <checkbox id="jasminum.zhnamedot" label="&jasminum.zhnamedot.label;" preference="pref-jasminum.zhnamedot"/> -->
<separator/>
<vbox flex="1">
<description>&jasminum.namepatent.desc;</description>
<textbox id="jasminum-namepatent" preference="pref-jasminum-namepatent"/>
<!-- <textbox id="jasminum-namepatent" preference="pref-jasminum-namepatent"/> -->
<hbox>
<menulist flex="1" editable="true" id="jasminum-namepatent" preference="pref-jasminum-namepatent">
<menupopup>
<menuitem label="{%t}_{%g}" tooltiptext="&jasminum.namepatent.desc.tg;"/>
<menuitem label="{%t}" tooltiptext="&jasminum.namepatent.desc.t;"/>
</menupopup>
</menulist>
<description>&jasminum.namepatent.desc.info;</description>
</hbox>
</vbox>
</groupbox>
<groupbox>
Expand All @@ -52,6 +74,7 @@
</vbox>
</tabpanel>
<tabpanel id="zotero-prefpane-translators-tab" orient="vertical">
<description>点击下方刷新按钮更新数据，在刷新窗口中点击对应翻译器的Update按键进行下载</description>
<listbox id="translators-listbox" flex="1">
<listhead>
<listheader label="Translators"/>
Expand Down
24 changes: 24 additions & 0 deletions chrome/content/scripts/include.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
if (!Zotero.Jasminum) {
var fileLoader = Components.classes["@mozilla.org/moz/jssubscript-loader;1"]
.getService(Components.interfaces.mozIJSSubScriptLoader);
var scripts = ['jasminum', 'ui', 'scrape', 'utils'];
scripts.forEach(s => fileLoader.loadSubScript('chrome://jasminum/content/scripts/' + s + '.js', {}, "UTF-8"));
}


window.addEventListener(
"load",
function (e) {
Zotero.Jasminum.init();
if (window.ZoteroPane) {
var doc = window.ZoteroPane.document;
// add event listener for zotfile menu items
doc.getElementById("zotero-itemmenu").addEventListener(
"popupshowing",
Zotero.Jasminum.UI.displayMenuitem,
false
);
}
},
false
);
Loading

0 comments on commit 4903232

Please sign in to comment.