Changeset 643bca

Timestamp:

Sep 16, 2008, 8:52:53 PM (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:

2f8c7f

Parents:

b3755b

Message:

collection of changes to 0.6 branch

Location:

chrome/content/v_identity

Files:

• vI_htmlTextBox.js (modified) (2 diffs)
• vI_htmlTextBox.xml (modified) (3 diffs)
• vI_prefDialog.js (modified) (1 diff)
• vI_storage.js (modified) (2 diffs)
• vI_storageExtras.js (modified) (14 diffs)
• v_identity.js (modified) (1 diff)
• v_identity.xml (modified) (15 diffs)

chrome/content/v_identity/vI_htmlTextBox.js

@@ -39 +39 @@
     },
 
-    initByObject :  function(object, stringName, outputString, cssSource) {
-        vI_htmlTextBox.Obj_TextBox = object;
-        if (stringName)
-            vI_htmlTextBox.string = document.getElementById("vITextBoxBundle").getString(stringName);
-        else if (outputString)
-            vI_htmlTextBox.string = outputString;
-        vI_htmlTextBox.cssSource = cssSource;
-        vI_htmlTextBox.__init();
-    },
-
     // read the chrome file (copied from http://forums.mozillazine.org/viewtopic.php?p=921150)
     __getContents : function (aURL){
@@ -76 +66 @@
     
     __init : function () {
-        if(!vI_htmlTextBox.Obj_TextBox) vI_htmlTextBox.Obj_TextBox = document.getElementById(vI_htmlTextBox.objectID);
-//      vI_htmlTextBox.Obj_TextBox.contentDocument
-//          .lastChild.setAttribute("style", "background-color: -moz-dialog; font: -moz-dialog;");
+        vI_htmlTextBox.Obj_TextBox = document.getElementById(vI_htmlTextBox.objectID);
+        vI_htmlTextBox.Obj_TextBox.contentDocument
+            .lastChild.setAttribute("style", "background-color: -moz-dialog; font: -moz-dialog;");
 
         if (vI_htmlTextBox.cssSource) vI_htmlTextBox.__setCSS();

chrome/content/v_identity/vI_htmlTextBox.xml

@@ -37 +37 @@
     <property name="outputString" >
         <setter><![CDATA[
+        if (!this._cssRead) this.cssSource = this.getAttribute('cssSource');    // read initial Attribute.
+        
+        var oldChilds = this.contentDocument.body.childNodes;
+        while (oldChilds.length > 0) this.contentDocument.body.removeChild(oldChilds[0])
+
         var text_list = val.split(/\n/)
         for (var i = 0; i < text_list.length; i++) {
@@ -50 +55 @@
         ]]></setter>
     </property>
+    <field name="_cssRead">false</field>
     <property name="cssSource" >
         <setter><![CDATA[
+        if (!val) return;
         var head = this.contentDocument.getElementsByTagName("HEAD").item(0);
         var range = document.createRange();
@@ -58 +65 @@
         var documentFragment = range.createContextualFragment("<style type='text/css'>" + css_text + "</style>");
         head.appendChild(documentFragment);
+        this._cssRead = true;
         ]]></setter>
     </property>

chrome/content/v_identity/vI_prefDialog.js

@@ -281 +281 @@
             document.getElementById("fccReplyFollowsParentBox").setAttribute("hidden", "true");
         }
-        if (!(typeof(enigSetMenuSettings)=="function")) {
-            document.getElementById("openPGPencryption").setAttribute("hidden", "true");
-        }
+//      if (!(typeof(enigSetMenuSettings)=="function")) {
+//          document.getElementById("openPGPencryption").setAttribute("hidden", "true");
+//      }
 
         vI_prefDialog.base.smartReplyConstraint(document.getElementById("VIdent_identity.smart_reply"));

chrome/content/v_identity/vI_storage.js

@@ -99 +99 @@
     isExistingIdentity : function() {
         vI_notificationBar.dump("## vI_storage: isExistingIdentity\n");
-        if (this.__keyTranslator.getID(this.id)) {
-            // if id is set, just grab the related identity and compare 
-            if (this.__equalsIdentity(gAccountManager.getIdentity(this.id))) {
-                vI_notificationBar.dump("## vI_storage: existing Identity found: " + this.id + "\n");
-                return this.id;
-            }
-        }
-        else {
-            // loop and compare with all Identities
-            var accounts = queryISupportsArray(gAccountManager.accounts, Components.interfaces.nsIMsgAccount);
-            for (var i in accounts) {
-                // skip possible active VirtualIdentity Accounts
-                try { vI_account.prefroot.getBoolPref("mail.account."+accounts[i].key+".vIdentity"); continue; } catch (e) { };
-        
-                var identities = queryISupportsArray(accounts[i].identities, Components.interfaces.nsIMsgIdentity);
-                for (var j in identities) {
-                    if (this.__equalsIdentity(identities[j])) {
-                        vI_notificationBar.dump("## vI_storage: existing Identity found: " + identities[j].key + "\n");
-                        return identities[j].key;
-                    }
+        var accounts = queryISupportsArray(gAccountManager.accounts, Components.interfaces.nsIMsgAccount);
+        for (var i in accounts) {
+            // skip possible active VirtualIdentity Accounts
+            try { vI_account.prefroot.getBoolPref("mail.account."+accounts[i].key+".vIdentity"); continue; } catch (e) { };
+    
+            var identities = queryISupportsArray(accounts[i].identities, Components.interfaces.nsIMsgIdentity);
+            for (var j in identities) {
+                if (    (this.ignoreFullNameWhileComparing || this.fullName == identities[j].fullName) &&
+                    (this.email == identities[j].email) &&
+                    this.__equalSMTP(identities[j].smtpServerKey)   ) {
+                    vI_notificationBar.dump("## vI_storage: existing Identity found: " + identities[j].key + "\n");
+                    return identities[j].key;
                 }
             }
@@ -433 +425 @@
         var warning = { title: null, recLabel : null, recipient : null, warning : null, css: null, query : null };
         warning.title = vI.elements.strings.getString("vident." + warningCase + ".title")
-        warning.recLabel = vI.elements.strings.getString("vident." + warningCase + ".recipient") +  " (" + recipient.recType + "):"
+        warning.recLabel = vI.elements.strings.getString("vident." + warningCase + ".recipient") + " (" + recipient.recType + "):"
         warning.recipient = recipient.recDesc;
         warning.warning = 

chrome/content/v_identity/vI_storageExtras.js

@@ -69 +69 @@
 
 function vI_storageExtras(callFunction, resource) {
-    this.extras = [ 
+// function vI_storageExtras_checkbox(field, option, composeDialogElementID, updateFunction, identityValue) {
+    this.extras = [
+
+//  gReceiptOptionChanged
+
+
         new vI_storageExtras_checkbox(
-            "reciept", "storageExtras_returnReciept", "returnReceiptMenu", null, null),
+            "reciept", "storageExtras_returnReciept", "returnReceiptMenu", null, "identity.requestReturnReceipt;"),
         new vI_storageExtras_characterEncoding(),
         new vI_storageExtras_msgFormat(),
@@ -77 +82 @@
         new vI_storageExtras_checkbox(
             "sMimeSig", "storageExtras_sMime_messageSignature", "menu_securitySign1",
-                (typeof(setSecuritySettings)=="function")?setSecuritySettings:null, 1),
+                "(typeof(setSecuritySettings)=='function')?setSecuritySettings(1):null;",
+                "identity.getBoolAttribute('sign_mail')"),
         new vI_storageExtras_checkbox(
             "PGPEnc", "storageExtras_openPGP_messageEncryption", "enigmail_encrypted_send",
-                (typeof(enigSetMenuSettings)=="function")?enigSetMenuSettings:null, ''),
+                "(typeof(enigSetMenuSettings)=='function')?enigSetMenuSettings(''):null;",
+                "identity.getIntAttribute('defaultEncryptionPolicy') > 0"),
         new vI_storageExtras_checkbox(
             "PGPSig", "storageExtras_openPGP_messageSignature", "enigmail_signed_send",
-                (typeof(enigSetMenuSettings)=="function")?enigSetMenuSettings:null, ''),
+                "(typeof(enigSetMenuSettings)=='function')?enigSetMenuSettings(''):null;",
+                "(identity.getIntAttribute('defaultEncryptionPolicy') > 0)?identity.getBoolAttribute('pgpSignEncrypted'):identity.getBoolAttribute('pgpSignPlain')"),
         new vI_storageExtras_checkbox(
             "PGPMIME", "storageExtras_openPGP_PGPMIME", "enigmail_sendPGPMime",
-                (typeof(enigSetMenuSettings)=="function")?enigSetMenuSettings:null, '')]
+                "(typeof(enigSetMenuSettings)=='function')?enigSetMenuSettings(''):null;",
+                "identity.getBoolAttribute('pgpMimeMode')")
+        ]
     if (callFunction) this.loopForRDF(callFunction, resource)
 }
@@ -112 +122 @@
         for( var i = 0; i < this.extras.length; i++ ) {
             if (this.extras[i].active) {
-                equal = (this.extras[i].equal(storageExtras.extras[i].value) && equal) // in this order to compare all fields (required for Matrix)
+                equal = (this.extras[i].equal(storageExtras.extras[i]) && equal) // in this order to compare all fields (required for Matrix)
             }
         }
@@ -122 +132 @@
         for( var i = 0; i < this.extras.length; i++ ) {
             if (this.extras[i].active) {
-                if (this.extras[i].getLabel(null))
+                if (this.extras[i].valueHtml)
                     string += "<tr>" +
                     "<td class='col1 extras '>" + prefStrings.getString("vident.identityData.extras." + this.extras[i].field) + "</td>" +
-                    "<td class='col2 extras '>" + this.extras[i].getLabel(null) + "</td>" +
+                    "<td class='col2 extras '>" + this.extras[i].valueHtml + "</td>" +
                     "</tr>"
             }
@@ -140 +150 @@
                     "<td class='col1 extras " + classEqual + "'>" + prefStrings.getString("vident.identityData.extras." + this.extras[i].field) + "</td>" +
                     "<td class='col2 extras " + classEqual + "'>" + this.extras[i].comp.compareValue + "</td>" +
-                    "<td class='col3 extras " + classEqual + "'>" + this.extras[i].comp.value + "</td>" +
+                    "<td class='col3 extras " + classEqual + "'>" + this.extras[i].valueHtml + "</td>" +
                     "</tr>"
             }
@@ -156 +166 @@
 
     readIdentityValues : function(identity) {
-        this.readValues();  // has to be build for all extras
+        if (vI_storageExtrasHelper.seamonkey_to_old()) return;
+        for( var i = 0; i < this.extras.length; i++ ) {
+            if (this.extras[i].active) this.extras[i].readIdentityValue(identity)
+//          vI_notificationBar.dump("## vI_storageExtras readIdentityValues "+ this.extras[i].field + "=" + this.extras[i].value + "\n");
+        }
     },
 
@@ -169 +183 @@
         if (vI_storageExtrasHelper.seamonkey_to_old()) return;
         for( var i = 0; i < this.extras.length; i++ ) {
+//          vI_notificationBar.dump("## vI_storageExtras preparing readValue "+ this.extras[i].field +"\n");
             if (this.extras[i].active) this.extras[i].readValue()
-//          vI_notificationBar.dump("## vI_storageExtras readValue "+ this.extras[i].field + "=" + this.extras[i].value + "\n");
+//              vI_notificationBar.dump("## vI_storageExtras readValue "+ this.extras[i].field + "=" + this.extras[i].value + "\n");
         }
     },
@@ -208 +223 @@
 function vI_storageExtras_characterEncoding() {
     this.active = vI_storageExtrasHelper.preferences.getBoolPref(this.option)
-    this.comp = { value : null, compareValue : null, equal : null }
+    this.comp = { compareValue : null, equal : null }
 }
 vI_storageExtras_characterEncoding.prototype = {
@@ -216 +231 @@
     option : "storageExtras_characterEncoding",
     comp : null,
-    
-    getLabel : function() {
+
+    get valueHtml() {
         return this.value?gCharsetConvertManager
                     .getCharsetTitle(gCharsetConvertManager.getCharsetAlias(this.value)):"";
     },
-    equal : function(compareValue) {
-        this.comp.compareValue = compareValue?compareValue:"";
-        this.comp.value = this.value?this.value:"";
-        this.comp.equal = (this.value == null || this.value == compareValue);
+
+    // function to read the value from a given identity
+    readIdentityValue : function(identity) { }, // no charset per identity
+
+    equal : function(compareStorageExtra) {
+        this.comp.compareValue = compareStorageExtra.valueHtml;
+        this.comp.equal = (!this.value || !compareStorageExtra.value || this.value == compareStorageExtra.value);
         return this.comp.equal;
     },
@@ -278 +296 @@
     comp : null,
 
-    getLabel : function() {
+    get valueHtml() {
         return this.value?document.getElementById(this.value).label:"";
     },
-    equal : function(compareValue) {
-        this.comp.compareValue = compareValue?document.getElementById(compareValue).label:"";
-        this.comp.value = this.value?document.getElementById(this.value).label:"";
-        this.comp.equal = (this.value == null || this.value == compareValue);
+
+    // function to read the value from a given identity
+    readIdentityValue : function(identity) { }, // no msgFormat per identity
+
+    equal : function(compareStorageExtra) {
+        this.comp.compareValue = compareStorageExtra.valueHtml;
+        this.comp.equal = (!this.value || !compareStorageExtra.value || this.value == compareStorageExtra.value);
         return this.comp.equal;
     },
@@ -329 +350 @@
     comp : null,
 
-    getLabel : function(value) {
-        if (value == null) value = this.value; 
-        switch (value) {
-            case "true":
-                return "<div class='bool checked'><label class='screen'>&nbsp;<label><label class='braille'>yes</label></div>"
-            case "false":
-                return "<div class='bool'><label class='screen'>&nbsp;<label><label class='braille'>no</label></div>"
-        }
-        return "";
-    },
-
-    equal : function(compareValue) {
-        this.comp.value = this.getLabel(this.value);
-        this.comp.compareValue = this.getLabel(compareValue);
-        this.comp.equal = (this.value == null || this.value == compareValue);
+    get valueHtml() {
+        if (!this.value) return "";
+        return  "<div class='bool" + ((this.value=="true")?" checked":"") + "'>" +
+                "<label class='screen'>&nbsp;</label>" +
+                "<label class='braille'>" + ((this.value=="true")?"yes":"no") + "</label>" +
+            "</div>"
+    },
+
+    equal : function(compareStorageExtra) {
+        this.comp.compareValue = compareStorageExtra.valueHtml;
+        this.comp.equal = (this.value == null || this.value == compareStorageExtra.value);
         return this.comp.equal;
+    },
+
+    // function to read the value from a given identity
+    readIdentityValue : function(identity) {
+        this.value = (identity.getIntAttribute("encryptionpolicy") == 2)?"true":"false"
     },
     // function to set or read the value from/to the MessageCompose Dialog
@@ -374 +396 @@
 }
 
-function vI_storageExtras_checkbox(field, option, composeDialogElementID, updateFunction, updateFunctionParam1) {
-    this.field = field;
-    this.option = option;
+// a general checkbox for extra options. Has to provide some additional information
+function vI_storageExtras_checkbox(field, option, composeDialogElementID, updateFunction, identityValue) {
+    this.field = field;     // description of the option
+    this.option = option;       // option string to get preference settings
     this.composeDialogElementID = composeDialogElementID;
     this.updateFunction = updateFunction;
-    this.updateFunctionParam1 = updateFunctionParam1;
+    this.valueFromIdentityFunction = identityValue;
     this.active = vI_storageExtrasHelper.preferences.getBoolPref(this.option) &&
         document.getElementById(this.composeDialogElementID);
-    this.comp = { value : null, compareValue : null, equal : null }
+    this.comp = { compareValue : null, equal : null }
 }
 vI_storageExtras_checkbox.prototype = {
@@ -392 +415 @@
     composeDialogElementID : null,
     updateFunction : null, // some elements have to be updated before the can be read
-    updateFunctionParam1 : null,
+    valueFromIdentityFunction : null,
     
-    getLabel : function(value) {
-        if (value == null) value = this.value;
-        switch (value) {
-            case "true":
-                return "<div class='bool checked'><label class='screen'>&nbsp;<label><label class='braille'>yes</label></div>"
-            case "false":
-                return "<div class='bool'><label class='screen'>&nbsp;<label><label class='braille'>no</label></div>"
-        }
-        return "";
-    },
-
-    equal : function(compareValue) {
-        this.comp.value = this.getLabel(this.value);
-        this.comp.compareValue = this.getLabel(compareValue);
-        this.comp.equal = (this.value == null || this.value == compareValue);
+    get valueHtml() {
+        if (!this.value) return "";
+        return  "<div class='bool" + ((this.value=="true")?" checked":"") + "'>" +
+                "<label class='screen'>&nbsp;</label>" +
+                "<label class='braille'>" + ((this.value=="true")?"yes":"no") + "</label>" +
+            "</div>"
+    },
+
+    equal : function(compareStorageExtra) {
+        this.comp.compareValue = compareStorageExtra.valueHtml;
+        this.comp.equal = (this.value == null || this.value == compareStorageExtra.value);
         return this.comp.equal;
+    },
+
+    // function to read the value from a given identity
+    readIdentityValue : function(identity) {
+        this.value = eval(this.valueFromIdentityFunction)?"true":"false";
     },
     // function to set or read the value from/to the MessageCompose Dialog
@@ -424 +448 @@
         var element = document.getElementById(this.composeDialogElementID)
         if (!element) return;
-        if (this.updateFunction) this.updateFunction(this.updateFunctionParam1);
+        if (this.updateFunction) eval(this.updateFunction);
         this.value = ((element.getAttribute("checked") == "true")?"true":"false")
     },

chrome/content/v_identity/v_identity.js

@@ -312 +312 @@
         vI.tempStorage.BaseIdentity = vI.elements.Obj_MsgIdentity.selectedItem;
         vI.tempStorage.NewIdentity = document.createElement("menuitem");
-        MenuItem.className = "identity-popup-item";
+        vI.tempStorage.NewIdentity.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.tempStorage.NewIdentity.setAttribute("label", vI_account.account.defaultIdentity.identityName);
+        vI.tempStorage.NewIdentity.setAttribute("accountname", " - " +  vI_account.account.incomingServer.prettyName);
+        vI.tempStorage.NewIdentity.setAttribute("accountkey", vI_account.account.key);
+        vI.tempStorage.NewIdentity.setAttribute("value", vI_account.account.defaultIdentity.key);
+        
+        vI.elements.Obj_MsgIdentityPopup.appendChild(vI.tempStorage.NewIdentity);
         vI.__setSelectedIdentity(vI.tempStorage.NewIdentity);
     },

chrome/content/v_identity/v_identity.xml

@@ -46 +46 @@
     <implementation>
     <method name="addTooltip">
-    <parameter name="identityData" />
-    <parameter name="randID" />
+    <parameter name="elem" />
+    <parameter name="permanent" />
             <body><![CDATA[
+        vI_notificationBar.dump("** v_identity.xml: addTooltip.\n");
+        var randID = elem.tooltipElem.getAttribute("tooltip");
         this.removeTooltip(randID);
-        if (!randID) randID = "tooltip_" + parseInt((new Date()).getTime());
+        if (!randID) {
+            randID = "tooltip_" + parseInt((new Date()).getTime());
+            elem.tooltipElem.setAttribute("tooltip", randID);
+        }
         var toolTip = document.createElement("tooltip");
         toolTip.setAttribute("class", "identityDataTooltip");
         toolTip.setAttribute("id", randID);
-        toolTip.identityData = identityData;
+        toolTip.elem = elem;
+        toolTip.permanent = permanent;
+        vI_notificationBar.dump("** v_identity.xml: addTooltip 3.\n");
         this.appendChild(toolTip);
-        return randID;
+        vI_notificationBar.dump("** v_identity.xml: addTooltip done.\n");
         ]]></body>
     </method>
@@ -69 +76 @@
     
     <binding id="vI_identityDataTooltip" extends="chrome://global/content/bindings/popup.xml#tooltip">
-    <content onpopupshowing="this.popupshowing();this.resize()" onpopupshown="this.resize()" >
-            <xul:browser style="overflow:hidden" anonid="tooltipBrowser" class="vI_htmlTextBox" flex="1" disablehistory="true" onoverflow="document.getBindingParent(this).resize()"/>
+    <content onpopuphidden="popuphidden();" onpopupshowing="this.popupshowing();this.resize()" onpopupshown="this.resize()" >
+            <xul:browser style="overflow:hidden" anonid="tooltipBrowser" class="vI_htmlTextBox" cssSource="vI_TooltipBrowser.css" flex="1" disablehistory="true" onoverflow="document.getBindingParent(this).resize()"/>
             <children />
     </content>
@@ -76 +83 @@
     <method name="popupshowing">
             <body><![CDATA[
-        if (this.identityData && !this._initialized) {
-            if (!this._identityInfo) this._identityInfo = 
-                "<table><tr><td colspan='2' class='name'>" +
-                    this.identityData.combinedNameHtml +
-                "</td></tr>" +
-                "<tr><td class='image'><img src='chrome://v_identity/skin/vi-info.png' /></td>" +
-                "<td class='identityTable'>" +
-                    "<table><tbody>" + this.identityData.getMatrix() + "</tbody></table>" +
-                "</td></tr></table>"
+        vI_notificationBar.dump("** v_identity.xml: popupshowing\n");
+        if (!this._identityInfo) {
+            vI_notificationBar.dump("** v_identity.xml: popupshowing 2\n");
+            this._identityInfo = 
+                "<table>" + 
+                "<tr>" +
+                    "<td colspan='2' class='name'>" + this.elem.identityData.combinedNameHtml + "</td>" +
+                "</tr><tr>" +
+                    "<td class='image'><img src='chrome://v_identity/skin/vi-info.png' /></td>" +
+                    "<td class='identityTable'><table><tbody>" + this.elem.identityData.getMatrix() + "</tbody></table></td>" +
+                "</tr>" +
+                "</table>"
             this._tooltipBrowser.outputString = this._identityInfo;
-            this._tooltipBrowser.cssSource = "vI_TooltipBrowser.css";
-            this._initialized = true;
-        }
-        ]]></body>
-    </method>
+        }
+        vI_notificationBar.dump("** v_identity.xml: popupshowing done.\n");
+        ]]></body>
+    </method>
+    <method name ="popuphidden">
+            <body><![CDATA[ 
+        vI_notificationBar.dump("** v_identity.xml: popuphidden\n");
+        if (!this.permanent) this._identityInfo = null;
+        ]]></body>
+    </method>   
     <method name="resize">
         <body><![CDATA[
+        if (!this._identityInfo) return;
+        vI_notificationBar.dump("** v_identity.xml: resize.\n");
         var width = document.getElementById("msgIdentity_clone").boxObject.width * 0.7;
         var height = this._tooltipBrowser.contentDocument.lastChild.scrollHeight + 5;
@@ -98 +115 @@
         width = document.getElementById("msgIdentity_clone").boxObject.width * 0.75;
         this.sizeTo(width, height);
-        ]]></body>
-    </method>
-    <field name="blocked">false</field>
-    <field name="identityData" />
+        vI_notificationBar.dump("** v_identity.xml: resize done.\n");
+        ]]></body>
+    </method>
+    <field name="permanent" />
+    <field name="elem" />
+<!--    <field name="identityData">this.elem.identityData</field> -->
     <field name="_identityInfo">false</field>
-    <field name="_initialized">false</field>
+<!--    <field name="_initialized">false</field> -->
     <field name="_tooltipBrowser">document.getAnonymousElementByAttribute(this, "anonid", "tooltipBrowser")</field>
     </implementation>
@@ -124 +143 @@
         this.description = this._identityDataStorage.sideDescription;
         
-        this.setAttribute("tooltip",
-            document.getElementById("vI_tooltipPopupset")
-            .addTooltip(this._identityDataStorage, this.getAttribute("tooltip")));
+        document.getElementById("vI_tooltipPopupset").addTooltip(this, true);
         ]]>
     </constructor>
@@ -132 +149 @@
             <body><![CDATA[
         document.getElementById("vI_tooltipPopupset")
-            .removeTooltip(this.getAttribute("tooltip"));
+            .removeTooltip(this.tooltipElem.getAttribute("tooltip"));
         ]]></body>
     </method>
@@ -141 +158 @@
     </destructor>
     <property name="_identityData" onget="return this._identityDataStorage;" />
+    <field name="tooltipElem">this</field>
     <property name="vid" onget="return this.getAttribute('vid');" onset="this.setAttribute('vid', val); return val;" />
     <property name="label" onget="return this.getAttribute('label');" onset="this.setAttribute('label', val); return val;" />
@@ -267 +285 @@
         if (!inputTextbox.timeout) inputTextbox.setAttribute("type", "timed");
         inputTextbox.setAttribute("timeout", "300")
+        
+        document.getElementById("vI_tooltipPopupset").addTooltip(this, false);
         ]]>
     </constructor>
