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

Rework the folder pane column title, make it a sidebar header ala firebird. 

Don't allow the user to drag and drop icons into the menu bar.
This commit is contained in:
scott%scott-macgregor.org 2003-05-23 04:31:43 +00:00
Родитель b19bcb9639
Коммит 17e5ee9332
8 изменённых файлов: 274 добавлений и 13 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

139
mail/base/content/folderPane.xul Normal file
Просмотреть файл

@ -0,0 +1,139 @@
<?xml version="1.0"?>
<!--
The contents of this file are subject to the Netscape Public
License Version 1.1 (the "License"); you may not use this file
except in compliance with the License. You may obtain a copy of
the License at http://www.mozilla.org/NPL/
Software distributed under the License is distributed on an "AS
IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
implied. See the License for the specific language governing
rights and limitations under the License.
The Original Code is Mozilla Communicator client code, released
March 31, 1998.
The Initial Developer of the Original Code is Netscape
Communications Corporation. Portions created by Netscape are
Copyright (C) 1998-1999 Netscape Communications Corporation. All
Rights Reserved.
Contributor(s):
Jan Varga <varga@utcru.sk>
Hkan Waara <hwaara@chello.se>
-->
<?xml-stylesheet href="chrome://messenger/skin/folderPane.css" type="text/css"?>
<?xml-stylesheet href="chrome://messenger/skin/folderPaneExtras.css" type="text/css"?>
<?xml-stylesheet href="chrome://messenger/skin/fakeAccount.css" type="text/css"?>
<!DOCTYPE overlay SYSTEM "chrome://messenger/locale/folderpane.dtd">
<overlay xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<tree id="folderTree" class="plain focusring" flex="1" seltype="single"
disableKeyNavigation="true"
datasources="rdf:null"
hidecolumnpicker="true"
statedatasource="rdf:mailnewsfolders"
flags="dont-build-content"
ondraggesture="BeginDragFolderTree(event);"
onselect="FolderPaneSelectionChange();">
<template>
<rule>
<conditions>
<treeitem uri="?container"/>
<member container="?container" child="?member" />
</conditions>
<bindings>
<binding subject="?member"
predicate="http://home.netscape.com/NC-rdf#FolderTreeName"
object="?folderTreeName" />
<binding subject="?member"
predicate="http://home.netscape.com/NC-rdf#FolderTreeName?sort=true"
object="?folderTreeNameSort" />
<binding subject="?member"
predicate="http://home.netscape.com/NC-rdf#FolderTreeSimpleName"
object="?folderTreeSimpleName" />
<binding subject="?member"
predicate="http://home.netscape.com/NC-rdf#SpecialFolder"
object="?specialFolder" />
<binding subject="?member"
predicate="http://home.netscape.com/NC-rdf#BiffState"
object="?biffState" />
<binding subject="?member"
predicate="http://home.netscape.com/NC-rdf#IsServer"
object="?isServer" />
<binding subject="?member"
predicate="http://home.netscape.com/NC-rdf#NewMessages"
object="?newMessages" />
<binding subject="?member"
predicate="http://home.netscape.com/NC-rdf#HasUnreadMessages"
object="?hasUnreadMessages" />
<binding subject="?member"
predicate="http://home.netscape.com/NC-rdf#SubfoldersHaveUnreadMessages"
object="?subfoldersHaveUnreadMessages" />
<binding subject="?member"
predicate="http://home.netscape.com/NC-rdf#IsSecure"
object="?isSecure" />
<binding subject="?member"
predicate="http://home.netscape.com/NC-rdf#ServerType"
object="?serverType" />
<binding subject="?member"
predicate="http://home.netscape.com/NC-rdf#RedirectorType"
object="?redirectorType" />
<binding subject="?member"
predicate="http://home.netscape.com/NC-rdf#NoSelect"
object="?noSelect" />
<binding subject="?member"
predicate="http://home.netscape.com/NC-rdf#ImapShared"
object="?imapShared" />
<binding subject="?member"
predicate="http://home.netscape.com/NC-rdf#TotalUnreadMessages"
object="?unreadCount" />
<binding subject="?member"
predicate="http://home.netscape.com/NC-rdf#TotalMessages"
object="?totalCount" />
<binding subject="?member"
predicate="http://home.netscape.com/NC-rdf#FolderSize"
object="?folderSize" />
<binding subject="?member"
predicate="http://home.netscape.com/NC-rdf#PageTitleFakeAccount"
object="?fakeAccount" />
</bindings>
<action>
<treechildren>
<treeitem uri="?member">
<treerow>
<treecell id="folderNameCell"
label="?folderTreeName"
properties="specialFolder-?specialFolder biffState-?biffState isServer-?isServer newMessages-?newMessages hasUnreadMessages-?hasUnreadMessages subfoldersHaveUnreadMessages-?subfoldersHaveUnreadMessages isSecure-?isSecure serverType-?serverType redirectorType-?redirectorType noSelect-?noSelect imapShared-?imapShared fakeAccount-?fakeAccount"/>
<treecell label="?unreadCount"
properties="hasUnreadMessages-?hasUnreadMessages subfoldersHaveUnreadMessages-?subfoldersHaveUnreadMessages"/>
<treecell label="?totalCount"
properties="hasUnreadMessages-?hasUnreadMessages subfoldersHaveUnreadMessages-?subfoldersHaveUnreadMessages"/>
<treecell label="?folderSize"/>
</treerow>
</treeitem>
</treechildren>
</action>
</rule>
</template>
<treecols>
<treecol id="folderNameCol"
flex="5"
crop="center"
persist="width"
hideheader="true"
ignoreincolumnpicker="true"
primary="true"
sort="?folderTreeNameSort"
sortActive="true"
sortDirection="ascending"/>
</treecols>
</tree>
</overlay>

