Reproog/novelWriter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change the strikethrough colour to the color labelled as 'hidden'

Browse Source
This commit is contained in:
Veronica K. B. Olsen
2020-10-14 16:06:51 +02:00
parent 1f957a2817
commit 366d601983
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nw/gui/dochighlight.py
+4 -4
View File
@@ -68,7 +68,7 @@ class GuiDocHighlighter(QSyntaxHighlighter):
self.colDialN = QColor(0, 0, 0) self.colDialN = QColor(0, 0, 0)
self.colDialD = QColor(0, 0, 0) self.colDialD = QColor(0, 0, 0)
self.colDialS = QColor(0, 0, 0) self.colDialS = QColor(0, 0, 0)
self.colComm = QColor(0, 0, 0) self.colHidden = QColor(0, 0, 0)
self.colKey = QColor(0, 0, 0) self.colKey = QColor(0, 0, 0)
self.colVal = QColor(0, 0, 0) self.colVal = QColor(0, 0, 0)
self.colSpell = QColor(0, 0, 0) self.colSpell = QColor(0, 0, 0)
@@ -92,7 +92,7 @@ class GuiDocHighlighter(QSyntaxHighlighter):
self.colDialN = QColor(*self.theTheme.colDialN) self.colDialN = QColor(*self.theTheme.colDialN)
self.colDialD = QColor(*self.theTheme.colDialD) self.colDialD = QColor(*self.theTheme.colDialD)
self.colDialS = QColor(*self.theTheme.colDialS) self.colDialS = QColor(*self.theTheme.colDialS)
self.colComm = QColor(*self.theTheme.colComm) self.colHidden = QColor(*self.theTheme.colHidden)
self.colKey = QColor(*self.theTheme.colKey) self.colKey = QColor(*self.theTheme.colKey)
self.colVal = QColor(*self.theTheme.colVal) self.colVal = QColor(*self.theTheme.colVal)
self.colSpell = QColor(*self.theTheme.colSpell) self.colSpell = QColor(*self.theTheme.colSpell)
@@ -118,14 +118,14 @@ class GuiDocHighlighter(QSyntaxHighlighter):
"header4h" : self._makeFormat(self.colHeadH, "bold", 1.2), "header4h" : self._makeFormat(self.colHeadH, "bold", 1.2),
"bold" : self._makeFormat(self.colEmph, "bold"), "bold" : self._makeFormat(self.colEmph, "bold"),
"italic" : self._makeFormat(self.colEmph, "italic"), "italic" : self._makeFormat(self.colEmph, "italic"),
"strike" : self._makeFormat(self.colEmph, "strike"), "strike" : self._makeFormat(self.colHidden, "strike"),
"trailing" : self._makeFormat(self.colTrail, "background"), "trailing" : self._makeFormat(self.colTrail, "background"),
"nobreak" : self._makeFormat(self.colTrail, "background"), "nobreak" : self._makeFormat(self.colTrail, "background"),
"dialogue1" : self._makeFormat(self.colDialN), "dialogue1" : self._makeFormat(self.colDialN),
"dialogue2" : self._makeFormat(self.colDialD), "dialogue2" : self._makeFormat(self.colDialD),
"dialogue3" : self._makeFormat(self.colDialS), "dialogue3" : self._makeFormat(self.colDialS),
"replace" : self._makeFormat(self.colRepTag), "replace" : self._makeFormat(self.colRepTag),
"hidden" : self._makeFormat(self.colComm), "hidden" : self._makeFormat(self.colHidden),
"keyword" : self._makeFormat(self.colKey), "keyword" : self._makeFormat(self.colKey),
"modifier" : self._makeFormat(self.colMod), "modifier" : self._makeFormat(self.colMod),
"value" : self._makeFormat(self.colVal, "underline"), "value" : self._makeFormat(self.colVal, "underline"),
nw/gui/docviewer.py
+3 -3
View File
@@ -532,9 +532,9 @@ class GuiDocViewer(QTextBrowser):
hColR = self.theTheme.colHead[0], hColR = self.theTheme.colHead[0],
hColG = self.theTheme.colHead[1], hColG = self.theTheme.colHead[1],
hColB = self.theTheme.colHead[2], hColB = self.theTheme.colHead[2],
cColR = self.theTheme.colComm[0], cColR = self.theTheme.colHidden[0],
cColG = self.theTheme.colComm[1], cColG = self.theTheme.colHidden[1],
cColB = self.theTheme.colComm[2], cColB = self.theTheme.colHidden[2],
eColR = self.theTheme.colEmph[0], eColR = self.theTheme.colEmph[0],
eColG = self.theTheme.colEmph[1], eColG = self.theTheme.colEmph[1],
eColB = self.theTheme.colEmph[2], eColB = self.theTheme.colEmph[2],
nw/gui/theme.py
+2 -2
View File
@@ -103,7 +103,7 @@ class GuiTheme:
self.colDialN = [0, 0, 0] self.colDialN = [0, 0, 0]
self.colDialD = [0, 0, 0] self.colDialD = [0, 0, 0]
self.colDialS = [0, 0, 0] self.colDialS = [0, 0, 0]
self.colComm = [0, 0, 0] self.colHidden = [0, 0, 0]
self.colKey = [0, 0, 0] self.colKey = [0, 0, 0]
self.colVal = [0, 0, 0] self.colVal = [0, 0, 0]
self.colSpell = [0, 0, 0] self.colSpell = [0, 0, 0]
@@ -356,7 +356,7 @@ class GuiTheme:
self.colDialN = self._loadColour(confParser, cnfSec, "straightquotes") self.colDialN = self._loadColour(confParser, cnfSec, "straightquotes")
self.colDialD = self._loadColour(confParser, cnfSec, "doublequotes") self.colDialD = self._loadColour(confParser, cnfSec, "doublequotes")
self.colDialS = self._loadColour(confParser, cnfSec, "singlequotes") self.colDialS = self._loadColour(confParser, cnfSec, "singlequotes")
self.colComm = self._loadColour(confParser, cnfSec, "hidden") self.colHidden = self._loadColour(confParser, cnfSec, "hidden")
self.colKey = self._loadColour(confParser, cnfSec, "keyword") self.colKey = self._loadColour(confParser, cnfSec, "keyword")
self.colVal = self._loadColour(confParser, cnfSec, "value") self.colVal = self._loadColour(confParser, cnfSec, "value")
self.colSpell = self._loadColour(confParser, cnfSec, "spellcheckline") self.colSpell = self._loadColour(confParser, cnfSec, "spellcheckline")
tests/test_gui.py
+1 -1
View File
@@ -1484,7 +1484,7 @@ def testThemes(qtbot, yesToAll, nwMinimal, nwTemp):
assert nwGUI.theTheme.colDialN == [242, 119, 122] assert nwGUI.theTheme.colDialN == [242, 119, 122]
assert nwGUI.theTheme.colDialD == [153, 204, 153] assert nwGUI.theTheme.colDialD == [153, 204, 153]
assert nwGUI.theTheme.colDialS == [255, 204, 102] assert nwGUI.theTheme.colDialS == [255, 204, 102]
assert nwGUI.theTheme.colComm == [153, 153, 153] assert nwGUI.theTheme.colHidden == [153, 153, 153]
assert nwGUI.theTheme.colKey == [242, 119, 122] assert nwGUI.theTheme.colKey == [242, 119, 122]
assert nwGUI.theTheme.colVal == [204, 153, 204] assert nwGUI.theTheme.colVal == [204, 153, 204]
assert nwGUI.theTheme.colSpell == [242, 119, 122] assert nwGUI.theTheme.colSpell == [242, 119, 122]