From 8f866f34ffd103bbf9467addc28cce9ca209fbc3 Mon Sep 17 00:00:00 2001 From: Le Tan Date: Fri, 9 Dec 2016 21:08:38 +0800 Subject: [PATCH] stylesheet Signed-off-by: Le Tan --- src/resources/vnote.qss | 15 +++++++++------ src/vmainwindow.cpp | 16 +++++++++++++--- 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/src/resources/vnote.qss b/src/resources/vnote.qss index 65bb74ab..fd2ecc84 100644 --- a/src/resources/vnote.qss +++ b/src/resources/vnote.qss @@ -100,10 +100,6 @@ QListWidget::item { padding-bottom: 3px; } -QListWidget#FileList { - border-top: 2px solid @base-color; -} - QSplitter { border: none; } @@ -113,13 +109,17 @@ QSplitter::handle { } QSplitter::handle:vertical { - height: 2px; + height: 1px; +} + +QSplitter#MainSplitter { + border-top: 2px solid @base-color; } /* QMainWindow */ QMainWindow::separator { background-color: @base-color; - height: 2px; + height: 1px; } /* End QMainWindow */ @@ -137,3 +137,6 @@ QToolBox::tab { background-color: @Indigo2; } +QWidget[NotebookPanel="true"] { + padding-left: 3px; +} diff --git a/src/vmainwindow.cpp b/src/vmainwindow.cpp index a6f61784..420503b5 100644 --- a/src/vmainwindow.cpp +++ b/src/vmainwindow.cpp @@ -45,6 +45,7 @@ void VMainWindow::setupUI() // Main Splitter mainSplitter = new QSplitter(); + mainSplitter->setObjectName("MainSplitter"); mainSplitter->addWidget(directoryPanel); mainSplitter->addWidget(fileList); mainSplitter->addWidget(editArea); @@ -79,23 +80,28 @@ QWidget *VMainWindow::setupDirectoryPanel() { notebookLabel = new QLabel(tr("Notebook")); notebookLabel->setProperty("TitleLabel", true); + notebookLabel->setProperty("NotebookPanel", true); directoryLabel = new QLabel(tr("Directory")); directoryLabel->setProperty("TitleLabel", true); + directoryLabel->setProperty("NotebookPanel", true); notebookSelector = new VNotebookSelector(vnote); notebookSelector->setObjectName("NotebookSelector"); + notebookSelector->setProperty("NotebookPanel", true); notebookSelector->setSizeAdjustPolicy(QComboBox::AdjustToMinimumContentsLengthWithIcon); directoryTree = new VDirectoryTree(vnote); + directoryTree->setProperty("NotebookPanel", true); QVBoxLayout *nbLayout = new QVBoxLayout; nbLayout->addWidget(notebookLabel); nbLayout->addWidget(notebookSelector); nbLayout->addWidget(directoryLabel); nbLayout->addWidget(directoryTree); - nbLayout->setContentsMargins(2, 0, 0, 0); + nbLayout->setContentsMargins(0, 0, 0, 0); nbLayout->setSpacing(0); QWidget *nbContainer = new QWidget(); + nbContainer->setObjectName("NotebookPanel"); nbContainer->setLayout(nbLayout); nbContainer->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Expanding); @@ -241,15 +247,18 @@ void VMainWindow::initActions() void VMainWindow::initToolBar() { QToolBar *fileToolBar = addToolBar(tr("Note")); - fileToolBar->setObjectName("note"); + fileToolBar->setObjectName("NoteToolBar"); + fileToolBar->setMovable(false); fileToolBar->addAction(newRootDirAct); fileToolBar->addAction(newNoteAct); fileToolBar->addAction(noteInfoAct); fileToolBar->addAction(deleteNoteAct); + fileToolBar->addSeparator(); fileToolBar->addAction(editNoteAct); fileToolBar->addAction(saveExitAct); fileToolBar->addAction(discardExitAct); fileToolBar->addAction(saveNoteAct); + fileToolBar->addSeparator(); newRootDirAct->setEnabled(false); newNoteAct->setEnabled(false); @@ -261,7 +270,8 @@ void VMainWindow::initToolBar() saveNoteAct->setVisible(false); QToolBar *viewToolBar = addToolBar(tr("View")); - viewToolBar->setObjectName("view"); + viewToolBar->setObjectName("ViewToolBar"); + viewToolBar->setMovable(false); viewToolBar->addAction(twoPanelViewAct); viewToolBar->addAction(onePanelViewAct); viewToolBar->addAction(expandViewAct);