aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStig Bjørlykke <stig@bjorlykke.org>2017-12-18 21:02:52 +0100
committerAnders Broman <a.broman58@gmail.com>2017-12-19 04:47:42 +0000
commit7cb6255f17b90863d863ad995d7bca5921b7c517 (patch)
tree3013069fc21d247ba4f110d90f2703f49487046e
parent9f7b8713fa8286611e84a68f82adc2d494b21173 (diff)
Qt: Resolve duplicate keyboard shortcuts
Two Edit->Copy methods are using the same keyboard shortcut as other functionality: 1. Ctrl+Shift+D is used for "Copy this item's description" and "Ignore All Displayed packets" 2. Ctrl+Shift+F is used for "Copy this item's field name" and "Reload as File Format/Capture" Resolve this by changing the Copy methods to use Ctrl+Alt+Shift as modifier. Add a keyboard shortcut for "Copy all visible items" while here. Change-Id: I0d963501055e63963d93e211f592aa9e82801d3c Reviewed-on: https://code.wireshark.org/review/24884 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
-rw-r--r--docbook/release-notes.asciidoc3
-rw-r--r--ui/qt/main_window.ui9
2 files changed, 9 insertions, 3 deletions
diff --git a/docbook/release-notes.asciidoc b/docbook/release-notes.asciidoc
index 873f84dd48..5a6e24f9e0 100644
--- a/docbook/release-notes.asciidoc
+++ b/docbook/release-notes.asciidoc
@@ -21,6 +21,9 @@ used for troubleshooting, analysis, development and education.
* Application startup time has been reduced.
+* Some keyboard shortcut mix-up has been resolved by assigning new shortcuts
+ to Edit -> Copy methods.
+
* The installation step for Wireshark will now install headers required to
build plugins. A pkg-config file is provided to help with this
(see doc/plugins.example for details). Note you must still rebuild all
diff --git a/ui/qt/main_window.ui b/ui/qt/main_window.ui
index 87ecfdd379..f9a0705c71 100644
--- a/ui/qt/main_window.ui
+++ b/ui/qt/main_window.ui
@@ -1310,13 +1310,16 @@
<string>Copy this item's description</string>
</property>
<property name="shortcut">
- <string notr="true">Ctrl+Shift+D</string>
+ <string notr="true">Ctrl+Alt+Shift+D</string>
</property>
</action>
<action name="actionCopyAllVisibleItems">
<property name="text">
<string>All Visible Items</string>
</property>
+ <property name="shortcut">
+ <string notr="true">Ctrl+Alt+Shift+A</string>
+ </property>
</action>
<action name="actionCopyAllVisibleSelectedTreeItems">
<property name="text">
@@ -1331,7 +1334,7 @@
<string>Copy this item's field name</string>
</property>
<property name="shortcut">
- <string notr="true">Ctrl+Shift+F</string>
+ <string notr="true">Ctrl+Alt+Shift+F</string>
</property>
</action>
<action name="actionEditCopyValue">
@@ -1342,7 +1345,7 @@
<string>Copy this item's value</string>
</property>
<property name="shortcut">
- <string notr="true">Ctrl+Shift+V</string>
+ <string notr="true">Ctrl+Alt+Shift+V</string>
</property>
</action>
<action name="actionEditCopyAsFilter">