Remove borders from all main GUI widgets
This commit is contained in:
@@ -131,8 +131,9 @@ class GuiDocEditor(QTextEdit):
|
|||||||
|
|
||||||
# Editor Settings
|
# Editor Settings
|
||||||
self.setMinimumWidth(self.mainConf.pxInt(300))
|
self.setMinimumWidth(self.mainConf.pxInt(300))
|
||||||
self.setAutoFillBackground(True)
|
|
||||||
self.setAcceptRichText(False)
|
self.setAcceptRichText(False)
|
||||||
|
self.setAutoFillBackground(True)
|
||||||
|
self.setFrameStyle(QFrame.NoFrame)
|
||||||
|
|
||||||
# Custom Shortcuts
|
# Custom Shortcuts
|
||||||
QShortcut(
|
QShortcut(
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ from PyQt5.QtGui import (
|
|||||||
)
|
)
|
||||||
from PyQt5.QtWidgets import (
|
from PyQt5.QtWidgets import (
|
||||||
qApp, QTextBrowser, QWidget, QScrollArea, QLabel, QHBoxLayout, QToolButton,
|
qApp, QTextBrowser, QWidget, QScrollArea, QLabel, QHBoxLayout, QToolButton,
|
||||||
QAction, QMenu
|
QAction, QMenu, QFrame
|
||||||
)
|
)
|
||||||
|
|
||||||
from novelwriter.core import ToHtml
|
from novelwriter.core import ToHtml
|
||||||
@@ -68,6 +68,7 @@ class GuiDocViewer(QTextBrowser):
|
|||||||
self.setAutoFillBackground(True)
|
self.setAutoFillBackground(True)
|
||||||
self.setOpenExternalLinks(False)
|
self.setOpenExternalLinks(False)
|
||||||
self.setFocusPolicy(Qt.StrongFocus)
|
self.setFocusPolicy(Qt.StrongFocus)
|
||||||
|
self.setFrameStyle(QFrame.NoFrame)
|
||||||
|
|
||||||
# Document Header and Footer
|
# Document Header and Footer
|
||||||
self.docHeader = GuiDocViewHeader(self)
|
self.docHeader = GuiDocViewHeader(self)
|
||||||
@@ -1185,6 +1186,7 @@ class GuiDocViewDetails(QScrollArea):
|
|||||||
self.setVerticalScrollBarPolicy(Qt.ScrollBarAsNeeded)
|
self.setVerticalScrollBarPolicy(Qt.ScrollBarAsNeeded)
|
||||||
self.setWidgetResizable(True)
|
self.setWidgetResizable(True)
|
||||||
self.setMinimumHeight(self.mainConf.pxInt(50))
|
self.setMinimumHeight(self.mainConf.pxInt(50))
|
||||||
|
self.setFrameStyle(QFrame.NoFrame)
|
||||||
|
|
||||||
logger.debug("GuiDocViewDetails initialisation complete")
|
logger.debug("GuiDocViewDetails initialisation complete")
|
||||||
|
|
||||||
|
|||||||
@@ -29,7 +29,9 @@ import novelwriter
|
|||||||
from time import time
|
from time import time
|
||||||
|
|
||||||
from PyQt5.QtCore import Qt, QSize
|
from PyQt5.QtCore import Qt, QSize
|
||||||
from PyQt5.QtWidgets import QTreeWidget, QTreeWidgetItem, QAbstractItemView
|
from PyQt5.QtWidgets import (
|
||||||
|
QTreeWidget, QTreeWidgetItem, QAbstractItemView, QFrame
|
||||||
|
)
|
||||||
|
|
||||||
from novelwriter.common import checkInt
|
from novelwriter.common import checkInt
|
||||||
from novelwriter.constants import nwKeyWords
|
from novelwriter.constants import nwKeyWords
|
||||||
@@ -60,6 +62,7 @@ class GuiNovelTree(QTreeWidget):
|
|||||||
|
|
||||||
# Build GUI
|
# Build GUI
|
||||||
iPx = self.theTheme.baseIconSize
|
iPx = self.theTheme.baseIconSize
|
||||||
|
self.setFrameStyle(QFrame.NoFrame)
|
||||||
self.setIconSize(QSize(iPx, iPx))
|
self.setIconSize(QSize(iPx, iPx))
|
||||||
self.setIndentation(iPx)
|
self.setIndentation(iPx)
|
||||||
self.setColumnCount(3)
|
self.setColumnCount(3)
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ from time import time
|
|||||||
|
|
||||||
from PyQt5.QtCore import Qt, QSize, pyqtSlot
|
from PyQt5.QtCore import Qt, QSize, pyqtSlot
|
||||||
from PyQt5.QtWidgets import (
|
from PyQt5.QtWidgets import (
|
||||||
QTreeWidget, QTreeWidgetItem, QMenu, QAction, QAbstractItemView
|
QTreeWidget, QTreeWidgetItem, QMenu, QAction, QAbstractItemView, QFrame
|
||||||
)
|
)
|
||||||
|
|
||||||
from novelwriter.enum import nwItemLayout, nwItemType, nwOutline
|
from novelwriter.enum import nwItemLayout, nwItemType, nwOutline
|
||||||
@@ -95,6 +95,7 @@ class GuiOutline(QTreeWidget):
|
|||||||
self.optState = theParent.theProject.optState
|
self.optState = theParent.theProject.optState
|
||||||
self.headerMenu = GuiOutlineHeaderMenu(self)
|
self.headerMenu = GuiOutlineHeaderMenu(self)
|
||||||
|
|
||||||
|
self.setFrameStyle(QFrame.NoFrame)
|
||||||
self.setSelectionBehavior(QAbstractItemView.SelectRows)
|
self.setSelectionBehavior(QAbstractItemView.SelectRows)
|
||||||
self.setSelectionMode(QAbstractItemView.SingleSelection)
|
self.setSelectionMode(QAbstractItemView.SingleSelection)
|
||||||
self.setExpandsOnDoubleClick(False)
|
self.setExpandsOnDoubleClick(False)
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ import novelwriter
|
|||||||
|
|
||||||
from PyQt5.QtCore import Qt, QT_TRANSLATE_NOOP, pyqtSignal
|
from PyQt5.QtCore import Qt, QT_TRANSLATE_NOOP, pyqtSignal
|
||||||
from PyQt5.QtWidgets import (
|
from PyQt5.QtWidgets import (
|
||||||
QScrollArea, QWidget, QGridLayout, QHBoxLayout, QGroupBox, QLabel
|
QScrollArea, QWidget, QGridLayout, QHBoxLayout, QGroupBox, QLabel, QFrame
|
||||||
)
|
)
|
||||||
|
|
||||||
from novelwriter.enum import nwView
|
from novelwriter.enum import nwView
|
||||||
@@ -233,6 +233,7 @@ class GuiOutlineDetails(QScrollArea):
|
|||||||
self.setHorizontalScrollBarPolicy(Qt.ScrollBarAsNeeded)
|
self.setHorizontalScrollBarPolicy(Qt.ScrollBarAsNeeded)
|
||||||
self.setVerticalScrollBarPolicy(Qt.ScrollBarAsNeeded)
|
self.setVerticalScrollBarPolicy(Qt.ScrollBarAsNeeded)
|
||||||
self.setWidgetResizable(True)
|
self.setWidgetResizable(True)
|
||||||
|
self.setFrameStyle(QFrame.NoFrame)
|
||||||
|
|
||||||
self.initDetails()
|
self.initDetails()
|
||||||
|
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ from time import time
|
|||||||
from PyQt5.QtCore import Qt, QSize, pyqtSignal, pyqtSlot
|
from PyQt5.QtCore import Qt, QSize, pyqtSignal, pyqtSlot
|
||||||
from PyQt5.QtGui import QIcon
|
from PyQt5.QtGui import QIcon
|
||||||
from PyQt5.QtWidgets import (
|
from PyQt5.QtWidgets import (
|
||||||
QTreeWidget, QTreeWidgetItem, QAbstractItemView, QMenu, QAction
|
QTreeWidget, QTreeWidgetItem, QAbstractItemView, QMenu, QAction, QFrame
|
||||||
)
|
)
|
||||||
|
|
||||||
from novelwriter.core import NWDoc
|
from novelwriter.core import NWDoc
|
||||||
@@ -81,6 +81,7 @@ class GuiProjectTree(QTreeWidget):
|
|||||||
# Tree Settings
|
# Tree Settings
|
||||||
iPx = self.theTheme.baseIconSize
|
iPx = self.theTheme.baseIconSize
|
||||||
self.setIconSize(QSize(iPx, iPx))
|
self.setIconSize(QSize(iPx, iPx))
|
||||||
|
self.setFrameStyle(QFrame.NoFrame)
|
||||||
self.setExpandsOnDoubleClick(False)
|
self.setExpandsOnDoubleClick(False)
|
||||||
self.setIndentation(iPx)
|
self.setIndentation(iPx)
|
||||||
self.setColumnCount(4)
|
self.setColumnCount(4)
|
||||||
|
|||||||
@@ -55,44 +55,50 @@ class GuiViewsBar(QToolBar):
|
|||||||
|
|
||||||
lblFont = self.theTheme.guiFont
|
lblFont = self.theTheme.guiFont
|
||||||
lblFont.setPointSizeF(0.65*self.theTheme.fontPointSize)
|
lblFont.setPointSizeF(0.65*self.theTheme.fontPointSize)
|
||||||
self.setFont(lblFont)
|
|
||||||
|
|
||||||
self.setMovable(False)
|
self.setMovable(False)
|
||||||
self.setToolButtonStyle(Qt.ToolButtonTextUnderIcon)
|
self.setToolButtonStyle(Qt.ToolButtonTextUnderIcon)
|
||||||
self.setIconSize(QSize(iPx, iPx))
|
self.setIconSize(QSize(iPx, iPx))
|
||||||
self.setMaximumWidth(mPx)
|
self.setMaximumWidth(mPx)
|
||||||
self.setContentsMargins(0, 0, 0, 0)
|
self.setContentsMargins(0, 0, 0, 0)
|
||||||
|
self.setStyleSheet("QToolBar {border: 0px;}")
|
||||||
|
|
||||||
stretch = QWidget(self)
|
stretch = QWidget(self)
|
||||||
stretch.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
|
stretch.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
|
||||||
|
|
||||||
# Actions
|
# Actions
|
||||||
self.aProject = QAction(self.tr("Project"))
|
self.aProject = QAction(self.tr("Project"))
|
||||||
|
self.aProject.setFont(lblFont)
|
||||||
self.aProject.setToolTip(self.tr("Show project tree and editor"))
|
self.aProject.setToolTip(self.tr("Show project tree and editor"))
|
||||||
self.aProject.setIcon(self.theTheme.getIcon("view_editor"))
|
self.aProject.setIcon(self.theTheme.getIcon("view_editor"))
|
||||||
self.aProject.triggered.connect(lambda: self.viewChangeRequested.emit(nwView.PROJECT))
|
self.aProject.triggered.connect(lambda: self.viewChangeRequested.emit(nwView.PROJECT))
|
||||||
|
|
||||||
self.aNovel = QAction(self.tr("Novel"))
|
self.aNovel = QAction(self.tr("Novel"))
|
||||||
|
self.aNovel.setFont(lblFont)
|
||||||
self.aNovel.setToolTip(self.tr("Show novel tree and editor"))
|
self.aNovel.setToolTip(self.tr("Show novel tree and editor"))
|
||||||
self.aNovel.setIcon(self.theTheme.getIcon("view_novel"))
|
self.aNovel.setIcon(self.theTheme.getIcon("view_novel"))
|
||||||
self.aNovel.triggered.connect(lambda: self.viewChangeRequested.emit(nwView.NOVEL))
|
self.aNovel.triggered.connect(lambda: self.viewChangeRequested.emit(nwView.NOVEL))
|
||||||
|
|
||||||
self.aOutline = QAction(self.tr("Outline"))
|
self.aOutline = QAction(self.tr("Outline"))
|
||||||
|
self.aOutline.setFont(lblFont)
|
||||||
self.aOutline.setToolTip(self.tr("Show novel outline"))
|
self.aOutline.setToolTip(self.tr("Show novel outline"))
|
||||||
self.aOutline.setIcon(self.theTheme.getIcon("view_outline"))
|
self.aOutline.setIcon(self.theTheme.getIcon("view_outline"))
|
||||||
self.aOutline.triggered.connect(lambda: self.viewChangeRequested.emit(nwView.OUTLINE))
|
self.aOutline.triggered.connect(lambda: self.viewChangeRequested.emit(nwView.OUTLINE))
|
||||||
|
|
||||||
self.aBuild = QAction(self.tr("Build"))
|
self.aBuild = QAction(self.tr("Build"))
|
||||||
|
self.aBuild.setFont(lblFont)
|
||||||
self.aBuild.setToolTip(self.tr("Build novel project"))
|
self.aBuild.setToolTip(self.tr("Build novel project"))
|
||||||
self.aBuild.setIcon(self.theTheme.getIcon("view_build"))
|
self.aBuild.setIcon(self.theTheme.getIcon("view_build"))
|
||||||
self.aBuild.triggered.connect(lambda: self.theParent.showBuildProjectDialog())
|
self.aBuild.triggered.connect(lambda: self.theParent.showBuildProjectDialog())
|
||||||
|
|
||||||
self.aDetails = QAction(self.tr("Details"))
|
self.aDetails = QAction(self.tr("Details"))
|
||||||
|
self.aDetails.setFont(lblFont)
|
||||||
self.aDetails.setToolTip(self.tr("Show project details"))
|
self.aDetails.setToolTip(self.tr("Show project details"))
|
||||||
self.aDetails.setIcon(self.theTheme.getIcon("proj_details"))
|
self.aDetails.setIcon(self.theTheme.getIcon("proj_details"))
|
||||||
self.aDetails.triggered.connect(lambda: self.theParent.showProjectDetailsDialog())
|
self.aDetails.triggered.connect(lambda: self.theParent.showProjectDetailsDialog())
|
||||||
|
|
||||||
self.aStats = QAction(self.tr("Stats"))
|
self.aStats = QAction(self.tr("Stats"))
|
||||||
|
self.aStats.setFont(lblFont)
|
||||||
self.aStats.setToolTip(self.tr("Show project statistics"))
|
self.aStats.setToolTip(self.tr("Show project statistics"))
|
||||||
self.aStats.setIcon(self.theTheme.getIcon("proj_stats"))
|
self.aStats.setIcon(self.theTheme.getIcon("proj_stats"))
|
||||||
self.aStats.triggered.connect(lambda: self.theParent.showWritingStatsDialog())
|
self.aStats.triggered.connect(lambda: self.theParent.showWritingStatsDialog())
|
||||||
@@ -109,8 +115,9 @@ class GuiViewsBar(QToolBar):
|
|||||||
self.mSettings.addAction(self.aPreferences)
|
self.mSettings.addAction(self.aPreferences)
|
||||||
|
|
||||||
self.tbSettings = QToolButton(self)
|
self.tbSettings = QToolButton(self)
|
||||||
self.tbSettings.setIcon(self.theTheme.getIcon("settings"))
|
self.tbSettings.setFont(lblFont)
|
||||||
self.tbSettings.setText(self.tr("Settings"))
|
self.tbSettings.setText(self.tr("Settings"))
|
||||||
|
self.tbSettings.setIcon(self.theTheme.getIcon("settings"))
|
||||||
self.tbSettings.setMenu(self.mSettings)
|
self.tbSettings.setMenu(self.mSettings)
|
||||||
self.tbSettings.setToolButtonStyle(Qt.ToolButtonTextUnderIcon)
|
self.tbSettings.setToolButtonStyle(Qt.ToolButtonTextUnderIcon)
|
||||||
self.tbSettings.setPopupMode(QToolButton.InstantPopup)
|
self.tbSettings.setPopupMode(QToolButton.InstantPopup)
|
||||||
|
|||||||
@@ -102,6 +102,7 @@ class GuiMain(QMainWindow):
|
|||||||
|
|
||||||
# Sizes
|
# Sizes
|
||||||
mPx = self.mainConf.pxInt(4)
|
mPx = self.mainConf.pxInt(4)
|
||||||
|
hWd = self.mainConf.pxInt(4)
|
||||||
|
|
||||||
# Main GUI Elements
|
# Main GUI Elements
|
||||||
self.statusBar = GuiMainStatus(self)
|
self.statusBar = GuiMainStatus(self)
|
||||||
@@ -149,12 +150,14 @@ class GuiMain(QMainWindow):
|
|||||||
self.splitView = QSplitter(Qt.Vertical)
|
self.splitView = QSplitter(Qt.Vertical)
|
||||||
self.splitView.addWidget(self.docViewer)
|
self.splitView.addWidget(self.docViewer)
|
||||||
self.splitView.addWidget(self.viewMeta)
|
self.splitView.addWidget(self.viewMeta)
|
||||||
|
self.splitView.setHandleWidth(hWd)
|
||||||
self.splitView.setSizes(self.mainConf.getViewPanePos())
|
self.splitView.setSizes(self.mainConf.getViewPanePos())
|
||||||
|
|
||||||
# Splitter : Document Editor / Document Viewer
|
# Splitter : Document Editor / Document Viewer
|
||||||
self.splitDocs = QSplitter(Qt.Horizontal)
|
self.splitDocs = QSplitter(Qt.Horizontal)
|
||||||
self.splitDocs.addWidget(self.docEditor)
|
self.splitDocs.addWidget(self.docEditor)
|
||||||
self.splitDocs.addWidget(self.splitView)
|
self.splitDocs.addWidget(self.splitView)
|
||||||
|
self.splitDocs.setHandleWidth(hWd)
|
||||||
|
|
||||||
# Splitter : Project Outlie / Outline Details
|
# Splitter : Project Outlie / Outline Details
|
||||||
self.splitOutline = QSplitter(Qt.Vertical)
|
self.splitOutline = QSplitter(Qt.Vertical)
|
||||||
@@ -164,9 +167,10 @@ class GuiMain(QMainWindow):
|
|||||||
|
|
||||||
# Splitter : Project Tree / Main Tabs
|
# Splitter : Project Tree / Main Tabs
|
||||||
self.splitMain = QSplitter(Qt.Horizontal)
|
self.splitMain = QSplitter(Qt.Horizontal)
|
||||||
self.splitMain.setContentsMargins(0, 0, mPx, 0)
|
self.splitMain.setContentsMargins(0, 0, 0, 0)
|
||||||
self.splitMain.addWidget(self.treePane)
|
self.splitMain.addWidget(self.treePane)
|
||||||
self.splitMain.addWidget(self.splitDocs)
|
self.splitMain.addWidget(self.splitDocs)
|
||||||
|
self.splitMain.setHandleWidth(hWd)
|
||||||
self.splitMain.setSizes(self.mainConf.getMainPanePos())
|
self.splitMain.setSizes(self.mainConf.getMainPanePos())
|
||||||
|
|
||||||
# Main Stack : Editor / Outline
|
# Main Stack : Editor / Outline
|
||||||
|
|||||||
Reference in New Issue
Block a user