aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
Diffstat (limited to 'ui')
-rw-r--r--ui/ChangeLog8
-rw-r--r--ui/evolution-addressbook.xml14
-rw-r--r--ui/evolution-calendar.xml16
-rw-r--r--ui/evolution-mail.xml66
-rw-r--r--ui/evolution.xml29
5 files changed, 71 insertions, 62 deletions
diff --git a/ui/ChangeLog b/ui/ChangeLog
index 2b6a7b273e..e0e3697b6a 100644
--- a/ui/ChangeLog
+++ b/ui/ChangeLog
@@ -1,3 +1,11 @@
+2000-12-01 Anna Marie Dirks <anna@helixcode.com>
+ * evolution.xml: Redid all the keyboard shortcuts to comply with GNOME
+ standards. Removed unnecessary shortcuts from less commonly used menu
+ items, changed all references to "alt", etc.
+ * evolution-addressbook.xml: see above
+ * evolution-mail.xml: see above
+ * evolution-calendar.xml: Same as above, but I also reorganized menus slightly by moving "new appointment" from the edit menu to the file menu.
+
2000-11-28 Jeffrey Stedfast <fejj@helixcode.com>
* evolution-mail.xml: Added Save As...
diff --git a/ui/evolution-addressbook.xml b/ui/evolution-addressbook.xml
index cbbb2ca0ae..6c0e306205 100644
--- a/ui/evolution-addressbook.xml
+++ b/ui/evolution-addressbook.xml
@@ -17,10 +17,8 @@
<submenu name="View">
<menuitem name="AsTable" _label="As _Table"
- verb="ViewAsTable" accel="*Control*l"/>
+ />
- <menuitem name="ViewNewContact" verb=""
- _label="_New Contact" accel="*Control*c"/>
</submenu>
@@ -30,7 +28,7 @@
<menuitem name="Search" verb="ToolSearch"
_label="_Search for contacts"
- pixtype="stock" pixname="Search" accel="*Control*r"/>
+ pixtype="stock" pixname="Search" />
</submenu>
@@ -68,4 +66,10 @@
</dockitem>
-</Root> \ No newline at end of file
+</Root>
+
+
+
+
+
+
diff --git a/ui/evolution-calendar.xml b/ui/evolution-calendar.xml
index 8b99a5377b..9b95697585 100644
--- a/ui/evolution-calendar.xml
+++ b/ui/evolution-calendar.xml
@@ -6,19 +6,18 @@
<submenu name="New" _label="_New">
<menuitem name="CalendarNew" verb=""
- _label="New Ca_lendar" _tip="Create a new calendar"
- accel="*Control**Shift*c"/>
+ _label="Ca_lendar" _tip="Create a new calendar"
+ accel="*Control**Shift*l"/>
</submenu>
<placeholder name="FileOps">
- <submenu name="Open" _label="_Open">
-
- <menuitem name="CalendarOpen" verb=""
+
+ <menuitem name="CalendarOpen" verb=""
_label="_Open Calendar" _tip="Open a calendar"
accel="*Control*o"/>
- </submenu>
+
<menuitem name="CalendarSaveAs" verb=""
_label="_Save Calendar As"
@@ -40,9 +39,6 @@
<submenu name="Edit">
- <menuitem name="Appointment" _label="_New appointment..."
- verb="EditNewAppointment" _tip="Create a new appointment"
- accel="*Shift**Control*a"/>
</submenu>
@@ -50,7 +46,7 @@
<menuitem name="Preferences" _label="Calendar Preferences..."
verb="CalendarPreferences" _tip="Alter preferences"
- accel="*Control*r"/>
+ />
</submenu>
</menu>
diff --git a/ui/evolution-mail.xml b/ui/evolution-mail.xml
index c0029f149f..cf2c669d36 100644
--- a/ui/evolution-mail.xml
+++ b/ui/evolution-mail.xml
@@ -23,12 +23,12 @@
<menuitem name="Print" verb="PrintMessage"
_label="Print message..."
_tip="Print message to the printer"
- pixtype="stock" pixname="Print" accel="*Control**Alt*P"/>
+ pixtype="stock" pixname="Print" accel="*Control*P"/>
<menuitem name="Print Preview" verb="PrintPreviewMessage"
_label="Print Preview of message..."
_tip="Previews the message to be printed"
- pixtype="stock" pixname="Print" accel="*Control**Alt*V"/>
+ pixtype="stock" pixname="Print"/>
</placeholder>
@@ -56,20 +56,15 @@
<submenu name="Settings">
- <menuitem name="MailFilters" verb="SetMailFilter"
- _label="Mail _Filters..." accel="*Control*m"/>
+ <menuitem name="MailFilters" verb="SetMailFilter" _label="Mail _Filters"/>
- <menuitem name="VFolderEdit" verb="SetVFolder"
- _label="_Virtual Folder Editor..." accel="*Control*V"/>
+ <menuitem name="VFolderEdit" verb="SetVFolder" _label="_Vitrual Folder Editor"/>
- <menuitem name="SetMailConfig" verb=""
- _label="_Mail Configuration..." accel="*Control*C"/>
+ <menuitem name="SetMailConfig" verb="" _label="_Mail Configuration" />
- <menuitem name="SetSubscribe" verb=""
- _label="Manage Subscriptions..." accel="*Control*u"/>
+ <menuitem name="SetSubscribe" verb="" _label="Manage Subscriptions"/>
- <menuitem name="SetForgetPwd" verb=""
- _label="Forget _Passwords" accel="*Control*p"/>
+ <menuitem name="SetForgetPwd" verb="" _label="Forget _Passwords"/>
</submenu>
@@ -79,11 +74,11 @@
<menuitem name="MessageOpenNewWnd" verb=""
_label="_Open in New Window"
- accel="*Control**Alt*o"/>
+ accel="*Control*o"/>
<menuitem name="MessageEdit" verb=""
_label="_Edit Message"
- accel="*Control**Alt*e"/>
+ accel="*Control*e"/>
<menuitem name="MessageSaveAs" verb=""
_label="_Save Message As..."
@@ -91,59 +86,58 @@
<menuitem name="MessagePrint" verb=""
_label="_Print Message"
- accel="*Control**Alt*p"/>
+ accel="*Control*p"/>
<menuitem/>
<menuitem name="MessageReplySndr" verb=""
_label="Reply to _Sender"
- accel="*Control**Alt*s"/>
+ accel="*Control*r"/>
<menuitem name="MessageReplyAll" verb=""
- _label="Reply to _All"
- accel="*Control**Alt*a"/>
+ _label="Reply to _All" accel="*Control**Shift*r"/>
<menuitem name="MessageForward" verb=""
_label="_Forward"
- accel="*Control**Alt*f"/>
+ accel="*Control*j"/>
<menuitem name="MessageForwardAttach" verb=""
_label="Forward as Attachment"
- accel=""/>
+ accel="*Control**Shift*j"/>
<menuitem/>
<menuitem name="MessageMarkAsRead" verb=""
_label="Mar_k As Read"
- accel="*Control**Alt*r"/>
+ accel="*Control*k"/>
<menuitem name="MessageMarkAsUnRead" verb=""
_label="Mark As U_nread"
- accel="*Control**Alt*u"/>
+ accel="*Control**Shift*k"/>
<menuitem/>
<menuitem name="MessageMove" verb=""
_label="_Move to Folder..."
- accel="*Control**Alt*m"/>
+ accel="*Control*m"/>
<menuitem name="MessageCopy" verb=""
_label="_Copy to Folder..."
- accel="*Control**Alt*c"/>
+ accel="*Control*c"/>
<menuitem name="MessageDelete" verb=""
_label="_Delete"
- accel="*Control**Alt*d"/>
+ accel="*Control*d"/>
<menuitem name="MessageUndelete" verb=""
_label="_Undelete"
- accel="*Control**Alt*n"/>
+ accel="*Control*u"/>
<menuitem/>
<menuitem name="MessageApplyFilters" verb=""
_label="_Apply Filters"
- accel="*Control**Alt*y"/>
+ accel="*Control*y"/>
<menuitem/>
@@ -151,29 +145,29 @@
<menuitem name="MessageVFolderSubj" verb=""
_label="_VFolder on Subject"
- accel="*Shift**Alt*v"/>
+ />
<menuitem name="MessageVFolderSndr" verb=""
_label="VFolder on Se_nder"
- accel="*Shift**Alt*n"/>
+ />
<menuitem name="MessageVFolderRecip" verb=""
_label="VFolder on _Recipients"
- accel="*Shift**Alt*r"/>
+ />
<menuitem/>
<menuitem name="MessageFilterSubj" verb=""
_label="_Filter on Subject"
- accel="*Shift**Alt*f"/>
+ />
<menuitem name="MessageFilterSndr" verb=""
_label="Fi_lter on Sender"
- accel="*Shift**Alt*l"/>
+ />
<menuitem name="MessageFilterRecip" verb=""
_label="Filter on Rec_ipients"
- accel="*Shift**Alt*i"/>
+ />
</submenu>
@@ -186,8 +180,7 @@
accel="*Control*x"/>
<menuitem name="FolderConfig" verb=""
- _label="_Configure Folder"
- accel="*Control*g"/>
+ _label="_Configure Folder"/>
</submenu>
@@ -252,3 +245,6 @@
+
+
+
diff --git a/ui/evolution.xml b/ui/evolution.xml
index 73b30dcef0..b3bb508de1 100644
--- a/ui/evolution.xml
+++ b/ui/evolution.xml
@@ -48,11 +48,7 @@
<menuitem name="FileGoToFolder" verb=""
_label="_Go to Folder..."
- _tip="Display a different folder" accel="*Control*o"/>
-
- <menuitem name="FileCreateFolder" verb=""
- _label="_Create New Folder..."
- _tip="Create a new folder" accel="*Control*n"/>
+ _tip="Display a different folder" accel="*Control*g"/>
<placeholder name="Print" delimit="top"/>
@@ -87,26 +83,25 @@
<menuitem name="HelpGetStarted" verb=""
_label="Getting _Started"
- accel="*Control*F1"/>
+ />
<menuitem name="HelpUsingMail" verb=""
_label="Using the _Mailer"
- accel="*Control*F2"/>
+ />
<menuitem name="HelpUsingCalendar" verb=""
_label="Using the _Calendar"
- accel="*Control*F3"/>
+ />
<menuitem name="HelpUsingContact" verb=""
_label="Using the C_ontact Manager"
- accel="*Control*F4"/>
+ />
<menuitem/>
<menuitem name="HelpSubmitBug" verb=""
_label="Submit _Bug Report"
- _tip="Submit bug report using Bug Buddy"
- accel="*Control*B"/>
+ _tip="Submit bug report using Bug Buddy."/>
<menuitem/>
@@ -114,7 +109,7 @@
_label="_About Evolution..."
_tip="Show information about Evolution"
pixtype="stock" pixname="About"
- accel="*Control*e"/>
+ />
</submenu>
</menu>
@@ -128,3 +123,13 @@
</Root>
+
+
+
+
+
+
+
+
+
+