Mercurial Repositories > eric / file diff

--- a/eric6/UI/UserInterface.py	Sun Sep 01 17:44:33 2019 +0200
+++ b/eric6/UI/UserInterface.py	Sun Sep 01 19:40:53 2019 +0200
@@ -15,7 +15,7 @@
 
 from PyQt5.QtCore import pyqtSlot, QTimer, QFile, QFileInfo, pyqtSignal, \
     PYQT_VERSION_STR, QDate, QIODevice, qVersion, QProcess, QSize, QUrl, \
-    QObject, Qt, QUuid, QThread
+    QObject, Qt, QUuid, QThread, QUrlQuery
 from PyQt5.QtGui import QKeySequence, QDesktopServices
 from PyQt5.QtWidgets import QSizePolicy, QWidget, QWhatsThis, QToolBar, \
     QDialog, QSplitter, QApplication, QMenu, QVBoxLayout, QDockWidget, \
@@ -53,8 +53,6 @@
 
 from eric6config import getConfig
 
-from Globals import qVersionTuple
-
 
 class Redirector(QObject):
     """
@@ -3113,18 +3111,10 @@
                                           self.__menus["window"])
         self.__menus["subwindow"].setTearOffEnabled(True)
         # central park
-        try:
-            self.__menus["subwindow"].addSection(self.tr("Central Park"))
-        except AttributeError:
-            # Qt4
-            self.__menus["subwindow"].addSeparator()
+        self.__menus["subwindow"].addSection(self.tr("Central Park"))
         self.__menus["subwindow"].addAction(self.viewmanagerActivateAct)
         # left side
-        try:
-            self.__menus["subwindow"].addSection(self.tr("Left Side"))
-        except AttributeError:
-            # Qt4
-            pass
+        self.__menus["subwindow"].addSection(self.tr("Left Side"))
         if self.__shellPosition == "left":
             self.__menus["subwindow"].addAction(self.shellActivateAct)
         self.__menus["subwindow"].addAction(self.pbActivateAct)
@@ -3136,22 +3126,14 @@
         if self.symbolsViewer is not None:
             self.__menus["subwindow"].addAction(self.symbolsViewerActivateAct)
         # bottom side
-        try:
-            self.__menus["subwindow"].addSection(self.tr("Bottom Side"))
-        except AttributeError:
-            # Qt4
-            self.__menus["subwindow"].addSeparator()
+        self.__menus["subwindow"].addSection(self.tr("Bottom Side"))
         if self.__shellPosition == "bottom":
             self.__menus["subwindow"].addAction(self.shellActivateAct)
         self.__menus["subwindow"].addAction(self.taskViewerActivateAct)
         self.__menus["subwindow"].addAction(self.logViewerActivateAct)
         if self.numbersViewer is not None:
             self.__menus["subwindow"].addAction(self.numbersViewerActivateAct)
-        try:
-            self.__menus["subwindow"].addSection(self.tr("Right Side"))
-        except AttributeError:
-            # Qt4
-            self.__menus["subwindow"].addSeparator()
+        self.__menus["subwindow"].addSection(self.tr("Right Side"))
         # right side
         if self.__shellPosition == "right":
             self.__menus["subwindow"].addAction(self.shellActivateAct)
@@ -3171,11 +3153,7 @@
         if self.microPythonWidget is not None:
             self.__menus["subwindow"].addAction(
                 self.microPythonWidgetActivateAct)
-        try:
-            self.__menus["subwindow"].addSection(self.tr("Plug-ins"))
-        except AttributeError:
-            # Qt4
-            self.__menus["subwindow"].addSeparator()
+        self.__menus["subwindow"].addSection(self.tr("Plug-ins"))
         
         ##############################################################
         ## Window/Toolbars menu
@@ -3756,15 +3734,10 @@
                 Utilities.generateDistroInfo("\r\n"))
         
         url = QUrl("mailto:{0}".format(address))
-        if qVersionTuple() >= (5, 0, 0):
-            from PyQt5.QtCore import QUrlQuery
-            urlQuery = QUrlQuery(url)
-            urlQuery.addQueryItem("subject", subject)
-            urlQuery.addQueryItem("body", body)
-            url.setQuery(urlQuery)
-        else:
-            url.addQueryItem("subject", subject)
-            url.addQueryItem("body", body)
+        urlQuery = QUrlQuery(url)
+        urlQuery.addQueryItem("subject", subject)
+        urlQuery.addQueryItem("body", body)
+        url.setQuery(urlQuery)
         QDesktopServices.openUrl(url)
         
     def checkForErrorLog(self):