mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

polish changes to the account manager, filter and search dialogs. r=alecf

This commit is contained in:
ben%netscape.com 2000-08-12 06:33:18 +00:00
Родитель 8da2baf3ca
Коммит 9e4e18669b
21 изменённых файлов: 383 добавлений и 319 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

5
mailnews/base/prefs/resources/content/AccountManager.xul
Просмотреть файл

@ -20,7 +20,7 @@
<keyset id="keyset"/> <keyset id="keyset"/>
<box orient="horizontal" flex="1" style="padding: 5px"> <box flex="1">
<box orient="vertical" flex="1"> <box orient="vertical" flex="1">
<tree rdf:datasources="rdf:msgaccountmanager" style="width:0px" flex="1" <tree rdf:datasources="rdf:msgaccountmanager" style="width:0px" flex="1"
rdf:containment="http://home.netscape.com/NC-rdf#Settings" rdf:containment="http://home.netscape.com/NC-rdf#Settings"
@ -60,6 +60,5 @@
<spring style="width: 5px"/> <spring style="width: 5px"/>
<iframe name="contentFrame" flex="6" style="width: 0px"/> <iframe name="contentFrame" flex="6" style="width: 0px"/>
</box> </box>
<separator class="groove"/> <box id="okCancelButtonsRight"/>
<box id="okCancelButtons"/>
</window> </window>

4
mailnews/base/prefs/resources/content/SmtpServerEdit.xul
Просмотреть файл

@ -41,7 +41,7 @@
<script language="javascript" src="SmtpServerEdit.js"/> <script language="javascript" src="SmtpServerEdit.js"/>
<keyset id="keyset"/> <keyset id="keyset"/>
<box id="smtpServerEditor"/> <box id="smtpServerEditor"/>
<separator class="groove"/> <separator/>
<box id="okCancelButtons"/> <box id="okCancelButtonsRight"/>
</window> </window>

24
mailnews/base/prefs/resources/content/SmtpServerList.xul
Просмотреть файл

@ -33,9 +33,9 @@
title="&smtpListTitle.label;" title="&smtpListTitle.label;"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
align="vertical" orient="vertical"
onload="onLoad();" onload="onLoad();"
width="30em" style="width: 30em;"
> >
<script language="javascript" src="chrome://global/content/strres.js"/> <script language="javascript" src="chrome://global/content/strres.js"/>
@ -43,17 +43,18 @@
<keyset id="keyset"/> <keyset id="keyset"/>
<box align="horizontal"> <html flex="1">&smtpListDesc.label;</html>
<html flex="1">&smtpListDesc.label;</html>
</box> <separator class="thin"/>
<box align="horizontal" style="min-height: 10em; min-width: 30em">
<tree id="smtpTree" onselect="onSelectionChange(event);" class="inset" flex="1" style="height: 30px"> <box>
<tree id="smtpTree" onselect="onSelectionChange(event);" class="inset" flex="1" style="height: 0px;">
<treecolgroup> <treecolgroup>
<treecol flex="1"/> <treecol flex="1"/>
</treecolgroup> </treecolgroup>
<treechildren id="smtpTreeChildren" flex="1"/> <treechildren id="smtpTreeChildren" flex="1"/>
</tree> </tree>
<box align="vertical"> <box orient="vertical">
<button id="addButton" <button id="addButton"
oncommand="onAdd(event);" value="&smtpListAdd.label;"/> oncommand="onAdd(event);" value="&smtpListAdd.label;"/>
<button id="editButton" disabled="true" <button id="editButton" disabled="true"
@ -64,6 +65,9 @@
oncommand="onSetDefault(event);" value="&smtpListSetDefault.label;"/> oncommand="onSetDefault(event);" value="&smtpListSetDefault.label;"/>
</box> </box>
</box> </box>
<separator class="groove"/>
<box id="okCancelButtons" /> <separator/>
<box id="okCancelButtonsRight" />
</window> </window>

6
mailnews/base/prefs/resources/content/am-copies.xul
Просмотреть файл

@ -8,7 +8,7 @@
<!DOCTYPE window SYSTEM "chrome://messenger/locale/am-copies.dtd" > <!DOCTYPE window SYSTEM "chrome://messenger/locale/am-copies.dtd" >
<window xmlns:html="http://www.w3.org/1999/xhtml" <window xmlns:html="http://www.w3.org/1999/xhtml"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
class="dialog" class="color-dialog"
onload="parent.onPanelLoaded('am-copies.xul');" onload="parent.onPanelLoaded('am-copies.xul');"
align="vertical"> align="vertical">
@ -23,7 +23,7 @@
<box class="box-smallheader" title="&copyAndFolderTitle.label;"/> <box class="box-smallheader" title="&copyAndFolderTitle.label;"/>
<titledbox orient="vertical"> <titledbox orient="vertical">
<title><text class="header label" value="&sendingPrefix.label;"/></title> <title value="&sendingPrefix.label;"/>
<box> <box>
<checkbox wsm_persist="true" id="identity.doFcc" <checkbox wsm_persist="true" id="identity.doFcc"
@ -45,7 +45,7 @@
</titledbox> </titledbox>
<titledbox orient="vertical"> <titledbox orient="vertical">
<title><text class="header label" value="&specialFolderTitle.label;"/></title> <title value="&specialFolderTitle.label;"/>
<grid> <grid>
<columns> <columns>
<column flex="1"/> <column flex="1"/>

5
mailnews/base/prefs/resources/content/am-identity-advanced.xul
Просмотреть файл

