From a73a73d5760e6ac62153da2891033c57d781827b Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Thu, 5 Jan 2012 02:13:29 -0500 Subject: [PATCH 01/11] Add NS_ERROR_FILE_IS_LOCKED to file access check --- chrome/content/zotero/xpcom/file.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chrome/content/zotero/xpcom/file.js b/chrome/content/zotero/xpcom/file.js index 2aa49c1d9..a42e7e93d 100644 --- a/chrome/content/zotero/xpcom/file.js +++ b/chrome/content/zotero/xpcom/file.js @@ -351,7 +351,7 @@ Zotero.File = new function(){ var opWord = "updated"; } - if (e.name == 'NS_ERROR_FILE_ACCESS_DENIED' + if (e.name == 'NS_ERROR_FILE_ACCESS_DENIED' || e.name == 'NS_ERROR_FILE_IS_LOCKED' // Shows up on some Windows systems || e.name == 'NS_ERROR_FAILURE') { Zotero.debug(e); From bcf02d575badbace72052a97615d29fb4b65373b Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Thu, 5 Jan 2012 03:22:15 -0500 Subject: [PATCH 02/11] Make elements small in prefs in Standalone --- chrome/skin/default/zotero/preferences.css | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/chrome/skin/default/zotero/preferences.css b/chrome/skin/default/zotero/preferences.css index b6ee0f386..231b4d272 100644 --- a/chrome/skin/default/zotero/preferences.css +++ b/chrome/skin/default/zotero/preferences.css @@ -15,6 +15,11 @@ radio[pane] -moz-box-pack: end; } +description, #quickCopy-instructions, #export-citePaperJournalArticleURL +{ + font-size: .85em; +} + .statusLine { margin: .75em 0; @@ -204,11 +209,6 @@ grid row hbox:first-child height: 1em; } -#quickCopy-instructions, #quickCopy-macWarning, #export-citePaperJournalArticleURL -{ - font-size: .85em; -} - #quickCopy-siteSettings-rows::-moz-tree-cell(quickCopy-copyAsHTML) { /* DEBUG: possible to center checkmark here instead of with spaces? From 9d16cb2fe6f1f6bae0fb24601cea301ea06c7e36 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Thu, 5 Jan 2012 14:58:11 -0500 Subject: [PATCH 03/11] "Use Firefox profile directory" -> "Use profile directory" --- chrome/locale/af-ZA/zotero/preferences.dtd | 1 - chrome/locale/ar/zotero/preferences.dtd | 1 - chrome/locale/bg-BG/zotero/preferences.dtd | 1 - chrome/locale/ca-AD/zotero/preferences.dtd | 1 - chrome/locale/cs-CZ/zotero/preferences.dtd | 1 - chrome/locale/da-DK/zotero/preferences.dtd | 1 - chrome/locale/de/zotero/preferences.dtd | 1 - chrome/locale/el-GR/zotero/preferences.dtd | 1 - chrome/locale/en-US/zotero/preferences.dtd | 2 +- chrome/locale/es-ES/zotero/preferences.dtd | 1 - chrome/locale/et-EE/zotero/preferences.dtd | 1 - chrome/locale/eu-ES/zotero/preferences.dtd | 1 - chrome/locale/fa/zotero/preferences.dtd | 1 - chrome/locale/fi-FI/zotero/preferences.dtd | 1 - chrome/locale/fr-FR/zotero/preferences.dtd | 1 - chrome/locale/gl-ES/zotero/preferences.dtd | 1 - chrome/locale/he-IL/zotero/preferences.dtd | 1 - chrome/locale/hr-HR/zotero/preferences.dtd | 1 - chrome/locale/hu-HU/zotero/preferences.dtd | 1 - chrome/locale/is-IS/zotero/preferences.dtd | 1 - chrome/locale/it-IT/zotero/preferences.dtd | 1 - chrome/locale/ja-JP/zotero/preferences.dtd | 1 - chrome/locale/ko-KR/zotero/preferences.dtd | 1 - chrome/locale/mn-MN/zotero/preferences.dtd | 1 - chrome/locale/nb-NO/zotero/preferences.dtd | 1 - chrome/locale/nl-NL/zotero/preferences.dtd | 1 - chrome/locale/nn-NO/zotero/preferences.dtd | 1 - chrome/locale/pl-PL/zotero/preferences.dtd | 1 - chrome/locale/pt-BR/zotero/preferences.dtd | 1 - chrome/locale/pt-PT/zotero/preferences.dtd | 1 - chrome/locale/ro-RO/zotero/preferences.dtd | 1 - chrome/locale/ru-RU/zotero/preferences.dtd | 1 - chrome/locale/sk-SK/zotero/preferences.dtd | 1 - chrome/locale/sl-SI/zotero/preferences.dtd | 1 - chrome/locale/sr-RS/zotero/preferences.dtd | 1 - chrome/locale/sv-SE/zotero/preferences.dtd | 1 - chrome/locale/th-TH/zotero/preferences.dtd | 1 - chrome/locale/tr-TR/zotero/preferences.dtd | 1 - chrome/locale/vi-VN/zotero/preferences.dtd | 1 - chrome/locale/zh-CN/zotero/preferences.dtd | 1 - chrome/locale/zh-TW/zotero/preferences.dtd | 1 - 41 files changed, 1 insertion(+), 41 deletions(-) diff --git a/chrome/locale/af-ZA/zotero/preferences.dtd b/chrome/locale/af-ZA/zotero/preferences.dtd index 6a4d24991..69f7573a1 100644 --- a/chrome/locale/af-ZA/zotero/preferences.dtd +++ b/chrome/locale/af-ZA/zotero/preferences.dtd @@ -167,7 +167,6 @@ - diff --git a/chrome/locale/ar/zotero/preferences.dtd b/chrome/locale/ar/zotero/preferences.dtd index 5dfd755a5..f27cd6ddb 100644 --- a/chrome/locale/ar/zotero/preferences.dtd +++ b/chrome/locale/ar/zotero/preferences.dtd @@ -167,7 +167,6 @@ - diff --git a/chrome/locale/bg-BG/zotero/preferences.dtd b/chrome/locale/bg-BG/zotero/preferences.dtd index 3f96c3ad3..ee89a6ede 100644 --- a/chrome/locale/bg-BG/zotero/preferences.dtd +++ b/chrome/locale/bg-BG/zotero/preferences.dtd @@ -167,7 +167,6 @@ - diff --git a/chrome/locale/ca-AD/zotero/preferences.dtd b/chrome/locale/ca-AD/zotero/preferences.dtd index bc72c0380..6cb3df28e 100644 --- a/chrome/locale/ca-AD/zotero/preferences.dtd +++ b/chrome/locale/ca-AD/zotero/preferences.dtd @@ -167,7 +167,6 @@ - diff --git a/chrome/locale/cs-CZ/zotero/preferences.dtd b/chrome/locale/cs-CZ/zotero/preferences.dtd index 8206ac063..3291a7b68 100644 --- a/chrome/locale/cs-CZ/zotero/preferences.dtd +++ b/chrome/locale/cs-CZ/zotero/preferences.dtd @@ -167,7 +167,6 @@ - diff --git a/chrome/locale/da-DK/zotero/preferences.dtd b/chrome/locale/da-DK/zotero/preferences.dtd index 0ec118399..7703840b1 100644 --- a/chrome/locale/da-DK/zotero/preferences.dtd +++ b/chrome/locale/da-DK/zotero/preferences.dtd @@ -167,7 +167,6 @@ - diff --git a/chrome/locale/de/zotero/preferences.dtd b/chrome/locale/de/zotero/preferences.dtd index 5ac54e4c8..2e061f1e4 100644 --- a/chrome/locale/de/zotero/preferences.dtd +++ b/chrome/locale/de/zotero/preferences.dtd @@ -167,7 +167,6 @@ - diff --git a/chrome/locale/el-GR/zotero/preferences.dtd b/chrome/locale/el-GR/zotero/preferences.dtd index 0ec118399..7703840b1 100644 --- a/chrome/locale/el-GR/zotero/preferences.dtd +++ b/chrome/locale/el-GR/zotero/preferences.dtd @@ -167,7 +167,6 @@ - diff --git a/chrome/locale/en-US/zotero/preferences.dtd b/chrome/locale/en-US/zotero/preferences.dtd index d308ec64f..c4ebd4b51 100644 --- a/chrome/locale/en-US/zotero/preferences.dtd +++ b/chrome/locale/en-US/zotero/preferences.dtd @@ -167,7 +167,7 @@ - + diff --git a/chrome/locale/es-ES/zotero/preferences.dtd b/chrome/locale/es-ES/zotero/preferences.dtd index d04a9cd50..ae2141129 100644 --- a/chrome/locale/es-ES/zotero/preferences.dtd +++ b/chrome/locale/es-ES/zotero/preferences.dtd @@ -167,7 +167,6 @@ - diff --git a/chrome/locale/et-EE/zotero/preferences.dtd b/chrome/locale/et-EE/zotero/preferences.dtd index 7c24bc9f7..64dcbba49 100644 --- a/chrome/locale/et-EE/zotero/preferences.dtd +++ b/chrome/locale/et-EE/zotero/preferences.dtd @@ -167,7 +167,6 @@ - diff --git a/chrome/locale/eu-ES/zotero/preferences.dtd b/chrome/locale/eu-ES/zotero/preferences.dtd index 9a11a4026..64296054d 100644 --- a/chrome/locale/eu-ES/zotero/preferences.dtd +++ b/chrome/locale/eu-ES/zotero/preferences.dtd @@ -167,7 +167,6 @@ - diff --git a/chrome/locale/fa/zotero/preferences.dtd b/chrome/locale/fa/zotero/preferences.dtd index cea6304ed..fe1d97f40 100644 --- a/chrome/locale/fa/zotero/preferences.dtd +++ b/chrome/locale/fa/zotero/preferences.dtd @@ -167,7 +167,6 @@ - diff --git a/chrome/locale/fi-FI/zotero/preferences.dtd b/chrome/locale/fi-FI/zotero/preferences.dtd index 0ec118399..7703840b1 100644 --- a/chrome/locale/fi-FI/zotero/preferences.dtd +++ b/chrome/locale/fi-FI/zotero/preferences.dtd @@ -167,7 +167,6 @@ - diff --git a/chrome/locale/fr-FR/zotero/preferences.dtd b/chrome/locale/fr-FR/zotero/preferences.dtd index b55508387..ac1220730 100644 --- a/chrome/locale/fr-FR/zotero/preferences.dtd +++ b/chrome/locale/fr-FR/zotero/preferences.dtd @@ -167,7 +167,6 @@ - diff --git a/chrome/locale/gl-ES/zotero/preferences.dtd b/chrome/locale/gl-ES/zotero/preferences.dtd index 87882c43a..c143bc542 100644 --- a/chrome/locale/gl-ES/zotero/preferences.dtd +++ b/chrome/locale/gl-ES/zotero/preferences.dtd @@ -167,7 +167,6 @@ - diff --git a/chrome/locale/he-IL/zotero/preferences.dtd b/chrome/locale/he-IL/zotero/preferences.dtd index 872007c31..ce671ed10 100644 --- a/chrome/locale/he-IL/zotero/preferences.dtd +++ b/chrome/locale/he-IL/zotero/preferences.dtd @@ -167,7 +167,6 @@ - diff --git a/chrome/locale/hr-HR/zotero/preferences.dtd b/chrome/locale/hr-HR/zotero/preferences.dtd index 0ec118399..7703840b1 100644 --- a/chrome/locale/hr-HR/zotero/preferences.dtd +++ b/chrome/locale/hr-HR/zotero/preferences.dtd @@ -167,7 +167,6 @@ - diff --git a/chrome/locale/hu-HU/zotero/preferences.dtd b/chrome/locale/hu-HU/zotero/preferences.dtd index d4943b968..e6092bf77 100644 --- a/chrome/locale/hu-HU/zotero/preferences.dtd +++ b/chrome/locale/hu-HU/zotero/preferences.dtd @@ -167,7 +167,6 @@ - diff --git a/chrome/locale/is-IS/zotero/preferences.dtd b/chrome/locale/is-IS/zotero/preferences.dtd index 4eeb7de8c..0adbe2cc3 100644 --- a/chrome/locale/is-IS/zotero/preferences.dtd +++ b/chrome/locale/is-IS/zotero/preferences.dtd @@ -167,7 +167,6 @@ - diff --git a/chrome/locale/it-IT/zotero/preferences.dtd b/chrome/locale/it-IT/zotero/preferences.dtd index 9c6f8261d..cc249f650 100644 --- a/chrome/locale/it-IT/zotero/preferences.dtd +++ b/chrome/locale/it-IT/zotero/preferences.dtd @@ -167,7 +167,6 @@ - diff --git a/chrome/locale/ja-JP/zotero/preferences.dtd b/chrome/locale/ja-JP/zotero/preferences.dtd index 88cb50c8f..aab116571 100644 --- a/chrome/locale/ja-JP/zotero/preferences.dtd +++ b/chrome/locale/ja-JP/zotero/preferences.dtd @@ -167,7 +167,6 @@ - diff --git a/chrome/locale/ko-KR/zotero/preferences.dtd b/chrome/locale/ko-KR/zotero/preferences.dtd index bbd2d8fc0..ecf77bae6 100644 --- a/chrome/locale/ko-KR/zotero/preferences.dtd +++ b/chrome/locale/ko-KR/zotero/preferences.dtd @@ -167,7 +167,6 @@ - diff --git a/chrome/locale/mn-MN/zotero/preferences.dtd b/chrome/locale/mn-MN/zotero/preferences.dtd index 8ad66f744..5ea07d23b 100644 --- a/chrome/locale/mn-MN/zotero/preferences.dtd +++ b/chrome/locale/mn-MN/zotero/preferences.dtd @@ -167,7 +167,6 @@ - diff --git a/chrome/locale/nb-NO/zotero/preferences.dtd b/chrome/locale/nb-NO/zotero/preferences.dtd index 7ff595334..c088e15de 100644 --- a/chrome/locale/nb-NO/zotero/preferences.dtd +++ b/chrome/locale/nb-NO/zotero/preferences.dtd @@ -167,7 +167,6 @@ - diff --git a/chrome/locale/nl-NL/zotero/preferences.dtd b/chrome/locale/nl-NL/zotero/preferences.dtd index 34eb6aac0..3b2ba001c 100644 --- a/chrome/locale/nl-NL/zotero/preferences.dtd +++ b/chrome/locale/nl-NL/zotero/preferences.dtd @@ -167,7 +167,6 @@ - diff --git a/chrome/locale/nn-NO/zotero/preferences.dtd b/chrome/locale/nn-NO/zotero/preferences.dtd index 9db2675e3..7915fdc3e 100644 --- a/chrome/locale/nn-NO/zotero/preferences.dtd +++ b/chrome/locale/nn-NO/zotero/preferences.dtd @@ -167,7 +167,6 @@ - diff --git a/chrome/locale/pl-PL/zotero/preferences.dtd b/chrome/locale/pl-PL/zotero/preferences.dtd index e9d526220..56f3e690d 100644 --- a/chrome/locale/pl-PL/zotero/preferences.dtd +++ b/chrome/locale/pl-PL/zotero/preferences.dtd @@ -167,7 +167,6 @@ - diff --git a/chrome/locale/pt-BR/zotero/preferences.dtd b/chrome/locale/pt-BR/zotero/preferences.dtd index ee3d6c33a..20e77f4d3 100644 --- a/chrome/locale/pt-BR/zotero/preferences.dtd +++ b/chrome/locale/pt-BR/zotero/preferences.dtd @@ -167,7 +167,6 @@ - diff --git a/chrome/locale/pt-PT/zotero/preferences.dtd b/chrome/locale/pt-PT/zotero/preferences.dtd index 86b6df7bf..724b70cb8 100644 --- a/chrome/locale/pt-PT/zotero/preferences.dtd +++ b/chrome/locale/pt-PT/zotero/preferences.dtd @@ -167,7 +167,6 @@ - diff --git a/chrome/locale/ro-RO/zotero/preferences.dtd b/chrome/locale/ro-RO/zotero/preferences.dtd index b7a5c7e21..8cc6abe65 100644 --- a/chrome/locale/ro-RO/zotero/preferences.dtd +++ b/chrome/locale/ro-RO/zotero/preferences.dtd @@ -167,7 +167,6 @@ - diff --git a/chrome/locale/ru-RU/zotero/preferences.dtd b/chrome/locale/ru-RU/zotero/preferences.dtd index f5fa3ce50..5a904a1bc 100644 --- a/chrome/locale/ru-RU/zotero/preferences.dtd +++ b/chrome/locale/ru-RU/zotero/preferences.dtd @@ -167,7 +167,6 @@ - diff --git a/chrome/locale/sk-SK/zotero/preferences.dtd b/chrome/locale/sk-SK/zotero/preferences.dtd index a0df388ba..83775e22f 100644 --- a/chrome/locale/sk-SK/zotero/preferences.dtd +++ b/chrome/locale/sk-SK/zotero/preferences.dtd @@ -167,7 +167,6 @@ - diff --git a/chrome/locale/sl-SI/zotero/preferences.dtd b/chrome/locale/sl-SI/zotero/preferences.dtd index d49d0e44f..a4ad6ced2 100644 --- a/chrome/locale/sl-SI/zotero/preferences.dtd +++ b/chrome/locale/sl-SI/zotero/preferences.dtd @@ -167,7 +167,6 @@ - diff --git a/chrome/locale/sr-RS/zotero/preferences.dtd b/chrome/locale/sr-RS/zotero/preferences.dtd index e48699d97..0a67c2a1c 100644 --- a/chrome/locale/sr-RS/zotero/preferences.dtd +++ b/chrome/locale/sr-RS/zotero/preferences.dtd @@ -167,7 +167,6 @@ - diff --git a/chrome/locale/sv-SE/zotero/preferences.dtd b/chrome/locale/sv-SE/zotero/preferences.dtd index 99cf5d79b..e8549a7a3 100644 --- a/chrome/locale/sv-SE/zotero/preferences.dtd +++ b/chrome/locale/sv-SE/zotero/preferences.dtd @@ -167,7 +167,6 @@ - diff --git a/chrome/locale/th-TH/zotero/preferences.dtd b/chrome/locale/th-TH/zotero/preferences.dtd index 843e2e5fc..34a3cd60d 100644 --- a/chrome/locale/th-TH/zotero/preferences.dtd +++ b/chrome/locale/th-TH/zotero/preferences.dtd @@ -167,7 +167,6 @@ - diff --git a/chrome/locale/tr-TR/zotero/preferences.dtd b/chrome/locale/tr-TR/zotero/preferences.dtd index 56e8afcd5..b9d09acb7 100644 --- a/chrome/locale/tr-TR/zotero/preferences.dtd +++ b/chrome/locale/tr-TR/zotero/preferences.dtd @@ -167,7 +167,6 @@ - diff --git a/chrome/locale/vi-VN/zotero/preferences.dtd b/chrome/locale/vi-VN/zotero/preferences.dtd index 7bc769392..1cf5dd94c 100644 --- a/chrome/locale/vi-VN/zotero/preferences.dtd +++ b/chrome/locale/vi-VN/zotero/preferences.dtd @@ -167,7 +167,6 @@ - diff --git a/chrome/locale/zh-CN/zotero/preferences.dtd b/chrome/locale/zh-CN/zotero/preferences.dtd index 80e4e0949..8120344bb 100644 --- a/chrome/locale/zh-CN/zotero/preferences.dtd +++ b/chrome/locale/zh-CN/zotero/preferences.dtd @@ -167,7 +167,6 @@ - diff --git a/chrome/locale/zh-TW/zotero/preferences.dtd b/chrome/locale/zh-TW/zotero/preferences.dtd index 3906de13b..658c03047 100644 --- a/chrome/locale/zh-TW/zotero/preferences.dtd +++ b/chrome/locale/zh-TW/zotero/preferences.dtd @@ -167,7 +167,6 @@ - From 7e5ec21781bcef898b0c086416d24a88e0fa701a Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Thu, 5 Jan 2012 16:25:20 -0500 Subject: [PATCH 04/11] Fix misspelling in Danish locale --- chrome/locale/da-DK/zotero/zotero.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chrome/locale/da-DK/zotero/zotero.properties b/chrome/locale/da-DK/zotero/zotero.properties index d4db50472..1213e6c26 100644 --- a/chrome/locale/da-DK/zotero/zotero.properties +++ b/chrome/locale/da-DK/zotero/zotero.properties @@ -257,7 +257,7 @@ itemFields.rights=Rettigheder itemFields.series=Tidsskrift itemFields.volume=Årgang itemFields.issue=Bind -itemFields.edition=Udgavve +itemFields.edition=Udgave itemFields.place=Sted itemFields.publisher=Udgiver itemFields.pages=Sider From 204f9563c6bced5b5988549554c762004b157887 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Thu, 5 Jan 2012 19:05:50 -0500 Subject: [PATCH 05/11] Fix global flag on Zotero.Prefs.get() --- chrome/content/zotero/xpcom/zotero.js | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/chrome/content/zotero/xpcom/zotero.js b/chrome/content/zotero/xpcom/zotero.js index fb038859d..4cc1c555a 100644 --- a/chrome/content/zotero/xpcom/zotero.js +++ b/chrome/content/zotero/xpcom/zotero.js @@ -1926,19 +1926,20 @@ Zotero.Prefs = new function(){ try { if (global) { var service = Components.classes["@mozilla.org/preferences-service;1"] - .getService(Components.interfaces.nsIPrefService); + .getService(Components.interfaces.nsIPrefService); + var branch = service.getBranch(""); } else { - var service = this.prefBranch; + var branch = this.prefBranch; } - switch (this.prefBranch.getPrefType(pref)){ - case this.prefBranch.PREF_BOOL: - return this.prefBranch.getBoolPref(pref); - case this.prefBranch.PREF_STRING: - return this.prefBranch.getCharPref(pref); - case this.prefBranch.PREF_INT: - return this.prefBranch.getIntPref(pref); + switch (branch.getPrefType(pref)){ + case branch.PREF_BOOL: + return branch.getBoolPref(pref); + case branch.PREF_STRING: + return branch.getCharPref(pref); + case branch.PREF_INT: + return branch.getIntPref(pref); } } catch (e){ From 0ae175127bfb5dd1eec225eef363862b908c87a0 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Thu, 5 Jan 2012 19:32:20 -0500 Subject: [PATCH 06/11] Add help button to prefs pointing to documentation --- .../content/zotero/preferences/preferences.js | 38 ++++++++++++++++++- .../zotero/preferences/preferences.xul | 24 ++++++++---- .../preferences/preferences_firefox.xul | 3 +- 3 files changed, 55 insertions(+), 10 deletions(-) diff --git a/chrome/content/zotero/preferences/preferences.js b/chrome/content/zotero/preferences/preferences.js index 41c81ca85..2ff53d787 100644 --- a/chrome/content/zotero/preferences/preferences.js +++ b/chrome/content/zotero/preferences/preferences.js @@ -30,9 +30,45 @@ var _io = {}; var Zotero_Preferences = { - onUnload: function () { Zotero_Preferences.Debug_Output.onUnload(); + }, + + openHelpLink: function () { + var url = "http://www.zotero.org/support/preferences/"; + var helpTopic = document.getElementsByTagName("prefwindow")[0].currentPane.helpTopic; + url += helpTopic; + + // Non-instantApply prefwindows are usually modal, so we can't open in the topmost window, + // since it's probably behind the window + var instantApply = Zotero.Prefs.get("browser.preferences.instantApply", true); + + if (instantApply) { + window.opener.ZoteroPane_Local.loadURI(url, { shiftKey: true, metaKey: true }); + } + else { + if (Zotero.isStandalone) { + var io = Components.classes['@mozilla.org/network/io-service;1'] + .getService(Components.interfaces.nsIIOService); + var uri = io.newURI(url, null, null); + var handler = Components.classes['@mozilla.org/uriloader/external-protocol-service;1'] + .getService(Components.interfaces.nsIExternalProtocolService) + .getProtocolHandlerInfo('http'); + handler.preferredAction = Components.interfaces.nsIHandlerInfo.useSystemDefault; + handler.launchWithURI(uri, null); + } + else { + var ww = Components.classes["@mozilla.org/embedcomp/window-watcher;1"] + .getService(Components.interfaces.nsIWindowWatcher); + var win = ww.openWindow( + window, + url, + "helpWindow", + "chrome=no,menubar=yes,location=yes,toolbar=yes,personalbar=yes,resizable=yes,scrollbars=yes,status=yes", + null + ); + } + } } } diff --git a/chrome/content/zotero/preferences/preferences.xul b/chrome/content/zotero/preferences/preferences.xul index 3ea24852a..da995dd0e 100644 --- a/chrome/content/zotero/preferences/preferences.xul +++ b/chrome/content/zotero/preferences/preferences.xul @@ -42,11 +42,13 @@ To add a new preference: --> + windowtype="zotero:pref" ondialoghelp="Zotero_Preferences.openHelpLink()" + xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> + image="chrome://zotero/skin/prefs-general.png" + helpTopic="general"> @@ -156,7 +158,8 @@ To add a new preference: + image="chrome://zotero/skin/prefs-sync.png" + helpTopic="sync"> @@ -403,7 +406,8 @@ To add a new preference: + image="chrome://zotero/skin/prefs-search.png" + helpTopic="search"> @@ -492,7 +496,8 @@ To add a new preference: + image="chrome://zotero/skin/prefs-export.png" + helpTopic="export"> @@ -557,7 +562,8 @@ To add a new preference: + image="chrome://zotero/skin/prefs-styles.png" + helpTopic="cite"> @@ -616,7 +622,8 @@ To add a new preference: + image="chrome://zotero/skin/prefs-keys.png" + helpTopic="shortcut_keys"> @@ -711,7 +718,8 @@ To add a new preference: + image="chrome://zotero/skin/prefs-advanced.png" + helpTopic="advanced"> diff --git a/chrome/content/zotero/preferences/preferences_firefox.xul b/chrome/content/zotero/preferences/preferences_firefox.xul index 51b9c1bd1..90aa7f9d8 100644 --- a/chrome/content/zotero/preferences/preferences_firefox.xul +++ b/chrome/content/zotero/preferences/preferences_firefox.xul @@ -78,7 +78,8 @@ To add a new preference: + image="chrome://zotero/skin/prefs-proxies.png" position="6" + helpTopic="proxies"> &zotero.preferences.proxies.desc_before_link;