1 files changed, 37 insertions, 24 deletions

diff --git a/src/mainwindow.h b/src/mainwindow.h
index 7083591d..0f0fea96 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -1,10 +1,12 @@
+
 /* ============================================================
 *
 * This file is a part of the rekonq project
 *
-* Copyright (C) 2008-2009 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2008-2010 by Andrea Diamantini <adjam7 at gmail dot com>
 * Copyright (C) 2009 by Paweł Prażak <pawelprazak at gmail dot com>
-* Copyright (C) 2009 by Lionel Chauvin <megabigbug@yahoo.fr>
+* Copyright (C) 2009-2010 by Lionel Chauvin <megabigbug@yahoo.fr>
+* Copyright (C) 2010 by Matthieu Gicquel <matgic78 at gmail dot com>
 *
 *
 * This program is free software; you can redistribute it and/or
@@ -29,9 +31,8 @@
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
-
-// Local Includes
-#include "application.h"
+// Rekonq Includes
+#include "rekonq_defines.h"
 
 // KDE Includes
 #include <KMainWindow>
@@ -40,11 +41,6 @@
 #include <KUrl>
 
 // Forward Declarations
-class QWebFrame;
-
-class KAction;
-class KPassivePopup;
-
 class FindBar;
 class HistoryPanel;
 class BookmarksPanel;
@@ -52,13 +48,20 @@ class WebInspectorPanel;
 class WebTab;
 class MainView;
 
+class KAction;
+class KPassivePopup;
+
+class QWebFrame;
+class QSlider;
+
+
 
 /**
  * This class serves as the main window for rekonq.
  * It handles the menus, toolbars, and status bars.
  *
  */
-class MainWindow : public KMainWindow
+class REKONQ_TESTS_EXPORT MainWindow : public KMainWindow
 {
     Q_OBJECT
 
@@ -70,18 +73,19 @@ public:
     WebTab *currentTab() const;
     QAction *actionByName(const QString name);
     virtual QSize sizeHint() const;
-    virtual KActionCollection *actionCollection () const;
+    virtual KActionCollection *actionCollection() const;
     void setWidgetsVisible(bool makeFullScreen);
-   
+
+    void setZoomSliderFactor(qreal factor);
+
 private:
     void setupActions();
     void setupTools();
     void setupToolbars();
     void setupPanels();
-    
+
 public slots:
-    void updateBrowser();
-    void homePage();
+    void homePage(Qt::MouseButtons = Qt::LeftButton, Qt::KeyboardModifiers = Qt::NoModifier);
 
     /**
      * Notifies a message in a popup
@@ -94,7 +98,7 @@ public slots:
     void notifyMessage(const QString &msg, Rekonq::Notify status = Rekonq::Info);
 
     void printRequested(QWebFrame *frame = 0);
-    
+
 signals:
     // switching tabs
     void ctrlTabPressed();
@@ -110,24 +114,26 @@ protected:
 
 private slots:
     void postLaunch();
-    void updateConfiguration();
     void browserLoading(bool);
     void updateActions();
     void updateWindowTitle(const QString &title = QString());
 
     // history related
-    void openPrevious();
-    void openNext();
+    void openPrevious(Qt::MouseButtons = Qt::LeftButton, Qt::KeyboardModifiers = Qt::NoModifier);
+    void openNext(Qt::MouseButtons = Qt::LeftButton, Qt::KeyboardModifiers = Qt::NoModifier);
 
     // Find Action slots
     void find(const QString &);
+    void matchCaseUpdate();
     void findNext();
     void findPrevious();
+    void highlightAll();
 
     // Zoom slots
-    void viewTextBigger();
-    void viewTextNormal();
-    void viewTextSmaller();
+    void zoomIn();
+    void zoomNormal();
+    void zoomOut();
+    void setZoomFactor(int factor);
 
     // File Menu slots
     void openLocation();
@@ -149,20 +155,27 @@ private slots:
     void aboutToShowBackMenu();
     void openActionUrl(QAction *action);
 
+    // encodings
+    void setEncoding(QAction *);
+    void populateEncodingMenu();
+
 private:
     MainView *m_view;
     FindBar *m_findBar;
-    
+
     HistoryPanel *m_historyPanel;
     BookmarksPanel *m_bookmarksPanel;
     WebInspectorPanel *m_webInspectorPanel;
 
     KAction *m_stopReloadAction;
     KMenu *m_historyBackMenu;
+    KMenu *m_encodingMenu;
 
     KToolBar *m_mainBar;
     KToolBar *m_bmBar;
 
+    QSlider *m_zoomSlider;
+
     QString m_lastSearch;
 
     KPassivePopup *m_popup;