Changeset 866fc1

Timestamp:

Jun 16, 2010, 2:14:01 PM (12 years ago)

Author:

rene <rene@…>

Branches:

multiEdit

Parents:

c8e38d

Message:

first attempt, problems with returnValue fo dialog

Location:

chrome

Files:

• content/v_identity/vI_identityData.js (modified) (2 diffs)
• content/v_identity/vI_rdfDataEditor.js (modified) (2 diffs)
• content/v_identity/vI_rdfDataEditor.xul (modified) (2 diffs)
• content/v_identity/vI_rdfDataTree.js (modified) (3 diffs)
• content/v_identity/vI_rdfDataTree.xul (modified) (5 diffs)
• content/v_identity/vI_storageExtras.js (modified) (1 diff)
• locale/en-US/v_identity/vI_rdfDataTree.dtd (modified) (1 diff)

chrome/content/v_identity/vI_identityData.js

@@ -88 +88 @@
 
     // copys all values of an identity. This way we can create a new object with a different document-context
-    copy : function(identityData) {
-        this.email = identityData.email;
-        this.fullName = identityData.fullName;
-        this.id.key = identityData.id.key;
-        this.smtp.key = identityData.smtp.key;
-        this.sideDescription = identityData.sideDescription;
-        this.extras.copy(identityData.extras);
+    // the (optional) keepOldOnEmpty parameter tells if it should keep the old value if there is no new value in parameter
+    copy : function(identityData, keepOldOnEmpty) {
+        if (!keepOldOnEmpty || identityData.email) this.email = identityData.email;
+        if (!keepOldOnEmpty || identityData.fullName) this.fullName = identityData.fullName;
+        if (!keepOldOnEmpty || identityData.id.key) this.id.key = identityData.id.key;
+        if (!keepOldOnEmpty || identityData.smtp.key) this.smtp.key = identityData.smtp.key;
+        if (!keepOldOnEmpty || identityData.sideDescription) this.sideDescription = identityData.sideDescription;
+        this.extras.copy(identityData.extras, keepOldOnEmpty);
     },
 
@@ -236 +237 @@
 };
 
-const DEFAULT_SMTP_TAG = "vI_useDefaultSMTP"
-const NO_SMTP_TAG = "vI_noStoredSMTP"
+const DEFAULT_SMTP_TAG = "vI_useDefaultSMTP";
+const NO_SMTP_TAG = "vI_noStoredSMTP";
 
 function vI_smtpObj(key) {

chrome/content/v_identity/vI_rdfDataEditor.js

@@ -50 +50 @@
         vI_rdfDataEditor.__type = window.arguments[1];
         vI_rdfDataEditor.__rdfDatasource = window.arguments[2];
-        vI_rdfDataEditor.__rdfDataTree = window.arguments[3];
-        ;
+        
         vI_rdfDataEditor.__identityData = new vI_identityData();
         vI_rdfDataEditor.__identityData.copy(window.arguments[0].identityData);
 
-        
+        if (vI_rdfDataEditor.__recipient == "vI_groupModifyTemplate")
+            document.getElementById("recipient_box").setAttribute("hidden", "true")
         // set recipient
         document.getElementById("recipient").value = vI_rdfDataEditor.__recipient;
@@ -107 +107 @@
         localIdentityData.extras.readEditorValues();
 
-        vI_rdfDataEditor.__rdfDatasource.updateRDF(
-                document.getElementById("recipient").value,
-                document.getElementById("type_menu").selectedItem.getAttribute("key"),
-                localIdentityData,
-                true, true, vI_rdfDataEditor.__recipient, vI_rdfDataEditor.__type);
+        if (vI_rdfDataEditor.__recipient != "vI_groupModifyTemplate")
+            vI_rdfDataEditor.__rdfDatasource.updateRDF(
+                    document.getElementById("recipient").value,
+                    document.getElementById("type_menu").selectedItem.getAttribute("key"),
+                    localIdentityData,
+                    true, true, vI_rdfDataEditor.__recipient, vI_rdfDataEditor.__type);
         
-        return document.getElementById("type_menu").selectedItem.getAttribute("key");
+        var returnVar = {
+            treeType: document.getElementById("type_menu").selectedItem.getAttribute("key"),
+            identityData: localIdentityData
+        }
+
+        return returnVar;
     }
 }

