Changeset d1f668

Timestamp:

Oct 2, 2009, 1:20:09 PM (13 years ago)

Author:

rene <rene@…>

Branches:

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

Children:

77bb12

Parents:

bdfae4

Message:

implementation of SMTP storage / change of interface

Files:

• chrome/content/v_identity/vI_identityData.js (modified) (4 diffs)
• chrome/content/v_identity/vI_prefDialog.js (modified) (4 diffs)
• chrome/content/v_identity/vI_prefDialog.xul (modified) (3 diffs)
• chrome/content/v_identity/vI_rdfDataEditor.js (modified) (2 diffs)
• chrome/content/v_identity/vI_rdfDatasource.js (modified) (7 diffs)
• chrome/content/v_identity/vI_statusmenu.js (modified) (9 diffs)
• chrome/content/v_identity/vI_upgrade.js (modified) (3 diffs)
• chrome/content/v_identity/v_identity.xml (modified) (7 diffs)
• chrome/content/v_identity/v_identity.xul (modified) (2 diffs)
• chrome/locale/en-US/v_identity/vI_prefDialog.dtd (modified) (3 diffs)
• chrome/locale/en-US/v_identity/v_identity.dtd (modified) (1 diff)
• chrome/locale/en-US/v_identity/v_identity.properties (modified) (1 diff)
• chrome/skin/classic/v_identity/vI_bl.png (added)
• chrome/skin/classic/v_identity/vI_gebl.png (added)
• chrome/skin/classic/v_identity/v_identity.css (modified) (3 diffs)
• defaults/preferences/preferences.js (modified) (2 diffs)

chrome/content/v_identity/vI_identityData.js

@@ -228 +228 @@
 };
 
+const DEFAULT_SMTP_TAG = "vI_useDefaultSMTP"
+const NO_SMTP_TAG = "vI_noStoredSMTP"
+
 function smtpObj(key) {
     this._key = key;
@@ -238 +241 @@
     
     set key(key) { this._key = key; this._value = null; },
-    get key() { if (this._value == null) var dummy = this.value; return this._key },
+    get key() {
+        var dummy = this.value; // just to be sure key is adapted if SMTP is not available
+        return this._key
+    },
+    get keyNice() { // the same as key but with "" for DEFAULT_SMTP_TAG
+        if (this.key == DEFAULT_SMTP_TAG) return ""; // this is the key used for default server
+        return this.key
+    },
     get value() {
         if (this._value == null) {
             this._value = "";
-            // if key == null, it is not known / if it is "" it's the Default SMTP
-            if (this._key == "") this._value = this.DEFAULT_TAG;
+            if (this._key == null || this._key == "") this._key = DEFAULT_SMTP_TAG;
+            if (this._key == DEFAULT_SMTP_TAG) this._value = this.DEFAULT_TAG;
+            else if (!this._key) this._value = null;
             else if (this._key) {
                 var servers = Components.classes["@mozilla.org/messengercompose/smtp;1"]
@@ -265 +276 @@
                         }
                     }
-                if (!this._value) this._key = null; // if non-existant SMTP handle like non available
+                if (!this._value) this._key = NO_SMTP_TAG; // if non-existant SMTP handle like non available
             }
         }
@@ -273 +284 @@
         if (this.key == null || compareSmtpObj.key == null) return true;
         return (this.key == compareSmtpObj.key);
+    },
+    hasNoDefinedSMTP : function() {
+        return (this.key == NO_SMTP_TAG);
     }
 }

chrome/content/v_identity/vI_prefDialog.js

@@ -64 +64 @@
                 "VIdent_identity.storage_storedefault",
                 "VIdent_identity.storage_store_base_id",
+                "VIdent_identity.storage_store_SMTP",
                 "VIdent_identity.storage_dont_update_multiple",
                 "VIdent_identity.storage_show_switch",
+                "VIdent_identity.storage_show_baseID_switch",
+                "VIdent_identity.storage_show_SMTP_switch",
+                "VIdent_identity.storage_colorIndication",
                 "VIdent_identity.storage_warn_update",
                 "VIdent_identity.storage_warn_vI_replace",
@@ -71 +75 @@
                 "VIdent_identity.storage_getOneOnly",
                 "VIdent_identity.storageExtras_returnReciept",
+                "VIdent_identity.storageExtras_fcc",
                 "VIdent_identity.storageExtras_characterEncoding",
                 "VIdent_identity.storageExtras_messageFormat",
@@ -207 +212 @@
             mAttr("VIdent_identity.storage_storedefault","disabled",element.checked);
             mAttr("VIdent_identity.storage_store_base_id","disabled",element.checked);
+            mAttr("VIdent_identity.storage_store_SMTP","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_show_baseID_switch","disabled",element.checked);
+            mAttr("VIdent_identity.storage_show_SMTP_switch","disabled",element.checked);
+            mAttr("VIdent_identity.storage_colorIndication","disabled",element.checked);
             mAttr("VIdent_identity.storage_warn_update","disabled",element.checked);
             mAttr("VIdent_identity.storage_warn_vI_replace","disabled",element.checked);
@@ -214 +223 @@
             mAttr("VIdent_identity.storage_getOneOnly","disabled",element.checked);
             mAttr("VIdent_identity.storageExtras_returnReciept","disabled",element.checked);
+            mAttr("VIdent_identity.storageExtras_fcc","disabled",element.checked);
             mAttr("VIdent_identity.storageExtras_characterEncoding","disabled",element.checked);
             mAttr("VIdent_identity.storageExtras_messageFormat","disabled",element.checked);

chrome/content/v_identity/vI_prefDialog.xul

