From 72bcd7bb86467fda9ad916bb9fef55e4fce61add Mon Sep 17 00:00:00 2001
From: "sspitzer%netscape.com"
 <sspitzer%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 3 May 2000 19:32:35 +0000
Subject: [PATCH] more changes

git-svn-id: svn://10.0.0.236/trunk@68093 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../modern/communicator/sidebar/customize.css |  6 +-
 mozilla/themes/modern/messenger/MANIFEST      |  1 +
 mozilla/themes/modern/messenger/Makefile.in   |  1 +
 .../themes/modern/messenger/importDialog.css  | 24 ++++++
 .../themes/modern/messenger/mailWidgets.xml   | 84 +++++++++++++++++--
 mozilla/themes/modern/messenger/makefile.win  |  1 +
 mozilla/themes/modern/messenger/messenger.css |  4 +
 mozilla/themes/modern/navigator/navigator.css |  2 +-
 8 files changed, 109 insertions(+), 14 deletions(-)
 create mode 100644 mozilla/themes/modern/messenger/importDialog.css

diff --git a/mozilla/themes/modern/communicator/sidebar/customize.css b/mozilla/themes/modern/communicator/sidebar/customize.css
index 8d5ba3226ef..38b064e1166 100644
--- a/mozilla/themes/modern/communicator/sidebar/customize.css
+++ b/mozilla/themes/modern/communicator/sidebar/customize.css
@@ -70,14 +70,10 @@ treeitem[selected="true"][container="true"][open="true"] > treerow > .treecell-p
  list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-folder-open-sel.gif");
 }
 
-box#header {
+#header {
   list-style-image: url("chrome://communicator/skin/sidebar/sidebar-icon.gif");
 }
 
-box#header > toolbar > .circle {
-  padding-top: 2px;
-}
-
 box#reorder {
   text-align: center;
 }
diff --git a/mozilla/themes/modern/messenger/MANIFEST b/mozilla/themes/modern/messenger/MANIFEST
index 1ea8c8cd32d..ffb3c07d1c0 100644
--- a/mozilla/themes/modern/messenger/MANIFEST
+++ b/mozilla/themes/modern/messenger/MANIFEST
@@ -95,3 +95,4 @@ winclassic.gif
 wink.gif
 winwide.gif
 wizard.css
+importDialog.css
diff --git a/mozilla/themes/modern/messenger/Makefile.in b/mozilla/themes/modern/messenger/Makefile.in
index 6d625330839..ce5dda2a082 100644
--- a/mozilla/themes/modern/messenger/Makefile.in
+++ b/mozilla/themes/modern/messenger/Makefile.in
@@ -128,6 +128,7 @@ EXPORT_RESOURCE_SAMPLES = \
 	wink.gif \
 	winwide.gif \
 	wizard.css \
+	importDialog.css \
 	$(NULL)
 
 DIRS = addressbook messengercompose
diff --git a/mozilla/themes/modern/messenger/importDialog.css b/mozilla/themes/modern/messenger/importDialog.css
new file mode 100644
index 00000000000..638e3d44ea9
--- /dev/null
+++ b/mozilla/themes/modern/messenger/importDialog.css
@@ -0,0 +1,24 @@
+/* 
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *  
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *  
+ * The Original Code is Mozilla Communicator client code, released
+ * March 31, 1998.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation. Portions created by Netscape are
+ * Copyright (C) 1998-1999 Netscape Communications Corporation. All
+ * Rights Reserved.
+ * 
+ * Contributor(s): 
+ *   
+ */
+
+
diff --git a/mozilla/themes/modern/messenger/mailWidgets.xml b/mozilla/themes/modern/messenger/mailWidgets.xml
index f7f147202ba..d91f00f1dc0 100644
--- a/mozilla/themes/modern/messenger/mailWidgets.xml
+++ b/mozilla/themes/modern/messenger/mailWidgets.xml
@@ -26,11 +26,9 @@
             var targets = this.targets;
             if (targets) {
               for (var i=0; i< targets.length; i++) {
-                dump("searchScopeSet: targets[" + i + "] = " + targets[i] + "\n")
                 targets[i].searchScope = val;
               }
             }
-            dump("done\n");
           ]]>
         </setter>
         <getter>
@@ -67,16 +65,25 @@
             for (var i=0; i<targetIds.length;i++) {
               var target = document.getElementById(targetIds[i]);
               if (target) targets[j++] = target;
-              if (!target) dump("Bad target " + i + ": " + targetIds[i] + "\n");
             }
             return targets;
           ]]>
         </getter>
       </property>
