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

Bug 676991 - Move toolbar print button to utilityOverlay r=neil/standard8

This commit is contained in:
Ian Neal 2011-09-24 13:53:14 +01:00
Родитель f02cc6ea4f
Коммит 9b61be8226
21 изменённых файлов: 129 добавлений и 302 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
editor/ui/composer/content/editor.xul
Просмотреть файл

@ -271,7 +271,7 @@
<toolbarbutton id="cutButton"/>
<toolbarbutton id="copyButton"/>
<toolbarbutton id="pasteButton"/>
<toolbarbutton id="printButton"/>
<toolbarbutton id="print-button"/>
<toolbarbutton id="findButton"/>
<toolbarseparator class="toolbarseparator-primary"/>
<toolbarbutton id="linkButton"/>

16
editor/ui/composer/content/editorOverlay.xul
Просмотреть файл

@ -1136,21 +1136,11 @@
command="cmd_paste"
tooltiptext="&pasteToolbarCmd.tooltip;"/>
<toolbarbutton id="printButton" type="menu-button" class="toolbarbutton-1"
<toolbarbutton id="print-button"
label="&printToolbarCmd.label;"
tooltiptext="&printToolbarCmd.tooltip;"
oncommand="if (event.target==this) goDoCommand('cmd_print');">
<menupopup id="printMenu">
<menuitem id="printMenuItemToolbar" accesskey="&printCmd.accesskey;" label="&printCmd.label;" default="true"
oncommand="goDoCommand('cmd_print');"/>
tooltiptext="&printToolbarCmd.tooltip;"/>
<!-- 'printSetupToolbar' is merged in here from platformGlobalOverlay.xul -->
<menuitem id="printPreviewMenuItemToolbar"
label="&printPreviewCmd.label;"
accesskey="&printPreviewCmd.accesskey;"
oncommand="goDoCommand('cmd_printpreview');"/>
</menupopup>
</toolbarbutton>
<toolbarbutton id="findButton"
class="toolbarbutton-1"
label="&findToolbarCmd.label;"

4
editor/ui/locales/en-US/chrome/composer/editorOverlay.dtd
Просмотреть файл

@ -68,10 +68,6 @@
<!ENTITY publishAsCmd.accesskey "h">
<!ENTITY saveAsChangeEncodingCmd.label "Save And Change Character Encoding">
<!ENTITY saveAsChangeEncodingCmd.accesskey "E">
<!ENTITY printCmd.label "Print…">
<!ENTITY printCmd.accesskey "P">
<!ENTITY printPreviewCmd.label "Print Preview">
<!ENTITY printPreviewCmd.accesskey "v">
<!-- Edit menu items -->
<!ENTITY editMenu.label "Edit">

13
suite/browser/navigator.xul
Просмотреть файл

@ -371,18 +371,9 @@
<searchbar id="searchbar" flex="1"/>
</toolbaritem>
<toolbarbutton id="print-button" type="menu-button"
class="toolbarbutton-1 chromeclass-toolbar-additional"
<toolbarbutton id="print-button"
label="&printButton.label;"
oncommand="if (event.target==this) PrintUtils.print();"
tooltiptext="&printButton.tooltip;">
<menupopup id="printMenu">
<menuitem id="printMenuItemToolbar" label="&printCmd.label;" accesskey="&printCmd.accesskey;"
default="true" oncommand="PrintUtils.print()"/>
<menuitem id="printPreviewMenuItemToolbar" label="&printPreviewCmd.label;" accesskey="&printPreviewCmd.accesskey;"
oncommand="setTimeout(BrowserPrintPreview, 0);"/>
</menupopup>
</toolbarbutton>
tooltiptext="&printButton.tooltip;"/>
<toolbaritem id="throbber-box" align="center">
<button id="navigator-throbber"

17
suite/common/utilityOverlay.xul
Просмотреть файл

