diff options
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/ChangeLog | 8 | ||||
| -rw-r--r-- | ui/evolution-addressbook.xml | 8 | ||||
| -rw-r--r-- | ui/evolution-calendar.xml | 16 | ||||
| -rw-r--r-- | ui/evolution-comp-editor.xml | 10 | ||||
| -rw-r--r-- | ui/evolution-contact-editor.xml | 11 | ||||
| -rw-r--r-- | ui/evolution-event-editor.xml | 2 | ||||
| -rw-r--r-- | ui/evolution-mail-global.xml | 18 | ||||
| -rw-r--r-- | ui/evolution-mail-list.xml | 6 | ||||
| -rw-r--r-- | ui/evolution-mail-message.xml | 22 | ||||
| -rw-r--r-- | ui/evolution-mail-messagedisplay.xml | 6 | ||||
| -rw-r--r-- | ui/evolution-message-composer.xml | 18 | ||||
| -rw-r--r-- | ui/evolution-signature-editor.xml | 8 | ||||
| -rw-r--r-- | ui/evolution-subscribe.xml | 2 | ||||
| -rw-r--r-- | ui/evolution-task-editor.xml | 2 | ||||
| -rw-r--r-- | ui/evolution.xml | 42 | ||||
| -rw-r--r-- | ui/my-evolution.xml | 2 |
16 files changed, 100 insertions, 81 deletions
diff --git a/ui/ChangeLog b/ui/ChangeLog index 36f55ea84f..c3cb723b62 100644 --- a/ui/ChangeLog +++ b/ui/ChangeLog @@ -1,3 +1,10 @@ +2002-01-15 Michael Meeks <michael@ximian.com> + + * *.xml: for all separators, add a unique (per xml file) name + to each separator, so we don't get them conflicting across + merges and messing with the order; then give them a dummy attr + f="" to stop them being transparent, hmm. + 2002-01-03 JP Rosevear <jpr@ximian.com> * evolution-tasks.xml: add a mark as complete item @@ -169,7 +176,6 @@ * evolution-comp-editor.xml: remove print preview from toolbar ->>>>>>> 1.239 2001-08-20 JP Rosevear <jpr@ximian.com> * evolution-comp-editor.xml: remove print setup option for diff --git a/ui/evolution-addressbook.xml b/ui/evolution-addressbook.xml index d77d1268f9..09684df33b 100644 --- a/ui/evolution-addressbook.xml +++ b/ui/evolution-addressbook.xml @@ -68,7 +68,7 @@ <menuitem name="ContactNewList" verb="" _label="_Contact List" pixtype="pixbuf"/> - <separator/> + <separator f="" name="eadbk1"/> </placeholder> </submenu> @@ -98,7 +98,7 @@ <menuitem name="ContactDelete" verb="" _label="Delete" pixtype="pixbuf"/> - <separator/> + <separator f="" name="eadbk2"/> <menuitem name="ContactsSelectAll" verb="" _label="_Select All"/> </submenu> @@ -129,7 +129,7 @@ <menuitem name="AddressbookConfig" verb="" _label="_Addressbook Sources..." pixtype ="pixbuf"/> - <separator/> + <separator f="" name="eadbk3"/> </placeholder> </submenu> @@ -144,7 +144,7 @@ _label="New List" pixtype="pixbuf" priority="1"/> - <separator/> + <separator f="" name="eadbk4"/> <toolitem name="ContactsPrint" verb="" _label="Print" pixtype="pixbuf"/> diff --git a/ui/evolution-calendar.xml b/ui/evolution-calendar.xml index e50572fceb..25828b8c5d 100644 --- a/ui/evolution-calendar.xml +++ b/ui/evolution-calendar.xml @@ -39,7 +39,7 @@ _label="_Appointment..." pixtype="pixbuf"/> <menuitem name="NewTask" verb="CalendarNewTask" _label="_Task..." pixtype="pixbuf"/> - <separator/> + <separator f="" name="ecal"/> </placeholder> </submenu> @@ -70,7 +70,7 @@ <placeholder name="ViewBegin"> <menuitem name="Today" verb="CalendarToday" _label="Go to _Today"/> <menuitem name="Goto" verb="CalendarGoto" _label="Go to _Date" pixtype="pixbuf"/> - <separator/> + <separator f="" name="ecal"/> </placeholder> </submenu> @@ -78,7 +78,7 @@ <submenu name="Tools"> <placeholder name="ComponentPlaceholder"> <menuitem name="CalendarSettings" verb="" _label="_Calendar Settings..." pixtype="pixbuf"/> - <separator/> + <separator f="" name="ecal"/> </placeholder> </submenu> @@ -90,7 +90,7 @@ <menuitem name="NewTask" verb="CalendarNewTask" _label="Create a New _Task" pixtype="pixbuf"/> - <separator/> + <separator f="" name="ecal"/> <menuitem name="PublishFreeBusy" verb="" _label="_Publish Free/Busy Information"/> </submenu> @@ -105,22 +105,22 @@ <toolitem name="NewTask" verb="CalendarNewTask" _label="New Task" priority="1" pixtype="pixbuf"/> - <separator/> + <separator f="" name="ecal1"/> <toolitem name="Print" verb="CalendarPrint" pixtype = "pixbuf"/> <toolitem name="Delete" verb="" pixtype="pixbuf"/> - <separator/> + <separator f="" name="ecal2"/> <toolitem name="Prev" verb="CalendarPrev" pixtype="pixbuf"/> <toolitem name="Today" verb="CalendarToday"/> <toolitem name="Next" verb="CalendarNext" pixtype="pixbuf"/> - <separator/> + <separator f="" name="ecal3"/> <toolitem name="Goto" verb="CalendarGoto" _label="Go To" priority="1" pixtype="pixbuf"/> - <separator/> + <separator f="" name="ecal4"/> <toolitem name="DayView" verb="ShowDayView" _label="Day" priority="1" pixtype="pixbuf"/> <toolitem name="WorkWeekView" verb="ShowWorkWeekView" _label="Work Week" priority="1" pixtype="pixbuf"/> diff --git a/ui/evolution-comp-editor.xml b/ui/evolution-comp-editor.xml index 8656a4c96f..69418e3e27 100644 --- a/ui/evolution-comp-editor.xml +++ b/ui/evolution-comp-editor.xml @@ -39,17 +39,17 @@ <menuitem name="FileSaveAs" verb="" pixtype="pixbuf"/> - <separator/> + <separator f="" name="ecompedit1"/> <menuitem name="FileDelete" verb="" pixtype="pixbuf"/> - <separator/> + <separator f="" name="ecompedit2"/> <menuitem name="FilePrint" verb="" pixtype="pixbuf"/> <menuitem name="FilePrintPreview" verb="" pixtype="pixbuf"/> - <separator/> + <separator f="" name="ecompedit3"/> <menuitem name="FileClose" verb=""/> @@ -68,11 +68,11 @@ <toolitem name="FileSaveAndClose" verb="" _label="Save and Close" priority="1" pixtype="pixbuf"/> - <separator/> + <separator f="" name="ecompedit1"/> <toolitem name="FilePrint" verb="" _label="Print" priority="1" pixtype="pixbuf"/> - <separator/> + <separator f="" name="ecompedit2"/> <toolitem name="FileDelete" verb="" _label="Delete" priority="1" pixtype="pixbuf"/> diff --git a/ui/evolution-contact-editor.xml b/ui/evolution-contact-editor.xml index 845c9b3633..1f3eb166a1 100644 --- a/ui/evolution-contact-editor.xml +++ b/ui/evolution-contact-editor.xml @@ -35,12 +35,12 @@ <menuitem name="ContactEditorSaveAs" verb="" _label="Save _As..."/> - <separator/> + <separator f="" name="econtactedit1"/> <menuitem name="ContactEditorDelete" verb="" _label="Delete"/> - <separator/> + <separator f="" name="econtactedit2"/> <placeholder name="Print"> @@ -55,7 +55,7 @@ </placeholder> - <separator/> + <separator f="" name="econtactedit3"/> <menuitem name="ContactEditorClose" verb="" _label="Close"/> @@ -76,11 +76,12 @@ <toolitem name="ContactEditorSaveClose" verb="" _label="Save and Close" priority="1" pixtype="pixbuf"/> - <separator/> + <separator f="" name="econtactedit1"/> + <toolitem name="ContactEditorPrint" verb="" _label="Print" priority="1" pixtype="pixbuf"/> - <separator/> + <separator f="" name="econtactedit2"/> <toolitem name="ContactEditorDelete" verb="" _label="Delete" pixtype="pixbuf" priority="1"/> diff --git a/ui/evolution-event-editor.xml b/ui/evolution-event-editor.xml index 92057ef6be..e2be9c202d 100644 --- a/ui/evolution-event-editor.xml +++ b/ui/evolution-event-editor.xml @@ -28,7 +28,7 @@ <menuitem name="ActionCancelMeeting" verb=""/> - <separator/> + <separator f=""/> <menuitem name="ActionForward" verb=""/> diff --git a/ui/evolution-mail-global.xml b/ui/evolution-mail-global.xml index fa9ae97cd7..5dfb19e789 100644 --- a/ui/evolution-mail-global.xml +++ b/ui/evolution-mail-global.xml @@ -52,14 +52,14 @@ <menuitem name="MessageNew" verb="MailCompose" accel="*Control*n" _label="_Mail Message"/> - <separator/> + <separator f="" name="emailglobal"/> </placeholder> </submenu> </submenu> <submenu name="View"> <menuitem name="ViewPreview" verb="" _label="_Preview Pane"/> - <separator/> + <separator f="" name="emailglobal"/> <placeholder name="MailMessageView"/> <placeholder name="MailListView"/> </submenu> @@ -77,7 +77,7 @@ <menuitem name="MailGetSend" verb="" _label="_Send / Receive" accel="F9"/> <menuitem name="ActionCompose" verb="MailCompose" _label="Compose _New Message"/> - <separator/> + <separator f="" name="emailglobal"/> <placeholder name="MailMessageActions"/> @@ -95,23 +95,23 @@ <menuitem name="ToolsSettings" verb="" _label="_Mail Settings..."/> - <separator/> + <separator f="" name="emailglobal1"/> <placeholder name="MailFilterTools"> <menuitem name="ToolsFilters" verb="" _label="_Filters..."/> </placeholder> - <separator/> + <separator f="" name="emailglobal2"/> <placeholder name="MailVFolderTools"> <menuitem name="ToolsVFolders" verb="" _label="Virtual Folder _Editor..."/> </placeholder> - <separator/> + <separator f="" name="emailglobal3"/> <menuitem name="ToolsSubscriptions" verb="" _label="_Subscribe to Folders..."/> - <separator/> + <separator f="" name="emailglobal4"/> </placeholder> @@ -128,14 +128,14 @@ _label="Send / Receive" priority="1" pixtype="pixbuf"/> - <separator/> + <separator f="" name="emailglobal1"/> <placeholder name="MailMessageToolbar"/> <toolitem name="MailStop" verb="" _label="Cancel"/> - <separator/> + <separator f="" name="emailglobal2"/> <placeholder name="MailNextButtons"/> diff --git a/ui/evolution-mail-list.xml b/ui/evolution-mail-list.xml index 837f35daff..9c54f255e2 100644 --- a/ui/evolution-mail-list.xml +++ b/ui/evolution-mail-list.xml @@ -81,13 +81,13 @@ <menuitem name="EditSelectThread" verb="" _label="Select _Thread"/> <menuitem name="EditInvertSelection" verb="" _label="_Invert Selection"/> - <separator/> + <separator f="" name="emaillist1"/> <menuitem name="EditCut" verb="" _label="Cu_t"/> <menuitem name="EditCopy" verb="" _label="_Copy"/> <menuitem name="EditPaste" verb="" _label="_Paste"/> - <separator/> + <separator f="" name="emaillist2"/> </placeholder> <placeholder name="MailListEditFlags"> @@ -103,7 +103,7 @@ </placeholder> <placeholder name="MailListView"> - <separator/> + <separator f="" name="emaillist"/> <menuitem name="ViewHideSelected" verb="" _label="Hide S_elected Messages"/> <menuitem name="ViewHideRead" verb="" _label="Hide _Read Messages"/> <menuitem name="ViewShowAll" verb="" _label="Sh_ow Hidden Messages"/> diff --git a/ui/evolution-mail-message.xml b/ui/evolution-mail-message.xml index a6c1184f3f..a3fdedf5f6 100644 --- a/ui/evolution-mail-message.xml +++ b/ui/evolution-mail-message.xml @@ -207,12 +207,12 @@ <placeholder name="MailMessageEdit"> <menuitem name="MessageSearch" verb="" _label="S_earch Message..."/> - <separator/> + <separator f="" name="emaillist1"/> <menuitem name="MessageDelete" verb="" _label="_Delete"/> <menuitem name="MessageUndelete" verb="" _label="_Undelete"/> - <separator/> + <separator f="" name="emaillist2"/> <menuitem name="MessageMarkAsRead" verb="" _label="Mar_k as Read"/> <menuitem name="MessageMarkAsUnRead" verb="" _label="Mark as U_nread"/> @@ -224,20 +224,20 @@ <submenu name="View"> <placeholder name="MailMessageView"> - <separator/> + <separator f="" name="emaillist"/> <submenu name="TextSize" _label="Text Si_ze"> <menuitem name="TextZoomOut" verb="" _label="S_maller"/> <menuitem name="TextZoomIn" verb="" _label="_Larger"/> - <separator/> + <separator f="" name="emaillist"/> <menuitem name="TextZoomReset" verb="" _label="Original Si_ze"/> </submenu> <submenu name="MessageDisplay" _label="_Message Display"> <menuitem name="ViewLoadImages" verb="" _label="Load _Images"/> - <separator/> + <separator f="" name="emaillist"/> <menuitem name="ViewNormal" verb="" _label="_Normal Display"/> <menuitem name="ViewFullHeaders" verb="" _label="Show Full _Headers"/> @@ -254,7 +254,7 @@ <menuitem name="MailNextUnread" verb="" _label="Next Unread Message"/> <menuitem name="MailNextFlagged" verb="" _label="Next Important Message"/> <menuitem name="MailNextThread" verb="" _label="Next Thread"/> - <separator/> + <separator f="" name="emaillist"/> <menuitem name="MailPrevious" verb="" _label="Previous Message"/> <menuitem name="MailPreviousUnread" verb="" _label="Previous Unread Message"/> <menuitem name="MailPreviousFlagged" verb="" _label="Previous Important Message"/> @@ -269,16 +269,16 @@ <menuitem verb="MessageForwardQuoted" _label="Forward _Quoted"/> </submenu> - <separator/> + <separator f="" name="emaillist1"/> <menuitem name="MessageMove" verb="" _label="_Move to Folder"/> <menuitem name="MessageCopy" verb="" _label="_Copy to Folder"/> - <separator/> + <separator f="" name="emaillist2"/> <menuitem name="AddSenderToAddressbook" verb="" _label="Add Sender to Address Book"/> - <separator/> + <separator f="" name="emaillist3"/> <menuitem name="MessageApplyFilters" verb="" _label="_Apply Filters"/> </placeholder> @@ -322,7 +322,7 @@ _label="Forward" priority="1" pixtype="pixbuf"/> - <separator/> + <separator f="" name="emaillist1"/> <toolitem name="MessageMove" verb="" _label="Move" @@ -332,7 +332,7 @@ _label="Copy" pixtype="pixbuf"/> - <separator/> + <separator f="" name="emaillist2"/> <toolitem name="PrintMessage" verb="" _label="Print" diff --git a/ui/evolution-mail-messagedisplay.xml b/ui/evolution-mail-messagedisplay.xml index 6c8a6a7eff..a371498ee2 100644 --- a/ui/evolution-mail-messagedisplay.xml +++ b/ui/evolution-mail-messagedisplay.xml @@ -8,11 +8,11 @@ <submenu name="File" _label="_File"> <placeholder name="FileOps"/> - <separator/> + <separator f="" name="emailmessage1"/> <placeholder name="Print"/> - <separator/> + <separator f="" name="emailmessage2"/> <menuitem name="MessageBrowserClose" verb="" _label="_Close"/> @@ -46,7 +46,7 @@ <dockitem name="Toolbar" relief="none" behavior="exclusive" _tip="Main toolbar" hlook="text" vlook="icon"> <placeholder name="MailMessageToolbar"/> - <separator/> + <separator f="" name="emailmessage"/> <placeholder name="MailNextButtons"/> </dockitem> </Root> diff --git a/ui/evolution-message-composer.xml b/ui/evolution-message-composer.xml index 683ed463ad..ae14864bcf 100644 --- a/ui/evolution-message-composer.xml +++ b/ui/evolution-message-composer.xml @@ -85,33 +85,33 @@ <menuitem name="FileSend" verb="" _label="Send"/> <menuitem name="FileSendLater" verb="" _label="Send _Later"/> - <separator/> + <separator f="" name="emailcomposer1"/> <menuitem name="FileSave" verb="" _label="_Save"/> <menuitem name="FileSaveAs" verb="" _label="Save _As..."/> <menuitem name="FileSaveDraft" verb="" _label="Save _Draft"/> <placeholder name="Print" delimit="top"/> - <separator/> + <separator f="" name="emailcomposer2"/> <menuitem name="FileClose" verb="" _label="_Close"/> </submenu> <submenu name="Edit" _label="_Edit"> <placeholder name="EditUndoRedo"/> - <separator/> + <separator f="" name="emailcomposer1"/> <placeholder name="EditCutCopyPaste"/> - <separator/> + <separator f="" name="emailcomposer2"/> <placeholder name="EditFindReplace"/> - <separator/> + <separator f="" name="emailcomposer3"/> <placeholder name="EncodingPlaceholder"/> - <separator/> + <separator f="" name="emailcomposer4"/> <placeholder name="EditMisc"/> </submenu> <submenu name="View" _label="_View"> <menuitem name="ViewAttach" verb="" _label="Show _attachments"/> - <separator/> + <separator f="" name="emailcomposer"/> <menuitem name="ViewFrom" verb=""/> <menuitem name="ViewReplyTo" verb=""/> <menuitem name="ViewCC" verb=""/> @@ -129,7 +129,7 @@ <submenu name="Format" _label="For_mat"> <menuitem name="FormatHtml" verb=""/> - <separator/> + <separator f="" name="emailcomposer"/> <placeholder name="FormatParagraph"/> </submenu> @@ -146,7 +146,7 @@ <toolitem name="FileSend" verb="" pixtype="pixbuf" priority="1"/> <toolitem name="FileAttach" verb="" pixtype="pixbuf" priority="1"/> - <separator/> + <separator f="" name="emailcomposer"/> </dockitem> </Root> diff --git a/ui/evolution-signature-editor.xml b/ui/evolution-signature-editor.xml index af8604d1e7..f4b964bd72 100644 --- a/ui/evolution-signature-editor.xml +++ b/ui/evolution-signature-editor.xml @@ -31,7 +31,7 @@ <placeholder name="Print" delimit="top"/> - <separator/> + <separator f=""/> <menuitem name="FileClose" verb="" _label="_Close"/> </submenu> @@ -39,11 +39,11 @@ <submenu name="Edit" _label="_Edit"> <placeholder name="EditUndoRedo"/> - <separator/> + <separator f=""/> <placeholder name="EditCutCopyPaste"/> - <separator/> + <separator f=""/> <placeholder name="EditFindReplace"/> - <separator/> + <separator f=""/> <placeholder name="EditMisc"/> </submenu> diff --git a/ui/evolution-subscribe.xml b/ui/evolution-subscribe.xml index 48be3210b3..a2eb86fb60 100644 --- a/ui/evolution-subscribe.xml +++ b/ui/evolution-subscribe.xml @@ -46,7 +46,7 @@ _label="Unsubscribe" _tip="Remove folder from your list of subscribed folders" pixtype="pixbuf"/> - <separator/> + <separator f=""/> <toolitem name="RefreshList" verb="" _label="Refresh List" _tip="Refresh List of Folders" diff --git a/ui/evolution-task-editor.xml b/ui/evolution-task-editor.xml index f9fe541784..0fa886850f 100644 --- a/ui/evolution-task-editor.xml +++ b/ui/evolution-task-editor.xml @@ -28,7 +28,7 @@ <menuitem name="ActionCancelTask" verb=""/> - <separator/> + <separator f=""/> <menuitem name="ActionForward" verb=""/> diff --git a/ui/evolution.xml b/ui/evolution.xml index 26eb7d2bc3..725e72b5e7 100644 --- a/ui/evolution.xml +++ b/ui/evolution.xml @@ -27,6 +27,7 @@ </commands> <menu> + <menuitem name="Dump" _label="_Dump" verb="BonoboUIDump"/> <submenu name="File" _label="_File"> <submenu name="New" _label="_New"> <placeholder name="NewFirstItem"> @@ -49,7 +50,7 @@ <placeholder name="FileOps"/> - <separator/> + <separator f="" name="eshell1"/> <submenu name="Folder" _label="_Folder"> <menuitem name="Folder" @@ -58,14 +59,14 @@ accel="*Control**Shift*e" pixtype="pixbuf"/> - <separator/> + <separator f="" name="eshell1"/> <menuitem name="OpenFolderInNewWindow" verb="OpenFolderInNewWindow" _label="Open in New _Window" _tip="Open this folder in an other window"/> - <separator/> + <separator f="" name="eshell2"/> <menuitem name="MoveFolder" verb="MoveFolder" @@ -77,7 +78,7 @@ _label="_Copy..." _tip="Copy this folder"/> - <separator/> + <separator f="" name="eshell3"/> <menuitem name="DeleteFolder" verb="DeleteFolder" @@ -89,7 +90,7 @@ _label="_Rename..." _tip="Change the name of this folder"/> - <separator/> + <separator f="" name="eshell4"/> <menuitem name="AddFolderToShortcutBar" verb="AddFolderToShortcutBar" @@ -105,7 +106,7 @@ _label="_Go to Folder..." _tip="Display a different folder" accel="*Control*g"/> - <separator/> + <separator f="" name="eshell4"/> <menuitem name="FileImporter" verb="" _label="_Import..." @@ -114,7 +115,7 @@ <placeholder name="Print" delimit="top"/> - <separator/> + <separator f="" name="eshell5"/> <menuitem name="ToggleOffline" verb="" _label="Work Offline" @@ -147,17 +148,17 @@ <placeholder name="BuiltMenuItems"/> - <separator/> + <separator f="" name="eshell1"/> <menuitem name="HelpFAQ" verb="" _label="Ximian Evolution _FAQ"/> - <separator/> + <separator f="" name="eshell2"/> <menuitem name="HelpSubmitBug" verb="" _label="Submit _Bug Report"/> - <separator/> + <separator f="" name="eshell3"/> <menuitem name="HelpAbout" verb="" _label="_About Ximian Evolution..."/> @@ -165,10 +166,21 @@ </submenu> </menu> - <dockitem name="Toolbar" relief="none" behavior="exclusive" config="0" - _tip="Main toolbar" hlook="text" vlook="icon"/> + <dockitem name="Toolbar" + relief="none" + behavior="exclusive" + config="0" + _tip="Main toolbar" + hlook="text" + vlook="icon"> + + <control name="NewComboButton"/> + </dockitem> <popups> + <popup name="NewPopup"> + </popup> + <popup name="FolderPopup"> <menuitem name="ActivateView" verb="ActivateView" @@ -180,7 +192,7 @@ _label="Open in New Window" _tip="Open this folder in an other window"/> - <separator/> + <separator f="" name="eshell1"/> <menuitem name="MoveFolder" verb="MoveFolder" @@ -192,7 +204,7 @@ _label="_Copy..." _tip="Copy this folder"/> - <separator/> + <separator f="" name="eshell2"/> <menuitem name="DeleteFolder" verb="DeleteFolder" @@ -209,7 +221,7 @@ _label="Create _New Folder..." _tip="Create a new folder"/> - <separator/> + <separator f="" name="eshell3"/> <menuitem name="AddFolderToShortcutBar" verb="AddFolderToShortcutBar" diff --git a/ui/my-evolution.xml b/ui/my-evolution.xml index a62f0469c8..339a43399f 100644 --- a/ui/my-evolution.xml +++ b/ui/my-evolution.xml @@ -25,7 +25,7 @@ <placeholder name="ComponentPlaceholder"> <menuitem name="ToolsSettings" verb="" _label="_Summary Settings..."/> - <separator/> + <separator f="" name="myevo"/> </placeholder> </submenu> </menu> |