chrome/content/v_identity/vI_rdfDataEditor.xul

@@ -33 +33 @@
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
     onload="vI_rdfDataEditor.init();"
-    ondialogaccept="window.arguments[3].treeType = vI_rdfDataEditor.accept();"
+    ondialogaccept="var retVal = vI_rdfDataEditor.accept(); window.arguments[3].treeType = retVal.treeType; window.arguments[3].identityData = retVal.identityData;"
     title="&vI_rdfDataEditor.dlgTitle.label;" >
 
+<script type="application/x-javascript" src="chrome://v_identity/content/vI_identityData.js" />
 <script type="application/x-javascript" src="chrome://v_identity/content/vI_rdfDataEditor.js" />
-<script type="application/x-javascript" src="chrome://v_identity/content/vI_identityData.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_storage.js" />
@@ -53 +53 @@
     <dialogheader title="&vI_rdfDataEditor.header.label;"/>
     <vbox id="vI_rdfDataEditorContent">
-    <hbox>
+    <hbox id="recipient_box">
         <vbox><spacer flex="1"/>
             <label value="&vI_rdfDataEditor.recipient.label;" accesskey="&vI_rdfDataEditor.recipient.accesskey;" control="recipient"/>

chrome/content/v_identity/vI_rdfDataTree.js

@@ -150 +150 @@
     
     onselect : function () {
+        vI_rdfDataTree.groupUpdateConstraints();
         vI_rdfDataTree.moveConstraints();
 
@@ -282 +283 @@
     },
 
+    groupModifySelected : function() {
+        var treeType = vI_rdfDataTree.tabbox.selectedPanel.id;
+        var tree = vI_rdfDataTree.trees[treeType];
+        if (tree.treeElem.view.selection.count < 1) return; // shouldn't happen, button should not be shown if none or one selected
+        
+        // Open Dialog as for new Elem
+        var newItemPreset = { recipientCol : "vI_groupModifyTemplate", identityData : new vI_identityData ("", null, null, NO_SMTP_TAG, null, null) };
+        // XXXX create useful preset
+        var retVar = { treeType: null, identityData: new vI_identityData() };
+
+        window.openDialog("chrome://v_identity/content/vI_rdfDataEditor.xul",0,
+            "chrome, dialog, modal, alwaysRaised, resizable=yes",
+            newItemPreset, treeType,
+            vI_rdfDatasource, retVar).focus();
+
+        var warning = vI_rdfDataTree._strings.getString("vI_rdfDataTree.modify.Warning1") + " " +
+            tree.treeElem.view.selection.count + " " +
+            vI_rdfDataTree._strings.getString("vI_rdfDataTree.modify.Warning2")
+        if (!vI_rdfDataTree.promptService.confirm(window,"Warning",warning)) return;
+
+        var start = new Object(); var end = new Object();
+        var numRanges = tree.treeElem.view.selection.getRangeCount();
+        for (var t=0; t<numRanges; t++){
+            tree.treeElem.view.selection.getRangeAt(t,start,end);
+            for (var v=start.value; v<=end.value; v++) {
+                var localIdentityData = new vI_identityData();
+                vI_notificationBar.dump("## groupModifySelected created new identityData\n");
+                localIdentityData.copy(tree.idTable[v].identityData, false);
+                vI_notificationBar.dump("## groupModifySelected added previous identityData\n");
+                vI_notificationBar.dump("## groupModifySelected const DEFAULT_SMTP_TAG = " + DEFAULT_SMTP_TAG + "\n");
+                // copy all defined settings from retVal.identityData to localIdentityData
+                localIdentityData.copy(retVar.identityData, true);
+                vI_notificationBar.dump("## groupModifySelected overtook new identityData\n");
+                vI_rdfDatasource.updateRDF(
+                    tree.idTable[v]["recipientCol"], treeType,
+                    localIdentityData,
+                    true, true, tree.idTable[v]["recipientCol"], treeType);
+            }
+        }
+
+        // reload all trees (multiple types might have changed)
+        for each (var treeType in vI_rdfDataTree.treeTypes) {
+            vI_rdfDataTree.trees[treeType].idData = null;
+            vI_rdfDataTree.trees[treeType].idTable = null;
+            vI_rdfDataTree.trees[treeType].loadTable()
+        }
+        vI_rdfDataTree.tabbox.selectedTab = document.getElementById(retVar.treeType + "Tab");
+        vI_rdfDataTree.hideInfoBox();
+    },
+
     modifySelected : function() {
         var treeType = vI_rdfDataTree.tabbox.selectedPanel.id;
@@ -340 +391 @@
         vI_rdfDataTree.hideInfoBox();
     },