@@ -331 +331 @@
                     <checkbox id="VIdent_identity.show_smtp" label="&vI_prefDialog.composeDialog.SMTP.label;"
                         tooltiptext="&vI_prefDialog.composeDialog.SMTP.tooltiptext;" prefstring="show_smtp" />
-                    <checkbox id="VIdent_identity.storage_show_switch" label="&vI_prefDialog.storage.show_switch.label;"
-                        prefstring="storage_show_switch"/>
                     <checkbox id="VIdent_identity.fcc_show_switch" label="&vI_prefDialog.composeDialog.fcc_show_switch.label;"
                         tooltiptext="&vI_prefDialog.composeDialog.fcc_show_switch.tooltiptext;" prefstring="fcc_show_switch" />
+                    <checkbox id="VIdent_identity.storage_colorIndication" label="&vI_prefDialog.composeDialog.storage_colorIndication.label;"
+                        prefstring="storage_colorIndication" />
+                </groupbox>
+                <groupbox>
+                <caption label="&vI_prefDialog.composeDialog.caption3;"/>
+                    <checkbox id="VIdent_identity.storage_show_switch" label="&vI_prefDialog.composeDialog.show_switch.label;"
+                        prefstring="storage_show_switch"/>
+                    <checkbox id="VIdent_identity.storage_show_baseID_switch" label="&vI_prefDialog.composeDialog.show_baseID_switch.label;"
+                        prefstring="storage_show_baseID_switch"/>
+                    <checkbox id="VIdent_identity.storage_show_SMTP_switch" label="&vI_prefDialog.composeDialog.show_SMTP_switch.label;"
+                        prefstring="storage_show_SMTP_switch"/>
                 </groupbox>
             </tabpanel>
@@ -565 +574 @@
                     <checkbox id="VIdent_identity.storage_store_base_id" label="&vI_prefDialog.storage.store_base_id.label;"
                         prefstring="storage_store_base_id"/>
+                    <checkbox id="VIdent_identity.storage_store_SMTP" label="&vI_prefDialog.storage.store_SMTP.label;"
+                        prefstring="storage_store_SMTP"/>
                     <checkbox id="VIdent_identity.storage_warn_update" label="&vI_prefDialog.storage.warn_update.label;"
                         prefstring="storage_warn_update"/>
@@ -579 +590 @@
                     <checkbox id="VIdent_identity.storageExtras_returnReciept" label="&vI_prefDialog.storageExtras.returnReciept.label;"
                         prefstring="storageExtras_returnReciept"/>
+                    <checkbox id="VIdent_identity.storageExtras_fcc" label="&vI_prefDialog.storageExtras.fcc.label;"
+                        prefstring="storageExtras_fcc"/>
                     <checkbox id="VIdent_identity.storageExtras_characterEncoding" label="&vI_prefDialog.storageExtras.characterEncoding.label;"
                         prefstring="storageExtras_characterEncoding"/>

chrome/content/v_identity/vI_rdfDataEditor.js

@@ -85 +85 @@
 
         // set SMTP
-        document.getElementById("smtpServerListHbox").smtp = vI_rdfDataEditor.__identityData.smtp.key;
+        document.getElementById("smtpServerListHbox").addNoneServer(); // add non (not stored) Server
+        document.getElementById("smtpServerListHbox").smtp = vI_rdfDataEditor.__identityData.smtp.keyNice;
         
         // set extra values
@@ -110 +111 @@
                 document.getElementById("type_menu").selectedItem.getAttribute("key"),
                 localIdentityData,
-                true, vI_rdfDataEditor.__recipient, vI_rdfDataEditor.__type);
+                true, true, vI_rdfDataEditor.__recipient, vI_rdfDataEditor.__type);
         
         return document.getElementById("type_menu").selectedItem.getAttribute("key");

chrome/content/v_identity/vI_rdfDatasource.js

@@ -22 +22 @@
     Contributor(s):
  * ***** END LICENSE BLOCK ***** */
- 
+
+
 var vI_rdfDatasource = {            
     rdfService : Components.classes["@mozilla.org/rdf/rdf-service;1"]
@@ -40 +41 @@
     //      .getService(Components.interfaces.nsIExtensionManager),
     
-    rdfVersion : "0.0.3",   // version of current implemented RDF-schema, internal only to trigger updates
+    rdfVersion : "0.0.4",   // version of current implemented RDF-schema, internal only to trigger updates
     
     virtualIdentityID : "{dddd428e-5ac8-4a81-9f78-276c734f75b8}",
@@ -205 +206 @@
             var id = vI_rdfDatasource.__getRDFValue(resource, "id")
             var smtp = vI_rdfDatasource.__getRDFValue(resource, "smtp")
-            if (!smtp) smtp = ""; // to indicate default SMTP (different than null like with SmartReply)
-            
+            if (!smtp) smtp = NO_SMTP_TAG;
             var extras = new vI_storageExtras(vI_rdfDatasource.__getRDFValue, resource);
             
@@ -272 +272 @@
         var id = vI_rdfDatasource.__getRDFValue(resource, "id")
         var smtp = vI_rdfDatasource.__getRDFValue(resource, "smtp")
-        if (!smtp) smtp = ""; // to indicate default SMTP (different than null like with SmartReply)
+        vI_notificationBar.dump("## vI_rdfDatasource: email='" + email + 
+            "' fullName='" + fullName + "' id='" + id + "' smtp='" + smtp + "'\n");
+        if (!smtp) smtp = NO_SMTP_TAG; // to indicate default SMTP (different than null like with SmartReply)
         
         vI_notificationBar.dump("## vI_rdfDatasource: email='" + email + 
@@ -295 +297 @@
             document.getElementById("msgIdentity_clone").identityData,
             (vI_statusmenu.objSaveBaseIDMenuItem.getAttribute("checked") == "true"),
+            (vI_statusmenu.objSaveSMTPMenuItem.getAttribute("checked") == "true"),
             null, null);
     },
