Changeset 3f9026

Timestamp:

Jul 5, 2011, 12:42:06 PM (11 years ago)

Author:

rene <rene@…>

Branches:

ng_0.8, ng_0.9

Children:

e832ce

Parents:

d1dd3e

Message:

changed preferences dialog

Files:

• chrome/content/v_identity/vI_account.js (modified) (3 diffs)
• chrome/content/v_identity/vI_context.xul (modified) (1 diff)
• chrome/content/v_identity/vI_identityData.js (modified) (1 diff)
• chrome/content/v_identity/vI_prefDialog.js (modified) (5 diffs)
• chrome/content/v_identity/vI_prefDialog.xul (modified) (5 diffs)
• chrome/content/v_identity/vI_prefDialogOpener.xul (deleted)
• chrome/content/v_identity/vI_prefDialog_TB3.xul (modified) (1 diff)
• chrome/content/v_identity/vI_prefDialog_preTB3.xul (deleted)
• chrome/content/v_identity/vI_prefDialog_preTB3FolderPicker.js (deleted)
• chrome/content/v_identity/vI_prefDialog_preTB3FolderPicker.xul (deleted)
• chrome/content/v_identity/vI_rdfAccountMismatchDialog.xml (modified) (1 diff)
• chrome/content/v_identity/vI_rdfDataEditor.js (modified) (1 diff)
• chrome/content/v_identity/vI_rdfDatasource.js (modified) (3 diffs)
• chrome/content/v_identity/vI_storage.js (modified) (3 diffs)
• chrome/content/v_identity/vI_storageExtras.js (modified) (11 diffs)
• chrome/content/v_identity/v_identity.js (modified) (6 diffs)
• chrome/content/v_identity/v_identity.xml (modified) (1 diff)
• chrome/content/v_identity/v_identity.xul (modified) (1 diff)
• chrome/locale/en-US/v_identity/vI_prefDialog.dtd (modified) (2 diffs)
• install.rdf (modified) (1 diff)

chrome/content/v_identity/vI_account.js

@@ -266 +266 @@
                 vI_account.account.defaultIdentity.fccFolder = vI_account.AccountManager.defaultAccount.defaultIdentity.fccFolder;
                 vI_account.account.defaultIdentity.fccFolderPickerMode = vI_account.AccountManager.defaultAccount.defaultIdentity.fccFolderPickerMode;
-                if (!vI_helper.olderVersion("TB", "2.0"))
-                    vI_account.account.defaultIdentity.fccReplyFollowsParent = vI_account.AccountManager.defaultAccount.defaultIdentity.fccReplyFollowsParent;
+                vI_account.account.defaultIdentity.fccReplyFollowsParent = vI_account.AccountManager.defaultAccount.defaultIdentity.fccReplyFollowsParent;
                 break;
                 case "3"  :
@@ -274 +273 @@
                 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_account._getBaseIdentity().fccReplyFollowsParent;
+                vI_account.account.defaultIdentity.fccReplyFollowsParent = vI_account._getBaseIdentity().fccReplyFollowsParent;
                 break;
                 default  :
@@ -285 +283 @@
                 vI_account.account.defaultIdentity.fccFolderPickerMode
                     = vI_main.preferences.getCharPref("fccFolderPickerMode");
-                if (!vI_helper.olderVersion("TB", "2.0"))
-                    vI_account.account.defaultIdentity.fccReplyFollowsParent = vI_main.preferences.getBoolPref("fccReplyFollowsParent");
+                vI_account.account.defaultIdentity.fccReplyFollowsParent = vI_main.preferences.getBoolPref("fccReplyFollowsParent");
 
                 break;

chrome/content/v_identity/vI_context.xul

@@ -60 +60 @@
             <menupopup>
                 <menuitem label="&vident.vI_Menu.Settings.label;"
-                      oncommand="window.open('chrome://v_identity/content/vI_prefDialogOpener.xul', '', 'chrome, dialog, resizable=yes');" />
+                      oncommand="window.open('chrome://v_identity/content/vI_prefDialog_TB3.xul', '', 'chrome, dialog, alwaysRaised, resizable=yes');" />
                 <menu label="&vident.vI_Menu.DataStorage.label;">
                     <menupopup>                        

chrome/content/v_identity/vI_identityData.js

@@ -298 +298 @@
                 var servers = Components.classes["@mozilla.org/messengercompose/smtp;1"]
                     .getService(Components.interfaces.nsISmtpService).smtpServers;
