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

93839 - tooltiptext should work without specifying tooltip, r=pinkerton, sr=hyatt

This commit is contained in:
hewitt%netscape.com 2001-12-04 23:30:25 +00:00
Родитель 792840f711
Коммит 8578b1b7a4
26 изменённых файлов: 483 добавлений и 1019 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

17
extensions/help/resources/content/help.xul
Просмотреть файл

@ -38,10 +38,9 @@
<script type="application/x-javascript" src="chrome://communicator/content/findUtils.js"/>
<script type="application/x-javascript" src="chrome://global/content/nsJSSupportsUtils.js"/>
<popupset id="aTooltipSet">
<popup id="backMenu" position="after_start" onpopupshowing="return createBackMenu(event);" oncommand="gotoHistoryIndex(event);"/>
<popup id="forwardMenu" position="after_start" onpopupshowing="return createForwardMenu(event);" oncommand="gotoHistoryIndex(event);"/>
</popupset>
<popup id="backMenu" position="after_start" onpopupshowing="return createBackMenu(event);" oncommand="gotoHistoryIndex(event);"/>
<popup id="forwardMenu" position="after_start" onpopupshowing="return createForwardMenu(event);" oncommand="gotoHistoryIndex(event);"/>
<popupset id="contentAreaContextSet"/>
<broadcasterset id="helpBroadcasters">
<broadcaster id="canGoBack" disabled="true"/>
@ -84,32 +83,32 @@
<!-- button bar -->
<toolbox id="help-toolbox" class="toolbox-top" deferattached="true">
<toolbar id="helpToolbar" class="toolbar-primary"
grippytooltip="aTooltip" grippytooltiptext="&toolbar.tooltip;"
grippytooltiptext="&toolbar.tooltip;"
tbalign="stretch" persist="collapsed">
<toolbarbutton id="helpBackButton" type="menu-button" class="toolbarbutton-1"
label="&backBtn.label;" crop="right"
oncommand="if (event.target==this) goBack(); else gotoHistoryIndex(event);"
observes="canGoBack" context="backMenu"
tooltip="aTooltip" tooltiptext="&backButton.tooltip;">
tooltiptext="&backButton.tooltip;">
<menupopup context="" onpopupshowing="createBackMenu(event);"/>
</toolbarbutton>
<toolbarbutton id="helpForwardButton" type="menu-button" class="toolbarbutton-1"
label="&fwdBtn.label;" crop="right"
tooltip="aTooltip" tooltiptext="&forwardButton.tooltip;"
tooltiptext="&forwardButton.tooltip;"
oncommand="if (event.target==this) goForward(); else gotoHistoryIndex(event);"
observes="canGoForward" context="forwardMenu">
<menupopup context="" onpopupshowing="createForwardMenu(event);"/>
</toolbarbutton>
<toolbarbutton id="helpHomeButton" class="toolbarbutton-1"
label="&homeBtn.label;" oncommand="goHome();"
tooltip="aTooltip" tooltiptext="&homeBtn.tooltip;"/>
tooltiptext="&homeBtn.tooltip;"/>
<spacer flex="1"/>
<toolbarbutton id="print" class="toolbarbutton-1"
label="&printButton.label;" oncommand="print();"
tooltip="aTooltip" tooltiptext="&printButton.tooltip;"/>
tooltiptext="&printButton.tooltip;"/>
</toolbar>
</toolbox>

1
extensions/irc/xul/content/chatzilla.xul
Просмотреть файл

@ -117,7 +117,6 @@
<vbox flex="1">
<toolbox id="header-bar-tbox" crop="right" persist="collapsed">
<toolbar class="chromeclass-toolbar" id="header-bar-tbar"
grippytooltip="aTooltip"
grippytooltiptext="&header.tooltip;" crop="right">
<hbox flex="1" class="header-box">
<vbox flex="1%">

53
extensions/irc/xul/content/static.js
Просмотреть файл