@ -478,6 +478,23 @@
<!-- Additional items are generated, see popupNotificationMenuShowing() -->
</menupopup>
<toolbarbutton id="print-button"
type="menu-button"
class="toolbarbutton-1 chromeclass-toolbar-additional"
command="cmd_print">
<menupopup id="printMenu">
<menuitem id="printMenuItemToolbar"
label="&printCmd.label;"
accesskey="&printCmd.accesskey;"
default="true"
command="cmd_print"/>
<menuitem id="printPreviewMenuItemToolbar"
label="&printPreviewCmd.label;"
accesskey="&printPreviewCmd.accesskey;"
command="cmd_printpreview"/>
</menupopup>
</toolbarbutton>
<!-- Sync toolbar button -->
<toolbarbutton id="sync-button"
class="toolbarbutton-1 chromeclass-toolbar-additional"

2
suite/debugQA/content/debugQATextEditorShell.xul
Просмотреть файл

@ -162,7 +162,7 @@
<toolbarbutton id="newButton"/>
<toolbarbutton id="openButton"/>
<toolbarbutton id="saveButton"/>
<toolbarbutton id="printButton"/>
<toolbarbutton id="print-button"/>
<toolbarseparator class="toolbarseparator-primary"/>
<toolbarbutton id="spellingButton"/>
<spacer flex="1"/>

5
suite/locales/en-US/chrome/browser/navigator.dtd
Просмотреть файл

@ -14,11 +14,6 @@
<!ENTITY editPageCmd.accesskey "E">
<!ENTITY editPageCmd.commandkey "e">
<!ENTITY printPreviewCmd.label "Print Preview">
<!ENTITY printPreviewCmd.accesskey "v">
<!ENTITY printCmd.label "Print…">
<!ENTITY printCmd.accesskey "p">
<!ENTITY navbarCmd.label "Navigation Toolbar">
<!ENTITY navbarCmd.accesskey "N">
<!ENTITY personalbarCmd.label "Personal Toolbar">

4
suite/locales/en-US/chrome/mailnews/messenger.dtd
Просмотреть файл

@ -107,10 +107,6 @@
<!ENTITY downloadSelectedCmd.accesskey "t">
<!ENTITY downloadFlaggedCmd.label "Get Flagged Messages">
<!ENTITY downloadFlaggedCmd.accesskey "G">
<!ENTITY printCmd.label "Print…">
<!ENTITY printCmd.accesskey "P">
<!ENTITY printPreviewCmd.label "Print Preview">
<!ENTITY printPreviewCmd.accesskey "v">
<!-- Edit Menu -->
<!ENTITY deleteMsgCmd.label "Delete Message">

19
suite/mailnews/mailWindowOverlay.xul
Просмотреть файл

@ -2252,25 +2252,10 @@
command="cmd_markAsFlagged"/>
</menupopup>
</toolbarbutton>
<toolbarbutton id="button-print"
class="toolbarbutton-1"
type="menu-button"
<toolbarbutton id="print-button"
label="&printButton.label;"
observes="button_print"
oncommand="goDoCommand('cmd_print')"
tooltiptext="&printButton.tooltip;">
<menupopup id="printMenu"
onpopupshowing="goUpdateCommand('cmd_printpreview');">
<menuitem id="button-printMenu"
label="&printCmd.label;"
accesskey="&printCmd.accesskey;"
default="true"/>
<menuitem id="button-printPreviewMenu"
label="&printPreviewCmd.label;"
accesskey="&printPreviewCmd.accesskey;"
command="cmd_printpreview"/>
</menupopup>
</toolbarbutton>
tooltiptext="&printButton.tooltip;"/>
<toolbarbutton id="button-stop"
class="toolbarbutton-1"
label="&stopButton.label;"

36
suite/themes/classic/communicator/communicator.css
Просмотреть файл

