eric: comparison src/eric7/UI/UserInterface.py

-:5fbbda78c175
+:783d835d7fe4
 Module implementing the main user interface.
 """
 import contextlib
 import datetime
+import enum
 import functools
 import getpass
 import json
 import logging
 import os
 """
 self.buffer += str(s)
 self.__nWrite(self.__bufferedWrite())
+class UserInterfaceSide(enum.Enum):
+"""
+Class defining the supported sides of the user interface.
+"""
+Left = 1
+Bottom = 2
+Right = 3
 class UserInterface(EricMainWindow):
 """
 Class implementing the main user interface.
 @signal appendStderr(str) emitted to write data to stderr logger
 mainPasswordChanged = pyqtSignal(str, str)
 onlineStateChanged = pyqtSignal(bool)
 maxFilePathLen = 100
 maxMenuFilePathLen = 75
-LeftSide = 1
-BottomSide = 2
-RightSide = 3
 ErrorLogFileName = "eric7_error.log"
 def __init__(
 self,
 if self.irc is not None:
 self.irc.autoConnected.connect(self.__ircAutoConnected)
 if self.pipWidget is not None:
 self.preferencesChanged.connect(self.pipWidget.preferencesChanged)
+if self.microPythonWidget is not None:
+self.microPythonWidget.aboutToDisconnect.connect(
+self.viewmanager.closeDeviceEditors
+)
 # create the toolbar manager object
 self.toolbarManager = EricToolBarManager(self, self)
 self.toolbarManager.setMainWindow(self)
 self.preferencesChanged.connect(self.toolbarManager.preferencesChanged)
 self.hToolboxDock,
 Qt.DockWidgetArea.BottomDockWidgetArea,
 self.hToolbox,
 self.tr("Horizontal Toolbox"),
 )
+self.hToolbox.currentChanged.connect(self.__hToolboxCurrentChanged)
 # Create the right toolbox
 self.rToolboxDock = self.__createDockWindow("rToolboxDock")
 self.rToolbox = EricVerticalToolBox(self.rToolboxDock)
 self.__setupDockWindow(
 # Create the bottom sidebar
 self.bottomSidebar = EricSideBar(
 EricSideBarSide.SOUTH, Preferences.getUI("IconBarSize")
 )
 self.bottomSidebar.setIconBarColor(Preferences.getUI("IconBarColor"))
+self.bottomSidebar.currentChanged.connect(self.__bottomSidebarCurrentChanged)
 # Create the right sidebar
 if Preferences.getUI("CombinedLeftRightSidebar"):
 # combine left and right sidebar on the left side
 self.rightSidebar = None
 def addSideWidget(self, side, widget, icon, label):
 """
 Public method to add a widget to the sides.
 @param side side to add the widget to
-@type int (one of UserInterface.LeftSide, UserInterface.BottomSide,
+@type UserInterfaceSide
-UserInterface.RightSide)
 @param widget reference to the widget to add
 @type QWidget
 @param icon icon to be used
 @type QIcon
 @param label label text to be shown
 @type str
 """
-if side in [
+if self.__layoutType == "Toolboxes":
-UserInterface.LeftSide,
+if side == UserInterfaceSide.Left:
-UserInterface.BottomSide,
+self.lToolbox.addItem(widget, icon, label)
-UserInterface.RightSide,
+elif side == UserInterfaceSide.Bottom:
-]:
+self.hToolbox.addItem(widget, icon, label)
-if self.__layoutType == "Toolboxes":
+elif side == UserInterfaceSide.Right:
-if side == UserInterface.LeftSide:
+self.rToolbox.addItem(widget, icon, label)
-self.lToolbox.addItem(widget, icon, label)
+elif self.__layoutType == "Sidebars":
-elif side == UserInterface.BottomSide:
+if side == UserInterfaceSide.Left:
-self.hToolbox.addItem(widget, icon, label)
+self.leftSidebar.addTab(widget, icon, label)
-elif side == UserInterface.RightSide:
+elif side == UserInterfaceSide.Bottom:
-self.rToolbox.addItem(widget, icon, label)
+self.bottomSidebar.addTab(widget, icon, label)
-elif self.__layoutType == "Sidebars":
+elif side == UserInterfaceSide.Right:
-if side == UserInterface.LeftSide:
+if self.rightSidebar:
+self.rightSidebar.addTab(widget, icon, label)
+else:
 self.leftSidebar.addTab(widget, icon, label)
-elif side == UserInterface.BottomSide:
-self.bottomSidebar.addTab(widget, icon, label)
-elif side == UserInterface.RightSide:
-if self.rightSidebar:
-self.rightSidebar.addTab(widget, icon, label)
-else:
-self.leftSidebar.addTab(widget, icon, label)
 def removeSideWidget(self, widget):
 """
 Public method to remove a widget added using addSideWidget().
 self.hToolboxDock.raise_()
 elif self.__layoutType == "Sidebars":
 self.bottomSidebar.show()
 self.bottomSidebar.setCurrentWidget(self.logViewer)
 self.bottomSidebar.raise_()