@ -779,36 +779,33 @@ function playSound (file)
function fillInTooltip(tipElement, id)
{
const XULNS =
"http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
const XLinkNS = "http://www.w3.org/1999/xlink";
const Node = { ELEMENT_NODE : 1 }; // XXX Components.interfaces.Node;
var retVal = false;
var tipNode = document.getElementById(id);
while (tipNode.hasChildNodes())
tipNode.removeChild(tipNode.firstChild);
var titleText = "";
var XLinkTitleText = "";
while (!titleText && !XLinkTitleText && tipElement) {
if (tipElement.nodeType == Node.ELEMENT_NODE) {
titleText = tipElement.getAttribute("title");
XLinkTitleText = tipElement.getAttributeNS(XLinkNS, "title");
}
tipElement = tipElement.parentNode;
const XLinkNS = "http://www.w3.org/1999/xlink";
var retVal = false;
var titleText = null;
var XLinkTitleText = null;
while (!titleText && !XLinkTitleText && tipElement) {
if (tipElement.nodeType == Node.ELEMENT_NODE) {
titleText = tipElement.getAttribute("title");
XLinkTitleText = tipElement.getAttributeNS(XLinkNS, "title");
}
var texts = [titleText, XLinkTitleText];
for (var i = 0; i < texts.length; ++i) {
var t = texts[i];
if (t && t.search(/\S/) >= 0) {
var tipLineElem =
tipNode.ownerDocument.createElementNS(XULNS, "text");
tipLineElem.setAttribute("value", t);
tipNode.appendChild(tipLineElem);
retVal = true;
}
tipElement = tipElement.parentNode;
}
var texts = [titleText, XLinkTitleText];
var tipNode = document.getElementById(id);
for (var i = 0; i < texts.length; ++i) {
var t = texts[i];
if (t && t.search(/\S/) >= 0) {
tipNode.setAttribute("label", t);
retVal = true;
}
return retVal;
}
return retVal;
}
/* timer-based mainloop */

884
extensions/p3p/resources/content/pref-P3P.xul
Просмотреть файл

Разница между файлами не показана из-за своего большого размера Загрузить разницу

2
extensions/p3p/resources/content/privacyOverlay.xul
Просмотреть файл

@ -31,6 +31,6 @@
<script type="application/x-javascript" src="chrome://communicator/content/privacyUI.js" />
<statusbarpanel id="privacy-button" onclick="displayPrivacyInfo()" tooltip="aTooltip"/>
<statusbarpanel id="privacy-button" onclick="displayPrivacyInfo()"/>
</overlay>

17
extensions/venkman/resources/content/venkman-menus.xul
Просмотреть файл

@ -126,12 +126,9 @@
<keyset id="tasksKeys"/>
</keyset>
<!-- Tooltips -->
<popupset id="aTooltipSet"/>
<!-- Main menu bar -->
<toolbox flex="1">
<menubar id="main-menubar" persist="collapsed" grippytooltip="aTooltip"
<menubar id="main-menubar" persist="collapsed"
grippytooltiptext="&MenuBar.tooltip;">
<!-- File menu -->
@ -214,24 +211,24 @@
<!-- Debug toolbar -->
<toolbar class="toolbar-primary chromeclass-toolbar" id="main-toolbar"
grippytooltip="aTooltip" grippytooltiptext="&DebugBar.tooltip;">
grippytooltiptext="&DebugBar.tooltip;">
<hbox id="main-toolbar-buttons">
<toolbarbutton class="toolbarbutton-1" id="stop-button"
label="&Stop.label;" observes="cmd_stop"
tooltip="aTooltip" tooltiptext="&Stop.tooltip;"/>
tooltiptext="&Stop.tooltip;"/>
<toolbarseparator class="toolbarseparator-primary"/>
<toolbarbutton class="toolbarbutton-1" id="cont-button"
label="&Cont.label;" observes="cmd_cont"
tooltip="aTooltip" tooltiptext="&Cont.tooltip;"/>
tooltiptext="&Cont.tooltip;"/>
<toolbarbutton class="toolbarbutton-1" id="step-over-button"
label="&StepOver.label;" observes="cmd_step_over"
tooltip="aTooltip" tooltiptext="&StepOver.tooltip;"/>
tooltiptext="&StepOver.tooltip;"/>
<toolbarbutton class="toolbarbutton-1" id="step-in-button"
label="&StepIn.label;" observes="cmd_step_in"
tooltip="aTooltip" tooltiptext="&StepIn.tooltip;"/>
tooltiptext="&StepIn.tooltip;"/>
<toolbarbutton class="toolbarbutton-1" id="step-out-button"
label="&StepOut.label;" observes="cmd_step_out"
tooltip="aTooltip" tooltiptext="&StepOut.tooltip;"/>
tooltiptext="&StepOut.tooltip;"/>
</hbox>
</toolbar>

36
extensions/venkman/resources/content/venkman-static.js
Просмотреть файл

@ -292,42 +292,6 @@ function evalInTargetScope (script)
}
}
function fillInTooltip(tipElement)
{
const XULNS =
"http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
const XLinkNS = "http://www.w3.org/1999/xlink";
const Node = { ELEMENT_NODE : 1 }; // XXX Components.interfaces.Node;
var retVal = false;
var tipNode = document.getElementById("tooltipBox");
while (tipNode.hasChildNodes())
tipNode.removeChild(tipNode.firstChild);
var titleText = "";
var XLinkTitleText = "";
while (!titleText && !XLinkTitleText && tipElement) {
if (tipElement.nodeType == Node.ELEMENT_NODE) {
titleText = tipElement.getAttribute("title");
XLinkTitleText = tipElement.getAttributeNS(XLinkNS, "title");
}
tipElement = tipElement.parentNode;
}
var texts = [titleText, XLinkTitleText];
for (var i = 0; i < texts.length; ++i) {
var t = texts[i];
if (t.search(/\S/) >= 0) {
var tipLineElem =
tipNode.ownerDocument.createElementNS(XULNS, "text");
tipLineElem.setAttribute("value", t);
tipNode.appendChild(tipLineElem);
retVal = true;
}
}
return retVal;
}
function formatException (ex)
{
if (ex instanceof BadMojo)

2
extensions/venkman/resources/content/venkman.xul
Просмотреть файл

@ -151,7 +151,7 @@
<!-- console view -->
<vbox id="console-box" flex="50" persist="width">
<iframe id="output-iframe" flex="1" tooltip="aTooltip"
<iframe id="output-iframe" flex="1"
ondraggesture=
"nsDragAndDrop.startDrag(event, contentAreaDNDObserver);"
src="chrome://venkman/content/venkman-output-window.html"

3
extensions/wallet/resources/content/walletNavigatorOverlay.xul
Просмотреть файл

@ -139,21 +139,18 @@
id="formPrefill"
oncommand="formPrefill();"
label=" &formPrefill.label; "
tooltip="aTooltip"
tooltiptext="&formPrefill.tooltip;"/>
<toolbarseparator/>
<button class="button-toolbar-4"
id="formCapture"
oncommand="formCapture();"
label=" &formCapture.label; "
tooltip="aTooltip"
tooltiptext="&formCapture.tooltip;"/>
<toolbarseparator/>
<button class="button-toolbar-4"
id="formShow"
oncommand="formShow(); initToolbarItems();"
label=" &formView.label; "
tooltip="aTooltip"
tooltiptext="&formView.tooltip;"/>
<toolbarseparator/>
</toolbar>

5
mailnews/addrbook/resources/content/abSelectAddressesDialog.xul
Просмотреть файл

@ -45,7 +45,6 @@ Rights Reserved.
<keyset id="dialogKeys"/>
<popupset id="aTooltipSet"/>
<!-- Main box, 3 pane and majority of buttons -->
<hbox flex="100%">
@ -99,9 +98,9 @@ Rights Reserved.
<vbox id="rightColumnButtonBox">
<vbox flex="50%">
<spacer class="third-column-spacer"/>
<button id="new" label="&newButton.label;" tooltip="aTooltip" tooltiptext="&addressPickerNewButton.tooltip;" oncommand="AbNewCard('dirTree')"/>
<button id="new" label="&newButton.label;" tooltiptext="&addressPickerNewButton.tooltip;" oncommand="AbNewCard('dirTree')"/>
<spacer class="third-column-spacer"/>
<button id="edit" label="&editButton.label;" tooltip="aTooltip" tooltiptext="&addressPickerEditButton.tooltip;" oncommand="AbEditCard()"/>
<button id="edit" label="&editButton.label;" tooltiptext="&addressPickerEditButton.tooltip;" oncommand="AbEditCard()"/>
<spacer flex="100%"/>
</vbox>
<vbox flex="50%">

24
mailnews/addrbook/resources/content/addressbook.xul
Просмотреть файл

@ -108,12 +108,10 @@ Rights Reserved.
<key id="key_properties" key="&propertiesCmd.key;" command="cmd_properties" modifiers="accel"/>
</keyset>
<popupset id="aTooltipSet">
<popup id="sidebarPopup"/>
</popupset>
<popup id="sidebarPopup"/>
<toolbox class="toolbox-top">
<menubar id="ab-menubar" grippytooltip="aTooltip" grippytooltiptext="&menuBar.tooltip;">
<menubar id="ab-menubar" grippytooltiptext="&menuBar.tooltip;">
<menu id="menu_File">
<menupopup id="menu_FilePopup">
<menuitem label="&newCard.label;" accesskey="&newCard.accesskey;" oncommand="AbNewCard('dirTree')"/>
@ -216,14 +214,14 @@ Rights Reserved.
</menubar>
<!-- toolbar -->
<toolbar class="chromeclass-toolbar toolbar-primary" id="abToolbar" persist="collapsed" grippytooltip="aTooltip" grippytooltiptext="&addressbookToolbar.tooltip;">
<toolbar class="chromeclass-toolbar toolbar-primary" id="abToolbar" persist="collapsed" grippytooltiptext="&addressbookToolbar.tooltip;">
<hbox id="toolbar_button_box">
<toolbarbutton class="toolbarbutton-1" id="button-newcard" label="&newcardButton.label;" tooltip="aTooltip" tooltiptext="&newcardButton.tooltip;" oncommand="AbNewCard('dirTree');"/>
<toolbarbutton class="toolbarbutton-1" id="button-newlist" label="&newlistButton.label;" tooltip="aTooltip" tooltiptext="&newlistButton.tooltip;" oncommand="AbNewList('dirTree');"/>
<toolbarbutton class="toolbarbutton-1" id="button-newcard" label="&newcardButton.label;" tooltiptext="&newcardButton.tooltip;" oncommand="AbNewCard('dirTree');"/>
<toolbarbutton class="toolbarbutton-1" id="button-newlist" label="&newlistButton.label;" tooltiptext="&newlistButton.tooltip;" oncommand="AbNewList('dirTree');"/>
<toolbarseparator class="toolbarseparator-primary"/>
<toolbarbutton class="toolbarbutton-1" id="button-editcard" label="&editButton.label;" tooltip="aTooltip" tooltiptext="&editButton.tooltip;" oncommand="goDoCommand('button_edit');"/>
<toolbarbutton class="toolbarbutton-1" id="button-newmessage" label="&newmsgButton.label;" tooltip="aTooltip" tooltiptext="&newmsgButton.tooltip;" oncommand="AbNewMessage();"/>
<toolbarbutton class="toolbarbutton-1" id="button-delete" observes="button_delete" label="&deleteButton.label;" tooltip="aTooltip" tooltiptext="&deleteButton.tooltip;" oncommand="goDoCommand('button_delete');"/>
<toolbarbutton class="toolbarbutton-1" id="button-editcard" label="&editButton.label;" tooltiptext="&editButton.tooltip;" oncommand="goDoCommand('button_edit');"/>
<toolbarbutton class="toolbarbutton-1" id="button-newmessage" label="&newmsgButton.label;" tooltiptext="&newmsgButton.tooltip;" oncommand="AbNewMessage();"/>
<toolbarbutton class="toolbarbutton-1" id="button-delete" observes="button_delete" label="&deleteButton.label;" tooltiptext="&deleteButton.tooltip;" oncommand="goDoCommand('button_delete');"/>
<vbox flex="100%">
<spacer flex="1"/>
@ -232,12 +230,12 @@ Rights Reserved.
<spacer flex="1"/-->
</vbox>
<!--button id="button_stop" class="other28" align="top" label="&stopButton.label;" tooltip="aTooltip" tooltiptext="&stopButton.tooltip;" disabled="true" oncommand="AbStop()"/>
<button id="button_search" class="other28" align="top" label="&searchButton.label;" disabled="true" tooltip="aTooltip" tooltiptext="&searchButton.tooltip;" oncommand="AbSearch()"/-->
<!--button id="button_stop" class="other28" align="top" label="&stopButton.label;" tooltiptext="&stopButton.tooltip;" disabled="true" oncommand="AbStop()"/>
<button id="button_search" class="other28" align="top" label="&searchButton.label;" disabled="true" tooltiptext="&searchButton.tooltip;" oncommand="AbSearch()"/-->
</hbox>
<hbox id="throbber-box" align="center">
<button id="navigator-throbber" oncommand='goClickThrobber("addressbook.throbber.url")' tooltip="aTooltip" tooltiptext="&throbber.tooltip;">
<button id="navigator-throbber" oncommand="goClickThrobber('addressbook.throbber.url')" tooltiptext="&throbber.tooltip;">
<observes element="broadcaster_throbber" attribute="busy"/>
</button>
</hbox>

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

@ -112,36 +112,34 @@ Rights Reserved.
<keyset id="tasksKeys"/>
</keyset>
<popupset id="aTooltipSet">
<popup id="threadPaneContext"/>
<popup id="folderPaneContext"/>
<popup id="attachmentTreeContext"/>
<popup id="threadPaneContext"/>
<popup id="folderPaneContext"/>
<popup id="attachmentTreeContext"/>
<tooltip id="attachmentTreeTooltip"/>
<popup id="emailAddressPopup" popupanchor="bottomleft" onpopupshowing="goUpdateCommand('cmd_createFilterFromPopup')">
<menuitem label="&AddToAddressBook.label;"
accesskey="&AddToAddressBook.accesskey;"
oncommand="AddNodeToAddressBook(document.popupNode)"/>
<menuitem label="&SendMailTo.label;"
accesskey="&SendMailTo.accesskey;"
oncommand="SendMailToNode(document.popupNode)"/>
<menuitem label="&CopyEmailAddress.label;"
accesskey="&CopyEmailAddress.accesskey;"
oncommand="CopyEmailAddress(document.popupNode)"/>
<menuitem label="&CreateFilter.label;"
accesskey="&CreateFilter.accesskey;"
oncommand="CreateFilter(document.popupNode)"
observes="cmd_createFilterFromPopup"/>
</popup>
<popup id="emailAddressPopup" popupanchor="bottomleft" onpopupshowing="goUpdateCommand('cmd_createFilterFromPopup')">
<menuitem label="&AddToAddressBook.label;"
accesskey="&AddToAddressBook.accesskey;"
oncommand="AddNodeToAddressBook(document.popupNode)"/>
<menuitem label="&SendMailTo.label;"
accesskey="&SendMailTo.accesskey;"
oncommand="SendMailToNode(document.popupNode)"/>
<menuitem label="&CopyEmailAddress.label;"
accesskey="&CopyEmailAddress.accesskey;"
oncommand="CopyEmailAddress(document.popupNode)"/>
<menuitem label="&CreateFilter.label;"
accesskey="&CreateFilter.accesskey;"
oncommand="CreateFilter(document.popupNode)"
observes="cmd_createFilterFromPopup"/>
</popup>
<popup id="allHeadersPopup" onpopupshowing="return fillAllHeadersPopup(document.popupNode);" popupanchor="bottomleft">
<hbox id="allHeadersPopupContainer">
</hbox>
</popup>
<popup id="allHeadersPopup" onpopupshowing="return fillAllHeadersPopup(document.popupNode);" popupanchor="bottomleft">
<hbox id="allHeadersPopupContainer">
</hbox>
</popup>
<popup id="messagePaneContext"/>
<popup id="sidebarPopup"/>
<popup id="folderTooltip"/>
</popupset>
<popup id="messagePaneContext"/>
<popup id="sidebarPopup"/>
<toolbox id="mailToolbarToolbox" class="toolbox-top">
<menubar id="mailMenubar"/>

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

@ -61,9 +61,9 @@
<hbox id="component-bar">
<toolbarbutton class="taskbutton" id="mini-mail" oncommand="toMessengerWindow()"
position="2" tooltip="aTooltip" tooltiptext="&taskMessenger.tooltip;"/>
position="2" tooltiptext="&taskMessenger.tooltip;"/>
<toolbarbutton class="taskbutton" id="mini-addr" oncommand="toAddressBook();"
position="4" tooltip="aTooltip" tooltiptext="&taskAddressBook.tooltip;"/>
position="4" tooltiptext="&taskAddressBook.tooltip;"/>
</hbox>
<menupopup id="taskPopup">

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

@ -785,7 +785,7 @@ Rights Reserved.
</popup>
<menubar id="mailMenubar" grippytooltip="aTooltip" grippytooltiptext="&menuBar.tooltip;">
<menubar id="mailMenubar" grippytooltiptext="&menuBar.tooltip;">
<menu id="menu_File" >
<menupopup id="menu_FilePopup" onpopupshowing="file_init();">
<menuitem label="&newMsgCmd.label;"
@ -1267,11 +1267,11 @@ Rights Reserved.
</menubar>
<toolbox id="mailToolbarToolbox">
<toolbar class="toolbar-primary chromeclass-toolbar" id="msgToolbar" persist="collapsed" grippytooltip="aTooltip" grippytooltiptext="&mailToolbar.tooltip;">
<toolbar class="toolbar-primary chromeclass-toolbar" id="msgToolbar" persist="collapsed" grippytooltiptext="&mailToolbar.tooltip;">
<hbox id="toolbar_button_box">
<toolbarbutton type="menu-button" id="button-getmsg"
class="toolbarbutton-1"
label="&getMsgButton.label;" crop="right" tooltip="aTooltip"
label="&getMsgButton.label;" crop="right"
sortResource="http://home.netscape.com/NC-rdf#FolderTreeName"
sortDirection="ascending"
tooltiptext="&getMsgButton.tooltip;"
@ -1296,16 +1296,16 @@ Rights Reserved.
</template>
<menupopup/>
</toolbarbutton>
<toolbarbutton id="button-newmsg" class="toolbarbutton-1" label="&newMsgButton.label;" tooltip="aTooltip" tooltiptext="&newMsgButton.tooltip;" oncommand="MsgNewMessage(event)"/>
<toolbarbutton id="button-newmsg" class="toolbarbutton-1" label="&newMsgButton.label;" tooltiptext="&newMsgButton.tooltip;" oncommand="MsgNewMessage(event)"/>
<toolbarseparator class="toolbarseparator-primary"/>
<toolbarbutton id="button-reply" class="toolbarbutton-1" label="&replyButton.label;" tooltip="aTooltip" tooltiptext="&replyButton.tooltip;" observes="button_reply" oncommand="MsgReplyMessage(event)"/>
<toolbarbutton class="toolbarbutton-1" id="button-replyall" label="&replyAllButton.label;" tooltip="aTooltip" tooltiptext="&replyAllButton.tooltip;" observes="button_replyall" oncommand="MsgReplyToAllMessage(event)"/>
<toolbarbutton class="toolbarbutton-1" id="button-forward" label="&forwardButton.label;" tooltip="aTooltip" tooltiptext="&forwardButton.tooltip;" observes="button_forward" oncommand="MsgForwardMessage(event)"/>
<toolbarbutton id="button-reply" class="toolbarbutton-1" label="&replyButton.label;" tooltiptext="&replyButton.tooltip;" observes="button_reply" oncommand="MsgReplyMessage(event)"/>
<toolbarbutton class="toolbarbutton-1" id="button-replyall" label="&replyAllButton.label;" tooltiptext="&replyAllButton.tooltip;" observes="button_replyall" oncommand="MsgReplyToAllMessage(event)"/>
<toolbarbutton class="toolbarbutton-1" id="button-forward" label="&forwardButton.label;" tooltiptext="&forwardButton.tooltip;" observes="button_forward" oncommand="MsgForwardMessage(event)"/>
<toolbarseparator class="toolbarseparator-primary"/>
<toolbarbutton type="menu" id="button-file" class="toolbarbutton-1"
label="&fileButton.label;" observes="button_file"
datasources="rdf:null"
tooltip="aTooltip" tooltiptext="&fileButton.tooltip;"
tooltiptext="&fileButton.tooltip;"
sortResource="http://home.netscape.com/NC-rdf#FolderTreeName" sortDirection="ascending">
<template>
<rule nc:NoSelect="true" iscontainer="true" isempty="false">
@ -1369,10 +1369,10 @@ Rights Reserved.
</template>
<menupopup/>
</toolbarbutton>
<toolbarbutton class="toolbarbutton-1" id="button-next" label="&nextButton.label;" oncommand="goDoCommand('cmd_nextUnreadMsg')" tooltip="aTooltip" tooltiptext="&nextButton.tooltip;" observes="button_next"/>
<toolbarbutton class="toolbarbutton-1" id="button-delete" label="&deleteButton.label;" tooltip="aTooltip" tooltiptext="&deleteButton.tooltip;" observes="button_delete" oncommand="goDoCommand('button_delete')"/>
<toolbarbutton class="toolbarbutton-1" id="button-next" label="&nextButton.label;" oncommand="goDoCommand('cmd_nextUnreadMsg')" tooltiptext="&nextButton.tooltip;" observes="button_next"/>
<toolbarbutton class="toolbarbutton-1" id="button-delete" label="&deleteButton.label;" tooltiptext="&deleteButton.tooltip;" observes="button_delete" oncommand="goDoCommand('button_delete')"/>
<toolbarbutton type="menu-button" id="button-mark" class="toolbarbutton-1" label="&markButton.label;" hidden="true" oncommand="goDoCommand('button_mark')"
crop="right" observes="button_mark" tooltip="aTooltip" tooltiptext="&markButton.tooltip;">
crop="right" observes="button_mark" tooltiptext="&markButton.tooltip;">
<menupopup onpopupshowing="InitMessageMark()">
<menuitem type="checkbox" key="key_toggleRead" id="markReadToolbarItem" label="&markAsReadCmd.label;" accesskey="&markAsReadCmd.accesskey;" observes="cmd_markAsRead" default="true" />
<menuitem label="&markThreadAsReadCmd.label;" accesskey="&markThreadAsReadCmd.accesskey;" observes="cmd_markThreadAsRead"/>
@ -1382,15 +1382,15 @@ Rights Reserved.
</menupopup>
</toolbarbutton>
<toolbarbutton id="button-print" type="menu-button" class="toolbarbutton-1" label="&printButton.label;"
crop="right" observes="button_print" oncommand="goDoCommand('cmd_print')" tooltip="aTooltip" tooltiptext="&printButton.tooltip;">
crop="right" observes="button_print" oncommand="goDoCommand('cmd_print')" tooltiptext="&printButton.tooltip;">
<menupopup id="printMenu">
<menuitem label="&printCmd.label;" accesskey="&printCmd.accesskey;" default="true"/>
</menupopup>
</toolbarbutton>
<toolbarbutton class="toolbarbutton-1" id="button-stop" label="&stopButton.label;" tooltip="aTooltip" tooltiptext="&stopButton.tooltip;" oncommand="MsgStop();"/>
<toolbarbutton class="toolbarbutton-1" id="button-stop" label="&stopButton.label;" tooltiptext="&stopButton.tooltip;" oncommand="MsgStop();"/>
<spacer flex="1"/>
<hbox id="throbber-box" align="center">
<button id="navigator-throbber" oncommand='goClickThrobber("messenger.throbber.url")' tooltip="aTooltip" tooltiptext="&throbber.tooltip;"/>
<button id="navigator-throbber" oncommand="goClickThrobber('messenger.throbber.url')" tooltiptext="&throbber.tooltip;"/>
</hbox>
</hbox>
</toolbar>
@ -1399,7 +1399,7 @@ Rights Reserved.
<hbox id="searchBox" persist="collapsed" align="center">
<label id="searchCriteria" value="&SearchSubjectOrSender.label;"/>
<textbox id="searchInput" flex ="1" oninput = "onSearchInput(event);" />
<button id="advancedButton" label="&advancedButton.label;" tooltip="aTooltip" tooltiptext="&advancedButton.tooltip;" oncommand="onAdvancedSearch();"/>
<button id="advancedButton" label="&advancedButton.label;" tooltiptext="&advancedButton.tooltip;" oncommand="onAdvancedSearch();"/>
</hbox>
<statusbar class="chromeclass-status" id="status-bar">

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

@ -117,10 +117,8 @@ Rights Reserved.
<popup id="messagePaneContext"/>
</popupset>
<popupset id="aTooltipSet">
<popup id="attachmentTreeContext"/>
</popupset>
<popup id="attachmentTreeContext"/>
<toolbox id="mailToolbarToolbox">
<menubar id="mailMenubar"/>

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

@ -114,38 +114,34 @@ Rights Reserved.
<keyset id="tasksKeys"/>
</keyset>
<popupset id="aTooltipSet">
<popup id="threadPaneContext"/>
<popup id="folderPaneContext"/>
<popup id="attachmentTreeContext"/>
<tooltip id="attachmentTreeTooltip"/>
<popup id="threadPaneContext"/>
<popup id="folderPaneContext"/>
<popup id="attachmentTreeContext"/>
<popup id="attachmentTreeTooltip"/>
<popup id="emailAddressPopup" popupanchor="bottomleft" onpopupshowing="goUpdateCommand('cmd_createFilterFromPopup')">
<menuitem label="&AddToAddressBook.label;"
accesskey="&AddToAddressBook.accesskey;"
oncommand="AddNodeToAddressBook(document.popupNode)"/>
<menuitem label="&SendMailTo.label;"
accesskey="&SendMailTo.accesskey;"
oncommand="SendMailToNode(document.popupNode)"/>
<menuitem label="&CopyEmailAddress.label;"
accesskey="&CopyEmailAddress.accesskey;"
oncommand="CopyEmailAddress(document.popupNode)"/>
<menuitem label="&CreateFilter.label;"
accesskey="&CreateFilter.accesskey;"
oncommand="CreateFilter(document.popupNode)"
observes="cmd_createFilterFromPopup"/>
</popup>
<popup id="emailAddressPopup" popupanchor="bottomleft" onpopupshowing="goUpdateCommand('cmd_createFilterFromPopup')">
<menuitem label="&AddToAddressBook.label;"
accesskey="&AddToAddressBook.accesskey;"
oncommand="AddNodeToAddressBook(document.popupNode)"/>
<menuitem label="&SendMailTo.label;"
accesskey="&SendMailTo.accesskey;"
oncommand="SendMailToNode(document.popupNode)"/>
<menuitem label="&CopyEmailAddress.label;"
accesskey="&CopyEmailAddress.accesskey;"
oncommand="CopyEmailAddress(document.popupNode)"/>
<menuitem label="&CreateFilter.label;"
accesskey="&CreateFilter.accesskey;"
oncommand="CreateFilter(document.popupNode)"
observes="cmd_createFilterFromPopup"/>
</popup>
<popup id="allHeadersPopup" onpopupshowing="return fillAllHeadersPopup(document.popupNode);" popupanchor="bottomleft">
<hbox id="allHeadersPopupContainer">
</hbox>
</popup>
<popup id="allHeadersPopup" onpopupshowing="return fillAllHeadersPopup(document.popupNode);" popupanchor="bottomleft">
<hbox id="allHeadersPopupContainer">
</hbox>
</popup>
<popup id="messagePaneContext"/>
<popup id="folderTooltip"/>
<popup id="sidebarPopup"/>
</popupset>
<popup id="messagePaneContext"/>
<popup id="sidebarPopup"/>
<toolbox id="mailToolbarToolbox" class="toolbox-top">
<menubar id="mailMenubar"/>

4
mailnews/base/resources/content/msgHdrViewOverlay.js
Просмотреть файл

@ -857,8 +857,8 @@ function displayAttachmentsForCollapsedView()
function FillInAttachmentTooltip(cellNode)
{
var attachmentName = cellNode.getAttribute("label");
var textNode = document.getElementById("attachmentTreeTooltipText");
textNode.setAttribute('value', attachmentName);
var tooltipNode = document.getElementById("attachmentTreeTooltip");
tooltipNode.setAttribute("label", attachmentName);
return true;
}

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

@ -48,9 +48,8 @@ Rights Reserved.
<menuitem label="&saveAllAttachmentsCmd.label;" oncommand="SaveAllAttachments();"/>
</popup>
<popup id="attachmentTreeTooltip" class="tooltip" onpopupshowing="return FillInAttachmentTooltip(document.tooltipNode);" >
<label id="attachmentTreeTooltipText"/>
</popup>
<tooltip id="attachmentTreeTooltip"
onpopupshowing="return FillInAttachmentTooltip(document.tooltipNode);"/>
<hbox id="msgHeaderView" persist="state">

1
mailnews/compose/resources/content/MsgComposeCommands.js
Просмотреть файл

@ -2047,7 +2047,6 @@ function AddAttachment(attachment)
attachment.name = gMsgCompose.AttachmentPrettyName(attachment.url);
cell.setAttribute("label", attachment.name); //use for display only
cell.attachment = attachment; //full attachment object stored here
cell.setAttribute("tooltip", "aTooltip");
try {
cell.setAttribute("tooltiptext", unescape(attachment.url));
}

19
mailnews/compose/resources/content/messengercompose.xul
Просмотреть файл

@ -140,7 +140,6 @@
<popup id="TextColorPopup"/>
<popup id="BackColorPopup"/>
</popupset>
<popupset id="aTooltipSet"/>
<keyset id="tasksKeys">
<!-- File Menu -->
@ -178,7 +177,7 @@
</popupset>
<toolbox class="toolbox-top">
<menubar id="compose-menubar" grippytooltip="aTooltip" grippytooltiptext="&menuBar.tooltip;">
<menubar id="compose-menubar" grippytooltiptext="&menuBar.tooltip;">
<menu id="menu_File">
<menupopup id="menu_FilePopup">
<menuitem label="&newMessage.label;" accesskey="&newMessage.accesskey;" key="key_newMessage" oncommand="goOpenNewMessage();"/>
@ -353,11 +352,11 @@
<menu id="menu_Help"/>
</menubar>
<toolbar class="toolbar-primary chromeclass-toolbar" id="composeToolbar" persist="collapsed" grippytooltip="aTooltip" grippytooltiptext="&mailToolbar.tooltip;">
<toolbar class="toolbar-primary chromeclass-toolbar" id="composeToolbar" persist="collapsed" grippytooltiptext="&mailToolbar.tooltip;">
<hbox id="toolbar_button_box">
<toolbarbutton class="toolbarbutton-1"
id="button-send" label="&sendButton.label;"
tooltip="aTooltip" tooltiptext="&sendButton.tooltip;"
tooltiptext="&sendButton.tooltip;"
command="cmd_sendButton"
now_label="&sendButton.label;"
now_tooltiptext="&sendButton.tooltip;"
@ -368,11 +367,11 @@
<toolbarseparator class="toolbarseparator-primary"/>
<toolbarbutton class="toolbarbutton-1"
id="button-address" label="&addressButton.label;"
tooltip="aTooltip" tooltiptext="&addressButton.tooltip;"
tooltiptext="&addressButton.tooltip;"
command="cmd_selectAddress"/>
<toolbarbutton class="toolbarbutton-1"
id="button-attach" label="&attachButton.label;"
tooltip="aTooltip" tooltiptext="&attachButton.tooltip;"
tooltiptext="&attachButton.tooltip;"
command="cmd_attachFile"/>
<toolbarbutton class="toolbarbutton-1"
id="spellingButton" label="&spellingButton.label;"
@ -380,19 +379,19 @@
<toolbarseparator class="toolbarseparator-primary"/>
<toolbarbutton class="toolbarbutton-1"
id="button-save" label="&saveButton.label;"
tooltip="aTooltip" tooltiptext="&saveButton.tooltip;"
tooltiptext="&saveButton.tooltip;"
command="cmd_saveDefault"/>
<spacer flex="1"/>
<hbox id="throbber-box" align="center">
<button id="navigator-throbber"
oncommand="goClickThrobber('compose.throbber.url')" tooltip="aTooltip" tooltiptext="&throbber.tooltip;">
oncommand="goClickThrobber('compose.throbber.url')" tooltiptext="&throbber.tooltip;">
<observes element="broadcaster_throbber" attribute="busy"/>
</button>
</hbox>
</hbox>
</toolbar>
<toolbar id="MsgHeadersToolbar" persist="collapsed" tborient="vertical" tbalign="stretch" flex="1" grippytooltip="aTooltip" grippytooltiptext="&addressBar.tooltip;">
<toolbar id="MsgHeadersToolbar" persist="collapsed" tborient="vertical" tbalign="stretch" flex="1" grippytooltiptext="&addressBar.tooltip;">
<hbox id="msgheaderstoolbar-box" flex="1">
<vbox flex="75">
<hbox align="center">
@ -431,7 +430,7 @@
</toolbar>
<!-- These toolbar items get filled out from the editorOverlay -->
<toolbar class="chromeclass-toolbar" id="FormatToolbar" persist="collapsed" tbautostretch="never" grippytooltip="aTooltip" grippytooltiptext="&formatToolbar.tooltip;">
<toolbar class="chromeclass-toolbar" id="FormatToolbar" persist="collapsed" tbautostretch="never" grippytooltiptext="&formatToolbar.tooltip;">
<menulist id="ParagraphSelect"/>
<menulist id="FontFaceSelect"/>
<stack id="ColorButtons"/>

2
netwerk/resources/content/securityOverlay.xul
Просмотреть файл

@ -9,6 +9,6 @@
<script type="application/x-javascript" src="chrome://communicator/content/securityUI.js" />
<statusbarpanel id="security-button" onclick="displayPageInfo()" tooltip="aTooltip" tooltiptext="&lockIcon.label;"/>
<statusbarpanel id="security-button" onclick="displayPageInfo()" tooltiptext="&lockIcon.label;"/>
</overlay>

6
themes/classic/global/win/global.css
Просмотреть файл

@ -238,9 +238,3 @@ caption
background-color : -moz-Dialog;
}
.tooltip-label
{
margin : 0px;
}

