зеркало из https://github.com/mozilla/gecko-dev.git
Bug 20840. Get 'Open Windows' and 'Mozilla' buttons working on the taskbar again. Re-factored 'blue toolbar' menu rules, promoting to global.css so that they could be shared with taskbarOverlay.xul. r=hangas, a=jevering
This commit is contained in:
waterson%netscape.com
Родитель
f16e1a83d9
Коммит
0d668654d0
|
|
@ -21,11 +21,11 @@ Rights Reserved.
|
|||
<?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?>
|
||||
|
||||
<?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
|
||||
<?xul-overlay href="chrome://global/content/tasksOverlay.xul"?>
|
||||
<?xul-overlay href="chrome://messenger/content/threadPane.xul"?>
|
||||
<?xul-overlay href="chrome://messenger/content/folderPane.xul"?>
|
||||
<?xul-overlay href="chrome://messenger/content/msgHdrViewOverlay.xul"?>
|
||||
<?xul-overlay href="chrome://sidebar/content/sidebarOverlay.xul"?>
|
||||
<?xul-overlay href="chrome://global/content/tasksOverlay.xul"?>
|
||||
|
||||
<!DOCTYPE window SYSTEM "chrome://messenger/locale/messenger.dtd">
|
||||
|
||||
|
|
|
|||
|
|
@ -232,7 +232,8 @@ Contributor(s): ______________________________________. -->
|
|||
// - pinkerton
|
||||
-->
|
||||
<menu id="PersonalMenu" datasources="rdf:bookmarks rdf:files rdf:localsearch rdf:internetsearch"
|
||||
ref="NC:BookmarksRoot">
|
||||
ref="NC:BookmarksRoot"
|
||||
oncommand="OpenBookmarkURL(event.target, document.getElementById('PersonalMenu').database)">
|
||||
<titledbutton align="right" class="bookmarkFolder toolbar-flat" container="true"
|
||||
value="&bookmarksButton.label;" crop="right"/>
|
||||
<template>
|
||||
|
|
@ -253,8 +254,7 @@ Contributor(s): ______________________________________. -->
|
|||
<rule>
|
||||
<menupopup>
|
||||
<menuitem class="standard" uri="rdf:*"
|
||||
value="rdf:http://home.netscape.com/NC-rdf#Name"
|
||||
oncommand="OpenBookmarkURL(event.target, document.getElementById('PersonalMenu').database)"/>
|
||||
value="rdf:http://home.netscape.com/NC-rdf#Name" />
|
||||
</menupopup>
|
||||
</rule>
|
||||
</template>
|
||||
|
|
|
|||
|
|
@ -138,24 +138,6 @@ toolbar#PersonalToolbar:-moz-drop-marker {
|
|||
color: white;
|
||||
}
|
||||
|
||||
titledbutton.bookmarkbutton {
|
||||
max-width: 8em;
|
||||
background-image: none;
|
||||
padding-left: 4px ! important;
|
||||
padding-right: 4px ! important;
|
||||
}
|
||||
|
||||
titledbutton.bookmarkbutton:hover,
|
||||
titledbutton.bookmarkbutton:active {
|
||||
padding-left: 4px;
|
||||
padding-right: 4px;
|
||||
}
|
||||
|
||||
titledbutton.bookmarkFolder {
|
||||
background-color: transparent;
|
||||
list-style-image: url("chrome://global/skin/toolbar-dropdown.gif");
|
||||
}
|
||||
|
||||
toolbar#PersonalToolbar #personaltoolbar-endcap {
|
||||
background-color: #CCCCCC;
|
||||
min-width: 68px;
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<template>
|
||||
<rule>
|
||||
<menupopup>
|
||||
<menuitem uri="..." value="rdf:http://home.netscape.com/NC-rdf#Name" oncommand="ShowWindowFromResource(event.target)"/>
|
||||
<menuitem uri="rdf:*" value="rdf:http://home.netscape.com/NC-rdf#Name" oncommand="ShowWindowFromResource(event.target)"/>
|
||||
</menupopup>
|
||||
</rule>
|
||||
</template>
|
||||
|
|
@ -50,7 +50,7 @@
|
|||
<template>
|
||||
<rule>
|
||||
<menupopup>
|
||||
<menuitem uri="..." value="rdf:http://home.netscape.com/NC-rdf#name"
|
||||
<menuitem uri="rdf:*" value="rdf:http://home.netscape.com/NC-rdf#name"
|
||||
oncommand="ShowUpdateFromResource( event.target )"/>
|
||||
</menupopup>
|
||||
</rule>
|
||||
|
|
@ -71,43 +71,57 @@
|
|||
</menu>
|
||||
|
||||
<toolbar id="taskbar" chromeclass="status" persist="collapsed">
|
||||
|
||||
<popup id="mozillaPopup">
|
||||
<menu>
|
||||
<menuitem value="&bonsai.label;" oncommand="OpenTaskURL('http://bonsai.mozilla.org/toplevel.cgi?treeid=SeaMonkey');"/>
|
||||
<menuitem value="&bugzillaButton.label;" oncommand="OpenTaskURL('http://bugzilla.mozilla.org');"/>
|
||||
</menu>
|
||||
</popup>
|
||||
|
||||
<popup id="windowPopup" >
|
||||
<menu oncommand="ShowWindowFromResource(event.target)" datasources="rdf:window-mediator" ref="NC:WindowMediatorRoot" >
|
||||
<template>
|
||||
<rule>
|
||||
<menuitem uri="..." value="rdf:http://home.netscape.com/NC-rdf#Name"/>
|
||||
</rule>
|
||||
</template>
|
||||
</menu>
|
||||
</popup>
|
||||
|
||||
|
||||
<box id="taskButtons" align="horizontal">
|
||||
|
||||
<titledbutton class="toolbar-flat" align="left" id="mini-nav" value="" onclick="toNavigator();"/>
|
||||
<titledbutton class="toolbar-flat" align="left" id="mini-mail" value="" onclick="toMessengerWindow()"/>
|
||||
<titledbutton class="toolbar-flat" align="left" id="mini-addr" value="" onclick="toAddressBook()"/>
|
||||
<titledbutton class="toolbar-flat" align="left" id="mini-comp" value="" onclick="toEditor();" />
|
||||
<titledbutton class="toolbar-flat taskbutton" align="left" id="mini-nav" value="" onclick="toNavigator();"/>
|
||||
<titledbutton class="toolbar-flat taskbutton" align="left" id="mini-mail" value="" onclick="toMessengerWindow()"/>
|
||||
<titledbutton class="toolbar-flat taskbutton" align="left" id="mini-addr" value="" onclick="toAddressBook()"/>
|
||||
<titledbutton class="toolbar-flat taskbutton" align="left" id="mini-comp" value="" onclick="toEditor();" />
|
||||
</box>
|
||||
<spring flex="100%"/>
|
||||
|
||||
<box align="horizontal">
|
||||
<titledbutton align="right" class="popup toolbar-flat" popup="mozillaPopup"
|
||||
popupanchor="bottomright" value="&mozillaButton.label;" />
|
||||
<!-- The "Tasks" menu is a grab bag o' fun little tasks -->
|
||||
<menu>
|
||||
<titledbutton align="right" class="bookmarkFolder toolbar-flat"
|
||||
value="&mozillaButton.label;" crop="right" />
|
||||
|
||||
<titledbutton align="right" class="popup toolbar-flat" value="&openWinButton.label;" popup="windowPopup"
|
||||
popupanchor="topleft" popupalign="bottomleft" />
|
||||
<menupopup class="standard" popupalign="bottomleft" popupanchor="topleft">
|
||||
<menuitem class="standard" value="&bonsai.label;"
|
||||
oncommand="OpenTaskURL('http://bonsai.mozilla.org/toplevel.cgi?treeid=SeaMonkey');"/>
|
||||
|
||||
<menuitem class="standard" value="&bugzillaButton.label;"
|
||||
oncommand="OpenTaskURL('http://bugzilla.mozilla.org');"/>
|
||||
|
||||
</menupopup>
|
||||
|
||||
<spring class="personaltoolbarspacer" flex="1"/>
|
||||
</menu>
|
||||
|
||||
<!-- The "Open Windows" menu uses the window mediator
|
||||
to display all of the open windows -->
|
||||
<menu align="right"
|
||||
oncommand="ShowWindowFromResource(event.target)"
|
||||
datasources="rdf:window-mediator"
|
||||
ref="NC:WindowMediatorRoot" >
|
||||
|
||||
<titledbutton align="right" class="bookmarkFolder toolbar-flat"
|
||||
value="&openWinButton.label;" crop="right" />
|
||||
|
||||
<template>
|
||||
<menupopup>
|
||||
<menuitem class="standard" uri="rdf:*"
|
||||
value="rdf:http://home.netscape.com/NC-rdf#Name"/>
|
||||
</menupopup>
|
||||
</template>
|
||||
|
||||
<menupopup class="standard" popupalign="bottomleft" popupanchor="topleft" />
|
||||
|
||||
<spring class="personaltoolbarspacer" flex="1"/>
|
||||
</menu>
|
||||
</box>
|
||||
<spring flex="100%"/>
|
||||
|
||||
<spring flex="100%"/>
|
||||
</toolbar>
|
||||
|
||||
</overlay>
|
||||
|
|
|
|||
|
|
@ -78,7 +78,11 @@ n-box-navbar.gif
|
|||
n-box.gif
|
||||
toolbar-begincap.gif
|
||||
toolbar-dropdown.gif
|
||||
toolbar-dropdown-hover.gif
|
||||
toolbar-endcap.gif
|
||||
toolbar-menu-arrow.gif
|
||||
toolbar-menu-arrow-disabled.gif
|
||||
toolbar-menu-arrow-hover.gif
|
||||
search.gif
|
||||
animthrob.gif
|
||||
animthrob_single.gif
|
||||
|
|
|
|||
|
|
@ -98,6 +98,10 @@ EXPORT_RESOURCE_CONTENT = \
|
|||
$(srcdir)/toolbar-begincap.gif \
|
||||
$(srcdir)/toolbar-endcap.gif \
|
||||
$(srcdir)/toolbar-dropdown.gif \
|
||||
$(srcdir)/toolbar-dropdown-hover.gif \
|
||||
$(srcdir)/toolbar-menu-arrow.gif \
|
||||
$(srcdir)/toolbar-menu-arrow-disabled.gif \
|
||||
$(srcdir)/toolbar-menu-arrow-hover.gif \
|
||||
$(srcdir)/navbar-bg.gif \
|
||||
$(srcdir)/navbar-endcap.gif \
|
||||
$(srcdir)/navbar-bg-begincap.gif \
|
||||
|
|
|
|||
|
|
@ -439,6 +439,63 @@ titledbutton.toolbar[disabled="true"]:active {
|
|||
}
|
||||
|
||||
|
||||
/**
|
||||
* Bookmarks n' stuff
|
||||
*/
|
||||
|
||||
/* These rules style the buttons that appear in the Personal Toolbar
|
||||
for leaf bookmarks */
|
||||
titledbutton.bookmarkbutton {
|
||||
margin: 0px;
|
||||
max-width: 8em;
|
||||
font: inherit;
|
||||
color: #99CCCC;
|
||||
border: none;
|
||||
padding: 1px;
|
||||
}
|
||||
|
||||
titledbutton.bookmarkbutton:hover {
|
||||
color: #CCFFFF;
|
||||
background-color: #336699;
|
||||
}
|
||||
|
||||
titledbutton.bookmarkbutton:active {
|
||||
color: #CCFFFF;
|
||||
background-color: #336699;
|
||||
padding-left: 2px;
|
||||
padding-top: 2px;
|
||||
padding-right: 0px;
|
||||
padding-bottom: 0px;
|
||||
}
|
||||
|
||||
/* These rules style the menus that appear in the Personal Toolbar
|
||||
for bookmark folders. */
|
||||
titledbutton.bookmarkFolder {
|
||||
margin: 0px;
|
||||
max-width: 8em;
|
||||
font: inherit;
|
||||
color: #99CCCC;
|
||||
border: none;
|
||||
padding: 1px;
|
||||
list-style-image: url("chrome://global/skin/toolbar-dropdown.gif");
|
||||
}
|
||||
|
||||
menu:hover > .bookmarkFolder {
|
||||
color: #CCFFFF;
|
||||
background-color: #336699;
|
||||
list-style-image: url("chrome://global/skin/toolbar-dropdown-hover.gif");
|
||||
}
|
||||
|
||||
menu:active > .bookmarkFolder {
|
||||
color: #CCFFFF;
|
||||
background-color: #336699;
|
||||
padding-left: 2px;
|
||||
padding-top: 2px;
|
||||
padding-right: 0px;
|
||||
padding-bottom: 0px;
|
||||
list-style-image: url("chrome://global/skin/toolbar-dropdown-hover.gif");
|
||||
}
|
||||
|
||||
/**
|
||||
* status-bar
|
||||
*/
|
||||
|
|
@ -879,7 +936,15 @@ menu.standard {
|
|||
}
|
||||
|
||||
menu.standard > .menu-right {
|
||||
list-style-image: url("chrome://global/skin/menu-arrow-hover.gif");
|
||||
list-style-image: url("chrome://global/skin/toolbar-menu-arrow.gif");
|
||||
}
|
||||
|
||||
menu.standard:hover > .menu-right {
|
||||
list-style-image: url("chrome://global/skin/toolbar-menu-arrow-hover.gif");
|
||||
}
|
||||
|
||||
menu.standard[disabled="true"] > .menu-right {
|
||||
list-style-image: url("chrome://global/skin/toolbar-menu-arrow-disabled.gif");
|
||||
}
|
||||
|
||||
menuitem.standard {
|
||||
|
|
|
|||
|
|
@ -103,7 +103,11 @@ install::
|
|||
$(MAKE_INSTALL) otherbutton28-bg-active.gif $(DISTBROWSER)
|
||||
$(MAKE_INSTALL) toolbar-begincap.gif $(DISTBROWSER)
|
||||
$(MAKE_INSTALL) toolbar-dropdown.gif $(DISTBROWSER)
|
||||
$(MAKE_INSTALL) toolbar-dropdown-hover.gif $(DISTBROWSER)
|
||||
$(MAKE_INSTALL) toolbar-endcap.gif $(DISTBROWSER)
|
||||
$(MAKE_INSTALL) toolbar-menu-arrow.gif $(DISTBROWSER)
|
||||
$(MAKE_INSTALL) toolbar-menu-arrow-disabled.gif $(DISTBROWSER)
|
||||
$(MAKE_INSTALL) toolbar-menu-arrow-hover.gif $(DISTBROWSER)
|
||||
$(MAKE_INSTALL) navbar-bg.gif $(DISTBROWSER)
|
||||
$(MAKE_INSTALL) navbar-endcap.gif $(DISTBROWSER)
|
||||
$(MAKE_INSTALL) navbar-bg-begincap.gif $(DISTBROWSER)
|
||||
|
|
|
|||
|
|
@ -26,15 +26,15 @@ toolbar#taskbar {
|
|||
user-focus: ignore;
|
||||
}
|
||||
|
||||
toolbar#taskbar titledbutton {
|
||||
titledbutton.taskbutton {
|
||||
margin-right: 1em;
|
||||
padding-left: 3px;
|
||||
}
|
||||
|
||||
toolbar#taskbar titledbutton:hover {
|
||||
titledbutton.taskbutton:hover {
|
||||
padding-left: 3px;
|
||||
}
|
||||
|
||||
toolbar#taskbar titledbutton:active {
|
||||
titledbutton.taskbutton:active {
|
||||
padding: 2px 0px 0px 4px;
|
||||
}
|
||||
|
|
|
|||
Двоичный файл не отображается.
|
После Ширина: | Высота: | Размер: 58 B |
Двоичные данные
xpfe/global/resources/skin/toolbar-dropdown.gif
Двоичные данные
xpfe/global/resources/skin/toolbar-dropdown.gif
Двоичный файл не отображается.
|
До Ширина: | Высота: | Размер: 44 B После Ширина: | Высота: | Размер: 58 B |
Двоичный файл не отображается.
|
После Ширина: | Высота: | Размер: 55 B |
Двоичный файл не отображается.
|
После Ширина: | Высота: | Размер: 55 B |
Двоичный файл не отображается.
|
После Ширина: | Высота: | Размер: 55 B |
Загрузка…
Ссылка в новой задаче