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

fixes for #17787 and #20395. make the folder pickers look like buttons 

and get the "mail.citation_color" pref to work in the prefs dialog.
thanks for brade for doing the hard work with color prefs.
r=brade,alecf, a=chofmann
This commit is contained in:
sspitzer%netscape.com 1999-12-21 00:52:39 +00:00
Родитель 23f6166708
Коммит 8b1b5440f7
3 изменённых файлов: 86 добавлений и 39 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@ -1,14 +1,15 @@
<?xml version="1.0"?>
<?xml-stylesheet href="chrome://pref/skin/pref.css" type="text/css"?>
<?xml-stylesheet href="chrome://pref/skin/" type="text/css"?>
<!DOCTYPE window SYSTEM "chrome://messenger/locale/pref-mailnews.dtd">
<window xmlns:html="http://www.w3.org/TR/REC-html40"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
class="dialog"
onload="StartUp('Mailnews-Main')"
onload="return StartUp('Mailnews-Main')"
align="vertical">
<html:script language="javascript" src="chrome://pref/content/PrefsWindow.js"/>
<html:script language="javascript" src="chrome://messenger/content/pref-mailnews.js"/>
<box class="header" align="horizontal">
@ -42,41 +43,14 @@
</html:select>
</html:div>
<!-- heeding and setting the "mail.citation_color" pref still needs work... -->
<menu>
<menu id="citationmenu">
<titledbutton value="&color.label;" class="popup" align="right"/>
<html:div style="width:30px; background-color:white"/>
<html:div id="pref:#000000:color:mail.citation_color" style="width:30px; background-color:white"/>
<menupopup>
<colorpicker palettename="standard" onclick="setColorWell(this.parentNode.parentNode);"/>
<colorpicker id="citation" palettename="standard" onclick="setColorWell(this.parentNode.parentNode,null,false);"/>
</menupopup>
</menu>
<!--html:table>
<html:tr><html:td>&style.label;
<html:select id="pref:int:mail.quoted_style">
<html:option value="0" label="&regular.label;"/>
<html:option value="1" label="&bold.label;"/>
<html:option value="2" label="&italic.label;"/>
<html:option value="3" label="&boldItalic.label;"/>
</html:select>
</html:td></html:tr>
<html:tr><html:td>&size.label;
<html:select id="pref:int:mail.quoted_style">
<html:option value="0" label="&regular.label;"/>
<html:option value="1" label="&bigger.label;"/>
<html:option value="2" label="&smaller.label;"/>
</html:select>
</html:td></html:tr>
<html:tr><html:td>
<menu>
<titledbutton value="&color.label;" class="popup" align="right"/>
<html:div style="width:30px; background-color:white"/>
<menupopup>
<colorpicker palettename="standard" onclick="setColorWell(this.parentNode.parentNode);"/>
</menupopup>
</menu>
</html:td></html:tr>
</html:table-->
</html:fieldset>
<html:fieldset>

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

