History Panel Action fix

5 files changed, 14 insertions, 7 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8660e674..ed3205b8 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -43,7 +43,7 @@ SET( rekonq_SRCS
 KDE4_ADD_UI_FILES( rekonq_SRCS
     cookies.ui
     cookiesexceptions.ui
-    history.ui
+    #history.ui
     password.ui
     proxy.ui
     settings_general.ui
diff --git a/src/historymenu.cpp b/src/historymenu.cpp
index df8bb756..8d75324d 100644
--- a/src/historymenu.cpp
+++ b/src/historymenu.cpp
@@ -19,16 +19,22 @@
 * ============================================================ */
 
 
+// Auto Includes
 #include "historymenu.h"
 #include "historymenu.moc"
 
+// Local Includes
 #include "application.h"
+#include "mainwindow.h"
 
+// Qt Includes
 #include <QtGui/QWidget>
 #include <QtCore/QModelIndex>
 
+// KDE Includes
 #include <KUrl>
 
+
 HistoryMenu::HistoryMenu(QWidget *parent)
         : ModelMenu(parent)
         , m_history(0)
@@ -68,8 +74,7 @@ void HistoryMenu::postPopulated()
     if (m_history->history().count() > 0)
         addSeparator();
 
-    KAction *showAllAction = new KAction(i18n("Show All History"), this);
-//     connect(showAllAction, SIGNAL(triggered()), this, SLOT(showHistoryDialog()));
+    QAction *showAllAction = Application::instance()->mainWindow()->actionByName("show_history_panel");
     addAction(showAllAction);
 
     KAction *clearAction = new KAction(i18n("Clear History"), this);
diff --git a/src/historymenu.h b/src/historymenu.h
index f0c16d22..da1feaed 100644
--- a/src/historymenu.h
+++ b/src/historymenu.h
@@ -22,16 +22,20 @@
 #ifndef HISTORYMENU_H
 #define HISTORYMENU_H
 
+// Local Includes
 #include "history.h"
 
+// Qt Includes
 #include <QtCore/QList>
 #include <QtGui/QAction>
 
+// Forward Declarations
 class ModelMenu;
 class QWidget;
 class QModelIndex;
 class KUrl;
 
+
 /**
  * Menu that is dynamically populated from the history
  *
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 3faa4699..ec3f45c6 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -338,7 +338,8 @@ void MainWindow::setupSidePanel()
 
     // setup side panel actions
     QAction* a = m_sidePanel->toggleViewAction();
-    a->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_H));
+    a->setText( i18n("History Panel") );
+    a->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_H)); // WARNING : is this the right shortcut ??
     actionCollection()->addAction(QLatin1String("show_history_panel"), a);
 }
 
diff --git a/src/rekonqui.rc b/src/rekonqui.rc
index 0916bf43..2a366229 100644
--- a/src/rekonqui.rc
+++ b/src/rekonqui.rc
@@ -70,9 +70,6 @@
     <Action name="options_show_statusbar" />
     <Merge name="StandardToolBarMenuHandler" />
     <Merge/>
-    <Menu name="side_panels"><text>Side &amp;Panels</text>
-        <Action name="show_history_panel" />
-    </Menu>
     <Separator/>
     <Action name="fullscreen" />
     <Separator/>