-                if (typeof(servers.Count) == "undefined")       // TB 3.x
-                    while (servers && servers.hasMoreElements()) {
-                        var server = servers.getNext();
-                        if (server instanceof Components.interfaces.nsISmtpServer && 
-                            !server.redirectorType && this._key == server.key) {
-                            this._value = server.description?server.description:server.hostname;
-                            break;
-                        }
+                while (servers && servers.hasMoreElements()) {
+                    var server = servers.getNext();
+                    if (server instanceof Components.interfaces.nsISmtpServer && 
+                        !server.redirectorType && this._key == server.key) {
+                        this._value = server.description?server.description:server.hostname;
+                        break;
                     }
-                else                            // TB 2.x
-                    for (var i=0 ; i < servers.Count(); i++) {
-                        var server = servers.QueryElementAt(i,
-                            Components.interfaces.nsISmtpServer);
-                        if (!server.redirectorType && this._key == server.key) {
-                            this._value = server.description?server.description:server.hostname;
-                            break;
-                        }
-                    }
+                }
             }
         }

chrome/content/v_identity/vI_prefDialog.js

@@ -114 +114 @@
                 "VIdent_identity.idSelection_autocreate",
                 "VIdent_identity.idSelection_preferExisting",
+                "VIdent_identity.idSelection_ignoreIDs",
                 "VIdent_identity.autoReplyToSelf"],
     
@@ -124 +125 @@
                 var eltType = element.localName;
                 try {
-                if (eltType == "radiogroup")
-                    element.selectedItem = element.childNodes[
-                        vI_prefDialog.preferences.getIntPref(element.getAttribute("prefstring"))];
-                else if (eltType == "checkbox")
-                    element.checked = 
-                        vI_prefDialog.preferences.getBoolPref(element.getAttribute("prefstring"));
-                else if (eltType == "textbox")
-                    if (element.getAttribute("preftype") == "int")
-                        element.setAttribute("value", 
-                        vI_prefDialog.preferences.getIntPref(element.getAttribute("prefstring")) );
-                    else element.setAttribute("value", 
-                        vI_prefDialog.unicodeConverter.ConvertToUnicode(vI_prefDialog.preferences.getCharPref(element.getAttribute("prefstring"))) );
+                    if (eltType == "radiogroup")
+                        element.selectedItem = element.childNodes[
+                            vI_prefDialog.preferences.getIntPref(element.getAttribute("prefstring"))];
+                    else if (eltType == "checkbox")
+                        element.checked = 
+                            vI_prefDialog.preferences.getBoolPref(element.getAttribute("prefstring"));
+                    else if (eltType == "textbox")
+                        if (element.getAttribute("preftype") == "int")
+                            element.setAttribute("value", 
+                            vI_prefDialog.preferences.getIntPref(element.getAttribute("prefstring")) );
+                        else
+                            element.setAttribute("value", 
+                            vI_prefDialog.unicodeConverter.ConvertToUnicode(vI_prefDialog.preferences.getCharPref(element.getAttribute("prefstring"))) );
+                    else if (eltType == "listbox")
+                        element.value =
+                            vI_prefDialog.preferences.getCharPref(element.getAttribute("prefstring"));
                 } catch (ex) {}
             }
@@ -158 +163 @@
                     else vI_prefDialog.preferences.setCharPref(
                             element.getAttribute("prefstring"), vI_prefDialog.unicodeConverter.ConvertFromUnicode(element.value));
-                    //~ alert(elementID + " " + element.getAttribute("prefstring") + " " + parseInt(element.value))
                 }
+                else if (eltType == "listbox")
+                    vI_prefDialog.preferences.setCharPref(element.getAttribute("prefstring"), element.value);
             }
         },
@@ -293 +299 @@
         onInitCopiesAndFolders()
 
-        if (vI_helper.olderVersion("TB", "2.0b") || vI_helper.olderVersion("SM", "1.5a")) {
-            document.getElementById("version-warning").setAttribute("hidden", "false");
-            document.getElementById("VIdent_identity.smart_draft").setAttribute("disabled", "true");
-            document.getElementById("VIdent_messageDraftsTab").setAttribute("hidden", "true");
-            document.getElementById("VIdent_messageTemplatesTab").setAttribute("hidden", "true");
-        }
-        if (vI_helper.olderVersion("TB", "1.5.0.7")) {
-            document.getElementById("notificationGroupBox").setAttribute("hidden", "true"); 
-        }
-        if (vI_helper.olderVersion("TB", "2.0")) {
-            document.getElementById("fccReplyFollowsParentBox").setAttribute("hidden", "true");
-        }
         const enigmail_ID="{847b3a00-7ab1-11d4-8f02-006008948af5}"
         if (!vI_helper.extensionActive(enigmail_ID)) {
@@ -318 +312 @@
         vI_prefDialog.base.initTreeValues();
 
-        if (vI_storageExtrasHelper.seamonkey_to_old()) {
-            document.getElementById("storageExtrasTreeitem1").setAttribute("hidden", "true")
-            document.getElementById("storageExtrasTreeitem2").setAttribute("hidden", "true")
-        }
     },
     

