Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-13 19:41:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Begin work on 48244 to clean up 3pane menus. r=alecf. Fix 43480, folder pane background

Browse Source 
is now white.  r=mscott.
This commit is contained in:
putterman%netscape.com 2000-08-18 14:35:32 +00:00
parent 2eb392f657
commit 2783deb7ad
3 changed files with 53 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
mailnews/base/resources/content/commandglue.js
View File

@ -416,6 +416,7 @@ function SortThreadPane(column, sortKey, secondarySortKey, toggleCurrentDirectio
} }
UpdateSortIndicator(column, direction); UpdateSortIndicator(column, direction);
UpdateSortMenu(column);
var folder = GetSelectedFolder(); var folder = GetSelectedFolder();
if(folder) if(folder)
@ -492,6 +493,29 @@ function UpdateSortIndicator(column,sortDirection)
} }
} }
function UpdateSortMenu(currentSortColumn)
{
UpdateSortMenuitem(currentSortColumn, "sortByDateMenuitem", "DateColumn");
UpdateSortMenuitem(currentSortColumn, "sortByFlagMenuitem", "FlaggedButtonColumn");
UpdateSortMenuitem(currentSortColumn, "sortByOrderReceivedMenuitem", "OrderReceivedColumn");
UpdateSortMenuitem(currentSortColumn, "sortByPriorityMenuitem", "PriorityColumn");
UpdateSortMenuitem(currentSortColumn, "sortBySenderMenuitem", "AuthorColumn");
UpdateSortMenuitem(currentSortColumn, "sortBySizeMenuitem", "SizeColumn");
UpdateSortMenuitem(currentSortColumn, "sortByStatusMenuitem", "StatusColumn");
UpdateSortMenuitem(currentSortColumn, "sortBySubjectMenuitem", "SubjectColumn");
UpdateSortMenuitem(currentSortColumn, "sortByUnreadMenuitem", "UnreadButtonColumn");
}
function UpdateSortMenuitem(currentSortColumnID, menuItemID, columnID)
{
var menuItem = document.getElementById(menuItemID);
if(menuItem)
{
menuItem.setAttribute("checked", currentSortColumnID == columnID);
}
}
function SortFolderPane(column, sortKey) function SortFolderPane(column, sortKey)
{ {
var node = FindInSidebar(window, column); var node = FindInSidebar(window, column);
@ -500,7 +524,10 @@ function SortFolderPane(column, sortKey)
dump('Couldnt find sort column\n'); dump('Couldnt find sort column\n');
return false; return false;
} }
return SortColumn(node, sortKey, null, null); SortColumn(node, sortKey, null, null);
//Remove the sortActive attribute because we don't want this pane to have any
//sort styles.
node.setAttribute("sortActive", "false");
} }
function SortColumn(node, sortKey, secondarySortKey, direction) function SortColumn(node, sortKey, secondarySortKey, direction)

60
mailnews/base/resources/content/mailWindowOverlay.xul
View File