@ -109,6 +109,42 @@ menuitem.menuitem-iconic > .menu-iconic-left {
display: -moz-box;
}
/* ::::: toolbar print button ::::: */
#print-button {
list-style-image: url("chrome://communicator/skin/icons/communicatoricons.png");
-moz-image-region: rect(0 29px 29px 0);
}
#print-button:hover {
-moz-image-region: rect(0 59px 29px 30px);
}
#print-button:hover:active {
-moz-image-region: rect(0 89px 29px 60px);
}
#print-button[disabled="true"] {
-moz-image-region: rect(0 119px 29px 90px) !important;
}
toolbar[iconsize="small"] > toolbarpaletteitem > #print-button,
toolbar[iconsize="small"] > #print-button {
list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
-moz-image-region: rect(0 19px 19px 0);
}
toolbar[iconsize="small"] > #print-button:hover {
-moz-image-region: rect(0 39px 19px 20px);
}
toolbar[iconsize="small"] > #print-button:hover:active {
-moz-image-region: rect(0 59px 19px 40px);
}
toolbar[iconsize="small"] > #print-button[disabled="true"] {
-moz-image-region: rect(0 79px 19px 60px) !important;
}
/* ::::: lightweight themes ::::: */
toolbar button:-moz-lwtheme,

19
suite/themes/classic/editor/editorPrimaryToolbar.css
Просмотреть файл

@ -126,23 +126,6 @@
-moz-image-region: rect(180px 119px 209px 90px) !important;
}
#printButton {
list-style-image: url("chrome://communicator/skin/icons/communicatoricons.png");
-moz-image-region: rect(0 29px 29px 0);
}
#printButton:hover {
-moz-image-region: rect(0 59px 29px 30px);
}
#printButton:hover:active {
-moz-image-region: rect(0 89px 29px 60px);
}
#printButton[disabled="true"] {
-moz-image-region: rect(0 119px 29px 90px);
}
#linkButton {
-moz-image-region: rect(90px 29px 119px 0);
}
@ -301,4 +284,4 @@
#findButton[disabled="true"] {
-moz-image-region: rect(420px 119px 449px 90px) !important;
}
}

30
suite/themes/classic/mac/communicator/communicator.css
Просмотреть файл

@ -108,6 +108,36 @@ grippy {
margin: 0px !important;
}
/* ::::: toolbar print button ::::: */
#print-button {
list-style-image: url("chrome://communicator/skin/icons/communicatoricons.png");
-moz-image-region: rect(0 29px 29px 0);
}
#print-button:hover:active,
#print-button[open] {
-moz-image-region: rect(0 59px 29px 30px);
}
#print-button[disabled="true"] {
-moz-image-region: rect(0 89px 29px 60px) !important;
}
toolbar[iconsize="small"] > toolbarpaletteitem > #print-button,
toolbar[iconsize="small"] > #print-button {
list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
-moz-image-region: rect(0 19px 19px 0);
}
toolbar[iconsize="small"] > #print-button:hover:active,
toolbar[iconsize="small"] > #print-button[open] {
-moz-image-region: rect(0 39px 19px 20px);
}
toolbar[iconsize="small"] > #print-button[disabled="true"] {
-moz-image-region: rect(0 59px 19px 40px) !important;
}
/* ::::: lightweight themes ::::: */
toolbar textbox:-moz-lwtheme:not([focused="true"]) {

14
suite/themes/classic/mac/editor/editorPrimaryToolbar.css
Просмотреть файл

@ -106,20 +106,6 @@
-moz-image-region: rect(180px 89px 209px 60px) !important;
}
#printButton {
list-style-image: url("chrome://communicator/skin/icons/communicatoricons.png");
-moz-image-region: rect(0 29px 29px 0);
}
#printButton:hover:active,
#printButton[open] {
-moz-image-region: rect(0 59px 29px 30px);
}
#printButton[disabled="true"] {
-moz-image-region: rect(0 89px 29px 60px);
}
#linkButton {
-moz-image-region: rect(90px 29px 119px 0);
}

29
suite/themes/classic/mac/messenger/primaryToolbar.css
Просмотреть файл

