Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 14:22:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix for #130385. (Filter UI: Action dropdown shows no (blank) Priority default selection)

Browse Source 
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
This commit is contained in:
sspitzer%netscape.com 2002-09-14 02:24:14 +00:00
parent fd2a2e2e91
commit 5158695220
7 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mailnews/base/search/resources/content/FilterEditor.js
View File

@ -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();
}

2
mailnews/base/search/resources/content/FilterEditor.xul
View File

@ -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>

1
mailnews/base/search/resources/content/FilterListDialog.js
View File

@ -72,7 +72,6 @@ function onLoad()
if (firstItem) {
selectServer(firstItem);
}
}
function onOk()

2
mailnews/base/search/resources/content/FilterListDialog.xul
View File

@ -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;">

14
mailnews/base/search/resources/content/viewLog.xul
View File

@ -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>

4
mailnews/base/search/src/nsMsgFilter.cpp
View File

@ -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)

4
mailnews/public/MailNewsTypes2.idl
View File

@ -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;