3
mail/base/content/mail3PaneWindowVertLayout.xul
Просмотреть файл

@ -145,6 +145,9 @@ Rights Reserved.
<vbox flex="1">
<hbox id="mail3PaneVertLayoutBox" persist="collapsed height" flex="1">
<vbox id="folderPaneBox" flex="1" autostretch="always" persist="width">
<sidebarheader id="folderPaneHeader" align="center">
<label id="folderpane-title" value="&folderPaneHeader.label;"/>
</sidebarheader>
<tree id="folderTree" flex="1" style="min-width: 100px;" context="folderPaneContext" persist="collapsed width height"/>
</vbox>

2
mail/base/content/mailWindowOverlay.xul
Просмотреть файл

@ -968,7 +968,7 @@ Rights Reserved.
<toolbox id="mail-toolbox" class="toolbox-top" mode="icons">
<!-- Menu -->
<toolbar type="menubar" id="mail-toolbar-menubar" class="chromeclass-menubar" customizable="true" defaultset="menubar-items" mode="icons">
<toolbar type="menubar" id="mail-toolbar-menubar" class="chromeclass-menubar" customizable="false" defaultset="menubar-items" mode="icons">
<toolbaritem id="menubar-items" align="center">
<menubar id="mail-menubar" style="border:0px;padding:0px;margin:0px;-moz-appearance:none">
<!-- File -->

3
mail/base/content/messenger.xul
Просмотреть файл

@ -143,6 +143,9 @@ Rights Reserved.
<hbox style="height:100px" flex="1">
<vbox id="folderPaneBox" flex="1" autostretch="always" persist="width">
<sidebarheader id="folderPaneHeader" align="center">
<label id="folderpane-title" value="&folderPaneHeader.label;"/>
</sidebarheader>
<tree id="folderTree" flex="1" style="min-width: 100px;" context="folderPaneContext" persist="collapsed width height"/>
</vbox>

9
mail/base/content/msgMail3PaneWindow.js
Просмотреть файл