@@ -305 +308 @@
     },
 
-    updateRDF : function (recDescription, recType, localIdentityData, storeBaseID, prevRecDescription, prevRecType) {
+    updateRDF : function (recDescription, recType, localIdentityData, storeBaseID, storeSMTP, prevRecDescription, prevRecType) {
 //      if (!localIdentityData.email) {
 //          vI_notificationBar.dump("## vI_rdfDatasource: updateRDF: no Sender-email for Recipient, aborting.\n");
@@ -326 +329 @@
         vI_rdfDatasource.__setRDFValue(resource, "email", localIdentityData.email);
         vI_rdfDatasource.__setRDFValue(resource, "fullName", localIdentityData.fullName);
-        if (storeBaseID) vI_rdfDatasource.__setRDFValue(resource, "id", localIdentityData.id.key);
-        vI_rdfDatasource.__setRDFValue(resource, "smtp", localIdentityData.smtp.key);
+        if (storeBaseID)
+            vI_rdfDatasource.__setRDFValue(resource, "id", localIdentityData.id.key);
+        else    vI_rdfDatasource.__unsetRDFValue(resource, "id", vI_rdfDatasource.__getRDFValue(resource, "id"))
+        if (storeSMTP && localIdentityData.smtp.key != NO_SMTP_TAG)
+            vI_rdfDatasource.__setRDFValue(resource, "smtp", localIdentityData.smtp.key);
+        else    vI_rdfDatasource.__unsetRDFValue(resource, "smtp", vI_rdfDatasource.__getRDFValue(resource, "smtp"))
         vI_rdfDatasource.__setRDFValue(resource, "name", recDescription);
 

chrome/content/v_identity/vI_statusmenu.js

@@ -33 +33 @@
     objStatusMenuSeparator : null,
     objSaveSwitch : null,
+    objSaveBaseIDSwitch : null,
+    objSaveSMTPSwitch : null,
     objFccSwitch : null,
     objStatusText : null,
@@ -46 +48 @@
             case "extensions.virtualIdentity.storage_show_switch":
                 vI_statusmenu.objSaveSwitch.setAttribute("hidden", !vI_statusmenu.prefroot.getBoolPref(data));
-                // no break, continue like with storedefault
+                break;
+            case "extensions.virtualIdentity.storage_show_baseID_switch":
+                vI_statusmenu.objSaveBaseIDSwitch.setAttribute("hidden", !vI_statusmenu.prefroot.getBoolPref(data));
+                break;
+            case "extensions.virtualIdentity.storage_show_SMTP_switch":
+                vI_statusmenu.objSaveSMTPSwitch.setAttribute("hidden", !vI_statusmenu.prefroot.getBoolPref(data));
+                break;
             case "extensions.virtualIdentity.storage_storedefault":
                 vI_statusmenu.objStorageSaveMenuItem.setAttribute("checked", vI_statusmenu.prefroot.getBoolPref("extensions.virtualIdentity.storage_storedefault"));
@@ -52 +60 @@
             case "extensions.virtualIdentity.storage_store_base_id":
                 vI_statusmenu.objSaveBaseIDMenuItem.setAttribute("checked", vI_statusmenu.prefroot.getBoolPref(data));
+                break;
+            case "extensions.virtualIdentity.storage_store_SMTP":
+                vI_statusmenu.objSaveSMTPMenuItem.setAttribute("checked", vI_statusmenu.prefroot.getBoolPref(data));
+                break;
+            case "extensions.virtualIdentity.storage_colorIndication":
+                document.getElementById("identityHbox").setAttribute("colorize", vI_statusmenu.prefroot.getBoolPref(data))
+                document.getElementById("baseIDHbox").setAttribute("colorize", vI_statusmenu.prefroot.getBoolPref(data))
+                document.getElementById("smtpServerHbox").setAttribute("colorize", vI_statusmenu.prefroot.getBoolPref(data))
                 break;
             case "extensions.virtualIdentity.storage":
@@ -74 +90 @@
         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);   
+        vI_statusmenu.prefroot.addObserver("extensions.virtualIdentity.storage_show_baseID_switch", vI_statusmenu, false);
+        vI_statusmenu.prefroot.addObserver("extensions.virtualIdentity.storage_show_SMTP_switch", vI_statusmenu, false);
+        vI_statusmenu.prefroot.addObserver("extensions.virtualIdentity.storage_colorIndication", 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);
+        vI_statusmenu.prefroot.addObserver("extensions.virtualIdentity.storage_store_SMTP", vI_statusmenu, false);
     },
     
@@ -83 +103 @@
         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_show_baseID_switch", vI_statusmenu);
+        vI_statusmenu.prefroot.removeObserver("extensions.virtualIdentity.storage_show_SMTP_switch", vI_statusmenu);
+        vI_statusmenu.prefroot.removeObserver("extensions.virtualIdentity.storage_colorIndication", vI_statusmenu);
         vI_statusmenu.prefroot.removeObserver("extensions.virtualIdentity.storage_storedefault", vI_statusmenu);
         vI_statusmenu.prefroot.removeObserver("extensions.virtualIdentity.storage_store_base_id", vI_statusmenu);
+        vI_statusmenu.prefroot.removeObserver("extensions.virtualIdentity.storage_store_SMTP", vI_statusmenu);
     },
     
