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

recover print

Browse Source
This commit is contained in:
Le Tan 2019-07-30 20:00:42 +08:00
parent 5b7b74130b
commit f507475ccd
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/vmainwindow.cpp
View File

@ -1061,7 +1061,6 @@ void VMainWindow::initFileMenu()
*/ */
// Print. // Print.
/*
m_printAct = new QAction(VIconUtils::menuIcon(":/resources/icons/print.svg"), m_printAct = new QAction(VIconUtils::menuIcon(":/resources/icons/print.svg"),
tr("&Print"), this); tr("&Print"), this);
m_printAct->setToolTip(tr("Print current note")); m_printAct->setToolTip(tr("Print current note"));
@ -1072,7 +1071,6 @@ void VMainWindow::initFileMenu()
fileMenu->addAction(m_printAct); fileMenu->addAction(m_printAct);
fileMenu->addSeparator(); fileMenu->addSeparator();
*/
// Themes. // Themes.
initThemeMenu(fileMenu); initThemeMenu(fileMenu);
@ -2085,6 +2083,8 @@ void VMainWindow::updateActionsStateFromTab(const VEditTab *p_tab)
&& file->getType() == FileType::Orphan && file->getType() == FileType::Orphan
&& dynamic_cast<const VOrphanFile *>(file)->isSystemFile(); && dynamic_cast<const VOrphanFile *>(file)->isSystemFile();
m_printAct->setEnabled(file && file->getDocType() == DocType::Markdown);
updateEditReadAct(p_tab); updateEditReadAct(p_tab);
saveNoteAct->setEnabled(file && editMode && file->isModifiable()); saveNoteAct->setEnabled(file && editMode && file->isModifiable());
@ -2572,7 +2572,6 @@ void VMainWindow::shortcutsHelp()
void VMainWindow::printNote() void VMainWindow::printNote()
{ {
/*
if (m_printer if (m_printer
|| !m_curFile || !m_curFile
|| m_curFile->getDocType() != DocType::Markdown) { || m_curFile->getDocType() != DocType::Markdown) {
@ -2595,16 +2594,11 @@ void VMainWindow::printNote()
} }
if (dialog.exec() == QDialog::Accepted) { if (dialog.exec() == QDialog::Accepted) {
webView->page()->print(m_printer, [this](bool p_succ) { webView->print(m_printer);
qDebug() << "print web page callback" << p_succ;
delete m_printer;
m_printer = NULL;
});
} else {
delete m_printer;
m_printer = NULL;
} }
*/
delete m_printer;
m_printer = NULL;
} }
QAction *VMainWindow::newAction(const QIcon &p_icon, QAction *VMainWindow::newAction(const QIcon &p_icon,