@ -215,20 +215,6 @@ toolbarpaletteitem > #button-delete {
-moz-image-region: rect(360px 89px 389px 60px) !important;
}
#button-print {
list-style-image: url("chrome://communicator/skin/icons/communicatoricons.png");
-moz-image-region: rect(0 29px 29px 0);
}
#button-print:hover:active,
#button-print[open] {
-moz-image-region: rect(0 59px 29px 30px);
}
#button-print[disabled="true"] {
-moz-image-region: rect(0 89px 29px 60px) !important;
}
#button-stop {
list-style-image: url("chrome://communicator/skin/icons/communicatoricons.png");
-moz-image-region: rect(30px 29px 59px 0);
@ -446,21 +432,6 @@ toolbar[iconsize="small"] > toolbarpaletteitem > #button-junk[disabled] {
-moz-image-region: rect(240px 59px 259px 40px) !important;
}
toolbar[iconsize="small"] > #button-print,
toolbar[iconsize="small"] > toolbarpaletteitem > #button-print {
list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
-moz-image-region: rect(0 19px 19px 0);
}
toolbar[iconsize="small"] > #button-print:hover:active,
toolbar[iconsize="small"] > #button-print[open] {
-moz-image-region: rect(0 39px 19px 20px);
}
toolbar[iconsize="small"] > #button-print[disabled="true"] {
-moz-image-region: rect(0 59px 19px 40px) !important;
}
toolbar[iconsize="small"] > #button-stop,
toolbar[iconsize="small"] > toolbarpaletteitem > #button-stop {
list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");

29
suite/themes/classic/mac/navigator/navigator.css
Просмотреть файл

@ -109,20 +109,6 @@
-moz-image-region: rect(30px 89px 59px 60px) !important;
}
#print-button {
list-style-image: url("chrome://communicator/skin/icons/communicatoricons.png");
-moz-image-region: rect(0 29px 29px 0);
}
#print-button:hover:active,
#print-button[open] {
-moz-image-region: rect(0 59px 29px 30px);
}
#print-button[disabled="true"] {
-moz-image-region: rect(0 89px 29px 60px) !important;
}
#home-button {
list-style-image: url("chrome://communicator/skin/icons/communicatoricons.png");
-moz-image-region: rect(120px 29px 149px 0);
@ -204,21 +190,6 @@ toolbar[iconsize="small"] > #stop-button[disabled="true"] {
-moz-image-region: rect(20px 59px 39px 40px) !important;
}
toolbar[iconsize="small"] > toolbarpaletteitem > #print-button,
toolbar[iconsize="small"] > #print-button {
list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
-moz-image-region: rect(0 19px 19px 0);
}
toolbar[iconsize="small"] > #print-button:hover:active,
toolbar[iconsize="small"] > #print-button[open] {
-moz-image-region: rect(0 39px 19px 20px);
}
toolbar[iconsize="small"] > #print-button[disabled="true"] {
-moz-image-region: rect(0 59px 19px 40px) !important;
}
toolbar[iconsize="small"] > toolbarpaletteitem > #home-button,
toolbar[iconsize="small"] > #home-button {
list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");

35
suite/themes/classic/messenger/primaryToolbar.css
Просмотреть файл

@ -254,23 +254,6 @@ toolbarpaletteitem > #button-delete {
-moz-image-region: rect(360px 119px 389px 90px) !important;
}
#button-print {
list-style-image: url("chrome://communicator/skin/icons/communicatoricons.png");
-moz-image-region: rect(0 29px 29px 0);
}
#button-print:hover {
-moz-image-region: rect(0 59px 29px 30px);
}
#button-print:hover:active {
-moz-image-region: rect(0 89px 29px 60px);
}
#button-print[disabled] {
-moz-image-region: rect(0 119px 29px 90px) !important;
}
#button-stop {
list-style-image: url("chrome://communicator/skin/icons/communicatoricons.png");
-moz-image-region: rect(30px 29px 59px 0);
@ -538,24 +521,6 @@ toolbar[iconsize="small"] > toolbarpaletteitem > #button-junk[disabled] {
-moz-image-region: rect(240px 79px 259px 60px) !important;
}
toolbar[iconsize="small"] > #button-print,
toolbar[iconsize="small"] > toolbarpaletteitem > #button-print {
list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
-moz-image-region: rect(0 19px 19px 0);
}
toolbar[iconsize="small"] > #button-print:hover {
-moz-image-region: rect(0 39px 19px 20px);
}
toolbar[iconsize="small"] > #button-print:hover:active {
-moz-image-region: rect(0 59px 19px 40px);
}
toolbar[iconsize="small"] > #button-print[disabled] {
-moz-image-region: rect(0 79px 19px 60px) !important;
}
toolbar[iconsize="small"] > #button-stop,
toolbar[iconsize="small"] > toolbarpaletteitem > #button-stop {
list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");