@@ -92 +116 @@
         vI_statusmenu.objStatusMenu = document.getElementById("vI-status-menu");
         vI_statusmenu.objSaveBaseIDMenuItem = document.getElementById("vI_statusMenu_storage_saveBaseID");
+        vI_statusmenu.objSaveSMTPMenuItem = document.getElementById("vI_statusMenu_storage_saveSMTP");
         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.objSaveSwitch = document.getElementById("saveSwitch");
+        vI_statusmenu.objSaveBaseIDSwitch = document.getElementById("saveBaseIDSwitch");
+        vI_statusmenu.objSaveSMTPSwitch = document.getElementById("saveSMTPSwitch");
         vI_statusmenu.objFccSwitch = document.getElementById("fcc_switch");
         vI_statusmenu.objStatusText = document.getElementById("statusText");
@@ -103 +130 @@
         vI_statusmenu.observe(null, null, "extensions.virtualIdentity.fcc_show_switch");
         vI_statusmenu.observe(null, null, "extensions.virtualIdentity.storage_show_switch");
+        vI_statusmenu.observe(null, null, "extensions.virtualIdentity.storage_show_baseID_switch");
+        vI_statusmenu.observe(null, null, "extensions.virtualIdentity.storage_show_SMTP_switch");
+        vI_statusmenu.observe(null, null, "extensions.virtualIdentity.storage_show_switch");
+        vI_statusmenu.observe(null, null, "extensions.virtualIdentity.storage_colorIndication");
         vI_statusmenu.observe(null, null, "extensions.virtualIdentity.storage_store_base_id");
+        vI_statusmenu.observe(null, null, "extensions.virtualIdentity.storage_store_SMTP");
+        vI_statusmenu.observe(null, null, "extensions.virtualIdentity.storage_storedefault");
         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");
+    __addStatusMessage : function(save, smtp) {
+        var sourceString = "vident.statusText.save." + save;
+        if (smtp != "off") sourceString = sourceString + ".smtp"
+        var messageLine1 = vI.elements.strings.getString(sourceString + ".line1");
+        var messageLine2 = vI.elements.strings.getString(sourceString + ".line2");
         if (!messageLine2) {
             vI_statusmenu.objStatusText.setAttribute("label", messageLine1);
@@ -133 +164 @@
     },
 
-    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";
+    changeSMTPStatus : function (elem) {
+        vI_statusmenu.objSaveSMTPMenuItem.setAttribute("checked", elem.getAttribute("checked"));
+        vI_statusmenu.menuConstraint();
+    },
+
+    changeBaseIDStatus : function (elem) {
+        vI_statusmenu.objSaveBaseIDMenuItem.setAttribute("checked", elem.getAttribute("checked"));
+        vI_statusmenu.menuConstraint();
+    },
+
+    changeSaveStatus : function (elem) {
+        vI_statusmenu.objStorageSaveMenuItem.setAttribute("checked", elem.getAttribute("checked"));
+        vI_statusmenu.menuConstraint();
+    },
+
+    menuConstraint : function () {
+        var save = "off"; var smtp = "off";
+        if (vI_statusmenu.objStorageSaveMenuItem.getAttribute("checked") == "true") {
+            vI_statusmenu.objSaveSMTPMenuItem.removeAttribute("disabled");
+            vI_statusmenu.objSaveBaseIDMenuItem.removeAttribute("disabled");
+            if (vI_statusmenu.prefroot.getBoolPref("extensions.virtualIdentity.storage")) {
+                if (vI_statusmenu.objSaveBaseIDMenuItem.getAttribute("checked") == "true") save = "base";
+                else save = "ok";
+                if (vI_statusmenu.objSaveSMTPMenuItem.getAttribute("checked") == "true") smtp = "save";
+            }
+        }
+        else {
+            vI_statusmenu.objSaveSMTPMenuItem.setAttribute("disabled", "true");
+            vI_statusmenu.objSaveBaseIDMenuItem.setAttribute("disabled", "true");
         }
         vI_statusmenu.objStatusMenu.setAttribute("save", save);
-        vI_statusmenu.__addStatusMessage(save);
+        vI_statusmenu.objStatusMenu.setAttribute("smtp", smtp);
+        vI_statusmenu.__addStatusMessage(save, smtp);
     },
 
@@ -150 +204 @@
 
         var curSaveStatus = (vI_statusmenu.objStorageSaveMenuItem.getAttribute("checked") == "true");
+        var curSaveSMTPStatus = (vI_statusmenu.objSaveSMTPMenuItem.getAttribute("checked") == "true");
         var curSaveBaseIDStatus = (vI_statusmenu.objSaveBaseIDMenuItem.getAttribute("checked") == "true");
-        var newSaveStatus = ((!curSaveStatus) || (curSaveStatus && !curSaveBaseIDStatus))
-        var newSaveBaseIDStatus = (!curSaveBaseIDStatus && curSaveStatus)
+        var newSaveStatus = ((!curSaveStatus) || (curSaveStatus && !curSaveSMTPStatus) || (curSaveStatus && !curSaveBaseIDStatus))
+        var newSaveSMTPStatus = ((!curSaveSMTPStatus && curSaveStatus) || (curSaveBaseIDStatus && !curSaveSMTPStatus))
+        var newSaveBaseIDStatus = ((curSaveSMTPStatus && curSaveStatus && !curSaveBaseIDStatus) || (curSaveBaseIDStatus && !curSaveSMTPStatus))
         vI_statusmenu.objStorageSaveMenuItem.setAttribute("checked", newSaveStatus)
+        vI_statusmenu.objSaveSMTPMenuItem.setAttribute("checked", newSaveSMTPStatus)
         vI_statusmenu.objSaveBaseIDMenuItem.setAttribute("checked", newSaveBaseIDStatus)
-
-        var elem = vI_statusmenu.objStorageSaveMenuItem;
-        vI_statusmenu.menuConstraint(elem);
+        
+        vI_statusmenu.menuConstraint();
     }
 }

