From 6addbbfedb47ef6e9fe3402a8a1ce75d2ada8af6 Mon Sep 17 00:00:00 2001
From: Le Tan <tamlokveer@gmail.com>
Date: Thu, 14 Sep 2017 20:25:58 +0800
Subject: [PATCH] remove CloseNote tool bar button

---
 src/vmainwindow.cpp | 11 +++--------
 src/vmainwindow.h   |  3 ++-
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/vmainwindow.cpp b/src/vmainwindow.cpp
index 8269dcb3..06ddef0f 100644
--- a/src/vmainwindow.cpp
+++ b/src/vmainwindow.cpp
@@ -354,13 +354,11 @@ void VMainWindow::initFileToolBar(QSize p_iconSize)
     connect(deleteNoteAct, &QAction::triggered,
             this, &VMainWindow::deleteCurNote);
 
-    m_closeNoteAct = new QAction(QIcon(":/resources/icons/close_note_tb.svg"),
-                                 tr("&Close Note"), this);
-    m_closeNoteAct->setStatusTip(tr("Close current note"));
     keySeq = g_config->getShortcutKeySequence("CloseNote");
     qDebug() << "set CloseNote shortcut to" << keySeq;
-    m_closeNoteAct->setShortcut(QKeySequence(keySeq));
-    connect(m_closeNoteAct, &QAction::triggered,
+    m_closeNoteShortcut = new QShortcut(QKeySequence(keySeq), this);
+    m_closeNoteShortcut->setContext(Qt::WidgetWithChildrenShortcut);
+    connect(m_closeNoteShortcut, &QShortcut::activated,
             this, [this](){
                 if (m_curFile) {
                     editArea->closeFile(m_curFile, false);
@@ -410,7 +408,6 @@ void VMainWindow::initFileToolBar(QSize p_iconSize)
     newNoteAct->setEnabled(false);
     noteInfoAct->setEnabled(false);
     deleteNoteAct->setEnabled(false);
-    m_closeNoteAct->setEnabled(false);
     editNoteAct->setEnabled(false);
     saveExitAct->setVisible(false);
     discardExitAct->setVisible(false);
@@ -421,7 +418,6 @@ void VMainWindow::initFileToolBar(QSize p_iconSize)
     fileToolBar->addSeparator();
     fileToolBar->addAction(noteInfoAct);
     fileToolBar->addAction(deleteNoteAct);
-    fileToolBar->addAction(m_closeNoteAct);
     fileToolBar->addAction(editNoteAct);
     fileToolBar->addAction(saveExitAct);
     fileToolBar->addAction(saveNoteAct);
@@ -1459,7 +1455,6 @@ void VMainWindow::updateActionStateFromTabStatusChange(const VFile *p_file,
     saveNoteAct->setEnabled(p_file && p_editMode);
     deleteNoteAct->setEnabled(p_file && p_file->getType() == FileType::Normal);
     noteInfoAct->setEnabled(p_file && !systemFile);
-    m_closeNoteAct->setEnabled(p_file);
 
     m_insertImageAct->setEnabled(p_file && p_editMode);
 
diff --git a/src/vmainwindow.h b/src/vmainwindow.h
index 017d55b4..0230dd68 100644
--- a/src/vmainwindow.h
+++ b/src/vmainwindow.h
@@ -216,7 +216,6 @@ private:
     QAction *newNoteAct;
     QAction *noteInfoAct;
     QAction *deleteNoteAct;
-    QAction *m_closeNoteAct;
     QAction *editNoteAct;
     QAction *saveNoteAct;
     QAction *saveExitAct;
@@ -239,6 +238,8 @@ private:
     QActionGroup *m_renderStyleActs;
     QActionGroup *m_editorStyleActs;
 
+    QShortcut *m_closeNoteShortcut;
+
     // Menus
     QMenu *viewMenu;