35
suite/themes/classic/navigator/navigator.css
Просмотреть файл

@ -112,23 +112,6 @@
-moz-image-region: rect(30px 119px 59px 90px) !important;
}
#print-button {
list-style-image: url("chrome://communicator/skin/icons/communicatoricons.png");
-moz-image-region: rect(0 29px 29px 0);
}
#print-button:hover {
-moz-image-region: rect(0 59px 29px 30px);
}
#print-button:hover:active {
-moz-image-region: rect(0 89px 29px 60px);
}
#print-button[disabled="true"] {
-moz-image-region: rect(0 119px 29px 90px) !important;
}
#home-button {
list-style-image: url("chrome://communicator/skin/icons/communicatoricons.png");
-moz-image-region: rect(120px 29px 149px 0);
@ -228,24 +211,6 @@ toolbar[iconsize="small"] > #stop-button[disabled="true"] {
-moz-image-region: rect(20px 79px 39px 60px) !important;
}
toolbar[iconsize="small"] > toolbarpaletteitem > #print-button,
toolbar[iconsize="small"] > #print-button {
list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
-moz-image-region: rect(0 19px 19px 0);
}
toolbar[iconsize="small"] > #print-button:hover {
-moz-image-region: rect(0 39px 19px 20px);
}
toolbar[iconsize="small"] > #print-button:hover:active {
-moz-image-region: rect(0 59px 19px 40px);
}
toolbar[iconsize="small"] > #print-button[disabled="true"] {
-moz-image-region: rect(0 79px 19px 60px) !important;
}
toolbar[iconsize="small"] > toolbarpaletteitem > #home-button,
toolbar[iconsize="small"] > #home-button {
list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");

36
suite/themes/modern/communicator/communicator.css
Просмотреть файл

@ -87,3 +87,39 @@
border: none;
margin: 0px !important;
}
/* ::::: toolbar print button ::::: */
#print-button {
list-style-image: url("chrome://communicator/skin/icons/common.png");
-moz-image-region: rect(0 42px 39px 0);
}
#print-button:hover {
-moz-image-region: rect(0 84px 39px 42px);
}
#print-button:hover:active {
-moz-image-region: rect(0 126px 39px 84px);
}
#print-button[disabled="true"] {
-moz-image-region: rect(0 168px 39px 126px) !important;
}
toolbar[iconsize="small"] > toolbarpaletteitem > #print-button,
toolbar[iconsize="small"] > #print-button {
list-style-image: url("chrome://communicator/skin/icons/common-small.png");
-moz-image-region: rect(0 19px 19px 0);
}
toolbar[iconsize="small"] > #print-button:hover {
-moz-image-region: rect(0 38px 19px 19px);
}
toolbar[iconsize="small"] > #print-button:hover:active {
-moz-image-region: rect(0 57px 19px 38px);
}
toolbar[iconsize="small"] > #print-button[disabled="true"] {
-moz-image-region: rect(0 76px 19px 57px) !important;
}

17
suite/themes/modern/editor/editorPrimaryToolbar.css
Просмотреть файл

