Changeset 1bc37c

Timestamp:

Nov 23, 2011, 9:58:27 AM (11 years ago)

Author:

rene <rene@…>

Branches:

ng_0.9

Children:

c9f1d7

Parents:

855e5e

Message:

added replyToSelf as module

Files:

• content/vI_msgIdentityCloneTools.js (deleted)
• content/v_identity.js (modified) (4 diffs)
• content/v_identity.xul (modified) (3 diffs)
• modules/vI_replyToSelf.js (added)

content/v_identity.js

@@ -29 +29 @@
 Components.utils.import("resource://v_identity/vI_account.js", virtualIdentityExtension);
 Components.utils.import("resource://v_identity/vI_prefs.js", virtualIdentityExtension);
+Components.utils.import("resource://v_identity/vI_replyToSelf.js", virtualIdentityExtension);
+Components.utils.import("resource://v_identity/plugins/signatureSwitch.js", virtualIdentityExtension);
 
 var main = {
@@ -139 +141 @@
             Log.debug("\nVIdentity_GenericSendMessage\n");
             
-            if (msgType == Components.interfaces.nsIMsgCompDeliverMode.Now) { vI.msgIdentityCloneTools.addReplyToSelf(); }
+            if (msgType == Components.interfaces.nsIMsgCompDeliverMode.Now)
+              vI.addReplyToSelf();
 
             var vid = document.getElementById("virtualIdentityExtension_msgIdentityClone").vid
@@ -249 +252 @@
     initSystemStage2 : function() {
         Log.debug("initSystemStage2.\n")
-        vI.msgIdentityCloneTools.initReplyTo();
+        vI.initReplyTo();
         vI.storage.init();
         vI.smartIdentity.init();
@@ -269 +272 @@
         var parent_hbox = main.elements.Obj_MsgIdentity.parentNode;
         var storage_box = document.getElementById("addresses-box");
-        var virtualIdentityExtension_autoReplyToSelfLabel = document.getElementById("virtualIdentityExtension_autoReplyToSelfLabel");
+        var virtualIdentityExtension_autoReplyToSelfLabel = document.getElementById("virtualIdentityExtension_autoReplyToSelfLabelBox");
         
         storage_box.removeChild(virtualIdentityExtension_autoReplyToSelfLabel);

content/v_identity.xul

@@ -18 +18 @@
 
    - The Initial Developer of the Original Code is Rene Ejury.
-   - Portions created by the Initial Developer are Copyright (C) 2007
+   - Portions created by the Initial Developer are Copyright (C) 2011
    - the Initial Developer. All Rights Reserved.
 
@@ -34 +34 @@
 ]>
 
-  <overlay id="v_identity" 
+<overlay id="virtualIdentityExtension_MsgComposeOverlay" 
           xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 <script type="application/x-javascript" src="chrome://v_identity/content/v_identity.js" />
-<script type="application/x-javascript" src="chrome://v_identity/content/vI_msgIdentityCloneTools.js" />
 <script type="application/x-javascript" src="chrome://v_identity/content/vI_smartIdentity.js" />
 <script type="application/x-javascript" src="chrome://v_identity/content/vI_statusmenu.js" />
@@ -57 +56 @@
 <vbox flex="1" id="addresses-box"> <!-- this is used as a strorage, elements will be rearranged by v_identity_init -->
 
-<label id="virtualIdentityExtension_autoReplyToSelfLabel" context="virtualIdentityExtension_vIAutoReplyToSelfMenu" value="&vident.composeDialog.autoReplyToSelf.label;" hidden="true" />
-    
+<vbox id="virtualIdentityExtension_autoReplyToSelfLabelBox">
+  <spacer flex="1"/>
+  <label id="virtualIdentityExtension_autoReplyToSelfLabel" context="virtualIdentityExtension_vIAutoReplyToSelfMenu" value="&vident.composeDialog.autoReplyToSelf.label;" hidden="true" />
+  <spacer flex="1"/>
+</vbox>
 <hbox id="virtualIdentityExtension_msgIdentityHbox" flex="1">
     <menulist id="virtualIdentityExtension_msgIdentityClone" class="identity_clone-menulist" vid="false"