Merge pull request #1171 from ales-erjavec/anyqt

[ENH] Add support for PyQt5

Author: janezd

.travis/install_orange.sh

@@ -2,6 +2,7 @@ foldable pip install -U setuptools pip codecov
 
 # Install dependencies sequentially
 cat requirements-core.txt \
+    requirements-gui.txt \
     requirements-dev.txt \
     requirements-doc.txt |
     while read dep; do

MANIFEST.in

@@ -9,6 +9,7 @@ recursive-include Orange/canvas/application/workflows *.ows
 
 recursive-include Orange/widgets *.png *.svg
 recursive-include Orange/widgets/_highcharts *.js *.css *.html
+recursive-include Orange/widgets/utils/_webview *.js
 recursive-include Orange/widgets/utils/plot *.fs *.vs *.gs *.obj
 
 recursive-include distribute *.svg *.desktop

Orange/canvas/__main__.py

@@ -17,19 +17,26 @@
 
 import pkg_resources
 
-from PyQt4.QtGui import QFont, QColor, QDesktopServices, QMessageBox
-from PyQt4.QtCore import Qt, QDir, QUrl
+from AnyQt.QtGui import QFont, QColor, QDesktopServices
+from AnyQt.QtWidgets import QMessageBox
+from AnyQt.QtCore import Qt, QDir, QUrl, QSettings
+
+import AnyQt.importhooks
+
+if AnyQt.USED_API == "pyqt5":
+    # Use a backport shim to fake leftover PyQt4 imports
+    AnyQt.importhooks.install_backport_hook('pyqt4')
 
 from Orange import canvas
 from Orange.canvas.application.application import CanvasApplication
 from Orange.canvas.application.canvasmain import CanvasMainWindow
 from Orange.canvas.application.outputview import TextStream, ExceptHook
-from Orange.canvas.application.errorreporting import ErrorReporting
+from Orange.canvas.application.errorreporting import ErrorReporting, \
+    handle_exception
 
 from Orange.canvas.gui.splashscreen import SplashScreen
 from Orange.canvas.config import cache_dir
 from Orange.canvas import config
-from Orange.canvas.utils.qtcompat import QSettings
 
 from Orange.canvas.registry import qt
 from Orange.canvas.registry import WidgetRegistry, set_global_registry
@@ -369,7 +376,7 @@ def handle_response(result):
     try:
         with patch('sys.excepthook',
                    ExceptHook(stream=stderr, canvas=canvas_window,
-                              handledException=ErrorReporting.handle_exception)),\
+                              handledException=handle_exception)),\
              patch('sys.stderr', stderr),\
              patch('sys.stdout', stdout):
             status = app.exec_()

Orange/canvas/application/aboutdialog.py

@@ -5,8 +5,8 @@
 import sys
 import pkg_resources
 
-from PyQt4.QtGui import QDialog, QDialogButtonBox, QVBoxLayout, QLabel
-from PyQt4.QtCore import Qt
+from AnyQt.QtWidgets import QDialog, QDialogButtonBox, QVBoxLayout, QLabel
+from AnyQt.QtCore import Qt
 
 from .. import config
 

Orange/canvas/application/addons.py

@@ -25,18 +25,22 @@
 except ImportError:
     docutils = None
 
