diff --git a/nw/assets/icons/fallback/reference-dark.svg b/nw/assets/icons/fallback/reference-dark.svg index e57b19b0..4d98eb91 100644 --- a/nw/assets/icons/fallback/reference-dark.svg +++ b/nw/assets/icons/fallback/reference-dark.svg @@ -5,13 +5,13 @@ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" - id="svg2608" + id="svg1321" viewBox="0 0 24 24" height="24" width="24" version="1.2"> + id="metadata1327"> @@ -23,9 +23,9 @@ + id="defs1325" /> + style="stroke-width:1.25;fill:#aeaeae;fill-opacity:1" + id="path1319" + d="M 12,2 C 6.48625,2 2,6.48625 2,12 c 0,5.51375 4.48625,10 10,10 2.02,0 3.965,-0.59875 5.62375,-1.73 0.57,-0.39 0.7175,-1.1675 0.32875,-1.7375 -0.38875,-0.57125 -1.165,-0.715 -1.7375,-0.32875 C 14.9725,19.0525 13.515,19.5 12,19.5 7.86375,19.5 4.5,16.13625 4.5,12 4.5,7.86375 7.86375,4.5 12,4.5 c 4.13625,0 7.5,3.36375 7.5,7.5 v 0.625 c 0,0.69 -0.56,1.25 -1.25,1.25 -0.69,0 -1.25,-0.56 -1.25,-1.25 v -3.75 c 0,-0.69125 -0.55875,-1.25 -1.25,-1.25 -0.55125,0 -1.00625,0.3625 -1.1725,0.86 C 13.8525,7.95125 12.96625,7.625 12,7.625 9.5875,7.625 7.625,9.5875 7.625,12 c 0,2.4125 1.9625,4.375 4.375,4.375 1.30625,0 2.46875,-0.5875 3.27,-1.49875 0.685,0.90375 1.76,1.49875 2.98,1.49875 2.0675,0 3.75,-1.6825 3.75,-3.75 V 12 C 22,6.48625 17.51375,2 12,2 Z m 0,11.875 c -1.03375,0 -1.875,-0.84125 -1.875,-1.875 0,-1.03375 0.84125,-1.875 1.875,-1.875 1.03375,0 1.875,0.84125 1.875,1.875 0,1.03375 -0.84125,1.875 -1.875,1.875 z" /> diff --git a/nw/assets/icons/fallback/reference.svg b/nw/assets/icons/fallback/reference.svg index 09202533..b39357c9 100644 --- a/nw/assets/icons/fallback/reference.svg +++ b/nw/assets/icons/fallback/reference.svg @@ -5,13 +5,13 @@ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" - version="1.2" - width="24" - height="24" + id="svg1321" viewBox="0 0 24 24" - id="svg2608"> + height="24" + width="24" + version="1.2"> + id="metadata1327"> @@ -23,9 +23,9 @@ + id="defs1325" /> + style="stroke-width:1.25;fill:#000000;fill-opacity:0.78039217" + id="path1319" + d="M 12,2 C 6.48625,2 2,6.48625 2,12 c 0,5.51375 4.48625,10 10,10 2.02,0 3.965,-0.59875 5.62375,-1.73 0.57,-0.39 0.7175,-1.1675 0.32875,-1.7375 -0.38875,-0.57125 -1.165,-0.715 -1.7375,-0.32875 C 14.9725,19.0525 13.515,19.5 12,19.5 7.86375,19.5 4.5,16.13625 4.5,12 4.5,7.86375 7.86375,4.5 12,4.5 c 4.13625,0 7.5,3.36375 7.5,7.5 v 0.625 c 0,0.69 -0.56,1.25 -1.25,1.25 -0.69,0 -1.25,-0.56 -1.25,-1.25 v -3.75 c 0,-0.69125 -0.55875,-1.25 -1.25,-1.25 -0.55125,0 -1.00625,0.3625 -1.1725,0.86 C 13.8525,7.95125 12.96625,7.625 12,7.625 9.5875,7.625 7.625,9.5875 7.625,12 c 0,2.4125 1.9625,4.375 4.375,4.375 1.30625,0 2.46875,-0.5875 3.27,-1.49875 0.685,0.90375 1.76,1.49875 2.98,1.49875 2.0675,0 3.75,-1.6825 3.75,-3.75 V 12 C 22,6.48625 17.51375,2 12,2 Z m 0,11.875 c -1.03375,0 -1.875,-0.84125 -1.875,-1.875 0,-1.03375 0.84125,-1.875 1.875,-1.875 1.03375,0 1.875,0.84125 1.875,1.875 0,1.03375 -0.84125,1.875 -1.875,1.875 z" /> diff --git a/nw/assets/icons/typicons_colour_dark/at.svg b/nw/assets/icons/typicons_colour_dark/at.svg new file mode 100644 index 00000000..60bd3acc --- /dev/null +++ b/nw/assets/icons/typicons_colour_dark/at.svg @@ -0,0 +1,31 @@ + + + + + + image/svg+xml + + + + + + + + diff --git a/nw/assets/icons/typicons_colour_dark/icons.conf b/nw/assets/icons/typicons_colour_dark/icons.conf index 3f8b547f..33aeef93 100644 --- a/nw/assets/icons/typicons_colour_dark/icons.conf +++ b/nw/assets/icons/typicons_colour_dark/icons.conf @@ -49,6 +49,6 @@ edit = pencil.svg check = tick.svg cross = times.svg hash = hash.svg -reference = bookmark.svg +reference = at.svg sticky-on = pin.svg sticky-off = pin-outline.svg diff --git a/nw/assets/icons/typicons_colour_light/at.svg b/nw/assets/icons/typicons_colour_light/at.svg new file mode 100644 index 00000000..7f34cade --- /dev/null +++ b/nw/assets/icons/typicons_colour_light/at.svg @@ -0,0 +1,31 @@ + + + + + + image/svg+xml + + + + + + + + diff --git a/nw/assets/icons/typicons_colour_light/icons.conf b/nw/assets/icons/typicons_colour_light/icons.conf index b080af1d..0ba6dd6b 100644 --- a/nw/assets/icons/typicons_colour_light/icons.conf +++ b/nw/assets/icons/typicons_colour_light/icons.conf @@ -49,6 +49,6 @@ edit = pencil.svg check = tick.svg cross = times.svg hash = hash.svg -reference = bookmark.svg +reference = at.svg sticky-on = pin.svg sticky-off = pin-outline.svg diff --git a/nw/assets/icons/typicons_grey_dark/at.svg b/nw/assets/icons/typicons_grey_dark/at.svg new file mode 100644 index 00000000..4d98eb91 --- /dev/null +++ b/nw/assets/icons/typicons_grey_dark/at.svg @@ -0,0 +1,31 @@ + + + + + + image/svg+xml + + + + + + + + diff --git a/nw/assets/icons/typicons_grey_dark/icons.conf b/nw/assets/icons/typicons_grey_dark/icons.conf index 0a68c931..301c74ac 100644 --- a/nw/assets/icons/typicons_grey_dark/icons.conf +++ b/nw/assets/icons/typicons_grey_dark/icons.conf @@ -49,6 +49,6 @@ edit = pencil.svg check = tick.svg cross = times.svg hash = hash.svg -reference = bookmark.svg +reference = at.svg sticky-on = pin.svg sticky-off = pin-outline.svg diff --git a/nw/assets/icons/typicons_grey_light/at.svg b/nw/assets/icons/typicons_grey_light/at.svg new file mode 100644 index 00000000..b39357c9 --- /dev/null +++ b/nw/assets/icons/typicons_grey_light/at.svg @@ -0,0 +1,31 @@ + + + + + + image/svg+xml + + + + + + + + diff --git a/nw/assets/icons/typicons_grey_light/icons.conf b/nw/assets/icons/typicons_grey_light/icons.conf index 2c019496..6e98346a 100644 --- a/nw/assets/icons/typicons_grey_light/icons.conf +++ b/nw/assets/icons/typicons_grey_light/icons.conf @@ -49,6 +49,6 @@ edit = pencil.svg check = tick.svg cross = times.svg hash = hash.svg -reference = bookmark.svg +reference = at.svg sticky-on = pin.svg sticky-off = pin-outline.svg diff --git a/nw/gui/docviewer.py b/nw/gui/docviewer.py index 74b20fc7..e227487c 100644 --- a/nw/gui/docviewer.py +++ b/nw/gui/docviewer.py @@ -36,8 +36,7 @@ from PyQt5.QtGui import ( QTextOption, QFont, QPalette, QColor, QTextCursor, QIcon ) from PyQt5.QtWidgets import ( - QTextBrowser, QWidget, QScrollArea, QLabel, QHBoxLayout, QFrame, - QToolButton + QTextBrowser, QWidget, QScrollArea, QLabel, QHBoxLayout, QToolButton ) from nw.core import ToHtml @@ -436,8 +435,6 @@ class GuiDocViewHeader(QWidget): self.theTitle.setAutoFillBackground(True) self.theTitle.setAlignment(Qt.AlignHCenter | Qt.AlignTop) self.theTitle.setFixedHeight(fPx) - self.theTitle.setFrameShape(QFrame.NoFrame) - self.theTitle.setLineWidth(0) self.theTitle.setPalette(self.thePalette) lblFont = self.theTitle.font() @@ -571,7 +568,8 @@ class GuiDocViewFooter(QWidget): self.thePalette.setColor(QPalette.Text, QColor(*self.theTheme.colText)) fPx = int(0.9*self.theTheme.fontPixelSize) - hSp = self.mainConf.pxInt(6) + bSp = self.mainConf.pxInt(2) + hSp = self.mainConf.pxInt(8) # Main Widget Settings self.setContentsMargins(0, 0, 0, 0) @@ -635,9 +633,10 @@ class GuiDocViewFooter(QWidget): # Assemble Layout self.outerBox = QHBoxLayout() - self.outerBox.setSpacing(hSp) + self.outerBox.setSpacing(bSp) self.outerBox.addWidget(self.showHide, 0) self.outerBox.addWidget(self.lblRefs, 0) + self.outerBox.addSpacing(hSp) self.outerBox.addWidget(self.stickyRefs, 0) self.outerBox.addWidget(self.lblSticky, 0) self.outerBox.addStretch(1)