Mercurial Repositories > eric / changeset
changeset
Human Machine Interfaces
Thu, 12 Jan 2023 13:48:00 +0100
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Thu, 12 Jan 2023 13:48:00 +0100
- branch
- eric7
- changeset 9695
- ad962e9b904d
- parent 9694
- 90a7081e2837
- child 9696
- 669dabfa1319
- child 9701
- 9ad323eba07c
Human Machine Interfaces
- Changed code to use the default tab bar icon size.
--- a/docs/changelog.md Thu Jan 12 11:52:43 2023 +0100 +++ b/docs/changelog.md Thu Jan 12 13:48:00 2023 +0100 @@ -2,6 +2,8 @@ ### Version 23.2 - bug fixes +- Human Machine Interfaces + - Changed code to use the default tab bar icon size. - Debug Client - Python - Removed the internal copy of the 'coverage' package and made it a dependency. - pip Interface
--- a/src/eric7/Debugger/DebugUI.py Thu Jan 12 11:52:43 2023 +0100 +++ b/src/eric7/Debugger/DebugUI.py Thu Jan 12 13:48:00 2023 +0100 @@ -21,7 +21,6 @@ from eric7.EricWidgets import EricMessageBox from eric7.Globals import recentNameBreakpointConditions from eric7.SystemUtilities import FileSystemUtilities -from eric7.UI import Config from eric7.UI.Info import Program from eric7.UI.NotificationWidget import NotificationTypes @@ -858,7 +857,6 @@ @return the generated toolbars (list of QToolBar) """ starttb = QToolBar(self.tr("Start"), self.ui) - starttb.setIconSize(Config.ToolBarIconSize) starttb.setObjectName("StartToolbar") starttb.setToolTip(self.tr("Start")) @@ -872,7 +870,6 @@ starttb.addAction(self.debugProjectAct) debugtb = QToolBar(self.tr("Debug"), self.ui) - debugtb.setIconSize(Config.ToolBarIconSize) debugtb.setObjectName("DebugToolbar") debugtb.setToolTip(self.tr("Debug"))
--- a/src/eric7/EricWidgets/EricToolBarManager.py Thu Jan 12 11:52:43 2023 +0100 +++ b/src/eric7/EricWidgets/EricToolBarManager.py Thu Jan 12 13:48:00 2023 +0100 @@ -335,7 +335,6 @@ self.__toolBarsWithSeparators[tbID] = [] if self.__ui is not None: - toolBar.setIconSize(self.__ui.getToolBarIconSize()) self.__ui.registerToolbar(name, title, toolBar) return toolBar
--- a/src/eric7/Graphics/PixmapDiagram.py Thu Jan 12 11:52:43 2023 +0100 +++ b/src/eric7/Graphics/PixmapDiagram.py Thu Jan 12 13:48:00 2023 +0100 @@ -26,7 +26,6 @@ from eric7.EricWidgets import EricMessageBox from eric7.EricWidgets.EricMainWindow import EricMainWindow from eric7.EricWidgets.EricZoomWidget import EricZoomWidget -from eric7.UI import Config class PixmapDiagram(EricMainWindow): @@ -169,11 +168,9 @@ Private method to populate the toolbars with our actions. """ self.windowToolBar = QToolBar(self.tr("Window"), self) - self.windowToolBar.setIconSize(Config.ToolBarIconSize) self.windowToolBar.addAction(self.closeAct) self.graphicsToolBar = QToolBar(self.tr("Graphics"), self) - self.graphicsToolBar.setIconSize(Config.ToolBarIconSize) self.graphicsToolBar.addAction(self.printPreviewAct) self.graphicsToolBar.addAction(self.printAct)
--- a/src/eric7/Graphics/SvgDiagram.py Thu Jan 12 11:52:43 2023 +0100 +++ b/src/eric7/Graphics/SvgDiagram.py Thu Jan 12 13:48:00 2023 +0100 @@ -17,7 +17,6 @@ from eric7.EricGui import EricPixmapCache from eric7.EricWidgets.EricMainWindow import EricMainWindow from eric7.EricWidgets.EricZoomWidget import EricZoomWidget -from eric7.UI import Config class SvgDiagram(EricMainWindow): @@ -159,11 +158,9 @@ Private method to populate the toolbars with our actions. """ self.windowToolBar = QToolBar(self.tr("Window"), self) - self.windowToolBar.setIconSize(Config.ToolBarIconSize) self.windowToolBar.addAction(self.closeAct) self.graphicsToolBar = QToolBar(self.tr("Graphics"), self) - self.graphicsToolBar.setIconSize(Config.ToolBarIconSize) self.graphicsToolBar.addAction(self.printPreviewAct) self.graphicsToolBar.addAction(self.printAct)
--- a/src/eric7/Graphics/UMLDialog.py Thu Jan 12 11:52:43 2023 +0100 +++ b/src/eric7/Graphics/UMLDialog.py Thu Jan 12 13:48:00 2023 +0100 @@ -18,7 +18,6 @@ from eric7.EricGui import EricPixmapCache from eric7.EricWidgets import EricFileDialog, EricMessageBox from eric7.EricWidgets.EricMainWindow import EricMainWindow -from eric7.UI import Config from .ApplicationDiagramBuilder import ApplicationDiagramBuilder from .ImportsDiagramBuilder import ImportsDiagramBuilder @@ -160,11 +159,9 @@ Private slot to initialize the toolbars. """ self.windowToolBar = QToolBar(self.tr("Window"), self) - self.windowToolBar.setIconSize(Config.ToolBarIconSize) self.windowToolBar.addAction(self.closeAct) self.fileToolBar = QToolBar(self.tr("File"), self) - self.fileToolBar.setIconSize(Config.ToolBarIconSize) self.fileToolBar.addAction(self.openAct) self.fileToolBar.addSeparator() self.fileToolBar.addAction(self.saveAct)
--- a/src/eric7/Graphics/UMLGraphicsView.py Thu Jan 12 11:52:43 2023 +0100 +++ b/src/eric7/Graphics/UMLGraphicsView.py Thu Jan 12 13:48:00 2023 +0100 @@ -19,7 +19,6 @@ from eric7.EricGui import EricPixmapCache from eric7.EricWidgets import EricFileDialog, EricMessageBox from eric7.EricWidgets.EricZoomWidget import EricZoomWidget -from eric7.UI import Config from .AssociationItem import AssociationItem from .ClassItem import ClassItem @@ -234,7 +233,6 @@ @rtype QToolBar """ toolBar = QToolBar(self.tr("Graphics"), self) - toolBar.setIconSize(Config.ToolBarIconSize) toolBar.addAction(self.deleteShapeAct) toolBar.addSeparator() toolBar.addAction(self.alignLeftAct)
--- a/src/eric7/HexEdit/HexEditMainWindow.py Thu Jan 12 11:52:43 2023 +0100 +++ b/src/eric7/HexEdit/HexEditMainWindow.py Thu Jan 12 13:48:00 2023 +0100 @@ -31,7 +31,6 @@ from eric7.EricWidgets.EricMainWindow import EricMainWindow from eric7.Globals import recentNameHexFiles, strGroup from eric7.SystemUtilities import FileSystemUtilities -from eric7.UI import Config from .HexEditGotoWidget import HexEditGotoWidget from .HexEditSearchReplaceWidget import HexEditSearchReplaceWidget @@ -834,7 +833,6 @@ """ filetb = self.addToolBar(self.tr("File")) filetb.setObjectName("FileToolBar") - filetb.setIconSize(Config.ToolBarIconSize) filetb.addAction(self.newWindowAct) filetb.addAction(self.openAct) filetb.addSeparator() @@ -847,7 +845,6 @@ edittb = self.addToolBar(self.tr("Edit")) edittb.setObjectName("EditToolBar") - edittb.setIconSize(Config.ToolBarIconSize) edittb.addAction(self.undoAct) edittb.addAction(self.redoAct) edittb.addSeparator() @@ -857,7 +854,6 @@ searchtb = self.addToolBar(self.tr("Find")) searchtb.setObjectName("SearchToolBar") - searchtb.setIconSize(Config.ToolBarIconSize) searchtb.addAction(self.searchAct) searchtb.addAction(self.searchNextAct) searchtb.addAction(self.searchPrevAct) @@ -865,12 +861,10 @@ if not self.__fromEric: settingstb = self.addToolBar(self.tr("Settings")) settingstb.setObjectName("SettingsToolBar") - settingstb.setIconSize(Config.ToolBarIconSize) settingstb.addAction(self.prefAct) helptb = self.addToolBar(self.tr("Help")) helptb.setObjectName("HelpToolBar") - helptb.setIconSize(Config.ToolBarIconSize) helptb.addAction(self.whatsThisAct) def __createStatusBar(self):
--- a/src/eric7/IconEditor/IconEditorWindow.py Thu Jan 12 11:52:43 2023 +0100 +++ b/src/eric7/IconEditor/IconEditorWindow.py Thu Jan 12 13:48:00 2023 +0100 @@ -21,7 +21,6 @@ from eric7.EricWidgets import EricFileDialog, EricMessageBox from eric7.EricWidgets.EricMainWindow import EricMainWindow from eric7.EricWidgets.EricZoomWidget import EricZoomWidget -from eric7.UI import Config from .IconEditorGrid import IconEditorGrid, IconEditorTool @@ -1015,7 +1014,6 @@ """ filetb = self.addToolBar(self.tr("File")) filetb.setObjectName("FileToolBar") - filetb.setIconSize(Config.ToolBarIconSize) filetb.addAction(self.newAct) filetb.addAction(self.newWindowAct) filetb.addAction(self.openAct) @@ -1029,7 +1027,6 @@ edittb = self.addToolBar(self.tr("Edit")) edittb.setObjectName("EditToolBar") - edittb.setIconSize(Config.ToolBarIconSize) edittb.addAction(self.undoAct) edittb.addAction(self.redoAct) edittb.addSeparator() @@ -1042,12 +1039,10 @@ viewtb = self.addToolBar(self.tr("View")) viewtb.setObjectName("ViewToolBar") - viewtb.setIconSize(Config.ToolBarIconSize) viewtb.addAction(self.showGridAct) toolstb = self.addToolBar(self.tr("Tools")) toolstb.setObjectName("ToolsToolBar") - toolstb.setIconSize(Config.ToolBarIconSize) toolstb.addAction(self.drawPencilAct) toolstb.addAction(self.drawColorPickerAct) toolstb.addAction(self.drawRectangleAct) @@ -1065,7 +1060,6 @@ helptb = self.addToolBar(self.tr("Help")) helptb.setObjectName("HelpToolBar") - helptb.setIconSize(Config.ToolBarIconSize) helptb.addAction(self.whatsThisAct) def __createStatusBar(self):
--- a/src/eric7/MultiProject/MultiProject.py Thu Jan 12 11:52:43 2023 +0100 +++ b/src/eric7/MultiProject/MultiProject.py Thu Jan 12 13:48:00 2023 +0100 @@ -24,7 +24,6 @@ from eric7.EricXML.MultiProjectReader import MultiProjectReader from eric7.Globals import recentNameMultiProject from eric7.SystemUtilities import FileSystemUtilities, OSUtilities -from eric7.UI import Config from .MultiProjectFile import MultiProjectFile @@ -878,7 +877,6 @@ @return the toolbar generated (QToolBar) """ tb = QToolBar(self.tr("Multiproject"), self.ui) - tb.setIconSize(Config.ToolBarIconSize) tb.setObjectName("MultiProjectToolbar") tb.setToolTip(self.tr("Multiproject"))
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/ProjectHelper.py Thu Jan 12 11:52:43 2023 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsGit/ProjectHelper.py Thu Jan 12 13:48:00 2023 +0100 @@ -16,7 +16,6 @@ from eric7.EricGui.EricAction import EricAction from eric7.EricWidgets import EricMessageBox from eric7.EricWidgets.EricApplication import ericApp -from eric7.UI import Config from eric7.VCS.ProjectHelper import VcsProjectHelper @@ -1955,7 +1954,6 @@ (EricToolBarManager) """ self.__toolbar = QToolBar(self.tr("Git"), ui) - self.__toolbar.setIconSize(Config.ToolBarIconSize) self.__toolbar.setObjectName("GitToolbar") self.__toolbar.setToolTip(self.tr("Git"))
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Thu Jan 12 11:52:43 2023 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Thu Jan 12 13:48:00 2023 +0100 @@ -16,7 +16,6 @@ from eric7.EricGui.EricAction import EricAction from eric7.EricWidgets import EricMessageBox from eric7.EricWidgets.EricApplication import ericApp -from eric7.UI import Config from eric7.VCS.ProjectHelper import VcsProjectHelper @@ -1890,7 +1889,6 @@ self.__toolbarManager = toolbarManager self.__toolbar = QToolBar(self.tr("Mercurial"), ui) - self.__toolbar.setIconSize(Config.ToolBarIconSize) self.__toolbar.setObjectName("MercurialToolbar") self.__toolbar.setToolTip(self.tr("Mercurial"))
--- a/src/eric7/Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py Thu Jan 12 11:52:43 2023 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py Thu Jan 12 13:48:00 2023 +0100 @@ -14,7 +14,6 @@ from eric7.EricGui import EricPixmapCache from eric7.EricGui.EricAction import EricAction from eric7.EricWidgets.EricApplication import ericApp -from eric7.UI import Config from eric7.VCS.ProjectHelper import VcsProjectHelper @@ -687,7 +686,6 @@ (EricToolBarManager) """ self.__toolbar = QToolBar(self.tr("Subversion (pysvn)"), ui) - self.__toolbar.setIconSize(Config.ToolBarIconSize) self.__toolbar.setObjectName("PySvnToolbar") self.__toolbar.setToolTip(self.tr("Subversion (pysvn)"))
--- a/src/eric7/Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py Thu Jan 12 11:52:43 2023 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py Thu Jan 12 13:48:00 2023 +0100 @@ -14,7 +14,6 @@ from eric7.EricGui import EricPixmapCache from eric7.EricGui.EricAction import EricAction from eric7.EricWidgets.EricApplication import ericApp -from eric7.UI import Config from eric7.VCS.ProjectHelper import VcsProjectHelper @@ -674,7 +673,6 @@ (EricToolBarManager) """ self.__toolbar = QToolBar(self.tr("Subversion (svn)"), ui) - self.__toolbar.setIconSize(Config.ToolBarIconSize) self.__toolbar.setObjectName("SubversionToolbar") self.__toolbar.setToolTip(self.tr("Subversion (svn)"))
--- a/src/eric7/Project/Project.py Thu Jan 12 11:52:43 2023 +0100 +++ b/src/eric7/Project/Project.py Thu Jan 12 13:48:00 2023 +0100 @@ -59,7 +59,6 @@ QtUtilities, ) from eric7.Tasks.TasksFile import TasksFile -from eric7.UI import Config from eric7.UI.NotificationWidget import NotificationTypes from .DebuggerPropertiesFile import DebuggerPropertiesFile @@ -5379,7 +5378,6 @@ from eric7 import VCS tb = QToolBar(self.tr("Project"), self.ui) - tb.setIconSize(Config.ToolBarIconSize) tb.setObjectName("ProjectToolbar") tb.setToolTip(self.tr("Project"))
--- a/src/eric7/QScintilla/MiniEditor.py Thu Jan 12 11:52:43 2023 +0100 +++ b/src/eric7/QScintilla/MiniEditor.py Thu Jan 12 13:48:00 2023 +0100 @@ -53,7 +53,6 @@ from eric7.EricWidgets.EricMainWindow import EricMainWindow from eric7.EricWidgets.EricZoomWidget import EricZoomWidget from eric7.SystemUtilities import OSUtilities -from eric7.UI import Config from . import Lexers from .EditorOutline import EditorOutlineView @@ -2995,7 +2994,6 @@ Private method to create the various toolbars. """ filetb = self.addToolBar(self.tr("File")) - filetb.setIconSize(Config.ToolBarIconSize) filetb.addAction(self.newAct) filetb.addAction(self.openAct) filetb.addAction(self.saveAct) @@ -3008,7 +3006,6 @@ filetb.addAction(self.closeAct) edittb = self.addToolBar(self.tr("Edit")) - edittb.setIconSize(Config.ToolBarIconSize) edittb.addAction(self.undoAct) edittb.addAction(self.redoAct) edittb.addSeparator() @@ -3018,25 +3015,21 @@ edittb.addAction(self.deleteAct) findtb = self.addToolBar(self.tr("Search")) - findtb.setIconSize(Config.ToolBarIconSize) findtb.addAction(self.searchAct) findtb.addAction(self.searchNextAct) findtb.addAction(self.searchPrevAct) findtb.addAction(self.searchClearMarkersAct) viewtb = self.addToolBar(self.tr("View")) - viewtb.setIconSize(Config.ToolBarIconSize) viewtb.addAction(self.zoomInAct) viewtb.addAction(self.zoomOutAct) viewtb.addAction(self.zoomResetAct) viewtb.addAction(self.zoomToAct) settingstb = self.addToolBar(self.tr("Settings")) - settingstb.setIconSize(Config.ToolBarIconSize) settingstb.addAction(self.prefAct) helptb = self.addToolBar(self.tr("Help")) - helptb.setIconSize(Config.ToolBarIconSize) helptb.addAction(self.whatsThisAct) def __createStatusBar(self):
--- a/src/eric7/QScintilla/ShellWindow.py Thu Jan 12 11:52:43 2023 +0100 +++ b/src/eric7/QScintilla/ShellWindow.py Thu Jan 12 13:48:00 2023 +0100 @@ -24,7 +24,6 @@ from eric7.EricWidgets.EricZoomWidget import EricZoomWidget from eric7.Globals import getConfig from eric7.SystemUtilities import OSUtilities, PythonUtilities -from eric7.UI import Config from eric7.UI.SearchWidget import SearchWidget from eric7.VirtualEnv.VirtualenvManager import VirtualenvManager @@ -1444,7 +1443,6 @@ Private method to create the various toolbars. """ filetb = self.addToolBar(self.tr("File")) - filetb.setIconSize(Config.ToolBarIconSize) filetb.addAction(self.newWindowAct) filetb.addSeparator() filetb.addAction(self.restartAct) @@ -1455,33 +1453,28 @@ filetb.addAction(self.exitAct) edittb = self.addToolBar(self.tr("Edit")) - edittb.setIconSize(Config.ToolBarIconSize) edittb.addAction(self.cutAct) edittb.addAction(self.copyAct) edittb.addAction(self.pasteAct) edittb.addAction(self.clearAct) findtb = self.addToolBar(self.tr("Find")) - findtb.setIconSize(Config.ToolBarIconSize) findtb.addAction(self.searchAct) findtb.addAction(self.searchNextAct) findtb.addAction(self.searchPrevAct) viewtb = self.addToolBar(self.tr("View")) - viewtb.setIconSize(Config.ToolBarIconSize) viewtb.addAction(self.zoomInAct) viewtb.addAction(self.zoomOutAct) viewtb.addAction(self.zoomResetAct) viewtb.addAction(self.zoomToAct) self.__historyToolbar = self.addToolBar(self.tr("History")) - self.__historyToolbar.setIconSize(Config.ToolBarIconSize) self.__historyToolbar.addAction(self.showHistoryAct) self.__historyToolbar.addAction(self.clearHistoryAct) self.__historyToolbar.setEnabled(self.__shell.isHistoryEnabled()) helptb = self.addToolBar(self.tr("Help")) - helptb.setIconSize(Config.ToolBarIconSize) helptb.addAction(self.whatsThisAct) ##################################################################
--- a/src/eric7/SqlBrowser/SqlBrowser.py Thu Jan 12 11:52:43 2023 +0100 +++ b/src/eric7/SqlBrowser/SqlBrowser.py Thu Jan 12 13:48:00 2023 +0100 @@ -17,7 +17,6 @@ from eric7.EricWidgets import EricMessageBox from eric7.EricWidgets.EricApplication import ericApp from eric7.EricWidgets.EricMainWindow import EricMainWindow -from eric7.UI import Config from .SqlBrowserWidget import SqlBrowserWidget @@ -190,7 +189,6 @@ """ filetb = self.addToolBar(self.tr("File")) filetb.setObjectName("FileToolBar") - filetb.setIconSize(Config.ToolBarIconSize) filetb.addAction(self.addConnectionAct) filetb.addSeparator() filetb.addAction(self.exitAct)
--- a/src/eric7/Tools/TRPreviewer.py Thu Jan 12 11:52:43 2023 +0100 +++ b/src/eric7/Tools/TRPreviewer.py Thu Jan 12 13:48:00 2023 +0100 @@ -42,7 +42,6 @@ from eric7.EricWidgets import EricFileDialog, EricMessageBox from eric7.EricWidgets.EricApplication import ericApp from eric7.EricWidgets.EricMainWindow import EricMainWindow -from eric7.UI import Config from .TRSingleApplication import TRSingleApplicationServer @@ -335,7 +334,6 @@ Private method to create the toolbars. """ filetb = self.addToolBar(self.tr("File")) - filetb.setIconSize(Config.ToolBarIconSize) filetb.addAction(self.openUIAct) filetb.addAction(self.openQMAct) filetb.addAction(self.reloadAct) @@ -345,7 +343,6 @@ filetb.addAction(self.exitAct) helptb = self.addToolBar(self.tr("Help")) - helptb.setIconSize(Config.ToolBarIconSize) helptb.addAction(self.whatsThisAct) def __whatsThis(self):
--- a/src/eric7/Tools/UIPreviewer.py Thu Jan 12 11:52:43 2023 +0100 +++ b/src/eric7/Tools/UIPreviewer.py Thu Jan 12 13:48:00 2023 +0100 @@ -37,7 +37,6 @@ from eric7.EricWidgets import EricFileDialog, EricMessageBox from eric7.EricWidgets.EricApplication import ericApp from eric7.EricWidgets.EricMainWindow import EricMainWindow -from eric7.UI import Config class UIPreviewer(EricMainWindow): @@ -280,7 +279,6 @@ Private method to create the toolbars. """ filetb = self.addToolBar(self.tr("File")) - filetb.setIconSize(Config.ToolBarIconSize) filetb.addAction(self.openAct) filetb.addAction(self.imageAct) filetb.addSeparator() @@ -290,11 +288,9 @@ filetb.addAction(self.exitAct) edittb = self.addToolBar(self.tr("Edit")) - edittb.setIconSize(Config.ToolBarIconSize) edittb.addAction(self.copyAct) helptb = self.addToolBar(self.tr("Help")) - helptb.setIconSize(Config.ToolBarIconSize) helptb.addAction(self.whatsThisAct) def __whatsThis(self):
--- a/src/eric7/UI/UserInterface.py Thu Jan 12 11:52:43 2023 +0100 +++ b/src/eric7/UI/UserInterface.py Thu Jan 12 13:48:00 2023 +0100 @@ -95,7 +95,6 @@ from eric7.Utilities.BackgroundService import BackgroundService from eric7.VirtualEnv.VirtualenvManager import VirtualenvManager -from . import Config from .Info import BugAddress, FeatureAddress, Program, Version, VersionOnly from .NotificationWidget import NotificationTypes @@ -4074,14 +4073,6 @@ self.__menus["help"].addAction(self.whatsThisAct) self.__menus["help"].aboutToShow.connect(self.__showHelpMenu) - def getToolBarIconSize(self): - """ - Public method to get the toolbar icon size. - - @return toolbar icon size (QSize) - """ - return Config.ToolBarIconSize - def __initToolbars(self): """ Private slot to create the toolbars. @@ -4102,13 +4093,6 @@ profilestb = QToolBar(self.tr("Profiles"), self) pluginstb = QToolBar(self.tr("Plugins"), self) - toolstb.setIconSize(Config.ToolBarIconSize) - testingtb.setIconSize(Config.ToolBarIconSize) - settingstb.setIconSize(Config.ToolBarIconSize) - helptb.setIconSize(Config.ToolBarIconSize) - profilestb.setIconSize(Config.ToolBarIconSize) - pluginstb.setIconSize(Config.ToolBarIconSize) - toolstb.setObjectName("ToolsToolbar") testingtb.setObjectName("UnittestToolbar") settingstb.setObjectName("SettingsToolbar")
--- a/src/eric7/VCS/ProjectHelper.py Thu Jan 12 11:52:43 2023 +0100 +++ b/src/eric7/VCS/ProjectHelper.py Thu Jan 12 13:48:00 2023 +0100 @@ -21,7 +21,6 @@ from eric7.EricWidgets import EricMessageBox from eric7.EricWidgets.EricApplication import ericApp from eric7.Project.PropertiesDialog import PropertiesDialog -from eric7.UI import Config from .CommandOptionsDialog import VcsCommandOptionsDialog @@ -178,7 +177,6 @@ @return the toolbar generated (QToolBar) """ tb = QToolBar(QCoreApplication.translate("VcsProjectHelper", "VCS"), ui) - tb.setIconSize(Config.ToolBarIconSize) tb.setObjectName("VersionControlToolbar") tb.setToolTip(QCoreApplication.translate("VcsProjectHelper", "VCS"))
--- a/src/eric7/ViewManager/ViewManager.py Thu Jan 12 11:52:43 2023 +0100 +++ b/src/eric7/ViewManager/ViewManager.py Thu Jan 12 13:48:00 2023 +0100 @@ -40,7 +40,6 @@ from eric7.QScintilla.SpellingDictionaryEditDialog import SpellingDictionaryEditDialog from eric7.QScintilla.ZoomDialog import ZoomDialog from eric7.SystemUtilities import FileSystemUtilities, OSUtilities -from eric7.UI import Config class ViewManager(QWidget): @@ -915,7 +914,6 @@ @return the generated toolbar """ tb = QToolBar(QCoreApplication.translate("ViewManager", "File"), self.ui) - tb.setIconSize(Config.ToolBarIconSize) tb.setObjectName("FileToolbar") tb.setToolTip(QCoreApplication.translate("ViewManager", "File")) @@ -3428,7 +3426,6 @@ @return the generated toolbar """ tb = QToolBar(QCoreApplication.translate("ViewManager", "Edit"), self.ui) - tb.setIconSize(Config.ToolBarIconSize) tb.setObjectName("EditToolbar") tb.setToolTip(QCoreApplication.translate("ViewManager", "Edit")) @@ -4030,7 +4027,6 @@ @rtype QToolBar """ tb = QToolBar(QCoreApplication.translate("ViewManager", "Search"), self.ui) - tb.setIconSize(Config.ToolBarIconSize) tb.setObjectName("SearchToolbar") tb.setToolTip(QCoreApplication.translate("ViewManager", "Search")) @@ -4596,7 +4592,6 @@ @return the generated toolbar """ tb = QToolBar(QCoreApplication.translate("ViewManager", "View"), self.ui) - tb.setIconSize(Config.ToolBarIconSize) tb.setObjectName("ViewToolbar") tb.setToolTip(QCoreApplication.translate("ViewManager", "View")) @@ -5181,7 +5176,6 @@ @return the generated toolbar """ tb = QToolBar(QCoreApplication.translate("ViewManager", "Bookmarks"), self.ui) - tb.setIconSize(Config.ToolBarIconSize) tb.setObjectName("BookmarksToolbar") tb.setToolTip(QCoreApplication.translate("ViewManager", "Bookmarks")) @@ -5328,7 +5322,6 @@ @return the generated toolbar """ tb = QToolBar(QCoreApplication.translate("ViewManager", "Spelling"), self.ui) - tb.setIconSize(Config.ToolBarIconSize) tb.setObjectName("SpellingToolbar") tb.setToolTip(QCoreApplication.translate("ViewManager", "Spelling"))
--- a/src/eric7/WebBrowser/WebBrowserWindow.py Thu Jan 12 11:52:43 2023 +0100 +++ b/src/eric7/WebBrowser/WebBrowserWindow.py Thu Jan 12 13:48:00 2023 +0100 @@ -72,7 +72,6 @@ from eric7.QtHelpInterface.HelpSearchWidget import HelpSearchWidget from eric7.QtHelpInterface.HelpTocWidget import HelpTocWidget from eric7.SystemUtilities import FileSystemUtilities, OSUtilities, PythonUtilities -from eric7.UI import Config from eric7.UI.Info import Version from eric7.UI.NotificationWidget import NotificationTypes from eric7.WebBrowser.Tools import WebIconProvider @@ -258,7 +257,6 @@ bookmarksModel = self.bookmarksManager().bookmarksModel() self.__bookmarksToolBar = BookmarksToolBar(self, bookmarksModel, self) - self.__bookmarksToolBar.setIconSize(Config.ToolBarIconSize) self.__bookmarksToolBar.openUrl.connect(self.openUrl) self.__bookmarksToolBar.newTab.connect(self.openUrlNewTab) self.__bookmarksToolBar.newWindow.connect(self.openUrlNewWindow) @@ -2627,7 +2625,6 @@ """ filetb = self.addToolBar(self.tr("File")) filetb.setObjectName("FileToolBar") - filetb.setIconSize(Config.ToolBarIconSize) filetb.addAction(self.newTabAct) filetb.addAction(self.newAct) filetb.addAction(self.newPrivateAct) @@ -2652,7 +2649,6 @@ edittb = self.addToolBar(self.tr("Edit")) edittb.setObjectName("EditToolBar") - edittb.setIconSize(Config.ToolBarIconSize) edittb.addAction(self.undoAct) edittb.addAction(self.redoAct) edittb.addSeparator() @@ -2665,7 +2661,6 @@ viewtb = self.addToolBar(self.tr("View")) viewtb.setObjectName("ViewToolBar") - viewtb.setIconSize(Config.ToolBarIconSize) viewtb.addAction(self.zoomInAct) viewtb.addAction(self.zoomResetAct) viewtb.addAction(self.zoomOutAct) @@ -2675,7 +2670,6 @@ findtb = self.addToolBar(self.tr("Find")) findtb.setObjectName("FindToolBar") - findtb.setIconSize(Config.ToolBarIconSize) findtb.addAction(self.findAct) findtb.addAction(self.findNextAct) findtb.addAction(self.findPrevAct) @@ -2700,7 +2694,6 @@ settingstb = self.addToolBar(self.tr("Settings")) settingstb.setObjectName("SettingsToolBar") - settingstb.setIconSize(Config.ToolBarIconSize) settingstb.addAction(self.prefAct) settingstb.addAction(self.shortcutsAct) settingstb.addAction(self.acceptedLanguagesAct) @@ -2712,7 +2705,6 @@ toolstb = self.addToolBar(self.tr("Tools")) toolstb.setObjectName("ToolsToolBar") - toolstb.setIconSize(Config.ToolBarIconSize) toolstb.addAction(self.feedsManagerAct) toolstb.addAction(self.siteInfoAct) toolstb.addSeparator() @@ -2721,14 +2713,12 @@ helptb = self.addToolBar(self.tr("Help")) helptb.setObjectName("HelpToolBar") - helptb.setIconSize(Config.ToolBarIconSize) helptb.addAction(self.whatsThisAct) self.__toolbars["help"] = (helptb.windowTitle(), helptb) self.addToolBarBreak() vttb = self.addToolBar(self.tr("VirusTotal")) vttb.setObjectName("VirusTotalToolBar") - vttb.setIconSize(Config.ToolBarIconSize) vttb.setToolButtonStyle(Qt.ToolButtonStyle.ToolButtonTextBesideIcon) vttb.addAction(self.virustotalScanCurrentAct) vttb.addAction(self.virustotalIpReportAct)
