Dark mode support.

This commit is contained in:
Gabriel Linder 2020-03-07 22:42:01 +01:00
parent adba81a8d8
commit 412698c8bb
No known key found for this signature in database
GPG Key ID: 5FA837672AC41AE3
2 changed files with 122 additions and 28 deletions

View File

@ -22,6 +22,16 @@ elif QT_LIB == 'PyQt5':
else: else:
from .exampleLoaderTemplate_pyqt import Ui_Form from .exampleLoaderTemplate_pyqt import Ui_Form
class App(QtGui.QApplication):
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
self.paletteChanged.connect(self.onPaletteChange)
self.onPaletteChange(self.palette())
def onPaletteChange(self, palette):
self.dark_mode = palette.base().color().name().lower() != "#ffffff"
class ExampleLoader(QtGui.QMainWindow): class ExampleLoader(QtGui.QMainWindow):
def __init__(self): def __init__(self):
QtGui.QMainWindow.__init__(self) QtGui.QMainWindow.__init__(self)
@ -34,6 +44,7 @@ class ExampleLoader(QtGui.QMainWindow):
self.codeBtn = QtGui.QPushButton('Run Edited Code') self.codeBtn = QtGui.QPushButton('Run Edited Code')
self.codeLayout = QtGui.QGridLayout() self.codeLayout = QtGui.QGridLayout()
self.ui.codeView.setLayout(self.codeLayout) self.ui.codeView.setLayout(self.codeLayout)
#self.simulate_black_mode()
self.hl = PythonHighlighter(self.ui.codeView.document()) self.hl = PythonHighlighter(self.ui.codeView.document())
self.codeLayout.addItem(QtGui.QSpacerItem(100,100,QtGui.QSizePolicy.Expanding,QtGui.QSizePolicy.Expanding), 0, 0) self.codeLayout.addItem(QtGui.QSpacerItem(100,100,QtGui.QSizePolicy.Expanding,QtGui.QSizePolicy.Expanding), 0, 0)
self.codeLayout.addWidget(self.codeBtn, 1, 1) self.codeLayout.addWidget(self.codeBtn, 1, 1)
@ -53,6 +64,25 @@ class ExampleLoader(QtGui.QMainWindow):
self.ui.codeView.textChanged.connect(self.codeEdited) self.ui.codeView.textChanged.connect(self.codeEdited)
self.codeBtn.clicked.connect(self.runEditedCode) self.codeBtn.clicked.connect(self.runEditedCode)
def simulate_black_mode(self):
"""
used to simulate MacOS "black mode" on other platforms
intended for debug only, as it manage only the QPlainTextEdit
"""
# first, a dark background
c = QtGui.QColor('#171717')
p = self.ui.codeView.palette()
p.setColor(QtGui.QPalette.Active, QtGui.QPalette.Base, c)
p.setColor(QtGui.QPalette.Inactive, QtGui.QPalette.Base, c)
self.ui.codeView.setPalette(p)
# then, a light font
f = QtGui.QTextCharFormat()
f.setForeground(QtGui.QColor('white'))
self.ui.codeView.setCurrentCharFormat(f)
# finally, override application automatic detection
app = QtGui.QApplication.instance()
app.dark_mode = True
def populateTree(self, root, examples): def populateTree(self, root, examples):
for key, val in examples.items(): for key, val in examples.items():
item = QtGui.QTreeWidgetItem([key]) item = QtGui.QTreeWidgetItem([key])
@ -117,7 +147,7 @@ class ExampleLoader(QtGui.QMainWindow):
self.loadFile(edited=True) self.loadFile(edited=True)
def run(): def run():
app = QtGui.QApplication([]) app = App([])
loader = ExampleLoader() loader = ExampleLoader()
app.exec_() app.exec_()

View File

