Changeset 039e6e

Timestamp:

Jul 17, 2009, 9:52:25 PM (12 years ago)

Author:

rene <rene@…>

Branches:

lite_0.1, multiEdit, ng_0.6, ng_0.6_help, ng_0.8, ng_0.9

Children:

193c97

Parents:

e7fe3d

Message:

reorganized prefDialog

Location:

chrome

Files:

• content/v_identity/vI_prefDialog.js (modified) (5 diffs)
• content/v_identity/vI_prefDialog.xul (modified) (3 diffs)
• skin/classic/v_identity/v_identity.css (modified) (2 diffs)

chrome/content/v_identity/vI_prefDialog.js

@@ -108 +108 @@
             }
         },
-        
+
         savePrefs : function() {
             for( var i = 0; i < vI_prefDialog.base._elementIDs.length; i++ ) {
@@ -132 +132 @@
         },
         
-        idSelectionConstraint : function() {
+        modifyAttribute : function(elemID, attribute, value) {
+            if (value) document.getElementById(elemID).removeAttribute(attribute);
+            else document.getElementById(elemID).setAttribute(attribute, "true");
+        },
+
+        constraints : function() {
             var storage = document.getElementById("VIdent_identity.storage").checked;
             var smartDraft = document.getElementById("VIdent_identity.smart_draft").checked;
             var smartReply = document.getElementById("VIdent_identity.smart_reply").checked;
-            vI_prefDialog.base.idSelectionConstraint1(storage && smartReply);
-            vI_prefDialog.base.idSelectionConstraint2(storage || smartReply || smartDraft);
-            if (storage || smartReply || smartDraft) vI_prefDialog.base.idSelectionResultConstraint()
-        },
-
-        idSelectionConstraint1 : function(checked) {
-            var elementIDs = [
-                "VIdent_identity.idSelection_storage_prefer_smart_reply",
-                "VIdent_identity.idSelection_storage_ignore_smart_reply"];
-            for( var i = 0; i < elementIDs.length; i++ ) {
-                if (checked) document.getElementById(elementIDs[i]).removeAttribute("disabled");
-                else document.getElementById(elementIDs[i]).setAttribute("disabled", "true");
-            }
-        },
-
-        idSelectionConstraint2 : function(checked) {
-            var elementIDs = [
-                "VIdent_identity.idSelection_ask",
-                "VIdent_identity.idSelection_ask_always",
-                "VIdent_identity.idSelection_autocreate",
-                "VIdent_identity.idSelection_autocreate.desc",];
-            for( var i = 0; i < elementIDs.length; i++ ) {
-                if (checked) document.getElementById(elementIDs[i]).removeAttribute("disabled");
-                else document.getElementById(elementIDs[i]).setAttribute("disabled", "true");
-            }
-        },
-
-        smartReplyConstraint : function(element) {
-            var elementIDs = [
-                "VIdent_identity.smart_reply_for_newsgroups",
-                "VIdent_identity.smart_reply_headers",
-                "VIdent_identity.smart_reply_filter",
-                "VIdent_identity.smart_reply_defaultFullName",
-                "VIdent_identity.smart_reply_ignoreFullName",
-                "VIdent_identity.smart_reply_headers_reset",
-                "VIdent_identity.smart_detectByReceivedHeader"];
-            for( var i = 0; i < elementIDs.length; i++ ) {
-                if (element.checked) document.getElementById(elementIDs[i]).removeAttribute("disabled");
-                else document.getElementById(elementIDs[i]).setAttribute("disabled", "true");
-            }
-            vI_prefDialog.base.idSelectionConstraint();
-        },
-        
+            var mAttr = vI_prefDialog.base.modifyAttribute;
+
+            // idSelectionConstraint
+            var idSelectionConstraint = (storage || smartReply || smartDraft);
+            mAttr("VIdent_identity.idSelection_ask","disabled",idSelectionConstraint);
+            mAttr("VIdent_identity.idSelection_ask_always","disabled",idSelectionConstraint);
+            mAttr("VIdent_identity.idSelection_autocreate","disabled",idSelectionConstraint);
+            mAttr("VIdent_identity.idSelection_autocreate.desc","disabled",idSelectionConstraint);
+            mAttr("selection","featureDisabled",idSelectionConstraint);
+            mAttr("toCompose","featureDisabled",idSelectionConstraint);
+
+            // idSelectionInputConstraint
+            var idSelectionInputConstraint = (storage && smartReply);
+            mAttr("VIdent_identity.idSelection_storage_prefer_smart_reply","disabled",idSelectionInputConstraint);
+            mAttr("VIdent_identity.idSelection_storage_ignore_smart_reply","disabled",idSelectionInputConstraint);
+            if (idSelectionInputConstraint) vI_prefDialog.base.idSelectionResultConstraint();
+
+            // sourceEmailConstraint
+            var sourceEmailConstraint = (smartReply || smartDraft);
+            mAttr("sourceEmail","featureDisabled",sourceEmailConstraint);
+            mAttr("toSelection","featureDisabled",sourceEmailConstraint);
+
+        },
+
         idSelectionResultConstraint : function() {
             var ask = document.getElementById("VIdent_identity.idSelection_ask")
@@ -188 +174 @@
             autocreate_desc.setAttribute("disabled", (ask.checked && ask_always.checked))
             autocreate_desc.setAttribute("hidden", !ask.checked)
+        },
+
+        smartReplyConstraint : function(element) {
+            var mAttr = vI_prefDialog.base.modifyAttribute;
+            mAttr("VIdent_identity.smart_reply_for_newsgroups","disabled",element.checked);
+            mAttr("VIdent_identity.smart_reply_headers","disabled",element.checked);
+            mAttr("VIdent_identity.smart_reply_filter","disabled",element.checked);
+            mAttr("VIdent_identity.smart_reply_defaultFullName","disabled",element.checked);
+            mAttr("VIdent_identity.smart_reply_ignoreFullName","disabled",element.checked);
+            mAttr("VIdent_identity.smart_reply_headers_reset","disabled",element.checked);
+            mAttr("VIdent_identity.smart_detectByReceivedHeader","disabled",element.checked);
+            vI_prefDialog.base.constraints();
         },
         
@@ -222 +220 @@
         
         storageConstraint : function(element) {
-            var elementIDs = [
-                "VIdent_identity.storage_storedefault",
-                "VIdent_identity.storage_store_base_id",
-                "VIdent_identity.storage_dont_update_multiple",
-                "VIdent_identity.storage_show_switch",
-                "VIdent_identity.storage_warn_update",
-                "VIdent_identity.storage_warn_vI_replace",
-                "VIdent_identity.storage_notification",
-                "VIdent_identity.storage_getOneOnly",
-                "VIdent_identity.storageExtras_returnReciept",
-                "VIdent_identity.storageExtras_characterEncoding",
-                "VIdent_identity.storageExtras_messageFormat",
-                "VIdent_identity.storageExtras_sMime_messageEncryption",
-                "VIdent_identity.storageExtras_sMime_messageSignature",
-                "VIdent_identity.storageExtras_openPGP_messageEncryption",
-                "VIdent_identity.storageExtras_openPGP_messageSignature",
-                "VIdent_identity.storageExtras_openPGP_PGPMIME"];
-            for( var i = 0; i < elementIDs.length; i++ ) {
-                if (element.checked) document.getElementById(elementIDs[i]).removeAttribute("disabled");
-                else document.getElementById(elementIDs[i]).setAttribute("disabled", "true");
-            }
-            var imageIDs = ["storageOut", "storageUp", "storageUpDown"];
-            for( var i = 0; i < imageIDs.length; i++ ) {
-                if (element.checked) document.getElementById(imageIDs[i]).removeAttribute("feature");
-                else document.getElementById(imageIDs[i]).setAttribute("feature", "off");
-            }
-            vI_prefDialog.base.idSelectionConstraint();
+            var mAttr = vI_prefDialog.base.modifyAttribute;
+            mAttr("VIdent_identity.storage_storedefault","disabled",element.checked);
+            mAttr("VIdent_identity.storage_store_base_id","disabled",element.checked);
+            mAttr("VIdent_identity.storage_dont_update_multiple","disabled",element.checked);
+            mAttr("VIdent_identity.storage_show_switch","disabled",element.checked);
+            mAttr("VIdent_identity.storage_warn_update","disabled",element.checked);
+            mAttr("VIdent_identity.storage_warn_vI_replace","disabled",element.checked);
+            mAttr("VIdent_identity.storage_notification","disabled",element.checked);
+            mAttr("VIdent_identity.storage_getOneOnly","disabled",element.checked);
+            mAttr("VIdent_identity.storageExtras_returnReciept","disabled",element.checked);
+            mAttr("VIdent_identity.storageExtras_characterEncoding","disabled",element.checked);
+            mAttr("VIdent_identity.storageExtras_messageFormat","disabled",element.checked);
+            mAttr("VIdent_identity.storageExtras_sMime_messageEncryption","disabled",element.checked);
+            mAttr("VIdent_identity.storageExtras_sMime_messageSignature","disabled",element.checked);
+            mAttr("VIdent_identity.storageExtras_openPGP_messageEncryption","disabled",element.checked);
+            mAttr("VIdent_identity.storageExtras_openPGP_messageSignature","disabled",element.checked);
+            mAttr("VIdent_identity.storageExtras_openPGP_PGPMIME","disabled",element.checked);
+            mAttr("storageOut","featureDisabled",element.checked);
+            mAttr("storageUp","featureDisabled",element.checked);
+            mAttr("storageUpDown","featureDisabled",element.checked);
+            vI_prefDialog.base.constraints();
         }
     },