chrome/content/v_identity/vI_upgrade.js

@@ -96 +96 @@
     
     rdfUpgrade : function() {
+        var currentVersion = vI_rdfDatasource.getCurrentRDFFileVersion();
         vI_notificationBar.dump("checking for previous version of rdf, found " + 
-            vI_rdfDatasource.getCurrentRDFFileVersion() + "\nrdf-upgrade required.\n")
-        // upgrade from pre0.0.3 to 0.0.3
-        vI_upgrade.__createRDFContainers();
+            currentVersion + "\nrdf-upgrade required.\n")
+        switch (currentVersion) {
+            case "0.0.1":
+            case "0.0.2":
+                vI_upgrade.__createRDFContainers(); // no break
+            default:
+                vI_upgrade.__tagDefaultSMTP();
+        }
         vI_rdfDatasource.storeRDFVersion();
         vI_notificationBar.dump("rdf-upgrade to " + vI_rdfDatasource.getCurrentRDFFileVersion() + " done.\n\n");
@@ -127 +133 @@
         
             vI_notificationBar.dump(".");
+        }
+        vI_notificationBar.dump("\n");
+    },
+
+    __tagDefaultSMTP: function() {
+        vI_notificationBar.dump("upgrade: tagDefaultSMTP ");
+        for each (treeType in Array("email", "maillist", "newsgroup", "filter")) {
+            var enumerator = vI_rdfDatasource.getContainer(treeType).GetElements();
+            while (enumerator && enumerator.hasMoreElements()) {
+                var resource = enumerator.getNext();
+                resource.QueryInterface(Components.interfaces.nsIRDFResource);
+                var smtp = vI_rdfDatasource.__getRDFValue(resource, "smtp")
+                if (!smtp || smtp == "") vI_rdfDatasource.__setRDFValue(resource, "smtp", DEFAULT_SMTP_TAG);
+                vI_notificationBar.dump(".");
+            }
         }
         vI_notificationBar.dump("\n");
@@ -278 +299 @@
         
         vI_rdfDatasource.updateRDF(vI_helper.combineNames(Card.displayName, Card.primaryEmail),
-                        "email", localIdentityData, true, null, null)
+                        "email", localIdentityData, true, true, null, null)
         if (Card.secondEmail.replace(/^\s+|\s+$/g,""))
             vI_rdfDatasource.updateRDF(vI_helper.combineNames(Card.displayName, Card.secondEmail),
-                    "email", localIdentityData, true, null, null)
+                    "email", localIdentityData, true, true, null, null)
         
         Card[returnVar.prop] = "";

chrome/content/v_identity/v_identity.xml

@@ -129 +129 @@
         this.description = this._identityDataStorage.sideDescription;
         this.smtp = this._identityDataStorage.smtp.value;
+        vI_notificationBar.dump("** v_identity.xml fromPopupItem_clone constructor smtp='" + this.smtp + "'.\n")
         this.smtpStyle = "width:" + document.getElementById("smtp_server_list").clientWidth + "px;";
         this._identityDataStorage.smtp.value;
@@ -157 +158 @@
     </binding>
 
-    <binding id="smtpServerList" >
+    <binding id="smtpServerList">
     <resources>
             <stylesheet src="chrome://global/skin/menu.css"/>
     </resources>
     <content sizetopopup="pref">
-        <xul:spacer flex="1" />
+        <xul:hbox id="smtpServerHbox" class="smtpServerHbox">
             <xul:menulist class="smtpServerMenuList" anonid="smtpServerMenuList" allowevents="true" id="smtp_server_list">
-                <xul:menupopup anonid="smtp_server_list_popup" />
+                <xul:menupopup anonid="smtp_server_list_popup" />
             </xul:menulist>
+            <xul:checkbox  id="saveSMTPSwitch" class="vI_plain" allowevents="true" oncommand="event.stopPropagation();vI_statusmenu.changeSMTPStatus(this);" >
+                <xul:observes element="vI_statusMenu_storage_saveSMTP" attribute="checked" />
+                <xul:observes element="vI_statusMenu_storage_saveSMTP" attribute="disabled" />
+            </xul:checkbox>
+            <xul:observes element="vI_statusMenu_storage_saveSMTP" attribute="checked" />
+            <xul:observes element="vI_statusMenu_storage_saveSMTP" attribute="disabled" />
+        </xul:hbox>
     </content>
     <implementation>