+
+    groupUpdateConstraints : function() {
+        var treeType = vI_rdfDataTree.tabbox.selectedPanel.id;
+        var tree = vI_rdfDataTree.trees[treeType];
+        if (tree.treeElem.view.selection.count > 1)
+            document.getElementById("groupEditButton_" + treeType).setAttribute("disabled","false");
+        else    document.getElementById("groupEditButton_" + treeType).setAttribute("disabled","true");
+    },
     
     moveConstraints : function() {

chrome/content/v_identity/vI_rdfDataTree.xul

@@ -48 +48 @@
     title="&vI_rdfDataTree.dlgTitle.label;">
 
+<script type="application/x-javascript" src="chrome://v_identity/content/vI_identityData.js" />
 <script type="application/x-javascript" src="chrome://v_identity/content/vI_rdfDataTree.js" />
-<script type="application/x-javascript" src="chrome://v_identity/content/vI_identityData.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" />
@@ -162 +162 @@
                   oncommand="vI_rdfDataTree.removeSelected();"/>
           <spacer flex="1"/>
+          <button id="groupEditButton_email" label="&vI_rdfDataTree.groupEditButton.label;" accesskey="&vI_rdfDataTree.groupEditButton.accesskey;" 
+                  oncommand="vI_rdfDataTree.groupModifySelected();" disabled="true"/>
 </vbox>
 </hbox>
@@ -199 +201 @@
                   oncommand="vI_rdfDataTree.removeSelected();"/>
           <spacer flex="1"/>
+      <button id="groupEditButton_maillist" label="&vI_rdfDataTree.groupEditButton.label;" accesskey="&vI_rdfDataTree.groupEditButton.accesskey;" 
+                  oncommand="vI_rdfDataTree.groupModifySelected();" disabled="true"/>
 </vbox>
 </hbox>
@@ -235 +239 @@
                   oncommand="vI_rdfDataTree.removeSelected();"/>
           <spacer flex="1"/>
+      <button id="groupEditButton_newsgroup" label="&vI_rdfDataTree.groupEditButton.label;" accesskey="&vI_rdfDataTree.groupEditButton.accesskey;" 
+                  oncommand="vI_rdfDataTree.groupModifySelected();" disabled="true"/>
 </vbox>
 </hbox>
@@ -283 +289 @@
                   oncommand="vI_rdfDataTree.moveDownSelected();"/>
           <spacer flex="1"/>
+      <button id="groupEditButton_filter" label="&vI_rdfDataTree.groupEditButton.label;" accesskey="&vI_rdfDataTree.groupEditButton.accesskey;" 
+                  oncommand="vI_rdfDataTree.groupModifySelected();" disabled="true"/>
 </vbox>
 </hbox>

chrome/content/v_identity/vI_storageExtras.js

@@ -116 +116 @@
     
     // 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;
+    // the (optional) keepOldOnEmpty parameter tells if it should keep the old value if there is no new value in parameter
+    copy : function(extras, keepOldOnEmpty) {
+        if (vI_storageExtrasHelper.seamonkey_to_old()) return;
+        for( var i = 0; i < this.extras.length; i++ ) {
+            if (!keepOldOnEmpty || extras.extras[i].value) this.extras[i].value = extras.extras[i].value;
         }
     },

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

@@ -22 +22 @@
 <!ENTITY vI_rdfDataTree.newItem.accesskey "N">
 
+<!ENTITY vI_rdfDataTree.groupEditButton.label "Group Edit">
+<!ENTITY vI_rdfDataTree.groupEditButton.accesskey "G">