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

refactor VMainWindow

Browse Source 
Signed-off-by: Le Tan <tamlokveer@gmail.com>
This commit is contained in:
Le Tan 2017-01-01 15:46:57 +08:00
parent eaab820d8b
commit 41abbb21d0
2 changed files with 195 additions and 182 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

345
src/vmainwindow.cpp
View File

@ -25,10 +25,11 @@ VMainWindow::VMainWindow(QWidget *parent)
g_vnote = vnote; g_vnote = vnote;
vnote->initPalette(palette()); vnote->initPalette(palette());
initPredefinedColorPixmaps(); initPredefinedColorPixmaps();
setupUI(); setupUI();
initActions();
initToolBar();
initMenuBar(); initMenuBar();
initToolBar();
initDockWindows(); initDockWindows();
initAvatar(); initAvatar();
@ -80,8 +81,8 @@ void VMainWindow::setupUI()
this, &VMainWindow::handleCurTabStatusChanged); this, &VMainWindow::handleCurTabStatusChanged);
setCentralWidget(mainSplitter); setCentralWidget(mainSplitter);
// Create and show the status bar // TODO: Create and show the status bar
statusBar(); // statusBar();
} }
QWidget *VMainWindow::setupDirectoryPanel() QWidget *VMainWindow::setupDirectoryPanel()
@ -123,8 +124,52 @@ QWidget *VMainWindow::setupDirectoryPanel()
return nbContainer; return nbContainer;
} }
void VMainWindow::initActions() void VMainWindow::initToolBar()
{ {
initFileToolBar();
initViewToolBar();
}
void VMainWindow::initViewToolBar()
{
QToolBar *viewToolBar = addToolBar(tr("View"));
viewToolBar->setObjectName("ViewToolBar");
viewToolBar->setMovable(false);
QAction *onePanelViewAct = new QAction(QIcon(":/resources/icons/one_panel.svg"),
tr("&Single Panel"), this);
onePanelViewAct->setStatusTip(tr("Display only the note panel"));
connect(onePanelViewAct, &QAction::triggered,
this, &VMainWindow::onePanelView);
QAction *twoPanelViewAct = new QAction(QIcon(":/resources/icons/two_panels.svg"),
tr("&Two Panels"), this);
twoPanelViewAct->setStatusTip(tr("Display both the directory and note panel"));
connect(twoPanelViewAct, &QAction::triggered,
this, &VMainWindow::twoPanelView);
QMenu *panelMenu = new QMenu(this);
panelMenu->addAction(onePanelViewAct);
panelMenu->addAction(twoPanelViewAct);
expandViewAct = new QAction(QIcon(":/resources/icons/expand.svg"),
tr("Expand"), this);
expandViewAct->setStatusTip(tr("Expand the edit area"));
expandViewAct->setCheckable(true);
expandViewAct->setShortcut(QKeySequence("Ctrl+E"));
expandViewAct->setMenu(panelMenu);
connect(expandViewAct, &QAction::triggered,
this, &VMainWindow::expandPanelView);
viewToolBar->addAction(expandViewAct);
}
void VMainWindow::initFileToolBar()
{
QToolBar *fileToolBar = addToolBar(tr("Note"));
fileToolBar->setObjectName("NoteToolBar");
fileToolBar->setMovable(false);
newRootDirAct = new QAction(QIcon(":/resources/icons/create_rootdir_tb.svg"), newRootDirAct = new QAction(QIcon(":/resources/icons/create_rootdir_tb.svg"),
tr("New &Rood Directory"), this); tr("New &Rood Directory"), this);
newRootDirAct->setStatusTip(tr("Create a root directory in current notebook")); newRootDirAct->setStatusTip(tr("Create a root directory in current notebook"));
@ -150,83 +195,6 @@ void VMainWindow::initActions()
connect(deleteNoteAct, &QAction::triggered, connect(deleteNoteAct, &QAction::triggered,
this, &VMainWindow::deleteCurNote); this, &VMainWindow::deleteCurNote);
initEditActions();
initViewActions();
importNoteAct = new QAction(QIcon(":/resources/icons/import_note.svg"),
tr("&Import Notes From Files"), this);
importNoteAct->setStatusTip(tr("Import notes from files into current directory"));
connect(importNoteAct, &QAction::triggered,
this, &VMainWindow::importNoteFromFile);
converterAct = new QActionGroup(this);
markedAct = new QAction(tr("Marked"), converterAct);
markedAct->setStatusTip(tr("Use Marked to convert Markdown to HTML (re-open current tabs to make it work)"));
markedAct->setCheckable(true);
markedAct->setData(int(MarkdownConverterType::Marked));
hoedownAct = new QAction(tr("Hoedown"), converterAct);
hoedownAct->setStatusTip(tr("Use Hoedown to convert Markdown to HTML (re-open current tabs to make it work)"));
hoedownAct->setCheckable(true);
hoedownAct->setData(int(MarkdownConverterType::Hoedown));
connect(converterAct, &QActionGroup::triggered,
this, &VMainWindow::changeMarkdownConverter);
aboutAct = new QAction(tr("&About"), this);
aboutAct->setStatusTip(tr("Show information about VNote"));
connect(aboutAct, &QAction::triggered,
this, &VMainWindow::aboutMessage);
aboutQtAct = new QAction(tr("About &Qt"), this);
aboutQtAct->setStatusTip(tr("Show information about Qt"));
connect(aboutQtAct, &QAction::triggered,
qApp, &QApplication::aboutQt);
m_insertImageAct = new QAction(QIcon(":/resources/icons/insert_image.svg"),
tr("Insert &Image"), this);
m_insertImageAct->setStatusTip(tr("Insert an image from file in current note"));
connect(m_insertImageAct, &QAction::triggered,
this, &VMainWindow::insertImage);
expandTabAct = new QAction(tr("&Expand Tab"), this);
expandTabAct->setStatusTip(tr("Expand entered tab to spaces"));
expandTabAct->setCheckable(true);
connect(expandTabAct, &QAction::triggered,
this, &VMainWindow::changeExpandTab);
tabStopWidthAct = new QActionGroup(this);
twoSpaceTabAct = new QAction(tr("2 Spaces"), tabStopWidthAct);
twoSpaceTabAct->setStatusTip(tr("Expand tab to 2 spaces"));
twoSpaceTabAct->setCheckable(true);
twoSpaceTabAct->setData(2);
fourSpaceTabAct = new QAction(tr("4 Spaces"), tabStopWidthAct);
fourSpaceTabAct->setStatusTip(tr("Expand tab to 4 spaces"));
fourSpaceTabAct->setCheckable(true);
fourSpaceTabAct->setData(4);
eightSpaceTabAct = new QAction(tr("8 Spaces"), tabStopWidthAct);
eightSpaceTabAct->setStatusTip(tr("Expand tab to 8 spaces"));
eightSpaceTabAct->setCheckable(true);
eightSpaceTabAct->setData(8);
connect(tabStopWidthAct, &QActionGroup::triggered,
this, &VMainWindow::setTabStopWidth);
backgroundColorAct = new QActionGroup(this);
connect(backgroundColorAct, &QActionGroup::triggered,
this, &VMainWindow::setEditorBackgroundColor);
m_cursorLineAct = new QAction(tr("Highlight Cursor Line"), this);
m_cursorLineAct->setStatusTip(tr("Highlight current cursor line"));
m_cursorLineAct->setCheckable(true);
connect(m_cursorLineAct, &QAction::triggered,
this, &VMainWindow::changeHighlightCursorLine);
renderBackgroundAct = new QActionGroup(this);
connect(renderBackgroundAct, &QActionGroup::triggered,
this, &VMainWindow::setRenderBackgroundColor);
}
void VMainWindow::initEditActions()
{
editNoteAct = new QAction(QIcon(":/resources/icons/edit_note.svg"), editNoteAct = new QAction(QIcon(":/resources/icons/edit_note.svg"),
tr("&Edit"), this); tr("&Edit"), this);
editNoteAct->setStatusTip(tr("Edit current note")); editNoteAct->setStatusTip(tr("Edit current note"));
@ -259,52 +227,6 @@ void VMainWindow::initEditActions()
connect(saveNoteAct, &QAction::triggered, connect(saveNoteAct, &QAction::triggered,
editArea, &VEditArea::saveFile); editArea, &VEditArea::saveFile);
}
void VMainWindow::initViewActions()
{
onePanelViewAct = new QAction(QIcon(":/resources/icons/one_panel.svg"),
tr("&Single Panel"), this);
onePanelViewAct->setStatusTip(tr("Display only the note panel"));
connect(onePanelViewAct, &QAction::triggered,
this, &VMainWindow::onePanelView);
twoPanelViewAct = new QAction(QIcon(":/resources/icons/two_panels.svg"),
tr("&Two Panels"), this);
twoPanelViewAct->setStatusTip(tr("Display both the directory and note panel"));
connect(twoPanelViewAct, &QAction::triggered,
this, &VMainWindow::twoPanelView);
QMenu *panelMenu = new QMenu(this);
panelMenu->addAction(onePanelViewAct);
panelMenu->addAction(twoPanelViewAct);
expandViewAct = new QAction(QIcon(":/resources/icons/expand.svg"),
tr("Expand"), this);
expandViewAct->setStatusTip(tr("Expand the edit area"));
expandViewAct->setCheckable(true);
expandViewAct->setShortcut(QKeySequence("Ctrl+E"));
expandViewAct->setMenu(panelMenu);
connect(expandViewAct, &QAction::triggered,
this, &VMainWindow::expandPanelView);
}
void VMainWindow::initToolBar()
{
m_fileToolBar = addToolBar(tr("Note"));
m_fileToolBar->setObjectName("NoteToolBar");
m_fileToolBar->setMovable(false);
m_fileToolBar->addAction(newRootDirAct);
m_fileToolBar->addAction(newNoteAct);
m_fileToolBar->addAction(noteInfoAct);
m_fileToolBar->addAction(deleteNoteAct);
m_fileToolBar->addSeparator();
m_fileToolBar->addAction(editNoteAct);
m_fileToolBar->addAction(saveExitAct);
m_fileToolBar->addAction(saveNoteAct);
m_fileToolBar->addSeparator();
newRootDirAct->setEnabled(false); newRootDirAct->setEnabled(false);
newNoteAct->setEnabled(false); newNoteAct->setEnabled(false);
noteInfoAct->setEnabled(false); noteInfoAct->setEnabled(false);
@ -313,25 +235,136 @@ void VMainWindow::initToolBar()
saveExitAct->setVisible(false); saveExitAct->setVisible(false);
saveNoteAct->setVisible(false); saveNoteAct->setVisible(false);
m_viewToolBar = addToolBar(tr("View")); fileToolBar->addAction(newRootDirAct);
m_viewToolBar->setObjectName("ViewToolBar"); fileToolBar->addAction(newNoteAct);
m_viewToolBar->setMovable(false); fileToolBar->addAction(noteInfoAct);
m_viewToolBar->addAction(expandViewAct); fileToolBar->addAction(deleteNoteAct);
fileToolBar->addSeparator();
fileToolBar->addAction(editNoteAct);
fileToolBar->addAction(saveExitAct);
fileToolBar->addAction(saveNoteAct);
fileToolBar->addSeparator();
} }
void VMainWindow::initMenuBar() void VMainWindow::initMenuBar()
{ {
QMenu *fileMenu = menuBar()->addMenu(tr("&File")); initFileMenu();
QMenu *editMenu = menuBar()->addMenu(tr("&Edit")); initEditMenu();
viewMenu = menuBar()->addMenu(tr("&View")); initViewMenu();
QMenu *markdownMenu = menuBar()->addMenu(tr("&Markdown")); initMarkdownMenu();
initHelpMenu();
}
void VMainWindow::initHelpMenu()
{
QMenu *helpMenu = menuBar()->addMenu(tr("&Help")); QMenu *helpMenu = menuBar()->addMenu(tr("&Help"));
// File Menu QAction *aboutAct = new QAction(tr("&About"), this);
fileMenu->addAction(importNoteAct); aboutAct->setStatusTip(tr("Show information about VNote"));
connect(aboutAct, &QAction::triggered,
this, &VMainWindow::aboutMessage);
QAction *aboutQtAct = new QAction(tr("About &Qt"), this);
aboutQtAct->setStatusTip(tr("Show information about Qt"));
connect(aboutQtAct, &QAction::triggered,
qApp, &QApplication::aboutQt);
// Edit Menu helpMenu->addAction(aboutQtAct);
editMenu->addAction(m_insertImageAct); helpMenu->addAction(aboutAct);
}
void VMainWindow::initMarkdownMenu()
{
QMenu *markdownMenu = menuBar()->addMenu(tr("&Markdown"));
QMenu *converterMenu = markdownMenu->addMenu(tr("&Converter"));
QActionGroup *converterAct = new QActionGroup(this);
QAction *markedAct = new QAction(tr("Marked"), converterAct);
markedAct->setStatusTip(tr("Use Marked to convert Markdown to HTML (re-open current tabs to make it work)"));
markedAct->setCheckable(true);
markedAct->setData(int(MarkdownConverterType::Marked));
QAction *hoedownAct = new QAction(tr("Hoedown"), converterAct);
hoedownAct->setStatusTip(tr("Use Hoedown to convert Markdown to HTML (re-open current tabs to make it work)"));
hoedownAct->setCheckable(true);
hoedownAct->setData(int(MarkdownConverterType::Hoedown));
connect(converterAct, &QActionGroup::triggered,
this, &VMainWindow::changeMarkdownConverter);
converterMenu->addAction(hoedownAct);
converterMenu->addAction(markedAct);
MarkdownConverterType converterType = vconfig.getMdConverterType();
if (converterType == MarkdownConverterType::Marked) {
markedAct->setChecked(true);
} else if (converterType == MarkdownConverterType::Hoedown) {
hoedownAct->setChecked(true);
}
initRenderBackgroundMenu(markdownMenu);
}
void VMainWindow::initViewMenu()
{
viewMenu = menuBar()->addMenu(tr("&View"));
}
void VMainWindow::initFileMenu()
{
QMenu *fileMenu = menuBar()->addMenu(tr("&File"));
// Import notes from files.
QAction *importNoteAct = new QAction(QIcon(":/resources/icons/import_note.svg"),
tr("&Import Notes From Files"), this);
importNoteAct->setStatusTip(tr("Import notes from files into current directory"));
connect(importNoteAct, &QAction::triggered,
this, &VMainWindow::importNoteFromFile);
fileMenu->addAction(importNoteAct);
}
void VMainWindow::initEditMenu()
{
QMenu *editMenu = menuBar()->addMenu(tr("&Edit"));
// Inser image.
QAction *insertImageAct = new QAction(QIcon(":/resources/icons/insert_image.svg"),
tr("Insert &Image"), this);
insertImageAct->setStatusTip(tr("Insert an image from file in current note"));
connect(insertImageAct, &QAction::triggered,
this, &VMainWindow::insertImage);
// Expand Tab into spaces.
QAction *expandTabAct = new QAction(tr("&Expand Tab"), this);
expandTabAct->setStatusTip(tr("Expand entered tab to spaces"));
expandTabAct->setCheckable(true);
connect(expandTabAct, &QAction::triggered,
this, &VMainWindow::changeExpandTab);
// Tab stop width.
QActionGroup *tabStopWidthAct = new QActionGroup(this);
QAction *twoSpaceTabAct = new QAction(tr("2 Spaces"), tabStopWidthAct);
twoSpaceTabAct->setStatusTip(tr("Expand tab to 2 spaces"));
twoSpaceTabAct->setCheckable(true);
twoSpaceTabAct->setData(2);
QAction *fourSpaceTabAct = new QAction(tr("4 Spaces"), tabStopWidthAct);
fourSpaceTabAct->setStatusTip(tr("Expand tab to 4 spaces"));
fourSpaceTabAct->setCheckable(true);
fourSpaceTabAct->setData(4);
QAction *eightSpaceTabAct = new QAction(tr("8 Spaces"), tabStopWidthAct);
eightSpaceTabAct->setStatusTip(tr("Expand tab to 8 spaces"));
eightSpaceTabAct->setCheckable(true);
eightSpaceTabAct->setData(8);
connect(tabStopWidthAct, &QActionGroup::triggered,
this, &VMainWindow::setTabStopWidth);
// Highlight current cursor line.
QAction *cursorLineAct = new QAction(tr("Highlight Cursor Line"), this);
cursorLineAct->setStatusTip(tr("Highlight current cursor line"));
cursorLineAct->setCheckable(true);
connect(cursorLineAct, &QAction::triggered,
this, &VMainWindow::changeHighlightCursorLine);
editMenu->addAction(insertImageAct);
editMenu->addSeparator(); editMenu->addSeparator();
editMenu->addAction(expandTabAct); editMenu->addAction(expandTabAct);
if (vconfig.getIsExpandTab()) { if (vconfig.getIsExpandTab()) {
@ -358,29 +391,12 @@ void VMainWindow::initMenuBar()
qWarning() << "unsupported tab stop width" << tabStopWidth << "in config"; qWarning() << "unsupported tab stop width" << tabStopWidth << "in config";
} }
initEditorBackgroundMenu(editMenu); initEditorBackgroundMenu(editMenu);
editMenu->addAction(m_cursorLineAct); editMenu->addAction(cursorLineAct);
if (vconfig.getHighlightCursorLine()) { if (vconfig.getHighlightCursorLine()) {
m_cursorLineAct->setChecked(true); cursorLineAct->setChecked(true);
} else { } else {
m_cursorLineAct->setChecked(false); cursorLineAct->setChecked(false);
} }
// Markdown Menu
QMenu *converterMenu = markdownMenu->addMenu(tr("&Converter"));
converterMenu->addAction(hoedownAct);
converterMenu->addAction(markedAct);
MarkdownConverterType converterType = vconfig.getMdConverterType();
if (converterType == MarkdownConverterType::Marked) {
markedAct->setChecked(true);
} else if (converterType == MarkdownConverterType::Hoedown) {
hoedownAct->setChecked(true);
}
initRenderBackgroundMenu(markdownMenu);
// Help menu
helpMenu->addAction(aboutQtAct);
helpMenu->addAction(aboutAct);
} }
void VMainWindow::initDockWindows() void VMainWindow::initDockWindows()
@ -500,6 +516,10 @@ void VMainWindow::initPredefinedColorPixmaps()
void VMainWindow::initRenderBackgroundMenu(QMenu *menu) void VMainWindow::initRenderBackgroundMenu(QMenu *menu)
{ {
QActionGroup *renderBackgroundAct = new QActionGroup(this);
connect(renderBackgroundAct, &QActionGroup::triggered,
this, &VMainWindow::setRenderBackgroundColor);
QMenu *renderBgMenu = menu->addMenu(tr("&Rendering Background")); QMenu *renderBgMenu = menu->addMenu(tr("&Rendering Background"));
const QString &curBgColor = vconfig.getCurRenderBackgroundColor(); const QString &curBgColor = vconfig.getCurRenderBackgroundColor();
QAction *tmpAct = new QAction(tr("System"), renderBackgroundAct); QAction *tmpAct = new QAction(tr("System"), renderBackgroundAct);
@ -529,6 +549,11 @@ void VMainWindow::initRenderBackgroundMenu(QMenu *menu)
void VMainWindow::initEditorBackgroundMenu(QMenu *menu) void VMainWindow::initEditorBackgroundMenu(QMenu *menu)
{ {
QMenu *backgroundColorMenu = menu->addMenu(tr("&Background Color")); QMenu *backgroundColorMenu = menu->addMenu(tr("&Background Color"));
QActionGroup *backgroundColorAct = new QActionGroup(this);
connect(backgroundColorAct, &QActionGroup::triggered,
this, &VMainWindow::setEditorBackgroundColor);
// System background color // System background color
const QString &curBgColor = vconfig.getCurBackgroundColor(); const QString &curBgColor = vconfig.getCurBackgroundColor();
QAction *tmpAct = new QAction(tr("System"), backgroundColorAct); QAction *tmpAct = new QAction(tr("System"), backgroundColorAct);

32
src/vmainwindow.h
View File

@ -64,11 +64,18 @@ protected:
private: private:
void setupUI(); void setupUI();
QWidget *setupDirectoryPanel(); QWidget *setupDirectoryPanel();
void initActions();
void initEditActions();
void initViewActions();
void initToolBar(); void initToolBar();
void initFileToolBar();
void initViewToolBar();
void initMenuBar(); void initMenuBar();
void initFileMenu();
void initEditMenu();
void initViewMenu();
void initMarkdownMenu();
void initHelpMenu();
void initDockWindows(); void initDockWindows();
void initAvatar(); void initAvatar();
void initPredefinedColorPixmaps(); void initPredefinedColorPixmaps();
@ -96,8 +103,6 @@ private:
QToolBox *toolBox; QToolBox *toolBox;
VOutline *outline; VOutline *outline;
VAvatar *m_avatar; VAvatar *m_avatar;
QToolBar *m_fileToolBar;
QToolBar *m_viewToolBar;
// Actions // Actions
QAction *newRootDirAct; QAction *newRootDirAct;
@ -108,24 +113,7 @@ private:
QAction *saveNoteAct; QAction *saveNoteAct;
QAction *saveExitAct; QAction *saveExitAct;
QAction *discardExitAct; QAction *discardExitAct;
QAction *twoPanelViewAct;
QAction *onePanelViewAct;
QAction *expandViewAct; QAction *expandViewAct;
QAction *importNoteAct;
QActionGroup *converterAct;
QAction *markedAct;
QAction *hoedownAct;
QAction *aboutAct;
QAction *aboutQtAct;
QAction *m_insertImageAct;
QAction *expandTabAct;
QActionGroup *tabStopWidthAct;
QAction *twoSpaceTabAct;
QAction *fourSpaceTabAct;
QAction *eightSpaceTabAct;
QActionGroup *backgroundColorAct;
QAction *m_cursorLineAct;
QActionGroup *renderBackgroundAct;
// Menus // Menus
QMenu *viewMenu; QMenu *viewMenu;