@@ -276 +268 @@
         vI_prefDialog.base.smartReplyHideSignature();
         vI_prefDialog.base.storageConstraint(document.getElementById("VIdent_identity.storage"));
-        vI_prefDialog.base.idSelectionConstraint();
+        vI_prefDialog.base.constraints();
         if (vI_storageExtrasHelper.seamonkey_to_old())
             document.getElementById("storageTab2").setAttribute("hidden", "true")

chrome/content/v_identity/vI_prefDialog.xul

@@ -89 +89 @@
                 oncommand="document.getElementById('prefTabbox').selectedIndex = 1;"
                 tooltiptext="&vI_prefDialog.tabbox.tab1.label;" />
-            <vbox><spacer flex="1"/><image class="arrow" id="toSelection" /><spacer flex="1"/></vbox>
+            <vbox><spacer flex="1"/><image class="arrow" id="toCompose" /><spacer flex="1"/></vbox>
             <radio pane="source" id="composeDialog"
                 oncommand="document.getElementById('prefTabbox').selectedIndex = 2;"
                 tooltiptext="&vI_prefDialog.tabbox.tab2.label;" />
-            <vbox><spacer flex="1"/><image class="arrow" id="toSelection" /><spacer flex="1"/></vbox>
+            <vbox><spacer flex="1"/><image class="arrow" id="toSend" /><spacer flex="1"/></vbox>
             <radio pane="source" id="emailOut"
                 oncommand="document.getElementById('prefTabbox').selectedIndex = 3;"
