diff options
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/ChangeLog | 75 | ||||
| -rw-r--r-- | ui/evolution-addressbook.xml | 43 | ||||
| -rw-r--r-- | ui/evolution-calendar.xml | 25 | ||||
| -rw-r--r-- | ui/evolution-contact-editor.xml | 11 | ||||
| -rw-r--r-- | ui/evolution-event-editor.xml | 2 | ||||
| -rw-r--r-- | ui/evolution-mail.xml | 346 | ||||
| -rw-r--r-- | ui/evolution-tasks.xml | 19 | ||||
| -rw-r--r-- | ui/evolution.xml | 58 |
8 files changed, 364 insertions, 215 deletions
diff --git a/ui/ChangeLog b/ui/ChangeLog index 521284298e..d1216c94ff 100644 --- a/ui/ChangeLog +++ b/ui/ChangeLog @@ -1,3 +1,78 @@ +2001-03-06 Miguel de Icaza <miguel@ximian.com> + + * evolution-tasks.xml: Added "File/New/Task" as well. + + * evolution-mail.xml: Added "File/New/Mail Message" at the top + with binding C-n. + + * evolution-calendar.xml: Set the binding for New Appointment to C-n + + * evolution-contact-editor.xml: Set the toolbar to hlook=text + vlook=icon; Set all icons priority-text to 1. + + * evolution-addressbook.xml: Added "Contact" to the New menu. + + * evolution.xml: Provide an entry point to put "New" items on the + first level. + + We are going to need some Bonobo support to "hide" objects when + other objects appear (like, having Mail Message bound to C-S-X in + the global space, and when we switch to Mail, we only show the + entry that has C-n as the binding). + +2001-02-28 Miguel de Icaza <miguel@ximian.com> + + * evolution.xml: Moved Importer after the Folder operations per + Dan's proposal. + + * evolution-addressbook.xml: Renamed Settings/AddressBook + Configuration to Tools/Settings. + + Make all the items have "Print" items that use the same icon + instead of a collection of icons. + + * evolution-calendar.xml: Moved "Calendar Preferences" from + "Settings" to "Tools/Settings". + + * evolution-mail.xml: Settings menu is fully gone. All things + that run a dialog now end up in "Tools" while actions end up in + "Actions". Hence I am right. + + Renamed "Mail Configuration..." to "Identieies and Servers" + + Move MessageMarkAsRead, MessageMarkAsUnRead + to Edit menu. Add MessageMarkAllAsRead. + + Remove "Print Message" from Message menu. Remove "Print Preview + Message" from Message menu. Leave them on the "File" menu. + + Renamed "Reply to Sender" to "Reply" (awaiting Ettore's + permission). + + Renamed "Messages" to "Actions". + + Open Message renamed to "Open Selected Items" (as this is what it + actually does). + + Moved "Save Message As" to "File" menu. + + Added "Properties" to the File/Folder submenu. + + Edit menu now looks like this: Message Move, Message Copy, Select + All, Invert Selection, Delete, Undelete, Mark as Read, Mark as + Unread. Some of them were moved from the "Messages" menu. + + "Forward message" shortcut changed to C-f + + Tools menu created. + + Create Rule From message moved to "Tools". + + * evolution.xml: Added Tools menu. Moved Edit/Customize to + Tools/Customize Toolbar. + + Added File/Folder submenu. Duplicate "New Folder" in here. + 2001-03-04 Damon Chaplin <damon@ximian.com> * evolution-tasks.xml: "New" -> "New Task". diff --git a/ui/evolution-addressbook.xml b/ui/evolution-addressbook.xml index 927c6a79ff..19290f24e2 100644 --- a/ui/evolution-addressbook.xml +++ b/ui/evolution-addressbook.xml @@ -3,13 +3,27 @@ <menu> <submenu name="File"> + <submenu name="New"> + <placeholder name="NewFirstItem"> + <menuitem name="New" + _label="_Contact" + verb="ContactNew" + pixtype="stock" pixname="New" + accel="*Control*n"/> + <separator/> + </placeholder> + </submenu> + <placeholder name="Print"> - <menuitem name="Print" verb="ContactsPrint" - _label="_Print Contacts..." - pixtype="pixbuf" + <menuitem name="Print Preview" verb="PrintPreviewMessage" + _label="Print Preview" + _tip="Previews the message to be printed" + pixtype="pixbuf"/> + <menuitem name="Print" verb="ContactsPrint" + _label="_Print..." + pixtype="stock" pixname="Print" accel="*Control*p"/> - </placeholder> </submenu> @@ -23,22 +37,21 @@ <submenu name="Settings"> - <menuitem name="AddressbookConfig" verb="AddressbookConfig" _label="_Addressbook Configuration..." - pixtype ="pixbuf"/> </submenu> - <placeholder name="Component"> - - <submenu name="Tools" _label="_Tools"> - - <menuitem name="Search" verb="ToolSearch" + <submenu name="Tools" _label="_Tools"> + <placeholder name="Component"> + <menuitem name="Search" verb="ToolSearch " _label="_Search for contacts" pixtype="stock" pixname="Search" /> - - </submenu> - - </placeholder> + + <menuitem name="AddressbookConfig" + verb="AddressbookConfig" + _label="_Addressbook Sources..." + pixtype ="pixbuf"/> + </placeholder> + </submenu> </menu> <dockitem name="Toolbar"> diff --git a/ui/evolution-calendar.xml b/ui/evolution-calendar.xml index d725a64bdd..3c5cc500d5 100644 --- a/ui/evolution-calendar.xml +++ b/ui/evolution-calendar.xml @@ -28,9 +28,10 @@ <submenu name="New" _label="_New"> - <menuitem name="CalendarNew" verb="" - _label="Ca_lendar" accel="*Control**Shift*l"/> - + <placeholder name="NewFirstItem"> + <menuitem name="CalendarNew" verb="EditNewAppointment" + _label="_Appointment" accel="*Control*n"/> + </placeholder> </submenu> <placeholder name="FileOps"> @@ -44,8 +45,14 @@ </placeholder> <placeholder name="Print"> + <menuitem name="Print Preview" verb="PrintPreviewMessage" + _label="Print Preview" + _tip="Previews the message to be printed"/> + <menuitem name="Print" verb="CalendarPrint" - _label="_Print this calendar" accel="*Control*p"/> + _label="_Print..." _tip="Print calendar" + pixtype="stock" pixname="Print"/> + accel="*Control*p"/> </placeholder> </submenu> @@ -54,11 +61,11 @@ </submenu> - <submenu name="Settings"> - - <menuitem name="CalendarPreferences" verb="" - _label="Calendar Preferences..."/> - + <submenu name="Tools" _label="_Tools"> + <placeholder name="Component"> + <menuitem name="CalendarPreferences" verb="" + _label="Settings..."/> + </placeholder> </submenu> </menu> diff --git a/ui/evolution-contact-editor.xml b/ui/evolution-contact-editor.xml index c0594838b4..b4c699e87f 100644 --- a/ui/evolution-contact-editor.xml +++ b/ui/evolution-contact-editor.xml @@ -223,20 +223,21 @@ static GnomeUIInfo main_menu[] = { </submenu> </menu> - <dockitem name="Toolbar" relief="none" behavior="exclusive"> + <dockitem name="Toolbar" relief="none" behavior="exclusive" + hlook="text" vlook="icon"> <toolitem name="Save and Close" _label="Save and Close" _tip="Save the contact and close the dialog box" verb="ContactEditorSaveClose" - pixtype="stock" pixname="Save"/> + pixtype="stock" pixname="Save" priority="1"/> <separator/> <toolitem name="Print" _label="Print..." _tip="Print this item" verb="ContactEditorPrint" - pixtype="stock" pixname="Print"/> + pixtype="stock" pixname="Print" priority="1"/> <toolitem name="Delete" _label="Delete..." _tip="Delete this item" verb="ContactEditorDelete" - pixtype="stock" pixname="Trash"/> + pixtype="stock" pixname="Trash" priority="1"/> <!-- <toolitem name="Help" _label="Help" @@ -253,4 +254,4 @@ static GnomeUIInfo main_menu[] = { </dockitem> -</Root>
\ No newline at end of file +</Root> diff --git a/ui/evolution-event-editor.xml b/ui/evolution-event-editor.xml index 489eca6ef1..863b272429 100644 --- a/ui/evolution-event-editor.xml +++ b/ui/evolution-event-editor.xml @@ -198,7 +198,7 @@ </menu> -<dockitem name="Toolbar"> +<dockitem name="Toolbar" hlook="text" vlook="icon"> <toolitem name="FileSaveAndClose" verb=""/> diff --git a/ui/evolution-mail.xml b/ui/evolution-mail.xml index 246ad19162..1d3b8d0976 100644 --- a/ui/evolution-mail.xml +++ b/ui/evolution-mail.xml @@ -11,6 +11,10 @@ <cmd name="MailStop" pixtype="stock" pixname="Stop"/> + <cmd name="MailCompose" + pixtype="pixbuf" _label="_Compose"/> + + <cmd name="MailGetSend" pixtype="pixbuf" _tip="Send queued mail and retrieve new mail"/> </commands> <keybindings> @@ -21,19 +25,47 @@ <submenu name="File"> - <placeholder name="Print"> + <submenu name="New"> + <placeholder name="NewFirstItem"> + <menuitem name="MessageNew" verb="MailCompose" + accel="*Control*n" _label="_Mail Message"/> + <separator/> + </placeholder> + </submenu> + + <placeholder name="FileOps"> - <menuitem name="Print" verb="PrintMessage" - _label="Print message..." - _tip="Print message to the printer" - pixtype="pixbuf" accel="*Control*P"/> + <menuitem name="MessageOpen" verb="" + _label="_Open Selected Items" + accel="*Control*o"/> - <menuitem name="Print Preview" verb="PrintPreviewMessage" - _label="Print Preview of message..." - _tip="Previews the message to be printed" - pixtype="pixbuf"/> + <menuitem name="MessageSaveAs" verb="" + _label="_Save As..." + pixtype="stock" pixname="Save" + accel="*Control**Alt*s"/> + </placeholder> - </placeholder> + <separator/> + + <submenu name="Folder" _label="_Folder"> + <menuitem name="FolderConfig" verb="" + _label="_Properties..." + pixtype="pixbuf"/> + </submenu> + + <placeholder name="Print"> + + <menuitem name="Print Preview" verb="PrintPreviewMessage" + _label="Print Preview" + _tip="Previews the message to be printed" + pixtype="pixbuf"/> + + <menuitem name="Print" verb="PrintMessage" + _label="Print..." + _tip="Print message to the printer" + pixtype="stock" pixname="Print" accel="*Control*P"/> + + </placeholder> </submenu> @@ -42,109 +74,14 @@ <menuitem name="EditSelectAll" verb="" _label="Select _All" accel="*Control*a"/> + <menuitem name="EditSelectThread" verb="" + _label="Select _Thread" accel="*Control*h"/> + <menuitem name="EditInvertSelection" verb="" _label="_Invert Selection" accel="*Control*i"/> - </submenu> - - <submenu name="View"> - - <separator/> - - <menuitem name="Threaded" verb="ViewThreaded" accel="*Control*t"/> - - <menuitem name="Source" verb="ViewSource" accel=""/> - - <separator/> - - <menuitem name="MessageHideClear" verb="" _label="Show _All Messages"/> - - <separator/> - - <menuitem name="MessageHideSelected" verb="" _label="Hide S_elected Messages"/> - <menuitem name="MessageHideRead" verb="" _label="Hide _Read messages"/> - <menuitem name="MessageHideDeleted" verb="" _label="Hide _Deleted Messages"/> - - </submenu> - - <submenu name="Settings"> - - <menuitem name="MailFilters" verb="SetMailFilter" _label="Mail _Filters..."/> - - <menuitem name="VFolderEdit" verb="SetVFolder" _label="_Virtual Folder Editor..."/> - - <menuitem name="SetMailConfig" verb="" _label="_Mail Configuration..." pixtype="pixbuf"/> - - <menuitem name="SetSubscribe" verb="" _label="Manage Subscriptions..."/> - - <menuitem name="SetForgetPwd" verb="" _label="Forget _Passwords"/> - - </submenu> - - <placeholder name="Component"> - - <submenu name="Message" _label="_Message"> - - <menuitem name="MessageOpenNewWnd" verb="" - _label="_Open in New Window" - accel="*Control*o"/> - - <menuitem name="MessageEdit" verb="" - _label="_Edit Message" - pixbuf="pixbuf" - accel="*Control*e"/> - - <menuitem name="MessageSaveAs" verb="" - _label="_Save Message As..." - pixtype="pixbuf" - accel="*Control**Alt*s"/> - - <menuitem name="MessagePrint" verb="" - _label="_Print Message" - pixtype="pixbuf" - accel="*Control*p"/> - - <separator/> - - <menuitem name="MessageReplySndr" verb="" - _label="Reply to _Sender" - pixtype="pixbuf" - accel="*Control*r"/> - - <menuitem name="MessageReplyAll" verb="" - _label="Reply to _All" - pixtype="pixbuf" - accel="*Control**Shift*r"/> - - <menuitem name="MessageForwardAttached" verb="" - _label="_Forward" - accel="*Control*j"/> - - <menuitem name="MessageForwardInlined" verb="" - _label="Forward inline" - accel="*Control**Shift*j"/> - - <separator/> - - <menuitem name="MessageMarkAsRead" verb="" - _label="Mar_k As Read" - accel="*Control*k"/> - - <menuitem name="MessageMarkAsUnRead" verb="" - _label="Mark As U_nread" - accel="*Control**Shift*k"/> - - <separator/> - - <menuitem name="MessageMove" verb="" - _label="_Move to Folder..." - pixtype="pixbuf" - accel="*Control*m"/> - - <menuitem name="MessageCopy" verb="" - _label="_Copy to Folder..." - accel="*Control*c"/> - + <separator/> + <menuitem name="MessageDelete" verb="" _label="_Delete" accel="*Control*d"/> @@ -153,68 +90,161 @@ _label="_Undelete" accel="*Control*u"/> - <separator/> - - <menuitem name="MessageApplyFilters" verb="" - _label="_Apply Filters" - accel="*Control*y"/> - - <separator/> - - <submenu name="MessageCreateRuleFromMessage" _label="Create Rule"> - - <menuitem name="MessageVFolderSubj" verb="" - _label="_VFolder on Subject" - /> - - <menuitem name="MessageVFolderSndr" verb="" - _label="VFolder on Se_nder" - /> - - <menuitem name="MessageVFolderRecip" verb="" - _label="VFolder on _Recipients" - /> - - <separator/> - - <menuitem name="MessageFilterSubj" verb="" - _label="_Filter on Subject" - /> + <separator/> + + <menuitem name="MessageMarkAsRead" verb="" + _label="Mar_k as Read" + accel="*Control*q"/> - <menuitem name="MessageFilterSndr" verb="" - _label="Fi_lter on Sender" - /> + <menuitem name="MessageMarkAsUnRead" verb="" + _label="Mark as U_nread" + accel="*Control**Shift*k"/> - <menuitem name="MessageFilterRecip" verb="" - _label="Filter on Rec_ipients" - /> + <menuitem name="MessageMarkAllAsRead" verb="" + _label="Mark All as R_ead"/> + </submenu> - </submenu> + <submenu name="View"> - </submenu> + <separator/> - <submenu name="Folder" _label="F_older"> - - <menuitem name="FolderExpunge" verb="" - _label="_Expunge" - accel="*Control*x"/> - - <menuitem name="FolderConfig" verb="" - _label="_Configure Folder..." - pixtype="pixbuf"/> - - </submenu> + <menuitem name="Threaded" verb="ViewThreaded" accel="*Control*t"/> + + <separator/> + + <submenu name="MessageHideMenu" _label="_Message Hiding"> + <menuitem name="MessageHideClear" verb="" _label="Show _All"/> + <menuitem name="MessageHideSelected" verb="" _label="Hide S_elected Messages"/> + <menuitem name="MessageHideRead" verb="" _label="Hide _Read messages"/> + <menuitem name="MessageHideDeleted" verb="" _label="Hide _Deleted Messages"/> + </submenu> + + <submenu name="MessageDisplayMenu" _label="Message _Display"> + <menuitem name="MessageDisplayFullHeaders" + _label="Full Headers" + _tip="Display all of the message headers"/> + <menuitem name="Source" verb="ViewSource" accel=""/> + </submenu> + </submenu> + <placeholder name="Component"> + <submenu name="Actions" _label="_Actions"> + <menuitem name="SendReceive" verb="MailGetSend" + _label="_Send and Receive"/> + + <separator/> + + <menuitem name="MessageReplySndr" verb="" + _label="Reply" + pixtype="pixbuf" + accel="*Control*r"/> + + <menuitem name="MessageReplyAll" verb="" + _label="Reply to _All" + pixtype="pixbuf" + accel="*Control**Shift*r"/> + + <menuitem name="MessageForwardAttached" verb="" + _label="_Forward" + accel="*Control*f"/> + + <submenu name="ForwardAs" _label="Forward As"> + <menuitem name="MessageForwardInlined" verb="" + _label="Inline" + accel="*Control**Shift*j"/> + + <menuitem name="MessageForwardQuoted" verb="" + _label="Quoted (FIXME: implement me)"/> + <menuitem name="MessageForwardAttachment" verb="" + _label="Attachment (FIXME: implement me)"/> + + <separator/> + + <menuitem name="Redirect" verb="" + _label="Redirect (FIXME: implement me)"/> + </submenu> + + <separator/> + + <menuitem name="MessageMove" verb="" + _label="_Move to Folder..." + pixtype="pixbuf" + accel="*Control*m"/> + + <menuitem name="MessageCopy" verb="" + _label="_Copy to Folder..." + accel="*Control*c"/> + + <separator/> + + <menuitem name="MessageApplyFilters" verb="" + _label="_Apply Filters" + accel="*Control*y"/> + + <menuitem name="SetForgetPwd" verb="" _label="Forget _Passwords"/> + + <menuitem name="FolderExpunge" verb="" _label="_Expunge" + accel="*Control*x"/> + </submenu> </placeholder> + + <submenu name="Tools" _label="_Tools"> + <placeholder name="Component"> + + <menuitem name="SetMailConfig" verb="" + _label="_Mail Settings..." pixtype="pixbuf"/> + + <separator/> + <menuitem name="MailFilters" verb="SetMailFilter" _label="_Filters..."/> + + <submenu name="MessageCreateRuleFromMessage" _label="_Create Filter From Message"> + <menuitem name="MessageFilterSubj" verb="" + _label="Filter on _Subject"/> + + <menuitem name="MessageFilterSndr" verb="" + _label="Filter on Se_nder"/> + + <menuitem name="MessageFilterRecip" verb="" + _label="Filter on _Recipients"/> + </submenu> + + <separator/> + + <menuitem name="VFolderEdit" verb="SetVFolder" + _label="Virtual Folder _Editor..."/> + + <submenu name="MessageCreateRuleFromMessage" + _label="Create _Virtual Folder From Message"> + + <menuitem name="MessageVFolderSubj" verb="" + _label="VFolder on _Subject" + /> + + <menuitem name="MessageVFolderSndr" verb="" + _label="VFolder on Se_nder" + /> + + <menuitem name="MessageVFolderRecip" verb="" + _label="VFolder on _Recipients"/> + </submenu> + + <separator/> + + <menuitem name="SetSubscribe" verb="" _label="Manage _Subscriptions..."/> + + <separator/> + + </placeholder> + </submenu> </menu> <dockitem name="Toolbar"> - <toolitem name="MailGet" verb="" + <toolitem name="MailGet" verb="MailGetSend" _label="Get Mail" priority="1" _tip="Send queued mail and retrieve new mail" pixtype="pixbuf"/> - <toolitem name="MailCompose" verb="" + <toolitem name="MailCompose" verb="MailCompose" _label="Compose" priority="1" _tip="Compose a new message" pixtype="pixbuf"/> diff --git a/ui/evolution-tasks.xml b/ui/evolution-tasks.xml index fe692ffce5..ff41ec6a91 100644 --- a/ui/evolution-tasks.xml +++ b/ui/evolution-tasks.xml @@ -1,8 +1,22 @@ <Root> + <commands> + <cmd name="TasksNewTask" pixtype="stock" pixname="New" + _tip="Create a new task" verb="TasksNewTask"/> + </commands> + <menu> <submenu name="File"> + <submenu name="New"> + <placeholder name="NewFirstItem"> + <menuitem name="NewTask" + verb="TasksNewTask" + _label="_Task" + accel="*Control*n"/> + </placeholder> + </submenu> + <placeholder name="FileOps"> <menuitem name="TasksSaveAs" verb="" @@ -38,9 +52,8 @@ </menu> <dockitem name="Toolbar"> - <toolitem name="New" _label="New Task" - priority="1" _tip="Create a new task" verb="TasksNewTask" - pixtype="stock" pixname="New"/> + <toolitem name="New" _label="New Task" verb="TasksNewTask" + priority="1"/> <separator/> diff --git a/ui/evolution.xml b/ui/evolution.xml index 40d9be4cbd..ccd4df565a 100644 --- a/ui/evolution.xml +++ b/ui/evolution.xml @@ -3,15 +3,15 @@ <cmd name="FileClose" _label="Close" _tip="Close this window" pixtype="stock" pixname="Close" accel="*Control*w"/> - <cmd name="FileExit" _label="Exit" _tip="Exit the program" - pixtype="stock" pixname="Exit" accel="*Control*q"/> + <cmd name="FileExit" _label="E_xit" _tip="Exit the program" + pixtype="stock" pixname="Quit" accel="*Control*q"/> <cmd name="ViewShortcutBar" type="toggle" - _label="Show the _Shortcut Bar" + _label="_Shortcut Bar" _tip="Toggle whether to show the shortcut bar"/> <cmd name="ViewFolderBar" type="toggle" - _label="Show the _Folder Bar" + _label="_Folder Bar" _tip="Toggle whether to show the folder bar"/> <cmd name="HelpSubmitBug" _label="Submit Bug Report" @@ -30,13 +30,16 @@ <menu> <submenu name="File" _label="_File"> <submenu name="New" _label="_New"> + <placeholder name="NewFirstItem"> + </placeholder> + <menuitem name="View" verb="NewView" _label="_View" accel="*Control**Shift*v" pixtype="stock" pixname="New"/> <menuitem name="Folder" verb="NewFolder" _label="_Folder" - accel="*Control**Shift*f"/> + accel="*Control**Shift*e"/> <menuitem name="Shortcut" verb="NewBarShortcut" _label="Evolution bar _shortcut" @@ -67,45 +70,52 @@ <separator/> - <menuitem name="FileImporter" verb="" - _label="_Import file..." - _tip="Import an external file format" accel="*Control*i"/> - + <submenu name="Folder" _label="_Folder"> + <menuitem name="Folder" verb="NewFolder" + _label="_New Folder" + accel="*Control**Shift*e"/> + </submenu> + <menuitem name="FileGoToFolder" verb="" _label="_Go to Folder..." _tip="Display a different folder" accel="*Control*g"/> + <separator/> + + <menuitem name="FileImporter" verb="" + _label="_Import file..." + _tip="Import an external file format" accel="*Control*i"/> + <placeholder name="Print" delimit="top"/> <separator/> + <menuitem name="WorkOffLine" verb="" + _label="Work Offline"/> + <menuitem name="FileClose" verb="" _label="_Close"/> - <menuitem name="FileExit" verb="" _label="E_xit"/> - + <menuitem name="FileExit" verb="FileExit"/> </submenu> <submenu name="Edit" _label="_Edit"> - - <placeholder/> - - <menuitem name="BonoboCustomize" verb="" - _label="Customi_ze..." pos="bottom"/> - </submenu> <submenu name="View" _label="_View"> - - <menuitem name="ShortcutBar" id="ViewShortcutBar" - accel="*Control*s"/> - <menuitem name="FolderBar" id="ViewFolderBar" accel="*Control*f"/> - + <menuitem name="ShortcutBar" id="ViewShortcutBar"/> + <menuitem name="FolderBar" id="ViewFolderBar"/> </submenu> - <submenu name="Settings" _label="_Settings"/> - <placeholder name="Component"/> + <placeholder name="Actions"/> + + <submenu name="Tools" _label="_Tools"> + <placeholder name="Component"/> + + <menuitem name="BonoboCustomize" verb="" + _label="Customi_ze Toolbars..." pos="bottom"/> + </submenu> <submenu name="Help" _label="_Help"> |