diff --git a/PyLoT.py b/PyLoT.py index 0edd102a..d0070a23 100755 --- a/PyLoT.py +++ b/PyLoT.py @@ -378,17 +378,17 @@ class MainWindow(QMainWindow): tip='Toggle filtered/original' ' waveforms', checkable=True, - shortcut='Ctrl+F') + shortcut='P') self.filterActionS = createAction(parent=self, text='Apply S Filter', slot=self.filterS, icon=self.filter_icon_s, tip='Toggle filtered/original' ' waveforms', checkable=True, - shortcut='Shift+F') + shortcut='S') filterEditAction = self.createAction(self, "&Filter parameter ...", self.adjustFilterOptions, - "Alt+F", self.filter_icon, + "Ctrl+F", self.filter_icon, """Adjust filter parameters.""") self.inventoryAction = self.createAction(self, "Select &Inventory ...", self.get_new_metadata, diff --git a/pylot/RELEASE-VERSION b/pylot/RELEASE-VERSION index 18025107..a28bf6ea 100644 --- a/pylot/RELEASE-VERSION +++ b/pylot/RELEASE-VERSION @@ -1 +1 @@ -c7dc-dirty +185c-dirty diff --git a/pylot/core/util/widgets.py b/pylot/core/util/widgets.py index 16ead10a..8c2c81c5 100644 --- a/pylot/core/util/widgets.py +++ b/pylot/core/util/widgets.py @@ -1264,14 +1264,14 @@ class PickDlg(QDialog): tip='Toggle filtered/original' ' waveforms', checkable=True, - shortcut='Ctrl+F') + shortcut='P') self.filterActionS = createAction(parent=self, text='Apply S Filter', slot=self.filterS, icon=filter_icon_s, tip='Toggle filtered/original' ' waveforms', checkable=True, - shortcut='Shift+F') + shortcut='S') self.autoFilterAction = createAction(parent=self, text='Automatic Filtering', slot=self.toggleAutoFilter, icon=key_a_icon, @@ -1540,7 +1540,7 @@ class PickDlg(QDialog): filterOptionsAction = createAction(parent=self, text="&Filter parameter ...", slot=self.filterOptions, - shortcut='Alt+F', + shortcut='Ctrl+F', icon=self.orig_parent.filter_icon) filterMenu = menuBar.addMenu('Filter') filterMenu.addAction(self.filterActionP)