Merge branch 'master' into local-svn

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/playground/network/rekonq@967887 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 7 insertions, 9 deletions

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index adc6fc87..930a4e64 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -224,7 +224,11 @@ void MainWindow::setupActions()
     KStandardAction::find(this, SLOT(slotViewFindBar()) , actionCollection());
     KStandardAction::findNext(this, SLOT(slotFindNext()) , actionCollection());
     KStandardAction::findPrev(this, SLOT(slotFindPrevious()) , actionCollection());
-    KStandardAction::fullScreen(this, SLOT(slotViewFullScreen(bool)), this, actionCollection());
+
+    // we all like "short" shortcuts.. ;)
+    a = KStandardAction::fullScreen(this, SLOT(slotViewFullScreen(bool)), this, actionCollection());
+    a->setShortcut(KShortcut(Qt::Key_F11));
+
     KStandardAction::home(this, SLOT(slotHome()), actionCollection());
     KStandardAction::preferences(this, SLOT(slotPreferences()), actionCollection());
     KStandardAction::showMenubar(this, SLOT(slotShowMenubar(bool)), actionCollection());
@@ -332,15 +336,9 @@ void MainWindow::setupSidePanel()
     addDockWidget(Qt::LeftDockWidgetArea, m_sidePanel);
 
     // setup side panel actions
-    KAction* a = new KAction(this);
-    a->setText(i18n("History"));
-    a->setCheckable(true);
-    a->setChecked(ReKonfig::showSideBar());
-    a->setShortcut(KShortcut(Qt::CTRL + Qt::Key_H));
+    QAction* a = m_sidePanel->toggleViewAction();
+    a->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_H));
     actionCollection()->addAction(QLatin1String("show_history_panel"), a);
-
-    // connect to toogle action
-    connect(a, SIGNAL(triggered(bool)), m_sidePanel->toggleViewAction(), SLOT(trigger()));
 }