@ -61,7 +61,8 @@
</menulist> </menulist>
</box> </box>
<separator class="groove"/> <separator/>
<box id="okCancelButtons"/>
<box id="okCancelButtonsRight"/>
</window> </window>

128
mailnews/base/prefs/resources/content/am-main.xul
Просмотреть файл

@ -7,90 +7,74 @@
<window xmlns:html="http://www.w3.org/1999/xhtml" <window xmlns:html="http://www.w3.org/1999/xhtml"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
flex="100%" flex="1" class="color-dialog"
class="dialog"
onload="parent.onPanelLoaded('am-main.xul');" onload="parent.onPanelLoaded('am-main.xul');"
align="vertical"> orient="vertical">
<script src="chrome://global/content/strres.js"/> <script src="chrome://global/content/strres.js"/>
<script src="chrome://communicator/content/pref/prefutilities.js"/> <script src="chrome://communicator/content/pref/prefutilities.js"/>
<script src="chrome://messenger/content/am-main.js"/> <script src="chrome://messenger/content/am-main.js"/>
<box class="box-smallheader" title="&accountTitle.label;"/> <box class="box-smallheader" title="&accountTitle.label;"/>
<html class="secDesc">&accountSettingsDesc.label;</html>
<box autostretch="never">
<text class="label" value="&accountName.label;" for="server.prettyName"/>
<textfield wsm_persist="true" type="text" size="30" id="server.prettyName" flex="1"/>
</box>
<separator class="thin"/>
<titledbox orient="vertical" flex="1">
<title value="&identityTitle.label;"/>
<html class="secDesc">&identityDesc.label;</html>
<separator class="thin"/>
<grid flex="1">
<columns>
<column/>
<column flex="1"/>
</columns>
<rows>
<row>
<text class="label" value="&name.label;" for="identity.fullName"/>
<textfield wsm_persist="true" id="identity.fullName" size="30"/>
</row>
<row>
<text class="label" value="&email.label;" for="identity.email"/>
<textfield wsm_persist="true" id="identity.email" />
</row>
<row>
<text class="label" value="&replyTo.label;" for="identity.replyTo"/>
<textfield wsm_persist="true" id="identity.replyTo"/>
</row>
<row>
<text class="label" value="&organization.label;" for="identity.organization"/>
<textfield wsm_persist="true" id="identity.organization"/>
</row>
</rows>
</grid>
<html class="secDesc">&accountSettingsDesc.label;</html>
<html>&accountNameDesc.label;</html>
<grid width="100%">
<columns>
<column flex="1"/>
<column flex="2"/>
</columns>
<rows>
<row autostretch="never">
<text class="label" value="&accountName.label;" for="server.prettyName"/>
<textfield wsm_persist="true" type="text" size="30" id="server.prettyName" flex="100%"/>
</row>
</rows>
</grid>
<spring class="spacer"/>
<titledbox orient="vertical">
<title><text class="header label" value="&identityTitle.label;"/></title>
<html class="secDesc">&identityDesc.label;</html>
<grid width="100%">
<columns>
<column flex="2"/>
<column flex="3"/>
</columns>
<rows>
<row autostretch="never">
<text class="label" value="&name.label;" for="identity.fullName"/>
<textfield wsm_persist="true" id="identity.fullName" size="30"/>
</row>
<row autostretch="never">
<text class="label" value="&email.label;" for="identity.email"/>
<textfield wsm_persist="true" id="identity.email" />
</row>
<row autostretch="never">
<text class="label" value="&replyTo.label;" for="identity.replyTo"/>
<textfield wsm_persist="true" id="identity.replyTo"/>
</row>
<row autostretch="never">
<text class="label" value="&organization.label;" for="identity.organization"/>
<textfield wsm_persist="true" id="identity.organization"/>
</row>
</rows>
</grid>
</titledbox>
<!-- no vcard in PR1
<row class="checkboxrow">
<html:td colspan="2">
<checkbox wsm_persist="true" id="identity.attachVCard" type="checkbox" value="&attachVCard.label;"/>
<button value="&editVCard.label;"/>
</html:td>
</row>
-->
<box orient="horizontal" autostretch="never"> <box orient="horizontal" autostretch="never">
<checkbox wsm_persist="true" id="identity.attachSignature" value="&signature.label;" flex="1"/> <checkbox wsm_persist="true" id="identity.attachSignature" value="&signature.label;" flex="1"/>
</box>
<box autostretch="never">
<textfield wsm_persist="true" id="identity.signature" datatype="nsIFileSpec" flex="1" name="identity.signature"/> <textfield wsm_persist="true" id="identity.signature" datatype="nsIFileSpec" flex="1" name="identity.signature"/>
<button class="dialog push" name="browse" type="button" value="&choose.label;" onclick="prefNavSelectFile('identity.signature', 'choosefile', true)"/> <button class="dialog push" name="browse" type="button" value="&choose.label;"
oncommand="prefNavSelectFile('identity.signature', 'choosefile', true)"/>
</box> </box>
<!-- <box autostretch="never">
<html:select wsm_persist="true" flex="100%"> <checkbox wsm_persist="true" id="identity.composeHtml" value="&useHtml.label;"/>
<html:option value="sig1">&sampleSig1.label;</html:option> </box>
<html:option value="sig2">&sampleSig2.label;</html:option>
<html:option value="sig3">&sampleSig3.label;</html:option>
</html:select>
<button value="&edit.label;"/>
-->
<checkbox wsm_persist="true" id="identity.composeHtml"
value="&useHtml.label;"/>
<box orient="horizontal">
<spring flex="1"/> <spring flex="1"/>
<button onclick="onAdvanced();" value="&advancedButton.label;"/>
<text hidden="true" wsm_persist="true" id="identity.smtpServerKey"/> <box>
</box> <spring flex="1"/>
<button onclick="onAdvanced();" value="&advancedButton.label;"/>
<text hidden="true" wsm_persist="true" id="identity.smtpServerKey"/>
</box>
</titledbox>
</window> </window>