@ -899,15 +899,6 @@ function OnLoadFolderPane()
{
UpgradeFolderPaneUI();
var folderUnreadCol = document.getElementById("folderUnreadCol");
var hidden = folderUnreadCol.getAttribute("hidden");
if (hidden != "true")
{
var folderNameCell = document.getElementById("folderNameCell");
folderNameCell.setAttribute("label", "?folderTreeSimpleName");
}
folderUnreadCol.addEventListener("DOMAttrModified", OnFolderUnreadColAttrModified, false);
//Add folderDataSource and accountManagerDataSource to folderPane
accountManagerDataSource = accountManagerDataSource.QueryInterface(Components.interfaces.nsIRDFDataSource);
folderDataSource = folderDataSource.QueryInterface(Components.interfaces.nsIRDFDataSource);

2
mail/base/jar.mn
Просмотреть файл

@ -6,6 +6,7 @@ messenger.jar:
+ content/messenger/mailWindowOverlay.js (content/mailWindowOverlay.js)
+ content/messenger/mailWindowOverlay.xul (content/mailWindowOverlay.xul)
+ content/messenger/messageWindow.xul (content/messageWindow.xul)
+ content/messenger/folderPane.xul (content/folderPane.xul)
+ content/messenger/messageWindow.js (content/messageWindow.js)
+ content/messenger/messenger.xul (content/messenger.xul)
+ content/messenger/msgMail3PaneWindow.js (content/msgMail3PaneWindow.js)
@ -22,6 +23,7 @@ classic.jar:
+ skin/classic/messenger/accountCentral.css (skin/accountCentral.css)
+ skin/classic/messenger/threadPane.css (skin/threadPane.css)
+ skin/classic/messenger/messageHeader.css (skin/messageHeader.css)
+ skin/classic/messenger/mailWindow1.css (skin/mailWindow1.css)
comm.jar:
+ content/navigator/viewSource.xul (content/viewSource.xul)

4
mail/base/locale/messenger.dtd
Просмотреть файл

@ -389,9 +389,7 @@ Rights Reserved.
<!ENTITY openMessageWindowCmd.key "o">
<!-- Folder Pane -->
<!ENTITY nameColumn.label "Name">
<!ENTITY unreadColumn.label "Unread">
<!ENTITY totalColumn.label "Total">
<!ENTITY folderPaneHeader.label "Folders">
<!-- Toolbar items -->
<!ENTITY getMsgButton.label "Get Mail">

125
mail/base/skin/mailWindow1.css Normal file
Просмотреть файл

@ -0,0 +1,125 @@
/*
* The contents of this file are subject to the Netscape Public
* License Version 1.1 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.mozilla.org/NPL/
*
* Software distributed under the License is distributed on an "AS
* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
* implied. See the License for the specific language governing
* rights and limitations under the License.
*
* The Original Code is Mozilla Communicator client code, released
* March 31, 1998.
*
* The Initial Developer of the Original Code is Netscape
* Communications Corporation. Portions created by Netscape are
* Copyright (C) 1998-1999 Netscape Communications Corporation. All
* Rights Reserved.
*
* Contributor(s):
*
*/
/* ===== mailWindow1.css ================================================
== Styles for the main Mail window in the default layout scheme.
======================================================================= */
@import url("chrome://messenger/skin/");
@import url("chrome://messenger/skin/primaryToolbar.css");
@import url("chrome://messenger/skin/folderMenus.css");
@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
/* :::::
:: Make sure the min height is small so we can
:: resize the pane vertically -EDV
::::: */
#messagepanebox {
min-height: 10px;
height: 0px;
}
/* ::::: border adjustments for focus ring and joined splitters ::::: */
/* ..... splitter adjustments ..... */
#gray_vertical_splitter {
border-right: none;
border-bottom: none;
border-left: none;
min-width: 5px;
}
#threadpane-splitter {
border: none;
min-height: 5px;
}
#threadpane-splitter[state="collapsed"] {
border-bottom: 2px solid;
}
/* ..... tree adjustments ..... */
#folderTree {
border-right: 1px solid;
-moz-border-right-colors: ThreeDShadow;
min-width: 1px;
}
#threadTree {
border-bottom: 2px solid;
-moz-border-bottom-colors: ThreeDHighlight ThreeDLightShadow;
min-width: 1px;
}
#threadTree,
#accountCentralBox,
#searchBox {
border-left: 2px solid;
-moz-border-left-colors: ThreeDShadow ThreeDDarkShadow;
}
#searchBox {
border-top: 1px solid ThreeDHighlight;
border-bottom: 1px solid ThreeDShadow;
}
/* we could set this height to 32 pixels to make it the same height as the search bar
but I think it makes the folder Pane header look too big.... use 28px for now
#folderPaneHeader {
height: 32px;
}
*/
#folderpane-title {
font-weight: bold;
}
/* ..... message pane adjustments ..... */
#messagepanebox {
border-top: 2px solid;
border-left: 2px solid;
-moz-border-top-colors: ThreeDShadow ThreeDDarkShadow;
-moz-border-left-colors: ThreeDShadow ThreeDDarkShadow;
}
#msgHeaderView {
border-left: none !important;
}
#messagepane {
border: 1px solid -moz-Field;
border-right: none;
}
#messagepanebox[focusring="true"] > #messagepane {
border-color: #000000;
}