chrome/content/v_identity/vI_prefDialog.xul

@@ -51 +51 @@
 
 <script type="application/x-javascript"
-            src="chrome://v_identity/content/vI_prefDialog.js" />
-<script type="application/x-javascript"
-        src="chrome://v_identity/content/vI_prefDialog_FolderPicker.js" />
-<script type="application/x-javascript"
             src="chrome://v_identity/content/vI_storageExtras.js" />
-<script type="application/x-javascript"
-            src="chrome://v_identity/content/vI_helper.js" />
 <script type="application/x-javascript"
             src="chrome://v_identity/content/vI_rdfDatasource.js" />
@@ -256 +250 @@
         <treecols orient="vertical"><treecol flex="1" hideheader="true" primary="true" /></treecols>
         <treechildren>
-            <treeitem><treerow><treecell label="&vI_prefDialog.idSelection.Cell0.label;" /></treerow></treeitem>
+            <treeitem><treerow><treecell label="&vI_prefDialog.idSelection.Cell0.label;" /></treerow></treeitem>
             <treeitem><treerow><treecell label="&vI_prefDialog.idSelection.Cell1.label;" /></treerow></treeitem>
+            <treeitem><treerow><treecell label="&vI_prefDialog.idSelection.Cell2.label;" /></treerow></treeitem>
         </treechildren>
         </tree>
         
         <tabbox flex="1" >
-        <tabs hidden="true"><tab /><tab /></tabs>
+        <tabs hidden="true"><tab /><tab /><tab /></tabs>
         
         <tabpanels class="plain">
-            <tabpanel orient="vertical">
-                <dialogheader title="&vI_prefDialog.idSelection.Tab0.header;"/>
-                <groupbox>
-                <caption label="&vI_prefDialog.idSelection.Tab0.caption;"/>
+            <tabpanel orient="vertical">
+                <dialogheader title="&vI_prefDialog.idSelection.Tab0.header;"/>
+                <groupbox>
+                <caption label="&vI_prefDialog.idSelection.Tab0.caption;"/>
+                <vbox align="left">
+                    <description class="widthXX">&vI_prefDialog.idSelection.usage.desc;</description>
+                    <listbox id="VIdent_identity.idSelection_ignoreIDs" class="identitySelector widthXX" 
+                        prefstring="idSelection_ignoreIDs" rows="5">
+                            <listcols><listcol /><listcol /><listcol id="ignoreIDs_debug" hidden="true" /><listcol flex="1"/></listcols>
+                    </listbox>
+                </vbox>
+                </groupbox>
+            </tabpanel>
+            <tabpanel orient="vertical">
+                <dialogheader title="&vI_prefDialog.idSelection.Tab1.header;"/>
+                <groupbox>
+                <caption label="&vI_prefDialog.idSelection.Tab1.caption;"/>
                 <vbox align="left">
                     <description class="widthXX">&vI_prefDialog.idSelection.reply.desc;</description>
@@ -278 +286 @@
                 </groupbox>
 <!--                <groupbox>
-                <caption label="&vI_prefDialog.idSelection.Tab0.caption2;"/>
+                <caption label="&vI_prefDialog.idSelection.Tab1.caption2;"/>
                 <vbox align="left">
                     <description class="widthXX">&vI_prefDialog.idSelection.draft.desc;</description>
@@ -285 +293 @@
             </tabpanel>
             <tabpanel orient="vertical">
-                <dialogheader title="&vI_prefDialog.idSelection.Tab1.header;"/>
-                <groupbox>
-                <caption label="&vI_prefDialog.idSelection.Tab1.caption;"/>
+                <dialogheader title="&vI_prefDialog.idSelection.Tab2.header;"/>
+                <groupbox>
+                <caption label="&vI_prefDialog.idSelection.Tab2.caption;"/>
                 <vbox align="left">
                     <description class="widthXX">&vI_prefDialog.idSelection.multiselect.desc;</description>
@@ -720 +728 @@
 <label id="extVersion" value="&vident.version;" hidden="true" />
 </hbox>
+<!--
+    <splitter id="vIDebugBoxSplitter" hidden="true"/>
+    <textbox id="vIDebugBox" hidden="true" multiline="true" readonly="true"
+    DOMAttrModified="if(event.attrName == 'value') this.value = event.newValue; return true;"/>
+        -->
 </dialog>
 </overlay>

