dawy_go/vnote
1
0
Fork 0
mirror of https://gitee.com/vnotex/vnote.git synced 2025-07-05 13:59:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

remove CloseNote tool bar button

Browse Source
This commit is contained in:
Le Tan 2017-09-14 20:25:58 +08:00
parent 156a73ff8c
commit 6addbbfedb
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/vmainwindow.cpp
View File

@ -354,13 +354,11 @@ void VMainWindow::initFileToolBar(QSize p_iconSize)
connect(deleteNoteAct, &QAction::triggered, connect(deleteNoteAct, &QAction::triggered,
this, &VMainWindow::deleteCurNote); 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"); keySeq = g_config->getShortcutKeySequence("CloseNote");
qDebug() << "set CloseNote shortcut to" << keySeq; qDebug() << "set CloseNote shortcut to" << keySeq;
m_closeNoteAct->setShortcut(QKeySequence(keySeq)); m_closeNoteShortcut = new QShortcut(QKeySequence(keySeq), this);
connect(m_closeNoteAct, &QAction::triggered, m_closeNoteShortcut->setContext(Qt::WidgetWithChildrenShortcut);
connect(m_closeNoteShortcut, &QShortcut::activated,
this, [this](){ this, [this](){
if (m_curFile) { if (m_curFile) {
editArea->closeFile(m_curFile, false); editArea->closeFile(m_curFile, false);
@ -410,7 +408,6 @@ void VMainWindow::initFileToolBar(QSize p_iconSize)
newNoteAct->setEnabled(false); newNoteAct->setEnabled(false);
noteInfoAct->setEnabled(false); noteInfoAct->setEnabled(false);
deleteNoteAct->setEnabled(false); deleteNoteAct->setEnabled(false);
m_closeNoteAct->setEnabled(false);
editNoteAct->setEnabled(false); editNoteAct->setEnabled(false);
saveExitAct->setVisible(false); saveExitAct->setVisible(false);
discardExitAct->setVisible(false); discardExitAct->setVisible(false);
@ -421,7 +418,6 @@ void VMainWindow::initFileToolBar(QSize p_iconSize)
fileToolBar->addSeparator(); fileToolBar->addSeparator();
fileToolBar->addAction(noteInfoAct); fileToolBar->addAction(noteInfoAct);
fileToolBar->addAction(deleteNoteAct); fileToolBar->addAction(deleteNoteAct);
fileToolBar->addAction(m_closeNoteAct);
fileToolBar->addAction(editNoteAct); fileToolBar->addAction(editNoteAct);
fileToolBar->addAction(saveExitAct); fileToolBar->addAction(saveExitAct);
fileToolBar->addAction(saveNoteAct); fileToolBar->addAction(saveNoteAct);
@ -1459,7 +1455,6 @@ void VMainWindow::updateActionStateFromTabStatusChange(const VFile *p_file,
saveNoteAct->setEnabled(p_file && p_editMode); saveNoteAct->setEnabled(p_file && p_editMode);
deleteNoteAct->setEnabled(p_file && p_file->getType() == FileType::Normal); deleteNoteAct->setEnabled(p_file && p_file->getType() == FileType::Normal);
noteInfoAct->setEnabled(p_file && !systemFile); noteInfoAct->setEnabled(p_file && !systemFile);
m_closeNoteAct->setEnabled(p_file);
m_insertImageAct->setEnabled(p_file && p_editMode); m_insertImageAct->setEnabled(p_file && p_editMode);

3
src/vmainwindow.h
View File

@ -216,7 +216,6 @@ private:
QAction *newNoteAct; QAction *newNoteAct;
QAction *noteInfoAct; QAction *noteInfoAct;
QAction *deleteNoteAct; QAction *deleteNoteAct;
QAction *m_closeNoteAct;
QAction *editNoteAct; QAction *editNoteAct;
QAction *saveNoteAct; QAction *saveNoteAct;
QAction *saveExitAct; QAction *saveExitAct;
@ -239,6 +238,8 @@ private:
QActionGroup *m_renderStyleActs; QActionGroup *m_renderStyleActs;
QActionGroup *m_editorStyleActs; QActionGroup *m_editorStyleActs;
QShortcut *m_closeNoteShortcut;
// Menus // Menus
QMenu *viewMenu; QMenu *viewMenu;