aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
Diffstat (limited to 'ui')
-rw-r--r--ui/evolution-calendars.ui24
-rw-r--r--ui/evolution-contacts.ui12
-rw-r--r--ui/evolution-mail-reader.ui6
-rw-r--r--ui/evolution-mail.ui1
-rw-r--r--ui/evolution-memos.ui16
-rw-r--r--ui/evolution-shell.ui6
-rw-r--r--ui/evolution-tasks.ui16
7 files changed, 31 insertions, 50 deletions
diff --git a/ui/evolution-calendars.ui b/ui/evolution-calendars.ui
index 8bff0fc506..818ed176b3 100644
--- a/ui/evolution-calendars.ui
+++ b/ui/evolution-calendars.ui
@@ -11,10 +11,6 @@
</menu>
<menu action='edit-menu'>
<placeholder name='edit-actions'>
- <menuitem action='event-clipboard-cut'/>
- <menuitem action='event-clipboard-copy'/>
- <menuitem action='event-clipboard-paste'/>
- <separator/>
<menuitem action='event-delete'/>
<menuitem action='event-delete-occurrence'/>
<menuitem action='event-delete-occurrence-all'/>
@@ -66,7 +62,7 @@
<separator/>
<menuitem action='event-popup-print'/>
<separator/>
- <menuitem action='event-popup-clipboard-paste'/>
+ <menuitem action='popup-paste-clipboard'/>
<separator/>
<menu action='gal-view-menu'>
<menuitem action='calendar-view-day'/>
@@ -85,9 +81,9 @@
<menuitem action='event-popup-save-as'/>
<menuitem action='event-popup-print'/>
<separator/>
- <menuitem action='event-popup-clipboard-cut'/>
- <menuitem action='event-popup-clipboard-copy'/>
- <menuitem action='event-popup-clipboard-paste'/>
+ <menuitem action='popup-cut-clipboard'/>
+ <menuitem action='popup-copy-clipboard'/>
+ <menuitem action='popup-paste-clipboard'/>
<separator/>
<menuitem action='event-popup-copy'/>
<menuitem action='event-popup-move'/>
@@ -113,9 +109,9 @@
<menuitem action='calendar-memopad-save-as'/>
<menuitem action='calendar-memopad-print'/>
<separator/>
- <menuitem action='calendar-memopad-clipboard-cut'/>
- <menuitem action='calendar-memopad-clipboard-copy'/>
- <menuitem action='calendar-memopad-clipboard-paste'/>
+ <menuitem action='popup-cut-clipboard'/>
+ <menuitem action='popup-copy-clipboard'/>
+ <menuitem action='popup-paste-clipboard'/>
<separator/>
<menuitem action='calendar-memopad-forward'/>
<separator/>
@@ -129,9 +125,9 @@
<menuitem action='calendar-taskpad-save-as'/>
<menuitem action='calendar-taskpad-print'/>
<separator/>
- <menuitem action='calendar-taskpad-clipboard-cut'/>
- <menuitem action='calendar-taskpad-clipboard-copy'/>
- <menuitem action='calendar-taskpad-clipboard-paste'/>
+ <menuitem action='popup-cut-clipboard'/>
+ <menuitem action='popup-copy-clipboard'/>
+ <menuitem action='popup-paste-clipboard'/>
<separator/>
<menuitem action='calendar-taskpad-assign'/>
<menuitem action='calendar-taskpad-forward'/>
diff --git a/ui/evolution-contacts.ui b/ui/evolution-contacts.ui
index 864a5aa887..c3ce87108a 100644
--- a/ui/evolution-contacts.ui
+++ b/ui/evolution-contacts.ui
@@ -13,12 +13,6 @@
</menu>
<menu action='edit-menu'>
<placeholder name='edit-actions'>
- <menuitem action='contact-select-all'/>
- <separator/>
- <menuitem action='contact-clipboard-cut'/>
- <menuitem action='contact-clipboard-copy'/>
- <menuitem action='contact-clipboard-paste'/>
- <separator/>
<menuitem action='contact-delete'/>
<menuitem action='address-book-delete'/>
</placeholder>
@@ -77,9 +71,9 @@
<menuitem action='contact-popup-copy'/>
<menuitem action='contact-popup-move'/>
<separator/>
- <menuitem action='contact-popup-clipboard-cut'/>
- <menuitem action='contact-popup-clipboard-copy'/>
- <menuitem action='contact-popup-clipboard-paste'/>
+ <menuitem action='popup-cut-clipboard'/>
+ <menuitem action='popup-copy-clipboard'/>
+ <menuitem action='popup-paste-clipboard'/>
<menuitem action='contact-popup-delete'/>
</popup>
<popup name='contact-search-options'>
diff --git a/ui/evolution-mail-reader.ui b/ui/evolution-mail-reader.ui
index 1209144486..b54f4b970e 100644
--- a/ui/evolution-mail-reader.ui
+++ b/ui/evolution-mail-reader.ui
@@ -11,10 +11,6 @@
</menu>
<menu action='edit-menu'>
<placeholder name='edit-actions'>
- <menuitem action='mail-clipboard-copy'/>
- <separator/>
- <menuitem action='mail-select-all'/>
- <separator/>
<menuitem action='mail-delete'/>
<menuitem action='mail-undelete'/>
<separator/>
@@ -145,8 +141,6 @@
</placeholder>
</popup>
<popup name='mail-preview-popup'>
- <menuitem action='mail-popup-clipboard-copy'/>
- <separator/>
<menuitem action='mail-popup-reply-sender'/>
<menuitem action='mail-popup-reply-all'/>
<menuitem action='mail-popup-forward'/>
diff --git a/ui/evolution-mail.ui b/ui/evolution-mail.ui
index f2c162c387..ec971201d1 100644
--- a/ui/evolution-mail.ui
+++ b/ui/evolution-mail.ui
@@ -42,7 +42,6 @@
<menuitem action='mail-folder-copy'/>
<menuitem action='mail-folder-move'/>
<separator/>
- <menuitem action='mail-folder-select-all'/>
<menuitem action='mail-folder-select-thread'/>
<menuitem action='mail-folder-select-subthread'/>
<menuitem action='mail-folder-mark-all-as-read'/>
diff --git a/ui/evolution-memos.ui b/ui/evolution-memos.ui
index 0d842b1526..29c4263440 100644
--- a/ui/evolution-memos.ui
+++ b/ui/evolution-memos.ui
@@ -11,10 +11,6 @@
</menu>
<menu action='edit-menu'>
<placeholder name='edit-actions'>
- <menuitem action='memo-clipboard-cut'/>
- <menuitem action='memo-clipboard-copy'/>
- <menuitem action='memo-clipboard-paste'/>
- <separator/>
<menuitem action='memo-delete'/>
</placeholder>
</menu>
@@ -31,9 +27,9 @@
</menubar>
<toolbar name='main-toolbar'>
<placeholder name='toolbar-actions'>
- <toolitem action='memo-clipboard-cut'/>
- <toolitem action='memo-clipboard-copy'/>
- <toolitem action='memo-clipboard-paste'/>
+ <toolitem action='cut-clipboard'/>
+ <toolitem action='copy-clipboard'/>
+ <toolitem action='paste-clipboard'/>
<separator/>
<toolitem action='memo-list-print'/>
<toolitem action='memo-delete'/>
@@ -47,9 +43,9 @@
<menuitem action='memo-popup-save-as'/>
<menuitem action='memo-popup-print'/>
<separator/>
- <menuitem action='memo-popup-clipboard-cut'/>
- <menuitem action='memo-popup-clipboard-copy'/>
- <menuitem action='memo-popup-clipboard-paste'/>
+ <menuitem action='popup-cut-clipboard'/>
+ <menuitem action='popup-copy-clipboard'/>
+ <menuitem action='popup-paste-clipboard'/>
<separator/>
<menuitem action='memo-popup-forward'/>
<separator/>
diff --git a/ui/evolution-shell.ui b/ui/evolution-shell.ui
index ccfeb865d2..654d322f60 100644
--- a/ui/evolution-shell.ui
+++ b/ui/evolution-shell.ui
@@ -20,6 +20,12 @@
<menuitem action='quit'/>
</menu>
<menu action='edit-menu'>
+ <menuitem action='cut-clipboard'/>
+ <menuitem action='copy-clipboard'/>
+ <menuitem action='paste-clipboard'/>
+ <separator/>
+ <menuitem action='select-all'/>
+ <separator/>
<placeholder name='edit-actions'/>
<separator/>
<menuitem action='sync-options'/>
diff --git a/ui/evolution-tasks.ui b/ui/evolution-tasks.ui
index 70695883df..de4d97e067 100644
--- a/ui/evolution-tasks.ui
+++ b/ui/evolution-tasks.ui
@@ -11,10 +11,6 @@
</menu>
<menu action='edit-menu'>
<placeholder name='edit-actions'>
- <menuitem action='task-clipboard-cut'/>
- <menuitem action='task-clipboard-copy'/>
- <menuitem action='task-clipboard-paste'/>
- <separator/>
<menuitem action='task-delete'/>
<separator/>
<menuitem action='task-mark-complete'/>
@@ -40,9 +36,9 @@
</placeholder>
</menubar>
<toolbar name='main-toolbar'>
- <toolitem action='task-clipboard-cut'/>
- <toolitem action='task-clipboard-copy'/>
- <toolitem action='task-clipboard-paste'/>
+ <toolitem action='cut-clipboard'/>
+ <toolitem action='copy-clipboard'/>
+ <toolitem action='paste-clipboard'/>
<separator/>
<toolitem action='task-print'/>
<toolitem action='task-delete'/>
@@ -55,9 +51,9 @@
<menuitem action='task-popup-save-as'/>
<menuitem action='task-popup-print'/>
<separator/>
- <menuitem action='task-popup-clipboard-cut'/>
- <menuitem action='task-popup-clipboard-copy'/>
- <menuitem action='task-popup-clipboard-paste'/>
+ <menuitem action='popup-cut-clipboard'/>
+ <menuitem action='popup-copy-clipboard'/>
+ <menuitem action='popup-paste-clipboard'/>
<separator/>
<menuitem action='task-popup-assign'/>
<menuitem action='task-popup-forward'/>