chrome/content/v_identity/vI_prefDialog_TB3.xul

@@ -37 +37 @@
     buttonlabelhelp="&vI_prefDialog.dlgHelpButton.label;"
         persist="screenX screenY"
-        title="&vI_prefDialog.dlgTitle.label;" />
+            title="&vI_prefDialog.dlgTitle.label;" >
+        
+        <script type="application/x-javascript"
+            src="chrome://v_identity/content/vI_prefDialog.js" />
+        <script type="application/x-javascript"
+            src="chrome://v_identity/content/vI_prefDialog_FolderPicker.js" />
+        <script type="application/x-javascript"
+            src="chrome://v_identity/content/vI_helper.js" />
+
+</dialog>

chrome/content/v_identity/vI_rdfAccountMismatchDialog.xml

@@ -202 +202 @@
             var servers = Components.classes["@mozilla.org/messengercompose/smtp;1"]
                 .getService(Components.interfaces.nsISmtpService).smtpServers;
-            if (typeof(servers.Count) == "undefined")                   // TB 3.x
-                while (servers && servers.hasMoreElements()) {
-                    var server = servers.getNext(); 
-                    if (server instanceof Components.interfaces.nsISmtpServer && !server.redirectorType) this._addSmtp(server);
-                }
-            else                                                        // TB 2.x
-                for (var i=0 ; i<servers.Count(); i++) this._addSmtp(servers.QueryElementAt(i, Components.interfaces.nsISmtpServer));
+            while (servers && servers.hasMoreElements()) {
+                var server = servers.getNext(); 
+                if (server instanceof Components.interfaces.nsISmtpServer && !server.redirectorType) this._addSmtp(server);
+            }
         ]]></body>
     </method>

chrome/content/v_identity/vI_rdfDataEditor.js

@@ -39 +39 @@
         document.getElementById("identity_list_popup").appendChild(separator);
 
-        if (typeof(FillIdentityList)=="function")       // TB 3.x
-            FillIdentityList(document.getElementById("identity_list"))
-        else                            // TB 2.x
-            FillIdentityListPopup(document.getElementById("identity_list_popup"))
+        FillIdentityList(document.getElementById("identity_list"))
     },
 

chrome/content/v_identity/vI_rdfDatasource.js

@@ -469 +469 @@
                 .getService(Components.interfaces.nsISmtpService).smtpServers;
             var found = false;
-            if (typeof(servers.Count) == "undefined")       // TB 3.x
-                while (servers && servers.hasMoreElements()) {
-                    var server = servers.getNext();
-                    if (server instanceof Components.interfaces.nsISmtpServer && 
-                        !server.redirectorType && smtp == server.key) {
-                        found = true; break;
-                    }
-                }
-            else                            // TB 2.x
-                for (var i=0 ; i < servers.Count(); i++) {
-                    var server = servers.QueryElementAt(i,Components.interfaces.nsISmtpServer);
-                    if (!server.redirectorType && smtp == server.key) {
-                        found = true; break;
-                    }
-                }
+            while (servers && servers.hasMoreElements()) {
+                var server = servers.getNext();
+                if (server instanceof Components.interfaces.nsISmtpServer && 
+                    !server.redirectorType && smtp == server.key) {
+                    found = true; break;
+                }
+            }
             var resource = this._rdfService.GetResource(this._rdfNS + this._rdfNSSMTPservers + "/" + smtp);
             var rdfSMTPlabel = this._getRDFValue(resource, "label");
@@ -539 +531 @@
         var servers = Components.classes["@mozilla.org/messengercompose/smtp;1"]
             .getService(Components.interfaces.nsISmtpService).smtpServers;
-        if (typeof(servers.Count) == "undefined")       // TB 3.x
-            while (servers && servers.hasMoreElements()) {
-                var server = servers.getNext(); 
-                if (server instanceof Components.interfaces.nsISmtpServer && !server.redirectorType) storeSmtp(server, this);
-            }
-        else                            // TB 2.x
-            for (var i=0 ; i<servers.Count(); i++) storeSmtp(servers.QueryElementAt(i, Components.interfaces.nsISmtpServer), this);
+        while (servers && servers.hasMoreElements()) {
+            var server = servers.getNext(); 
+            if (server instanceof Components.interfaces.nsISmtpServer && !server.redirectorType) storeSmtp(server, this);
+        }
 
 //         if (vI_notificationBar) vI_notificationBar.dump("## vI_rdfDatasource: storeAccounts done\n");
@@ -835 +824 @@
         var servers = Components.classes["@mozilla.org/messengercompose/smtp;1"]
             .getService(Components.interfaces.nsISmtpService).smtpServers;