@ -118,7 +118,7 @@ Rights Reserved.
<key id="key_nextMsg" key="&nextMsgCmd.key;" control="false" shift="true" observes="cmd_nextMsg"/> <key id="key_nextMsg" key="&nextMsgCmd.key;" control="false" shift="true" observes="cmd_nextMsg"/>
<key id="key_nextUnreadMsg" key="&nextUnreadMsgCmd.key;" control="false" shift="false" observes="cmd_nextUnreadMsg"/> <key id="key_nextUnreadMsg" key="&nextUnreadMsgCmd.key;" control="false" shift="false" observes="cmd_nextUnreadMsg"/>
<key id="key_nextUnreadThread" key="&nextUnreadThreadCmd.key;" control="false" shift="false" observes="cmd_nextUnreadThread"/> <key id="key_nextUnreadThread" key="&nextUnreadThreadCmd.key;" control="false" shift="false" alt="false" observes="cmd_nextUnreadThread"/>
<key id="key_previousMsg" key="&previousMsgCmd.key;" control="false" shift="true" observes="cmd_previousMsg"/> <key id="key_previousMsg" key="&previousMsgCmd.key;" control="false" shift="true" observes="cmd_previousMsg"/>
<key id="key_previousUnreadMsg" key="&previousUnreadMsgCmd.key;" control="false" shift="false" observes="cmd_previousUnreadMsg"/> <key id="key_previousUnreadMsg" key="&previousUnreadMsgCmd.key;" control="false" shift="false" observes="cmd_previousUnreadMsg"/>
<key id="key_reply" key="&replyMsgCmd.key;" xulkey="true" shift="false" observes="cmd_reply"/> <key id="key_reply" key="&replyMsgCmd.key;" xulkey="true" shift="false" observes="cmd_reply"/>
@ -343,7 +343,6 @@ Rights Reserved.
<menuitem id="menu_newEditor"/> <menuitem id="menu_newEditor"/>
</menupopup> </menupopup>
</menu> </menu>
<menuitem value="&openAttachmentCmd.label;" disabled="true" oncommand="MsgOpenAttachment();"/>
<menuseparator/> <menuseparator/>
<menuitem id="menu_close"/> <menuitem id="menu_close"/>
<menu value="&saveAsMenu.label;" accesskey="&saveAsMenu.accesskey;"> <menu value="&saveAsMenu.label;" accesskey="&saveAsMenu.accesskey;">
@ -363,22 +362,20 @@ Rights Reserved.
<menuitem value="&sendUnsentCmd.label;" <menuitem value="&sendUnsentCmd.label;"
accesskey="&sendUnsentCmd.accesskey;" accesskey="&sendUnsentCmd.accesskey;"
oncommand="MsgSendUnsentMsg();"/> oncommand="MsgSendUnsentMsg();"/>
<menuitem value="&emptyTrashCmd.label;"
accesskey="&emptyTrashCmd.accesskey;"
oncommand="MsgEmptyTrash();"/>
<menuitem value="&subscribeCmd.label;" <menuitem value="&subscribeCmd.label;"
accesskey="&subscribeCmd.accesskey;" accesskey="&subscribeCmd.accesskey;"
oncommand="MsgSubscribe();"/> oncommand="MsgSubscribe();"/>
<menuseparator/> <menuseparator/>
<menuitem id="menu_renameFolder" value="&renameFolder.label;" <menuitem id="menu_renameFolder" value="&renameFolder.label;"
accesskey="&renameFolder.accesskey;" accesskey="&renameFolder.accesskey;"
observes="cmd_renameFolder"/> observes="cmd_renameFolder"/>
<menuitem value="&emptyTrashCmd.label;"
accesskey="&emptyTrashCmd.accesskey;"
oncommand="MsgEmptyTrash();"/>
<menuitem value="&compactFolder.label;" accesskey="&compactFolder.accesskey;" oncommand="MsgCompactFolder();"/> <menuitem value="&compactFolder.label;" accesskey="&compactFolder.accesskey;" oncommand="MsgCompactFolder();"/>
<menuseparator/> <menuseparator/>
<menuitem value="&importCmd.label;" accesskey="&importCmd.accesskey;" oncommand="toImport();"/> <menuitem value="&importCmd.label;" accesskey="&importCmd.accesskey;" oncommand="toImport();"/>
<menuseparator/> <menuseparator/>
<menuitem observes="cmd_pageSetup"/>
<menuitem value="&printPreviewCmd.label;" accesskey="&printPreviewCmd.accesskey;" disabled="true" oncommand="PrintPreview();"/>
<menuitem id="printMenuItem" value="&printCmd.label;" accesskey="&printCmd.accesskey;" oncommand="PrintEnginePrint();"/> <menuitem id="printMenuItem" value="&printCmd.label;" accesskey="&printCmd.accesskey;" oncommand="PrintEnginePrint();"/>
<menuseparator/> <menuseparator/>
</menupopup> </menupopup>
@ -396,16 +393,6 @@ Rights Reserved.
<menuitem id="menu_delete"/> <menuitem id="menu_delete"/>
<menuseparator/> <menuseparator/>
<menuitem id="menu_selectAll"/> <menuitem id="menu_selectAll"/>
<menu value="&selectMenu.label;" accesskey="&selectMenu.accesskey;" id="menu_selectMenu">
<menupopup>
<menuitem value="&selectThreadCmd.label;" accesskey="&selectThreadCmd.accesskey;" disabled="true" oncommand="MsgSelectThread();"/>
<menuitem value="&selectFlaggedCmd.label;" accesskey="&selectFlaggedCmd.accesskey;" disabled="true" oncommand="MsgSelectFlaggedMsg();"/>
<!--
<menuseparator/>
<menuitem value="&selectInvertCmd.label;" accesskey="&selectInvertCmd.accesskey;" disabled="true" oncommand="MsgSelectInvertMsg();"/>
-->
</menupopup>
</menu>
<menuseparator/> <menuseparator/>
<menuitem value="&filtersCmd.label;" <menuitem value="&filtersCmd.label;"
accesskey="&filtersCmd.accesskey;" accesskey="&filtersCmd.accesskey;"
@ -437,15 +424,15 @@ Rights Reserved.
<menuseparator/> <menuseparator/>
<menu value="&sortMenu.label;"> <menu value="&sortMenu.label;">
<menupopup> <menupopup>
<menuitem value="&sortByDateCmd.label;" accesskey="&sortByDateCmd.accesskey;" observes="cmd_sortByDate"/> <menuitem id="sortByDateMenuitem" type="checkbox" value="&sortByDateCmd.label;" accesskey="&sortByDateCmd.accesskey;" observes="cmd_sortByDate"/>
<menuitem value="&sortByFlagCmd.label;" accesskey="&sortByFlagCmd.accesskey;" observes="cmd_sortByFlag"/> <menuitem id="sortByFlagMenuitem" type="checkbox" value="&sortByFlagCmd.label;" accesskey="&sortByFlagCmd.accesskey;" observes="cmd_sortByFlag"/>
<menuitem value="&sortByPriorityCmd.label;" accesskey="&sortByPriorityCmd.accesskey;" observes="cmd_sortByPriority"/> <menuitem id="sortByOrderReceivedMenuitem" type="checkbox" value="&sortByOrderReceivedCmd.label;" accesskey="&sortByOrderReceivedCmd.accesskey;" observes="cmd_sortByOrderReceived"/>
<menuitem value="&sortBySenderCmd.label;" accesskey="&sortBySenderCmd.accesskey;" observes="cmd_sortBySender"/> <menuitem id="sortByPriorityMenuitem" type="checkbox" value="&sortByPriorityCmd.label;" accesskey="&sortByPriorityCmd.accesskey;" observes="cmd_sortByPriority"/>
<menuitem value="&sortBySizeCmd.label;" accesskey="&sortBySizeCmd.accesskey;" observes="cmd_sortBySize"/> <menuitem id="sortBySenderMenuitem" type="checkbox" value="&sortBySenderCmd.label;" accesskey="&sortBySenderCmd.accesskey;" observes="cmd_sortBySender"/>
<menuitem value="&sortByStatusCmd.label;" accesskey="&sortByStatusCmd.accesskey;" observes="cmd_sortByStatus"/> <menuitem id="sortBySizeMenuitem" type="checkbox" value="&sortBySizeCmd.label;" accesskey="&sortBySizeCmd.accesskey;" observes="cmd_sortBySize"/>
<menuitem value="&sortBySubjectCmd.label;" accesskey="&sortBySubjectCmd.accesskey;" observes="cmd_sortBySubject"/> <menuitem id="sortByStatusMenuitem" type="checkbox" value="&sortByStatusCmd.label;" accesskey="&sortByStatusCmd.accesskey;" observes="cmd_sortByStatus"/>
<menuitem value="&sortByUnreadCmd.label;" accesskey="&sortByUnreadCmd.accesskey;" observes="cmd_sortByRead"/> <menuitem id="sortBySubjectMenuitem" type="checkbox" value="&sortBySubjectCmd.label;" accesskey="&sortBySubjectCmd.accesskey;" observes="cmd_sortBySubject"/>
<menuitem value="&sortByOrderReceivedCmd.label;" accesskey="&sortByOrderReceivedCmd.accesskey;" observes="cmd_sortByOrderReceived"/> <menuitem id="sortByUnreadMenuitem" type="checkbox" value="&sortByUnreadCmd.label;" accesskey="&sortByUnreadCmd.accesskey;" observes="cmd_sortByRead"/>
</menupopup> </menupopup>
</menu> </menu>
<menu value="&msgsMenu.label;" accesskey="&msgsMenu.accesskey;"> <menu value="&msgsMenu.label;" accesskey="&msgsMenu.accesskey;">
@ -469,13 +456,6 @@ Rights Reserved.
value="&headersNormalCmd.label;" value="&headersNormalCmd.label;"
accesskey="&headersNormalCmd.accesskey;" accesskey="&headersNormalCmd.accesskey;"
oncommand="MsgViewNormalHeaders();"/> oncommand="MsgViewNormalHeaders();"/>
<menuitem id="viewbriefheaders"
type="radio"
name="viewheadergroup"
value="&headersBriefCmd.label;"
accesskey="&headersBriefCmd.accesskey;"
disabled="true"
oncommand="MsgViewBriefHeaders();"/>
</menupopup> </menupopup>
</menu> </menu>
<menuitem id="menu_showThreads" <menuitem id="menu_showThreads"
@ -491,17 +471,11 @@ Rights Reserved.
</menu> </menu>
<menuseparator/> <menuseparator/>
<menuitem value="&viewAttachmentsInlineCmd.label;" accesskey="&viewAttachmentsInlineCmd.accesskey;" disabled="true" oncommand="MsgViewAttachInline();"/> <menuitem value="&viewAttachmentsInlineCmd.label;" accesskey="&viewAttachmentsInlineCmd.accesskey;" disabled="true" oncommand="MsgViewAttachInline();"/>
<menuitem value="&wrapLongLinesCmd.label;" accesskey="&wrapLongLinesCmd.accesskey;" disabled="true" oncommand="MsgWrapLongLines();"/>
<menuseparator/>
<menuitem value="&increaseFontCmd.label;" accesskey="&increaseFontCmd.accesskey;" disabled="true" oncommand="MsgIncreaseFont();"/>
<menuitem value="&decreaseFontCmd.label;" accesskey="&decreaseFontCmd.accesskey;" disabled="true" oncommand="MsgDecreaseFont();"/>
<menuseparator/> <menuseparator/>
<menuitem value="&reloadCmd.label;" accesskey="&reloadCmd.accesskey;" oncommand="MsgReload();"/> <menuitem value="&reloadCmd.label;" accesskey="&reloadCmd.accesskey;" oncommand="MsgReload();"/>
<menuitem value="&showImagesCmd.label;" accesskey="&showImagesCmd.accesskey;" disabled="true" oncommand="MsgShowImages();"/>
<menuitem value="&stopCmd.label;" accesskey="&stopCmd.accesskey;" disabled="true" oncommand="MsgStop();"/> <menuitem value="&stopCmd.label;" accesskey="&stopCmd.accesskey;" disabled="true" oncommand="MsgStop();"/>
<menuseparator/> <menuseparator/>
<menuitem value="&pageSourceCmd.label;" accesskey="&pageSourceCmd.accesskey;" oncommand="MsgViewPageSource();"/> <menuitem value="&pageSourceCmd.label;" accesskey="&pageSourceCmd.accesskey;" oncommand="MsgViewPageSource();"/>
<menuitem value="&pageInfoCmd.label;" accesskey="&pageInfoCmd.accesskey;" disabled="true" oncommand="MsgViewPageInfo();"/>
<menuseparator/> <menuseparator/>
<menu id = "mailviewCharsetMenu" /> <menu id = "mailviewCharsetMenu" />
</menupopup> </menupopup>
@ -664,9 +638,6 @@ Rights Reserved.
</template> </template>
</menu> </menu>
<menuseparator/> <menuseparator/>
<menuitem value="&addSenderToAddressBookCmd.label;" accesskey="&addSenderToAddressBookCmd.accesskey;" disabled="true" oncommand="MsgAddSenderToAddressBook();"/>
<menuitem value="&addAllToAddressBookCmd.label;" accesskey="&addAllToAddressBookCmd.accesskey;" disabled="true" oncommand="MsgAddAllToAddressBook();"/>
<menuseparator/>
<menu value="&markMenu.label;" accesskey="&markMenu.accesskey;"> <menu value="&markMenu.label;" accesskey="&markMenu.accesskey;">
<menupopup> <menupopup>
<menuitem value="&markAsReadCmd.label;" accesskey="&markAsReadCmd.accesskey;" oncommand="MsgMarkMsgAsRead(true);"/> <menuitem value="&markAsReadCmd.label;" accesskey="&markAsReadCmd.accesskey;" oncommand="MsgMarkMsgAsRead(true);"/>
@ -678,9 +649,6 @@ Rights Reserved.
<menuitem value="&markUnflaggedCmd.label;" accesskey="&markUnflaggedCmd.accesskey;" oncommand="MsgMarkAsFlagged(false);"/> <menuitem value="&markUnflaggedCmd.label;" accesskey="&markUnflaggedCmd.accesskey;" oncommand="MsgMarkAsFlagged(false);"/>
</menupopup> </menupopup>
</menu> </menu>
<menuseparator/>
<menuitem value="&ignoreThreadCmd.label;" accesskey="&ignoreThreadCmd.accesskey;" disabled="true" oncommand="MsgIgnoreThread();"/>
<menuitem value="&watchThreadCmd.label;" accesskey="&watchThreadCmd.accesskey;" disabled="true" oncommand="MsgWatchThread();"/>
</menupopup> </menupopup>
</menu> </menu>