@ -30,17 +30,75 @@ def format(color, style=''):
return _format return _format
# Syntax styles that can be shared by all languages class LightThemeColors:
STYLES = {
'keyword': format('blue'), Red = "#B71C1C"
'operator': format('red'), Pink = "#FCE4EC"
'brace': format('darkGray'), Purple = "#4A148C"
'defclass': format('black', 'bold'), DeepPurple = "#311B92"
'string': format('magenta'), Indigo = "#1A237E"
'string2': format('darkMagenta'), Blue = "#0D47A1"
'comment': format('darkGreen', 'italic'), LightBlue = "#01579B"
'self': format('black', 'italic'), Cyan = "#006064"
'numbers': format('brown'), Teal = "#004D40"
Green = "#1B5E20"
LightGreen = "#33691E"
Lime = "#827717"
Yellow = "#F57F17"
Amber = "#FF6F00"
Orange = "#E65100"
DeepOrange = "#BF360C"
Brown = "#3E2723"
Grey = "#212121"
BlueGrey = "#263238"
class DarkThemeColors:
Red = "#F44336"
Pink = "#F48FB1"
Purple = "#CE93D8"
DeepPurple = "#B39DDB"
Indigo = "#9FA8DA"
Blue = "#90CAF9"
LightBlue = "#81D4FA"
Cyan = "#80DEEA"
Teal = "#80CBC4"
Green = "#A5D6A7"
LightGreen = "#C5E1A5"
Lime = "#E6EE9C"
Yellow = "#FFF59D"
Amber = "#FFE082"
Orange = "#FFCC80"
DeepOrange = "#FFAB91"
Brown = "#BCAAA4"
Grey = "#EEEEEE"
BlueGrey = "#B0BEC5"
LIGHT_STYLES = {
'keyword': format(LightThemeColors.Blue, 'bold'),
'operator': format(LightThemeColors.Red, 'bold'),
'brace': format(LightThemeColors.Purple),
'defclass': format(LightThemeColors.Indigo, 'bold'),
'string': format(LightThemeColors.Amber),
'string2': format(LightThemeColors.DeepPurple),
'comment': format(LightThemeColors.Green, 'italic'),
'self': format(LightThemeColors.Blue, 'bold'),
'numbers': format(LightThemeColors.Teal),
}
DARK_STYLES = {
'keyword': format(DarkThemeColors.Blue, 'bold'),
'operator': format(DarkThemeColors.Red, 'bold'),
'brace': format(DarkThemeColors.Purple),
'defclass': format(DarkThemeColors.Indigo, 'bold'),
'string': format(DarkThemeColors.Amber),
'string2': format(DarkThemeColors.DeepPurple),
'comment': format(DarkThemeColors.Green, 'italic'),
'self': format(DarkThemeColors.Blue, 'bold'),
'numbers': format(DarkThemeColors.Teal),
} }
@ -54,7 +112,7 @@ class PythonHighlighter(QSyntaxHighlighter):
'for', 'from', 'global', 'if', 'import', 'in', 'for', 'from', 'global', 'if', 'import', 'in',
'is', 'lambda', 'not', 'or', 'pass', 'print', 'is', 'lambda', 'not', 'or', 'pass', 'print',
'raise', 'return', 'try', 'while', 'yield', 'raise', 'return', 'try', 'while', 'yield',
'None', 'True', 'False', 'None', 'True', 'False', 'async', 'await',
] ]
# Python operators # Python operators
@ -81,42 +139,42 @@ class PythonHighlighter(QSyntaxHighlighter):
# Multi-line strings (expression, flag, style) # Multi-line strings (expression, flag, style)
# FIXME: The triple-quotes in these two lines will mess up the # FIXME: The triple-quotes in these two lines will mess up the
# syntax highlighting from this point onward # syntax highlighting from this point onward
self.tri_single = (QRegExp("'''"), 1, STYLES['string2']) self.tri_single = (QRegExp("'''"), 1, 'string2')
self.tri_double = (QRegExp('"""'), 2, STYLES['string2']) self.tri_double = (QRegExp('"""'), 2, 'string2')
rules = [] rules = []
# Keyword, operator, and brace rules # Keyword, operator, and brace rules
rules += [(r'\b%s\b' % w, 0, STYLES['keyword']) rules += [(r'\b%s\b' % w, 0, 'keyword')
for w in PythonHighlighter.keywords] for w in PythonHighlighter.keywords]
rules += [(r'%s' % o, 0, STYLES['operator']) rules += [(r'%s' % o, 0, 'operator')
for o in PythonHighlighter.operators] for o in PythonHighlighter.operators]
rules += [(r'%s' % b, 0, STYLES['brace']) rules += [(r'%s' % b, 0, 'brace')
for b in PythonHighlighter.braces] for b in PythonHighlighter.braces]
# All other rules # All other rules
rules += [ rules += [
# 'self' # 'self'
(r'\bself\b', 0, STYLES['self']), (r'\bself\b', 0, 'self'),
# 'def' followed by an identifier # 'def' followed by an identifier
(r'\bdef\b\s*(\w+)', 1, STYLES['defclass']), (r'\bdef\b\s*(\w+)', 1, 'defclass'),
# 'class' followed by an identifier # 'class' followed by an identifier
(r'\bclass\b\s*(\w+)', 1, STYLES['defclass']), (r'\bclass\b\s*(\w+)', 1, 'defclass'),
# Numeric literals # Numeric literals
(r'\b[+-]?[0-9]+[lL]?\b', 0, STYLES['numbers']), (r'\b[+-]?[0-9]+[lL]?\b', 0, 'numbers'),
(r'\b[+-]?0[xX][0-9A-Fa-f]+[lL]?\b', 0, STYLES['numbers']), (r'\b[+-]?0[xX][0-9A-Fa-f]+[lL]?\b', 0, 'numbers'),
(r'\b[+-]?[0-9]+(?:\.[0-9]+)?(?:[eE][+-]?[0-9]+)?\b', 0, STYLES['numbers']), (r'\b[+-]?[0-9]+(?:\.[0-9]+)?(?:[eE][+-]?[0-9]+)?\b', 0, 'numbers'),
# Double-quoted string, possibly containing escape sequences # Double-quoted string, possibly containing escape sequences
(r'"[^"\\]*(\\.[^"\\]*)*"', 0, STYLES['string']), (r'"[^"\\]*(\\.[^"\\]*)*"', 0, 'string'),
# Single-quoted string, possibly containing escape sequences # Single-quoted string, possibly containing escape sequences
(r"'[^'\\]*(\\.[^'\\]*)*'", 0, STYLES['string']), (r"'[^'\\]*(\\.[^'\\]*)*'", 0, 'string'),
# From '#' until a newline # From '#' until a newline
(r'#[^\n]*', 0, STYLES['comment']), (r'#[^\n]*', 0, 'comment'),
] ]
@ -124,12 +182,18 @@ class PythonHighlighter(QSyntaxHighlighter):
self.rules = [(QRegExp(pat), index, fmt) self.rules = [(QRegExp(pat), index, fmt)
for (pat, index, fmt) in rules] for (pat, index, fmt) in rules]
@property
def styles(self):
app = QtGui.QApplication.instance()
return DARK_STYLES if app.dark_mode 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.
""" """
# Do other syntax formatting # Do other syntax formatting
for expression, nth, format in self.rules: for expression, nth, format in self.rules:
index = expression.indexIn(text, 0) index = expression.indexIn(text, 0)
format = self.styles[format]
while index >= 0: while index >= 0:
# We actually want the index of the nth match # We actually want the index of the nth match
@ -175,7 +239,7 @@ class PythonHighlighter(QSyntaxHighlighter):
self.setCurrentBlockState(in_state) self.setCurrentBlockState(in_state)
length = len(text) - start + add length = len(text) - start + add
# Apply formatting # Apply formatting
self.setFormat(start, length, style) self.setFormat(start, length, self.styles[style])
# Look for the next match # Look for the next match
start = delimiter.indexIn(text, start + length) start = delimiter.indexIn(text, start + length)