commit e1c770bef73c62ca1f0b3289d70af234f3e70158
parent 621af3b301ca37a55a762f2ed51984f809fbc24f
Author: Dan Stillman <dstillman@zotero.org>
Date: Sat, 29 Jan 2011 01:24:47 +0000
Remove Full Sync option from preferences
Diffstat:
2 files changed, 8 insertions(+), 61 deletions(-)
diff --git a/chrome/content/zotero/preferences/preferences.js b/chrome/content/zotero/preferences/preferences.js
@@ -486,55 +486,6 @@ function handleSyncReset(action) {
break;
- case 'full-sync':
- var buttonFlags = (ps.BUTTON_POS_0) * (ps.BUTTON_TITLE_IS_STRING)
- + (ps.BUTTON_POS_1) * (ps.BUTTON_TITLE_CANCEL)
- + ps.BUTTON_POS_1_DEFAULT;
- var index = ps.confirmEx(
- null,
- // TODO: localize
- Zotero.getString('general.warning'),
- "The local Zotero library will be completely merged with data belonging to user '" + account + "' on the Zotero server. "
- + "Any unsynced changes will appear as conflicts.\n\n"
- + "This option should generally be used only for troubleshooting sync errors.",
- buttonFlags,
- "Sync",
- null, null, null, {}
- );
-
- switch (index) {
- case 0:
- // TODO: better error handling
- Zotero.Sync.Server.resetClient();
- Zotero.Sync.Server.sync(/*{
- onSuccess: function () {
- Zotero.Sync.Runner.setSyncIcon();
- ps.alert(
- null,
- "Full Sync Completed",
- "The local Zotero library has been merged with data from the Zotero server."
- );
- },
- onError: function (msg) {
- // TODO: combine with error dialog for regular syncs
- ps.alert(
- null,
- "Full Sync Failed",
- "An error occurred while performing the full sync.\n\n"
- + "Click the sync error icon in the Zotero toolbar "
- + "for further information."
- );
- Zotero.Sync.Runner.error(msg);
- }
- }*/);
- break;
-
- // Cancel
- case 1:
- return;
- }
-
- break;
case 'reset-storage-history':
var buttonFlags = (ps.BUTTON_POS_0) * (ps.BUTTON_TITLE_IS_STRING)
diff --git a/chrome/content/zotero/preferences/preferences.xul b/chrome/content/zotero/preferences/preferences.xul
@@ -355,14 +355,6 @@ To add a new preference:
</columns>
<rows>
- <row id="zotero-full-sync">
- <radio/>
- <vbox onclick="this.previousSibling.click()">
- <label value="&zotero.preferences.sync.reset.fullSync;"/>
- <description>&zotero.preferences.sync.reset.fullSync.desc;</description>
- </vbox>
- </row>
-
<row id="zotero-restore-from-server" selected="true">
<radio/>
<vbox onclick="this.previousSibling.click()">
@@ -380,6 +372,10 @@ To add a new preference:
</row>
</rows>
</grid>
+
+ <hbox>
+ <button label="&zotero.preferences.sync.reset.button;" oncommand="handleSyncReset(document.getElementById('zotero-reset-sync-group').selectedItem.parentNode.id.substr(7))"/>
+ </hbox>
</groupbox>
<groupbox>
@@ -401,12 +397,12 @@ To add a new preference:
</row>
</rows>
</grid>
+
+ <hbox>
+ <button label="&zotero.preferences.sync.reset.button;" oncommand="handleSyncReset(document.getElementById('zotero-reset-sync-group').selectedItem.parentNode.id.substr(7))"/>
+ </hbox>
</groupbox>
</radiogroup>
-
- <hbox>
- <button id="zotero-reset-button" label="&zotero.preferences.sync.reset.button;" oncommand="handleSyncReset(document.getElementById('zotero-reset-sync-group').selectedItem.parentNode.id.substr(7))"/>
- </hbox>
</tabpanel>
</tabpanels>
</tabbox>
