From 5ea37bd192b8c18b21077fc4c71c8958666a0812 Mon Sep 17 00:00:00 2001 From: Curtis Gedak Date: Thu, 22 Nov 2018 09:32:47 -0700 Subject: [PATCH] Remove plot resolution step key bindings Ctrl+Enter and Ctrl+Backspace Many applications, including Manuskript in the Editor pane, use the keyboard shortcut 'Ctrl+Backspace' to delete the previous word. However in the Plot pane Manuskript uses 'Ctrl+Backspace' to delete a plot resolution step. Fix this inconsistent behaviour by removing the keyboard shortcuts for 'Ctrl+Enter' and 'Ctrl+Backspace' from the Plot pane. Closes issue #375 --- manuskript/ui/mainWindow.py | 6 ++---- manuskript/ui/mainWindow.ui | 10 ++-------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/manuskript/ui/mainWindow.py b/manuskript/ui/mainWindow.py index 5589962a..2fa93140 100644 --- a/manuskript/ui/mainWindow.py +++ b/manuskript/ui/mainWindow.py @@ -1418,10 +1418,8 @@ class Ui_MainWindow(object): self.label_28.setText(_translate("MainWindow", "Result")) self.tabPlot.setTabText(self.tabPlot.indexOf(self.infos_2), _translate("MainWindow", "Basic info")) self.grpSubPlotSummary.setTitle(_translate("MainWindow", "Summary:")) - self.btnAddSubPlot.setToolTip(_translate("MainWindow", "Add plot step (CTRL+Enter)")) - self.btnAddSubPlot.setShortcut(_translate("MainWindow", "Ctrl+Return")) - self.btnRmSubPlot.setToolTip(_translate("MainWindow", "Remove selected plot step(s) (CTRL+Backspace)")) - self.btnRmSubPlot.setShortcut(_translate("MainWindow", "Ctrl+Backspace")) + self.btnAddSubPlot.setToolTip(_translate("MainWindow", "Add plot step")) + self.btnRmSubPlot.setToolTip(_translate("MainWindow", "Remove selected plot step(s)")) self.tabPlot.setTabText(self.tabPlot.indexOf(self.tab_15), _translate("MainWindow", "Resolution steps")) self.grpPlotSummary.setTitle(_translate("MainWindow", "Summary")) self.comboBox_2.setItemText(0, _translate("MainWindow", "One paragraph")) diff --git a/manuskript/ui/mainWindow.ui b/manuskript/ui/mainWindow.ui index 182df211..081f5f7e 100644 --- a/manuskript/ui/mainWindow.ui +++ b/manuskript/ui/mainWindow.ui @@ -1348,7 +1348,7 @@ - Add plot step (CTRL+Enter) + Add plot step @@ -1357,9 +1357,6 @@ .. - - Ctrl+Return - true @@ -1368,7 +1365,7 @@ - Remove selected plot step(s) (CTRL+Backspace) + Remove selected plot step(s) @@ -1377,9 +1374,6 @@ .. - - Ctrl+Backspace - true