-        if (typeof(servers.Count) == "undefined")       // TB 3.x
-            while (servers && servers.hasMoreElements()) {
-                var server = servers.getNext(); 
-                if (server instanceof Components.interfaces.nsISmtpServer && !server.redirectorType)
-                    if (label == (server.description?server.description:server.hostname) || (hostname == server.hostname && username == server.username))
-                        return server.key;
-            }
-        else                            // TB 2.x
-            for (var i=0 ; i<servers.Count(); i++)
-                if (label == (server.description?server.description:server.hostname) || (hostname == server.hostname && username == server.username))
-                        return server.key;
+        while (servers && servers.hasMoreElements()) {
+            var server = servers.getNext(); 
+            if (server instanceof Components.interfaces.nsISmtpServer && !server.redirectorType)
+                if (label == (server.description?server.description:server.hostname) || (hostname == server.hostname && username == server.username))
+                    return server.key;
+        }
         return null;
     },

chrome/content/v_identity/vI_storage.js

@@ -334 +334 @@
             addrbook.QueryInterface(Components.interfaces.nsIAbDirectory);
             var searchUri = (addrbook.directoryProperties?addrbook.directoryProperties.URI:addrbook.URI) + queryString;
-            
+            vI_notificationBar.dump("## vI_storage: _walkTroughCards searchUri='" + searchUri + "'\n")
+        
             // just try the following steps, they might fail if addressbook wasn't configured the right way
             // not completely reproducible, but caused bug https://www.absorb.it/virtual-id/ticket/41
             try {
                 var AbView = Components.classes["@mozilla.org/addressbook/abview;1"].createInstance(Components.interfaces.nsIAbView);
-                AbView.init(searchUri, true, null, "GeneratedName", "ascending");
+                if (typeof(AbView.init)=="function")    // <= TB-3.0a1
+                    AbView.init(searchUri, true, null, "GeneratedName", "ascending");
+                else {                                  // >= TB-3.0a2
+                    var rdf = Components.classes["@mozilla.org/rdf/rdf-service;1"].getService(Components.interfaces.nsIRDFService);
+                    AbView.setView(rdf.GetResource(searchUri).QueryInterface(Components.interfaces.nsIAbDirectory), null, "GeneratedName", "ascending");
+                }
             } catch (ex) { break; };
             var directory = AbView.directory;
-            
             // directory will now be a subset of the addressbook containing only those cards that match the searchstring
             if (!directory) break;
-            var childCards = null; var keepGoing = 1;
-            try { childCards = directory.childCards; childCards.first(); } catch (ex) { keepGoing = 0; }
+            try { var childCards = directory.childCards; } catch (ex) { break; };
             
-            while (keepGoing == 1) {
-                var currentCard = childCards.currentItem();
-                currentCard.QueryInterface(Components.interfaces.nsIAbCard);
-                callFunction(addrbook, currentCard, returnVar);
-                try { childCards.next(); } catch (ex) { keepGoing = 0; }
+            if (typeof(childCards.first)=="function") { // old versions don't use enumerator
+                var keepGoing = 1;
+                try { childCards.first(); } catch (ex) { keepGoing = 0; }
+                while (keepGoing == 1) {
+                    var currentCard = childCards.currentItem();
+                    currentCard.QueryInterface(Components.interfaces.nsIAbCard);
+                    callFunction(addrbook, currentCard, returnVar);
+                    try { childCards.next(); } catch (ex) { keepGoing = 0; }
+                }
+            }
+            else {
+                while (childCards.hasMoreElements()) {
+                    vI_notificationBar.dump("## vI_storage: _walkTroughCards found card\n")
+        
+                    var currentCard = childCards.getNext();
+                    currentCard.QueryInterface(Components.interfaces.nsIAbCard);
+                    callFunction(addrbook, currentCard, returnVar);
+                }
             }
         }
@@ -366 +383 @@
         var returnVar = vI_storage._walkTroughCards(queryString, vI_storage._isMailingListCard,
             { mailListName : vI_storage.getMailListName(recipient), isMailList : false } )
+        vI_notificationBar.dump("## vI_storage: isMailingList " + returnVar.isMailList + "\n")
         return returnVar.isMailList;
     },  
@@ -389 +407 @@
         if (recipientType != "addr_bcc" || !getCurrentIdentity().doBcc) return false
 