4
themes/modern/global/global.css
Просмотреть файл

@ -215,10 +215,6 @@ caption {
/* ::::: miscellaneous ::::: */
.tooltip-label {
margin: 0px;
}
.toolbar-focustarget {
-moz-user-focus: ignore !important;
}

8
xpfe/browser/resources/content/navWidgetBindings.xml
Просмотреть файл

@ -15,9 +15,9 @@
<xul:menulist editable="true" class="location-field" flex="1"
autocomplete="true" timeout="300" searchSessionType="urlbar"
inherits="label=content"
tooltip="aTooltip" tooltiptext="" ubattr="field"/>
tooltiptext="" ubattr="field"/>
<xul:button class="button-toolbar-3 go-button" label="Go"
ubattr="go-button" tooltip="aTooltip" tooltiptext="Go"/>
ubattr="go-button" tooltiptext="Go"/>
<xul:box class="urlbar-post-buttons">
<children includes="button"/>
</xul:box>
@ -48,7 +48,7 @@
<xul:box align="center" flex="1" class="menulist-container">
<xul:image class="menulist-icon" inherits="src" emattr="icon"/>
<xul:textbox class="menulist-editable-textbox plain" flex="1" emattr="field"
inherits="autocomplete,searchSessionType,timeout,tooltip=fieldtooltip,tooltiptext=fieldtooltiptext,value"/>
inherits="autocomplete,searchSessionType,timeout,tooltiptext=fieldtooltiptext,value"/>
<xul:menubutton class="menulist-editable-menubutton menubutton-icon" emattr="menubutton">
<xul:menupopup class="menulist-editable-menupopup" emattr="menupopup"
popupalign="topright" popupanchor="bottomright">
@ -116,7 +116,7 @@
<content>
<xul:menubutton id="back-button" label="Back" buttontooltiptext="Go Back"
oncommand="gotoHistoryIndex(event);" buttonaction="BrowserBack();" context="backMenu"
class="menubutton-dual toolbar top" crop="right" tooltip="aTooltip" observes="canGoBack">
class="menubutton-dual toolbar top" crop="right" observes="canGoBack">
<xul:menupopup onpopupshowing="BrowserBackMenu(event);"/>
</xul:menubutton>
</content>

259
xpfe/browser/resources/content/navigator-toolbars.xul
Просмотреть файл

@ -1,259 +0,0 @@
<?xml version="1.0"?>
<!--
The contents of this file are subject to the Mozilla 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/MPL/
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.org code.
The Initial Developer of the Original Code is Netscape
Communications Corporation. Portions created by Netscape are
Copyright (C) 2000 Netscape Communications Corporation. All
Rights Reserved.
Contributor(s):
Ben Goodger <ben@netscape.com> (Original Author)
-->
<overlay id="navigator-toolbars"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:NC="http://home.netscape.com/NC-rdf#">
<script type="application/x-javascript" src="chrome://navigator/content/navigator-toolbars.js"/>
<template id="nav-toolbar-template">
<!-- Create Toolbars -->
<!--
<rule NC:Element="toolbar">
<toolbar uri="..."
class="http://home.netscape.com/NC-rdf#Class"
grippytooltip="aTooltip"
grippytooltiptext="http://home.netscape.com/NC-rdf#Name"/>
</rule>
-->
<rule>
<conditions>
<content uri="?uri"/>
<triple subject="?uri"
predicate="http://home.netscape.com/NC-rdf#child"
object="?items"/>
<member container="?items" child="?item"/>
<triple subject="?item"
predicate="http://home.netscape.com/NC-rdf#Element"
object="toolbar"/>
</conditions>
<bindings>
<binding subject="?item"
predicate="http://home.netscape.com/NC-rdf#Class"
object="?item-class"/>
<binding subject="?item"
predicate="http://home.netscape.com/NC-rdf#Name"
object="?item-name"/>
</bindings>
<action>
<toolbar uri="?item" class="?item-class"
grippytooltip="aTooltip" grippytooltiptext="?item-name"/>
</action>
</rule>
<!-- Create Box-related nodes -->
<!--
<rule NC:Element="box">
<hbox uri="..."
class="http://home.netscape.com/NC-rdf#Class"
value="http://home.netscape.com/NC-rdf#Name"
content="http://home.netscape.com/NC-rdf#URL"
src="http://home.netscape.com/NC-rdf#Icon"
type="http://home.netscape.com/NC-rdf#Type"/>
</rule>
-->
<rule>
<conditions>
<content uri="?uri"/>
<triple subject="?uri"
predicate="http://home.netscape.com/NC-rdf#child"
object="?items"/>
<member container="?items" child="?item"/>
<triple subject="?item"
predicate="http://home.netscape.com/NC-rdf#Element"
object="box"/>
</conditions>
<bindings>
<binding subject="?item"
predicate="http://home.netscape.com/NC-rdf#Name"
object="?item-name"/>
<binding subject="?item"
predicate="http://home.netscape.com/NC-rdf#Class"
object="?item-class"/>
<binding subject="?item"
predicate="http://home.netscape.com/NC-rdf#Icon"
object="?item-icon"/>
<binding subject="?item"
predicate="http://home.netscape.com/NC-rdf#Type"
object="?item-type"/>
<binding subject="?item"
predicate="http://home.netscape.com/NC-rdf#URL"
object="?item-URL"/>
</bindings>
<action>
<hbox uri="?item" class="?item-class" value="?item-name"
src="?item-icon" content="?item-URL" type="?item-type"/>
</action>
</rule>
<!-- Throbber -->
<rule>
<conditions>
<content uri="?uri"/>
<triple subject="?uri"
predicate="http://home.netscape.com/NC-rdf#child"
object="?items"/>
<member container="?items" child="?item"/>
<triple subject="?item"
predicate="http://home.netscape.com/NC-rdf#Type"
object="throbber-button"/>
</conditions>
<bindings>
<binding subject="?item"
predicate="http://home.netscape.com/NC-rdf#Name"
object="?item-name"/>
<binding subject="?item"
predicate="http://home.netscape.com/NC-rdf#Class"
object="?item-class"/>
<binding subject="?item"
predicate="http://home.netscape.com/NC-rdf#Icon"
object="?item-icon"/>
<binding subject="?item"
predicate="http://home.netscape.com/NC-rdf#URL"
object="?item-URL"/>
<binding subject="?item"
predicate="http://home.netscape.com/NC-rdf#loading"
object="?item-busy"/>
</bindings>
<action>
<throbber uri="?item" class="?item-class"
src="?item-icon" content="?item-URL" loading="?item-busy"/>
<!-- popup="panelpopup"/> -->
</action>
</rule>
<!-- Generate standard toolbar buttons -->
<!--
<rule>
<button uri="..."
class="http://home.netscape.com/NC-rdf#Class button-toolbar bookmark-item"
label="http://home.netscape.com/NC-rdf#Name"
src="http://home.netscape.com/NC-rdf#Icon"
type="http://home.netscape.com/NC-rdf#Type"
content="http://home.netscape.com/NC-rdf#URL"
crop="right"/>
</rule>
-->
<rule>
<conditions>
<content uri="?uri"/>
<triple subject="?uri"
predicate="http://home.netscape.com/NC-rdf#child"
object="?items"/>
<member container="?items" child="?item"/>
</conditions>
<bindings>
<binding subject="?item"
predicate="http://home.netscape.com/NC-rdf#Name"
object="?item-name"/>
<binding subject="?item"
predicate="http://home.netscape.com/NC-rdf#Class"
object="?item-class"/>
<binding subject="?item"
predicate="http://home.netscape.com/NC-rdf#Icon"
object="?item-icon"/>
<binding subject="?item"
predicate="http://home.netscape.com/NC-rdf#Type"
object="?item-type"/>
<binding subject="?item"
predicate="http://home.netscape.com/NC-rdf#URL"
object="?item-URL"/>
<binding subject="?item"
predicate="http://home.netscape.com/NC-rdf#loading"
object="?item-busy"/>
</bindings>
<action>
<button uri="?item" class="button-toolbar bookmark-item ?item-class ?item-type" label="?item-name"
src="?item-icon" type="?item-icon" crop="right"
content="?item-URL" loading="?item-busy"/>
<!-- popup="panelpopup"/> -->
</action>
</rule>
<!-- Command Toolbar Items -->
<rule>
<conditions>
<content uri="?uri"/>
<triple subject="?uri"
predicate="http://home.netscape.com/NC-rdf#child"
object="?items"/>
<member container="?items" child="?item"/>
<triple subject="?item"
predicate="http://home.netscape.com/NC-rdf#Class"
object="button-toolbar-1"/>
</conditions>
<bindings>
<binding subject="?item"
predicate="http://home.netscape.com/NC-rdf#Name"
object="?item-name"/>
<binding subject="?item"
predicate="http://home.netscape.com/NC-rdf#Icon"
object="?item-icon"/>
<binding subject="?item"
predicate="http://home.netscape.com/NC-rdf#Type"
object="?item-type"/>
<binding subject="?item"
predicate="http://home.netscape.com/NC-rdf#disabled"
object="?item-disabled"/>
</bindings>
<action>
<button uri="?item" class="button-toolbar-1 ?item-type" label="?item-name"
src="?item-icon" type="?item-icon" crop="right"
loading="?item-busy" disabled="?item-disabled"/>
</action>
</rule>
<!-- This Sucks. Put here for now
<rule>
<conditions>
<content uri="?uri"/>
<triple subject="?uri"
predicate="http://home.netscape.com/NC-rdf#child"
object="?items"/>
<member container="?items" child="?item"/>
<triple subject="?item"
predicate="http://home.netscape.com/NC-rdf#title"
object="?title"/>
<triple subject="?item"
predicate="http://home.netscape.com/NC-rdf#content"
object="?content"/>
</conditions>
<action>
<button uri="?item" class="button-toolbar bookmark-item"
label="?content" content="?content"
popup="panelpopup"/>
</action>
</rule>-->
</template>
</overlay>

6
xpfe/browser/resources/content/toolbarTest.xul
Просмотреть файл

@ -11,8 +11,6 @@
xmlns:nc="http://home.netscape.com/NC-rdf#"
orient="vertical" onload="resetToolbars();">
<popupset id="aTooltipSet"/>
<script>
<![CDATA[
var rdfs = Components.classes["@mozilla.org/rdf/rdf-service;1"].getService(Components.interfaces.nsIRDFService);
@ -135,7 +133,7 @@
</bindings>
<action>
<toolbar uri="?item" class="?item-class"
grippytooltip="aTooltip" grippytooltiptext="?item-name"/>
grippytooltiptext="?item-name"/>
</action>
</rule>
@ -181,7 +179,7 @@
</bindings>
<action>
<button uri="?items" class="?item-class button-toolbar bookmarkitem" label="?uri"
tooltip="aTooltip" tooltiptext="?item-name"
tooltiptext="?item-name"
src="?item-icon" type="?item-icon" crop="right"/>
</action>
</rule>