@@ -162 +162 @@
                 <checkbox id="VIdent_identity.smart_draft" label="&vI_prefDialog.smartDraft.label;"
                     tooltiptext="&vI_prefDialog.smartDraft.tooltiptext;" prefstring="smart_draft"
-                    oncommand="vI_prefDialog.base.idSelectionConstraint();" />
+                    oncommand="vI_prefDialog.base.constraints();" />
                 </groupbox>
                 <groupbox>
@@ -221 +221 @@
                     <hbox>
                     <description class="widthX">&vI_prefDialog.smartReply.defaultFullname.label;</description>
-                    <vbox><spacer flex="1"/><textbox id="VIdent_identity.smart_reply_defaultFullName" flex="1"
+                    <vbox><spacer flex="1"/><textbox id="VIdent_identity.smart_reply_defaultFullName"
                         prefstring="smart_reply_defaultFullName" size="20" /><spacer flex="1"/></vbox>
                     </hbox>

chrome/skin/classic/v_identity/v_identity.css

@@ -49 +49 @@
 
 radio#sourceEmail           { -moz-image-region: rect(0px, 338px, 52px, 280px) }
-radio#sourceEmail[feature="off"]    { -moz-image-region: rect(104px, 338px, 156px, 280px) }
+radio#sourceEmail[featureDisabled="true"]   { -moz-image-region: rect(104px, 338px, 156px, 280px) }
 radio#sourceEmail:hover         { -moz-image-region: rect(52px, 338px, 104px, 280px) }
 radio#selection         { -moz-image-region: rect(0px, 168px, 52px, 112px) }