-        var doBccArray;
-        if (typeof(gMsgCompose.compFields.SplitRecipients)=="function")
-            doBccArray = gMsgCompose.compFields.SplitRecipients(getCurrentIdentity().doBccList, false); // TB 2.x
-        else    doBccArray = gMsgCompose.compFields.splitRecipients(getCurrentIdentity().doBccList, false, {}); // TB 3.x
+        var doBccArray = gMsgCompose.compFields.splitRecipients(getCurrentIdentity().doBccList, false, {});
 
         for (var index = 0; index < doBccArray.count; index++ ) {

chrome/content/v_identity/vI_storageExtras.js

@@ -38 +38 @@
     
     hideUnusedEditorFields : function() {
-        if (vI_storageExtrasHelper.seamonkey_to_old()) return;
         var storageExtras = new vI_storageExtras();
         var allHidden = true;
@@ -51 +50 @@
         // resize the window to the content
         window.sizeToContent();
-    },
-
-    seamonkey_to_old : function() {
-        if (vI_storageExtrasHelper.seamonkey_old != "true")
-            vI_storageExtrasHelper.seamonkey_old = vI_helper.olderVersion("SM", "1.5a")
-        return (vI_storageExtrasHelper.seamonkey_old)   
     }
 }
@@ -90 +83 @@
                 function(identity) { return (identity.getBoolAttribute('pgpMimeMode')) })
         ]
-    if (document.getElementById("menu_securityNoEncryption1"))  // TB 2.x
-        this.extras[4] = new vI_storageExtras_sMime_messageEncryption()
-
     if (rdfDatasource) this.loopForRDF(rdfDatasource, resource, "get")
 }
