Changeset 67ba6a

Timestamp:

Sep 16, 2008, 2:21:41 AM (14 years ago)

Author:

rene <rene@…>

Branches:

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

Children:

b3755b

Parents:

97d350

Message:

some bugfixes, updates

Location:

chrome

Files:

• content/v_identity/vI_account.js (modified) (5 diffs)
• content/v_identity/vI_helper.js (modified) (1 diff)
• content/v_identity/vI_rdfDatasource.js (modified) (1 diff)
• content/v_identity/vI_statusmenu.js (added)
• content/v_identity/vI_storage.js (modified) (5 diffs)
• content/v_identity/vI_storageExtras.js (modified) (1 diff)
• content/v_identity/v_identity.js (modified) (4 diffs)
• content/v_identity/v_identity.xml (modified) (4 diffs)
• content/v_identity/v_identity.xul (modified) (1 diff)
• skin/classic/v_identity/v_identity.css (modified) (2 diffs)

chrome/content/v_identity/vI_account.js

@@ -34 +34 @@
         .getBranch(null),
 
+    _getBaseIdentity : function () {
+        return gAccountManager.getIdentity(vI.elements.Obj_MsgIdentity.value);
+    },
+
     _copyBoolAttribute : function(name) {
         vI_account.account.defaultIdentity.setBoolAttribute(name,
-                vI_helper.getBaseIdentity().getBoolAttribute(name));
+                vI_account._getBaseIdentity().getBoolAttribute(name));
     },
     
     _copyIntAttribute : function(name) {
         vI_account.account.defaultIdentity.setIntAttribute(name,
-                vI_helper.getBaseIdentity().getIntAttribute(name));
+                vI_account._getBaseIdentity().getIntAttribute(name));
     },
 
     _copyCharAttribute : function(name) {
         vI_account.account.defaultIdentity.setCharAttribute(name,
-                vI_helper.getBaseIdentity().getCharAttribute(name));
+                vI_account._getBaseIdentity().getCharAttribute(name));
     },
 
     _copyUnicharAttribute : function(name) {
         vI_account.account.defaultIdentity.setUnicharAttribute(name,
-                vI_helper.getBaseIdentity().getUnicharAttribute(name));
+                vI_account._getBaseIdentity().getUnicharAttribute(name));
     },
 
@@ -212 +216 @@
         // by pointing to the same incomingServer stored passwords can be reused
         // the incomingServer has to be replaced before the account is removed, else it get removed ether
-        var servers = vI_account.AccountManager.GetServersForIdentity(vI_helper.getBaseIdentity());
+        var servers = vI_account.AccountManager.GetServersForIdentity(vI_account._getBaseIdentity());
         vI_account.account.incomingServer = servers.QueryElementAt(0, Components.interfaces.nsIMsgIncomingServer);
         
@@ -250 +254 @@
                 case "3"  :
                 vI_notificationBar.dump ("## vI_account: preparing Fcc --- use Settings of Modified Account\n");
-                vI_account.account.defaultIdentity.doFcc = vI_helper.getBaseIdentity().doFcc;
-                vI_account.account.defaultIdentity.fccFolder = vI_helper.getBaseIdentity().fccFolder;
-                vI_account.account.defaultIdentity.fccFolderPickerMode = vI_helper.getBaseIdentity().fccFolderPickerMode;
+                vI_account.account.defaultIdentity.doFcc = vI_account._getBaseIdentity().doFcc;
+                vI_account.account.defaultIdentity.fccFolder = vI_account._getBaseIdentity().fccFolder;
+                vI_account.account.defaultIdentity.fccFolderPickerMode = vI_account._getBaseIdentity().fccFolderPickerMode;
                 if (!vI_helper.olderVersion("TB", "2.0"))
-                    vI_account.account.defaultIdentity.fccReplyFollowsParent = vI_helper.getBaseIdentity().fccReplyFollowsParent;
+                    vI_account.account.defaultIdentity.fccReplyFollowsParent = vI_account._getBaseIdentity().fccReplyFollowsParent;
                 break;
                 default  :
@@ -290 +294 @@
             case "3"  :
             vI_notificationBar.dump ("## vI_account: preparing Draft --- use Settings of Modified Account\n");