-radio#selection[feature="off"]  { -moz-image-region: rect(104px, 168px, 156px, 112px) }
+radio#selection[featureDisabled="true"]     { -moz-image-region: rect(104px, 168px, 156px, 112px) }
 radio#selection:hover       { -moz-image-region: rect(52px, 168px, 104px, 112px) }
 radio#composeDialog             { -moz-image-region: rect(0px, 112px, 52px, 56px) }
-radio#composeDialog[feature="off"]  { -moz-image-region: rect(104px, 112px, 156px, 56px) }
+radio#composeDialog[featureDisabled="true"]     { -moz-image-region: rect(104px, 112px, 156px, 56px) }
 radio#composeDialog:hover       { -moz-image-region: rect(52px, 112px, 104px, 56px) }
 radio#emailOut          { -moz-image-region: rect(0px, 56px, 52px, 0px) }
-radio#emailOut[feature="off"]   { -moz-image-region: rect(104px, 56px, 156px, 0px) }
+radio#emailOut[featureDisabled="true"]  { -moz-image-region: rect(104px, 56px, 156px, 0px) }
 radio#emailOut:hover        { -moz-image-region: rect(52px, 56px, 104px, 0px) }
 radio#storageOut            { -moz-image-region: rect(0px, 280px, 52px, 224px) }
-radio#storageOut[feature="off"]     { -moz-image-region: rect(104px, 280px, 156px, 224px) }
+radio#storageOut[featureDisabled="true"]    { -moz-image-region: rect(104px, 280px, 156px, 224px) }
 radio#storageOut:hover          { -moz-image-region: rect(52px, 280px, 104px, 224px) }
 radio#options           { -moz-image-region: rect(0px, 393px, 52px, 335px) }
-radio#options[feature="off"]    { -moz-image-region: rect(104px, 393px, 156px, 335px) }
+radio#options[featureDisabled="true"]   { -moz-image-region: rect(104px, 393px, 156px, 335px) }
 radio#options:hover         { -moz-image-region: rect(52px, 393px, 104px, 335px) }
 
@@ -71 +71 @@
 }
 
-image#toSelection           { -moz-image-region: rect(0px, 64px, 30px, 47px) }
-image#toSelection[feature="off"]    { -moz-image-region: rect(30px, 64px, 60px, 47px) }
+image#toSelection, image#toCompose, image#toSend { -moz-image-region: rect(0px, 64px, 30px, 47px) }
+image#toSelection[featureDisabled="true"], image#toCompose[featureDisabled="true"], image#toSend[featureDisabled="true"]    { -moz-image-region: rect(30px, 64px, 60px, 47px) }
 image#storageUpDown             { -moz-image-region: rect(0px, 30px, 30px, -1px) }
-image#storageUpDown[feature="off"]  { -moz-image-region: rect(30px, 30px, 60px, -1px) }
+image#storageUpDown[featureDisabled="true"]     { -moz-image-region: rect(30px, 30px, 60px, -1px) }
 image#storageUp             { -moz-image-region: rect(0px, 48px, 30px, 30px) }
-image#storageUp[feature="off"]      { -moz-image-region: rect(30px, 48px, 60px, 30px) }
+image#storageUp[featureDisabled="true"]     { -moz-image-region: rect(30px, 48px, 60px, 30px) }