summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2009-10-22 11:00:05 +0200
committerAndrea Diamantini <adjam7@gmail.com>2009-10-22 11:00:05 +0200
commite0671f3767b8ff4d14ef1e1c13774f49bdba460f (patch)
tree631506c6456eaf8ff434b3b1996202daff9d6bba
parentMerge commit 'refs/merge-requests/1870' of git://gitorious.org/rekonq/mainlin... (diff)
downloadrekonq-e0671f3767b8ff4d14ef1e1c13774f49bdba460f.tar.xz
Restored open action (in the tools menu).
-rw-r--r--src/mainwindow.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 28a59f11..02102ae1 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -147,7 +147,6 @@ MainWindow::~MainWindow()
{
Application::instance()->removeMainWindow(this);
delete m_popup;
-// delete m_view;
}
@@ -389,6 +388,7 @@ void MainWindow::setupTools()
KActionMenu *toolsMenu = new KActionMenu(KIcon("configure"), i18n("&Tools"), this);
toolsMenu->setDelayed(false);
+ toolsMenu->addAction(actionByName(KStandardAction::name(KStandardAction::Open)));
toolsMenu->addAction(actionByName(KStandardAction::name(KStandardAction::SaveAs)));
toolsMenu->addAction(actionByName(KStandardAction::name(KStandardAction::Print)));
toolsMenu->addAction(actionByName(KStandardAction::name(KStandardAction::Find)));
@@ -571,8 +571,8 @@ void MainWindow::slotUpdateWindowTitle(const QString &title)
void MainWindow::slotFileOpen()
{
QString filePath = KFileDialog::getOpenFileName(KUrl(),
- i18n("*.html *.htm *.svg *.png *.gif *.svgz|Web Resources (*.html *.htm *.svg *.png *.gif *.svgz)\n" \
- "*.*|All files (*.*)"),
+ i18n("*.html *.htm *.svg *.png *.gif *.svgz|Web Resources (*.html *.htm *.svg *.png *.gif *.svgz)\n"
+ "*.*|All files (*.*)"),
this,
i18n("Open Web Resource"));