commit 650c3935076165a2bd4626daba1012fc0fac9156 parent 2cd45be19162d920fc6f9d96f876b504ab19bc23 Author: Dan Stillman <dstillman@zotero.org> Date: Mon, 4 Feb 2013 01:56:29 -0500 Expose launchNonNativeFiles hidden pref in Firefox "Open PDFs and other files within Firefox when possible" Diffstat:
4 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/chrome/content/zotero/preferences/preferences.js b/chrome/content/zotero/preferences/preferences.js @@ -90,6 +90,14 @@ function init() rows[i].firstChild.nextSibling.value = Zotero.isMac ? 'Cmd+Shift+' : 'Ctrl+Alt+'; } + // JS-based strings + var checkbox = document.getElementById('launchNonNativeFiles-checkbox'); + if (checkbox ) { + checkbox.label = Zotero.getString( + 'zotero.preferences.launchNonNativeFiles', Zotero.appName + ); + } + updateStorageSettings(null, null, true); updateWordProcessorInstructions(); refreshStylesList(); diff --git a/chrome/content/zotero/preferences/preferences.xul b/chrome/content/zotero/preferences/preferences.xul @@ -117,7 +117,7 @@ To add a new preference: <label class="statusLine" value="&zotero.preferences.keys.changesTakeEffect;"/> </groupbox> - <groupbox> + <groupbox id="zotero-prefpane-miscellaneous-groupbox"> <caption label="&zotero.preferences.miscellaneous;"/> <hbox align="center"> @@ -129,11 +129,10 @@ To add a new preference: <checkbox label="&zotero.preferences.zoteroDotOrgVersionHeader;" tooltiptext="&zotero.preferences.zoteroDotOrgVersionHeader.tooltip;" preference="pref-zoteroDotOrgVersionHeader"/> - <checkbox label="&zotero.preferences.parseRISRefer;" preference="pref-parseEndNoteMIMETypes"/> + <checkbox id="parse-ris-checkbox" label="&zotero.preferences.parseRISRefer;" preference="pref-parseEndNoteMIMETypes"/> <checkbox label="&zotero.preferences.automaticSnapshots;" preference="pref-automaticSnapshots"/> <checkbox label="&zotero.preferences.downloadAssociatedFiles;" preference="pref-downloadAssociatedFiles"/> <checkbox label="&zotero.preferences.automaticTags;" preference="pref-automaticTags"/> - <hbox align="center"> <label value="&zotero.preferences.trashAutoEmptyDaysPre;"/> <textbox size="2" preference="pref-trashAutoEmptyDays"/> diff --git a/chrome/content/zotero/preferences/preferences_firefox.xul b/chrome/content/zotero/preferences/preferences_firefox.xul @@ -48,6 +48,7 @@ To add a new preference: <preferences id="zotero-prefpane-general-preferences"> <preference id="pref-showIn" name="extensions.zotero.showIn" type="int"/> <preference id="pref-statusBarIcon" name="extensions.zotero.statusBarIcon" type="int"/> + <preference id="pref-launchNonNativeFiles" name="extensions.zotero.launchNonNativeFiles" type="bool"/> </preferences> <groupbox id="zotero-prefpane-general-groupbox"> <grid id="zotero-prefpane-general-grid"> @@ -75,6 +76,13 @@ To add a new preference: </rows> </grid> </groupbox> + <groupbox id="zotero-prefpane-miscellaneous-groupbox"> + <checkbox id="launchNonNativeFiles-checkbox" + insertbefore="parse-ris-checkbox" + preference="pref-launchNonNativeFiles" + onsyncfrompreference="return !document.getElementById(this.getAttribute('preference')).value" + onsynctopreference="return !this.checked"/> + </groupbox> </prefpane> <prefpane id="zotero-prefpane-export" diff --git a/chrome/locale/en-US/zotero/zotero.properties b/chrome/locale/en-US/zotero/zotero.properties @@ -447,6 +447,7 @@ db.integrityCheck.reportInForums = You can report this problem in the Zotero For zotero.preferences.update.updated = Updated zotero.preferences.update.upToDate = Up to date zotero.preferences.update.error = Error +zotero.preferences.launchNonNativeFiles = Open PDFs and other files within %S when possible zotero.preferences.openurl.resolversFound.zero = %S resolvers found zotero.preferences.openurl.resolversFound.singular = %S resolver found zotero.preferences.openurl.resolversFound.plural = %S resolvers found