-            vI_account.account.defaultIdentity.draftFolder = vI_helper.getBaseIdentity().draftFolder;
-            vI_account.account.defaultIdentity.draftsFolderPickerMode = vI_helper.getBaseIdentity().draftsFolderPickerMode;
+            vI_account.account.defaultIdentity.draftFolder = vI_account._getBaseIdentity().draftFolder;
+            vI_account.account.defaultIdentity.draftsFolderPickerMode = vI_account._getBaseIdentity().draftsFolderPickerMode;
             break;
             default  :
@@ -317 +321 @@
             case "3"  :
             vI_notificationBar.dump ("## vI_account: preparing Templates --- use Settings of Modified Account\n");
-            vI_account.account.defaultIdentity.stationeryFolder = vI_helper.getBaseIdentity().stationeryFolder;
-            vI_account.account.defaultIdentity.tmplFolderPickerMode = vI_helper.getBaseIdentity().tmplFolderPickerMode;
+            vI_account.account.defaultIdentity.stationeryFolder = vI_account._getBaseIdentity().stationeryFolder;
+            vI_account.account.defaultIdentity.tmplFolderPickerMode = vI_account._getBaseIdentity().tmplFolderPickerMode;
             break;
             default  :

chrome/content/v_identity/vI_helper.js

@@ -103 +103 @@
     },
 
-    // "accountname" property changed in Thunderbird 3.x, Seamonkey 1.5x to "description"
-    getAccountname: function(elem) {
-        if (elem.getAttribute("accountname") == "" && elem.getAttribute("description") != "")
-            return "- " + elem.getAttribute("description")
-        else return elem.getAttribute("accountname")
-    },
-
+/*vI_upgrade.js:229:
+vI_upgrade.js:232:*/
     combineNames : function (fullName, email) {
         if (fullName && fullName.replace(/^\s+|\s+$/g,"")) return fullName.replace(/^\s+|\s+$/g,"") + " <" + email.replace(/^\s+|\s+$/g,"") + ">"
         else return email?email.replace(/^\s+|\s+$/g,""):""
     },
+    
+// vI_rdfDataEditor.js:80:         elem.value = address.combinedName;
+// vI_rdfDatasource.js:119:                if (!parsed.combinedName) {
+// vI_rdfDatasource.js:123:                vI_notificationBar.dump("## vI_rdfDatasource: __getRDFResourceForVIdentity: recDescription=" + parsed.combinedName + "\n")
+// vI_rdfDatasource.js:130:                return vI_rdfDatasource.rdfService.GetResource(vI_rdfDatasource.rdfNS + rdfNSRecType + parsed.combinedName);
+// vI_upgrade.js:225:              //~ alert(splitted.email + "++" + splitted.name + "++" + splitted.combinedName)
+// vI_upgrade.js:256:                       combinedName: name + " <" + email + ">"}
 
-    addIdentityMenuItem: function(object, identityName, accountName, accountKey, identityKey, base_id_key, smtp_key, extras) {
-        vI_notificationBar.dump("## vI_helper: addIdentityMenuItem '" + accountName + "'\n");
-        var MenuItem = document.createElement("menuitem");
-        MenuItem.className = "identity-popup-item";
-        
-        // set the account name in the choosen menu item
-        MenuItem.setAttribute("label", identityName);
-        MenuItem.setAttribute("accountname", accountName);
-        MenuItem.setAttribute("accountkey", accountKey);
-        MenuItem.setAttribute("value", identityKey);
-        MenuItem.setAttribute("class", "identity_clone-popup-item new-icon")
-        if (base_id_key) MenuItem.base_id_key = base_id_key
-        if (smtp_key) MenuItem.smtp_key = smtp_key
-        if (extras) MenuItem.extras = extras
-
-            MenuItem.identityData = new identityData("test@identityData", identityName, base_id_key, smtp_key, extras);
-
-        object.appendChild(MenuItem)
-        
-        return MenuItem
-    },
-
-    getBaseIdentity : function () {
-        return gAccountManager.getIdentity(vI.elements.Obj_MsgIdentity.value);
-    },
-    
     parseAddress : function(address) {
         //~ vI_notificationBar.dump("## v_identity: getAddress: parsing '" + address + "'\n")

chrome/content/v_identity/vI_rdfDatasource.js

@@ -235 +235 @@
         vI_rdfDatasource.__setRDFValue(resource, "smtp", localIdentityData.smtp)
         
-        if (localIdentityData.extras) localIdentityData.extras.loopForRDF(vI_rdfDatasource.__setRDFValue, resource);
+        localIdentityData.extras.loopForRDF(vI_rdfDatasource.__setRDFValue, resource);
     },
 

