1 files changed, 15 insertions, 6 deletions
diff --git a/src/mainwindow.h b/src/mainwindow.h
index 14c59cce..854745df 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -29,13 +29,16 @@
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
+
 // Local Includes
 #include "bookmarks.h"
 #include "mainview.h"
 #include "webview.h"
 
 // KDE Includes
-#include <KXmlGuiWindow>
+#include <KMainWindow>
+#include <KActionCollection>
+#include <KToolBar>
 
 // Forward Declarations
 class QWebFrame;
@@ -54,7 +57,7 @@ class WebView;
  * It handles the menus, toolbars, and status bars.
  *
  */
-class MainWindow : public KXmlGuiWindow
+class MainWindow : public KMainWindow
 {
     Q_OBJECT
 
@@ -66,12 +69,13 @@ public:
     WebView *currentTab() const;
     QAction *actionByName(const QString name);
     virtual QSize sizeHint() const;
-
+    virtual KActionCollection *actionCollection () const;
+    
 private:
     void setupActions();
     void setupHistoryMenu();
-    void setupBars();
     void setupTools();
+    void setupToolbar();
 
     void setupSidePanel();
     SidePanel *sidePanel();
@@ -111,7 +115,6 @@ private slots:
     // File Menu slots
     void slotFileOpen();
     void slotFilePrintPreview();
-    void slotFilePrint();
     void slotFileSaveAs();
     void printRequested(QWebFrame *frame);
 
@@ -138,6 +141,9 @@ private slots:
     // clear private data
     void clearPrivateData();
 
+    void slotAboutToShowBackMenu();
+    void slotOpenActionUrl(QAction *action);
+
 private:
     MainView *m_view;
     FindBar *m_findBar;
@@ -146,11 +152,14 @@ private:
     KAction *m_stopReloadAction;
     KAction *m_historyBackAction;
     KAction *m_historyForwardAction;
-
+    KMenu *m_historyBackMenu;
+    
     QString m_lastSearch;
     QString m_homePage;
 
     QPointer<KPassivePopup> m_popup;
+
+    KActionCollection *m_ac;
 };
 
 #endif // MAINWINDOW_H