From 0ded620772a0a763a46e16ac8a0e7382fbdc844e Mon Sep 17 00:00:00 2001 From: Le Tan Date: Mon, 14 Aug 2017 19:04:34 +0800 Subject: [PATCH] use smaller icon size for toolbar --- src/resources/icons/delete_dir.svg | 5 ++++- src/resources/icons/delete_note.svg | 5 ++++- src/resources/icons/delete_note_tb.svg | 2 +- src/resources/icons/delete_notebook.svg | 5 ++++- src/resources/vnote.qss | 2 +- src/vmainwindow.cpp | 24 ++++++++++++++++++------ src/vmainwindow.h | 6 +++--- 7 files changed, 35 insertions(+), 14 deletions(-) diff --git a/src/resources/icons/delete_dir.svg b/src/resources/icons/delete_dir.svg index 43a684e9..ec2afc25 100644 --- a/src/resources/icons/delete_dir.svg +++ b/src/resources/icons/delete_dir.svg @@ -3,5 +3,8 @@ - + diff --git a/src/resources/icons/delete_note.svg b/src/resources/icons/delete_note.svg index 43a684e9..ec2afc25 100644 --- a/src/resources/icons/delete_note.svg +++ b/src/resources/icons/delete_note.svg @@ -3,5 +3,8 @@ - + diff --git a/src/resources/icons/delete_note_tb.svg b/src/resources/icons/delete_note_tb.svg index ec2afc25..e875331f 100644 --- a/src/resources/icons/delete_note_tb.svg +++ b/src/resources/icons/delete_note_tb.svg @@ -3,7 +3,7 @@ - diff --git a/src/resources/icons/delete_notebook.svg b/src/resources/icons/delete_notebook.svg index 43a684e9..ec2afc25 100644 --- a/src/resources/icons/delete_notebook.svg +++ b/src/resources/icons/delete_notebook.svg @@ -3,5 +3,8 @@ - + diff --git a/src/resources/vnote.qss b/src/resources/vnote.qss index ac696ef6..059d3125 100644 --- a/src/resources/vnote.qss +++ b/src/resources/vnote.qss @@ -1,5 +1,5 @@ QPushButton[CornerBtn="true"] { - padding: 4px 0px 4px 0px; + padding: 4px -2px 4px -2px; margin: 0px; border: none; background-color: transparent; diff --git a/src/vmainwindow.cpp b/src/vmainwindow.cpp index b1563f61..34a0ba56 100644 --- a/src/vmainwindow.cpp +++ b/src/vmainwindow.cpp @@ -194,16 +194,22 @@ QWidget *VMainWindow::setupDirectoryPanel() void VMainWindow::initToolBar() { - initFileToolBar(); - initViewToolBar(); - initEditToolBar(); + const int tbIconSize = 20 * VUtils::calculateScaleFactor(); + QSize iconSize(tbIconSize, tbIconSize); + + initFileToolBar(iconSize); + initViewToolBar(iconSize); + initEditToolBar(iconSize); } -void VMainWindow::initViewToolBar() +void VMainWindow::initViewToolBar(QSize p_iconSize) { QToolBar *viewToolBar = addToolBar(tr("View")); viewToolBar->setObjectName("ViewToolBar"); viewToolBar->setMovable(false); + if (p_iconSize.isValid()) { + viewToolBar->setIconSize(p_iconSize); + } QAction *onePanelViewAct = new QAction(QIcon(":/resources/icons/one_panel.svg"), tr("&Single Panel"), this); @@ -244,11 +250,14 @@ static void setActionsEnabled(QWidget *p_widget, bool p_enabled) } } -void VMainWindow::initEditToolBar() +void VMainWindow::initEditToolBar(QSize p_iconSize) { m_editToolBar = addToolBar(tr("Edit Toolbar")); m_editToolBar->setObjectName("EditToolBar"); m_editToolBar->setMovable(false); + if (p_iconSize.isValid()) { + m_editToolBar->setIconSize(p_iconSize); + } m_editToolBar->addSeparator(); @@ -307,11 +316,14 @@ void VMainWindow::initEditToolBar() setActionsEnabled(m_editToolBar, false); } -void VMainWindow::initFileToolBar() +void VMainWindow::initFileToolBar(QSize p_iconSize) { QToolBar *fileToolBar = addToolBar(tr("Note")); fileToolBar->setObjectName("NoteToolBar"); fileToolBar->setMovable(false); + if (p_iconSize.isValid()) { + fileToolBar->setIconSize(p_iconSize); + } newRootDirAct = new QAction(QIcon(":/resources/icons/create_rootdir_tb.svg"), tr("New &Root Folder"), this); diff --git a/src/vmainwindow.h b/src/vmainwindow.h index 3054bfc5..4523e264 100644 --- a/src/vmainwindow.h +++ b/src/vmainwindow.h @@ -132,11 +132,11 @@ private: QWidget *setupDirectoryPanel(); void initToolBar(); - void initFileToolBar(); - void initViewToolBar(); + void initFileToolBar(QSize p_iconSize = QSize()); + void initViewToolBar(QSize p_iconSize = QSize()); // Init the Edit toolbar. - void initEditToolBar(); + void initEditToolBar(QSize p_iconSize = QSize()); void initMenuBar(); void initFileMenu();