chrome/content/v_identity/vI_storage.js

@@ -36 +36 @@
     this.id = (this.__keyTranslator.isValidID(id))?id:"";
     this.smtp = (this.__keyTranslator.isValidSMTP(smtp))?smtp:""
-    this.extras = extras;
+    this.extras = extras?extras:new vI_storageExtras();
     this.comp = {   // holds the results of the last comparison for later creation of a compareMatrix
         compareID : null,
@@ -94 +94 @@
     // creates an Duplicate of the current IdentityData, cause usually we are working with a pointer
     getDuplicate : function() {
-        var newExtras = this.extras?this.extras.getDuplicate():null;
-        return new identityData(this.email, this.fullName, this.id, this.smtp, newExtras, this.sideDescription);
+        return new identityData(this.email, this.fullName, this.id, this.smtp, this.extras.getDuplicate(), this.sideDescription);
     },
 
@@ -141 +140 @@
 
     __equalsIdentity : function(identity) {
-        var newExtras = new vI_storageExtras();
-        newExtras.readValues(identity);
         var testIdentity = new identityData(
             identity.email,
             identity.fullName,
             identity.key,
-            identity.smtpServerKey, newExtras)
+            identity.smtpServerKey)
+        testIdentity.extras.readIdentityValues(identity);
         return (this.equals(testIdentity));
     },
@@ -158 +156 @@
         this.comp.equals.smtpName = this.__equalSMTP(compareIdentityData.smtp);
         this.comp.equals.idName = this.__equalID(compareIdentityData.id);
-        this.comp.equals.extras = (!this.extras || !compareIdentityData.extras || this.extras.equal(compareIdentityData.extras))
+        this.comp.equals.extras = this.extras.equal(compareIdentityData.extras);
 
         return (this.comp.equals.fullName && this.comp.equals.email && this.comp.equals.smtpName && this.comp.equals.idName && this.comp.equals.extras)
@@ -195 +193 @@
             string += "<tr><td class='col1'>" + this[item+"Label"] + ":</td>" +
                 "<td class='col2'>" + this[item+"Html"] + "</td></tr>"
-        if (this.extras) string += this.extras.getMatrix();
+        string += this.extras.getMatrix();
         return string;      
     }

chrome/content/v_identity/vI_storageExtras.js

@@ -155 +155 @@
     },
 