15
mailnews/base/prefs/resources/content/am-server.xul
Просмотреть файл

@ -6,7 +6,7 @@
<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
xmlns:html="http://www.w3.org/1999/xhtml" xmlns:html="http://www.w3.org/1999/xhtml"
class="dialog" class="color-dialog"
onload="parent.onPanelLoaded('am-server.xul');" onload="parent.onPanelLoaded('am-server.xul');"
orient="vertical"> orient="vertical">
@ -44,9 +44,10 @@
</rows> </rows>
</grid> </grid>
<spring class="spacer"/> <spring class="spacer"/>
<titledbox> <titledbox>
<title><text class="header label" value="&serverSettings.label;"/></title> <title value="&serverSettings.label;"/>
<box id="serverPrefContainer" orient="vertical"> <box id="serverPrefContainer" orient="vertical" flex="1">
<checkbox wsm_persist="true" id="server.isSecure" value="&isSecure.label;" hidefor="pop3"/> <checkbox wsm_persist="true" id="server.isSecure" value="&isSecure.label;" hidefor="pop3"/>
<!-- <!--
@ -89,11 +90,11 @@
<checkbox wsm_persist="true" id="server.emptyTrashOnExit" iscontrolcontainer="true" <checkbox wsm_persist="true" id="server.emptyTrashOnExit" iscontrolcontainer="true"
value="&emptyTrashOnExit.label;" hidefor="nntp"/> value="&emptyTrashOnExit.label;" hidefor="nntp"/>
<box iscontrolcontainer="true"> <box iscontrolcontainer="true" flex="1">
<box orient="horizontal"> <box flex="1">
<spring flex="100%"/> <spring flex="1"/>
<button value="&advancedButton.label;" <button value="&advancedButton.label;"
onclick="openImapAdvanced(event);"/> oncommand="openImapAdvanced(event);"/>
</box> </box>
<checkbox hidden="true" wsm_persist="true" id="imap.dualUseFolders"/> <checkbox hidden="true" wsm_persist="true" id="imap.dualUseFolders"/>

2
mailnews/base/prefs/resources/content/am-serverwithnoidentities.xul
Просмотреть файл

@ -7,7 +7,7 @@
<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
xmlns:html="http://www.w3.org/1999/xhtml" xmlns:html="http://www.w3.org/1999/xhtml"
class="dialog" class="color-dialog"
onload="parent.onPanelLoaded('am-serverwithnoidentities.xul');" onload="parent.onPanelLoaded('am-serverwithnoidentities.xul');"
align="vertical"> align="vertical">

19
mailnews/base/prefs/resources/content/am-smtp.xul
Просмотреть файл

@ -9,20 +9,29 @@
<window xmlns:html="http://www.w3.org/1999/xhtml" <window xmlns:html="http://www.w3.org/1999/xhtml"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
flex="100%" flex="100%"
class="dialog" class="color-dialog"
onload="onLoad();" onload="onLoad();"
align="vertical"> orient="vertical">
<script language="javascript" src="am-smtp.js"/> <script language="javascript" src="am-smtp.js"/>
<box class="box-smallheader" title="&smtpServer.label;"/> <box class="box-smallheader" title="&smtpServer.label;"/>
<titledbox orient="vertical">
<html>&smtpDesc.label;</html> <html>&smtpDesc.label;</html>
<separator/>
<box id="smtpServerEditor"/> <box id="smtpServerEditor"/>
<box align="horizontal"> <separator/>
<spring flex="100%"/>
<box>
<spring flex="1"/>
<button value="&advanced.label;" oncommand="onAdvanced(event);"/> <button value="&advanced.label;" oncommand="onAdvanced(event);"/>
</box> </box>
</titledbox>
</window> </window>

6
mailnews/base/prefs/resources/content/pref-mailnews.xul
Просмотреть файл

@ -17,9 +17,9 @@
"mailnewsStartPageEnabled", "mailnewsStartPageUrl"]; "mailnewsStartPageEnabled", "mailnewsStartPageUrl"];
]]> ]]>
</script> </script>
<script language="javascript" src="chrome://global/content/strres.js"></script> <script language="javascript" src="chrome://global/content/strres.js"/>
<script language="javascript" src="chrome://communicator/content/pref/prefutilities.js"></script> <script language="javascript" src="chrome://communicator/content/pref/prefutilities.js"/>
<script language="javascript" src="chrome://messenger/content/pref-mailnews.js"></script> <script language="javascript" src="chrome://messenger/content/pref-mailnews.js"/>
<box class="box-smallheader" title="&pane.title;"/> <box class="box-smallheader" title="&pane.title;"/>

4
mailnews/base/prefs/resources/content/pref-viewing_messages.xul
Просмотреть файл

@ -52,8 +52,8 @@
]]> ]]>
</script> </script>
<script language="javascript" src="chrome://global/content/strres.js"></script> <script language="javascript" src="chrome://global/content/strres.js"/>
<script language="javascript" src="chrome://communicator/content/pref/prefutilities.js"></script> <script language="javascript" src="chrome://communicator/content/pref/prefutilities.js"/>
<box class="box-smallheader" title="&pane.title;"/> <box class="box-smallheader" title="&pane.title;"/>

10
mailnews/base/prefs/resources/content/smtpEditOverlay.xul
Просмотреть файл