+
+      <!-- value forwards to the internal menulist's "data" attribute -->
+      <property name="value" onget="return this.anonymousContent[0].selectedItem.data">
+        <setter>
+          <![CDATA[
+            var menulist = this.anonymousContent[0];
+            var dataItems = menulist.getElementsByAttribute("data", val);
+            menulist.selectedItem = dataItems[0];
+          ]]>
+        </setter>
+      </property>
       <method name="refreshList">
         <body>
           <![CDATA[
-            dump("refreshing <" + this.tagName + ">\n");
             var menuItemIds = this.valueIds;
             var menuItemStrings = this.valueStrings;
 
@@ -113,15 +120,12 @@
         <argument name="event"/>
         <body>
           <![CDATA[
-            dump("onSelect!\n");
             var menulist = this.anonymousContent[0];
 
             // notify targets
             var targets = this.targets;
             if (targets) {
-              dump("There are " + targets.length + " targets\n");
               for (var i=0; i< targets.length; i++) {
-                dump("onSelect: targets[" + i + "] = " + targets[i] + "\n");
                 targets[i].parentValue = menulist.data;
               }
             }
@@ -221,7 +225,7 @@
             // we inherit from a deck, so just use it's index attribute
             // to hide/show widgets
             if (val == Components.interfaces.nsMsgSearchAttrib.Priority)
-              this.setAttribute("index", "2");
+              this.setAttribute("index", "1");
             else if (val == Components.interfaces.nsMsgSearchAttrib.MsgStatus)
               this.setAttribute("index", "2");
             else
@@ -229,6 +233,70 @@
           ]]>
         </setter>
       </property>
+      <property name="value">
+        <setter>
+          <![CDATA[
+          this.internalValue = val;
+          var type = val.attrib;
+          if (type == Components.interfaces.nsMsgSearchAttrib.Priority)
+            this.anonymousContent[1].data=val.priority;
+          else if (type == Components.interfaces.nsMsgSearchAttrib.MsgStatus)
+            this.anonymousContent[2].data=val.status;
+          else
+            this.anonymousContent[0].value = val.str;
+          ]]>
+        </setter>
+        <getter>
+          <![CDATA[
+          return this.internalValue;
+          ]]>
+        </getter>
+      </property>
+    </interface>
+  </binding>
+  <binding id="searchterm">
+    <interface>
+      <!-- the three tags that make up a term - to use, set the
+           attribute in the XUL to the ID of the term.
+        -->
+      <property name="searchattribute" readonly="true" onget="return document.getElementById(this.getAttribute('searchattribute'));"/>
+
+      <property name="searchoperator" readonly="true" onget="return document.getElementById(this.getAttribute('searchoperator'));"/>
+
+      <property name="searchvalue" readonly="true" onget="return document.getElementById(this.getAttribute('searchvalue'));"/>
+
+      <!-- takes an nsIMsgSearchValue and initializes the appropriate widget
+           with the right value
+        -->
+      <!-- right now only handles filters - need to abstract termlist -->
+      <method name="initialize">
+        <argument name="filter"/>
+        <argument name="termIndex"/>
+        <body>
+          <![CDATA[
+            var attrib = new Object;
+            var op = new Object;
+            var value = new Object;
+            var booland = new Object;
+            var header = new Object;
+            filter.GetTerm(termIndex, attrib, op, value, booland, header);
+
+            var searchAttribute=this.searchattribute;
+            var searchOperator=this.searchoperator;
+            var searchValue=this.searchvalue;
+
+            dump("searchAttribute=" + searchAttribute + "\n");
+            dump("searchOperator=" + searchOperator + "\n");
+            dump("searchValue=" + searchValue + "\n");
+
+            dump("Setting " + attrib.value + ", " +
+                 op.value + ", " + value.value + "\n");
+            if (searchAttribute) searchAttribute.value = attrib.value;
+            if (searchOperator) searchOperator.value = op.value;
+            if (searchValue) searchValue.value = value.value;
+          ]]>
+        </body>
+      </method>
     </interface>
   </binding>
 </bindings>
diff --git a/mozilla/themes/modern/messenger/makefile.win b/mozilla/themes/modern/messenger/makefile.win
index 9703f20e85d..9b7cd195d65 100644
--- a/mozilla/themes/modern/messenger/makefile.win
+++ b/mozilla/themes/modern/messenger/makefile.win
@@ -128,3 +128,4 @@ install::
 	$(MAKE_INSTALL) wink.gif $(DIST)\bin\chrome\$(THEME)\messenger\skin
 	$(MAKE_INSTALL) winwide.gif $(DIST)\bin\chrome\$(THEME)\messenger\skin
 	$(MAKE_INSTALL) wizard.css $(DIST)\bin\chrome\$(THEME)\messenger\skin
+	$(MAKE_INSTALL) importDialog.css $(DIST)\bin\chrome\$(THEME)\messenger\skin
diff --git a/mozilla/themes/modern/messenger/messenger.css b/mozilla/themes/modern/messenger/messenger.css
index 2be3a134c0c..e3ed04c4f08 100644
--- a/mozilla/themes/modern/messenger/messenger.css
+++ b/mozilla/themes/modern/messenger/messenger.css
@@ -313,3 +313,7 @@ searchoperator {
 searchvalue {
  behavior: url(chrome://messenger/skin/mailWidgets.xml#searchvalue);
 }
+
+searchterm {
+ behavior: url(chrome://messenger/skin/mailWidgets.xml#searchterm);
+}
\ No newline at end of file
diff --git a/mozilla/themes/modern/navigator/navigator.css b/mozilla/themes/modern/navigator/navigator.css
index 9ea85196bb9..e453655f8b4 100644
--- a/mozilla/themes/modern/navigator/navigator.css
+++ b/mozilla/themes/modern/navigator/navigator.css
@@ -67,7 +67,7 @@ window[chromehidden~="extrachrome"] .chromeclass-extrachrome {
 	  list-style-image      : url("chrome://communicator/skin/bookmarks/bookmark-item.gif"); 
   } 
 
-#sessionhist-popup 
+#ubhist-keyword-popup 
   {
 	  margin                : 0px 4px 0px 0px;
 	  width                 : 10px;