зеркало из https://github.com/mozilla/pjs.git
Checking in part of the new menu specification plus a new address book event so you can now open the (partially broken) address book from within grendel instead of running it as a separate app.
This commit is contained in:
rj.keller%beonex.com
Родитель
edd303aedf
Коммит
99ae0cdd94
|
|
@ -50,6 +50,8 @@ import grendel.prefs.ui.UI;
|
|||
import grendel.storage.MailDrop;
|
||||
import grendel.search.SearchFrame;
|
||||
|
||||
import grendel.addressbook.AddressBook;
|
||||
|
||||
/* Temporarily removed because FilterMaster is broken (edwin)
|
||||
import grendel.filters.FilterMaster;
|
||||
*/
|
||||
|
|
@ -69,6 +71,7 @@ public class ActionFactory {
|
|||
static RunServerPrefsAction fRunServerPrefsAction = new RunServerPrefsAction();
|
||||
static RunGeneralPrefsAction fRunGeneralPrefsAction = new RunGeneralPrefsAction();
|
||||
static RunUIPrefsAction fRunUIPrefsAction = new RunUIPrefsAction();
|
||||
static ShowAddressBookAction fShowAddressBookAction = new ShowAddressBookAction();
|
||||
|
||||
static int fIdent = 0;
|
||||
|
||||
|
|
@ -131,6 +134,10 @@ public class ActionFactory {
|
|||
static public RunUIPrefsAction GetRunUIPrefsAction() {
|
||||
return fRunUIPrefsAction;
|
||||
}
|
||||
|
||||
static public ShowAddressBookAction GetShowAddressBookAction() {
|
||||
return fShowAddressBookAction;
|
||||
}
|
||||
}
|
||||
|
||||
class ExitAction extends Event {
|
||||
|
|
@ -212,6 +219,18 @@ class RunFiltersAction extends Event {
|
|||
}
|
||||
}
|
||||
|
||||
class ShowAddressBookAction extends Event {
|
||||
|
||||
ShowAddressBookAction() {
|
||||
super("openAddressBook");
|
||||
}
|
||||
|
||||
public void actionPerformed(ActionEvent aEvent) {
|
||||
AddressBook AddressBookFrame = new AddressBook();
|
||||
AddressBookFrame.setVisible(true);
|
||||
}
|
||||
}
|
||||
|
||||
class ShowTooltipsAction extends Event {
|
||||
|
||||
ShowTooltipsAction() {
|
||||
|
|
|
|||
|
|
@ -93,6 +93,9 @@
|
|||
|
||||
<!ENTITY editUndoLabel "Undo" >
|
||||
<!ENTITY editUndoAccel "U" >
|
||||
<!ENTITY editRedoLabel "Redo" >
|
||||
<!ENTITY editRedoAccel "R" >
|
||||
|
||||
<!ENTITY editCutLabel "Cut" >
|
||||
<!ENTITY editCutAccel "t" >
|
||||
<!ENTITY editCopyLabel "Copy" >
|
||||
|
|
@ -109,19 +112,27 @@
|
|||
|
||||
<!-- Message menu item labels -->
|
||||
|
||||
<!ENTITY folderNewLabel "New Folder..." >
|
||||
<!ENTITY folderNewLabel "Folder..." >
|
||||
<!ENTITY folderNewAccel "F" >
|
||||
<!ENTITY folderDeleteLabel "Delete Folder" >
|
||||
<!ENTITY folderDeleteAccel "D" >
|
||||
|
||||
<!ENTITY accountNewLabel "Account..." >
|
||||
<!ENTITY accountNewAccel "A" >
|
||||
|
||||
<!ENTITY msgGetNewLabel "Get New Messages" >
|
||||
<!ENTITY msgGetNewAccel "G" >
|
||||
<!ENTITY msgOpenLabel "Open Message" >
|
||||
<!ENTITY msgOpenAccel "M" >
|
||||
<!ENTITY msgSaveAsLabel "Save As..." >
|
||||
<!ENTITY msgSaveAsAccel "A" >
|
||||
<!ENTITY msgNewLabel "New Message" >
|
||||
<!ENTITY msgNewAccel "N" >
|
||||
<!ENTITY newLabel "New" >
|
||||
<!ENTITY newAccel "N" >
|
||||
<!ENTITY msgNewLabel "Message" >
|
||||
<!ENTITY msgNewAccel "M" >
|
||||
<!ENTITY msgNewLabel2 "New Message" >
|
||||
<!ENTITY msgNewAccel2 "N" >
|
||||
|
||||
<!ENTITY msgReplyLabel "Reply" >
|
||||
<!ENTITY msgReplyAccel "R" >
|
||||
<!ENTITY msgReplyAllLabel "Reply All" >
|
||||
|
|
@ -177,8 +188,8 @@
|
|||
|
||||
<!-- Preferences menu labels -->
|
||||
|
||||
<!ENTITY multiPrefsLabel "Preferences" >
|
||||
<!ENTITY multiPrefsAccel "P" >
|
||||
<!ENTITY multiPrefsLabel "Tools" >
|
||||
<!ENTITY multiPrefsAccel "T" >
|
||||
|
||||
<!ENTITY prefIdsLabel "Identities" >
|
||||
<!ENTITY prefIdsAccel "I" >
|
||||
|
|
@ -188,3 +199,25 @@
|
|||
<!ENTITY prefGeneralAccel "G" >
|
||||
<!ENTITY prefUILabel "User interface" >
|
||||
<!ENTITY prefUIAccel "U" >
|
||||
|
||||
<!ENTITY addressBookLabel "Address Book..." >
|
||||
<!ENTITY addressBookAccel "A" >
|
||||
|
||||
<!-- view menu labels -->
|
||||
<!ENTITY toolbarsLabel "Toolbars" >
|
||||
<!ENTITY toolbarsAccel "T" >
|
||||
<!ENTITY mailToolbarsLabel "Mail Toolbar" >
|
||||
<!ENTITY mailToolbarsAccel "M" >
|
||||
<!ENTITY statusbarLabel "Status Bar" >
|
||||
<!ENTITY statusbarAccel "S" >
|
||||
|
||||
<!-- help menu labels -->
|
||||
<!ENTITY helpLabel "Help" >
|
||||
<!ENTITY helpAccel "H" >
|
||||
|
||||
<!ENTITY contentsLabel "Contents..." >
|
||||
<!ENTITY contentsAccel "C" >
|
||||
<!ENTITY releaseNotesLabel "Release Notes" >
|
||||
<!ENTITY releaseNotesAccel "R" >
|
||||
<!ENTITY aboutLabel "About Grendel..." >
|
||||
<!ENTITY aboutAccel "A" >
|
||||
|
|
|
|||
|
|
@ -351,6 +351,7 @@ class UnifiedMessageFrame extends GeneralFrame {
|
|||
ActionFactory.GetPreferencesAction(),
|
||||
ActionFactory.GetSearchAction(),
|
||||
ActionFactory.GetRunFiltersAction(),
|
||||
ActionFactory.GetShowAddressBookAction(),
|
||||
ActionFactory.GetShowTooltipsAction(),
|
||||
ActionFactory.GetRunIdentityPrefsAction(),
|
||||
ActionFactory.GetRunServerPrefsAction(),
|
||||
|
|
|
|||
|
|
@ -1,3 +1,38 @@
|
|||
/* ***** 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 Grendel mail/news client.
|
||||
*
|
||||
* The Initial Developer of the Original Code is
|
||||
* R.J. Keller.
|
||||
* Portions created by the Initial Developer are Copyright (C) 2005
|
||||
* 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 ***** */
|
||||
<?xml version="1.0"?>
|
||||
|
||||
<!DOCTYPE window [
|
||||
|
|
@ -14,9 +49,14 @@
|
|||
<menubar id="mail.multi_pane">
|
||||
|
||||
<menu id="FileMenu" label="&multiFileLabel;" accesskey="&multiFileAccel;">
|
||||
<menupopup>
|
||||
<menu label="&newLabel;" accesskey="&newAccel;">
|
||||
<menupopup>
|
||||
<menuitem id="msgNew" onclick="msgNew" label="&msgNewLabel;" accesskey="&msgNewAccel;"/>
|
||||
<menuitem id="folderNew" onclick="folderNew" label="&folderNewLabel;" accesskey="&folderNewAccel;"/>
|
||||
<menuitem id="newAccount" onclick="prefSrvs" label="&accountNewLabel;" accesskey="&accountNewAccel;"/>
|
||||
</menupopup>
|
||||
</menu>
|
||||
<menuitem id="msgOpen" onclick="msgOpen" label="&msgOpenLabel;" accesskey="&msgOpenAccel;"/>
|
||||
<menuitem id="msgSaveAs" onclick="msgSaveAs" label="&msgSaveAsLabel;" accesskey="&msgSaveAsAccel;"/>
|
||||
<menuseparator/>
|
||||
|
|
@ -29,6 +69,8 @@
|
|||
<menu id="EditMenu" label="&multiEditLabel;" accesskey="&multiEditAccel;">
|
||||
<menupopup>
|
||||
<menuitem id="editUndo" onclick="editUndo" label="&editUndoLabel;" accesskey="&editUndoAccel;"/>
|
||||
<menuitem id="editRedo" onclick="editRedo" label="&editRedoLabel;" accesskey="&editRedoAccel;"/>
|
||||
<menuseparator/>
|
||||
<menuitem id="editCut" onclick="editCut" label="&editCutLabel;" accesskey="&editCutAccel;"/>
|
||||
<menuitem id="editCopy" onclick="editCopy" label="&editCopyLabel;" accesskey="&editCopyAccel;"/>
|
||||
<menuitem id="editPaste" onclick="editPaste" label="&editPasteLabel;" accesskey="&editPasteAccel;"/>
|
||||
|
|
@ -42,6 +84,12 @@
|
|||
|
||||
<menu id="ViewMenu" label="&multiViewLabel;" accesskey="&multiViewAccel;">
|
||||
<menupopup>
|
||||
<menu id="toolbars" label="&toolbarsLabel;" accesskey="&toolbarsAccel;">
|
||||
<menupopup>
|
||||
<menuitem onclick="toggleMailToolbar" label="&mailToolbarsLabel;" accesskey="&mailToolbarsAccel;"/>
|
||||
<menuitem onclick="toggleStatusbar" label="&statusbarLabel;" accesskey="&statusbarAccel;"/>
|
||||
</menupopup>
|
||||
</menu>
|
||||
<menu id="SortMenu" label="&viewSortLabel;" accesskey="&viewSortAccel;">
|
||||
<menupopup>
|
||||
<menuitem id="toggleThreading" onclick="toggleThreading" label="&toggleThreadingLabel;" accesskey="&toggleThreadingAccel;"/>
|
||||
|
|
@ -57,7 +105,7 @@
|
|||
|
||||
<menu id="MessageMenu" label="&multiMessageLabel;" accesskey="&multiMessageAccel;">
|
||||
<menupopup>
|
||||
<menuitem id="msgNew" onclick="msgNew" label="&msgNewLabel;" accesskey="&msgNewAccel;"/>
|
||||
<menuitem id="msgNew" onclick="msgNew" label="&msgNewLabel2;" accesskey="&msgNewAccel2;"/>
|
||||
<menuseparator/>
|
||||
<menuitem id="msgReply" onclick="msgReply" label="&msgReplyLabel;" accesskey="&msgReplyAccel;"/>
|
||||
<menuitem id="msgReplyAll" onclick="msgReplyAll" label="&msgReplyAllLabel;" accesskey="&msgReplyAllAccel;"/>
|
||||
|
|
@ -77,6 +125,8 @@
|
|||
|
||||
<menu id="PrefsMenu" label="&multiPrefsLabel;" accesskey="&multiPrefsAccel;">
|
||||
<menupopup>
|
||||
<menuitem onclick="openAddressBook" label="&addressBookLabel;" accesskey="&addressBookAccel;"/>
|
||||
<menuseparator/>
|
||||
<menuitem id="prefGeneral" onclick="prefGeneral" label="&prefGeneralLabel;" accesskey="&prefGeneralAccel;"/>
|
||||
<menuitem id="prefIds" onclick="prefIds" label="&prefIdsLabel;" accesskey="&prefIdsAccel;"/>
|
||||
<menuitem id="prefSrvs" onclick="prefSrvs" label="&prefSrvsLabel;" accesskey="&prefSrvsAccel;"/>
|
||||
|
|
@ -84,6 +134,14 @@
|
|||
</menupopup>
|
||||
</menu>
|
||||
|
||||
<menu id="HelpMenu" label="&helpLabel;" accesskey="&helpAccel;">
|
||||
<menupopup>
|
||||
<menuitem onclick="openHelp" label="&contentsLabel;" accesskey="&contentsAccel;"/>
|
||||
<menuitem onclick="openReleaseNotes" label="&releaseNotesLabel;" accesskey="&releaseNotesAccel;"/>
|
||||
<menuitem onclick="openAbout" label="&aboutLabel;" accesskey="&aboutAccel;"/>
|
||||
</menupopup>
|
||||
</menu>
|
||||
|
||||
</menubar>
|
||||
|
||||
</window>
|
||||
Загрузка…
Ссылка в новой задаче