From 896d7f12573ebd71fca34a7ab2f213fb07bd201c Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Fri, 5 Jun 2020 19:38:03 +0200 Subject: [PATCH 1/5] No focus shift on open document from tree --- nw/guimain.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/nw/guimain.py b/nw/guimain.py index ea6c050e..e50b23c9 100644 --- a/nw/guimain.py +++ b/nw/guimain.py @@ -193,9 +193,11 @@ class GuiMain(QMainWindow): # Shortcuts and Actions self._connectMenuActions() + keyReturn = QShortcut(self.treeView) keyReturn.setKey(QKeySequence(Qt.Key_Return)) keyReturn.activated.connect(self._treeKeyPressReturn) + keyEscape = QShortcut(self) keyEscape.setKey(QKeySequence(Qt.Key_Escape)) keyEscape.activated.connect(self._keyPressEscape) @@ -1014,6 +1016,9 @@ class GuiMain(QMainWindow): ## def _treeSingleClick(self): + """Single click on a project tree item just updates the details + panel below the tree. + """ sHandle = self.treeView.getSelectedHandle() if sHandle is not None: self.treeMeta.updateViewBox(sHandle) @@ -1029,7 +1034,7 @@ class GuiMain(QMainWindow): if nwItem is not None: if nwItem.itemType == nwItemType.FILE: logger.verbose("Requested item %s is a file" % tHandle) - self.openDocument(tHandle) + self.openDocument(tHandle, changeFocus=False) else: logger.verbose("Requested item %s is a folder" % tHandle) return From 7723f24c124dc6ae7d83581cb48ea2433361f7a3 Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Sat, 6 Jun 2020 10:36:50 +0200 Subject: [PATCH 2/5] The correct fix for tree widget font sizes, issue #273 --- nw/assets/themes/gui/default/style.qss | 4 ---- nw/assets/themes/gui/default_dark/styles.qss | 4 ---- nw/gui/outline.py | 5 ----- nw/gui/projload.py | 6 ------ nw/gui/projsettings.py | 8 -------- nw/gui/projtree.py | 12 ------------ 6 files changed, 39 deletions(-) diff --git a/nw/assets/themes/gui/default/style.qss b/nw/assets/themes/gui/default/style.qss index 90ef623f..14e81208 100644 --- a/nw/assets/themes/gui/default/style.qss +++ b/nw/assets/themes/gui/default/style.qss @@ -1,7 +1,3 @@ /** * Default Theme: Light */ - -QTreeView, QHeaderView { - font-size: 13px; -} diff --git a/nw/assets/themes/gui/default_dark/styles.qss b/nw/assets/themes/gui/default_dark/styles.qss index 6c847eb6..4b647f09 100644 --- a/nw/assets/themes/gui/default_dark/styles.qss +++ b/nw/assets/themes/gui/default_dark/styles.qss @@ -1,7 +1,3 @@ /** * Default Theme: Dark */ - -QTreeView, QHeaderView { - font-size: 13px; -} diff --git a/nw/gui/outline.py b/nw/gui/outline.py index 12c26383..ada3c0a8 100644 --- a/nw/gui/outline.py +++ b/nw/gui/outline.py @@ -339,8 +339,6 @@ class GuiProjectOutline(QTreeWidget): headItem.setTextAlignment(self.colIndex[nwOutline.CCOUNT], Qt.AlignRight) headItem.setTextAlignment(self.colIndex[nwOutline.WCOUNT], Qt.AlignRight) headItem.setTextAlignment(self.colIndex[nwOutline.PCOUNT], Qt.AlignRight) - for hItem in self.treeOrder: - headItem.setFont(self.colIndex[hItem], self.theTheme.guiFont) currTitle = None currChapter = None @@ -433,9 +431,6 @@ class GuiProjectOutline(QTreeWidget): newItem.setText(self.colIndex[nwOutline.ENTITY], ", ".join(theRefs[nwKeyWords.ENTITY_KEY])) newItem.setText(self.colIndex[nwOutline.CUSTOM], ", ".join(theRefs[nwKeyWords.CUSTOM_KEY])) - for i in self.treeOrder: - newItem.setFont(self.colIndex[i], self.theTheme.guiFont) - return newItem # END Class GuiProjectOutline diff --git a/nw/gui/projload.py b/nw/gui/projload.py index 63f0be9f..282a69f7 100644 --- a/nw/gui/projload.py +++ b/nw/gui/projload.py @@ -92,9 +92,6 @@ class GuiProjectLoad(QDialog): treeHead = self.listBox.headerItem() treeHead.setTextAlignment(1, Qt.AlignRight) treeHead.setTextAlignment(2, Qt.AlignRight) - treeHead.setFont(0, self.theTheme.guiFont) - treeHead.setFont(1, self.theTheme.guiFont) - treeHead.setFont(2, self.theTheme.guiFont) self.lblRecent = QLabel("Recently Opened Projects") self.lblPath = QLabel("Path") @@ -260,9 +257,6 @@ class GuiProjectLoad(QDialog): newItem.setTextAlignment(0, Qt.AlignLeft | Qt.AlignVCenter) newItem.setTextAlignment(1, Qt.AlignRight | Qt.AlignVCenter) newItem.setTextAlignment(2, Qt.AlignRight | Qt.AlignVCenter) - newItem.setFont(0, self.theTheme.guiFont) - newItem.setFont(1, self.theTheme.guiFont) - newItem.setFont(2, self.theTheme.guiFont) self.listBox.addTopLevelItem(newItem) if not hasSelection: newItem.setSelected(True) diff --git a/nw/gui/projsettings.py b/nw/gui/projsettings.py index a1c28ca4..3722d41c 100644 --- a/nw/gui/projsettings.py +++ b/nw/gui/projsettings.py @@ -450,14 +450,8 @@ class GuiProjectEditReplace(QWidget): self.listBox.itemSelectionChanged.connect(self._selectedItem) self.listBox.setIndentation(0) - treeHead = self.listBox.headerItem() - treeHead.setFont(0, self.theTheme.guiFont) - treeHead.setFont(1, self.theTheme.guiFont) - for aKey, aVal in self.theProject.autoReplace.items(): newItem = QTreeWidgetItem(["<%s>" % aKey, aVal]) - newItem.setFont(0, self.theTheme.guiFont) - newItem.setFont(1, self.theTheme.guiFont) self.listBox.addTopLevelItem(newItem) self.listBox.sortByColumn(0, Qt.AscendingOrder) @@ -548,8 +542,6 @@ class GuiProjectEditReplace(QWidget): saveKey = "" % (self.listBox.topLevelItemCount() + 1) newVal = "" newItem = QTreeWidgetItem([saveKey, newVal]) - newItem.setFont(0, self.theTheme.guiFont) - newItem.setFont(1, self.theTheme.guiFont) self.listBox.addTopLevelItem(newItem) return True diff --git a/nw/gui/projtree.py b/nw/gui/projtree.py index 72246c3a..312d3a75 100644 --- a/nw/gui/projtree.py +++ b/nw/gui/projtree.py @@ -79,14 +79,6 @@ class GuiProjectTree(QTreeWidget): treeHeadItem.setToolTip(self.C_EXPORT, "Include in build") treeHeadItem.setToolTip(self.C_FLAGS, "Status, class, and layout flags") - # Force the font to fix font sizing issues on some platforms - # like Ubuntu. This must also be set when the rows are added. - self.setFont(self.theTheme.guiFont) - treeHeadItem.setFont(self.C_NAME, self.theTheme.guiFont) - treeHeadItem.setFont(self.C_COUNT,self.theTheme.guiFont) - treeHeadItem.setFont(self.C_EXPORT, self.theTheme.guiFont) - treeHeadItem.setFont(self.C_FLAGS, self.theTheme.guiFont) - # Let the last column stretch, and set the minimum size to the # size of the icon as the default Qt font metrics approach fails # for some fonts like the Ubuntu font. @@ -599,10 +591,6 @@ class GuiProjectTree(QTreeWidget): newItem.setTextAlignment(self.C_EXPORT, Qt.AlignLeft | Qt.AlignVCenter) newItem.setTextAlignment(self.C_FLAGS, Qt.AlignLeft | Qt.AlignVCenter) - newItem.setFont(self.C_NAME, self.theTheme.guiFont) - newItem.setFont(self.C_COUNT, self.theTheme.guiFont) - newItem.setFont(self.C_FLAGS, self.theTheme.guiFont) - newItem.setData(self.C_NAME, Qt.UserRole, tHandle) self.theMap[tHandle] = newItem From b176f21eb7933d0f75e11fc6135e29142701988e Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Sat, 6 Jun 2020 10:38:05 +0200 Subject: [PATCH 3/5] Some cleanup of themes folder and the source --- nw/assets/themes/gui/default/style.qss | 3 - nw/assets/themes/gui/default_dark/README.md | 8 --- .../themes/gui/default_dark/icons/add.png | Bin 225 -> 0 bytes .../themes/gui/default_dark/icons/close.png | Bin 296 -> 0 bytes .../gui/default_dark/icons/document.png | Bin 256 -> 0 bytes .../themes/gui/default_dark/icons/folder.png | Bin 280 -> 0 bytes .../themes/gui/default_dark/icons/globe.svg | 56 ---------------- .../themes/gui/default_dark/icons/orphan.png | Bin 552 -> 0 bytes .../themes/gui/default_dark/icons/remove.png | Bin 204 -> 0 bytes .../themes/gui/default_dark/icons/replace.png | Bin 338 -> 0 bytes .../themes/gui/default_dark/icons/root.png | Bin 375 -> 0 bytes .../themes/gui/default_dark/icons/save.png | Bin 295 -> 0 bytes .../themes/gui/default_dark/icons/search.png | Bin 563 -> 0 bytes .../themes/gui/default_dark/icons/time.svg | 61 ------------------ .../themes/gui/default_dark/icons/trash.png | Bin 487 -> 0 bytes nw/assets/themes/gui/default_dark/styles.qss | 2 + 16 files changed, 2 insertions(+), 128 deletions(-) delete mode 100644 nw/assets/themes/gui/default/style.qss delete mode 100644 nw/assets/themes/gui/default_dark/README.md delete mode 100644 nw/assets/themes/gui/default_dark/icons/add.png delete mode 100644 nw/assets/themes/gui/default_dark/icons/close.png delete mode 100644 nw/assets/themes/gui/default_dark/icons/document.png delete mode 100644 nw/assets/themes/gui/default_dark/icons/folder.png delete mode 100644 nw/assets/themes/gui/default_dark/icons/globe.svg delete mode 100644 nw/assets/themes/gui/default_dark/icons/orphan.png delete mode 100644 nw/assets/themes/gui/default_dark/icons/remove.png delete mode 100644 nw/assets/themes/gui/default_dark/icons/replace.png delete mode 100644 nw/assets/themes/gui/default_dark/icons/root.png delete mode 100644 nw/assets/themes/gui/default_dark/icons/save.png delete mode 100644 nw/assets/themes/gui/default_dark/icons/search.png delete mode 100644 nw/assets/themes/gui/default_dark/icons/time.svg delete mode 100644 nw/assets/themes/gui/default_dark/icons/trash.png diff --git a/nw/assets/themes/gui/default/style.qss b/nw/assets/themes/gui/default/style.qss deleted file mode 100644 index 14e81208..00000000 --- a/nw/assets/themes/gui/default/style.qss +++ /dev/null @@ -1,3 +0,0 @@ -/** - * Default Theme: Light - */ diff --git a/nw/assets/themes/gui/default_dark/README.md b/nw/assets/themes/gui/default_dark/README.md deleted file mode 100644 index 36d11bcf..00000000 --- a/nw/assets/themes/gui/default_dark/README.md +++ /dev/null @@ -1,8 +0,0 @@ -# Default Dark Theme - -## Icons - -The following icons are from the typicons.font package on [GitHub](https://github.com/stephenhutchings/typicons.font): - -* globe.svg -* time.svg diff --git a/nw/assets/themes/gui/default_dark/icons/add.png b/nw/assets/themes/gui/default_dark/icons/add.png deleted file mode 100644 index 486320716e09c6fe506a62c7dd48c0c561ac2f26..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 225 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzwj^(N7X~vBw5a>_2q?l?;1OBO zz@VoL!i*J5?aP3I>?NMQuI!Jw*n~t?1I`@W0~C@hag8W(&d<$F%`0JWE=o--Nlj5G z&n(GMaQE~L2yf&Q2P*RPba4!cIGmgy!Ky54Fllw*^490}M*qFeif=lTB=tf-qV&KD zW;a=bR}5}Wsxn&{t2!;ESex~Ed#<%D=7UJiVRk#H!N6c%%A@z)Q2H#;PzFy|KbLh* G2~7ZZq(315 diff --git a/nw/assets/themes/gui/default_dark/icons/close.png b/nw/assets/themes/gui/default_dark/icons/close.png deleted file mode 100644 index e3ff6ae0be7756493d113a6587b72ba5f3463a53..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 296 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzwj^(N7X~vBw5a>_2q?l?;1OBO zz@VoL!i*J5?aP3I>?NMQuI!Jw*o356n$-T}0EHw=Tq8=H^K)}k^GX<;i&7IyQd1Pl zGfOfQ+&z5*!W;R-fr=)0x;TbJ9DW<($ag@2LwMfi=|589H@)BSdQ-~eFrLUI=8Ly! zY+0%zwA=Zf*}16SwY6K+I5vLWx2YvAz4Te==0^pL%8Vg@irL&+&d*ayKg$}?8Ce+2 z_~v@lTxD%F>5XeEb~Bvi`B=gz91+#@alTj!U*Za0=VlF)E=i|neO2E?&ob;_=svJX i!Kq{Bd=HgxM_HddOp$5d>{beN8-u5-pUXO@geCyBC}y_+ diff --git a/nw/assets/themes/gui/default_dark/icons/document.png b/nw/assets/themes/gui/default_dark/icons/document.png deleted file mode 100644 index 0d619034c67b5fab05468ec9cc90835ad5f313d7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 256 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzwj^(N7X~vBw5a>_2q?l?;1OBO zz@VoL!i*J5?aP3I>?NMQuI!Jw*aXc@=66V%1BE0@Tq8=H^K)}k^GX<;i&7IyQd1Pl zGfOfQ+&z5*!W;R-fr>IbT^vIq4ksr_url*V6ngHd{r%0}R98q$>{yogWry|y4b}~< z6PWz{{kwE-?5q9#z>j&cqJb2XN;`w1Jnzm)6Iw-_Pk8b#-kFfn#-M4LY9h|_*Tf<7 qq{S?@wtP>IoLdra#e13<*%{vG2HFeAnVtgL$>8bg=d#Wzp$PzNc1g7W diff --git a/nw/assets/themes/gui/default_dark/icons/folder.png b/nw/assets/themes/gui/default_dark/icons/folder.png deleted file mode 100644 index e7e36709ff4cb460ebb78466048d2ec2416c1bbd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 280 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzwj^(N7X~vBw5a>_2q?l?;1OBO zz@VoL!i*J5?aP3I>?NMQuI!Jw*aQuQb8c|o0t!i%xJHyX=jZ08=9Mrw7o{eaq^2m8 zXO?6rxO@5rgg5eu0~IxRx;TbJ9DaN4Aa8>L4{Jb{RabI}1pCJq8E-<*YYB1I?LYQU zx$(=^m{~z8pT2v%yioh`QR+-qJ`3$WC!Y1cnZBQV?SE`v({9dFg@4%IS>_9T(dTer zc)@UV`iY!|P{&iR{xCMgHfb)-RyZ(g;;9$E(i%z|XPYm2$I7zdnyb?Nb6iK$WLzGk Sa_0iw!r - - - - - image/svg+xml - - - - - - - - - diff --git a/nw/assets/themes/gui/default_dark/icons/orphan.png b/nw/assets/themes/gui/default_dark/icons/orphan.png deleted file mode 100644 index 1d2c1b26e59971a8d63ef24c6bd7016044f7b6e1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 552 zcmV+@0@wYCP)e zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00EFmL_t(o!|jzlO9Md=hTk_a zpb^x&O*$LJ#!>{e5J4>c16oAz<9DRdN*fCiTR{XBEK~#w|AVarLoEJsB2d>y*?&e`swi!BKEkv#G|Z#rs$2KNB+A~Hd806@QpOaV9v zTl<(9jct^Qhp7nkI5bN5} zVKZ9mIg;l9dg{dwl~Os9e#Zs0){`W!0rb{G`>yM*lCZ)@=htW*3PznTR=p{1Isg#&tY2`N`RyrkSTv>ki#CsWZ=s6e?uVV qcQM9XH2(db=k5II8Hfd9VqO73Xp}t?dQkfS0000_2q?l?;1OBO zz@VoL!i*J5?aP3I>?NMQuI!Jw*o4Gb%sZMCfkKict`Q~9`MJ5Nc_j?aMX8A;sVNHO znI#zt?w-B@;f;LaKt(2=E{-7)hu>b_2q?l?;1OBO zz@VoL!i*J5?aP3I>?NMQuI!Jw*o0JsBejF41BE0@Tq8=H^K)}k^GX<;i&7IyQd1Pl zGfOfQ+&z5*!W;R-fr@r{x;TbJ98OMBwl9zoH|Rtr=*m@Z2n^F zrb2}#*_(nsUpD=DJk|aSCu7XC&#yOJu;ZPOWf>~#(DyW?m|^F%;G>LFBK$ToYiymP z#2#?CXp^ji?&*_745qs3HyN*NoAYE*#ZoTzP+fIRmUZg{8h_jUImf>$!mliKOHgaG z)-+=S1A`3$EBRF4ZB@Q^VUJ?-S;qhEsnvq28u$0rdW*+%adR6d`7)oLrYoI$sGn&U aGlS~qiX49Rl_2q?l?;1OBO zz@VoL!i*J5?aP3I>?NMQuI!Jw*o4fOZ8D4%fI^Zbt`Q~9`MJ5Nc_j?aMX8A;sVNHO znI#zt?w-B@;f;LaKt=aGT^vIq4!@nYm$%tKpjDoe`NEC{t5B{zY#wJO-zr_=!IOM) zO`*ujpxudVE~^w$6dIa+xb`2jSHE9dW#`Sdhc7H4&t@}E7l&^0-FsW}O84@7=t$nu zQ|da&K~VAepXaB7vSV5fcy|aMIl1w%a=5?y_X8XW=ZaieT(6uzd-2X@wi(_ZcyqM2 ziK*Oi`mLGL=e^OFZ%0^0aYjb|xyt===dSNcU`WU0`(CM?NxTQPu3}Kwu{@JqpS_B?`i}1!oz95UK(8`* My85}Sb4q9e0CPlz9smFU diff --git a/nw/assets/themes/gui/default_dark/icons/save.png b/nw/assets/themes/gui/default_dark/icons/save.png deleted file mode 100644 index 6b3c44965ae65c5be4c1d7a79ef67d74252fdcca..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 295 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzwj^(N7X~vBw5a>_2q?l?;1OBO zz@VoL!i*J5?aP3I>?NMQuI!Jw*n}ixcBPyD1PV!(xJHyX=jZ08=9Mrw7o{eaq^2m8 zXO?6rxO@5rgg5eu0~Pgqx;TbJ98OM>*#g3 z<%t-NqWgqfT2dd>B$aor6u&F@B%<#sqm{1B|IC?h*IlVelnHstz`e_1@-?MdQ4&W4 gOm0a^v1%|dFbbH+GVNaY1L!mcPgg&ebxsLQ0ET&8s{jB1 diff --git a/nw/assets/themes/gui/default_dark/icons/search.png b/nw/assets/themes/gui/default_dark/icons/search.png deleted file mode 100644 index 8cdb5347bb30690f715d65756bf77f5e72c34720..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 563 zcmV-30?hr1P)e zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00EmxL_t(o!|j$qYQjJihQAms z8j*k-5vABOcz|5M)tsQ+w`UN~Q1|u(S$P2u;2A1X5jR2*V`#MPCR3&mV=`@Qq5ivs z`R9G}X6C(ti~hTev;$q&y#;ze7idMl7r+!43n89z0f++kfzFAcGhmPv#5fWB5x55k zObf4Mvo$Nc7D@nIy@gZ{JM7S-eDI}hD1>y@Rc^8_*@+X?LytzV%nV^9qGq2e6PuMpue=p#v}l zs2+CO0E&02126`#Lr)t(@s4#X;WN-lQ-Tvp@=OSEqk9Mk0F7WtZSSWJUfcU>KN#p9 zLZTWz1ZeN()KhFnJ@nK*FmxPeXX2tiqYqz1!B{P|OQ`?=002ovPDHLkV1f^b B;MV{E diff --git a/nw/assets/themes/gui/default_dark/icons/time.svg b/nw/assets/themes/gui/default_dark/icons/time.svg deleted file mode 100644 index bdb740c1..00000000 --- a/nw/assets/themes/gui/default_dark/icons/time.svg +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - diff --git a/nw/assets/themes/gui/default_dark/icons/trash.png b/nw/assets/themes/gui/default_dark/icons/trash.png deleted file mode 100644 index 96afbba0c30af2eadde9cf57860efb5d9fb1e1fc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 487 zcmVe zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00B=)L_t(o!|hiwZiFxpTu$zJ zfPWD28j2K1+z${f6-6rA$Ug{D3JSjl-4FHw^hjJ0894^~Y_ljQT~@LL7`(ePJ8J{* z>Xx`Bg%Ascld7tcpa7KPzVAu0EX&dw$mW5Ra_PG66u6tFfjrND`DC^i5s?%D&iU>f zi~W$wE`P0pO#p~^nzOyNFHhMAq?C(_ma+y+1$ZHFCM8Z4aL%31+uL=$p2itI-@j=C za9Ml1!Zgn7eVQ?-hXT@!!N=RzaTz{>U1hAsG|rG_Ke^OH5kzH_3QV|_bJE?=rUV=J zdggoeu%`g;8bHL29L>UuEkY*+wjQ8!t|MdPpHu}Z^Li+th2v6WA+YOEo7}scyHv%F zcCuLRz0QPGdxA{?L4Dw?J>g*huXiGH!H$UQprX!81&RiJF>~QqsuG` Date: Sat, 6 Jun 2020 11:52:02 +0200 Subject: [PATCH 4/5] Replaced the time icon with a calendar icon --- .../icons/typicons_colour_dark/calendar.svg | 55 ++++++++++++++++ .../icons/typicons_colour_dark/icons.conf | 2 +- nw/assets/icons/typicons_colour_dark/time.svg | 62 ------------------- .../icons/typicons_colour_light/calendar.svg | 55 ++++++++++++++++ .../icons/typicons_colour_light/icons.conf | 2 +- .../icons/typicons_colour_light/time.svg | 62 ------------------- .../icons/typicons_grey_dark/calendar.svg | 55 ++++++++++++++++ nw/assets/icons/typicons_grey_dark/icons.conf | 2 +- nw/assets/icons/typicons_grey_dark/time.svg | 56 ----------------- .../icons/typicons_grey_light/calendar.svg | 55 ++++++++++++++++ .../icons/typicons_grey_light/icons.conf | 2 +- nw/assets/icons/typicons_grey_light/time.svg | 55 ---------------- 12 files changed, 224 insertions(+), 239 deletions(-) create mode 100644 nw/assets/icons/typicons_colour_dark/calendar.svg delete mode 100644 nw/assets/icons/typicons_colour_dark/time.svg create mode 100644 nw/assets/icons/typicons_colour_light/calendar.svg delete mode 100644 nw/assets/icons/typicons_colour_light/time.svg create mode 100644 nw/assets/icons/typicons_grey_dark/calendar.svg delete mode 100644 nw/assets/icons/typicons_grey_dark/time.svg create mode 100644 nw/assets/icons/typicons_grey_light/calendar.svg delete mode 100644 nw/assets/icons/typicons_grey_light/time.svg diff --git a/nw/assets/icons/typicons_colour_dark/calendar.svg b/nw/assets/icons/typicons_colour_dark/calendar.svg new file mode 100644 index 00000000..c55dbb89 --- /dev/null +++ b/nw/assets/icons/typicons_colour_dark/calendar.svg @@ -0,0 +1,55 @@ + + + + + + image/svg+xml + + + + + + + + + diff --git a/nw/assets/icons/typicons_colour_dark/icons.conf b/nw/assets/icons/typicons_colour_dark/icons.conf index 76290410..b0e75498 100644 --- a/nw/assets/icons/typicons_colour_dark/icons.conf +++ b/nw/assets/icons/typicons_colour_dark/icons.conf @@ -21,7 +21,7 @@ cls_novel = book.svg cls_plot = puzzle.svg cls_character = user.svg cls_world = location.svg -cls_timeline = time.svg +cls_timeline = calendar.svg cls_object = key.svg cls_entity = flag.svg cls_custom = star.svg diff --git a/nw/assets/icons/typicons_colour_dark/time.svg b/nw/assets/icons/typicons_colour_dark/time.svg deleted file mode 100644 index ac0587cb..00000000 --- a/nw/assets/icons/typicons_colour_dark/time.svg +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - diff --git a/nw/assets/icons/typicons_colour_light/calendar.svg b/nw/assets/icons/typicons_colour_light/calendar.svg new file mode 100644 index 00000000..bdaf6b28 --- /dev/null +++ b/nw/assets/icons/typicons_colour_light/calendar.svg @@ -0,0 +1,55 @@ + + + + + + image/svg+xml + + + + + + + + + diff --git a/nw/assets/icons/typicons_colour_light/icons.conf b/nw/assets/icons/typicons_colour_light/icons.conf index 08042fc9..70477f64 100644 --- a/nw/assets/icons/typicons_colour_light/icons.conf +++ b/nw/assets/icons/typicons_colour_light/icons.conf @@ -21,7 +21,7 @@ cls_novel = book.svg cls_plot = puzzle.svg cls_character = user.svg cls_world = location.svg -cls_timeline = time.svg +cls_timeline = calendar.svg cls_object = key.svg cls_entity = flag.svg cls_custom = star.svg diff --git a/nw/assets/icons/typicons_colour_light/time.svg b/nw/assets/icons/typicons_colour_light/time.svg deleted file mode 100644 index 0ded9527..00000000 --- a/nw/assets/icons/typicons_colour_light/time.svg +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - diff --git a/nw/assets/icons/typicons_grey_dark/calendar.svg b/nw/assets/icons/typicons_grey_dark/calendar.svg new file mode 100644 index 00000000..3bbfee8c --- /dev/null +++ b/nw/assets/icons/typicons_grey_dark/calendar.svg @@ -0,0 +1,55 @@ + + + + + + image/svg+xml + + + + + + + + + diff --git a/nw/assets/icons/typicons_grey_dark/icons.conf b/nw/assets/icons/typicons_grey_dark/icons.conf index d81f4adf..d06201b1 100644 --- a/nw/assets/icons/typicons_grey_dark/icons.conf +++ b/nw/assets/icons/typicons_grey_dark/icons.conf @@ -21,7 +21,7 @@ cls_novel = book.svg cls_plot = puzzle.svg cls_character = user.svg cls_world = location.svg -cls_timeline = time.svg +cls_timeline = calendar.svg cls_object = key.svg cls_entity = flag.svg cls_custom = star.svg diff --git a/nw/assets/icons/typicons_grey_dark/time.svg b/nw/assets/icons/typicons_grey_dark/time.svg deleted file mode 100644 index 12f47768..00000000 --- a/nw/assets/icons/typicons_grey_dark/time.svg +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/nw/assets/icons/typicons_grey_light/calendar.svg b/nw/assets/icons/typicons_grey_light/calendar.svg new file mode 100644 index 00000000..600a386d --- /dev/null +++ b/nw/assets/icons/typicons_grey_light/calendar.svg @@ -0,0 +1,55 @@ + + + + + + image/svg+xml + + + + + + + + + diff --git a/nw/assets/icons/typicons_grey_light/icons.conf b/nw/assets/icons/typicons_grey_light/icons.conf index 2b26abc8..dd97c4c8 100644 --- a/nw/assets/icons/typicons_grey_light/icons.conf +++ b/nw/assets/icons/typicons_grey_light/icons.conf @@ -21,7 +21,7 @@ cls_novel = book.svg cls_plot = puzzle.svg cls_character = user.svg cls_world = location.svg -cls_timeline = time.svg +cls_timeline = calendar.svg cls_object = key.svg cls_entity = flag.svg cls_custom = star.svg diff --git a/nw/assets/icons/typicons_grey_light/time.svg b/nw/assets/icons/typicons_grey_light/time.svg deleted file mode 100644 index 9e47aa48..00000000 --- a/nw/assets/icons/typicons_grey_light/time.svg +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - From 3e5263338bfe7b77cb631fe0c1118f2c1c779ebf Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Sat, 6 Jun 2020 12:13:23 +0200 Subject: [PATCH 5/5] Added link style colour to the build output --- nw/core/tohtml.py | 1 + nw/gui/build.py | 3 +-- tests/reference/build/1_LoremIpsum.htm | 1 + tests/reference/build/2_LoremIpsum.htm | 1 + tests/reference/build/3_LoremIpsum.htm | 1 + 5 files changed, 5 insertions(+), 2 deletions(-) diff --git a/nw/core/tohtml.py b/nw/core/tohtml.py index c451daaf..282717b3 100644 --- a/nw/core/tohtml.py +++ b/nw/core/tohtml.py @@ -269,6 +269,7 @@ class ToHtml(Tokenizer): theStyles.append(r"h1, h2 {color: rgb(66, 113, 174);}") theStyles.append(r"h3, h4 {color: rgb(50, 50, 50);}") theStyles.append(r"h1, h2, h3, h4 {page-break-after: avoid;}") + theStyles.append(r"a {color: rgb(66, 113, 174);}") theStyles.append(r".title {font-size: 2.5em;}") theStyles.append(r".tags {color: rgb(245, 135, 31); font-weight: bold;}") theStyles.append(r".break {text-align: left;}") diff --git a/nw/gui/build.py b/nw/gui/build.py index f072b6ea..df812c95 100644 --- a/nw/gui/build.py +++ b/nw/gui/build.py @@ -961,8 +961,7 @@ class GuiBuildNovelDocView(QTextBrowser): if not theStyles: theStyles.append(r"h1, h2 {color: rgb(66, 113, 174);}") theStyles.append(r"h3, h4 {color: rgb(50, 50, 50);}") - theStyles.append(r"a {color: rgb(137, 89, 168);}") - theStyles.append(r"mark {background-color: rgb(240, 198, 116);}") + theStyles.append(r"a {color: rgb(66, 113, 174);}") theStyles.append(r".tags {color: rgb(245, 135, 31); font-weight: bold;}") self.qDocument.setDefaultStyleSheet("\n".join(theStyles)) diff --git a/tests/reference/build/1_LoremIpsum.htm b/tests/reference/build/1_LoremIpsum.htm index 4faf5f79..a3e4432f 100644 --- a/tests/reference/build/1_LoremIpsum.htm +++ b/tests/reference/build/1_LoremIpsum.htm @@ -9,6 +9,7 @@ p {text-align: left;} h1, h2 {color: rgb(66, 113, 174);} h3, h4 {color: rgb(50, 50, 50);} h1, h2, h3, h4 {page-break-after: avoid;} +a {color: rgb(66, 113, 174);} .title {font-size: 2.5em;} .tags {color: rgb(245, 135, 31); font-weight: bold;} .break {text-align: left;} diff --git a/tests/reference/build/2_LoremIpsum.htm b/tests/reference/build/2_LoremIpsum.htm index 7ea871c2..3bbbe9a1 100644 --- a/tests/reference/build/2_LoremIpsum.htm +++ b/tests/reference/build/2_LoremIpsum.htm @@ -9,6 +9,7 @@ p {text-align: justify;} h1, h2 {color: rgb(66, 113, 174);} h3, h4 {color: rgb(50, 50, 50);} h1, h2, h3, h4 {page-break-after: avoid;} +a {color: rgb(66, 113, 174);} .title {font-size: 2.5em;} .tags {color: rgb(245, 135, 31); font-weight: bold;} .break {text-align: left;} diff --git a/tests/reference/build/3_LoremIpsum.htm b/tests/reference/build/3_LoremIpsum.htm index a9c2e695..cbd64275 100644 --- a/tests/reference/build/3_LoremIpsum.htm +++ b/tests/reference/build/3_LoremIpsum.htm @@ -9,6 +9,7 @@ p {text-align: justify;} h1, h2 {color: rgb(66, 113, 174);} h3, h4 {color: rgb(50, 50, 50);} h1, h2, h3, h4 {page-break-after: avoid;} +a {color: rgb(66, 113, 174);} .title {font-size: 2.5em;} .tags {color: rgb(245, 135, 31); font-weight: bold;} .break {text-align: left;}