Qt: Update some keyboard shortcuts to match the GTK+ UI.

As the QKeySequence documentation says,

  "On Mac OS X, references to "Ctrl", Qt::CTRL, Qt::Control and
   Qt::ControlModifier correspond to the Command keys on the Macintosh
   keyboard, and references to "Meta", Qt::META, Qt::Meta and
   Qt::MetaModifier correspond to the Control keys. Developers on Mac OS
   X can use the same shortcut descriptions across all platforms, and
   their applications will automatically work as expected on Mac OS X."

This also applies to Qt Creator on OS X. If you assign a shortcut to an
action that contains the Control key, it will draw the ^ symbol in the
UI but will save "Meta" in the .ui file instead of "Ctrl", in the manner
of a well-meaning-but-not-helpful comedy sidekick.

This happened for the actions listed below. Replace "Meta" in their
shortcuts with "Ctrl".

- Unmark all (Ctrl+Alt+M)
- Next marked packet (Ctrl+Shift+N)
- Previous marked packet (Ctrl+Shift+B)
- Show packet times... (Ctrl+Alt+1 - Ctrl+Alt+8)

This matches the GTK+ UI on Windows and Linux, and uses the Command key
on OS X. If we really want to use the Control key everywhere we can
override the action sequences in main_window.cpp. We might want to do
this for the "mark" actions since Command+M is the standard key for
"Minimize this window".

Change-Id: I1537cee5bc27a32b505bace01c1de3703a18dd6a
Reviewed-on: https://code.wireshark.org/review/13238
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
(cherry picked from commit 1f0c9f669375da29c60552ce2f7a63c9bfbd1433)
Reviewed-on: https://code.wireshark.org/review/13252

1 files changed, 11 insertions, 11 deletions

diff --git a/ui/qt/main_window.ui b/ui/qt/main_window.ui
index b378f488e6..84b27daebe 100644
--- a/ui/qt/main_window.ui
+++ b/ui/qt/main_window.ui
@@ -1447,7 +1447,7 @@
     <string>Unmark all displayed packets</string>
    </property>
    <property name="shortcut">
-    <string>Meta+Alt+M</string>
+    <string>Ctrl+Alt+M</string>
    </property>
   </action>
   <action name="actionEditNextMark">
@@ -1458,7 +1458,7 @@
     <string>Go to the next marked packet</string>
    </property>
    <property name="shortcut">
-    <string>Meta+Shift+N</string>
+    <string>Ctrl+Shift+N</string>
    </property>
   </action>
   <action name="actionEditPreviousMark">
@@ -1469,7 +1469,7 @@
     <string>Go to the previous marked packet</string>
    </property>
    <property name="shortcut">
-    <string>Meta+Shift+B</string>
+    <string>Ctrl+Shift+B</string>
    </property>
   </action>
   <action name="actionEditIgnorePacket">
@@ -2103,7 +2103,7 @@
     <string>Show packet times as the date and time of day.</string>
    </property>
    <property name="shortcut">
-    <string>Meta+Alt+1</string>
+    <string>Ctrl+Alt+1</string>
    </property>
   </action>
   <action name="actionViewTimeDisplayFormatDateYDOYandTimeOfDay">
@@ -2128,7 +2128,7 @@
     <string>Show packet times as the date and time of day.</string>
    </property>
    <property name="shortcut">
-    <string>Meta+Alt+2</string>
+    <string>Ctrl+Alt+2</string>
    </property>
   </action>
   <action name="actionViewTimeDisplayFormatSecondsSinceEpoch">
@@ -2142,7 +2142,7 @@
     <string>Show packet times as the seconds since the UNIX / POSIX epoch (1970-01-01).</string>
    </property>
    <property name="shortcut">
-    <string>Meta+Alt+3</string>
+    <string>Ctrl+Alt+3</string>
    </property>
   </action>
   <action name="actionViewTimeDisplayFormatSecondsSinceBeginningOfCapture">
@@ -2156,7 +2156,7 @@
     <string>Show packet times as the date and time of day.</string>
    </property>
    <property name="shortcut">
-    <string>Meta+Alt+4</string>
+    <string>Ctrl+Alt+4</string>
    </property>
   </action>
   <action name="actionViewTimeDisplayFormatSecondsSincePreviousCapturedPacket">
@@ -2170,7 +2170,7 @@
     <string>Show packet times as the seconds since the previous captured packet.</string>
    </property>
    <property name="shortcut">
-    <string>Meta+Alt+5</string>
+    <string>Ctrl+Alt+5</string>
    </property>
   </action>
   <action name="actionViewTimeDisplayFormatSecondsSincePreviousDisplayedPacket">
@@ -2184,7 +2184,7 @@
     <string>Show packet times as the seconds since the previous displayed packet.</string>
    </property>
    <property name="shortcut">
-    <string>Meta+Alt+6</string>
+    <string>Ctrl+Alt+6</string>
    </property>
   </action>
   <action name="actionViewTimeDisplayFormatUTCDateYMDandTimeOfDay">
@@ -2198,7 +2198,7 @@
     <string>Show packet times as the UTC date and time of day.</string>
    </property>
    <property name="shortcut">
-    <string>Meta+Alt+7</string>
+    <string>Ctrl+Alt+7</string>
    </property>
   </action>
   <action name="actionViewTimeDisplayFormatUTCDateYDOYandTimeOfDay">
@@ -2223,7 +2223,7 @@
     <string>Show packet times as the UTC time of day.</string>
    </property>
    <property name="shortcut">
-    <string>Meta+Alt+8</string>
+    <string>Ctrl+Alt+8</string>
    </property>
   </action>
   <action name="actionViewTimeDisplayFormatPrecisionAutomatic">