diff -r e9e7eca7efee -r bf71ee032bb4 src/eric7/EricWidgets/EricApplication.py
--- a/src/eric7/EricWidgets/EricApplication.py Wed Jul 13 11:16:20 2022 +0200
+++ b/src/eric7/EricWidgets/EricApplication.py Wed Jul 13 14:55:47 2022 +0200
@@ -13,8 +13,7 @@
from PyQt6.QtGui import QColor, QPalette
from PyQt6.QtWidgets import QApplication
-QCoreApplication.setAttribute(
- Qt.ApplicationAttribute.AA_ShareOpenGLContexts, True)
+QCoreApplication.setAttribute(Qt.ApplicationAttribute.AA_ShareOpenGLContexts, True)
from . import EricMessageBox
@@ -23,6 +22,7 @@
"""
Eric application class with an object registry.
"""
+
PaletteRoleMapping = {
"alternate-base": QPalette.ColorRole.AlternateBase,
"base": QPalette.ColorRole.Base,
@@ -40,22 +40,23 @@
"link": QPalette.ColorRole.Link,
"link-visited": QPalette.ColorRole.LinkVisited,
}
-
+
def __init__(self, argv):
"""
Constructor
-
+
@param argv command line arguments
@type list
"""
super().__init__(argv)
-
+
QCoreApplication.setAttribute(
- Qt.ApplicationAttribute.AA_DontCreateNativeWidgetSiblings, True)
-
+ Qt.ApplicationAttribute.AA_DontCreateNativeWidgetSiblings, True
+ )
+
self.__objectRegistry = {}
self.__pluginObjectRegistry = {}
-
+
self.__smallScreen = False
if "--small-screen" in argv:
self.__smallScreen = True
@@ -63,24 +64,23 @@
if not self.__smallScreen:
primaryScreenSize = self.primaryScreen().size()
self.__smallScreen = (
- primaryScreenSize.width() < 1920 or
- primaryScreenSize.height() < 1080
+ primaryScreenSize.width() < 1920 or primaryScreenSize.height() < 1080
)
-
+
def usesSmallScreen(self):
"""
Public method to determine, if the application is used on a small
screen.
-
+
@return flag indicating the use of a small screen
@rtype bool
"""
return self.__smallScreen
-
+
def registerObject(self, name, objectRef):
"""
Public method to register an object in the object registry.
-
+
@param name name of the object
@type str
@param objectRef reference to the object
@@ -91,11 +91,11 @@
raise KeyError('Object "{0}" already registered.'.format(name))
else:
self.__objectRegistry[name] = objectRef
-
+
def getObject(self, name):
"""
Public method to get a reference to a registered object.
-
+
@param name name of the object
@type str
@return reference to the registered object
@@ -104,13 +104,13 @@
"""
if name not in self.__objectRegistry:
raise KeyError('Object "{0}" is not registered.'.format(name))
-
+
return self.__objectRegistry[name]
-
+
def registerPluginObject(self, name, objectRef, pluginType=None):
"""
Public method to register a plugin object in the object registry.
-
+
@param name name of the plugin object
@type str
@param objectRef reference to the plugin object
@@ -120,25 +120,24 @@
@exception KeyError raised when the given name is already in use
"""
if name in self.__pluginObjectRegistry:
- raise KeyError(
- 'Pluginobject "{0}" already registered.'.format(name))
+ raise KeyError('Pluginobject "{0}" already registered.'.format(name))
else:
self.__pluginObjectRegistry[name] = (objectRef, pluginType)
-
+
def unregisterPluginObject(self, name):
"""
Public method to unregister a plugin object in the object registry.
-
+
@param name name of the plugin object
@type str
"""
if name in self.__pluginObjectRegistry:
del self.__pluginObjectRegistry[name]
-
+
def getPluginObject(self, name):
"""
Public method to get a reference to a registered plugin object.
-
+
@param name name of the plugin object
@type str
@return reference to the registered plugin object
@@ -146,16 +145,15 @@
@exception KeyError raised when the given name is not known
"""
if name not in self.__pluginObjectRegistry:
- raise KeyError(
- 'Pluginobject "{0}" is not registered.'.format(name))
-
+ raise KeyError('Pluginobject "{0}" is not registered.'.format(name))
+
return self.__pluginObjectRegistry[name][0]
-
+
def getPluginObjects(self):
"""
Public method to get a list of (name, reference) pairs of all
registered plugin objects.
-
+
@return list of (name, reference) pairs
@rtype list of (str, any)
"""
@@ -163,11 +161,11 @@
for name in self.__pluginObjectRegistry:
objects.append((name, self.__pluginObjectRegistry[name][0]))
return objects
-
+
def getPluginObjectType(self, name):
"""
Public method to get the type of a registered plugin object.
-
+
@param name name of the plugin object
@type str
@return type of the plugin object
@@ -175,15 +173,14 @@
@exception KeyError raised when the given name is not known
"""
if name not in self.__pluginObjectRegistry:
- raise KeyError(
- 'Pluginobject "{0}" is not registered.'.format(name))
-
+ raise KeyError('Pluginobject "{0}" is not registered.'.format(name))
+
return self.__pluginObjectRegistry[name][1]
-
+
def getStyleIconsPath(self, universal=False):
"""
Public method to get the path for the style icons.
-
+
@param universal flag indicating a universal file path (defaults to
False)
@type bool (optional)
@@ -193,24 +190,23 @@
import Preferences
import Utilities
from eric7config import getConfig
-
+
styleIconsPath = Preferences.getUI("StyleIconsPath")
if not styleIconsPath:
# default is the 'StyleIcons' sub-directory of the icons
# directory
- styleIconsPath = os.path.join(
- getConfig('ericIconDir'), "StyleIcons")
-
+ styleIconsPath = os.path.join(getConfig("ericIconDir"), "StyleIcons")
+
if universal:
return Utilities.fromNativeSeparators(styleIconsPath)
else:
return styleIconsPath
-
+
def setStyleSheetFile(self, filename):
"""
Public method to read a QSS style sheet file and set the application
style sheet based on its contents.
-
+
@param filename name of the QSS style sheet file
@type str
"""
@@ -222,36 +218,38 @@
EricMessageBox.warning(
None,
QCoreApplication.translate(
- "EricApplication", "Loading Style Sheet"),
+ "EricApplication", "Loading Style Sheet"
+ ),
QCoreApplication.translate(
"EricApplication",
"""<p>The Qt Style Sheet file <b>{0}</b> could"""
- """ not be read.<br>Reason: {1}</p>""")
- .format(filename, str(msg)))
+ """ not be read.<br>Reason: {1}</p>""",
+ ).format(filename, str(msg)),
+ )
return
else:
styleSheet = ""
-
+
if styleSheet:
# pre-process the style sheet to replace the placeholder for the
# path to the icons
styleIconsPath = self.getStyleIconsPath(universal=True)
styleSheet = styleSheet.replace("${path}", styleIconsPath)
-
+
if "QPalette {" in styleSheet:
self.__setPaletteFromStyleSheet(styleSheet)
-
+
ericApp().setStyleSheet(styleSheet)
-
+
def __setPaletteFromStyleSheet(self, styleSheet):
"""
Private method to set the palette from a style sheet.
-
+
@param styleSheet style sheet
@type str
"""
palette = self.palette()
-
+
paletteStr = styleSheet.split("QPalette {")[1].split("}")[0]
paletteLines = paletteStr.strip().splitlines()
for line in paletteLines:
@@ -260,14 +258,14 @@
value = value.strip("\t ;")
if role in self.PaletteRoleMapping and value.startswith("#"):
palette.setColor(self.PaletteRoleMapping[role], QColor(value))
-
+
self.setPalette(palette)
-
+
def usesDarkPalette(self):
"""
Public method to check, if the application uses a palette with a dark
background.
-
+
@return flag indicating the use of a palette with a dark background
@rtype bool
"""
@@ -275,4 +273,5 @@
lightness = palette.color(QPalette.ColorRole.Window).lightness()
return lightness <= 128
+
ericApp = QCoreApplication.instance
