summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2009-08-23 12:16:21 +0200
committerAndrea Diamantini <adjam7@gmail.com>2009-08-23 12:16:21 +0200
commit8365635b411c16398011246abbf36639f4417768 (patch)
tree20605573d0bd2baef378e0da59fd312877eb1805
parentAdd an icon to the help submenu (diff)
parentReplace "Print preview" by "Print" in the tool menu (diff)
downloadrekonq-8365635b411c16398011246abbf36639f4417768.tar.xz
Merge commit 'megabigbug/Print'
-rw-r--r--src/mainwindow.cpp15
-rw-r--r--src/mainwindow.h1
2 files changed, 3 insertions, 13 deletions
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 085c6f7f..d4c555ef 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -238,9 +238,8 @@ void MainWindow::setupActions()
// Standard Actions
KStandardAction::open(this, SLOT(slotFileOpen()), actionCollection());
- KStandardAction::saveAs(this, SLOT(slotFileSaveAs()), actionCollection());
- KStandardAction::printPreview(this, SLOT(slotFilePrintPreview()), actionCollection());
- KStandardAction::print(this, SLOT(slotFilePrint()), actionCollection());
+ KStandardAction::saveAs(this, SLOT(slotFileSaveAs()), actionCollection());
+ KStandardAction::print(this, SLOT(slotFilePrintPreview()), actionCollection());
KStandardAction::quit(this , SLOT(close()), actionCollection());
KStandardAction::find(m_findBar, SLOT(show()) , actionCollection());
KStandardAction::findNext(this, SLOT(slotFindNext()) , actionCollection());
@@ -355,7 +354,7 @@ void MainWindow::setupTools()
toolsMenu->setDelayed(false);
toolsMenu->addAction(actionByName(KStandardAction::name(KStandardAction::SaveAs)));
- toolsMenu->addAction(actionByName(KStandardAction::name(KStandardAction::PrintPreview)));
+ toolsMenu->addAction(actionByName(KStandardAction::name(KStandardAction::Print)));
toolsMenu->addAction(actionByName(KStandardAction::name(KStandardAction::Find)));
KActionMenu *fontMenu = new KActionMenu(KIcon("page-zoom"), i18n("Zoom"), this);
@@ -575,14 +574,6 @@ void MainWindow::slotFilePrintPreview()
}
-void MainWindow::slotFilePrint()
-{
- if (!currentTab())
- return;
- printRequested(currentTab()->page()->mainFrame());
-}
-
-
void MainWindow::printRequested(QWebFrame *frame)
{
QPrinter printer;
diff --git a/src/mainwindow.h b/src/mainwindow.h
index cc32dd68..854745df 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -115,7 +115,6 @@ private slots:
// File Menu slots
void slotFileOpen();
void slotFilePrintPreview();
- void slotFilePrint();
void slotFileSaveAs();
void printRequested(QWebFrame *frame);