зеркало из https://github.com/mozilla/pjs.git
tooltips, folder tooltips, and making button icons show up again.
This commit is contained in:
putterman%netscape.com
Родитель
c855b6a512
Коммит
f811e7926b
|
|
@ -28,6 +28,9 @@
|
|||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
|
||||
|
||||
<popup id="folderTooltip" class="tooltip" oncreate="return FillInFolderTooltip(document.tooltipNode);" >
|
||||
<text id="foldertooltipText"/>
|
||||
</popup>
|
||||
|
||||
<tree datasources="rdf:null"
|
||||
id="folderTree" class="mail-folders"
|
||||
|
|
@ -60,7 +63,7 @@
|
|||
IsServer="rdf:http://home.netscape.com/NC-rdf#IsServer"
|
||||
HasUnreadMessages="rdf:http://home.netscape.com/NC-rdf#HasUnreadMessages"
|
||||
NoSelect="rdf:http://home.netscape.com/NC-rdf#NoSelect">
|
||||
<treecell indent="true" class="treecell-indent tree-cell-folderpane-icon"
|
||||
<treecell tooltip="folderTooltip" indent="true" class="treecell-indent tree-cell-folderpane-icon"
|
||||
value="rdf:http://home.netscape.com/NC-rdf#FolderTreeName"
|
||||
SpecialFolder="rdf:http://home.netscape.com/NC-rdf#SpecialFolder"
|
||||
BiffState="rdf:http://home.netscape.com/NC-rdf#BiffState"
|
||||
|
|
|
|||
|
|
@ -689,6 +689,43 @@ function MsgSortByThread()
|
|||
ChangeThreadView()
|
||||
}
|
||||
|
||||
function FillInFolderTooltip(cellNode)
|
||||
{
|
||||
var folderNode = cellNode.parentNode.parentNode;
|
||||
var uri = folderNode.getAttribute('id');
|
||||
var folderResource = RDF.GetResource(uri);
|
||||
|
||||
var folderTree = GetFolderTree();
|
||||
var db = folderTree.database;
|
||||
|
||||
var nameProperty = RDF.GetResource('http://home.netscape.com/NC-rdf#Name');
|
||||
var unreadCountProperty = RDF.GetResource('http://home.netscape.com/NC-rdf#TotalUnreadMessages');
|
||||
var totalCountProperty = RDF.GetResource('http://home.netscape.com/NC-rdf#TotalMessages');
|
||||
|
||||
var nameResult = db.GetTarget(folderResource, nameProperty , true);
|
||||
nameResult = nameResult.QueryInterface(Components.interfaces.nsIRDFLiteral);
|
||||
var name = nameResult.Value;
|
||||
|
||||
var unreadCountResult = db.GetTarget(folderResource, unreadCountProperty , true);
|
||||
unreadCountResult = unreadCountResult.QueryInterface(Components.interfaces.nsIRDFLiteral);
|
||||
var unreadCount = unreadCountResult.Value;
|
||||
if(unreadCount == "")
|
||||
unreadCount = "0";
|
||||
|
||||
var totalCountResult = db.GetTarget(folderResource, totalCountProperty , true);
|
||||
totalCountResult = totalCountResult.QueryInterface(Components.interfaces.nsIRDFLiteral);
|
||||
var totalCount = totalCountResult.Value;
|
||||
if(totalCount == "")
|
||||
totalCount = "0";
|
||||
|
||||
var textNode = document.getElementById("foldertooltipText");
|
||||
var folderTooltip = name + " (" + unreadCount + "/" + totalCount +")";
|
||||
textNode.setAttribute('value', folderTooltip);
|
||||
return true;
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -286,8 +286,11 @@ Rights Reserved.
|
|||
oncommand="SendMailToNode(document.popupNode)"/>
|
||||
</popup>
|
||||
<popup id="messagePaneContext"/>
|
||||
<popup id="folderTooltip"/>
|
||||
|
||||
</popupset>
|
||||
|
||||
<popupset id="aTooltipSet"/>
|
||||
|
||||
<menubar id="mailMenubar"/>
|
||||
|
||||
|
|
|
|||
|
|
@ -59,6 +59,7 @@ Rights Reserved.
|
|||
valueFolder="&deleteFolderCmd.label;"
|
||||
valueMessage="&deleteMsgCmd.label;"
|
||||
valueMessages="&deleteMsgsCmd.label;"/>
|
||||
<broadcaster id="button_delete"/>
|
||||
<broadcaster id="cmd_selectAll"/>
|
||||
<broadcaster id="cmd_preferences"/>
|
||||
|
||||
|
|
@ -724,15 +725,15 @@ Rights Reserved.
|
|||
<toolbox id="mailToolbarToolbox">
|
||||
<toolbar class="toolbar-primary chromeclass-toolbar" id="msgToolbar" persist="collapsed">
|
||||
<box id="toolbar_button_box">
|
||||
<button class="button-toolbar-2 top" id="button_getmsg" value="&getMsgButton.label;" onclick="MsgGetMessage()"/>
|
||||
<button class="button-toolbar-2 top" id="button_newmsg" value="&newMsgButton.label;" onclick="MsgNewMessage(event)"/>
|
||||
<button class="button-toolbar-2 top" id="button-getmsg" value="&getMsgButton.label;" tooltip="aTooltip" tooltiptext="&getMsgButton.tooltip;" onclick="MsgGetMessage()"/>
|
||||
<button class="button-toolbar-2 top" id="button-newmsg" value="&newMsgButton.label;" tooltip="aTooltip" tooltiptext="&newMsgButton.tooltip;" onclick="MsgNewMessage(event)"/>
|
||||
<toolbarseparator/>
|
||||
<button class="button-toolbar-2 top" id="button_reply" value="&replyButton.label;" onclick="MsgReplyMessage(event)"/>
|
||||
<button class="button-toolbar-2 top" id="button_replyall" value="&replyAllButton.label;" onclick="MsgReplyToAllMessage(event)"/>
|
||||
<button class="button-toolbar-2 top" id="button_forward" value="&forwardButton.label;" onclick="MsgForwardMessage(event)"/>
|
||||
<button class="button-toolbar-2 top" id="button-reply" value="&replyButton.label;" tooltip="aTooltip" tooltiptext="&replyButton.tooltip;" onclick="MsgReplyMessage(event)"/>
|
||||
<button class="button-toolbar-2 top" id="button-replyall" value="&replyAllButton.label;" tooltip="aTooltip" tooltiptext="&replyAllButton.tooltip;" onclick="MsgReplyToAllMessage(event)"/>
|
||||
<button class="button-toolbar-2 top" id="button-forward" value="&forwardButton.label;" tooltip="aTooltip" tooltiptext="&forwardButton.tooltip;" onclick="MsgForwardMessage(event)"/>
|
||||
<toolbarseparator/>
|
||||
<menu id="FileButtonMenu" datasources="rdf:null" rdf:ignore="http://home.netscape.com/NC-rdf#MessageChild">
|
||||
<button class="button-toolbar-2 top" id="button_file" value="&fileButton.label;"/>
|
||||
<button class="button-toolbar-2 top" id="button-file" value="&fileButton.label;" tooltip="aTooltip" tooltiptext="&fileButton.tooltip;"/>
|
||||
<template>
|
||||
<rule nc:CanFileMessages="true" iscontainer="true" isempty="false">
|
||||
<menupopup>
|
||||
|
|
@ -780,10 +781,10 @@ Rights Reserved.
|
|||
</template>
|
||||
<menupopup/>
|
||||
</menu>
|
||||
<button class="button-toolbar-2 top" id="button_next" value="&nextButton.label;" onclick="MsgNextUnreadMessage()"/>
|
||||
<button class="button-toolbar-2 top" id="button_delete" disabled="true" value="&deleteButton.label;" onclick="goDoCommand('button_delete')"/>
|
||||
<button class="button-toolbar-2 top" id="button_print" value="&printButton.label;" onclick="PrintEnginePrint()"/>
|
||||
<button class="button-toolbar-2 top" id="button_stop" value="&stopButton.label;" onclick="MsgStop();"/>
|
||||
<button class="button-toolbar-2 top" id="button-next" value="&nextButton.label;" tooltip="aTooltip" tooltiptext="&nextButton.tooltip;" onclick="MsgNextUnreadMessage()"/>
|
||||
<button class="button-toolbar-2 top" id="button-delete" value="&deleteButton.label;" tooltip="aTooltip" tooltiptext="&deleteButton.tooltip;" observes="button_delete" onclick="goDoCommand('button_delete')"/>
|
||||
<button class="button-toolbar-2 top" id="button-print" value="&printButton.label;" tooltip="aTooltip" tooltiptext="&printButton.tooltip;" onclick="PrintEnginePrint()"/>
|
||||
<button class="button-toolbar-2 top" id="button-stop" value="&stopButton.label;" tooltip="aTooltip" tooltiptext="&stopButton.tooltip;" onclick="MsgStop();"/>
|
||||
<spring flex="100%"/>
|
||||
</box>
|
||||
<button class="plain" id="navigator-throbber" oncommand='goClickThrobber("messenger.throbber.url")'/>
|
||||
|
|
|
|||
|
|
@ -66,6 +66,8 @@ Rights Reserved.
|
|||
</popup>
|
||||
<popup id="messagePaneContext"/>
|
||||
</popupset>
|
||||
<popupset id="aTooltipSet"/>
|
||||
|
||||
<menubar id="mailMenubar"/>
|
||||
|
||||
<toolbox id="mailToolbarToolbox"/>
|
||||
|
|
|
|||
|
|
@ -294,7 +294,9 @@ Rights Reserved.
|
|||
oncommand="SendMailToNode(document.popupNode)"/>
|
||||
</popup>
|
||||
<popup id="messagePaneContext"/>
|
||||
<popup id="folderTooltip"/>
|
||||
</popupset>
|
||||
<popupset id="aTooltipSet"/>
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -269,6 +269,18 @@ Rights Reserved.
|
|||
<!ENTITY printButton.label "Print">
|
||||
<!ENTITY stopButton.label "Stop">
|
||||
|
||||
<!--Tooltips-->
|
||||
<!ENTITY getMsgButton.tooltip "Get Msg">
|
||||
<!ENTITY newMsgButton.tooltip "New Msg">
|
||||
<!ENTITY replyButton.tooltip "Reply">
|
||||
<!ENTITY replyAllButton.tooltip "Reply All">
|
||||
<!ENTITY forwardButton.tooltip "Forward">
|
||||
<!ENTITY fileButton.tooltip "File">
|
||||
<!ENTITY nextButton.tooltip "Next">
|
||||
<!ENTITY deleteButton.tooltip "Delete">
|
||||
<!ENTITY printButton.tooltip "Print">
|
||||
<!ENTITY stopButton.tooltip "Stop">
|
||||
|
||||
<!-- Statusbar -->
|
||||
<!ENTITY statusText.label "Document: Done">
|
||||
<!ENTITY unreadCountText.label "Unread: ">
|
||||
|
|
|
|||
|
|
@ -46,7 +46,6 @@ CHROME_SKIN = \
|
|||
.\reply.gif \
|
||||
.\replyall.gif \
|
||||
.\forward.gif \
|
||||
.\trash.gif \
|
||||
.\check.gif \
|
||||
.\dot.gif \
|
||||
.\subscribe.css \
|
||||
|
|
|
|||
|
|
@ -1,319 +0,0 @@
|
|||
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
|
||||
* 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.
|
||||
*/
|
||||
|
||||
@import url(chrome://communicator/skin/);
|
||||
|
||||
@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); /* set default namespace to HTML */
|
||||
@namespace html url("http://www.w3.org/TR/REC-html40"); /* namespace for XUL elements */
|
||||
|
||||
[hide] {
|
||||
display: none;
|
||||
}
|
||||
|
||||
spring.spacer {
|
||||
width: 5px;
|
||||
height: 5px;
|
||||
}
|
||||
|
||||
box.cleanborder {
|
||||
margin: 10px;
|
||||
padding: 10px;
|
||||
border: 2px groove white;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
box.padded {
|
||||
margin: 10px;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
iframe {
|
||||
min-width: 10px;
|
||||
min-height: 10px;
|
||||
width: 100px;
|
||||
height: 100px;
|
||||
}
|
||||
|
||||
/**
|
||||
* boxes
|
||||
*/
|
||||
#results_box {
|
||||
border-left: 8px solid #CCCCCC;
|
||||
min-width: 10px;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* toolbar button images
|
||||
*/
|
||||
#getmsg-btn {
|
||||
list-style-image:url("chrome://messenger/skin/getmsg.gif");
|
||||
}
|
||||
|
||||
#newmsg-btn{
|
||||
list-style-image:url("chrome://messenger/skin/newmsg.gif");
|
||||
}
|
||||
|
||||
#reply-btn{
|
||||
list-style-image:url("chrome://messenger/skin/reply.gif");
|
||||
}
|
||||
|
||||
#replyall-btn{
|
||||
list-style-image:url("chrome://messenger/skin/replyall.gif");
|
||||
}
|
||||
|
||||
#forward-btn{
|
||||
list-style-image:url("chrome://messenger/skin/forward.gif");
|
||||
}
|
||||
|
||||
#file-btn{
|
||||
list-style-image:url("chrome://messenger/skin/file.gif");
|
||||
}
|
||||
|
||||
#next-btn{
|
||||
list-style-image:url("chrome://messenger/skin/next.gif");
|
||||
}
|
||||
|
||||
#delete-btn{
|
||||
list-style-image:url("chrome://messenger/skin/trash.gif");
|
||||
}
|
||||
|
||||
#print-btn{
|
||||
list-style-image:url("chrome://messenger/skin/print.gif");
|
||||
}
|
||||
|
||||
#stop-btn{
|
||||
list-style-image:url("chrome://messenger/skin/stop.gif");
|
||||
}
|
||||
|
||||
|
||||
.folderMenuItem > .menu-left {
|
||||
list-style-image: url("chrome://messenger/skin/folder-closed.gif");
|
||||
}
|
||||
|
||||
|
||||
.folderMenuItem[open="true"] > .menu-left {
|
||||
list-style-image: url("chrome://messenger/skin/folder-open.gif");
|
||||
}
|
||||
|
||||
/* special folder */
|
||||
.folderMenuItem[SpecialFolder="Inbox"] > .menu-left {
|
||||
list-style-image: url("chrome://messenger/skin/folder-inbox.gif");
|
||||
}
|
||||
|
||||
.folderMenuItem[SpecialFolder="Inbox"][open="true"] > .menu-left
|
||||
{
|
||||
list-style-image: url("chrome://messenger/skin/folder-inbox.gif");
|
||||
}
|
||||
|
||||
.folderMenuItem[SpecialFolder="Trash"] > .menu-left {
|
||||
list-style-image: url("chrome://messenger/skin/folder-trash.gif");
|
||||
}
|
||||
|
||||
.folderMenuItem[SpecialFolder="Trash"][open="true"] > .menu-left {
|
||||
list-style-image: url("chrome://messenger/skin/folder-trash.gif");
|
||||
}
|
||||
|
||||
.folderMenuItem[IsServer="true"] > .menu-left
|
||||
{
|
||||
list-style-image: url("chrome://messenger/skin/server-mail.gif");
|
||||
}
|
||||
|
||||
.folderMenuItem[IsServer="true"][open="true"] > .menu-left
|
||||
{
|
||||
list-style-image: url("chrome://messenger/skin/server-mail.gif");
|
||||
}
|
||||
|
||||
/* IMAP folders */
|
||||
|
||||
.folderMenuItem[IsServer="true"][ServerType="imap"][IsSecure="true"] > .menu-left {
|
||||
list-style-image: url("chrome://messenger/skin/server-remote-lock.gif");
|
||||
}
|
||||
|
||||
/* Local Servers */
|
||||
.folderMenuItem[IsServer="true"][ServerType="none"] > .menu-left
|
||||
{
|
||||
list-style-image: url("chrome://messenger/skin/server-local.gif");
|
||||
}
|
||||
|
||||
/* News folders */
|
||||
.folderMenuItem[ServerType="nntp"] > .menu-left {
|
||||
list-style-image: url("chrome://messenger/skin/folder-newsgroup.gif");
|
||||
}
|
||||
|
||||
.folderMenuItem[IsServer="true"][ServerType="nntp"][IsSecure="true"] > .menu-left {
|
||||
list-style-image: url("chrome://messenger/skin/server-news-lock.gif");
|
||||
}
|
||||
|
||||
.folderMenuItem[IsServer="true"][ServerType="nntp"] > .menu-left {
|
||||
list-style-image: url("chrome://messenger/skin/server-news.gif");
|
||||
}
|
||||
|
||||
#button_getmsg {
|
||||
list-style-image:url("chrome://messenger/skin/getmsg.gif");
|
||||
}
|
||||
|
||||
#button_newmsg {
|
||||
list-style-image:url("chrome://messenger/skin/newmsg.gif");
|
||||
}
|
||||
|
||||
#button_reply {
|
||||
list-style-image:url("chrome://messenger/skin/reply.gif");
|
||||
}
|
||||
|
||||
#button_replyall {
|
||||
list-style-image:url("chrome://messenger/skin/replyall.gif");
|
||||
}
|
||||
|
||||
#button_forward {
|
||||
list-style-image:url("chrome://messenger/skin/forward.gif");
|
||||
}
|
||||
|
||||
#button_file {
|
||||
list-style-image:url("chrome://messenger/skin/file.gif");
|
||||
}
|
||||
|
||||
#button_next {
|
||||
list-style-image:url("chrome://messenger/skin/next.gif");
|
||||
}
|
||||
|
||||
#button_delete {
|
||||
list-style-image:url("chrome://messenger/skin/trash.gif");
|
||||
}
|
||||
|
||||
#button_print {
|
||||
list-style-image:url("chrome://global/skin/print.gif");
|
||||
}
|
||||
|
||||
#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;
|
||||
}
|
||||
|
||||
/**
|
||||
* Make sure the min height is small so we can
|
||||
* resize the pane vertically -EDV
|
||||
*/
|
||||
box#messagepanebox
|
||||
{
|
||||
min-height: 10px;
|
||||
height: 0px;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* this belongs in the mail filter window
|
||||
*/
|
||||
|
||||
treeitem[Enabled="true"] > treerow > treecell.enabledcol > .tree-button {
|
||||
list-style-image: url("chrome://messenger/skin/unreadmail.gif");
|
||||
}
|
||||
|
||||
treecell.enabledcol > .tree-button {
|
||||
list-style-image: url("chrome://messenger/skin/readmail.gif");
|
||||
}
|
||||
|
||||
searchattribute {
|
||||
behavior: url(chrome://messenger/skin/mailWidgets.xml#searchattribute);
|
||||
}
|
||||
|
||||
searchoperator {
|
||||
behavior: url(chrome://messenger/skin/mailWidgets.xml#searchoperator);
|
||||
}
|
||||
|
||||
searchvalue {
|
||||
behavior: url(chrome://messenger/skin/mailWidgets.xml#searchvalue);
|
||||
}
|
||||
|
||||
searchterm {
|
||||
behavior: url(chrome://messenger/skin/mailWidgets.xml#searchterm);
|
||||
}
|
||||
Загрузка…
Ссылка в новой задаче