@@ -272 +292 @@
         <![CDATA[
         document.getElementById("vI_tooltipPopupset")
-            .removeTooltip(this.getAttribute("tooltip"));
+            .removeTooltip(this.tooltipElem.getAttribute("tooltip"));
         ]]>
     </destructor>
@@ -296 +316 @@
         vI_notificationBar.dump("** v_identity.xml: clone_Obj_MsgIdentity\n");
         
-        this.dontInitExtras = true;
         var MenuItems = this._msgIdentityPopupElem.childNodes
         for (var index = 0; index < MenuItems.length; index++) {
@@ -315 +334 @@
         }
         this._popupMenu_separator = true;
-        this.dontInitExtras = false;
         
         vI_msgIdentityCloneTools.initReplyToFields(this.value);
@@ -329 +347 @@
         }
         this.selectedItem = null;
+        this.identityData = null;
         ]]></body>
     </method>   
@@ -437 +456 @@
         this.setAttribute("label", this.label);
         
-        this.tooltipElem.setAttribute("tooltip",
-            document.getElementById("vI_tooltipPopupset")
-            .addTooltip(this._identityDataStorage, this.tooltipElem.getAttribute("tooltip")));
-
         var existingIdentity = this.checkForVirtualIdentity();
         if (existingIdentity) this.selectedMenuItem = existingIdentity;