@ -138,23 +138,6 @@
-moz-image-region: rect(204px 199px 237px 150px) !important;
}
#printButton {
list-style-image: url("chrome://communicator/skin/icons/btn1.gif");
-moz-image-region: rect(34px 49px 67px 0);
}
#printButton:hover {
-moz-image-region: rect(34px 99px 67px 50px);
}
#printButton:hover:active {
-moz-image-region: rect(34px 149px 67px 100px);
}
#printButton[disabled="true"] {
-moz-image-region: rect(34px 199px 67px 150px);
}
#linkButton {
-moz-image-region: rect(102px 49px 135px 0);
}

34
suite/themes/modern/messenger/primaryToolbar.css
Просмотреть файл

@ -265,23 +265,6 @@ toolbarpaletteitem > #button-delete {
-moz-image-region: rect(544px 199px 577px 150px) !important;
}
#button-print {
list-style-image: url("chrome://communicator/skin/icons/btn1.gif");
-moz-image-region: rect(34px 49px 67px 0);
}
#button-print:hover {
-moz-image-region: rect(34px 99px 67px 50px);
}
#button-print:hover:active {
-moz-image-region: rect(34px 149px 67px 100px);
}
#button-print[disabled] {
-moz-image-region: rect(34px 199px 67px 150px) !important;
}
#button-stop {
list-style-image: url("chrome://communicator/skin/icons/btn1.gif");
-moz-image-region: rect(68px 49px 101px 0);
@ -340,23 +323,6 @@ toolbar[iconsize="small"] #button-delete {}
toolbar[iconsize="small"] #button-mark {}
*/
toolbar[iconsize="small"] #button-print {
list-style-image: url("chrome://communicator/skin/icons/common-small.png");
-moz-image-region: rect(0 19px 19px 0);
}
toolbar[iconsize="small"] #button-print:hover {
-moz-image-region: rect(0 38px 19px 19px);
}
toolbar[iconsize="small"] #button-print:hover:active {
-moz-image-region: rect(0 57px 19px 38px);
}
toolbar[iconsize="small"] #button-print[disabled] {
-moz-image-region: rect(0 76px 19px 57px) !important;
}
toolbar[iconsize="small"] #button-stop {
list-style-image: url("chrome://communicator/skin/icons/common-small.png");
-moz-image-region: rect(19px 19px 38px 0);

35
suite/themes/modern/navigator/navigator.css
Просмотреть файл

@ -123,23 +123,6 @@ toolbox {
-moz-image-region: rect(39px 168px 78px 126px) !important;
}
#print-button {
list-style-image: url("chrome://communicator/skin/icons/common.png");
-moz-image-region: rect(0 42px 39px 0);
}
#print-button:hover {
-moz-image-region: rect(0 84px 39px 42px);
}
#print-button:hover:active {
-moz-image-region: rect(0 126px 39px 84px);
}
#print-button[disabled="true"] {
-moz-image-region: rect(0 168px 39px 126px) !important;
}
#home-button {
list-style-image: url("chrome://communicator/skin/icons/common.png");
-moz-image-region: rect(156px 42px 195px 0);
@ -246,24 +229,6 @@ toolbar[iconsize="small"] > #stop-button[disabled="true"] {
-moz-image-region: rect(19px 76px 38px 57px) !important;
}
toolbar[iconsize="small"] > toolbarpaletteitem > #print-button,
toolbar[iconsize="small"] > #print-button {
list-style-image: url("chrome://communicator/skin/icons/common-small.png");
-moz-image-region: rect(0 19px 19px 0);
}
toolbar[iconsize="small"] > #print-button:hover {
-moz-image-region: rect(0 38px 19px 19px);
}
toolbar[iconsize="small"] > #print-button:hover:active {
-moz-image-region: rect(0 57px 19px 38px);
}
toolbar[iconsize="small"] > #print-button[disabled="true"] {
-moz-image-region: rect(0 76px 19px 57px) !important;
}
toolbar[iconsize="small"] > toolbarpaletteitem > #home-button,
toolbar[iconsize="small"] > #home-button {
list-style-image: url("chrome://communicator/skin/icons/common-small.png");