Fix merge errors

bluesky/ui/qtgl/arealist.py

@@ -1,12 +1,7 @@
 from math import cos, radians
-try:
-    from PyQt5.QtWidgets import QListView, QStyledItemDelegate, QStyle, QApplication as app
-    from PyQt5.QtGui import QColor, QPalette
-    from PyQt5.QtCore import QSize, Qt, QRect, QAbstractListModel, QModelIndex, Qt, QVariant
-except ImportError:
-    from PyQt6.QtWidgets import QListView, QStyledItemDelegate, QStyle, QApplication as app
-    from PyQt6.QtGui import QColor, QPalette
-    from PyQt6.QtCore import QSize, Qt, QRect, QAbstractListModel, QModelIndex, Qt, QVariant
+from PyQt6.QtWidgets import QListView, QStyledItemDelegate, QStyle, QApplication as app
+from PyQt6.QtGui import QColor, QPalette
+from PyQt6.QtCore import QSize, Qt, QRect, QAbstractListModel, QModelIndex, Qt, QVariant
 
 from bluesky.network import context as ctx
 from bluesky.network.subscriber import subscriber

bluesky/ui/qtgl/gui.py

@@ -2,7 +2,7 @@
 import os
 import sys
 
-from PyQt6.QtCore import Qt, QEvent, qInstallMessageHandler, QT_VERSION_STR
+from PyQt6.QtCore import QTimer, qInstallMessageHandler, QT_VERSION_STR
 
 from PyQt6.QtCore import QtMsgType
 from PyQt6.QtWidgets import QApplication

bluesky/ui/qtgl/mainwindow.py

@@ -2,19 +2,18 @@
 from pathlib import Path
 import platform
 
-from bluesky.core import Base, Signal
-from bluesky.network.discovery import Discovery
-
-from PyQt6.QtWidgets import QApplication as app
-from PyQt6.QtCore import Qt, pyqtSlot, QTimer, QItemSelectionModel, QSize
+from PyQt6.QtWidgets import QApplication as app, QWidget, QMainWindow, \
+    QSplashScreen, QTreeWidgetItem, QPushButton, QFileDialog, QDialog, \
+    QTreeWidget, QVBoxLayout, QDialogButtonBox, QMenu, QLabel
+from PyQt6.QtCore import Qt, pyqtSlot, QTimer, QItemSelectionModel, QSize, QEvent, pyqtProperty
 from PyQt6.QtGui import QPixmap, QIcon
-from PyQt6.QtWidgets import QMainWindow, QSplashScreen, QTreeWidgetItem, \
-    QPushButton, QFileDialog, QDialog, QTreeWidget, QVBoxLayout, \
-    QDialogButtonBox, QMenu
 from PyQt6 import uic
 
 # Local imports
 import bluesky as bs
+from bluesky.core import Base, Signal
+from bluesky.network.discovery import Discovery
+
 from bluesky import stack
 from bluesky.stack.argparser import PosArg
 from bluesky.pathfinder import ResourcePath

bluesky/ui/qtgl/radarwidget.py

@@ -295,8 +295,7 @@ def event(self, event):
                 if g.gestureType() == Qt.GestureType.PinchGesture:
                     event.accept(g)
                     zoom = g.scaleFactor() * (zoom or 1.0)
-                    if CORRECT_PINCH:
-                        zoom /= g.lastScaleFactor()
+
                 elif g.gestureType() == Qt.GestureType.PanGesture:
                     event.accept(g)
                     if abs(g.delta().y() + g.delta().x()) > 1e-1:

bluesky/ui/qtgl/splitter.py

@@ -1,11 +1,5 @@
-try:
-    from PyQt6.QtCore import Qt
-    from PyQt6.QtWidgets import QSplitter, QSplitterHandle, QVBoxLayout, QToolButton
-
-except ImportError:
-    from PyQt5.QtCore import Qt
-    from PyQt5.QtWidgets import QSplitter, QSplitterHandle, QVBoxLayout, QToolButton
-
+from PyQt6.QtCore import Qt
+from PyQt6.QtWidgets import QSplitter, QSplitterHandle, QVBoxLayout, QToolButton
 
 
 class Handle(QSplitterHandle):

bluesky/ui/qtgl/stacklist.py

@@ -1,10 +1,5 @@
-try:
-    from PyQt6.QtWidgets import QListView
-    from PyQt6.QtGui import QPalette
-
-except ImportError:
-    from PyQt5.QtWidgets import QListView
-    from PyQt5.QtGui import QPalette
+from PyQt6.QtWidgets import QListView
+from PyQt6.QtGui import QPalette
 
 
 class StackList(QListView):