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

Merge branch 'sem-geologist-fix_dark_theming' into develop

Browse Source
This commit is contained in:
Luke Campagnola 2018-01-31 08:46:32 -08:00
commit e65ab3faa5
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pyqtgraph/console/Console.py
View File

@ -115,7 +115,7 @@ class ConsoleWidget(QtGui.QWidget):
self.write("<br><b>%s</b>\n"%encCmd, html=True) self.write("<br><b>%s</b>\n"%encCmd, html=True)
self.execMulti(cmd) self.execMulti(cmd)
else: else:
self.write("<br><div style='background-color: #CCF'><b>%s</b>\n"%encCmd, html=True) self.write("<br><div style='background-color: #CCF; color: black'><b>%s</b>\n"%encCmd, html=True)
self.inCmd = True self.inCmd = True
self.execSingle(cmd) self.execSingle(cmd)
@ -210,7 +210,7 @@ class ConsoleWidget(QtGui.QWidget):
else: else:
if self.inCmd: if self.inCmd:
self.inCmd = False self.inCmd = False
self.output.textCursor().insertHtml("</div><br><div style='font-weight: normal; background-color: #FFF;'>") self.output.textCursor().insertHtml("</div><br><div style='font-weight: normal; background-color: #FFF; color: black'>")
#self.stdout.write("</div><br><div style='font-weight: normal; background-color: #FFF;'>") #self.stdout.write("</div><br><div style='font-weight: normal; background-color: #FFF;'>")
self.output.insertPlainText(strn) self.output.insertPlainText(strn)
#self.stdout.write(strn) #self.stdout.write(strn)
@ -368,6 +368,7 @@ class ConsoleWidget(QtGui.QWidget):
self.ui.exceptionStackList.addItem('-- exception caught here: --') self.ui.exceptionStackList.addItem('-- exception caught here: --')
item = self.ui.exceptionStackList.item(self.ui.exceptionStackList.count()-1) item = self.ui.exceptionStackList.item(self.ui.exceptionStackList.count()-1)
item.setBackground(QtGui.QBrush(QtGui.QColor(200, 200, 200))) item.setBackground(QtGui.QBrush(QtGui.QColor(200, 200, 200)))
item.setForeground(QtGui.QBrush(QtGui.QColor(50, 50, 50)))
self.frames.append(None) self.frames.append(None)
# And finish the rest of the stack up to the exception # And finish the rest of the stack up to the exception

1
pyqtgraph/parametertree/parameterTypes.py
View File

@ -400,6 +400,7 @@ class GroupParameterItem(ParameterItem):
else: else:
for c in [0,1]: for c in [0,1]:
self.setBackground(c, QtGui.QBrush(QtGui.QColor(220,220,220))) self.setBackground(c, QtGui.QBrush(QtGui.QColor(220,220,220)))
self.setForeground(c, QtGui.QBrush(QtGui.QColor(50,50,50)))
font = self.font(c) font = self.font(c)
font.setBold(True) font.setBold(True)
#font.setPointSize(font.pointSize()+1) #font.setPointSize(font.pointSize()+1)