@@ -113 +103 @@
     // just give a duplicate of the current storageExtras, else we will work with pointers
     getDuplicate : function() {
-        if (vI_storageExtrasHelper.seamonkey_to_old()) return null;
         var newExtras = new vI_storageExtras();
         for( var i = 0; i < this.extras.length; i++ ) {
@@ -123 +112 @@
     // copys all values of an identity. This way we can create a new object with a different document-context
     copy : function(extras) {
-        if (vI_storageExtrasHelper.seamonkey_to_old()) return;
         for( var i = 0; i < this.extras.length; i++ ) {
             this.extras[i].value = extras.extras[i].value;
@@ -168 +156 @@
     },
     status : function() {
-        if (vI_storageExtrasHelper.seamonkey_to_old()) return null;
         var returnVal = "";
         for( var i = 0; i < this.extras.length; i++ )
@@ -177 +164 @@
 
     readIdentityValues : function(identity) {
-        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)
@@ -185 +171 @@
 
     setValues : function() {
-        if (vI_storageExtrasHelper.seamonkey_to_old()) return;
         for( var i = 0; i < this.extras.length; i++ ) {
             if (this.extras[i].active) this.extras[i].setValue()
@@ -192 +177 @@
     },
     readValues : function() {
-        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");
@@ -200 +184 @@
     },
     setEditorValues : function() {
-        if (vI_storageExtrasHelper.seamonkey_to_old()) return;
         for( var i = 0; i < this.extras.length; i++ ) this.extras[i].setEditorValue();
     },
     readEditorValues : function() {
-        if (vI_storageExtrasHelper.seamonkey_to_old()) return;
         for( var i = 0; i < this.extras.length; i++ ) {
             this.extras[i].readEditorValue();
@@ -213 +195 @@
     // add value's to the pref object, required for rdfDataTree
     addPrefs : function(pref) {
-        if (vI_storageExtrasHelper.seamonkey_to_old()) return;
         for( var i = 0; i < this.extras.length; i++ )
             pref[this.extras[i].field + "Col"] = this.extras[i].valueNice;

chrome/content/v_identity/v_identity.js

@@ -39 +39 @@
     original_functions : {
         GenericSendMessage : null,
-        FillIdentityListPopup : null,   // TB 2.x
-        FillIdentityList : null     // TB 3.x
+        FillIdentityList : null
     },
 
@@ -60 +59 @@
         NotifyComposeBodyReady: function() { 
             vI_notificationBar.dump("## v_identity: NotifyComposeBodyReady\n");
-            if (!vI_helper.olderVersion("TB", "2.0a")) vI_main.initSystemStage2();
+            vI_main.initSystemStage2();
         },
         NotifyComposeFieldsReady: function() { 
             vI_notificationBar.dump("## v_identity: NotifyComposeFieldsReady\n");
-            if (vI_helper.olderVersion("TB", "2.0a")) vI_main.initSystemStage2();
         },
         ComposeProcessDone: function(aResult) {
@@ -79 +77 @@
         
     replacement_functions : {
-        // TB 2.x
-        FillIdentityListPopup: function(popup) {
-            vI_notificationBar.dump("## v_identity: mod. FillIdentityListPopup\n");
-            var accounts = queryISupportsArray(gAccountManager.accounts, Components.interfaces.nsIMsgAccount);
-            accounts.sort(compareAccountSortOrder);
-
-            for (var i in accounts) {
-                var server = accounts[i].incomingServer;
-                if (!server) continue;
-                // check for VirtualIdentity Account
-                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) {
-                    var identity = identities[j];
-                    var item = document.createElement("menuitem");
-                    item.className = "identity-popup-item";
-                    item.setAttribute("label", identity.identityName);
-                    item.setAttribute("value", identity.key);
-                    item.setAttribute("accountkey", accounts[i].key);
-                    item.setAttribute("accountname", " - " + server.prettyName);
-                    popup.appendChild(item);
-                }
-            }
-        },
-        
-        // TB 3.x
         FillIdentityList: function(menulist) {
             vI_notificationBar.dump("## v_identity: mod. FillIdentityList\n");
             var accounts = queryISupportsArray(gAccountManager.accounts, Components.interfaces.nsIMsgAccount);
-            if (typeof(sortAccounts)=="function") // TB 3.x
-                accounts.sort(sortAccounts);
+            accounts.sort(sortAccounts);
 
             for (var i in accounts) {
@@ -143 +112 @@
             var vid = document.getElementById("msgIdentity_clone").vid
 
-            if (msgType != nsIMsgCompDeliverMode.Now) {
-                // dont allow user to fake identity if Message is not sended NOW and thunderbird-version is below 2.0 !!!!
-                if (vid && (vI_helper.olderVersion("TB", "2.0b") || vI_helper.olderVersion("SM", "1.5a"))) {
-                    var server = gAccountManager.defaultAccount.incomingServer.prettyName
-                    var name = gAccountManager.defaultAccount.defaultIdentity.fullName
-                    var email = gAccountManager.defaultAccount.defaultIdentity.email
-                    var query = vI_main.elements.strings.getString("vident.sendLater.warning") +
-                        vI_main.elements.strings.getString("vident.sendLater.prefix") +
-                        name + " " + email + " [" + server + "]" + 
-                        vI_main.elements.strings.getString("vident.sendLater.postfix")
-                    
-                    if (!promptService.confirm(window,"Error",query)) {
-                        vI_main.replacement_functions.GenericSendMessageInProgress = false;
-                        return;
-                    }
-                    else { document.getElementById("msgIdentity_clone").selectedMenuItem = "default"; vid = false; }
-                }
-            }
-            else {
+            if (msgType == nsIMsgCompDeliverMode.Now) {
                 if ( (vid && vI_main.preferences.getBoolPref("warn_virtual") &&
                     !(promptService.confirm(window,"Warning",
@@ -209 +160 @@
         
         replace_FillIdentityList : function() {
-            if (typeof(FillIdentityList)=="function") {
-                //~ vI_notificationBar.dump("## v_identity: replace FillIdentityList (TB 3.x)\n");
-                vI_main.original_functions.FillIdentityList = FillIdentityList;
-                FillIdentityList = vI_main.replacement_functions.FillIdentityList;
-            }
-            else {
-                //~ vI_notificationBar.dump("## v_identity: replace FillIdentityListPopup (TB 2.x)\n");
-                vI_main.original_functions.FillIdentityListPopup = FillIdentityListPopup;
-                FillIdentityListPopup = vI_main.replacement_functions.FillIdentityListPopup;
-            }
+            //~ vI_notificationBar.dump("## v_identity: replace FillIdentityList \n");
+            vI_main.original_functions.FillIdentityList = FillIdentityList;
+            FillIdentityList = vI_main.replacement_functions.FillIdentityList;
         }
     },
@@ -423 +367 @@
 
 vI_main.replacement_functions.replace_FillIdentityList();
-window.addEventListener('load', vI_main.init, false);       // TB 1.5x, SM
-window.addEventListener('compose-window-init', vI_main.init, true); // TB 2.x 3.x
+window.addEventListener('compose-window-init', vI_main.init, true);
 
 window.addEventListener("unload", function(e) { vI_main.AccountManagerObserver.unregister(); try {vI_statusmenu.removeObserver();} catch (ex) { } }, false);

chrome/content/v_identity/v_identity.xml

@@ -224 +224 @@
                 .getService(Components.interfaces.nsISmtpService).smtpServers;
             
-            if (typeof(servers.Count) == "undefined")       // TB 3.x
-                while (servers && servers.hasMoreElements())
-                    this._addServer(servers.getNext());
-            else                            // TB 2.x
-                for (var i=0 ; i<servers.Count(); i++)
-                    this._addServer(servers.QueryElementAt(i, Components.interfaces.nsISmtpServer));
+            while (servers && servers.hasMoreElements())
+                this._addServer(servers.getNext());
         ]]></body>
     </method>

chrome/content/v_identity/v_identity.xul

@@ -91 +91 @@
           <menuseparator id="vI_statusMenu_separator" />
           <menuitem class="menuitem-iconic" label="&vident.vI_Menu.Settings.label;"
-            oncommand="window.open('chrome://v_identity/content/vI_prefDialogOpener.xul', '', 'chrome, dialog, resizable=yes');" />
+            oncommand="window.open('chrome://v_identity/content/vI_prefDialog_TB3.xul', '', 'chrome, dialog, alwaysRaised, resizable=yes');" />
           <menuitem class="menuitem-iconic" label="&vident.vI_Menu.DataEditor.label;"
             oncommand="window.open('chrome://v_identity/content/vI_rdfDataTree.xul', '', 'chrome, dialog, resizable=yes');" />

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

@@ -48 +48 @@
 
 
-<!ENTITY vI_prefDialog.idSelection.Cell0.label "Input">
-<!ENTITY vI_prefDialog.idSelection.Cell1.label "Result Selection">
+<!ENTITY vI_prefDialog.idSelection.Cell0.label "OthersXXXXS">
+<!ENTITY vI_prefDialog.idSelection.Cell1.label "Input">
+<!ENTITY vI_prefDialog.idSelection.Cell2.label "Result Selection">
 
-<!ENTITY vI_prefDialog.idSelection.Tab0.header "Identity Input">
-<!ENTITY vI_prefDialog.idSelection.Tab0.caption "Smart Reply and Storage">
-<!ENTITY vI_prefDialog.idSelection.Tab0.caption2 "Smart Draft and Storage">
+<!ENTITY vI_prefDialog.idSelection.Tab0.header "XXXX Tab2">
+<!ENTITY vI_prefDialog.idSelection.Tab0.caption "Àhh, was jetzt?">
+<!ENTITY vI_prefDialog.idSelection.usage.desc "XXXX Test">
+
+<!ENTITY vI_prefDialog.idSelection.Tab1.header "Identity Input">
+<!ENTITY vI_prefDialog.idSelection.Tab1.caption "Smart Reply and Storage">
+<!ENTITY vI_prefDialog.idSelection.Tab1.caption2 "Smart Draft and Storage">
 <!ENTITY vI_prefDialog.idSelection.reply.desc "If you answer any emails, the priority of stored Virtual Identities compared to ones retrieved with &apos;Smart Reply&apos; can configured here.">
 <!ENTITY vI_prefDialog.idSelection.prefer_smart_reply.label "prefer &apos;Smart Reply&apos;-Identities">
@@ -60 +65 @@
 <!ENTITY vI_prefDialog.idSelection.draft.desc "If you edit a Draft (or a Template) there is nothing to configure. If the extension is able to read the header of the stored email, a related Virtual Identity is created. There is no information about SMTP or any other specific settings in the Draft/Template. This information is, if possible, retrieved from the Virtual Identity Storage.">
 
-<!ENTITY vI_prefDialog.idSelection.Tab1.header "Result Handling">
-<!ENTITY vI_prefDialog.idSelection.Tab1.caption "Handling of the Results">
+<!ENTITY vI_prefDialog.idSelection.Tab2.header "Result Handling">
+<!ENTITY vI_prefDialog.idSelection.Tab2.caption "Handling of the Results">
 <!ENTITY vI_prefDialog.idSelection.multiselect.desc "The results of the search in the Virtual Identity Storage and the Smart Reply or Smart Draft header analysis are added to the message-identity dropdown menu. You can also select, how they are might be used as the new senders identity.">
 <!ENTITY vI_prefDialog.idSelection.ask.label "open a dialog to choose Identity">

install.rdf

@@ -33 +33 @@
                    em:updateURL="http://absorb.it/software/virtual_identity/pre/v_identity_update.rdf"
                    em:updateKey="MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDY5lTLkMzbwKDrWvC5rAjR9Uiv6THmeOK03lBCsQ89KXYlz8i2CNTgvp44+/kK+73u+ZdduNSID+HGuzfoWy+cJLznFSlKx5DcYWDKKGKhCrXvRZ/nFX1JowmfdR5LskQMLNHMjadUCuS6ka3tX+yWErxOMPTdYmSWazU8tp1fGwIDAQAB"
-                   em:optionsURL="chrome://v_identity/content/vI_prefDialogOpener.xul" >
+                   em:optionsURL="chrome://v_identity/content/vI_prefDialog_TB3.xul" >
     <em:targetApplication RDF:resource="rdf:#$njP94"/>
     <em:targetApplication RDF:resource="rdf:#$rjP94"/>