22
mailnews/base/resources/locale/en-US/messenger.dtd
View File

@ -103,25 +103,25 @@ Rights Reserved.
<!ENTITY showLocationToolbarCmd.accesskey "l"> <!ENTITY showLocationToolbarCmd.accesskey "l">
<!ENTITY showMessageCmd.label "Message"> <!ENTITY showMessageCmd.label "Message">
<!ENTITY showMessageCmd.accesskey ""> <!ENTITY showMessageCmd.accesskey "">
<!ENTITY sortMenu.label "Sort"> <!ENTITY sortMenu.label "Sort by">
<!ENTITY sortMenu.accesskey "o"> <!ENTITY sortMenu.accesskey "o">
<!ENTITY sortByDateCmd.label "by Date"> <!ENTITY sortByDateCmd.label "Date">
<!ENTITY sortByDateCmd.accesskey "e"> <!ENTITY sortByDateCmd.accesskey "e">
<!ENTITY sortByFlagCmd.label "by Flag"> <!ENTITY sortByFlagCmd.label "Flag">
<!ENTITY sortByFlagCmd.accesskey "f"> <!ENTITY sortByFlagCmd.accesskey "f">
<!ENTITY sortByPriorityCmd.label "by Priority"> <!ENTITY sortByPriorityCmd.label "Priority">
<!ENTITY sortByPriorityCmd.accesskey "p"> <!ENTITY sortByPriorityCmd.accesskey "p">
<!ENTITY sortBySenderCmd.label "by Sender"> <!ENTITY sortBySenderCmd.label "Sender">
<!ENTITY sortBySenderCmd.accesskey "r"> <!ENTITY sortBySenderCmd.accesskey "r">
<!ENTITY sortBySizeCmd.label "by Size"> <!ENTITY sortBySizeCmd.label "Size">
<!ENTITY sortBySizeCmd.accesskey "z"> <!ENTITY sortBySizeCmd.accesskey "z">
<!ENTITY sortByStatusCmd.label "by Status"> <!ENTITY sortByStatusCmd.label "Status">
<!ENTITY sortByStatusCmd.accesskey "by Status"> <!ENTITY sortByStatusCmd.accesskey "Status">
<!ENTITY sortBySubjectCmd.label "by Subject"> <!ENTITY sortBySubjectCmd.label "Subject">
<!ENTITY sortBySubjectCmd.accesskey "s"> <!ENTITY sortBySubjectCmd.accesskey "s">
<!ENTITY sortByUnreadCmd.label "by Unread"> <!ENTITY sortByUnreadCmd.label "Unread">
<!ENTITY sortByUnreadCmd.accesskey "u"> <!ENTITY sortByUnreadCmd.accesskey "u">
<!ENTITY sortByOrderReceivedCmd.label "by Order Received"> <!ENTITY sortByOrderReceivedCmd.label "Order Received">
<!ENTITY sortByOrderReceivedCmd.accesskey "o"> <!ENTITY sortByOrderReceivedCmd.accesskey "o">
<!ENTITY msgsMenu.label "Messages"> <!ENTITY msgsMenu.label "Messages">
<!ENTITY msgsMenu.accesskey "m"> <!ENTITY msgsMenu.accesskey "m">