@ -32,21 +32,23 @@
<script src="smtpEditOverlay.js"/> <script src="smtpEditOverlay.js"/>
<box id="smtpServerEditor" orient="vertical"> <box id="smtpServerEditor" orient="vertical">
<box orient="horizontal" autostretch="never"> <box autostretch="never">
<text class="label" value="&serverName.label;"/> <text class="label" value="&serverName.label;"/>
<textfield wsm_persist="true" id="smtp.hostname"/> <textfield wsm_persist="true" id="smtp.hostname" flex="1"/>
</box> </box>
<!-- use a grid here when it's implemented --> <!-- use a grid here when it's implemented -->
<box orient="vertical"> <box orient="vertical">
<!-- This hidden one will hold the integer version <!-- This hidden one will hold the integer version
of smtp.useUsername --> of smtp.useUsername -->
<text hidden="true" id="smtp.authMethod" wsm_persist="true"/> <text hidden="true" id="smtp.authMethod" wsm_persist="true"/>
<box autostretch="never">
<checkbox id="smtp.useUsername" value="&alwaysUseUsername.label;" <checkbox id="smtp.useUsername" value="&alwaysUseUsername.label;"
oncommand="onUseUsername(event.target,true);"/> oncommand="onUseUsername(event.target,true);"/>
</box>
<box orient="vertical" style="margin-left: 2em"> <box orient="vertical" style="margin-left: 2em">
<box orient="horizontal" autostretch="never"> <box autostretch="never">
<text class="label" value="&userName.label;"/> <text class="label" value="&userName.label;"/>
<textfield wsm_persist="true" id="smtp.username"/> <textfield wsm_persist="true" id="smtp.username" flex="1"/>
</box> </box>
</box> </box>
</box> </box>

2
mailnews/base/prefs/resources/locale/en-US/am-main.dtd
Просмотреть файл

@ -10,7 +10,7 @@
<!ENTITY email.label "Email Address:"> <!ENTITY email.label "Email Address:">
<!ENTITY replyTo.label "Reply-to Address:"> <!ENTITY replyTo.label "Reply-to Address:">
<!ENTITY organization.label "Organization:"> <!ENTITY organization.label "Organization:">
<!ENTITY signature.label "Attach this signature"> <!ENTITY signature.label "Attach this signature:">
<!ENTITY edit.label "Edit..."> <!ENTITY edit.label "Edit...">
<!ENTITY choose.label "Choose..."> <!ENTITY choose.label "Choose...">
<!-- LOCALIZATION NOTE (editVCard.label) : do not translate "vCard" in below line --> <!-- LOCALIZATION NOTE (editVCard.label) : do not translate "vCard" in below line -->

28
mailnews/base/resources/content/mailWidgets.xml
Просмотреть файл

@ -42,8 +42,8 @@
<binding id="search-menulist-abstract" name="searchMenulistAbstract" extends="xul:box"> <binding id="search-menulist-abstract" name="searchMenulistAbstract" extends="xul:box">
<content> <content>
<xul:menulist inherits="flex" oncommand="this.parentNode.onSelect(event)"> <xul:menulist class="search-menulist" inherits="flex" oncommand="this.parentNode.onSelect(event)">
<xul:menupopup/> <xul:menupopup class="search-menulist-popup"/>
</xul:menulist> </xul:menulist>
</content> </content>
@ -232,20 +232,20 @@
<binding id="searchvalue" name="searchValue" extends="xul:deck"> <binding id="searchvalue" name="searchValue" extends="xul:deck">
<!-- yeah yeah, this stuff needs to be localized. I'm working on it! --> <!-- yeah yeah, this stuff needs to be localized. I'm working on it! -->
<content> <content>
<xul:textfield flex="1" /> <xul:textfield flex="1" class="search-value-textfield"/>
<xul:menulist flex="1" > <xul:menulist flex="1" class="search-value-menulist">
<xul:menupopup> <xul:menupopup class="search-value-popup">
<xul:menuitem value="Lowest"/> <xul:menuitem value="Lowest" class="search-value-menuitem"/>
<xul:menuitem value="Low"/> <xul:menuitem value="Low" class="search-value-menuitem"/>
<xul:menuitem value="Normal"/> <xul:menuitem value="Normal" class="search-value-menuitem"/>
<xul:menuitem value="High"/> <xul:menuitem value="High" class="search-value-menuitem"/>
<xul:menuitem value="Highest"/> <xul:menuitem value="Highest" class="search-value-menuitem"/>
</xul:menupopup> </xul:menupopup>
</xul:menulist> </xul:menulist>
<xul:menulist flex="1" > <xul:menulist flex="1" class="search-value-menulist">
<xul:menupopup> <xul:menupopup class="search-value-popup">
<xul:menuitem value="read"/> <xul:menuitem value="read" class="search-value-menuitem"/>
<xul:menuitem value="replied"/> <xul:menuitem value="replied" class="search-value-menuitem"/>
</xul:menupopup> </xul:menupopup>
</xul:menulist> </xul:menulist>
</content> </content>

21
mailnews/base/resources/content/subscribe.xul
Просмотреть файл