@ -9,7 +9,7 @@
<html:script language="JavaScript" src="chrome://messenger/content/msgFolderPickerOverlay.js"/>
<menu style="border: thin solid black;" value="&subscribeclickhere.label;" uri="" id="msgSubscribeFolderPicker" datasources="rdf:msgaccountmanager rdf:mailnewsfolders" rdf:ignore="http://home.netscape.com/NC-rdf#MessageChild"
<menu class="push" value="&subscribeclickhere.label;" uri="" id="msgSubscribeFolderPicker" datasources="rdf:msgaccountmanager rdf:mailnewsfolders" rdf:ignore="http://home.netscape.com/NC-rdf#MessageChild"
ref="msgaccounts:/">
<template>
<!-- since we only do news subscribe (and not imap subscribe)
@ -51,7 +51,7 @@
</template>
</menu>
<menu style="border: thin solid red;" value="&newfolderclickhere.label;" uri="" id="msgNewFolderPicker" datasources="rdf:msgaccountmanager rdf:mailnewsfolders" rdf:ignore="http://home.netscape.com/NC-rdf#MessageChild"
<menu class="push" value="&newfolderclickhere.label;" uri="" id="msgNewFolderPicker" datasources="rdf:msgaccountmanager rdf:mailnewsfolders" rdf:ignore="http://home.netscape.com/NC-rdf#MessageChild"
ref="msgaccounts:/">
<template>
<rule nc:CanCreateSubfolders="true" iscontainer="true" isempty="false">
@ -100,7 +100,7 @@
</template>
</menu>
<menu style="border: thin solid blue;" value="&renamefolderclickhere.label;" uri="" id="msgRenameFolderPicker" datasources="rdf:msgaccountmanager rdf:mailnewsfolders" rdf:ignore="http://home.netscape.com/NC-rdf#MessageChild"
<menu class="push" value="&renamefolderclickhere.label;" uri="" id="msgRenameFolderPicker" datasources="rdf:msgaccountmanager rdf:mailnewsfolders" rdf:ignore="http://home.netscape.com/NC-rdf#MessageChild"
ref="msgaccounts:/">
<template>
<rule nc:CanRename="true" iscontainer="true" isempty="false">
@ -163,7 +163,7 @@
</template>
</menu>
<menu style="border: thin solid green;" value="&filemessagesclickhere.label;" uri="" id="msgFccFolderPicker" datasources="rdf:msgaccountmanager rdf:mailnewsfolders" rdf:ignore="http://home.netscape.com/NC-rdf#MessageChild"
<menu class="push" value="&filemessagesclickhere.label;" uri="" id="msgFccFolderPicker" datasources="rdf:msgaccountmanager rdf:mailnewsfolders" rdf:ignore="http://home.netscape.com/NC-rdf#MessageChild"
ref="msgaccounts:/">
<template>
<rule nc:CanFileMessages="true" iscontainer="true" isempty="false">
@ -214,7 +214,7 @@
</rule>
</template>
</menu>
<menu style="border: thin solid green;" value="&filemessagesclickhere.label;" uri="" id="msgDraftsFolderPicker" datasources="rdf:msgaccountmanager rdf:mailnewsfolders" rdf:ignore="http://home.netscape.com/NC-rdf#MessageChild"
<menu class="push" value="&filemessagesclickhere.label;" uri="" id="msgDraftsFolderPicker" datasources="rdf:msgaccountmanager rdf:mailnewsfolders" rdf:ignore="http://home.netscape.com/NC-rdf#MessageChild"
ref="msgaccounts:/">
<template>
<rule nc:CanFileMessages="true" iscontainer="true" isempty="false">
@ -265,7 +265,7 @@
</rule>
</template>
</menu>
<menu style="border: thin solid green;" value="&filemessagesclickhere.label;" uri="" id="msgStationeryFolderPicker" datasources="rdf:msgaccountmanager rdf:mailnewsfolders" rdf:ignore="http://home.netscape.com/NC-rdf#MessageChild"
<menu class="push" value="&filemessagesclickhere.label;" uri="" id="msgStationeryFolderPicker" datasources="rdf:msgaccountmanager rdf:mailnewsfolders" rdf:ignore="http://home.netscape.com/NC-rdf#MessageChild"
ref="msgaccounts:/">
<template>
<rule nc:CanFileMessages="true" iscontainer="true" isempty="false">
@ -316,7 +316,7 @@
</rule>
</template>
</menu>
<menu style="border: thin solid green;" value="&filemessagesclickhere.label;" uri="" id="msgJunkMailFolderPicker" datasources="rdf:msgaccountmanager rdf:mailnewsfolders" rdf:ignore="http://home.netscape.com/NC-rdf#MessageChild"
<menu class="push" value="&filemessagesclickhere.label;" uri="" id="msgJunkMailFolderPicker" datasources="rdf:msgaccountmanager rdf:mailnewsfolders" rdf:ignore="http://home.netscape.com/NC-rdf#MessageChild"
ref="msgaccounts:/">
<template>
<rule nc:CanFileMessages="true" iscontainer="true" isempty="false">

73
mailnews/base/resources/skin/messenger.css
Просмотреть файл

@ -237,3 +237,76 @@ iframe {
#button_stop {
list-style-image:url("chrome://global/skin/stop.gif");
}
menu.push {
border: 1px outset white;
padding: 2px;
margin: 2px;
text-align: center;
background-color:inherit;
background-image: inherit;
}
menu.push:hover {
border: 1px outset white;
color:#003366;
text-decoration:underline;
padding: 2px;
}
menu.push:hover:-moz-outline {
border : 1px solid black;
color:#003366;
padding: 2px;
}
menu.push:active {
text-decoration:none;
border: 1px inset;
padding-left: 3px;
padding-right: 1px;
padding-top: 3px;
padding-bottom: 1px;
}
menu.push[toggled="1"] {
border: 1px white inset;
padding-left: 3px;
padding-right: 1px;
padding-top: 3px;
padding-bottom: 1px;
}
menu.push[toggled="2"] {
background-color: lightgray;
border: 1px solid gray;
}
menu.push:active:-moz-outline {
border : 1px solid black;
}
menu.push[disabled="true"] {
background-color:inherit;
background-image: inherit;
border : 1px solid #999999;
color: #999999;
text-decoration: none;
}
menu.push[disabled="true"]:hover {
background-color:inherit;
background-image: inherit;
border : 1px solid #999999;
color: #999999;
text-decoration: none;
}
menu.push[disabled="true"]:active {
background-color:inherit;
background-image: inherit;
border : 1px solid #999999;
color: #999999;
text-decoration: none;
}