summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2011-12-16 23:48:29 +0100
committerAndrea Diamantini <adjam7@gmail.com>2011-12-16 23:48:29 +0100
commitbeee4bb1f8f23a5b3b7da5187e385f5554314ca5 (patch)
tree749b42a27324b069ff2143d03ee12f030d611db1
parentDownloads page improvement (diff)
downloadrekonq-beee4bb1f8f23a5b3b7da5187e385f5554314ca5.tar.xz
Home page shortcut containing CTRL fix
Please, refer to rb #103428 description to have a proper explanation of the issue. Thanks to Thomas Murach for fixing the bug he discovered :) REVIEW: 103428 REVIEWED-BY: adjam
-rw-r--r--src/mainwindow.cpp9
-rw-r--r--src/mainwindow.h2
2 files changed, 4 insertions, 7 deletions
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 6b15385d..9ae319c8 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -348,7 +348,7 @@ void MainWindow::setupActions()
a->setShortcut(fullScreenShortcut);
a = actionCollection()->addAction(KStandardAction::Home);
- connect(a, SIGNAL(triggered(Qt::MouseButtons, Qt::KeyboardModifiers)), this, SLOT(homePage(Qt::MouseButtons, Qt::KeyboardModifiers)));
+ connect(a, SIGNAL(triggered(Qt::MouseButtons, Qt::KeyboardModifiers)), this, SLOT(homePage()));
KStandardAction::preferences(this, SLOT(preferences()), actionCollection());
a = KStandardAction::redisplay(m_view, SLOT(webReload()), actionCollection());
@@ -1037,16 +1037,13 @@ void MainWindow::viewPageSource()
}
-void MainWindow::homePage(Qt::MouseButtons mouseButtons, Qt::KeyboardModifiers keyboardModifiers)
+void MainWindow::homePage()
{
KUrl homeUrl = ReKonfig::useNewTabPage()
? KUrl(QL1S("about:home"))
: KUrl(ReKonfig::homePage());
- if (mouseButtons == Qt::MidButton || keyboardModifiers == Qt::ControlModifier)
- rApp->loadUrl(homeUrl, Rekonq::NewTab);
- else
- currentTab()->view()->load(homeUrl);
+ currentTab()->view()->load(homeUrl);
}
diff --git a/src/mainwindow.h b/src/mainwindow.h
index 8d827b04..2b413900 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -90,7 +90,7 @@ private:
public Q_SLOTS:
void openDownloadsPage();
- void homePage(Qt::MouseButtons = Qt::LeftButton, Qt::KeyboardModifiers = Qt::NoModifier);
+ void homePage();
/**
* Notifies a message in a popup