Changeset 11726

Timestamp:

Jan 20, 2011, 8:32:28 PM (12 years ago)

Author:

jordan

Message:

(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.

Location:

trunk

Files:

• gtk/actions.c (modified) (1 diff)
• qt/mainwin.ui (modified) (2 diffs)

trunk/gtk/actions.c

@@ -127 +127 @@
     { "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 ) },

trunk/qt/mainwin.ui

@@ -215 +215 @@
   <action name="action_OpenFolder">
    <property name="text">
-    <string>&amp;Open Folder</string>
+    <string>Open Fold&amp;er</string>
    </property>
    <property name="toolTip">
@@ -221 +221 @@
    </property>
    <property name="shortcut">
-    <string>Ctrl+O</string>
+    <string>Ctrl+E</string>
    </property>
   </action>