Changeset 308706


Ignore:
Timestamp:
Nov 16, 2011, 1:32:14 AM (9 years ago)
Author:
rene <rene@…>
Branches:
ng_0.9
Children:
3e14f2
Parents:
238a98
Message:

namespace-id changes

Files:
19 edited

Legend:

Unmodified
Added
Removed
  • content/bindings/v_identity.xml

    r238a98 r308706  
    9999        <body><![CDATA[
    100100        if (!this._identityInfo) return;
    101         var width = document.getElementById("msgIdentity_clone").boxObject.width * 0.7;
     101        var width = document.getElementById("virtualIdentityExtension_msgIdentityClone").boxObject.width * 0.7;
    102102        var height = this._tooltipBrowser.contentDocument.lastChild.scrollHeight + 5;
    103103        this.sizeTo(width, height);
    104         width = document.getElementById("msgIdentity_clone").boxObject.width * 0.75;
     104        width = document.getElementById("virtualIdentityExtension_msgIdentityClone").boxObject.width * 0.75;
    105105        this.sizeTo(width, height);
    106106        ]]></body>
     
    278278            <xul:hbox id="identityHbox" class="identityHbox" flex="1">
    279279                <xul:vbox><xul:spacer flex="1" />
    280                     <xul:image class="menulist_clone-icon" id="msgIdentity_clone_image" xbl:inherits="src"/>
     280                    <xul:image class="menulist_clone-icon" id="virtualIdentityExtension_msgIdentityClone_image" xbl:inherits="src"/>
    281281                <xul:spacer flex="1" /></xul:vbox>
    282                 <xul:vbox flex="1" id="msgIdentity_clone_fromVbox"><xul:spacer flex="1" />
     282                <xul:vbox flex="1" id="virtualIdentityExtension_msgIdentityClone_fromVbox"><xul:spacer flex="1" />
    283283<!--                    textbox is internally an html:input field which inherits the onblur event.
    284284                    Thats why we have to search the textbox before calling blurEvent() -->
    285                     <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();"
     285                    <xul:textbox anonid="textBox" type="search" id="virtualIdentityExtension_msgIdentityClonetextBoxElem" class="plain menulist_clone-textbox" allowevents="true" xbl:inherits="value=label,crop,accesskey,nomatch=vid" oncommand="event.stopPropagation(); document.getBindingParent(this).inputEvent();"
    286286                    onblur="event.stopPropagation(); var elem = this; while (elem.localName != 'textbox') elem = elem.parentNode; document.getBindingParent(elem).blurEvent();"
    287287                    crop="right" highlightnonmatches="true"/>
     
    301301                    <xul:hbox>
    302302                        <xul:label id="msgIdentity_base_id_label" class="menu_clone-description" xbl:inherits="value,hidden=base_id_key_hidden" crop="right" hidden="true"/>
    303                         <xul:label id="msgIdentity_clone_label" class="menu_clone-description" xbl:inherits="value=description" crop="right"/>
     303                        <xul:label id="virtualIdentityExtension_msgIdentityClone_label" class="menu_clone-description" xbl:inherits="value=description" crop="right"/>
    304304                    </xul:hbox>
    305305                <xul:spacer flex="1" /></xul:vbox>
     
    582582        ]]></setter>
    583583    </property>
    584     <field name="_popupElem">document.getElementById("msgIdentityPopup_clone")</field>
     584    <field name="_popupElem">document.getElementById("virtualIdentityExtension_msgIdentityPopupClone")</field>
    585585    <field name="tooltipElem">document.getAnonymousElementByAttribute(this, "anonid", "contentHBox")</field>
    586586    <field name="textBoxElem">document.getAnonymousElementByAttribute(this, "anonid", "textBox");</field>
  • content/prefDialog/vI_prefDialog.js

    r238a98 r308706  
    2727
    2828Components.utils.import("resource://gre/modules/AddonManager.jsm");
    29 let Log = setupLogging("virtualIdentity.prefDialog");
     29let Log = vI.setupLogging("virtualIdentity.prefDialog");
    3030
    3131var prefDialog = {
  • content/vI_context.xul

    r238a98 r308706  
    4444           
    4545        observe: function(subject, topic, data) {
    46             document.getElementById("vI_Menu").setAttribute("hidden",
     46            document.getElementById("virtualIdentityExtension_vIMenu").setAttribute("hidden",
    4747                !vI_context.prefroot.getBoolPref("extensions.virtualIdentity.menu_entry"));
    4848        }
     
    6262   
    6363    <menupopup id="taskPopup">
    64         <menu id="vI_Menu" hidden="true" label="&vident.vI_Menu.label;">
     64        <menu id="virtualIdentityExtension_vIMenu" hidden="true" label="&vident.vI_Menu.label;">
    6565            <menupopup>
    6666                <menuitem label="&vident.vI_Menu.Settings.label;"
  • content/vI_getHeader.js

    r238a98 r308706  
    4141            .createInstance(Components.interfaces.nsIScriptableUnicodeConverter),
    4242
    43 //  strings : document.getElementById("vIdentBundle"),
     43//  strings : document.getElementById("virtualIdentityExtension_vIdentBundle"),
    4444   
    4545    headerToSearch : null,
     
    116116    setupEventListener: function() {
    117117       
    118         getHeader.strings = document.getElementById("vIdentBundle");
     118        getHeader.strings = document.getElementById("virtualIdentityExtension_vIdentBundle");
    119119       
    120120        getHeader.unicodeConverter.charset = "UTF-8";
  • content/vI_getHeader.xul

    r238a98 r308706  
    3939
    4040<stringbundleset id="stringbundleset">
    41     <stringbundle id="vIdentBundle" src="chrome://v_identity/locale/v_identity.properties" />
     41    <stringbundle id="virtualIdentityExtension_vIdentBundle" src="chrome://v_identity/locale/v_identity.properties" />
    4242  </stringbundleset>
    4343
    4444<vbox id="messagepanebox" >
    45   <textbox id="vIDebugBox" />
     45  <textbox id="virtualIdentityExtension_vIDebugBox" />
    4646</vbox>
    4747
    4848<vbox id="messagepanebox">
    49      <notificationbox id="vINotification" position="1" insertbefore="msgheaderstoolbar-box"/>
     49     <notificationbox id="virtualIdentityExtension_vINotification" position="1" insertbefore="msgheaderstoolbar-box"/>
    5050</vbox>
    5151</overlay>
  • content/vI_msgIdentityCloneTools.js

    r238a98 r308706  
    106106    initReplyTo : function() {
    107107        if (vI.statusmenu.prefroot.getBoolPref("extensions.virtualIdentity.autoReplyToSelf")) {
    108             document.getElementById("autoReplyToSelfLabel").removeAttribute("hidden");
     108            document.getElementById("virtualIdentityExtension_autoReplyToSelfLabel").removeAttribute("hidden");
    109109            msgIdentityCloneTools.removeAllReplyTos();
    110110        }
    111         else document.getElementById("autoReplyToSelfLabel").setAttribute("hidden", "true");
     111        else document.getElementById("virtualIdentityExtension_autoReplyToSelfLabel").setAttribute("hidden", "true");
    112112    },
    113113   
    114114    removeAllReplyTos : function() {
    115         if (!document.getElementById("autoReplyToSelfLabel").hasAttribute("hidden")) {
     115        if (!document.getElementById("virtualIdentityExtension_autoReplyToSelfLabel").hasAttribute("hidden")) {
    116116            for (var row = 1; row <= top.MAX_RECIPIENTS; row ++) {
    117117                var awType = awGetPopupElement(row).selectedItem.getAttribute("value");
     
    125125
    126126    addReplyToSelf : function() {
    127         if (!document.getElementById("autoReplyToSelfLabel").hasAttribute("hidden")) {
    128             awAddRecipient("addr_reply",document.getElementById("msgIdentity_clone").label);
     127        if (!document.getElementById("virtualIdentityExtension_autoReplyToSelfLabel").hasAttribute("hidden")) {
     128            awAddRecipient("addr_reply",document.getElementById("virtualIdentityExtension_msgIdentityClone").label);
    129129            Log.debug("added ReplyToSelf");
    130             document.getElementById("autoReplyToSelfLabel").setAttribute("hidden","true");
     130            document.getElementById("virtualIdentityExtension_autoReplyToSelfLabel").setAttribute("hidden","true");
    131131        }
    132132    }
  • content/vI_rdfDataEditor.xul

    r238a98 r308706  
    8585    </groupbox>
    8686    </vbox>
    87     <textbox id="vIDebugBox" />
     87    <textbox id="virtualIdentityExtension_vIDebugBox" />
    8888</dialog>
  • content/vI_rdfDataTree.xul

    r238a98 r308706  
    7070    <stringbundle id="vI_rdfDataTreeBundle" src="chrome://v_identity/locale/vI_rdfDataEditor.properties" />
    7171    <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties" />
    72     <stringbundle id="vIdentBundle" src="chrome://v_identity/locale/v_identity.properties" />
    73         <stringbundle id="vIStorageExtrasBundle" src="chrome://v_identity/locale/vI_storageExtras.properties" />
     72    <stringbundle id="virtualIdentityExtension_vIdentBundle" src="chrome://v_identity/locale/v_identity.properties" />
     73        <stringbundle id="virtualIdentityExtension_vIStorageExtrasBundle" src="chrome://v_identity/locale/vI_storageExtras.properties" />
    7474</stringbundleset>
    7575
     
    306306<!-- <splitter /> -->
    307307<browser id="rdfDataTreeCollectionInfoBox" class="vI_htmlTextBox" type="chrome" cssSource="vI_rdfTreeInfo.css" disablehistory="true" onoverflow="virtualIdentityExtension.rdfDataTreeCollection.overflow();"/>
    308 <textbox id="vIDebugBox" />
     308<textbox id="virtualIdentityExtension_vIDebugBox" />
    309309</window>
  • content/vI_smartIdentity.js

    r238a98 r308706  
    5959                msgHdr = smartIdentity.messenger.
    6060                    messageServiceFromURI(gMsgCompose.originalMsgURI).messageURIToMsgHdr(gMsgCompose.originalMsgURI);
    61                 smartIdentity._smartIdentityCollection = new vI.smartIdentityCollection(msgHdr, getCurrentIdentity(), document.getElementById("msgIdentity_clone").vid, newsgroup, this._getRecipients()); 
     61                smartIdentity._smartIdentityCollection = new vI.smartIdentityCollection(msgHdr, getCurrentIdentity(), document.getElementById("virtualIdentityExtension_msgIdentityClone").vid, newsgroup, this._getRecipients()); 
    6262                smartIdentity._smartIdentityCollection.Reply();
    6363                autocreate = false; break;
     
    6767                msgHdr = smartIdentity.messenger.
    6868                    messageServiceFromURI(gMsgCompose.compFields.draftId).messageURIToMsgHdr(gMsgCompose.compFields.draftId);
    69                 smartIdentity._smartIdentityCollection = new vI.smartIdentityCollection(msgHdr, getCurrentIdentity(), document.getElementById("msgIdentity_clone").vid, newsgroup, this._getRecipients()); 
     69                smartIdentity._smartIdentityCollection = new vI.smartIdentityCollection(msgHdr, getCurrentIdentity(), document.getElementById("virtualIdentityExtension_msgIdentityClone").vid, newsgroup, this._getRecipients()); 
    7070                smartIdentity._smartIdentityCollection.Draft();
    7171                autocreate = false; break;
     
    7676            case msgComposeTypeReference.MailToUrl:
    7777                Log.debug("New Mail\n");
    78                 smartIdentity._smartIdentityCollection = new vI.smartIdentityCollection(null, getCurrentIdentity(), document.getElementById("msgIdentity_clone").vid, newsgroup, this._getRecipients());   
     78                smartIdentity._smartIdentityCollection = new vI.smartIdentityCollection(null, getCurrentIdentity(), document.getElementById("virtualIdentityExtension_msgIdentityClone").vid, newsgroup, this._getRecipients());   
    7979                // to enable composing new email with new identity: identity is hidden in subject line
    8080                // used for instance from conversation addon
     
    111111                Log.debug("found existing Identity, use without interaction.\n");
    112112                // add all Indentities to Clone Menu before selecting and leaving the function
    113                 document.getElementById("msgIdentity_clone").addIdentitiesToCloneMenu(smartIdentity._smartIdentityCollection._allIdentities);
     113                document.getElementById("virtualIdentityExtension_msgIdentityClone").addIdentitiesToCloneMenu(smartIdentity._smartIdentityCollection._allIdentities);
    114114                smartIdentity.changeIdentityToSmartIdentity(smartIdentity._smartIdentityCollection._allIdentities, existingIDIndex.key);
    115115                return;
     
    117117        }
    118118       
    119         document.getElementById("msgIdentity_clone").addIdentitiesToCloneMenu(smartIdentity._smartIdentityCollection._allIdentities);
     119        document.getElementById("virtualIdentityExtension_msgIdentityClone").addIdentitiesToCloneMenu(smartIdentity._smartIdentityCollection._allIdentities);
    120120        Log.debug("__smartIdentitySelection smartIdentity._smartIdentityCollection._allIdentities.number=" +
    121121                smartIdentity._smartIdentityCollection._allIdentities.number +
     
    145145        Log.debug("changeIdentityToSmartIdentity selectedValue=" + selectedValue + ": '" + allIdentities.identityDataCollection[selectedValue].combinedName + "' "
    146146            + "(" + allIdentities.identityDataCollection[selectedValue].id.value + "," + allIdentities.identityDataCollection[selectedValue].smtp.value + ")\n");
    147         document.getElementById("msgIdentity_clone").selectedMenuItem = allIdentities.menuItems[selectedValue];
    148         if (document.getElementById("msgIdentity_clone").vid) {
     147        document.getElementById("virtualIdentityExtension_msgIdentityClone").selectedMenuItem = allIdentities.menuItems[selectedValue];
     148        if (document.getElementById("virtualIdentityExtension_msgIdentityClone").vid) {
    149149            var label=vI.main.elements.strings.getString("vident.smartIdentity.vIUsage");
    150150            if (allIdentities.number > 1) label += " "
  • content/vI_statusmenu.js

    r238a98 r308706  
    118118        statusmenu.prefroot.QueryInterface(Components.interfaces.nsIPrefBranch2);
    119119
    120         statusmenu.objStatusMenu = document.getElementById("vI-status-menu");
     120        statusmenu.objStatusMenu = document.getElementById("virtualIdentityExtension_vIStatusMenu");
    121121        statusmenu.objSaveBaseIDMenuItem = document.getElementById("virtualIdentityExtension_statusMenu_storage_saveBaseID");
    122122        statusmenu.objSaveSMTPMenuItem = document.getElementById("virtualIdentityExtension_statusMenu_storage_saveSMTP");
     
    126126        statusmenu.objSaveBaseIDSwitch = document.getElementById("saveBaseIDSwitch");
    127127        statusmenu.objSaveSMTPSwitch = document.getElementById("saveSMTPSwitch");
    128         statusmenu.objFccSwitch = document.getElementById("fcc_switch");
     128        statusmenu.objFccSwitch = document.getElementById("virtualIdentityExtension_fccSwitch");
    129129        statusmenu.objStatusText = document.getElementById("statusText");
    130130        statusmenu.objStatusTooltipLine1 = document.getElementById("virtualIdentityExtension_statusMenuTooltip_StatusValueLine1");
  • content/vI_storage.js

    r238a98 r308706  
    8484        storage.updateVIdentityFromStorage(document.getElementById(element.id.replace(/^addressCol1/,"addressCol2")));
    8585        if (element.selectedItem.getAttribute("value") == "addr_reply") // if reply-to is manually entered disable AutoReplyToSelf
    86             document.getElementById("autoReplyToSelfLabel").setAttribute("hidden", "true");
     86            document.getElementById("virtualIdentityExtension_autoReplyToSelfLabel").setAttribute("hidden", "true");
    8787
    8888    },
     
    159159        // firstUsedInputElement was set before and we are not editing the same
    160160        var isNotFirstInputElement = (storage.firstUsedInputElement && storage.firstUsedInputElement != inputElement)
    161         var currentIdentity = document.getElementById("msgIdentity_clone").identityData
     161        var currentIdentity = document.getElementById("virtualIdentityExtension_msgIdentityClone").identityData
    162162        var storageResult = storage._rdfDatasourceAccess.updateVIdentityFromStorage(inputElement.value, recipientType,
    163             currentIdentity, document.getElementById("msgIdentity_clone").vid, isNotFirstInputElement);
     163            currentIdentity, document.getElementById("virtualIdentityExtension_msgIdentityClone").vid, isNotFirstInputElement);
    164164       
    165165        if (storageResult.identityCollection.number == 0) return; // return if there was no match
     
    172172            for (var j = 0; j < storageResult.identityCollection.number; j++) {
    173173                Log.debug("updateVIdentityFromStorage adding: " + storageResult.identityCollection.identityDataCollection[j].combinedName + "\n");
    174                 selectedMenuItem = document.getElementById("msgIdentity_clone").addIdentityToCloneMenu(storageResult.identityCollection.identityDataCollection[j])
     174                selectedMenuItem = document.getElementById("virtualIdentityExtension_msgIdentityClone").addIdentityToCloneMenu(storageResult.identityCollection.identityDataCollection[j])
    175175            }
    176176        }
    177177        if (storageResult.result == "accept") {
    178178            Log.debug("updateVIdentityFromStorage selecting: " + storageResult.identityCollection.identityDataCollection[0].combinedName + "\n");
    179             document.getElementById("msgIdentity_clone").selectedMenuItem = selectedMenuItem;
    180             if (document.getElementById("msgIdentity_clone").vid)
     179            document.getElementById("virtualIdentityExtension_msgIdentityClone").selectedMenuItem = selectedMenuItem;
     180            if (document.getElementById("virtualIdentityExtension_msgIdentityClone").vid)
    181181                vI.StorageNotification.info(vI.main.elements.strings.getString("vident.smartIdentity.vIStorageUsage") + ".");
    182182        }
  • content/vI_storageExtras.js

    r238a98 r308706  
    6464            "reciept", "storageExtras_returnReciept", "returnReceiptMenu", null, function(identity) { return identity.requestReturnReceipt; }),
    6565        new storageExtras_checkbox(
    66             "fcc", "storageExtras_fcc", "fcc_switch", null, function(identity) { return identity.doFcc; }),
     66            "fcc", "storageExtras_fcc", "virtualIdentityExtension_fccSwitch", null, function(identity) { return identity.doFcc; }),
    6767        new storageExtras_characterEncoding(),
    6868        new storageExtras_msgFormat(),
     
    132132    },
    133133    getMatrix : function() {
    134         var prefStrings = document.getElementById("vIStorageExtrasBundle");
     134        var prefStrings = document.getElementById("virtualIdentityExtension_vIStorageExtrasBundle");
    135135        var string = "";
    136136        for( var i = 0; i < this.extras.length; i++ ) {
     
    146146    },
    147147    getCompareMatrix : function() {
    148         var prefStrings = document.getElementById("vIStorageExtrasBundle");
     148        var prefStrings = document.getElementById("virtualIdentityExtension_vIStorageExtrasBundle");
    149149        var string = "";
    150150        for( var i = 0; i < this.extras.length; i++ ) {
  • content/vI_upgrade.xul

    r238a98 r308706  
    8686        <groupbox>
    8787            <caption label="&vident.upgrade.upgrade.caption;"/>
    88             <textbox id="vIDebugBox" />
     88            <textbox id="virtualIdentityExtension_vIDebugBox" />
    8989        </groupbox>
    9090    </wizardpage>   
     
    101101    <hbox>
    102102    <spacer flex="1" />
    103     <button class="v_identity_logo v_identity_logo_button"
     103    <button class="virtualIdentityExtension_Logo virtualIdentityExtension_Logo_button"
    104104        label="&vident.vidLogo.label; &vident.version;"
    105105        oncommand="virtualIdentityExtension.upgrade.openURL('http://www.absorb.it/virtual-id')" tooltiptext="&vident.upgrade.vidLogo.tooltiptext;" />
  • content/vI_upgradeOverlay.js

    r238a98 r308706  
    5757       
    5858        if (prefroot.getBoolPref("extensions.virtualIdentity.error_console")) {
    59             document.getElementById("vIErrorBoxSplitter").removeAttribute("hidden");
    60             document.getElementById("vIErrorBox").removeAttribute("hidden");
    61             document.getElementById("vIErrorBox").setAttribute("class", "console-box");
     59            document.getElementById("virtualIdentityExtension_vIErrorBoxSplitter").removeAttribute("hidden");
     60            document.getElementById("virtualIdentityExtension_vIErrorBox").removeAttribute("hidden");
     61            document.getElementById("virtualIdentityExtension_vIErrorBox").setAttribute("class", "console-box");
    6262            prefroot.setBoolPref("javascript.options.showInConsole", true);
    6363            prefroot.setBoolPref("browser.dom.window.dump.enabled", true);
  • content/vI_upgradeOverlay.xul

    r238a98 r308706  
    5050
    5151    <vbox id="messagepanebox" >
    52         <splitter id="vIErrorBoxSplitter" hidden="true" />
    53         <vbox id="vIErrorBox" context="ConsoleContext" sortOrder="reverse" hidden="true" />
     52        <splitter id="virtualIdentityExtension_vIErrorBoxSplitter" hidden="true" />
     53        <vbox id="virtualIdentityExtension_vIErrorBox" context="ConsoleContext" sortOrder="reverse" hidden="true" />
    5454    </vbox>
    5555</overlay>
  • content/v_identity.js

    r238a98 r308706  
    5959    elements : {
    6060        init_base : function() {
    61             main.elements.Area_MsgIdentityHbox = document.getElementById("msgIdentityHbox");
     61            main.elements.Area_MsgIdentityHbox = document.getElementById("virtualIdentityExtension_msgIdentityHbox");
    6262            main.elements.Obj_MsgIdentity = document.getElementById("msgIdentity");
    6363        },
    6464        init_rest : function() {
    6565            main.elements.Obj_MsgIdentityPopup = document.getElementById("msgIdentityPopup");
    66             main.elements.Obj_vILogo = document.getElementById("v_identity_logo");
    67             main.elements.strings = document.getElementById("vIdentBundle");
     66            main.elements.Obj_vILogo = document.getElementById("virtualIdentityExtension_Logo");
     67            main.elements.strings = document.getElementById("virtualIdentityExtension_vIdentBundle");
    6868        },
    6969        strings : null
     
    148148            if (msgType == Components.interfaces.nsIMsgCompDeliverMode.Now) { vI.msgIdentityCloneTools.addReplyToSelf(); }
    149149
    150             var vid = document.getElementById("msgIdentity_clone").vid
    151             var virtualIdentityData = document.getElementById("msgIdentity_clone").identityData;
     150            var vid = document.getElementById("virtualIdentityExtension_msgIdentityClone").vid
     151            var virtualIdentityData = document.getElementById("virtualIdentityExtension_msgIdentityClone").identityData;
    152152           
    153153            returnValue = vIaccount_prepareSendMsg( vid, msgType, virtualIdentityData,
     
    160160            }
    161161            else if (returnValue.update == "takeover") {
    162                     var msgIdentityCloneElem = document.getElementById("msgIdentity_clone");
     162                    var msgIdentityCloneElem = document.getElementById("virtualIdentityExtension_msgIdentityClone");
    163163                    msgIdentityCloneElem.selectedMenuItem = msgIdentityCloneElem.addIdentityToCloneMenu(returnValue.storedIdentity);
    164164                    main.replacement_functions.GenericSendMessageInProgress = false;
     
    233233        gMsgCompose.RegisterStateListener(main.ComposeStateListener);
    234234        document.getElementById("virtualIdentityExtension_tooltipPopupset")
    235             .addTooltip(document.getElementById("msgIdentity_clone"), false);
     235            .addTooltip(document.getElementById("virtualIdentityExtension_msgIdentityClone"), false);
    236236        window.addEventListener('compose-window-reopen', main.reopen, true);
    237237        window.addEventListener('compose-window-close', main.close, true);
    238238       
    239         // append observer to fcc_switch, because it does'n work with real identities (hidden by css)
    240         document.getElementById("fcc_switch").appendChild(document.getElementById("msgIdentity_clone_observer").cloneNode(false));
     239        // append observer to virtualIdentityExtension_fccSwitch, because it does'n work with real identities (hidden by css)
     240        document.getElementById("virtualIdentityExtension_fccSwitch").appendChild(document.getElementById("virtualIdentityExtension_msgIdentityClone_observer").cloneNode(false));
    241241
    242242        main.AccountManagerObserver.register();
     
    249249        Log.debug("initSystemStage1.\n")
    250250        main.gMsgCompose = gMsgCompose;
    251         document.getElementById("msgIdentity_clone").init();
     251        document.getElementById("virtualIdentityExtension_msgIdentityClone").init();
    252252        vI.statusmenu.init();
    253253        Log.debug("initSystemStage1 done.\n")
     
    276276        var parent_hbox = main.elements.Obj_MsgIdentity.parentNode;
    277277        var storage_box = document.getElementById("addresses-box");
    278         var autoReplyToSelfLabel = document.getElementById("autoReplyToSelfLabel");
    279        
    280         storage_box.removeChild(autoReplyToSelfLabel);
    281         parent_hbox.appendChild(autoReplyToSelfLabel);
     278        var virtualIdentityExtension_autoReplyToSelfLabel = document.getElementById("virtualIdentityExtension_autoReplyToSelfLabel");
     279       
     280        storage_box.removeChild(virtualIdentityExtension_autoReplyToSelfLabel);
     281        parent_hbox.appendChild(virtualIdentityExtension_autoReplyToSelfLabel);
    282282        storage_box.removeChild(main.elements.Area_MsgIdentityHbox);
    283283        parent_hbox.appendChild(main.elements.Area_MsgIdentityHbox);
    284284
    285285        main.elements.Obj_MsgIdentity.setAttribute("hidden", "true");
    286         main.elements.Obj_MsgIdentity.previousSibling.setAttribute("control", "msgIdentity_clone");
     286        main.elements.Obj_MsgIdentity.previousSibling.setAttribute("control", "virtualIdentityExtension_msgIdentityClone");
    287287       
    288288        var access_label = parent_hbox.getElementsByAttribute( "control", "msgIdentity" )[0];
    289         if (access_label) access_label.setAttribute("control", "msgIdentity_clone");
     289        if (access_label) access_label.setAttribute("control", "virtualIdentityExtension_msgIdentityClone");
    290290       
    291291        // initialize the pointers to extension elements (initialize those earlier might brake the interface)
     
    306306       
    307307        // clean all elements
    308         document.getElementById("msgIdentity_clone").clean();
     308        document.getElementById("virtualIdentityExtension_msgIdentityClone").clean();
    309309        Log.debug("everything cleaned.\n")
    310310       
     
    376376    prepareAccount : function() {
    377377        main.Cleanup(); // just to be sure that nothing is left (maybe last time sending was irregularily stopped)
    378         vIaccount_createAccount(document.getElementById("msgIdentity_clone").identityData,
     378        vIaccount_createAccount(document.getElementById("virtualIdentityExtension_msgIdentityClone").identityData,
    379379                                 main.accountManager.getIdentity(main.elements.Obj_MsgIdentity.value));
    380380        main.addVirtualIdentityToMsgIdentityMenu();
     
    392392            if (topic == "am-smtpChanges") {
    393393                Log.debug("smtp changes observed\n");
    394                 var msgIdentity_clone = document.getElementById("msgIdentity_clone");
    395                 document.getAnonymousElementByAttribute(msgIdentity_clone, "class", "smtpServerListHbox").refresh();
     394                var virtualIdentityExtension_msgIdentityClone = document.getElementById("virtualIdentityExtension_msgIdentityClone");
     395                document.getAnonymousElementByAttribute(virtualIdentityExtension_msgIdentityClone, "class", "smtpServerListHbox").refresh();
    396396            }
    397397            if (topic == "am-acceptChanges") {
    398398                Log.debug("account changes observed\n");
    399                 document.getElementById("msgIdentity_clone").clean();
    400                 document.getElementById("msgIdentity_clone").init();
     399                document.getElementById("virtualIdentityExtension_msgIdentityClone").clean();
     400                document.getElementById("virtualIdentityExtension_msgIdentityClone").init();
    401401            }
    402402        },
  • content/v_identity.xul

    r238a98 r308706  
    5050
    5151  <stringbundleset id="stringbundleset">
    52     <stringbundle id="vIdentBundle" src="chrome://v_identity/locale/v_identity.properties" />
    53     <stringbundle id="vIStorageExtrasBundle" src="chrome://v_identity/locale/vI_storageExtras.properties" />
     52    <stringbundle id="virtualIdentityExtension_vIdentBundle" src="chrome://v_identity/locale/v_identity.properties" />
     53    <stringbundle id="virtualIdentityExtension_vIStorageExtrasBundle" src="chrome://v_identity/locale/vI_storageExtras.properties" />
    5454  </stringbundleset>
    5555
    5656<vbox id="appcontent" >
    57   <textbox id="vIDebugBox" />
     57  <textbox id="virtualIdentityExtension_vIDebugBox" />
    5858</vbox>
    5959
    6060<toolbox id="headers-box">
    61     <notificationbox id="vINotification" position="1" insertbefore="MsgHeadersToolbar" />
     61    <notificationbox id="virtualIdentityExtension_vINotification" position="1" insertbefore="MsgHeadersToolbar" />
    6262</toolbox>
    6363
    6464<vbox flex="1" id="addresses-box"> <!-- this is used as a strorage, elements will be rearranged by v_identity_init -->
    6565
    66 <label id="autoReplyToSelfLabel" context="vI_autoReplyToSelfMenu" value="&vident.composeDialog.autoReplyToSelf.label;" hidden="true" />
     66<label id="virtualIdentityExtension_autoReplyToSelfLabel" context="virtualIdentityExtension_vIAutoReplyToSelfMenu" value="&vident.composeDialog.autoReplyToSelf.label;" hidden="true" />
    6767   
    68 <hbox id="msgIdentityHbox" flex="1">
    69     <menulist id="msgIdentity_clone" class="identity_clone-menulist" vid="false"
     68<hbox id="virtualIdentityExtension_msgIdentityHbox" flex="1">
     69    <menulist id="virtualIdentityExtension_msgIdentityClone" class="identity_clone-menulist" vid="false"
    7070        label="..." flex="1" oncommand="this.command();">
    71         <menupopup id="msgIdentityPopup_clone"/>
     71        <menupopup id="virtualIdentityExtension_msgIdentityPopupClone"/>
    7272    </menulist>
    73     <checkbox id="fcc_switch" label="&vident.composeDialog.fcc_switch.label;"
     73    <checkbox id="virtualIdentityExtension_fccSwitch" label="&vident.composeDialog.fcc_switch.label;"
    7474        tooltiptext="&vident.composeDialog.fcc_switch.tooltiptext;" hidden="true" doFcc="false"
    7575        oncommand="if (this.doFcc == this.checked) this.checked = !(this.checked); this.doFcc = this.checked;" />
     
    9494  </popupset>
    9595  <popupset>
    96       <menupopup id="vI_autoReplyToSelfMenu">
     96      <menupopup id="virtualIdentityExtension_vIAutoReplyToSelfMenu">
    9797          <menuitem type="menuitem-iconic" label="&vident.composeDialog.autoReplyToSelf.menuLabel;"
    98             oncommand="document.getElementById('autoReplyToSelfLabel').setAttribute('hidden', 'true');"/>
     98            oncommand="document.getElementById('virtualIdentityExtension_autoReplyToSelfLabel').setAttribute('hidden', 'true');"/>
    9999        </menupopup>
    100100  </popupset>
     
    109109
    110110  <statusbar id="status-bar">
    111       <statusbarpanel class="v_identity_logo"
    112               id="v_identity_logo"
     111      <statusbarpanel class="virtualIdentityExtension_Logo"
     112              id="virtualIdentityExtension_Logo"
    113113              insertafter="statusText"
    114114              align="right">
    115115        <label value="&vident.vidLogo.label; &vident.version;" />
    116         <observes id="msgIdentity_clone_observer" element="msgIdentity_clone" attribute="vid" />
     116        <observes id="virtualIdentityExtension_msgIdentityClone_observer" element="virtualIdentityExtension_msgIdentityClone" attribute="vid" />
    117117    </statusbarpanel>
    118       <statusbarpanel id="vI-status-menu" save="off"
     118      <statusbarpanel id="virtualIdentityExtension_vIStatusMenu" save="off"
    119119              class="statusbarpanel-menu-iconic"
    120120              collapsed="true"
  • modules/vI_log.js

    r238a98 r308706  
    9696      .getService(Ci.nsIWindowMediator)
    9797      .getMostRecentWindow(null);
    98     obj_debugBox = window.document.getElementById("vIDebugBox");
     98    obj_debugBox = window.document.getElementById("virtualIdentityExtension_vIDebugBox");
    9999    if (obj_debugBox)
    100100      obj_debugBox.dump(message);
     
    129129      self.currentWindow.clearTimeout(self.timer);
    130130    self.timer = null;
    131     obj_notificationBox = self.currentWindow.document.getElementById("vINotification");
     131    obj_notificationBox = self.currentWindow.document.getElementById("virtualIdentityExtension_vINotification");
    132132    if (obj_notificationBox)
    133133      obj_notificationBox.removeAllNotifications(true);
     
    135135
    136136  addNote: function(note) {
    137     obj_notificationBox = this.currentWindow.document.getElementById("vINotification");
     137    obj_notificationBox = this.currentWindow.document.getElementById("virtualIdentityExtension_vINotification");
    138138    if (!obj_notificationBox)
    139139      return;
     
    164164  // give the box a frame if it is to big
    165165  if (tooBig)
    166     currentWindow.document.getElementById("vINotificationTextbox").setAttribute("class", "plain border")
     166    currentWindow.document.getElementById("virtualIdentityExtension_vINotificationTextbox").setAttribute("class", "plain border")
    167167}
    168168
     
    221221    .getService(Ci.nsIWindowMediator)
    222222    .getMostRecentWindow(null);
    223   let obj_debugBox = currentWindow.document.getElementById("vIDebugBox");
     223  let obj_debugBox = currentWindow.document.getElementById("virtualIdentityExtension_vIDebugBox");
    224224  if (obj_debugBox)
    225225    obj_debugBox.clear();
    226   let obj_notificationBox = currentWindow.document.getElementById("vINotification");
     226  let obj_notificationBox = currentWindow.document.getElementById("virtualIdentityExtension_vINotification");
    227227  if (obj_notificationBox)
    228228    obj_notificationBox.removeAllNotifications(true);
  • skin/v_identity.css

    r238a98 r308706  
    33@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
    44
    5 #fcc_switch[vid="false"] {
     5#virtualIdentityExtension_fccSwitch[vid="false"] {
    66    display: none;
    77}
    88
    9 #msgIdentity_clone .smtpServerListHbox {
     9#virtualIdentityExtension_msgIdentityClone .smtpServerListHbox {
    1010    margin: 0px;
    1111    -moz-appearance: textfield;
     
    233233}
    234234
    235 #vINotificationTitle {
     235#virtualIdentityExtension_vINotificationTitle {
    236236    text-align: right;
    237237    font-weight: bold;
    238238}
    239239
    240 #vINotificationTextbox {
     240#virtualIdentityExtension_vINotificationTextbox {
    241241    background-color: transparent;
    242242    margin: 5px !important;
     
    248248}
    249249
    250 #vINotificationTextbox.border {
     250#virtualIdentityExtension_vINotificationTextbox.border {
    251251      border-style: solid !important;
    252252      border-right-style: none !important;
     
    254254}
    255255
    256 #vI-status-menu[save="off"] {
     256#virtualIdentityExtension_vIStatusMenu[save="off"] {
    257257    list-style-image: url("chrome://v_identity/skin/vI_gr.png");
    258258    visibility: visible;
    259259}
    260260
    261 #vI-status-menu[save="ok"] {
     261#virtualIdentityExtension_vIStatusMenu[save="ok"] {
    262262    list-style-image: url("chrome://v_identity/skin/vI_gn.png");
    263263    visibility: visible;
    264264}
    265265
    266 #vI-status-menu[save="base"] {
     266#virtualIdentityExtension_vIStatusMenu[save="base"] {
    267267    list-style-image: url("chrome://v_identity/skin/vI_ge.png");
    268268    visibility: visible;
    269269}
    270270
    271 #vI-status-menu[save="ok"][smtp="save"] {
     271#virtualIdentityExtension_vIStatusMenu[save="ok"][smtp="save"] {
    272272    list-style-image: url("chrome://v_identity/skin/vI_bl.png");
    273273    visibility: visible;
    274274}
    275275
    276 #vI-status-menu[save="base"][smtp="save"] {
     276#virtualIdentityExtension_vIStatusMenu[save="base"][smtp="save"] {
    277277    list-style-image: url("chrome://v_identity/skin/vI_gebl.png");
    278278    visibility: visible;
     
    304304}
    305305   
    306 .v_identity_logo_button {
     306.virtualIdentityExtension_Logo_button {
    307307    -moz-appearance: toolbarbutton;
    308308    border: medium none ; background-color: transparent;
    309309}
    310310
    311 #vINotification {
     311#virtualIdentityExtension_vINotification {
    312312  -moz-binding: url("chrome://global/content/bindings/notification.xml#notificationbox");
    313313  -moz-box-orient: vertical;
     
    315315}
    316316
    317 #vINotification notification {
     317#virtualIdentityExtension_vINotification notification {
    318318  -moz-binding: url("chrome://v_identity/content/bindings/vI_notificationBox.xml#vI_notification");
    319319}
    320320
    321 #vINotification .messageImage {
     321#virtualIdentityExtension_vINotification .messageImage {
    322322  display: none;
    323323}
    324324
    325 .vINotificationLogo {
     325.virtualIdentityExtension_vINotificationLogo {
    326326    margin: 0 0 0 0.5em;
    327327    padding: 0;
    328328}
    329329
    330 #vIDebugBox {
     330#virtualIdentityExtension_vIDebugBox {
    331331    -moz-binding: url("chrome://v_identity/content/bindings/vI_debugBox.xml#vI_debugBox");
    332332}
    333333
    334 #vIDebugBox, #vIErrorBox{
     334#virtualIdentityExtension_vIDebugBox, #virtualIdentityExtension_vIErrorBox{
    335335    overflow: auto;
    336336    font-size: x-small;
     
    476476}*/
    477477
    478 .virtIdLabel[vid="false"], .v_identity_logo[vid="false"] {
     478.virtIdLabel[vid="false"], .virtualIdentityExtension_Logo[vid="false"] {
    479479    display:    none;
    480480}
     
    509509}
    510510
    511 .vINotificationCloseButton {
     511.virtualIdentityExtension_vINotificationCloseButton {
    512512    display: inline;
    513513    padding: 4px 2px !important;
     
    520520}
    521521
    522 .vINotificationCloseButton:hover {
     522.virtualIdentityExtension_vINotificationCloseButton:hover {
    523523    -moz-image-region: rect(0px, 28px, 14px, 14px);
    524524    opacity: 1.0;
    525525}
    526526
    527 .vINotificationCloseButton:hover:active {
     527.virtualIdentityExtension_vINotificationCloseButton:hover:active {
    528528    -moz-image-region: rect(0px, 42px, 14px, 28px);
    529529    opacity: 1.0;
    530530}
    531531
    532 .vINotificationCloseButton:focus {
     532.virtualIdentityExtension_vINotificationCloseButton:focus {
    533533    outline: none !important;
    534534}
Note: See TracChangeset for help on using the changeset viewer.