From 9fd14cc14f0e7288a356bd01a5945c5946a6860a Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Tue, 9 Jun 2020 17:31:18 +0200 Subject: [PATCH 1/2] Using toolbar buttons instead on the document bar --- nw/gui/docbars.py | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/nw/gui/docbars.py b/nw/gui/docbars.py index 6720933d..f35556df 100644 --- a/nw/gui/docbars.py +++ b/nw/gui/docbars.py @@ -33,7 +33,7 @@ from PyQt5.QtCore import Qt, QSize from PyQt5.QtGui import QPalette, QColor from PyQt5.QtWidgets import ( qApp, QWidget, QFrame, QGridLayout, QLabel, QLineEdit, QPushButton, - QHBoxLayout + QHBoxLayout, QToolButton ) from nw.constants import nwDocAction, nwUnicode @@ -213,32 +213,40 @@ class GuiDocTitleBar(QWidget): lblFont.setPointSizeF(0.9*self.theTheme.fontPointSize) self.theTitle.setFont(lblFont) + buttonStyle = ( + "QToolButton {{border: none; background: transparent;}} " + "QToolButton:hover {{border: none; background: rgba({0},{1},{2},0.2);}}" + ).format(*self.theTheme.colText) + # Buttons - self.closeButton = QPushButton("") + self.closeButton = QToolButton(self) self.closeButton.setIcon(self.theTheme.getIcon("close")) self.closeButton.setContentsMargins(0, 0, 0, 0) self.closeButton.setIconSize(QSize(fPx, fPx)) self.closeButton.setFixedSize(fPx, fPx) - self.closeButton.setFlat(True) + self.closeButton.setStyleSheet(buttonStyle) + self.closeButton.setToolButtonStyle(Qt.ToolButtonIconOnly) self.closeButton.setVisible(False) self.closeButton.clicked.connect(self._closeDocument) if self.isEditor: - self.minmaxButton = QPushButton("") + self.minmaxButton = QToolButton(self) self.minmaxButton.setIcon(self.theTheme.getIcon("maximise")) self.minmaxButton.setContentsMargins(0, 0, 0, 0) self.minmaxButton.setIconSize(QSize(fPx, fPx)) self.minmaxButton.setFixedSize(fPx, fPx) - self.minmaxButton.setFlat(True) + self.minmaxButton.setStyleSheet(buttonStyle) + self.minmaxButton.setToolButtonStyle(Qt.ToolButtonIconOnly) self.minmaxButton.setVisible(False) self.minmaxButton.clicked.connect(self._minmaxDocument) else: - self.refreshButton = QPushButton("") + self.refreshButton = QToolButton(self) self.refreshButton.setIcon(self.theTheme.getIcon("refresh")) self.refreshButton.setContentsMargins(0, 0, 0, 0) self.refreshButton.setIconSize(QSize(fPx, fPx)) self.refreshButton.setFixedSize(fPx, fPx) - self.refreshButton.setFlat(True) + self.refreshButton.setStyleSheet(buttonStyle) + self.refreshButton.setToolButtonStyle(Qt.ToolButtonIconOnly) self.refreshButton.setVisible(False) self.refreshButton.clicked.connect(self._refreshDocument) From 8bb992bfb8a4bd720e8bdd87090843a50bce3295 Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Tue, 9 Jun 2020 17:31:47 +0200 Subject: [PATCH 2/2] Made the document icon a bit darker for darker themes --- .../icons/typicons_colour_dark/document-text.svg | 16 ++++++++-------- .../icons/typicons_grey_dark/document-text.svg | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/nw/assets/icons/typicons_colour_dark/document-text.svg b/nw/assets/icons/typicons_colour_dark/document-text.svg index 1fb9b11a..d363691e 100644 --- a/nw/assets/icons/typicons_colour_dark/document-text.svg +++ b/nw/assets/icons/typicons_colour_dark/document-text.svg @@ -5,11 +5,11 @@ 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="svg2161" - viewBox="0 0 24 24" - height="24" + version="1.2" width="24" - version="1.2"> + height="24" + viewBox="0 0 24 24" + id="svg2161"> @@ -25,11 +25,11 @@ + style="opacity:0.95;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.71486783;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="display:inline;fill:#595959;fill-opacity:1;stroke-width:1.11111116" /> diff --git a/nw/assets/icons/typicons_grey_dark/document-text.svg b/nw/assets/icons/typicons_grey_dark/document-text.svg index 1fb9b11a..d363691e 100644 --- a/nw/assets/icons/typicons_grey_dark/document-text.svg +++ b/nw/assets/icons/typicons_grey_dark/document-text.svg @@ -5,11 +5,11 @@ 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="svg2161" - viewBox="0 0 24 24" - height="24" + version="1.2" width="24" - version="1.2"> + height="24" + viewBox="0 0 24 24" + id="svg2161"> @@ -25,11 +25,11 @@ + style="opacity:0.95;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.71486783;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="display:inline;fill:#595959;fill-opacity:1;stroke-width:1.11111116" />