change keyboard shortcut for merge to avoid clash on MacOS #422

3ll3d00d · Jan 29, 2021 · 6ead22f · 6ead22f
1 parent c540e34
commit 6ead22f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/main/python/ui/beq.py b/src/main/python/ui/beq.py
@@ -902,6 +902,6 @@ def retranslateUi(self, MainWindow):
         self.actionShow_Filter_Widget.setText(_translate("MainWindow", "Show Filter Widget"))
         self.actionShow_Filter_Widget.setShortcut(_translate("MainWindow", "Ctrl+Alt+="))
         self.actionMerge_Signals.setText(_translate("MainWindow", "Merge &Signals"))
-        self.actionMerge_Signals.setShortcut(_translate("MainWindow", "Ctrl+Alt+S"))
+        self.actionMerge_Signals.setShortcut(_translate("MainWindow", "Ctrl+Meta+S"))
 from app import PlotWidgetWithDateAxis
 from mpl import MplWidget
diff --git a/src/main/python/ui/beq.ui b/src/main/python/ui/beq.ui
@@ -1550,7 +1550,7 @@
     <string>Merge &amp;Signals</string>
    </property>
    <property name="shortcut">
-    <string>Ctrl+Alt+S</string>
+    <string>Ctrl+Meta+S</string>
    </property>
   </action>
  </widget>