diff -r 27f636beebad -r 2c730d5fd177 eric6/UI/UserInterface.py
--- a/eric6/UI/UserInterface.py Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/UI/UserInterface.py Tue Mar 02 17:17:09 2021 +0100
@@ -772,12 +772,12 @@
layout.addWidget(self.viewmanager.searchWidget())
layout.addWidget(self.viewmanager.replaceWidget())
self.viewmanager.mainWidget().setSizePolicy(
- QSizePolicy.Preferred, QSizePolicy.Expanding)
+ QSizePolicy.Policy.Preferred, QSizePolicy.Policy.Expanding)
leftWidget.setLayout(layout)
self.viewmanager.searchWidget().hide()
self.viewmanager.replaceWidget().hide()
- splitter = QSplitter(Qt.Horizontal)
+ splitter = QSplitter(Qt.Orientation.Horizontal)
splitter.addWidget(leftWidget)
self.setCentralWidget(splitter)
@@ -827,21 +827,26 @@
# Create the left toolbox
self.lToolboxDock = self.__createDockWindow("lToolboxDock")
self.lToolbox = E5VerticalToolBox(self.lToolboxDock)
- self.__setupDockWindow(self.lToolboxDock, Qt.LeftDockWidgetArea,
- self.lToolbox, self.tr("Left Toolbox"))
+ self.__setupDockWindow(self.lToolboxDock,
+ Qt.DockWidgetArea.LeftDockWidgetArea,
+ self.lToolbox,
+ self.tr("Left Toolbox"))
# Create the horizontal toolbox
self.hToolboxDock = self.__createDockWindow("hToolboxDock")
self.hToolbox = E5HorizontalToolBox(self.hToolboxDock)
- self.__setupDockWindow(self.hToolboxDock, Qt.BottomDockWidgetArea,
+ self.__setupDockWindow(self.hToolboxDock,
+ Qt.DockWidgetArea.BottomDockWidgetArea,
self.hToolbox,
self.tr("Horizontal Toolbox"))
# Create the right toolbox
self.rToolboxDock = self.__createDockWindow("rToolboxDock")
self.rToolbox = E5VerticalToolBox(self.rToolboxDock)
- self.__setupDockWindow(self.rToolboxDock, Qt.RightDockWidgetArea,
- self.rToolbox, self.tr("Right Toolbox"))
+ self.__setupDockWindow(self.rToolboxDock,
+ Qt.DockWidgetArea.RightDockWidgetArea,
+ self.rToolbox,
+ self.tr("Right Toolbox"))
####################################################
## Populate the left toolbox
@@ -1216,9 +1221,9 @@
# create the central widget
logging.debug("Creating central widget...")
cw = self.centralWidget() # save the current central widget
- self.leftSplitter = QSplitter(Qt.Horizontal)
- self.rightSplitter = QSplitter(Qt.Horizontal)
- self.verticalSplitter = QSplitter(Qt.Vertical)
+ self.leftSplitter = QSplitter(Qt.Orientation.Horizontal)
+ self.rightSplitter = QSplitter(Qt.Orientation.Horizontal)
+ self.verticalSplitter = QSplitter(Qt.Orientation.Vertical)
self.verticalSplitter.addWidget(cw)
self.verticalSplitter.addWidget(self.bottomSidebar)
self.rightSplitter.addWidget(self.verticalSplitter)
@@ -1561,7 +1566,12 @@
dock = QDockWidget()
dock.setObjectName(name)
dock.setFeatures(
- QDockWidget.DockWidgetFeatures(QDockWidget.AllDockWidgetFeatures))
+ QDockWidget.DockWidgetFeatures(
+ QDockWidget.DockWidgetFeature.DockWidgetClosable |
+ QDockWidget.DockWidgetFeature.DockWidgetMovable |
+ QDockWidget.DockWidgetFeature.DockWidgetFloatable
+ )
+ )
return dock
def __setupDockWindow(self, dock, where, widget, caption):
@@ -1643,7 +1653,7 @@
""" and the preferences will be written to disc.</p>"""
))
self.exitAct.triggered.connect(self.__quit)
- self.exitAct.setMenuRole(QAction.QuitRole)
+ self.exitAct.setMenuRole(QAction.MenuRole.QuitRole)
self.actions.append(self.exitAct)
self.restartAct = E5Action(
@@ -2527,7 +2537,7 @@
""" with your prefered values.</p>"""
))
self.prefAct.triggered.connect(self.showPreferences)
- self.prefAct.setMenuRole(QAction.PreferencesRole)
+ self.prefAct.setMenuRole(QAction.MenuRole.PreferencesRole)
self.actions.append(self.prefAct)
self.prefExportAct = E5Action(
@@ -3456,8 +3466,8 @@
self.addToolBar(multiprojecttb)
self.addToolBar(projecttb)
self.addToolBar(vcstb)
- self.addToolBar(Qt.RightToolBarArea, settingstb)
- self.addToolBar(Qt.RightToolBarArea, toolstb)
+ self.addToolBar(Qt.ToolBarArea.RightToolBarArea, settingstb)
+ self.addToolBar(Qt.ToolBarArea.RightToolBarArea, toolstb)
self.addToolBar(helptb)
self.addToolBar(bookmarktb)
self.addToolBar(spellingtb)
@@ -4500,14 +4510,14 @@
if self.__layoutType == "Toolboxes":
# set the corner usages
- self.setCorner(Qt.TopLeftCorner,
- Qt.LeftDockWidgetArea)
- self.setCorner(Qt.BottomLeftCorner,
- Qt.LeftDockWidgetArea)
- self.setCorner(Qt.TopRightCorner,
- Qt.RightDockWidgetArea)
- self.setCorner(Qt.BottomRightCorner,
- Qt.RightDockWidgetArea)
+ self.setCorner(Qt.Corner.TopLeftCorner,
+ Qt.DockWidgetArea.LeftDockWidgetArea)
+ self.setCorner(Qt.Corner.BottomLeftCorner,
+ Qt.DockWidgetArea.LeftDockWidgetArea)
+ self.setCorner(Qt.Corner.TopRightCorner,
+ Qt.DockWidgetArea.RightDockWidgetArea)
+ self.setCorner(Qt.Corner.BottomRightCorner,
+ Qt.DockWidgetArea.RightDockWidgetArea)
# step 3: activate the windows of the new profile
if self.__layoutType == "Toolboxes":
@@ -4619,7 +4629,7 @@
self.leftSidebar.show()
self.leftSidebar.setCurrentWidget(self.projectBrowser)
self.projectBrowser.currentWidget().setFocus(
- Qt.ActiveWindowFocusReason)
+ Qt.FocusReason.ActiveWindowFocusReason)
def __activateMultiProjectBrowser(self):
"""
@@ -4631,7 +4641,8 @@
elif self.__layoutType == "Sidebars":
self.leftSidebar.show()
self.leftSidebar.setCurrentWidget(self.multiProjectBrowser)
- self.multiProjectBrowser.setFocus(Qt.ActiveWindowFocusReason)
+ self.multiProjectBrowser.setFocus(
+ Qt.FocusReason.ActiveWindowFocusReason)
def activateDebugViewer(self):
"""
@@ -4643,7 +4654,8 @@
elif self.__layoutType == "Sidebars":
self.rightSidebar.show()
self.rightSidebar.setCurrentWidget(self.debugViewer)
- self.debugViewer.currentWidget().setFocus(Qt.ActiveWindowFocusReason)
+ self.debugViewer.currentWidget().setFocus(
+ Qt.FocusReason.ActiveWindowFocusReason)
def __activateShell(self):
"""
@@ -4655,7 +4667,7 @@
elif self.__layoutType == "Sidebars":
self.__shellParent.show()
self.__shellParent.setCurrentWidget(self.shellAssembly)
- self.shell.setFocus(Qt.ActiveWindowFocusReason)
+ self.shell.setFocus(Qt.FocusReason.ActiveWindowFocusReason)
def __activateLogViewer(self):
"""
@@ -4667,7 +4679,7 @@
elif self.__layoutType == "Sidebars":
self.bottomSidebar.show()
self.bottomSidebar.setCurrentWidget(self.logViewer)
- self.logViewer.setFocus(Qt.ActiveWindowFocusReason)
+ self.logViewer.setFocus(Qt.FocusReason.ActiveWindowFocusReason)
def __activateTaskViewer(self):
"""
@@ -4679,7 +4691,7 @@
elif self.__layoutType == "Sidebars":
self.bottomSidebar.show()
self.bottomSidebar.setCurrentWidget(self.taskViewer)
- self.taskViewer.setFocus(Qt.ActiveWindowFocusReason)
+ self.taskViewer.setFocus(Qt.FocusReason.ActiveWindowFocusReason)
def __activateTemplateViewer(self):
"""
@@ -4692,7 +4704,8 @@
elif self.__layoutType == "Sidebars":
self.leftSidebar.show()
self.leftSidebar.setCurrentWidget(self.templateViewer)
- self.templateViewer.setFocus(Qt.ActiveWindowFocusReason)
+ self.templateViewer.setFocus(
+ Qt.FocusReason.ActiveWindowFocusReason)
def __activateBrowser(self):
"""
@@ -4705,7 +4718,7 @@
elif self.__layoutType == "Sidebars":
self.leftSidebar.show()
self.leftSidebar.setCurrentWidget(self.browser)
- self.browser.setFocus(Qt.ActiveWindowFocusReason)
+ self.browser.setFocus(Qt.FocusReason.ActiveWindowFocusReason)
def __toggleLeftToolbox(self):
"""
@@ -4714,7 +4727,8 @@
hasFocus = self.lToolbox.currentWidget().hasFocus()
shown = self.__toggleWindow(self.lToolboxDock)
if shown:
- self.lToolbox.currentWidget().setFocus(Qt.ActiveWindowFocusReason)
+ self.lToolbox.currentWidget().setFocus(
+ Qt.FocusReason.ActiveWindowFocusReason)
else:
if hasFocus:
self.__activateViewmanager()
@@ -4726,7 +4740,8 @@
hasFocus = self.rToolbox.currentWidget().hasFocus()
shown = self.__toggleWindow(self.rToolboxDock)
if shown:
- self.rToolbox.currentWidget().setFocus(Qt.ActiveWindowFocusReason)
+ self.rToolbox.currentWidget().setFocus(
+ Qt.FocusReason.ActiveWindowFocusReason)
else:
if hasFocus:
self.__activateViewmanager()
@@ -4738,7 +4753,8 @@
hasFocus = self.hToolbox.currentWidget().hasFocus()
shown = self.__toggleWindow(self.hToolboxDock)
if shown:
- self.hToolbox.currentWidget().setFocus(Qt.ActiveWindowFocusReason)
+ self.hToolbox.currentWidget().setFocus(
+ Qt.FocusReason.ActiveWindowFocusReason)
else:
if hasFocus:
self.__activateViewmanager()
@@ -4751,7 +4767,7 @@
shown = self.__toggleWindow(self.leftSidebar)
if shown:
self.leftSidebar.currentWidget().setFocus(
- Qt.ActiveWindowFocusReason)
+ Qt.FocusReason.ActiveWindowFocusReason)
else:
if hasFocus:
self.__activateViewmanager()
@@ -4764,7 +4780,7 @@
shown = self.__toggleWindow(self.rightSidebar)
if shown:
self.rightSidebar.currentWidget().setFocus(
- Qt.ActiveWindowFocusReason)
+ Qt.FocusReason.ActiveWindowFocusReason)
else:
if hasFocus:
self.__activateViewmanager()
@@ -4777,7 +4793,7 @@
shown = self.__toggleWindow(self.bottomSidebar)
if shown:
self.bottomSidebar.currentWidget().setFocus(
- Qt.ActiveWindowFocusReason)
+ Qt.FocusReason.ActiveWindowFocusReason)
else:
if hasFocus:
self.__activateViewmanager()
@@ -4793,7 +4809,7 @@
elif self.__layoutType == "Sidebars":
self.rightSidebar.show()
self.rightSidebar.setCurrentWidget(self.cooperation)
- self.cooperation.setFocus(Qt.ActiveWindowFocusReason)
+ self.cooperation.setFocus(Qt.FocusReason.ActiveWindowFocusReason)
def __activateIRC(self):
"""
@@ -4806,7 +4822,7 @@
elif self.__layoutType == "Sidebars":
self.rightSidebar.show()
self.rightSidebar.setCurrentWidget(self.irc)
- self.irc.setFocus(Qt.ActiveWindowFocusReason)
+ self.irc.setFocus(Qt.FocusReason.ActiveWindowFocusReason)
def __activateSymbolsViewer(self):
"""
@@ -4819,7 +4835,7 @@
elif self.__layoutType == "Sidebars":
self.leftSidebar.show()
self.leftSidebar.setCurrentWidget(self.symbolsViewer)
- self.symbolsViewer.setFocus(Qt.ActiveWindowFocusReason)
+ self.symbolsViewer.setFocus(Qt.FocusReason.ActiveWindowFocusReason)
def __activateNumbersViewer(self):
"""
@@ -4832,7 +4848,7 @@
elif self.__layoutType == "Sidebars":
self.bottomSidebar.show()
self.bottomSidebar.setCurrentWidget(self.numbersViewer)
- self.numbersViewer.setFocus(Qt.ActiveWindowFocusReason)
+ self.numbersViewer.setFocus(Qt.FocusReason.ActiveWindowFocusReason)
def __activateViewmanager(self):
"""
@@ -4840,7 +4856,7 @@
"""
aw = self.viewmanager.activeWindow()
if aw is not None:
- aw.setFocus(Qt.ActiveWindowFocusReason)
+ aw.setFocus(Qt.FocusReason.ActiveWindowFocusReason)
def activateCodeDocumentationViewer(self, switchFocus=True):
"""
@@ -4859,7 +4875,7 @@
self.codeDocumentationViewer)
if switchFocus:
self.codeDocumentationViewer.setFocus(
- Qt.ActiveWindowFocusReason)
+ Qt.FocusReason.ActiveWindowFocusReason)
def __activatePipWidget(self):
"""
@@ -4872,7 +4888,7 @@
elif self.__layoutType == "Sidebars":
self.rightSidebar.show()
self.rightSidebar.setCurrentWidget(self.pipWidget)
- self.pipWidget.setFocus(Qt.ActiveWindowFocusReason)
+ self.pipWidget.setFocus(Qt.FocusReason.ActiveWindowFocusReason)
def __activateCondaWidget(self):
"""
@@ -4885,7 +4901,7 @@
elif self.__layoutType == "Sidebars":
self.rightSidebar.show()
self.rightSidebar.setCurrentWidget(self.condaWidget)
- self.condaWidget.setFocus(Qt.ActiveWindowFocusReason)
+ self.condaWidget.setFocus(Qt.FocusReason.ActiveWindowFocusReason)
def __activateMicroPython(self):
"""
@@ -4898,7 +4914,8 @@
elif self.__layoutType == "Sidebars":
self.rightSidebar.show()
self.rightSidebar.setCurrentWidget(self.microPythonWidget)
- self.microPythonWidget.setFocus(Qt.ActiveWindowFocusReason)
+ self.microPythonWidget.setFocus(
+ Qt.FocusReason.ActiveWindowFocusReason)
def __toggleWindow(self, w):
"""
@@ -4921,7 +4938,7 @@
from Preferences.ToolConfigurationDialog import ToolConfigurationDialog
dlg = ToolConfigurationDialog(
self.toolGroups[self.currentToolGroup][1], self)
- if dlg.exec() == QDialog.Accepted:
+ if dlg.exec() == QDialog.DialogCode.Accepted:
self.toolGroups[self.currentToolGroup][1] = dlg.getToollist()
self.__updateExternalToolsActions()
@@ -4934,7 +4951,7 @@
)
dlg = ToolGroupConfigurationDialog(
self.toolGroups, self.currentToolGroup, self)
- if dlg.exec() == QDialog.Accepted:
+ if dlg.exec() == QDialog.DialogCode.Accepted:
self.toolGroups, self.currentToolGroup = dlg.getToolGroups()
def __createUnitTestDialog(self):
@@ -5550,8 +5567,8 @@
else:
self.toolProcs.append((program, proc, procData))
if tool['redirect'] == 'no':
- proc.closeReadChannel(QProcess.StandardOutput)
- proc.closeReadChannel(QProcess.StandardError)
+ proc.closeReadChannel(QProcess.ProcessChannel.StandardOutput)
+ proc.closeReadChannel(QProcess.ProcessChannel.StandardError)
proc.closeWriteChannel()
def __processToolStdout(self):
@@ -5562,7 +5579,7 @@
# loop through all running tool processes
for program, toolProc, toolProcData in self.toolProcs:
- toolProc.setReadChannel(QProcess.StandardOutput)
+ toolProc.setReadChannel(QProcess.ProcessChannel.StandardOutput)
if (
toolProcData[0] is None or
@@ -5589,7 +5606,7 @@
# loop through all running tool processes
for program, toolProc, _toolProcData in self.toolProcs:
- toolProc.setReadChannel(QProcess.StandardError)
+ toolProc.setReadChannel(QProcess.ProcessChannel.StandardError)
while toolProc.canReadLine():
error = str(toolProc.readLine(), ioEncoding, 'replace')
@@ -5607,7 +5624,7 @@
# loop through all running tool processes
for program, toolProc, toolProcData in self.toolProcs:
- if toolProc.state() == QProcess.NotRunning:
+ if toolProc.state() == QProcess.ProcessState.NotRunning:
exitedProcs.append((program, toolProc, toolProcData))
if toolProcData[0] is not None:
if toolProcData[1] == "replaceSelection":
@@ -5930,7 +5947,7 @@
@type bool
"""
if isinstance(home, QUrl):
- home = home.toString(QUrl.None_)
+ home = home.toString(QUrl.UrlFormattingOption.None_)
if len(home) > 0:
homeUrl = QUrl(home)
@@ -6033,8 +6050,8 @@
QThread.msleep(1000)
QApplication.processEvents()
if (
- process.state() == QProcess.NotRunning and
- process.exitStatus() == QProcess.NormalExit and
+ process.state() == QProcess.ProcessState.NotRunning and
+ process.exitStatus() == QProcess.ExitStatus.NormalExit and
process.exitCode() == 100
):
# Process exited prematurely due to missing pre-requisites
@@ -6118,7 +6135,10 @@
self.__configurationDialog.showConfigurationPageByName("empty")
self.__configurationDialog.exec()
QApplication.processEvents()
- if self.__configurationDialog.result() == QDialog.Accepted:
+ if (
+ self.__configurationDialog.result() ==
+ QDialog.DialogCode.Accepted
+ ):
self.__configurationDialog.setPreferences()
Preferences.syncPreferences()
self.__preferencesChanged()
@@ -6257,7 +6277,7 @@
from Preferences.ViewProfileDialog import ViewProfileDialog
dlg = ViewProfileDialog(self.__layoutType, self.profiles['edit'][1],
self.profiles['debug'][1])
- if dlg.exec() == QDialog.Accepted:
+ if dlg.exec() == QDialog.DialogCode.Accepted:
edit, debug = dlg.getVisibilities()
self.profiles['edit'][1] = edit
self.profiles['debug'][1] = debug
@@ -6273,7 +6293,7 @@
"""
from E5Gui.E5ToolBarDialog import E5ToolBarDialog
dlg = E5ToolBarDialog(self.toolbarManager)
- if dlg.exec() == QDialog.Accepted:
+ if dlg.exec() == QDialog.DialogCode.Accepted:
Preferences.setUI(
"ToolbarManagerState", self.toolbarManager.saveState())
@@ -6352,7 +6372,7 @@
"""
from .ClearPrivateDataDialog import ClearPrivateDataDialog
dlg = ClearPrivateDataDialog(self)
- if dlg.exec() == QDialog.Accepted:
+ if dlg.exec() == QDialog.DialogCode.Accepted:
# recent files, recent projects, recent multi projects,
# debug histories, shell histories
(files, projects, multiProjects, debug, shell, vcs, plugins) = (
@@ -6509,7 +6529,7 @@
fn = os.path.join(Utilities.getConfigDir(), "eric6tasks.e6t")
if os.path.exists(fn):
f = QFile(fn)
- if f.open(QIODevice.ReadOnly):
+ if f.open(QIODevice.OpenModeFlag.ReadOnly):
from E5XML.TasksReader import TasksReader
reader = TasksReader(f, viewer=self.taskViewer)
reader.readXML()
@@ -6547,7 +6567,7 @@
res = self.__sessionFile.writeFile(fn)
else:
f = QFile(fn)
- if f.open(QIODevice.WriteOnly):
+ if f.open(QIODevice.OpenModeFlag.WriteOnly):
from E5XML.SessionWriter import SessionWriter
SessionWriter(f, None).writeXML()
f.close()
@@ -6599,7 +6619,7 @@
else:
# old XML based format
f = QFile(fn)
- if f.open(QIODevice.ReadOnly):
+ if f.open(QIODevice.OpenModeFlag.ReadOnly):
from E5XML.SessionReader import SessionReader
self.__readingSession = True
reader = SessionReader(f, True)
@@ -6833,7 +6853,7 @@
from PluginManager.PluginRepositoryDialog import PluginRepositoryDialog
dlg = PluginRepositoryDialog(self.pluginManager, self)
res = dlg.exec()
- if res == (QDialog.Accepted + 1):
+ if res == (QDialog.DialogCode.Accepted + 1):
self.__installPlugins(dlg.getDownloadedPlugins())
def __pluginsConfigure(self):
@@ -7072,8 +7092,9 @@
self.tr("Trying host {0}").format(url.host()))
self.__versionCheckProgress.setValue(alternative)
request = QNetworkRequest(url)
- request.setAttribute(QNetworkRequest.CacheLoadControlAttribute,
- QNetworkRequest.AlwaysNetwork)
+ request.setAttribute(
+ QNetworkRequest.Attribute.CacheLoadControlAttribute,
+ QNetworkRequest.CacheLoadControl.AlwaysNetwork)
reply = self.__networkManager.get(request)
reply.finished.connect(lambda: self.__versionsDownloadDone(reply))
self.__replies.append(reply)
@@ -7097,12 +7118,12 @@
reply.deleteLater()
if reply in self.__replies:
self.__replies.remove(reply)
- if reply.error() == QNetworkReply.NoError:
+ if reply.error() == QNetworkReply.NetworkError.NoError:
ioEncoding = Preferences.getSystem("IOEncoding")
versions = str(reply.readAll(), ioEncoding, 'replace').splitlines()
reply.close()
if (
- reply.error() != QNetworkReply.NoError or
+ reply.error() != QNetworkReply.NetworkError.NoError or
len(versions) == 0 or
versions[0].startswith("<")
):
@@ -7433,7 +7454,8 @@
"""
if self.__startup:
if Preferences.getGeometry("MainMaximized"):
- self.setWindowState(Qt.WindowStates(Qt.WindowMaximized))
+ self.setWindowState(
+ Qt.WindowStates(Qt.WindowState.WindowMaximized))
self.__startup = False
##########################################