@ -78,6 +78,10 @@ Rights Reserved.
</rows> </rows>
</grid> </grid>
<spring/> <spring/>
</row>
<row>
<separator class="thin"/>
<spring/>
</row> </row>
<row flex="1"> <row flex="1">
<tree class="inset" flex="1" <tree class="inset" flex="1"
@ -116,19 +120,20 @@ Rights Reserved.
<button id="subscribe" class="dialog" value="&subscribeButton.label;" oncommand="SetSubscribeState(true)"/> <button id="subscribe" class="dialog" value="&subscribeButton.label;" oncommand="SetSubscribeState(true)"/>
<button id="unsubscribe" class="dialog" value="&unsubscribeButton.label;" oncommand="SetSubscribeState(false)"/> <button id="unsubscribe" class="dialog" value="&unsubscribeButton.label;" oncommand="SetSubscribeState(false)"/>
<button id="refresh" class="dialog" value="&refreshButton.label;" oncommand="RefreshList()"/> <button id="refresh" class="dialog" value="&refreshButton.label;" oncommand="RefreshList()"/>
<spring flex="1"/>
<button id="stop" class="dialog" value="&stopButton.label;" oncommand="Stop()"/> <button id="stop" class="dialog" value="&stopButton.label;" oncommand="Stop()"/>
</box> </box>
</row> </row>
</rows> </rows>
</grid> </grid>
<separator class="groove"/> <separator/>
<box autostretch="never">
<progressmeter id="statusbar-icon" value="0"/>
<text id="statusText" value="this space for rent" crop="right" flex="1"/>
<spring flex="1"/>
<box id="okCancelButtonsRight"/>
</box>
<statusbar id="status-bar" class="chromeclass-status">
<statusbarpanel id="offline-status"/>
<progressmeter class="progressmeter-statusbar" statusbar="true" id="statusbar-icon" mode="normal" value="0" style="width:100px;height:10px"/>
<statusbarpanel id="statusText" value="this space for rent" crop="right" flex="1"/>
<statusbarpanel id="security-button"/>
<box id="okCancelButtons"/>
</statusbar>
</window> </window>

8
mailnews/base/resources/locale/en-US/subscribe.dtd
Просмотреть файл

@ -20,8 +20,8 @@ Rights Reserved.
<!ENTITY subscribeButton.label "Subscribe"> <!ENTITY subscribeButton.label "Subscribe">
<!ENTITY unsubscribeButton.label "Unsubscribe"> <!ENTITY unsubscribeButton.label "Unsubscribe">
<!ENTITY refreshButton.label "Refresh"> <!ENTITY refreshButton.label "Refresh">
<!ENTITY stopButton.label "Stop"> <!ENTITY stopButton.label "Stop">
<!ENTITY server.label "Server:"> <!ENTITY server.label "Server:">
<!ENTITY subscribedHeader.label "Subscribe"> <!ENTITY subscribedHeader.label "Subscribe">
<!ENTITY messagesHeader.label "Messages"> <!ENTITY messagesHeader.label "Messages">

58
mailnews/base/search/resources/content/FilterEditor.xul
Просмотреть файл

@ -31,17 +31,20 @@ Rights Reserved.
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
title="&window.title;" title="&window.title;"
orient="vertical" orient="vertical"
persist="width heigh screenX screenY" style="width: 40em;"
persist="width height screenX screenY"
onload="filterEditorOnLoad('msgFccFolderPicker');"> onload="filterEditorOnLoad('msgFccFolderPicker');">
<script language="JavaScript" src="chrome://global/content/strres.js"/> <script language="JavaScript" src="chrome://global/content/strres.js"/>
<script language="JavaScript" src="chrome://messenger/content/FilterEditor.js"/> <script language="JavaScript" src="chrome://messenger/content/FilterEditor.js"/>
<keyset id="keyset"/> <keyset id="keyset"/>
<box orient="horizontal" class="padded">
<text value="&filterName.label;"/> <box autostretch="never">
<text class="label" value="&filterName.label;"/>
<textfield flex="1" id="filterName"/> <textfield flex="1" id="filterName"/>
</box> </box>
<titledbox id="searchTermListBox"/> <titledbox id="searchTermListBox"/>
<titledbox> <titledbox>
<title> <title>
@ -59,19 +62,40 @@ Rights Reserved.
<menulist id="actionTargetFolder" flex="1" <menulist id="actionTargetFolder" flex="1"
oncommand="onTargetFolderSelected(event);"/> oncommand="onTargetFolderSelected(event);"/>
<menulist id="actionValuePriority"> <titledbox id="searchTermListBox" flex="1"/>
<titledbox autostretch="never">
<title value="&filterAction.label;"/>
<menulist id="actionMenu" flex="1" oncommand="onActionChanged(event)">
<menupopup> <menupopup>
<!-- see MailNewsTypes2.idl --> <menuitem data="1" actionvalueindex="0" value="&moveToFolder.label;"/>
<menuitem data="6" value="&highestPriorityCmd.label;"/> <menuitem data="2" actionvalueindex="1" value="&changePriority.label;"/>
<menuitem data="5" value="&highPriorityCmd.label;"/> <menuitem data="3" actionvalueindex="2" value="&delete.label;"/>
<menuitem data="4" value="&normalPriorityCmd.label;"/> <menuitem data="4" actionvalueindex="2" value="&markRead.label;"/>
<menuitem data="3" value="&lowPriorityCmd.label;"/> <menuitem data="5" actionvalueindex="2" value="&ignoreThread.label;"/>
<menuitem data="2" value="&lowestPriorityCmd.label;"/> <menuitem data="6" actionvalueindex="2" value="&watchThread.label;"/>
</menupopup> </menupopup>
</menulist> </menulist>
<text id="actionValueNone"/> <deck id="actionValueDeck" flex="1">
</deck> <menulist id="actionTargetFolder" flex="1"
oncommand="onTargetFolderSelected(event);"/>
<menulist id="actionValuePriority">
<menupopup>
<!-- see MailNewsTypes2.idl -->
<menuitem data="6" value="&highestPriorityCmd.label;"/>
<menuitem data="5" value="&highPriorityCmd.label;"/>
<menuitem data="4" value="&normalPriorityCmd.label;"/>
<menuitem data="3" value="&lowPriorityCmd.label;"/>
<menuitem data="2" value="&lowestPriorityCmd.label;"/>
</menupopup>
</menulist>
<text id="actionValueNone"/>
</deck>
</titledbox> </titledbox>
<separator class="groove"/>
<box id="okCancelButtons"/> <separator/>
<box id="okCancelButtonsRight"/>
</window> </window>

