From ce74eb117aff40aa6082a04ea87ab2fceaacd1bf Mon Sep 17 00:00:00 2001
From: "sspitzer%netscape.com"
 <sspitzer%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sat, 14 Sep 2002 02:24:14 +0000
Subject: [PATCH] fix for #130385.  (Filter UI:  Action dropdown shows no
 (blank) Priority default selection) fix for #168046.  (Filter UI: default
 dialog size clipped so doesn't show OK/Cancel/Help) fix for #167891.  (filter
 log window, persist size, add border, use <p> instead of <pre> so that the
 log entries will wrap, and we don't force the user to horizontally scroll)
 r/sr=bienvenu

git-svn-id: svn://10.0.0.236/trunk@129591 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../base/search/resources/content/FilterEditor.js  |  6 ++++++
 .../base/search/resources/content/FilterEditor.xul |  2 +-
 .../search/resources/content/FilterListDialog.js   |  1 -
 .../search/resources/content/FilterListDialog.xul  |  2 --
 .../base/search/resources/content/viewLog.xul      | 14 +++++++++++---
 mozilla/mailnews/base/search/src/nsMsgFilter.cpp   |  4 ++--
 mozilla/mailnews/public/MailNewsTypes2.idl         |  4 +++-
 7 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/mozilla/mailnews/base/search/resources/content/FilterEditor.js b/mozilla/mailnews/base/search/resources/content/FilterEditor.js
index 06ddbbef0f5..5e429f2c082 100644
--- a/mozilla/mailnews/base/search/resources/content/FilterEditor.js
+++ b/mozilla/mailnews/base/search/resources/content/FilterEditor.js
@@ -106,6 +106,7 @@ function filterEditorOnLoad()
 
         }
     }
+
     if (!gFilter)
     {
       var stub = gFilterBundle.getString("untitledFilterName");
@@ -119,7 +120,12 @@ function filterEditorOnLoad()
         name = stub + " " + count.toString();
       }
       gFilterNameElement.value = name;
+
+      // initialize priority
+      var defaultValue = String(Components.interfaces.nsMsgPriority.Default);
+      gActionPriority.selectedItem = gActionPriority.getElementsByAttribute("value", defaultValue)[0]
     }
+
     gFilterNameElement.select();
     moveToAlertPosition();
 }
diff --git a/mozilla/mailnews/base/search/resources/content/FilterEditor.xul b/mozilla/mailnews/base/search/resources/content/FilterEditor.xul
index ba3d48d92ff..9b72bf297c4 100644
--- a/mozilla/mailnews/base/search/resources/content/FilterEditor.xul
+++ b/mozilla/mailnews/base/search/resources/content/FilterEditor.xul
@@ -92,7 +92,7 @@ Contributor(s):
             <!-- see MailNewsTypes2.idl -->
             <menuitem value="6" label="&highestPriorityCmd.label;"/>
             <menuitem value="5" label="&highPriorityCmd.label;"/>
-            <menuitem value="4" label="&normalPriorityCmd.label;" selected="true" />
+            <menuitem value="4" label="&normalPriorityCmd.label;"/>
             <menuitem value="3" label="&lowPriorityCmd.label;"/>
             <menuitem value="2" label="&lowestPriorityCmd.label;"/>
           </menupopup>
diff --git a/mozilla/mailnews/base/search/resources/content/FilterListDialog.js b/mozilla/mailnews/base/search/resources/content/FilterListDialog.js
index 2afc3624a40..b650bf3e7b1 100644
--- a/mozilla/mailnews/base/search/resources/content/FilterListDialog.js
+++ b/mozilla/mailnews/base/search/resources/content/FilterListDialog.js
@@ -72,7 +72,6 @@ function onLoad()
     if (firstItem) {
         selectServer(firstItem);
     }
-    
 }
 
 function onOk()
diff --git a/mozilla/mailnews/base/search/resources/content/FilterListDialog.xul b/mozilla/mailnews/base/search/resources/content/FilterListDialog.xul
index 89122416227..1b5aca0aceb 100644
--- a/mozilla/mailnews/base/search/resources/content/FilterListDialog.xul
+++ b/mozilla/mailnews/base/search/resources/content/FilterListDialog.xul
@@ -37,8 +37,6 @@ Contributor(s):  Hkan Waara <hwaara@chello.se>
   ondialogaccept="return onOk();"
   ondialogcancel="return onCancel();"
   ondialoghelp="return doHelpButton();"