+    <method name="addNoneServer">
+        <body><![CDATA[
+        var listitem = document.createElement("menuitem");
+        listitem.setAttribute("class", "menuitem-non-iconic");
+        listitem.setAttribute("type", "non-iconic-noaccel");
+        listitem.setAttribute("label", " ");
+        listitem.setAttribute("key", NO_SMTP_TAG);
+        this._smtpPopup.insertBefore(listitem, this._smtpPopup.firstChild);
+        this._smtpMenu.selectedItem = listitem;
+        ]]></body>
+    </method>
     <method name="_addDefaultServer">
             <body><![CDATA[
@@ -210 +229 @@
     <property name="smtp" onget="return this._smtpMenu.selectedItem.getAttribute('key');" >
         <setter><![CDATA[
-        if (val == null) return; // dont overwrite if not set
-//      vI_notificationBar.dump("** v_identity.xml smtp set to '" + val + "'\n")
+        // if (val == null) return; // dont overwrite if not set
+        vI_notificationBar.dump("** v_identity.xml smtp set to '" + val + "'\n")
         var MenuItems = this._smtpPopup.childNodes
         for (var index = 0; index < MenuItems.length; index++) {
@@ -238 +257 @@
     </resources>
     <content sizetopopup="pref">
-        <xul:hbox anonid="contentHBox" flex="1"  >
-                <xul:vbox><xul:spacer flex="1" />
-                    <xul:image class="menulist_clone-icon" id="msgIdentity_clone_image" xbl:inherits="src"/>
-                <xul:spacer flex="1" /></xul:vbox>
-                <xul:vbox flex="1"><xul:spacer flex="1" />
-<!--                textbox is internally an html:input field which inherits the onblur event.
-                Thats why we have to search the textbox before calling blurEvent() -->
-                    <xul:textbox anonid="textBox" type="search" id="msgIdentity_clonetextBoxElem" class="plain menulist_clone-textbox" allowevents="true" xbl:inherits="value=label,crop,accesskey,nomatch=vid" oncommand="event.stopPropagation(); document.getBindingParent(this).inputEvent();"
-                onblur="event.stopPropagation(); var elem = this; while (elem.localName != 'textbox') elem = elem.parentNode; document.getBindingParent(elem).blurEvent();"
-                 crop="right" highlightnonmatches="true"/>
-                <xul:spacer flex="1" /></xul:vbox>
-            <xul:vbox><xul:spacer flex="1" />
-                <xul:hbox>
-                    <xul:label id="msgIdentity_base_id_label" class="menu_clone-description" xbl:inherits="value,hidden=base_id_key_hidden" crop="right" hidden="true"/>
-                    <xul:label value="&vident.accPane.prettyName.prefix;" class="menu_clone-vid virtIdLabel" xbl:inherits="vid" crop="right"/>
+        <xul:hbox class="contentHBox" anonid="contentHBox" flex="1"  >
+            <xul:hbox id="identityHbox" class="identityHbox" flex="1">
+                <xul:vbox><xul:spacer flex="1" />
+                    <xul:image class="menulist_clone-icon" id="msgIdentity_clone_image" xbl:inherits="src"/>
+                <xul:spacer flex="1" /></xul:vbox>
+                <xul:vbox flex="1" id="msgIdentity_clone_fromVbox"><xul:spacer flex="1" />
+<!--                    textbox is internally an html:input field which inherits the onblur event.
+                    Thats why we have to search the textbox before calling blurEvent() -->
+                    <xul:textbox anonid="textBox" type="search" id="msgIdentity_clonetextBoxElem" class="plain menulist_clone-textbox" allowevents="true" xbl:inherits="value=label,crop,accesskey,nomatch=vid" oncommand="event.stopPropagation(); document.getBindingParent(this).inputEvent();"
+                    onblur="event.stopPropagation(); var elem = this; while (elem.localName != 'textbox') elem = elem.parentNode; document.getBindingParent(elem).blurEvent();"
+                    crop="right" highlightnonmatches="true"/>
+                <xul:spacer flex="1" /></xul:vbox>
+                <xul:vbox id="saveSwitch"><xul:spacer flex="1" />
+                    <xul:checkbox class="vI_plain" allowevents="true" oncommand="event.stopPropagation();vI_statusmenu.changeSaveStatus(this);" >
+                        <xul:observes element="vI_statusMenu_storage_save" attribute="checked" />
+                    </xul:checkbox>
+                <xul:spacer flex="1" /></xul:vbox>
+                <xul:vbox><xul:spacer flex="1" />
+                    <xul:hbox>
+                        <xul:label id="msgIdentity_base_id_label" class="menu_clone-description" xbl:inherits="value,hidden=base_id_key_hidden" crop="right" hidden="true"/>
+                        <xul:label value="&vident.accPane.prettyName.prefix;" class="menu_clone-vid virtIdLabel" xbl:inherits="vid" crop="right"/>
+                    </xul:hbox>
+                <xul:spacer flex="1" /></xul:vbox>
+                <xul:observes element="vI_statusMenu_storage_save" attribute="checked" />
+            </xul:hbox>
+            <xul:hbox id="baseIDHbox" class="baseIDHbox" >
+                <xul:vbox><xul:spacer flex="1" />
                     <xul:label id="msgIdentity_clone_label" class="menu_clone-description" xbl:inherits="value=description" crop="right"/>
-                </xul:hbox>
-            <xul:spacer flex="1" /></xul:vbox>
+                <xul:spacer flex="1" /></xul:vbox>
+                <xul:vbox id="saveBaseIDSwitch"><xul:spacer flex="1" />
+                    <xul:checkbox class="vI_plain" allowevents="true" oncommand="event.stopPropagation();vI_statusmenu.changeBaseIDStatus(this);" >
+                        <xul:observes element="vI_statusMenu_storage_saveBaseID" attribute="checked" />
+                        <xul:observes element="vI_statusMenu_storage_saveBaseID" attribute="disabled" />
+                    </xul:checkbox>
+                <xul:spacer flex="1" /></xul:vbox>
+                <xul:observes element="vI_statusMenu_storage_saveBaseID" attribute="checked" />
+                <xul:observes element="vI_statusMenu_storage_saveBaseID" attribute="disabled" />
+            </xul:hbox>
+            <xul:hbox oncommand="event.stopPropagation();document.getBindingParent(this).smtp = this.smtp" anonid="smtpServerListHbox" class="smtpServerListHbox" />
         </xul:hbox>
-        <xul:hbox oncommand="event.stopPropagation();document.getBindingParent(this).smtp = this.smtp" anonid="smtpServerListHbox" class="smtpServerListHbox" />
         <children />
     </content>
@@ -466 +505 @@
         ]]></getter>
         <setter><![CDATA[
-//      vI_notificationBar.dump("** v_identity.xml identityData setter'\n")
+        vI_notificationBar.dump("** v_identity.xml identityData setter\n")
         if (!val) this._identityDataStorage = null
         else {
@@ -478 +517 @@
                     this._identityDataStorage.sideDescription = (idName)?" - "+idName:"";
                 }
-                
-                if (this._identityDataStorage.smtp.key == null)
+                else if (this._identityDataStorage.smtp.hasNoDefinedSMTP()) {
                     this._identityDataStorage.smtp.key = oldIdentityData.smtp.key;
-                
+                    vI_notificationBar.dump("** v_identity.xml use previous SMTP: '" + this._identityDataStorage.smtp.key + "'\n")
+                }
                 this._identityDataStorage.extras.setValues();
             
@@ -490 +529 @@
             this.label = this._identityDataStorage.combinedName;
             this.value = this._identityDataStorage.id.key;
-//          vI_notificationBar.dump("** v_identity.xml identityData setter value='" + this.value + "'\n")
+            vI_notificationBar.dump("** v_identity.xml identityData setter value='" + this.value + "'\n")
             this.description = this._identityDataStorage.sideDescription;
-            document.getAnonymousElementByAttribute(this, "anonid", "smtpServerListHbox").smtp = this._identityDataStorage.smtp.key;
+            vI_notificationBar.dump("** v_identity.xml identityData setter smtp='" + this._identityDataStorage.smtp.keyNice + "'\n")
+            document.getAnonymousElementByAttribute(this, "anonid", "smtpServerListHbox").smtp = this._identityDataStorage.smtp.keyNice;
             
         }
-//      vI_notificationBar.dump("** v_identity.xml identityData setter done.'\n")
+        // vI_notificationBar.dump("** v_identity.xml identityData setter done.'\n")
         ]]></setter>
     </property>

chrome/content/v_identity/v_identity.xul

@@ -74 +74 @@
         <menupopup id="msgIdentityPopup_clone"/>
     </menulist>
-    <checkbox id="storage_save" label="&vident.composeDialog.storageSave.label;" 
-          tooltiptext="&vident.composeDialog.storageSave.tooltiptext;" hidden="true"
-          oncommand="vI_statusmenu.menuConstraint(this);" >
-        <observes element="vI_statusMenu_storage_save" attribute="checked" />
-    </checkbox>
     <checkbox id="fcc_switch" label="&vident.composeDialog.fcc_switch.label;" 
           tooltiptext="&vident.composeDialog.fcc_switch.tooltiptext;" hidden="true" />
@@ -90 +85 @@
             oncommand="vI_statusmenu.menuConstraint(this);"/>
           <menuitem type="checkbox" id="vI_statusMenu_storage_saveBaseID" label="&vident.vI_Menu.saveBaseID.label;"
+            oncommand="vI_statusmenu.menuConstraint(vI_statusmenu.objStorageSaveMenuItem);"/>
+          <menuitem type="checkbox" id="vI_statusMenu_storage_saveSMTP" label="&vident.vI_Menu.saveSMTP.label;"
             oncommand="vI_statusmenu.menuConstraint(vI_statusmenu.objStorageSaveMenuItem);"/>
           <menuseparator id="vI_statusMenu_separator" />

chrome/locale/en-US/v_identity/vI_prefDialog.dtd

@@ -73 +73 @@
 <!ENTITY vI_prefDialog.composeDialog.caption "Message Compose Features">
 <!ENTITY vI_prefDialog.composeDialog.caption2 "Message Compose Dialog">
+<!ENTITY vI_prefDialog.composeDialog.caption3 "Storage Switches">
 <!ENTITY vI_prefDialog.composeDialog.autoTimestamp.label "autogenerate Timestamp-Identity for new mails">
 <!ENTITY vI_prefDialog.composeDialog.autoTimestamp.tooltiptext "On composing a new email, modify your usual sender-address with a timestamp. On easy way to create unique Identities, off by default.">
@@ -80 +81 @@
 <!ENTITY vI_prefDialog.composeDialog.SMTP.label "show SMTP Menu">
 <!ENTITY vI_prefDialog.composeDialog.SMTP.tooltiptext "show Menu to select between available SMTP-servers">
-<!ENTITY vI_prefDialog.composeDialog.fcc_show_switch.label "show switch to activate/deactivate saving of sent mails">
+<!ENTITY vI_prefDialog.composeDialog.fcc_show_switch.label "show switch to activate/deactivate saving of sent mails (fcc)">
 <!ENTITY vI_prefDialog.composeDialog.fcc_show_switch.tooltiptext "show Button to activate/deactivate Storing of Sent mails (fcc) on the fly">
+<!ENTITY vI_prefDialog.composeDialog.show_switch.label "checkbox for saving of Identities">
+<!ENTITY vI_prefDialog.composeDialog.show_baseID_switch.label "checkbox for saving of base Identities">
+<!ENTITY vI_prefDialog.composeDialog.show_SMTP_switch.label "checkbox for saving of SMTP">
+<!ENTITY vI_prefDialog.composeDialog.storage_colorIndication.label "colorize to be stored Identity-parts">
 
 <!ENTITY vI_prefDialog.sending.Folder.label "Attributes / Copies">
@@ -133 +138 @@
 <!ENTITY vI_prefDialog.storage.storedefault.label "save used Identities while sending emails">
 <!ENTITY vI_prefDialog.storage.store_base_id.label "store underlying base Identity">
+<!ENTITY vI_prefDialog.storage.store_SMTP.label "store used SMTP">
 <!ENTITY vI_prefDialog.storage.warn_update.label "ask before overwriting Identities in your Storage">
 <!ENTITY vI_prefDialog.storage.dont_update_multiple.label "never overwrite (and ask) if email has multiple recipients">
-<!ENTITY vI_prefDialog.storage.show_switch.label "show switch to activate/deactivate saving of Identities">
 
 <!ENTITY vI_prefDialog.storageTab.Tab1.header "Storage Extras 1">

chrome/locale/en-US/v_identity/v_identity.dtd

@@ -14 +14 @@
 <!ENTITY vident.vI_Menu.storageSave.label "save Identity while sending">
 <!ENTITY vident.vI_Menu.saveBaseID.label "store underlying base Identity">
+<!ENTITY vident.vI_Menu.saveSMTP.label "store SMTP information">
 <!ENTITY vident.vI_Menu.TooltipTitle.label "Virtual Identity Status">
 <!ENTITY vident.vI_Menu.TooltipChange.label "click to change">

chrome/locale/en-US/v_identity/v_identity.properties

@@ -21 +21 @@
 vident.statusText.save.base.line1=storing virtual Identities
 vident.statusText.save.base.line2=(remember underlying Identity)
+vident.statusText.save.ok.smtp.line1=storing virtual Identities
+vident.statusText.save.ok.smtp.line2=(remember SMTP)
+vident.statusText.save.base.smtp.line1=storing virtual Identities
+vident.statusText.save.base.smtp.line2=(remember underlying Identity & SMTP)
 
 vident.identityData.Name=Name

chrome/skin/classic/v_identity/v_identity.css

@@ -3 +3 @@
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
+#msgIdentity_clone .smtpServerListHbox {
+    margin: -2px;
+    -moz-appearance: textfield;
+}
+
+.smtpServerListHbox {
+  -moz-binding: url("chrome://v_identity/content/v_identity.xml#smtpServerList");
+}
+
+#vI_rdfDataEditorContent checkbox.vI_plain {
+    display: none;
+}
+
+.smtpServerHbox {
+    margin: -1px 0px -1px -1px;
+}
+.identity_clone-menulist .smtpServerMenuList {
+  border-style: none;
+  -moz-appearance: none;
+  margin: 0px;
+  padding: 0px;
+  color:        graytext;
+  text-align:   center;
+}
+
+.identityHbox, .baseIDHbox, .smtpServerHbox {
+    background-color: transparent;
+}
+.identityHbox[checked="true"][colorize="true"], .baseIDHbox[checked="true"][colorize="true"], .smtpServerHbox[checked="true"][colorize="true"] {
+    background-color: rgb(235, 245, 235);
+}
+
+.baseIDHbox[checked="true"][colorize="true"][disabled="true"], .smtpServerHbox[checked="true"][colorize="true"][disabled="true"] {
+    background-color: transparent;
+}
+
+checkbox.vI_plain > .checkbox-spacer-box > .checkbox-check {
+    width: 0px;
+}
+checkbox.vI_plain > .checkbox-label-center-box {
+    display: none;
+}
+
+checkbox.vI_plain {
+    margin: 0px;
+    height: 0px;
+    padding: 0px;
+}
 
 .widthXX { width: 36em; }