181
mailnews/base/search/resources/content/FilterListDialog.xul
Просмотреть файл

@ -28,92 +28,111 @@ Rights Reserved.
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
orient="vertical" orient="vertical"
onload="onLoad();" onload="onLoad();"
style="width: 34em;"
title="&window.title;"> title="&window.title;">
<script language="JavaScript" src="chrome://messenger/content/FilterListDialog.js"/> <script language="JavaScript" src="chrome://messenger/content/FilterListDialog.js"/>
<script language="JavaScript" src="chrome://global/content/strres.js"/> <script language="JavaScript" src="chrome://global/content/strres.js"/>
<!-- <script src="resource:/res/samples/DumpDOM.js"/> -->
<keyset id="keyset"/>
<box orient="horizontal"> <!-- <script src="resource:/res/samples/DumpDOM.js"/> -->
<text class="label" value="&filtersForPrefix.label;"/>
<menulist oncommand="onServerClick(event);" id="serverMenu">
<menupopup rdf:datasources="rdf:msgaccountmanager"
rdf:containment="http://home.netscape.com/NC-rdf#child"
ref="msgaccounts:/">
<template>
<menuitem uri="..." data="..." value="rdf:http://home.netscape.com/NC-rdf#Name"/>
</template>
</menupopup>
</menulist>
<text class="label" value="&filtersForPostfix.label;"/>
</box>
<box orient="horizontal" >
<box orient="vertical" style="width:100%;" >
<text value="&filterHeader.label;"/>
<box orient="horizontal" style="min-height: 200px; min-width: 200px">
<tree id="filterTree" class="inset" flex="1"
onselect="onFilterSelect(event);"
rdf:datasources="rdf:msgfilters rdf:msgaccountmanager "
rdf:containment="http://home.netscape.com/NC-rdf#child">
<template>
<rule>
<treechildren flex="1">
<treeitem uri="..." open="true"
Enabled="rdf:http://home.netscape.com/NC-rdf#Enabled">
<treerow >
<treecell indent="true" value="rdf:http://home.netscape.com/NC-rdf#Name"/>
<treecell allowevents="true"
class="enabledcol treecell-image"
value="rdf:http://home.netscape.com/NC-rdf#Enabled"
onclick="onToggleEnabled(event);"/>
</treerow>
</treeitem>
</treechildren>
</rule>
</template>
<treecolgroup> <keyset id="keyset"/>
<treecol style="width: 0px" flex="85" rdf:resource="http://home.netscape.com/NC-rdf#Name" id="nameColumn"/>
<treecol style="width: 0px" flex="15" id="activeColumn"/>
</treecolgroup>
<treehead> <grid flex="1">
<treerow> <columns>
<treecell persist="hidden width" class="treecell-header treecell-inset-header" value="&nameColumn.label;"/> <column flex="1"/>
<treecell persist="hidden width" class="treecell-header treecell-inset-header" value="&activeColumn.label;"/> <column/>
</treerow> <column/>
</treehead> </columns>
</tree> <rows>
<row>
<text class="label" value="&filtersForPrefix.label;"/>
<spring/>
<spring/>
</row>
<row>
<menulist oncommand="onServerClick(event);" id="serverMenu">
<menupopup rdf:datasources="rdf:msgaccountmanager"
rdf:containment="http://home.netscape.com/NC-rdf#child"
ref="msgaccounts:/">
<template>
<menuitem uri="..." data="..." value="rdf:http://home.netscape.com/NC-rdf#Name"/>
</template>
</menupopup>
</menulist>
<spring/>
<spring/>
</row>
<row>
<separator class="thin"/>
<spring/>
<spring/>
</row>
<row>
<box orient="vertical">
<html>&filterHeader.label;</html>
<tree id="filterTree" class="inset" flex="1"
onselect="onFilterSelect(event);"
rdf:datasources="rdf:msgfilters rdf:msgaccountmanager "
rdf:containment="http://home.netscape.com/NC-rdf#child">
> <treehead>
<box orient="vertical"> <treerow>
<spring flex="3"/> <treecell class="treecell-header treecell-inset-header"
<scrollbarbutton type="increment" oncommand="onUp(event)"> persist="hidden width" value="&nameColumn.label;"/>
<image src="chrome://global/skin/scroll-up.gif"/> <treecell class="treecell-header treecell-inset-header"
</scrollbarbutton> persist="hidden width" value="&activeColumn.label;"/>
<spring flex="1"/> </treerow>
<scrollbarbutton type="decrement" oncommand="onDown(event)"> </treehead>
<image src="chrome://global/skin/scroll-down.gif"/>
</scrollbarbutton> <template>
<spring flex="3"/> <rule>
</box> <treechildren>
</box> <treeitem uri="..." open="true"
</box> Enabled="rdf:http://home.netscape.com/NC-rdf#Enabled">
<box orient="vertical"> <treerow >
<button id="newButton" value="&newButton.label;" onclick="onNewFilter();"/> <treecell indent="true" value="rdf:http://home.netscape.com/NC-rdf#Name"/>
<button id="editButton" value="&editButton.label;" onclick="onEditFilter();"/> <treecell allowevents="true"
<button id="deleteButton" value="&deleteButton.label;" onclick="onDeleteFilter();"/> class="enabledcol treecell-image"
</box> value="rdf:http://home.netscape.com/NC-rdf#Enabled"
</box> onclick="onToggleEnabled(event);"/>
<!-- </treerow>
take out for PR2 </treeitem>
<box orient="horizontal"> </treechildren>
<button value="&runFiltersNow.label;" width="0em"/> </rule>
</box> </template>
-->
<!-- <button onclick="DumpDOM(document.getElementById('filterTree'));" value="dump"/> --> <treecolgroup>
<separator class="groove"/> <treecol style="width: 0px" flex="75" rdf:resource="http://home.netscape.com/NC-rdf#Name" id="nameColumn"/>
<box id="okCancelButtons"/> <treecol style="width: 0px" flex="25" id="activeColumn"/>
</treecolgroup>
<treechildren flex="1"/>
</tree>
</box>
<box orient="vertical">
<spring flex="1"/>
<button class="reorder-up top" oncommand="onUp(event);"/>
<button class="reorder-down top" oncommand="onDown(event);"/>
<spring flex="1"/>
</box>
<box orient="vertical">
<button id="newButton" value="&newButton.label;" onclick="onNewFilter();"/>
<button id="editButton" value="&editButton.label;" onclick="onEditFilter();"/>
<button id="deleteButton" value="&deleteButton.label;" onclick="onDeleteFilter();"/>
<spring flex="1"/>
<!-- take out for PR2
<button value="&runFiltersNow.label;" width="0em"/>
<button onclick="DumpDOM(document.getElementById('filterTree'));" value="dump"/>
-->
</box>
</row>
</rows>
</grid>
<separator/>
<box id="okCancelButtonsRight"/>
</window> </window>