+    readIdentityValues : function(identity) {
+        this.readValues();  // has to be build for all extras
+    },
 
     setValues : function() {

chrome/content/v_identity/v_identity.js

@@ -22 +22 @@
     Contributor(s):
  * ***** END LICENSE BLOCK ***** */
-
-
-var vI_statusmenu = {
-    prefroot : Components.classes["@mozilla.org/preferences-service;1"]
-        .getService(Components.interfaces.nsIPrefService)
-        .getBranch(null),
-
-    objStatusMenu : null,
-    objSaveBaseIDMenuItem : null,
-    objStorageSaveMenuItem : null,
-    objStatusMenuSeparator : null,
-    objSaveSwitch : null,
-    objStatusText : null,
-    
-    observe: function(subject, topic, data) {
-        switch (data) {
-            case "extensions.virtualIdentity.storage_show_switch":
-                vI_statusmenu.objSaveSwitch.setAttribute("hidden", !vI_statusmenu.prefroot.getBoolPref(data));
-                // no break, continue like with storedefault
-            case "extensions.virtualIdentity.storage_storedefault":
-                vI_statusmenu.objStorageSaveMenuItem.setAttribute("checked", vI_statusmenu.prefroot.getBoolPref("extensions.virtualIdentity.storage_storedefault"));
-                break;
-            case "extensions.virtualIdentity.storage_store_base_id":
-                vI_statusmenu.objSaveBaseIDMenuItem.setAttribute("checked", vI_statusmenu.prefroot.getBoolPref(data));
-                break;
-            case "extensions.virtualIdentity.storage":
-                if (vI_statusmenu.prefroot.getBoolPref(data)) {
-                    vI_statusmenu.objStorageSaveMenuItem.removeAttribute("hidden");
-                    vI_statusmenu.objSaveBaseIDMenuItem.removeAttribute("hidden");
-                    vI_statusmenu.objStatusMenuSeparator.removeAttribute("hidden");
-                }
-                else {
-                    vI_statusmenu.objStorageSaveMenuItem.setAttribute("hidden", "true");
-                    vI_statusmenu.objSaveBaseIDMenuItem.setAttribute("hidden", "true");
-                    vI_statusmenu.objStatusMenuSeparator.setAttribute("hidden", "true");
-                }
-                break;
-        }
-        vI_statusmenu.menuConstraint(vI_statusmenu.objStorageSaveMenuItem);
-    },
-    
-    addObserver: function() {
-        vI_statusmenu.prefroot.addObserver("extensions.virtualIdentity.storage", vI_statusmenu, false);
-        vI_statusmenu.prefroot.addObserver("extensions.virtualIdentity.storage_show_switch", vI_statusmenu, false);
-        vI_statusmenu.prefroot.addObserver("extensions.virtualIdentity.storage_storedefault", vI_statusmenu, false);    
-        vI_statusmenu.prefroot.addObserver("extensions.virtualIdentity.storage_store_base_id", vI_statusmenu, false);   
-    },
-    
-    removeObserver: function() {
-        vI_statusmenu.prefroot.removeObserver("extensions.virtualIdentity.storage", vI_statusmenu);
-        vI_statusmenu.prefroot.removeObserver("extensions.virtualIdentity.storage_show_switch", vI_statusmenu);
-        vI_statusmenu.prefroot.removeObserver("extensions.virtualIdentity.storage_storedefault", vI_statusmenu);
-        vI_statusmenu.prefroot.removeObserver("extensions.virtualIdentity.storage_store_base_id", vI_statusmenu);
-    },
-    
-    init : function () {
-        vI_statusmenu.prefroot.QueryInterface(Components.interfaces.nsIPrefBranch2);
-
-        vI_statusmenu.objStatusMenu = document.getElementById("vI-status-menu");
-        vI_statusmenu.objSaveBaseIDMenuItem = document.getElementById("vI_statusMenu_storage_saveBaseID");
-        vI_statusmenu.objStorageSaveMenuItem = document.getElementById("vI_statusMenu_storage_save");
-        vI_statusmenu.objStatusMenuSeparator = document.getElementById("vI_statusMenu_separator");
-        vI_statusmenu.objSaveSwitch = document.getElementById("storage_save");
-        vI_statusmenu.objStatusText = document.getElementById("statusText");
-        vI_statusmenu.objStatusTooltipLine1 = document.getElementById("vI_statusMenuTooltip_StatusValueLine1");
-        vI_statusmenu.objStatusTooltipLine2 = document.getElementById("vI_statusMenuTooltip_StatusValueLine2");
-
-        vI_statusmenu.addObserver();
-        vI_statusmenu.observe(null, null, "extensions.virtualIdentity.storage_show_switch");
-        vI_statusmenu.observe(null, null, "extensions.virtualIdentity.storage_store_base_id");
-        vI_statusmenu.observe(null, null, "extensions.virtualIdentity.storage");
-    },
-    
-    saveBaseIDClicked : function () {
-        vI_statusmenu.menuConstraint(vI_statusmenu.objStorageSaveMenuItem);
-    },
-
-    __timeout : 5,  // timeout for status messages in seconds
-    __addStatusMessage : function(save) {
-        var messageLine1 = vI.elements.strings.getString("vident.statusText.save." + save + ".line1");
-        var messageLine2 = vI.elements.strings.getString("vident.statusText.save." + save + ".line2");
-        if (!messageLine2) {
-            vI_statusmenu.objStatusText.setAttribute("label", messageLine1);
-            vI_statusmenu.objStatusTooltipLine1.setAttribute("value", messageLine1);
-            vI_statusmenu.objStatusTooltipLine2.setAttribute("hidden", "true");
-        }   
-        else {
-            vI_statusmenu.objStatusText.setAttribute("label", messageLine1 + " " + messageLine2);
-            vI_statusmenu.objStatusTooltipLine1.setAttribute("value", messageLine1);
-            vI_statusmenu.objStatusTooltipLine2.setAttribute("value", messageLine2);
-            vI_statusmenu.objStatusTooltipLine2.removeAttribute("hidden");
-        }
-        window.setTimeout(vI_statusmenu.__clearStatusMessage, vI_statusmenu.__timeout * 1000);
-    },
-
-    __clearStatusMessage : function() {
-        vI_statusmenu.objStatusText.setAttribute("label", "");
-    },
-
-    menuConstraint : function (elem) {
-        var save = "off";
-        if (vI_statusmenu.prefroot.getBoolPref("extensions.virtualIdentity.storage") &&
-            elem.getAttribute("checked") == "true") {
-            if (vI_statusmenu.objSaveBaseIDMenuItem.getAttribute("checked") == "true")
-                save = "base";
-            else save = "ok";
-        }
-        vI_statusmenu.objStatusMenu.setAttribute("save", save);
-        vI_statusmenu.__addStatusMessage(save);
-    },
-
-    clicked : function (button) {
-        if (button != 0) return; // only react on left mouse button
-        if (!vI_statusmenu.prefroot.getBoolPref("extensions.virtualIdentity.storage")) return;
-
-        var curSaveStatus = (vI_statusmenu.objStorageSaveMenuItem.getAttribute("checked") == "true");
-        var curSaveBaseIDStatus = (vI_statusmenu.objSaveBaseIDMenuItem.getAttribute("checked") == "true");
-        var newSaveStatus = ((!curSaveStatus) || (curSaveStatus && !curSaveBaseIDStatus))
-        var newSaveBaseIDStatus = (!curSaveBaseIDStatus && curSaveStatus)
-        vI_statusmenu.objStorageSaveMenuItem.setAttribute("checked", newSaveStatus)
-        vI_statusmenu.objSaveBaseIDMenuItem.setAttribute("checked", newSaveBaseIDStatus)
-
-        var elem = vI_statusmenu.objStorageSaveMenuItem;
-        vI_statusmenu.menuConstraint(elem);
-    }
-}
 
 var vI = {
@@ -348 +222 @@
     initSystemStage2 : function() {
         vI_notificationBar.dump("## v_identity: initSystemStage2.\n")
-//      vI_msgIdentityCloneTools.initReplyToFields();
         vI_storage.init();
-        vI_smartIdentity.init();    
+        vI_smartIdentity.init();
     },
     
@@ -368 +241 @@
         var storage_box = document.getElementById("addresses-box");
         
+        vI.elements.Obj_MsgIdentity.setAttribute("hidden", "true");
+        vI.elements.Obj_MsgIdentity.previousSibling.setAttribute("control", "msgIdentity_clone");
+
         storage_box.removeChild(vI.elements.Area_MsgIdentityHbox);
         parent_hbox.appendChild(vI.elements.Area_MsgIdentityHbox);
@@ -435 +311 @@
     {
         vI.tempStorage.BaseIdentity = vI.elements.Obj_MsgIdentity.selectedItem;
-        vI.tempStorage.NewIdentity =
-            vI_helper.addIdentityMenuItem(vI.elements.Obj_MsgIdentityPopup,
-                        vI_account.account.defaultIdentity.identityName,
-                        " - " +  vI_account.account.incomingServer.prettyName,
-                        vI_account.account.key,
-                        vI_account.account.defaultIdentity.key, null, null, null);
+        vI.tempStorage.NewIdentity = document.createElement("menuitem");
+        MenuItem.className = "identity-popup-item";
+        
+        // set the account name in the choosen menu item
+        MenuItem.setAttribute("label", vI_account.account.defaultIdentity.identityName);
+        MenuItem.setAttribute("accountname", " - " +  vI_account.account.incomingServer.prettyName);
+        MenuItem.setAttribute("accountkey", vI_account.account.key);
+        MenuItem.setAttribute("value", vI_account.account.defaultIdentity.key);
+        
+        vI.elements.Obj_MsgIdentityPopup.appendChild(MenuItem);
         vI.__setSelectedIdentity(vI.tempStorage.NewIdentity);
     },

chrome/content/v_identity/v_identity.xml

@@ -217 +217 @@
         _self: this,
             observe: function(aSubject, aTopic, aPrefName) {
-            if (this._self._prefroot.getBoolPref("extensions.virtualIdentity.show_smtp"))
-                this._self.removeAttribute("hidden")
-            else    this._self.setAttribute("hidden","true")
+            if (this._self._prefroot)
+                this._self.showSmtp = 
+                this._self._prefroot.getBoolPref("extensions.virtualIdentity.show_smtp")
         }
         })]]></field>