+else:
+if self.__layoutType == "Toolboxes":
+logViewerIndex = self.hToolbox.indexOf(self.logViewer)
+if self.hToolbox.currentIndex() != logViewerIndex:
+self.hToolbox.setTabIcon(
+logViewerIndex, EricPixmapCache.getIcon("logViewerNew")
+)
+elif self.__layoutType == "Sidebars":
+logViewerIndex = self.bottomSidebar.indexOf(self.logViewer)
+if self.bottomSidebar.currentIndex() != logViewerIndex:
+self.bottomSidebar.setTabIcon(
+logViewerIndex, EricPixmapCache.getIcon("sbLogViewerNew96")
+)
 def __openOnStartup(self, startupType=None):
 """
 Private method to open the last file, project or multiproject.
 if project is not None:
 self.capProject = project
 if self.passiveMode:
 if not self.capProject and not self.capEditor:
-self.setWindowTitle(self.tr("{0} - Passive Mode").format(Program))
+self.setWindowTitle(self.tr("{0} - Passive Mode").format("eric-ide"))
 elif self.capProject and not self.capEditor:
 self.setWindowTitle(
-self.tr("{0} - {1} - Passive Mode").format(self.capProject, Program)
+self.tr("{0} - {1} - Passive Mode").format(
+self.capProject, "eric-ide"
+)
 )
 elif not self.capProject and self.capEditor:
 self.setWindowTitle(
-self.tr("{0} - {1} - Passive Mode").format(self.capEditor, Program)
+self.tr("{0} - {1} - Passive Mode").format(
+self.capEditor, "eric-ide"
+)
 )
 else:
 self.setWindowTitle(
 self.tr("{0} - {1} - {2} - Passive Mode").format(
-self.capProject, self.capEditor, Program
+self.capProject, self.capEditor, "eric-ide"
 )
 )
 else:
 if not self.capProject and not self.capEditor:
-self.setWindowTitle(Program)
+self.setWindowTitle("eric-ide")
 elif self.capProject and not self.capEditor:
-self.setWindowTitle("{0} - {1}".format(self.capProject, Program))
+self.setWindowTitle("{0} - {1}".format(self.capProject, "eric-ide"))
 elif not self.capProject and self.capEditor:
-self.setWindowTitle("{0} - {1}".format(self.capEditor, Program))
+self.setWindowTitle("{0} - {1}".format(self.capEditor, "eric-ide"))
 else:
 self.setWindowTitle(
-"{0} - {1} - {2}".format(self.capProject, self.capEditor, Program)
+"{0} - {1} - {2}".format(
+self.capProject, self.capEditor, "eric-ide"
+)
 )
 def __initActions(self):
 """
 Private method to define the user interface actions.
 Private slot to handle the activation of the Log Viewer.
 """
 if self.__layoutType == "Toolboxes":
 self.hToolboxDock.show()
 self.hToolbox.setCurrentWidget(self.logViewer)
+self.hToolbox.setTabIcon(
+self.hToolbox.currentIndex(),
+EricPixmapCache.getIcon("logViewer"),
+)
 elif self.__layoutType == "Sidebars":
 self.bottomSidebar.show()
 self.bottomSidebar.setCurrentWidget(self.logViewer)
+self.bottomSidebar.setTabIcon(
+self.bottomSidebar.currentIndex(),
+EricPixmapCache.getIcon("sbLogViewer96"),
+)
 self.logViewer.setFocus(Qt.FocusReason.ActiveWindowFocusReason)
 def __activateTaskViewer(self):
 """
 Private slot to handle the activation of the Task Viewer.
 )
 else:
 if hasFocus:
 self.__activateViewmanager()
+@pyqtSlot(int)
+def __hToolboxCurrentChanged(self, index):
+"""
+Private slot handling a change of the current index of the Horizontal Toolbox.
+@param index current index of the horizontal toolbox
+@type int
+"""
+if index == self.hToolbox.indexOf(self.logViewer):
+self.hToolbox.setTabIcon(index, EricPixmapCache.getIcon("logViewer"))
 def __toggleLeftSidebar(self):
 """
 Private slot to handle the toggle of the left sidebar window.
 """
 hasFocus = self.leftSidebar.currentWidget().hasFocus()
 Qt.FocusReason.ActiveWindowFocusReason
 )
 else:
 if hasFocus:
 self.__activateViewmanager()
+@pyqtSlot(int)
+def __bottomSidebarCurrentChanged(self, index):
+"""
+Private slot handling a change of the current index of the Bottom Sidebar.
+@param index current index of the bottom sidebar
+@type int
+"""
+if index == self.bottomSidebar.indexOf(self.logViewer):
+self.bottomSidebar.setTabIcon(
+index, EricPixmapCache.getIcon("sbLogViewer96")
+)
 def activateCooperationViewer(self):
 """
 Public slot to handle the activation of the cooperation window.
 """
 the configuration dialog is shown.
 """
 if not Preferences.isConfigured():
 self.__initDebugToolbarsLayout()
-if Preferences.hasEric6Configuration():
+EricMessageBox.information(
-yes = EricMessageBox.yesNo(
+self,
-self,
+self.tr("First time usage"),
-self.tr("First time usage"),
+self.tr(
-self.tr(
+"""eric has not been configured yet. """
-"eric7 has not been configured yet but an eric6"
+"""The configuration dialog will be started."""
-" configuration was found. Shall this be"
+),
-" imported?"
+)
-),
-yesDefault=True,
-)
-if yes:
-Preferences.importEric6Configuration()
-else:
-EricMessageBox.information(
-self,
-self.tr("First time usage"),
-self.tr(
-"""eric has not been configured yet. """
-"""The configuration dialog will be started."""
-),
-)
 self.showPreferences()
 Preferences.setConfigured()
 def checkProjectsWorkspace(self):
 """

Mercurial Repositories > eric / file comparison

comparison: src/eric7/UI/UserInterface.py

src/eric7/UI/UserInterface.py