ASCEE/pyqtgraph
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1587 from irgolic/darkmode-example-property

Browse Source 
app.dark_mode => app.property('darkMode')
This commit is contained in:
Ogi Moore 2021-02-18 19:33:16 -08:00 committed by GitHub
commit d0d10ca512
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/ExampleApp.py
View File

@ -189,7 +189,7 @@ class PythonHighlighter(QSyntaxHighlighter):
@property @property
def styles(self): def styles(self):
app = QtGui.QApplication.instance() app = QtGui.QApplication.instance()
return DARK_STYLES if app.dark_mode else LIGHT_STYLES return DARK_STYLES if app.property('darkMode') else LIGHT_STYLES
def highlightBlock(self, text): def highlightBlock(self, text):
"""Apply syntax highlighting to the given block of text. """Apply syntax highlighting to the given block of text.
@ -310,7 +310,7 @@ class ExampleLoader(QtGui.QMainWindow):
self.ui.codeView.setCurrentCharFormat(f) self.ui.codeView.setCurrentCharFormat(f)
# finally, override application automatic detection # finally, override application automatic detection
app = QtGui.QApplication.instance() app = QtGui.QApplication.instance()
app.dark_mode = True app.setProperty('darkMode', True)
def updateTheme(self): def updateTheme(self):
self.hl = PythonHighlighter(self.ui.codeView.document()) self.hl = PythonHighlighter(self.ui.codeView.document())

2
examples/syntax.py
View File

@ -186,7 +186,7 @@ class PythonHighlighter(QSyntaxHighlighter):
@property @property
def styles(self): def styles(self):
app = QtGui.QApplication.instance() app = QtGui.QApplication.instance()
return DARK_STYLES if app.dark_mode else LIGHT_STYLES return DARK_STYLES if app.property('darkMode') else LIGHT_STYLES
def highlightBlock(self, text): def highlightBlock(self, text):
"""Apply syntax highlighting to the given block of text. """Apply syntax highlighting to the given block of text.

9
pyqtgraph/Qt.py
View File

@ -468,19 +468,12 @@ class App(QtGui.QApplication):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
super(App, self).__init__(*args, **kwargs) super(App, self).__init__(*args, **kwargs)
if QT_LIB in ['PyQt5', 'PySide2', 'PySide6']:
# qt4 does not have paletteChanged signal!
self.paletteChanged.connect(self.onPaletteChange) self.paletteChanged.connect(self.onPaletteChange)
self.onPaletteChange(self.palette()) self.onPaletteChange(self.palette())
def onPaletteChange(self, palette): def onPaletteChange(self, palette):
if QT_LIB in ['PyQt4', 'PySide']:
# Qt4 this is a QString
color = str(palette.base().color().name())
else:
# Qt5 has this as a str
color = palette.base().color().name() color = palette.base().color().name()
self.dark_mode = color.lower() != "#ffffff" self.setProperty('darkMode', color.lower() != "#ffffff")
QAPP = None QAPP = None
def mkQApp(name=None): def mkQApp(name=None):