-  width="440"
-  height="320"
   persist="width height screenX screenY"
   title="&window.title;">
 
diff --git a/mozilla/mailnews/base/search/resources/content/viewLog.xul b/mozilla/mailnews/base/search/resources/content/viewLog.xul
index 9fd6190b490..a2df028fb81 100644
--- a/mozilla/mailnews/base/search/resources/content/viewLog.xul
+++ b/mozilla/mailnews/base/search/resources/content/viewLog.xul
@@ -24,10 +24,10 @@ Rights Reserved.
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/viewLog.dtd">
 
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+<window id="viewLogWindow"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         onload="onLoad();"
         title="&viewLog.title;"
-        width="440" height="370"
         persist="screenX screenY width height">
 
   <script type="application/x-javascript" src="chrome://messenger/content/viewLog.js"/>
@@ -39,6 +39,14 @@ Rights Reserved.
       <spacer flex="1"/>
       <button label="&clearLog.label;" accesskey="&clearLog.accesskey;" oncommand="clearLog()"/>
     </hbox>
-    <browser id="logView" disablehistory="true" disablesecurity="true" src="about:blank" flex="1"/>
+    <vbox flex="1">
+      <spacer height="10px"/>
+      <hbox flex="1">
+        <spacer width="10px"/>
+        <browser id="logView" disablehistory="true" disablesecurity="true" src="about:blank" flex="1"/>
+        <spacer width="10px"/>
+      </hbox>
+      <spacer height="10px"/>
+    </vbox>
   </vbox>
 </window>
diff --git a/mozilla/mailnews/base/search/src/nsMsgFilter.cpp b/mozilla/mailnews/base/search/src/nsMsgFilter.cpp
index 83ef7ace35a..b4b80806c3e 100644
--- a/mozilla/mailnews/base/search/src/nsMsgFilter.cpp
+++ b/mozilla/mailnews/base/search/src/nsMsgFilter.cpp
@@ -263,9 +263,9 @@ nsMsgFilter::GetActionTargetFolderUri(char** aResult)
     return NS_OK;
 }
 
-#define LOG_ENTRY_START_TAG "<pre>\n"
+#define LOG_ENTRY_START_TAG "<p>\n"
 #define LOG_ENTRY_START_TAG_LEN (strlen(LOG_ENTRY_START_TAG))
-#define LOG_ENTRY_END_TAG "</pre>\n"
+#define LOG_ENTRY_END_TAG "</p>\n"
 #define LOG_ENTRY_END_TAG_LEN (strlen(LOG_ENTRY_END_TAG))
 
 NS_IMETHODIMP nsMsgFilter::LogRuleHit(nsIMsgDBHdr *aMsgHdr)
diff --git a/mozilla/mailnews/public/MailNewsTypes2.idl b/mozilla/mailnews/public/MailNewsTypes2.idl
index a27723f59a2..e2394d59aed 100644
--- a/mozilla/mailnews/public/MailNewsTypes2.idl
+++ b/mozilla/mailnews/public/MailNewsTypes2.idl
@@ -42,7 +42,7 @@ typedef long nsMsgSearchScopeValue;
 
 typedef long nsMsgPriorityValue;
 
-[uuid(94C0D8D8-2045-11d3-8A8F-0060B0FC04D2)]
+[scriptable, uuid(94C0D8D8-2045-11d3-8A8F-0060B0FC04D2)]
 interface nsMsgPriority {
     const nsMsgPriorityValue notSet = 0;
     const nsMsgPriorityValue none = 1;
@@ -51,6 +51,8 @@ interface nsMsgPriority {
     const nsMsgPriorityValue normal = 4;
     const nsMsgPriorityValue high = 5;
     const nsMsgPriorityValue highest = 6;
+    // the default for a priority picker
+    const nsMsgPriorityValue Default = 4;
 };
 
 typedef unsigned long nsMsgLabelValue;