[Pkg-mozext-commits] [gcontactsync] 34/88: Issue #18: Remove advanced settings checkbox from the edit accounts dialog
David Prévot
taffit at moszumanska.debian.org
Thu Sep 18 20:52:27 UTC 2014
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository gcontactsync.
commit 1906b37cf6e731b4495f28f6460d2020cb55a20c
Author: Josh Geenen <joshgeenen at gmail.com>
Date: Mon Jan 20 12:09:10 2014 -0600
Issue #18: Remove advanced settings checkbox from the edit accounts dialog
---
src/content/Accounts.js | 18 +-----
src/content/Accounts.xul | 130 ++++++++++++++++++++----------------------
src/locale/en-US/Accounts.dtd | 5 --
3 files changed, 63 insertions(+), 90 deletions(-)
diff --git a/src/content/Accounts.js b/src/content/Accounts.js
index 15be1ea..3e61b0a 100644
--- a/src/content/Accounts.js
+++ b/src/content/Accounts.js
@@ -63,9 +63,9 @@ com.gContactSync.Accounts = {
mPrefElemIDs: [
"Username",
"Groups",
- "showAdvanced",
"Plugin",
"SyncDirection",
+ "updateGoogleInConflicts",
"disabled"
],
/**
@@ -75,11 +75,10 @@ com.gContactSync.Accounts = {
initDialog: function Accounts_initDialog() {
// This script is also included by the account setup wizard.
// Only run these initialization functions on the account dialog.
- if (document.getElementById("showAdvanced") === null) {return;}
+ if (document.getElementById("loginTree") === null) {return;}
try {
this.fillAbTree();
this.fillUsernames();
- this.showAdvancedSettings(document.getElementById("showAdvanced").checked);
this.selectedAbChange();
}
catch (e) {
@@ -246,19 +245,6 @@ com.gContactSync.Accounts = {
}
},
/**
- * Show or hide the advanced settings and then call window.sizeToContent().
- * @param aShow {boolean} Set to true to show the advanced settings or false
- * to hide them.
- * @returns {boolean} True if the advanced settings were shown or hidden.
- */
- showAdvancedSettings: function Accounts_showAdvanceDsettings(aShow) {
- var elem = document.getElementById("advancedGroupBox");
- if (!elem) return false;
- elem.setAttribute("collapsed", aShow ? "false" : "true");
- window.sizeToContent();
- return true;
- },
- /**
* Called when the selected address book changes in the accounts tree.
* @returns {boolean} true if there is currently an address book selected.
*/
diff --git a/src/content/Accounts.xul b/src/content/Accounts.xul
index 0f9f996..f034a7d 100644
--- a/src/content/Accounts.xul
+++ b/src/content/Accounts.xul
@@ -69,79 +69,71 @@
</hbox>
</vbox>
<vbox>
- <groupbox id="BasicGroupbox">
- <caption label="&Basic.label;"/>
- <hbox>
- <label control="Username" value="&Username.label;" accesskey="&Username.accesskey;"/>
- <label id="link-label" value="&NewUsername.label;" accesskey="&NewUsername.accesskey;"
- onclick="com.gContactSync.Accounts.newUsername();"/>
- </hbox>
- <menulist id="Username"
- oncommand="com.gContactSync.Accounts.restoreGroups();
- com.gContactSync.Accounts.mUnsavedChange = true;">
- <menupopup id="UsernamePopup">
- <menuitem value="None" label="&NoUsername.label;"/>
- </menupopup>
- </menulist>
- <spacer height="5px"/>
- <label control="Groups" value="&Groups.label;" accesskey="&Groups.accesskey;"/>
- <hbox id="GroupsBox">
- <menulist id="Groups"
- oncommand="com.gContactSync.Accounts.mUnsavedChange = true;">
- <menupopup id="GroupsPopup">
- <menuitem class="default" value="All" label="&AllGroups.label;"/>
- <menuitem class="default" value="false" label="&NoGroups.label;"/>
- <menuitem class="default" value="contacts" label="&Contacts.label;"/>
- <menuitem class="default" value="coworkers" label="&Coworkers.label;"/>
- <menuitem class="default" value="family" label="&Family.label;"/>
- <menuitem class="default" value="friends" label="&Friends.label;"/>
- </menupopup>
- </menulist>
- <button id="GetGroups"
- oncommand="com.gContactSync.Accounts.getAllGroups(document.getElementById('Username').value);"
- label="&GetGroups.label;"
- accesskey="&GetGroups.accesskey;"/>
- </hbox>
- <spacer height="5px"/>
- <checkbox id="disabled"
- label="&Disable.label;"
- accesskey="&Disable.accesskey;"
- tooltiptext="&Disable.tooltiptext;"
- oncommand="com.gContactSync.Accounts.mUnsavedChange = true;"/>
- </groupbox>
- <checkbox id="showAdvanced" label="&showAdvanced.label;"
- oncommand="com.gContactSync.Accounts.showAdvancedSettings(this.checked);"/>
+ <hbox>
+ <label control="Username" value="&Username.label;" accesskey="&Username.accesskey;"/>
+ <label id="link-label" value="&NewUsername.label;" accesskey="&NewUsername.accesskey;"
+ onclick="com.gContactSync.Accounts.newUsername();"/>
+ </hbox>
+ <menulist id="Username"
+ oncommand="com.gContactSync.Accounts.restoreGroups();
+ com.gContactSync.Accounts.mUnsavedChange = true;">
+ <menupopup id="UsernamePopup">
+ <menuitem value="None" label="&NoUsername.label;"/>
+ </menupopup>
+ </menulist>
<spacer height="5px"/>
- <groupbox id="advancedGroupBox">
- <label control="Plugin" value="&Plugin.label;" collapsed="true"/>
- <menulist id="Plugin" collapsed="true"
- oncommand="com.gContactSync.Accounts.mUnsavedChange = true;">
- <menupopup id="PluginPopup">
- <menuitem id="google" value="Google" label="&Google.label;"/>
- </menupopup>
- </menulist>
- <spacer height="5px" collapsed="true"/>
- <caption label="&Advanced.label;"/>
- <spacer height="5px"/>
- <hbox>
- <label control="SyncDirection" value="&SyncDirection.label;" accesskey="&SyncDirection.accesskey;"/>
- <label id="link-label" value="&DirectionHelp.label;"
- onclick="com.gContactSync.Accounts.directionPopup();"/>
- </hbox>
- <menulist id="SyncDirection"
+ <label control="Groups" value="&Groups.label;" accesskey="&Groups.accesskey;"/>
+ <hbox id="GroupsBox">
+ <menulist id="Groups"
oncommand="com.gContactSync.Accounts.mUnsavedChange = true;">
- <menupopup id="SyncDirectionPopup">
- <menuitem value="Complete" label="&Complete.label;"/>
- <menuitem value="ReadOnly" label="&ReadOnly.label;"/>
- <menuitem value="WriteOnly" label="&WriteOnly.label;"/>
+ <menupopup id="GroupsPopup">
+ <menuitem class="default" value="All" label="&AllGroups.label;"/>
+ <menuitem class="default" value="false" label="&NoGroups.label;"/>
+ <menuitem class="default" value="contacts" label="&Contacts.label;"/>
+ <menuitem class="default" value="coworkers" label="&Coworkers.label;"/>
+ <menuitem class="default" value="family" label="&Family.label;"/>
+ <menuitem class="default" value="friends" label="&Friends.label;"/>
</menupopup>
</menulist>
- <spacer height="5px"/>
- <checkbox id="updateGoogleInConflicts"
- label="&updateG.label;"
- tooltiptext="&updateG.tooltiptext;"
- oncommand="com.gContactSync.Accounts.mUnsavedChange = true;"/>
- </groupbox>
+ <button id="GetGroups"
+ oncommand="com.gContactSync.Accounts.getAllGroups(document.getElementById('Username').value);"
+ label="&GetGroups.label;"
+ accesskey="&GetGroups.accesskey;"/>
+ </hbox>
+ <spacer height="5px"/>
+ <label control="Plugin" value="&Plugin.label;" collapsed="true"/>
+ <menulist id="Plugin" collapsed="true"
+ oncommand="com.gContactSync.Accounts.mUnsavedChange = true;">
+ <menupopup id="PluginPopup">
+ <menuitem id="google" value="Google" label="&Google.label;"/>
+ </menupopup>
+ </menulist>
+ <spacer height="5px"/>
+ <hbox>
+ <label control="SyncDirection" value="&SyncDirection.label;" accesskey="&SyncDirection.accesskey;"/>
+ <label id="link-label" value="&DirectionHelp.label;"
+ onclick="com.gContactSync.Accounts.directionPopup();"/>
+ </hbox>
+ <menulist id="SyncDirection"
+ oncommand="com.gContactSync.Accounts.mUnsavedChange = true;">
+ <menupopup id="SyncDirectionPopup">
+ <menuitem value="Complete" label="&Complete.label;"/>
+ <menuitem value="ReadOnly" label="&ReadOnly.label;"/>
+ <menuitem value="WriteOnly" label="&WriteOnly.label;"/>
+ </menupopup>
+ </menulist>
+ <spacer height="5px"/>
+ <checkbox id="updateGoogleInConflicts"
+ label="&updateG.label;"
+ accesskey="&updateG.accesskey;"
+ tooltiptext="&updateG.tooltiptext;"
+ oncommand="com.gContactSync.Accounts.mUnsavedChange = true;"/>
+ <spacer height="5px"/>
+ <checkbox id="disabled"
+ label="&Disable.label;"
+ accesskey="&Disable.accesskey;"
+ tooltiptext="&Disable.tooltiptext;"
+ oncommand="com.gContactSync.Accounts.mUnsavedChange = true;"/>
<spacer height="5px"/>
<hbox id="acctButtons" align="right">
<!--<button id="deleteAB" label="&deleteAB.label;" oncommand="com.gContactSync.Accounts.deleteSelectedAB();"/>-->
diff --git a/src/locale/en-US/Accounts.dtd b/src/locale/en-US/Accounts.dtd
index 5cef092..b8165c0 100644
--- a/src/locale/en-US/Accounts.dtd
+++ b/src/locale/en-US/Accounts.dtd
@@ -13,7 +13,6 @@
<!-- Account labels and options -->
<!-- Basic Settings -->
-<!ENTITY Basic.label "Basic Settings">
<!ENTITY Username.label "Choose an Account">
<!ENTITY Username.accesskey "C">
<!ENTITY NewUsername.label "Add a New Account">
@@ -31,10 +30,6 @@
<!ENTITY GetGroups.label "Find all Groups">
<!ENTITY GetGroups.accesskey "F">
-<!-- Advanced Settings -->
-<!ENTITY showAdvanced.label "Show Advanced Settings">
-<!ENTITY Advanced.label "Advanced Settings">
-
<!ENTITY Plugin.label "Pick a Plugin to use">
<!ENTITY Google.label "Google">
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/gcontactsync.git
More information about the Pkg-mozext-commits
mailing list