+    <property name="showSmtp" onget="return (this.getAttribute('showSmtp') == 'true');" onset="this.setAttribute('showSmtp',val?'true':'false'); return val;" />
     <field name="_prefroot">Components.classes["@mozilla.org/preferences-service;1"]
             .getService(Components.interfaces.nsIPrefService)
@@ -266 +267 @@
         if (!inputTextbox.timeout) inputTextbox.setAttribute("type", "timed");
         inputTextbox.setAttribute("timeout", "300")
-        
-        this._msgIdentityElem.setAttribute("hidden", "true");
-        this._msgIdentityElem.previousSibling.setAttribute("control", "msgIdentity_clone");
         ]]>
     </constructor>
@@ -303 +301 @@
             var identity = gAccountManager.getIdentity(MenuItems[index].getAttribute("value"));
             
-            var newExtras = new vI_storageExtras(); newExtras.readValues();
-            var newIdentity = new identityData( identity.email, identity.fullName, identity.key,
-                                identity.smtpServerKey, newExtras,
-                                vI_helper.getAccountname(MenuItems[index]))
+            var newIdentity = new identityData(identity.email, identity.fullName, identity.key,
+                        identity.smtpServerKey, null,
+                        identity.description?"- "+identity.description:identity.accountname)
+            newIdentity.extras.readIdentityValues(identity);
 
             var menuItem = this.addIdentityToCloneMenu(newIdentity)
