From 1e124bf19cf7c6b4e39001a86214ee00265612ba Mon Sep 17 00:00:00 2001
From: BlueGreenMagick <50060875+BlueGreenMagick@users.noreply.github.com>
Date: Sun, 26 Apr 2020 11:32:32 +0900
Subject: [PATCH] Seperate SidebarTreeView class from Browser

---
 qt/aqt/browser.py | 81 ++++++++++++++++++++++++-----------------------
 1 file changed, 41 insertions(+), 40 deletions(-)

diff --git a/qt/aqt/browser.py b/qt/aqt/browser.py
index 45c84e99f..9d48b0118 100644
--- a/qt/aqt/browser.py
+++ b/qt/aqt/browser.py
@@ -576,6 +576,46 @@ class SidebarModel(QAbstractItemModel):
         # then ourselves
         tree.setExpanded(parent, True)
 
+    # Sidebar
+    ######################################################################
+
+
+class SidebarTreeView(QTreeView):
+    def __init__(self):
+        super().__init__()
+        self.expanded.connect(self.onExpansion)
+        self.collapsed.connect(self.onCollapse)
+
+    def onClickCurrent(self) -> None:
+        idx = self.currentIndex()
+        if idx.isValid():
+            item: SidebarItem = idx.internalPointer()
+            if item.onClick:
+                item.onClick()
+
+    def mouseReleaseEvent(self, event: QMouseEvent) -> None:
+        super().mouseReleaseEvent(event)
+        self.onClickCurrent()
+
+    def keyPressEvent(self, event: QKeyEvent) -> None:
+        if event.key() in (Qt.Key_Return, Qt.Key_Enter):
+            self.onClickCurrent()
+        else:
+            super().keyPressEvent(event)
+
+    def onExpansion(self, idx: QModelIndex) -> None:
+        self._onExpansionChange(idx, True)
+
+    def onCollapse(self, idx: QModelIndex) -> None:
+        self._onExpansionChange(idx, False)
+
+    def _onExpansionChange(self, idx: QModelIndex, expanded: bool) -> None:
+        item: SidebarItem = idx.internalPointer()
+        if item.expanded != expanded:
+            item.expanded = expanded
+            if item.onExpanded:
+                item.onExpanded(expanded)
+
 
 # Browser window
 ######################################################################
@@ -1022,51 +1062,12 @@ QTableView {{ gridline-color: {grid} }}
     def onColumnMoved(self, a, b, c):
         self.setColumnSizes()
 
-    # Sidebar
-    ######################################################################
-
-    class SidebarTreeView(QTreeView):
-        def __init__(self):
-            super().__init__()
-            self.expanded.connect(self.onExpansion)
-            self.collapsed.connect(self.onCollapse)
-
-        def onClickCurrent(self) -> None:
-            idx = self.currentIndex()
-            if idx.isValid():
-                item: SidebarItem = idx.internalPointer()
-                if item.onClick:
-                    item.onClick()
-
-        def mouseReleaseEvent(self, event: QMouseEvent) -> None:
-            super().mouseReleaseEvent(event)
-            self.onClickCurrent()
-
-        def keyPressEvent(self, event: QKeyEvent) -> None:
-            if event.key() in (Qt.Key_Return, Qt.Key_Enter):
-                self.onClickCurrent()
-            else:
-                super().keyPressEvent(event)
-
-        def onExpansion(self, idx: QModelIndex) -> None:
-            self._onExpansionChange(idx, True)
-
-        def onCollapse(self, idx: QModelIndex) -> None:
-            self._onExpansionChange(idx, False)
-
-        def _onExpansionChange(self, idx: QModelIndex, expanded: bool) -> None:
-            item: SidebarItem = idx.internalPointer()
-            if item.expanded != expanded:
-                item.expanded = expanded
-                if item.onExpanded:
-                    item.onExpanded(expanded)
-
     def setupSidebar(self) -> None:
         dw = self.sidebarDockWidget = QDockWidget(_("Sidebar"), self)
         dw.setFeatures(QDockWidget.DockWidgetClosable)
         dw.setObjectName("Sidebar")
         dw.setAllowedAreas(Qt.LeftDockWidgetArea)
-        self.sidebarTree = self.SidebarTreeView()
+        self.sidebarTree = SidebarTreeView()
         self.sidebarTree.mw = self.mw
         self.sidebarTree.setUniformRowHeights(True)
         self.sidebarTree.setHeaderHidden(True)