55
mailnews/base/search/resources/content/SearchDialog.xul
Просмотреть файл

@ -26,6 +26,7 @@ Rights Reserved.
<?xul-overlay href="chrome://messenger/content/searchTermOverlay.xul"?> <?xul-overlay href="chrome://messenger/content/searchTermOverlay.xul"?>
<?xul-overlay href="chrome://messenger/content/msgFolderPickerOverlay.xul"?> <?xul-overlay href="chrome://messenger/content/msgFolderPickerOverlay.xul"?>
<?xul-overlay href="chrome://messenger/content/mailWindowOverlay.xul"?> <?xul-overlay href="chrome://messenger/content/mailWindowOverlay.xul"?>
<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
<!DOCTYPE window SYSTEM "chrome://messenger/locale/SearchDialog.dtd" > <!DOCTYPE window SYSTEM "chrome://messenger/locale/SearchDialog.dtd" >
@ -33,34 +34,46 @@ Rights Reserved.
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
onload="searchOnLoad();" onload="searchOnLoad();"
title="&searchDialogTitle.label;" title="&searchDialogTitle.label;"
class="dialog" width="620" height="470"
persist="screenX screenY width height"
orient="vertical"> orient="vertical">
<keyset id="keyset"/>
<script src="chrome://global/content/strres.js"/> <script src="chrome://global/content/strres.js"/>
<script src="chrome://messenger/content/mailWindow.js"/> <script src="chrome://messenger/content/mailWindow.js"/>
<script src="chrome://messenger/content/SearchDialog.js"/> <script src="chrome://messenger/content/SearchDialog.js"/>
<box>
<text class="label" value="&searchHeading.label;"/> <box orient="vertical" class="dialog box-padded">
<menulist id="searchableFolders" flex="2" <box autostretch="never">
oncommand="onChooseFolder(event)"/> <text class="label" value="&searchHeading.label;"/>
<spring flex="1"/> <menulist id="searchableFolders" flex="2"
<!-- oncommand="onChooseFolder(event)"/>
<checkbox value="&searchSubfolders.label;"/> <spring flex="1"/>
--> <!--
</box> <checkbox value="&searchSubfolders.label;"/>
-->
</box>
<box> <box flex="1">
<titledbox id="searchTermListBox" flex="1"/> <titledbox id="searchTermListBox" flex="1"/>
<box orient="vertical"> <box orient="vertical">
<button value="&searchButton.label;" oncommand="onSearch(event)"/> <button value="&searchButton.label;" oncommand="onSearch(event)"/>
<button value="&resetButton.label;" oncommand="onReset(event)"/> <button value="&resetButton.label;" oncommand="onReset(event)"/>
<spring flex="1"/>
<button value="&closeButton.label;" onclick="window.close()"/>
<separator class="thin"/>
</box>
</box> </box>
</box> </box>
<splitter id="searchfields-splitter" collapse="before" persist="state hidden"
autostretch="never" orient="vertical">
<grippy/>
</splitter>
<tree id="threadTree" flex="1" style="height: 0px" context="threadPaneContext"/>
<tree id="threadTree" class="inset" flex="1" style="height: 50px" context="threadPaneContext"/> <statusbar id="status-bar"/>
<box>
<spring flex="100%"/>
<button value="&closeButton.label;" onclick="window.close()"/>
</box>
<box id="status-bar"/>
</window> </window>

115
mailnews/base/search/resources/content/searchTermOverlay.xul
Просмотреть файл