@@ -488 +486 @@
         document.getAnonymousElementByAttribute(this, "anonid", "smtpServerListHbox").smtp = this._identityDataStorage.smtp;
         
-        if (!this.dontInitExtras && this._identityDataStorage.extras) {
+        if (!this.dontInitExtras) {
             vI_notificationBar.dump("** v_identity.xml: set extra Values\n");
             this._identityDataStorage.extras.setValues();
         }
-        if (!this._identityDataStorage.extras)
-            this._identityDataStorage.extras = new vI_storageExtras();
-        
         vI_notificationBar.dump("** v_identity.xml: read extra Values\n");
         this._identityDataStorage.extras.readValues(); // fill in the missing Values

chrome/content/v_identity/v_identity.xul

@@ -42 +42 @@
 <script type="application/x-javascript" src="chrome://v_identity/content/vI_msgIdentityCloneTools.js" />
 <script type="application/x-javascript" src="chrome://v_identity/content/vI_smartIdentity.js" />
+<script type="application/x-javascript" src="chrome://v_identity/content/vI_statusmenu.js" />
 <!-- <script type="application/x-javascript" src="chrome://v_identity/content/vI_smtpSelector.js" /> -->
 <script type="application/x-javascript" src="chrome://v_identity/content/vI_notificationBar.js"/>

chrome/skin/classic/v_identity/v_identity.css

@@ -128 +128 @@
 }
 
-.smtpServerMenuList {
+.identity_clone-menulist .smtpServerMenuList {
   -moz-appearance: textfield;
   margin: 0px;
@@ -138 +138 @@
 }
 
-.smtpServerMenuList .menuitem-label {
+.identity_clone-menulist .smtpServerMenuList .menuitem-label {
   text-align:   center;
 }
 
-.smtpServerMenuList .menulist-icon, .smtpServerMenuList .menulist-dropmarker {
+.identity_clone-menulist .smtpServerMenuList .menulist-icon, .smtpServerMenuList .menulist-dropmarker {
+    display: none;
+}
+
+.identity_clone-menulist [showSmtp="false"] .smtpServerMenuList {
     display: none;
 }