@@ -152 +200 @@
 }
 
+#vI-status-menu[save="ok"][smtp="save"] {
+    list-style-image: url("chrome://v_identity/skin/vI_bl.png");
+    visibility: visible;
+}
+
+#vI-status-menu[save="base"][smtp="save"] {
+    list-style-image: url("chrome://v_identity/skin/vI_gebl.png");
+    visibility: visible;
+}
+
 treechildren::-moz-tree-cell-text(user)
 {
@@ -223 +281 @@
 }
 
-.smtpServerListHbox {
-  -moz-binding: url("chrome://v_identity/content/v_identity.xml#smtpServerList");
-}
-
-.identity_clone-menulist .smtpServerMenuList {
-  -moz-appearance: textfield;
-  margin: -2px -1px;
-  border: 1px solid;
-  padding: 0px;
-  background-color: -moz-Field;
-  color:        graytext;
-  text-align:   center;
-}
 
 .identity_clone-menulist .smtpServerMenuList .menulist-label-box {

defaults/preferences/preferences.js

@@ -32 +32 @@
 pref("extensions.virtualIdentity.storage_storedefault", true);
 pref("extensions.virtualIdentity.storage_store_base_id", false);
+pref("extensions.virtualIdentity.storage_store_SMTP", false);
 pref("extensions.virtualIdentity.storage_dont_update_multiple", true);
 pref("extensions.virtualIdentity.storage_show_switch", false);
+pref("extensions.virtualIdentity.storage_show_baseID_switch", false);
+pref("extensions.virtualIdentity.storage_show_SMTP_switch", false);
+pref("extensions.virtualIdentity.storage_colorIndication", true);
 pref("extensions.virtualIdentity.storage_warn_update", true);
 pref("extensions.virtualIdentity.storage_warn_vI_replace", true);
@@ -46 +50 @@
 pref("extensions.virtualIdentity.storageExtras_openPGP_messageSignature", false);
 pref("extensions.virtualIdentity.storageExtras_openPGP_PGPMIME", false);
+pref("extensions.virtualIdentity.storageExtras_fcc", false);
 pref("extensions.virtualIdentity.idSelection_storage_prefer_smart_reply", false);
 pref("extensions.virtualIdentity.idSelection_storage_ignore_smart_reply", true);