@@ -462 +477 @@
         this.identityData.smtp = val;
         
-        this.tooltipElem.setAttribute("tooltip",
-            document.getElementById("vI_tooltipPopupset")
-            .addTooltip(this._identityDataStorage, this.tooltipElem.getAttribute("tooltip")));
+        document.getElementById("vI_tooltipPopupset").addTooltip(this);
 
         var existingIdentity = this.checkForVirtualIdentity();
@@ -470 +483 @@
         ]]></setter>
     </property>
-    <field name="dontInitExtras" />
-    <property name="identityData" onget="return this._identityDataStorage;" >
+    <property name="identityData">
+        <getter><![CDATA[
+        vI_notificationBar.dump("** v_identity.xml: read identityData.\n");
+        this._identityDataStorage.extras.readValues(); // update with current data
+        vI_notificationBar.dump("** v_identity.xml: extras update done identityData.\n");
+        return this._identityDataStorage;
+        ]]></getter>
         <setter><![CDATA[
-        vI_notificationBar.dump("** v_identity.xml: updating DataStorage.\n");
-        var oldIdentityData = this._identityDataStorage;
-        this._identityDataStorage = val;        
-        if (!this._identityDataStorage.id) {
-            this._identityDataStorage.id = oldIdentityData.id;
-            var idName = this._identityDataStorage.idName;
-            this._identityDataStorage.sideDescription = (idName)?" - "+idName:"";
-        }
-        this.label = this._identityDataStorage.combinedName;
-        this.value = this._identityDataStorage.id;
-        this.description = this._identityDataStorage.sideDescription;
-        document.getAnonymousElementByAttribute(this, "anonid", "smtpServerListHbox").smtp = this._identityDataStorage.smtp;
-        
-        if (!this.dontInitExtras) {
-            vI_notificationBar.dump("** v_identity.xml: set extra Values\n");
-            this._identityDataStorage.extras.setValues();
-        }
-        vI_notificationBar.dump("** v_identity.xml: read extra Values\n");
-        this._identityDataStorage.extras.readValues(); // fill in the missing Values
-        
-        this.checkForVirtualIdentity();
-        
-        this.tooltipElem.setAttribute("tooltip",
-            document.getElementById("vI_tooltipPopupset")
-            .addTooltip(this._identityDataStorage, this.tooltipElem.getAttribute("tooltip")));
-        
-        vI_notificationBar.dump("** v_identity.xml: updating DataStorage done.\n");
+        if (!val) this._identityDataStorage = null
+        else {
+            vI_notificationBar.dump("** v_identity.xml: updating DataStorage.\n");
+            var oldIdentityData = this._identityDataStorage;
+            this._identityDataStorage = val;
+            
+            if (oldIdentityData) { // indicates that it's not first time after clean
+                if (!this._identityDataStorage.id) {
+                    this._identityDataStorage.id = oldIdentityData.id;
+                    var idName = this._identityDataStorage.idName;
+                    this._identityDataStorage.sideDescription = (idName)?" - "+idName:"";
+                }
+                vI_notificationBar.dump("** v_identity.xml: set extra Values\n");
+                this._identityDataStorage.extras.setValues();
+            
+                this.checkForVirtualIdentity();
+            }
+            else    this.vid = false;       // first time after clean it's always a real identity
+            
+            this.label = this._identityDataStorage.combinedName;
+            this.value = this._identityDataStorage.id;
+            this.description = this._identityDataStorage.sideDescription;
+            document.getAnonymousElementByAttribute(this, "anonid", "smtpServerListHbox").smtp = this._identityDataStorage.smtp;
+            
+            vI_notificationBar.dump("** v_identity.xml: updating DataStorage done.\n");
+        }
         ]]></setter>
     </property>