@ -25,67 +25,70 @@
<!DOCTYPE window SYSTEM "chrome://messenger/locale/searchTermOverlay.dtd" > <!DOCTYPE window SYSTEM "chrome://messenger/locale/searchTermOverlay.dtd" >
<overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> <overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<script src="chrome://messenger/content/searchTermOverlay.js"/>
<titledbox orient="vertical" id="searchTermListBox"> <script src="chrome://messenger/content/searchTermOverlay.js"/>
<title>
<text value="&conditions.label;"/> <titledbox orient="vertical" id="searchTermListBox" value="&conditions.label;" flex="1">
</title>
<text value="&conditionDesc.label;"/> <text class="label" value="&conditionDesc.label;"/>
<radiogroup id="booleanAndGroup" selectedItem="or" oncommand="booleanChanged(event);">
<radiogroup class="indent" id="booleanAndGroup" orient="vertical" autostretch="never"
selectedItem="or" oncommand="booleanChanged(event);">
<radio group="booleanAndGroup" data="and" value="&matchAll.label;"/> <radio group="booleanAndGroup" data="and" value="&matchAll.label;"/>
<radio group="booleanAndGroup" checked="true" data="or" value="&matchAny.label;"/> <radio group="booleanAndGroup" checked="true" data="or" value="&matchAny.label;"/>
</radiogroup> </radiogroup>
<spring class="spacer"/> <separator class="thin"/>
<box flex="1">
<box id="searchterms"/>
<tree class="inset" flex="1" id="searchTermTree" style="height: 0px;">
<treecolgroup>
<treecol flex="1"/>
<treecol flex="4"/>
<treecol flex="0"/>
<treecol flex="4"/>
<treecol flex="0"/>
<treecol flex="4"/>
<treecol flex="0"/>
</treecolgroup>
<treechildren flex="1" id="searchTermList">
<!-- this is what the treerows will look like:
<treeitem id="searchListItem">
<treerow>
<treecell id="preSearchAttr"/>
<treecell allowevents="true">
<searchattribute id="searchAttr" for="searchOp,searchValue" flex="1"/>
</treecell>
<treecell id="preSearchOp"/>
<treecell allowevents="true">
<searchoperator id="searchOp" flex="1"/>
</treecell>
<treecell id="preSearchValue"/>
<treecell allowevents="true" >
<searchvalue id="searchValue" flex="1"/>
</treecell>
<treecell id="postSearchValue"/>
</treerow>
</treeitem>
<treeitem>
<treerow>
<treecell value="the.."/>
<treecell value="contains.."/>
<treecell value="text here"/>
</treerow>
</treeitem>
-->
</treechildren>
</tree>
</box>
<box> <box>
<box id="searchterms"/> <button id="more" value="&more.label;" onclick="onMore(event);"/>
<tree rows="5" class="inset" flex="1" id="searchTermTree"> <button id="less" value="&less.label;" disabled="true" onclick="onLess(event);"/>
<treecolgroup> </box>
<treecol flex="1"/>
<treecol flex="4"/>
<treecol flex="0"/>
<treecol flex="4"/>
<treecol flex="0"/>
<treecol flex="4"/>
<treecol flex="0"/>
</treecolgroup>
<treechildren flex="1" id="searchTermList">
<!-- this is what the treerows will look like:
<treeitem id="searchListItem">
<treerow>
<treecell id="preSearchAttr"/>
<treecell allowevents="true">
<searchattribute id="searchAttr" for="searchOp,searchValue" flex="1"/>
</treecell>
<treecell id="preSearchOp"/>
<treecell allowevents="true">
<searchoperator id="searchOp" flex="1"/>
</treecell>
<treecell id="preSearchValue"/>
<treecell allowevents="true" >
<searchvalue id="searchValue" flex="1"/>
</treecell>
<treecell id="postSearchValue"/>
</treerow>
</treeitem>
<treeitem>
<treerow>
<treecell value="the.."/>
<treecell value="contains.."/>
<treecell value="text here"/>
</treerow>
</treeitem>
-->
</treechildren>
</tree>
</box>
<box>
<button id="more" value="&more.label;" onclick="onMore(event);"/>
<button id="less" value="&less.label;" disabled="true" onclick="onLess(event);"/>
</box>
</titledbox> </titledbox>
</overlay> </overlay>

6
mailnews/base/search/resources/locale/en-US/FilterListDialog.dtd
Просмотреть файл

@ -2,13 +2,13 @@
<!ENTITY numberColumn.label "Number"> <!ENTITY numberColumn.label "Number">
<!ENTITY nameColumn.label "Description"> <!ENTITY nameColumn.label "Description">
<!ENTITY activeColumn.label "Enabled"> <!ENTITY activeColumn.label "Enabled">
<!ENTITY newButton.label "New"> <!ENTITY newButton.label "New...">
<!ENTITY editButton.label "Edit"> <!ENTITY editButton.label "Edit...">
<!ENTITY deleteButton.label "Delete"> <!ENTITY deleteButton.label "Delete">
<!ENTITY logFilterUseCheckbox.label "Log Filter Use"> <!ENTITY logFilterUseCheckbox.label "Log Filter Use">
<!ENTITY viewLogButton.label "View Log"> <!ENTITY viewLogButton.label "View Log">
<!ENTITY description.label "Description"> <!ENTITY description.label "Description">
<!ENTITY filterHeader.label "Filters which are Enabled will be run in the order shown below."> <!ENTITY filterHeader.label "Filters which are Enabled will be run in the order shown below:">
<!ENTITY runFiltersNow.label "Run Filter(s) Now"> <!ENTITY runFiltersNow.label "Run Filter(s) Now">
<!ENTITY filtersForPrefix.label "Filters for:"> <!ENTITY filtersForPrefix.label "Filters for:">
<!ENTITY filtersForPostfix.label ""> <!ENTITY filtersForPostfix.label "">