From 2a585c5e5ae57eb2361397eba1fa26284948f0fe Mon Sep 17 00:00:00 2001 From: Damien Elmes Date: Thu, 11 Feb 2021 10:10:45 +1000 Subject: [PATCH] Revert "add escape hatch for new clicking behaviour, in case it causes problems" This reverts commit 678756c3e991ffe70ebb8993d3e8e4dc387270ef. --- qt/aqt/profiles.py | 3 --- qt/aqt/sidebar.py | 12 ++++-------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/qt/aqt/profiles.py b/qt/aqt/profiles.py index 8c5ee1018..50bc6a3a6 100644 --- a/qt/aqt/profiles.py +++ b/qt/aqt/profiles.py @@ -668,9 +668,6 @@ create table if not exists profiles def set_recording_driver(self, driver: RecordingDriver) -> None: self.profile["recordingDriver"] = driver.value - def sidebar_left_click_modifiers(self) -> bool: - return self.profile.get("sidebarLeftClick", False) - ###################################################################### def apply_profile_options(self) -> None: diff --git a/qt/aqt/sidebar.py b/qt/aqt/sidebar.py index e3ddb63e1..331019f8d 100644 --- a/qt/aqt/sidebar.py +++ b/qt/aqt/sidebar.py @@ -315,10 +315,9 @@ class SidebarTreeView(QTreeView): self.setHeaderHidden(True) self.setIndentation(15) self.setAutoExpandDelay(600) - if not self.mw.pm.sidebar_left_click_modifiers(): - # pylint: disable=no-member - mode = QAbstractItemView.SelectionMode.ExtendedSelection # type: ignore - self.setSelectionMode(mode) + # pylint: disable=no-member + mode = QAbstractItemView.SelectionMode.ExtendedSelection # type: ignore + self.setSelectionMode(mode) self.setDragDropMode(QAbstractItemView.InternalMove) self.setDragDropOverwriteMode(False) @@ -434,10 +433,7 @@ class SidebarTreeView(QTreeView): def mouseReleaseEvent(self, event: QMouseEvent) -> None: super().mouseReleaseEvent(event) if event.button() == Qt.LeftButton: - if ( - not self._keyboard_modified_pressed() - or self.mw.pm.sidebar_left_click_modifiers() - ): + if not self._keyboard_modified_pressed(): self._on_click_current() elif event.button() == Qt.RightButton: if self._keyboard_modified_pressed():