From a63fdd15b4f9ecf19162f174212abfaebaf599be Mon Sep 17 00:00:00 2001
From: Jordan Lee <jordan@transmissionbt.com>
Date: Thu, 20 Jan 2011 20:32:28 +0000
Subject: [PATCH] (trunk) #3926 "use 'Open Torrent' instead of 'Add Torrent' in
 GTK+ and Qt clients" -- fix accelerator ambiguity.

Using Ctrl-O for "Open File" causes a conflict with the existing Ctrl-O for "Open Folder." The HIG-compliant shortcut wins the conflict, so "Open Folder" gets a new accelerator.
---
 gtk/actions.c | 2 +-
 qt/mainwin.ui | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gtk/actions.c b/gtk/actions.c
index 48c977794..2eb817c1f 100644
--- a/gtk/actions.c
+++ b/gtk/actions.c
@@ -126,7 +126,7 @@ static GtkActionEntry entries[] =
     { "deselect-all", NULL, N_( "Dese_lect All" ), "<shift><control>A", NULL, G_CALLBACK( action_cb ) },
     { "edit-preferences", GTK_STOCK_PREFERENCES, NULL, NULL, NULL, G_CALLBACK( action_cb ) },
     { "show-torrent-properties", GTK_STOCK_PROPERTIES, NULL, "<alt>Return", N_( "Torrent properties" ), G_CALLBACK( action_cb ) },
-    { "open-torrent-folder",  GTK_STOCK_OPEN, N_( "_Open Folder" ), NULL, NULL, G_CALLBACK( action_cb ) },
+    { "open-torrent-folder",  GTK_STOCK_OPEN, N_( "Open Fold_er" ), "<control>E", NULL, G_CALLBACK( action_cb ) },
     { "show-about-dialog", GTK_STOCK_ABOUT, NULL, NULL, NULL, G_CALLBACK( action_cb ) },
     { "help", GTK_STOCK_HELP, N_( "_Contents" ), "F1", NULL, G_CALLBACK( action_cb ) },
     { "update-tracker", GTK_STOCK_NETWORK, N_( "Ask Tracker for _More Peers" ), NULL, NULL, G_CALLBACK( action_cb ) },
diff --git a/qt/mainwin.ui b/qt/mainwin.ui
index df7826d4e..e2c5430a2 100644
--- a/qt/mainwin.ui
+++ b/qt/mainwin.ui
@@ -214,13 +214,13 @@
   </action>
   <action name="action_OpenFolder">
    <property name="text">
-    <string>&amp;Open Folder</string>
+    <string>Open Fold&amp;er</string>
    </property>
    <property name="toolTip">
     <string>Open the torrent's folder</string>
    </property>
    <property name="shortcut">
-    <string>Ctrl+O</string>
+    <string>Ctrl+E</string>
    </property>
   </action>
   <action name="action_Start">