Bug 511404: tab related bindings should all move to content/tabmail.xml. r=bwinton

This commit is contained in:
Magnus Melin 2009-09-07 21:41:01 +03:00
Родитель 94c1a3448f
Коммит acd4180d8e
12 изменённых файлов: 80 добавлений и 387 удалений

Просмотреть файл

@ -36,11 +36,11 @@
* ***** END LICENSE BLOCK ***** */
.tabmail-tabs {
-moz-binding: url("chrome://messenger/skin/tabmailBindings.xml#tabmail-tabs");
-moz-binding: url("chrome://messenger/content/tabmail.xml#tabmail-tabs");
}
.tabmail-tab {
-moz-binding: url("chrome://messenger/skin/tabmailBindings.xml#tabmail-tab");
-moz-binding: url("chrome://messenger/content/tabmail.xml#tabmail-tab");
}
.tabmail-arrowscrollbox {

Просмотреть файл

@ -22,6 +22,7 @@
- Contributor(s):
- Scott MacGregor <mscott@mozilla.org>
- Andrew Sutherland <asutherland@asutherland.org>
- Magnus Melin <mkmelin+mozilla@iki.fi>
-
- Alternatively, the contents of this file may be used under the terms of
- either the GNU General Public License Version 2 or later (the "GPL"), or
@ -1062,16 +1063,21 @@
</method>
</implementation>
</binding>
<binding id="tabmail-tab" display="xul:box"
<binding id="tabmail-tab" display="xul:box"
extends="chrome://global/content/bindings/tabbox.xml#tab">
<content chromedir="&locale.dir;"
closetabtext="&closeTab.label;">
<xul:hbox class="tab-middle box-inherit" xbl:inherits="align,dir,pack,orient,selected" flex="1">
<xul:image class="tab-icon" xbl:inherits="validate,src=image"/>
<xul:label class="tab-text" xbl:inherits="value=label,accesskey,crop,disabled" flex="1"/>
<xul:hbox class="tab-image-left" xbl:inherits="selected"/>
<xul:hbox class="tab-image-middle box-inherit" align="center"
xbl:inherits="dir,pack,orient,selected" flex="1">
<xul:image class="tab-icon-image" xbl:inherits="validate,src=image"/>
<xul:label class="tab-text"
xbl:inherits="value=label,accesskey,crop,disabled"
crop="right" flex="1"/>
</xul:hbox>
<xul:toolbarbutton anonid="close-button" tabindex="-1" class="tab-close-button"/>
<xul:toolbarbutton anonid="close-button" class="tab-close-button" tabindex="-1"/>
<xul:hbox class="tab-image-right" xbl:inherits="selected"/>
</content>
<implementation>
@ -1185,27 +1191,49 @@
<binding id="tabmail-tabs"
extends="chrome://global/content/bindings/tabbox.xml#tabs">
<content>
<xul:arrowscrollbox anonid="arrowscrollbox" class="tabmail-arrowscrollbox" flex="1"
xbl:inherits="smoothscroll" orient="horizontal" style="min-width: 1px;">
<children includes="tab"/>
</xul:arrowscrollbox>
<children/>
<xul:stack align="center" pack="end" class="tabs-alltabs-stack">
<xul:hbox flex="1" class="tabs-alltabs-box" anonid="alltabs-box"/>
<xul:hbox flex="1" class="tabs-alltabs-box-animate"
anonid="alltabs-box-animate"/>
<xul:toolbarbutton class="tabs-alltabs-button" type="menu"
anonid="alltabs-button"
tooltipstring="&listAllTabs.label;">
<xul:menupopup class="tabs-alltabs-popup"
anonid="alltabs-popup"
position="after_end"/>
</xul:toolbarbutton>
<xul:stack flex="1" class="tabs-stack">
<xul:vbox>
<xul:spacer flex="1"/>
<xul:hbox class="tabs-bottom" align="center"/>
</xul:vbox>
<xul:vbox>
<xul:hbox>
<xul:stack>
<xul:spacer class="tabs-left"/>
</xul:stack>
<xul:arrowscrollbox class="tabmail-arrowscrollbox"
anonid="arrowscrollbox"
orient="horizontal"
flex="1"
style="min-width: 1px;"
chromedir="&locale.dir;">
<children includes="tab"/>
</xul:arrowscrollbox>
<children/>
<xul:stack align="center" pack="end" chromedir="&locale.dir;">
<xul:hbox class="tabs-alltabs-box" anonid="alltabs-box" flex="1"/>
<xul:hbox class="tabs-alltabs-box-animate"
anonid="alltabs-box-animate"
flex="1"/>
<xul:toolbarbutton class="tabs-alltabs-button"
anonid="alltabs-button"
type="menu"
tooltipstring="&listAllTabs.label;">
<xul:menupopup class="tabs-alltabs-popup"
anonid="alltabs-popup" position="after_end"/>
</xul:toolbarbutton>
</xul:stack>
<xul:hbox class="tabs-closebutton-box"
anonid="tabstrip-closebutton"
align="center" pack="end">
<xul:toolbarbutton class="close-button tabs-closebutton"/>
</xul:hbox>
</xul:hbox>
<xul:spacer class="tabs-bottom-spacer"/>
</xul:vbox>
</xul:stack>
<xul:hbox class="tabs-closebutton-box" align="center" pack="end" anonid="tabstrip-closebutton">
<xul:toolbarbutton class="close-button tabs-closebutton"/>
</xul:hbox>
</content>
<implementation implements="nsITimerCallback, nsIDOMEventListener">
<constructor>
<![CDATA[

Просмотреть файл

@ -27,7 +27,6 @@ classic.jar:
skin/classic/messenger/multimessageview.css (mail/multimessageview.css)
skin/classic/messenger/dialogs.css (mail/dialogs.css)
skin/classic/messenger/newmailalert.css (mail/newmailalert.css)
* skin/classic/messenger/tabmailBindings.xml (mail/tabmailBindings.xml)
skin/classic/messenger/tabmail.css (mail/tabmail.css)
skin/classic/messenger/editContactOverlay.css (mail/editContactOverlay.css)
skin/classic/messenger/starred48.png (mail/starred48.png)

Просмотреть файл

@ -1,6 +1,6 @@
/* ::::: Folder Pane ::::: */
.tabmail-tab[type="folder"] > .tab-image-middle > .tab-icon > .tab-icon-image,
.tabmail-tab[type="folder"] > .tab-image-middle > .tab-icon-image,
treechildren::-moz-tree-image(folderNameCol) {
background-position: center center;
background-repeat: no-repeat;
@ -29,7 +29,7 @@ treechildren::-moz-tree-image(folderNameCol, selected, open, newMessages-true) {
/* ..... Newsgroup ..... */
.tabmail-tab[type="folder"][ServerType="nntp"] > .tab-image-middle > .tab-icon > .tab-icon-image,
.tabmail-tab[type="folder"][ServerType="nntp"] > .tab-image-middle > .tab-icon-image,
treechildren::-moz-tree-image(folderNameCol, serverType-nntp) {
background-image: none;
list-style-image: url("chrome://messenger/skin/icons/folder.png");
@ -38,7 +38,7 @@ treechildren::-moz-tree-image(folderNameCol, serverType-nntp) {
/* ..... Feed ..... */
.tabmail-tab[type="folder"][ServerType="rss"] > .tab-image-middle > .tab-icon > .tab-icon-image,
.tabmail-tab[type="folder"][ServerType="rss"] > .tab-image-middle > .tab-icon-image,
treechildren::-moz-tree-image(folderNameCol, serverType-rss) {
background-image: url("chrome://messenger/skin/icons/folder-pane.png");
background-position: left -112px;
@ -53,8 +53,8 @@ treechildren::-moz-tree-image(folderNameCol, serverType-rss, newMessages-true) {
/* Resets list-style-image for Feed Trash and Virtual folders */
.tabmail-tab[type="folder"][SpecialFolder="Trash"][ServerType="rss"] > .tab-image-middle > .tab-icon > .tab-icon-image,
.tabmail-tab[type="folder"][SpecialFolder="Virtual"][ServerType="rss"] > .tab-image-middle > .tab-icon > .tab-icon-image,
.tabmail-tab[type="folder"][SpecialFolder="Trash"][ServerType="rss"] > .tab-image-middle > .tab-icon-image,
.tabmail-tab[type="folder"][SpecialFolder="Virtual"][ServerType="rss"] > .tab-image-middle > .tab-icon-image,
treechildren::-moz-tree-image(folderNameCol, serverType-rss, specialFolder-Trash),
treechildren::-moz-tree-image(folderNameCol, serverType-rss, specialFolder-Virtual) {
background-image: url("chrome://messenger/skin/icons/folder-pane.png");
@ -64,7 +64,7 @@ treechildren::-moz-tree-image(folderNameCol, serverType-rss, specialFolder-Virtu
/* ..... Inbox ..... */
.tabmail-tab[type="folder"][SpecialFolder="Inbox"] > .tab-image-middle > .tab-icon > .tab-icon-image,
.tabmail-tab[type="folder"][SpecialFolder="Inbox"] > .tab-image-middle > .tab-icon-image,
treechildren::-moz-tree-image(folderNameCol, specialFolder-Inbox) {
background-image: url("chrome://messenger/skin/icons/folder-pane.png");
background-position: left -64px;
@ -79,7 +79,7 @@ treechildren::-moz-tree-image(folderNameCol, specialFolder-Inbox, newMessages-tr
/* ..... Sent ..... */
.tabmail-tab[type="folder"][SpecialFolder="Sent"] > .tab-image-middle > .tab-icon > .tab-icon-image,
.tabmail-tab[type="folder"][SpecialFolder="Sent"] > .tab-image-middle > .tab-icon-image,
treechildren::-moz-tree-image(folderNameCol, specialFolder-Sent) {
background-image: url("chrome://messenger/skin/icons/folder-pane.png");
background-position: left -144px;
@ -88,7 +88,7 @@ treechildren::-moz-tree-image(folderNameCol, specialFolder-Sent) {
/* ..... Outbox ..... */
.tabmail-tab[type="folder"][SpecialFolder="Outbox"] > .tab-image-middle > .tab-icon > .tab-icon-image,
.tabmail-tab[type="folder"][SpecialFolder="Outbox"] > .tab-image-middle > .tab-icon-image,
treechildren::-moz-tree-image(folderNameCol, specialFolder-Outbox) {
background-image: url("chrome://messenger/skin/icons/folder-pane.png");
background-position: left -96px;
@ -97,7 +97,7 @@ treechildren::-moz-tree-image(folderNameCol, specialFolder-Outbox) {
/* ..... Drafts ..... */
.tabmail-tab[type="folder"][SpecialFolder="Drafts"] > .tab-image-middle > .tab-icon > .tab-icon-image,
.tabmail-tab[type="folder"][SpecialFolder="Drafts"] > .tab-image-middle > .tab-icon-image,
treechildren::-moz-tree-image(folderNameCol, specialFolder-Drafts) {
background-image: url("chrome://messenger/skin/icons/folder-pane.png");
background-position: left -48px;
@ -106,7 +106,7 @@ treechildren::-moz-tree-image(folderNameCol, specialFolder-Drafts) {
/* ..... Templates ..... */
.tabmail-tab[type="folder"][SpecialFolder="Templates"] > .tab-image-middle > .tab-icon > .tab-icon-image,
.tabmail-tab[type="folder"][SpecialFolder="Templates"] > .tab-image-middle > .tab-icon-image,
treechildren::-moz-tree-image(folderNameCol, specialFolder-Templates) {
background-image: url("chrome://messenger/skin/icons/folder-pane.png");
background-position: left -160px;
@ -115,7 +115,7 @@ treechildren::-moz-tree-image(folderNameCol, specialFolder-Templates) {
/* ..... Junk ..... */
.tabmail-tab[type="folder"][SpecialFolder="Junk"] > .tab-image-middle > .tab-icon > .tab-icon-image,
.tabmail-tab[type="folder"][SpecialFolder="Junk"] > .tab-image-middle > .tab-icon-image,
treechildren::-moz-tree-image(folderNameCol, specialFolder-Junk) {
background-image: url("chrome://messenger/skin/icons/folder-pane.png");
background-position: left -80px;
@ -124,7 +124,7 @@ treechildren::-moz-tree-image(folderNameCol, specialFolder-Junk) {
/* ..... Trash ..... */
.tabmail-tab[type="folder"][SpecialFolder="Trash"] > .tab-image-middle > .tab-icon > .tab-icon-image,
.tabmail-tab[type="folder"][SpecialFolder="Trash"] > .tab-image-middle > .tab-icon-image,
treechildren::-moz-tree-image(folderNameCol, specialFolder-Trash) {
background-image: url("chrome://messenger/skin/icons/folder-pane.png");
background-position: left -176px;
@ -133,7 +133,7 @@ treechildren::-moz-tree-image(folderNameCol, specialFolder-Trash) {
/* ..... Archives ..... */
.tabmail-tab[type="folder"][SpecialFolder="Archive"] > .tab-image-middle > .tab-icon > .tab-icon-image,
.tabmail-tab[type="folder"][SpecialFolder="Archive"] > .tab-image-middle > .tab-icon-image,
treechildren::-moz-tree-image(folderNameCol, specialFolder-Archive) {
background-image: url("chrome://messenger/skin/icons/folder-pane.png");
background-position: left -192px;
@ -150,7 +150,7 @@ treechildren::-moz-tree-image(folderNameCol, imapShared-true) {
/* ..... Saved Search Folder ..... */
.tabmail-tab[type="folder"][SpecialFolder="Virtual"] > .tab-image-middle > .tab-icon > .tab-icon-image,
.tabmail-tab[type="folder"][SpecialFolder="Virtual"] > .tab-image-middle > .tab-icon-image,
treechildren::-moz-tree-image(folderNameCol, specialFolder-Virtual) {
background-image: url("chrome://messenger/skin/icons/folder-pane.png");
background-position: left -128px;
@ -158,14 +158,14 @@ treechildren::-moz-tree-image(folderNameCol, specialFolder-Virtual) {
}
/* ..... Newsgroup ..... */
.tabmail-tab[type="folder"][ServerType="nntp"] > .tab-image-middle > .tab-icon > .tab-icon-image {
.tabmail-tab[type="folder"][ServerType="nntp"] > .tab-image-middle > .tab-icon-image {
background-image: url("chrome://messenger/skin/icons/folder-pane.png");
background-position: left -208px;
list-style-image: url("chrome://messenger/skin/icons/folder-blank.png");
}
/* ..... Account nodes ..... */
.tabmail-tab[type="folder"][IsServer="true"] > .tab-image-middle > .tab-icon > .tab-icon-image {
.tabmail-tab[type="folder"][IsServer="true"] > .tab-image-middle > .tab-icon-image {
-moz-margin-start: 0px;
background-image: url("chrome://messenger/skin/icons/folder-pane.png");
background-position: left -16px;
@ -173,27 +173,27 @@ treechildren::-moz-tree-image(folderNameCol, specialFolder-Virtual) {
}
/* ..... Secure IMAP/POP account nodes ..... */
.tabmail-tab[type="folder"][IsServer="true"][ServerType="imap"][IsSecure="true"] > .tab-image-middle > .tab-icon > .tab-icon-image,
.tabmail-tab[type="folder"][IsServer="true"][ServerType="pop3"][IsSecure="true"] > .tab-image-middle > .tab-icon > .tab-icon-image {
.tabmail-tab[type="folder"][IsServer="true"][ServerType="imap"][IsSecure="true"] > .tab-image-middle > .tab-icon-image,
.tabmail-tab[type="folder"][IsServer="true"][ServerType="pop3"][IsSecure="true"] > .tab-image-middle > .tab-icon-image {
background-position: left -16px;
list-style-image: url("chrome://messenger/skin/icons/folder-blank.png");
}
/* ..... Local folders ..... */
.tabmail-tab[type="folder"][IsServer="true"][ServerType="none"] > .tab-image-middle > .tab-icon > .tab-icon-image {
.tabmail-tab[type="folder"][IsServer="true"][ServerType="none"] > .tab-image-middle > .tab-icon-image {
background-position: left 0px;
list-style-image: url("chrome://messenger/skin/icons/folder-blank.png");
}
/* ..... News server ..... */
.tabmail-tab[type="folder"][IsServer="true"][ServerType="nntp"] > .tab-image-middle > .tab-icon > .tab-icon-image {
.tabmail-tab[type="folder"][IsServer="true"][ServerType="nntp"] > .tab-image-middle > .tab-icon-image {
background-image: none;
list-style-image: url("chrome://messenger/skin/icons/server.png");
-moz-image-region: rect(0 64px 16px 48px);
}
/* ..... Secure news server ..... */
.tabmail-tab[type="folder"][IsServer="true"][ServerType="nntp"][IsSecure="true"] > .tab-image-middle > .tab-icon > .tab-icon-image {
.tabmail-tab[type="folder"][IsServer="true"][ServerType="nntp"][IsSecure="true"] > .tab-image-middle > .tab-icon-image {
background-image: none;
list-style-image: url("chrome://messenger/skin/icons/server.png");
-moz-image-region: rect(0 80px 16px 64px);
@ -263,7 +263,7 @@ treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-nntp, isS
/* ..... Feed server ..... */
.tabmail-tab[type="folder"][IsServer="true"][ServerType="rss"] > .tab-image-middle > .tab-icon > .tab-icon-image,
.tabmail-tab[type="folder"][IsServer="true"][ServerType="rss"] > .tab-image-middle > .tab-icon-image,
treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-rss) {
background-position: left -32px;
list-style-image: url("chrome://messenger/skin/icons/folder-blank.png");

Просмотреть файл

@ -82,15 +82,15 @@ tabpanels {
-moz-image-region: rect(0px, 16px, 16px, 0px);
}
.tabmail-tab[busy] > .tab-image-middle > .tab-icon > .tab-icon-image {
.tabmail-tab[busy] > .tab-image-middle > .tab-icon-image {
list-style-image: url("chrome://global/skin/icons/loading_16.png") !important;
}
.tabmail-tab[thinking] > .tab-image-middle > .tab-icon > .tab-icon-image {
.tabmail-tab[thinking] > .tab-image-middle > .tab-icon-image {
list-style-image: url("chrome://global/skin/icons/loading_16.png") !important;
}
.tabmail-tab[type="glodaSearch"] > .tab-image-middle > .tab-icon > .tab-icon-image {
.tabmail-tab[type="glodaSearch"] > .tab-image-middle > .tab-icon-image {
list-style-image: url("chrome://global/skin/icons/Search-glass.png");
}

Просмотреть файл

@ -1,110 +0,0 @@
<?xml version="1.0"?>
# ***** BEGIN LICENSE BLOCK *****
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
#
# 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 tab mail
#
# The Initial Developer of the Original Code is
# Scott MacGregor <mscott@mozilla.org>.
# Portions created by the Initial Developer are Copyright (C) 2007
# the Initial Developer. All Rights Reserved.
#
# Contributor(s):
#
# Alternatively, the contents of this file may be used under the terms of
# either the GNU General Public License Version 2 or later (the "GPL"), or
# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
# in which case the provisions of the GPL or the LGPL are applicable instead
# of those above. If you wish to allow use of your version of this file only
# under the terms of either the GPL or the LGPL, and not to allow others to
# use your version of this file under the terms of the MPL, indicate your
# decision by deleting the provisions above and replace them with the notice
# and other provisions required by the GPL or the LGPL. If you do not delete
# the provisions above, a recipient may use your version of this file under
# the terms of any one of the MPL, the GPL or the LGPL.
#
# ***** END LICENSE BLOCK *****
<!DOCTYPE bindings [
<!ENTITY % tabMailDTD SYSTEM "chrome://messenger/locale/tabmail.dtd" >
%tabMailDTD;
<!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd">
%globalDTD;
]>
<bindings id="globalBindings"
xmlns="http://www.mozilla.org/xbl"
xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
xmlns:xbl="http://www.mozilla.org/xbl">
<binding id="tabmail-tab" extends="chrome://messenger/content/tabmail.xml#tabmail-tab">
<content chromedir="&locale.dir;"
closetabtext="&closeTab.label;">
<xul:hbox class="tab-image-left" xbl:inherits="selected"/>
<xul:hbox flex="1" class="tab-image-middle" align="center" xbl:inherits="selected">
<xul:stack class="tab-icon">
<xul:image xbl:inherits="validate,src=image" class="tab-icon-image"/>
<xul:image class="tab-extra-status"/>
</xul:stack>
<xul:label flex="1" xbl:inherits="value=label,crop,accesskey" crop="right" class="tab-text"/>
</xul:hbox>
<xul:toolbarbutton anonid="close-button" class="tab-close-button" tabindex="-1"/>
<xul:hbox class="tab-image-right" xbl:inherits="selected"/>
</content>
</binding>
<binding id="tabmail-tabs"
extends="chrome://messenger/content/tabmail.xml#tabmail-tabs">
<content>
<xul:stack flex="1" class="tabs-stack">
<xul:vbox>
<xul:spacer flex="1"/>
<xul:hbox class="tabs-bottom" align="center"/>
</xul:vbox>
<xul:vbox>
<xul:hbox>
<xul:stack>
<xul:spacer class="tabs-left"/>
</xul:stack>
<xul:arrowscrollbox anonid="arrowscrollbox"
orient="horizontal"
flex="1"
style="min-width: 1px;"
chromedir="&locale.dir;"
class="tabmail-arrowscrollbox">
<children includes="tab"/>
</xul:arrowscrollbox>
<children/>
<xul:stack align="center" pack="end" chromedir="&locale.dir;">
<xul:hbox flex="1"
class="tabs-alltabs-box"
anonid="alltabs-box"/>
<xul:hbox flex="1" class="tabs-alltabs-box-animate"
anonid="alltabs-box-animate"/>
<xul:toolbarbutton class="tabs-alltabs-button" type="menu"
anonid="alltabs-button"
tooltipstring="&listAllTabs.label;">
<xul:menupopup class="tabs-alltabs-popup"
anonid="alltabs-popup" position="after_end"/>
</xul:toolbarbutton>
</xul:stack>
<xul:hbox class="tabs-closebutton-box" align="center" pack="end" anonid="tabstrip-closebutton">
<xul:toolbarbutton class="close-button tabs-closebutton"/>
</xul:hbox>
</xul:hbox>
<xul:spacer class="tabs-bottom-spacer"/>
</xul:vbox>
</xul:stack>
</content>
</binding>
</bindings>

Просмотреть файл

@ -24,7 +24,6 @@ classic.jar:
skin/classic/messenger/virtualFolderListDialog.css (mail/virtualFolderListDialog.css)
skin/classic/messenger/searchDialog.css (mail/searchDialog.css)
skin/classic/messenger/filterDialog.css (mail/filterDialog.css)
* skin/classic/messenger/tabmailBindings.xml (mail/tabmailBindings.xml)
skin/classic/messenger/tabmail.css (mail/tabmail.css)
skin/classic/messenger/editContactOverlay.css (mail/editContactOverlay.css)
skin/classic/messenger/starred48.png (mail/starred48.png)

Просмотреть файл

@ -35,16 +35,6 @@
/* ::::: tabmail ::::: */
/* bring in the proper bindings on OS X */
.tabmail-tab {
-moz-binding: url("chrome://messenger/skin/tabmailBindings.xml#tabmail-tab") !important;
}
.tabmail-tabs {
-moz-binding: url("chrome://messenger/skin/tabmailBindings.xml#tabmail-tabs") !important;
}
.tabmail-tabs > .tabmail-tab:first-child > .tab-close-button {
visibility: collapse;
}

Просмотреть файл

@ -1,102 +0,0 @@
<?xml version="1.0"?>
# ***** BEGIN LICENSE BLOCK *****
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
#
# 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 tab mail
#
# The Initial Developer of the Original Code is
# Scott MacGregor <mscott@mozilla.org>.
# Portions created by the Initial Developer are Copyright (C) 2007
# the Initial Developer. All Rights Reserved.
#
# Contributor(s):
#
# Alternatively, the contents of this file may be used under the terms of
# either the GNU General Public License Version 2 or later (the "GPL"), or
# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
# in which case the provisions of the GPL or the LGPL are applicable instead
# of those above. If you wish to allow use of your version of this file only
# under the terms of either the GPL or the LGPL, and not to allow others to
# use your version of this file under the terms of the MPL, indicate your
# decision by deleting the provisions above and replace them with the notice
# and other provisions required by the GPL or the LGPL. If you do not delete
# the provisions above, a recipient may use your version of this file under
# the terms of any one of the MPL, the GPL or the LGPL.
#
# ***** END LICENSE BLOCK *****
<!DOCTYPE bindings [
<!ENTITY % tabMailDTD SYSTEM "chrome://messenger/locale/tabmail.dtd" >
%tabMailDTD;
<!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd">
%globalDTD;
]>
<bindings id="globalBindings"
xmlns="http://www.mozilla.org/xbl"
xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
xmlns:xbl="http://www.mozilla.org/xbl">
<binding id="tabmail-tab" extends="chrome://messenger/content/tabmail.xml#tabmail-tab">
<content chromedir="&locale.dir;"
closetabtext="&closeTab.label;">
<xul:hbox class="tab-image-left" xbl:inherits="selected"/>
<xul:hbox flex="1" class="tab-image-middle" align="center" xbl:inherits="selected">
<xul:image xbl:inherits="validate,src=image,selected" class="tab-icon-image"/>
<xul:label flex="1" xbl:inherits="value=label,crop,accesskey" crop="right" class="tab-text"/>
</xul:hbox>
<xul:toolbarbutton anonid="close-button" class="tab-close-button" tabindex="-1"/>
<xul:hbox class="tab-image-right" xbl:inherits="selected"/>
</content>
</binding>
<binding id="tabmail-tabs"
extends="chrome://messenger/content/tabmail.xml#tabmail-tabs">
<content>
<xul:stack flex="1" class="tabs-stack">
<xul:vbox>
<xul:spacer flex="1"/>
<xul:hbox class="tabs-bottom" align="center"/>
</xul:vbox>
<xul:vbox>
<xul:hbox>
<xul:stack>
<xul:spacer class="tabs-left"/>
</xul:stack>
<xul:arrowscrollbox anonid="arrowscrollbox" orient="horizontal" flex="1" style="min-width: 1px;" class="tabmail-arrowscrollbox">
<children includes="tab"/>
</xul:arrowscrollbox>
<children/>
<xul:stack align="center" pack="end">
<xul:hbox flex="1" class="tabs-alltabs-box"
anonid="alltabs-box"/>
<xul:hbox flex="1" class="tabs-alltabs-box-animate"
anonid="alltabs-box-animate"/>
<xul:toolbarbutton class="tabs-alltabs-button"
type="menu"
anonid="alltabs-button"
tooltipstring="&listAllTabs.label;">
<xul:menupopup class="tabs-alltabs-popup"
anonid="alltabs-popup" position="after_end"/>
</xul:toolbarbutton>
</xul:stack>
<xul:hbox class="tabs-closebutton-box" align="center" pack="end" anonid="tabstrip-closebutton">
<xul:toolbarbutton class="close-button tabs-closebutton"/>
</xul:hbox>
</xul:hbox>
<xul:spacer class="tabs-bottom-spacer"/>
</xul:vbox>
</xul:stack>
</content>
</binding>
</bindings>

Просмотреть файл

@ -66,7 +66,6 @@ classic.jar:
skin/classic/messenger/dialogs.css (mail/dialogs.css)
skin/classic/messenger/multimessageview.css (mail/multimessageview.css)
skin/classic/messenger/newmailalert.css (mail/newmailalert.css)
* skin/classic/messenger/tabmailBindings.xml (mail/tabmailBindings.xml)
skin/classic/messenger/tabmail.css (mail/tabmail.css)
skin/classic/messenger/editContactOverlay.css (mail/editContactOverlay.css)
skin/classic/messenger/starred48.png (mail/starred48.png)
@ -257,7 +256,6 @@ classic.jar:
skin/classic/aero/messenger/dialogs.css (mail/dialogs.css)
skin/classic/aero/messenger/multimessageview.css (mail/multimessageview.css)
skin/classic/aero/messenger/newmailalert.css (mail/newmailalert.css)
* skin/classic/aero/messenger/tabmailBindings.xml (mail/tabmailBindings.xml)
skin/classic/aero/messenger/tabmail.css (mail/tabmail.css)
skin/classic/aero/messenger/editContactOverlay.css (mail/editContactOverlay.css)
skin/classic/aero/messenger/starred48.png (mail/starred48.png)

Просмотреть файл

@ -38,7 +38,6 @@
*/
.tabmail-tabs {
-moz-binding: url("chrome://messenger/skin/tabmailBindings.xml#tabmail-tabs") !important;
padding-top: 0px;
background: -moz-dialog url("chrome://messenger/skin/tabmail-tabs-bkgnd.png") !important;
-moz-padding-start: 0px;
@ -58,7 +57,6 @@
.tabmail-tab {
-moz-appearance: none !important;
-moz-binding: url("chrome://messenger/skin/tabmailBindings.xml#tabmail-tab") !important;
background: transparent !important;
margin: 0px 0px 1px !important;
padding: 0px !important;

Просмотреть файл

@ -1,107 +0,0 @@
<?xml version="1.0"?>
# ***** BEGIN LICENSE BLOCK *****
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
#
# 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 tab mail
#
# The Initial Developer of the Original Code is
# Scott MacGregor <mscott@mozilla.org>.
# Portions created by the Initial Developer are Copyright (C) 2007
# the Initial Developer. All Rights Reserved.
#
# Contributor(s):
#
# Alternatively, the contents of this file may be used under the terms of
# either the GNU General Public License Version 2 or later (the "GPL"), or
# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
# in which case the provisions of the GPL or the LGPL are applicable instead
# of those above. If you wish to allow use of your version of this file only
# under the terms of either the GPL or the LGPL, and not to allow others to
# use your version of this file under the terms of the MPL, indicate your
# decision by deleting the provisions above and replace them with the notice
# and other provisions required by the GPL or the LGPL. If you do not delete
# the provisions above, a recipient may use your version of this file under
# the terms of any one of the MPL, the GPL or the LGPL.
#
# ***** END LICENSE BLOCK *****
<!DOCTYPE bindings [
<!ENTITY % tabMailDTD SYSTEM "chrome://messenger/locale/tabmail.dtd" >
%tabMailDTD;
<!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd">
%globalDTD;
]>
<bindings id="globalBindings"
xmlns="http://www.mozilla.org/xbl"
xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
xmlns:xbl="http://www.mozilla.org/xbl">
<binding id="tabmail-tab" extends="chrome://messenger/content/tabmail.xml#tabmail-tab">
<content chromedir="&locale.dir;"
closetabtext="&closeTab.label;">
<xul:hbox class="tab-image-left" xbl:inherits="selected"/>
<xul:hbox flex="1" class="tab-image-middle" align="center" xbl:inherits="selected">
<xul:image xbl:inherits="validate,src=image" class="tab-icon-image"/>
<xul:label flex="1" xbl:inherits="value=label,crop,accesskey" crop="right" class="tab-text"/>
</xul:hbox>
<xul:toolbarbutton anonid="close-button" class="tab-close-button" tabindex="-1"/>
<xul:hbox class="tab-image-right" xbl:inherits="selected"/>
</content>
</binding>
<binding id="tabmail-tabs"
extends="chrome://messenger/content/tabmail.xml#tabmail-tabs">
<content>
<xul:stack flex="1" class="tabs-stack">
<xul:vbox>
<xul:spacer flex="1"/>
<xul:hbox class="tabs-bottom" align="center"/>
</xul:vbox>
<xul:vbox>
<xul:hbox>
<xul:stack>
<xul:spacer class="tabs-left"/>
</xul:stack>
<xul:arrowscrollbox anonid="arrowscrollbox"
orient="horizontal"
flex="1"
style="min-width: 1px;"
chromedir="&locale.dir;"
class="tabmail-arrowscrollbox">
<children includes="tab"/>
</xul:arrowscrollbox>
<children/>
<xul:stack align="center" pack="end" chromedir="&locale.dir;">
<xul:hbox flex="1"
class="tabs-alltabs-box"
anonid="alltabs-box"/>
<xul:hbox flex="1" class="tabs-alltabs-box-animate"
anonid="alltabs-box-animate"/>
<xul:toolbarbutton class="tabs-alltabs-button" type="menu"
anonid="alltabs-button"
tooltipstring="&listAllTabs.label;">
<xul:menupopup class="tabs-alltabs-popup"
anonid="alltabs-popup" position="after_end"/>
</xul:toolbarbutton>
</xul:stack>
<xul:hbox class="tabs-closebutton-box" align="center" pack="end" anonid="tabstrip-closebutton">
<xul:toolbarbutton class="close-button tabs-closebutton"/>
</xul:hbox>
</xul:hbox>
<xul:spacer class="tabs-bottom-spacer"/>
</xul:vbox>
</xul:stack>
</content>
</binding>
</bindings>