-from PyQt4.QtGui import (
+from AnyQt.QtWidgets import (
     QWidget, QDialog, QLabel, QLineEdit, QTreeView, QHeaderView,
-    QTextBrowser, QTextOption, QDialogButtonBox, QProgressDialog,
-    QVBoxLayout, QPalette, QStandardItemModel, QStandardItem,
-    QSortFilterProxyModel, QItemSelectionModel, QStyle, QStyledItemDelegate,
-    QStyleOptionViewItemV4, QApplication, QHBoxLayout
+    QTextBrowser, QDialogButtonBox, QProgressDialog,
+    QVBoxLayout, QStyle, QStyledItemDelegate, QStyleOptionViewItem,
+    QApplication, QHBoxLayout
 )
 
-from PyQt4.QtCore import (
+from AnyQt.QtGui import (
+    QStandardItemModel, QStandardItem, QPalette, QTextOption
+)
+
+from AnyQt.QtCore import (
+    QSortFilterProxyModel, QItemSelectionModel,
     Qt, QObject, QMetaObject, QEvent, QSize, QTimer, QThread, Q_ARG
 )
-from PyQt4.QtCore import pyqtSignal as Signal, pyqtSlot as Slot
+from AnyQt.QtCore import pyqtSignal as Signal, pyqtSlot as Slot
 
 from ..config import ADDON_KEYWORD
 from ..gui.utils import message_warning, message_information, \
@@ -125,7 +129,7 @@ def editorEvent(self, event, model, option, index):
         if event.type() in {QEvent.MouseButtonPress, QEvent.MouseButtonRelease,
                             QEvent.MouseButtonDblClick}:
             pos = event.pos()
-            opt = QStyleOptionViewItemV4(option)
+            opt = QStyleOptionViewItem(option)
             self.initStyleOption(opt, index)
             rect = style.subElementRect(
                 QStyle.SE_ItemViewItemCheckIndicator, opt, widget)
@@ -222,8 +226,8 @@ def __init__(self, parent=None, **kwargs):
             self.__update_details
         )
         header = self.__view.header()
-        header.setResizeMode(0, QHeaderView.Fixed)
-        header.setResizeMode(2, QHeaderView.ResizeToContents)
+        header.setSectionResizeMode(0, QHeaderView.Fixed)
+        header.setSectionResizeMode(2, QHeaderView.ResizeToContents)
 
         self.__details = QTextBrowser(
             frameShape=QTextBrowser.NoFrame,

Orange/canvas/application/application.py

@@ -3,9 +3,9 @@
 
 """
 
-from PyQt4.QtGui import QApplication
+from AnyQt.QtWidgets import QApplication
 
-from PyQt4.QtCore import Qt, QUrl, QEvent, pyqtSignal as Signal
+from AnyQt.QtCore import Qt, QUrl, QEvent, pyqtSignal as Signal
 
 
 class CanvasApplication(QApplication):

Orange/canvas/application/canvasmain.py

@@ -11,25 +11,37 @@
 
 import pkg_resources
 
-from PyQt4.QtGui import (
+from AnyQt.QtWidgets import (
     QMainWindow, QWidget, QAction, QActionGroup, QMenu, QMenuBar, QDialog,
-    QFileDialog, QMessageBox, QVBoxLayout, QSizePolicy, QColor, QKeySequence,
-    QIcon, QToolBar, QToolButton, QDockWidget, QDesktopServices, QApplication,
-    QShortcut
+    QFileDialog, QMessageBox, QVBoxLayout, QSizePolicy, QToolBar, QToolButton,
+    QDockWidget, QApplication, QShortcut
 )
+from AnyQt.QtGui import QColor, QIcon, QDesktopServices, QKeySequence
 
-from PyQt4.QtCore import (
-    Qt, QEvent, QSize, QUrl, QTimer, QFile, QByteArray
+from AnyQt.QtCore import (
+    Qt, QEvent, QSize, QUrl, QTimer, QFile, QByteArray, QSettings, QT_VERSION
 )
 
-from PyQt4.QtNetwork import QNetworkDiskCache
-
-from PyQt4.QtWebKit import QWebView
-
-from PyQt4.QtCore import pyqtProperty as Property
-
-# Compatibility with PyQt < v4.8.3
-from ..utils.qtcompat import QSettings
+if QT_VERSION < 0x50500:
+    from AnyQt.QtWebKitWidgets import QWebView
+    from AnyQt.QtNetwork import QNetworkDiskCache
+    USE_WEB_ENGINE = False
+else:
+    from PyQt5.QtWebEngineWidgets import QWebEngineView
+    USE_WEB_ENGINE = True
+
+from AnyQt.QtCore import pyqtProperty as Property
+
+if QT_VERSION >= 0x50000:
+    from AnyQt.QtCore import QStandardPaths
+    def user_documents_path():
+        """Return the users 'Documents' folder path."""
+        return QStandardPaths.writableLocation(
+            QStandardPaths.DocumentsLocation)
+else:
+    def user_documents_path():
+        return QDesktopServices.storageLocation(
+            QDesktopServices.DocumentsLocation)
 
 from ..gui.dropshadow import DropShadowFrame
 from ..gui.dock import CollapsibleDockWidget
@@ -155,9 +167,7 @@ def __init__(self, *args):
 
         self.widget_registry = None
 
-        self.last_scheme_dir = QDesktopServices.StandardLocation(
-            QDesktopServices.DocumentsLocation
-        )
+        self.last_scheme_dir = user_documents_path()
         try:
             self.recent_schemes = config.recent_schemes()
         except Exception:
@@ -334,13 +344,17 @@ def setup_ui(self):
                                     objectName="help-dock",
                                     allowedAreas=Qt.RightDockWidgetArea |
                                                  Qt.BottomDockWidgetArea)
-        self.help_view = QWebView()
-        manager = self.help_view.page().networkAccessManager()
-        cache = QNetworkDiskCache()
-        cache.setCacheDirectory(
-            os.path.join(config.cache_dir(), "help", "help-view-cache")
-        )
-        manager.setCache(cache)
+        self.help_dock.setAllowedAreas(Qt.NoDockWidgetArea)
+        if USE_WEB_ENGINE:
+            self.help_view = QWebEngineView()
+        else:
+            self.help_view = QWebView()
+            manager = self.help_view.page().networkAccessManager()
+            cache = QNetworkDiskCache()
+            cache.setCacheDirectory(
+                os.path.join(config.cache_dir(), "help", "help-view-cache")
+            )
+            manager.setCache(cache)
         self.help_dock.setWidget(self.help_view)
         self.addDockWidget(
             QSettings().value('help-dock/area', Qt.RightDockWidgetArea, type=int),
@@ -567,7 +581,10 @@ def setup_actions(self):
                     triggered=self.reset_widget_settings)
 
     def setup_menu(self):
-        menu_bar = QMenuBar()
+        if sys.platform == "darwin" and QT_VERSION >= 0x50000:
+            self.__menu_glob = QMenuBar(None)
+
+        menu_bar = QMenuBar(self)
 
         # File menu
         file_menu = QMenu(self.tr("&File"), menu_bar)
@@ -691,9 +708,7 @@ def restore(self):
         self.show_log_action.setChecked(
             settings.value("output-dock/is-visible", False, type=bool))
 
-        default_dir = QDesktopServices.storageLocation(
-            QDesktopServices.DocumentsLocation
-        )
+        default_dir = user_documents_path()
 
         self.last_scheme_dir = settings.value("last-scheme-dir", default_dir,
                                               type=str)
@@ -872,15 +887,14 @@ def open_scheme(self):
 
         if self.last_scheme_dir is None:
             # Get user 'Documents' folder
-            start_dir = QDesktopServices.storageLocation(
-                QDesktopServices.DocumentsLocation)
+            start_dir = user_documents_path()
         else:
             start_dir = self.last_scheme_dir
 
         # TODO: Use a dialog instance and use 'addSidebarUrls' to
         # set one or more extra sidebar locations where Schemes are stored.
         # Also use setHistory
-        filename = QFileDialog.getOpenFileName(
+        filename, _ = QFileDialog.getOpenFileName(
             self, self.tr("Open Orange Workflow File"),
             start_dir, self.tr("Orange Workflow (*.ows)"),
         )
@@ -1179,13 +1193,11 @@ def save_scheme_as(self):
             if self.last_scheme_dir is not None:
                 start_dir = self.last_scheme_dir
             else:
-                start_dir = QDesktopServices.storageLocation(
-                    QDesktopServices.DocumentsLocation
-                )
+                start_dir = user_documents_path()
 
             start_dir = os.path.join(str(start_dir), title + ".ows")
 
-        filename = QFileDialog.getSaveFileName(
+        filename, _ = QFileDialog.getSaveFileName(
             self, self.tr("Save Orange Workflow File"),
             start_dir, self.tr("Orange Workflow (*.ows)")
         )