Last commit before loadPage REMOVAL..

..

2 files changed, 37 insertions, 28 deletions

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 481bac96..6d1ccf5d 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -169,17 +169,17 @@ void MainWindow::setupActions()
     actionCollection()->addAction( i18n("private browsing"), a );
     connect( a, SIGNAL( triggered(bool) ) , this, SLOT( slotPrivateBrowsing() ) );
 
-    a = new KAction( KIcon("zoom-in"), i18n("&Enlarge font"), this );
+    a = new KAction( KIcon("zoom-in"), i18n("&Enlarge Font"), this );
     a->setShortcut( QKeySequence(Qt::CTRL | Qt::Key_Plus) );
     actionCollection()->addAction( QLatin1String("bigger font"), a );
     connect( a, SIGNAL( triggered( bool ) ), this, SLOT( slotViewTextBigger() ) );
 
-    a = new KAction( KIcon("zoom-original"),  i18n("&Normal font"), this );
+    a = new KAction( KIcon("zoom-original"),  i18n("&Normal Font"), this );
     a->setShortcut( QKeySequence(Qt::CTRL | Qt::Key_0) );
     actionCollection()->addAction( QLatin1String("normal font"), a );
     connect( a, SIGNAL( triggered( bool ) ), this, SLOT( slotViewTextNormal() ) );
 
-    a = new KAction( KIcon("zoom-out"),  i18n("&Shrink font"), this );
+    a = new KAction( KIcon("zoom-out"),  i18n("&Shrink Font"), this );
     a->setShortcut( QKeySequence(Qt::CTRL | Qt::Key_Minus) );
     actionCollection()->addAction( QLatin1String("smaller font"), a );
     connect( a, SIGNAL( triggered( bool ) ), this, SLOT( slotViewTextSmaller() ) );
diff --git a/src/mainwindow.h b/src/mainwindow.h
index 8a13d7f9..fb251657 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -40,10 +40,16 @@
 class QWebFrame;
 class WebView;
 
+
 /**
-    The MainWindow of the Browser Application.
-    Handles the tab widget and all the actions
-*/
+ * This class serves as the main window for rekonq.  
+ * It handles the menus, toolbars, and status bars.
+ *
+ * @short Main window class
+ * @author Andrea Diamantini adjam7_AT_gmail_DOT_com
+ *
+ */
+
 class MainWindow : public KXmlGuiWindow 
 {
     Q_OBJECT
@@ -60,28 +66,42 @@ private:
     void setupActions();
     void setupCustomMenu();
 
-public slots:
+private slots:
+
     void loadPage(const QString &url);
     void slotHome();
-    void slotFind(const QString &);
-    void slotFindNext();
-    void slotFindPrevious();
-
-private slots:
+    void loadUrl(const KUrl &url);
     void slotLoadProgress(int);
     void slotUpdateStatusbar(const QString &string);
     void slotUpdateWindowTitle(const QString &title = QString());
+    void slotOpenLocation();
+    void slotAboutToShowBackMenu();
 
-    void loadUrl(const KUrl &url);
-    void slotPreferences();
+    // history related
+    void slotOpenActionUrl(QAction *action);
+    void slotOpenPrevious();
+    void slotOpenNext();
 
+    void slotShowWindow();
+    void slotSwapFocus();
+    void geometryChangeRequested(const QRect &geometry);
+
+
+    // File Menu slots
     void slotFileNew();
     void slotFileOpen();
     void slotFilePrintPreview();
     void slotFilePrint();
     void slotPrivateBrowsing();
     void slotFileSaveAs();
+    void printRequested(QWebFrame *frame);
 
+    // Edit Menu slots
+    void slotFind(const QString &);
+    void slotFindNext();
+    void slotFindPrevious();
+
+    // View Menu slots
     void slotViewTextBigger();
     void slotViewTextNormal();
     void slotViewTextSmaller();
@@ -89,23 +109,12 @@ private slots:
     void slotViewFullScreen(bool enable);
     void slotViewFindBar();
 
+    // Tools Menu slots
     void slotToggleInspector(bool enable);
     void slotDownloadManager();
-    void slotOpenLocation();
-
-    void slotAboutToShowBackMenu();
-
-    // history related
-    void slotOpenActionUrl(QAction *action);
-    void slotOpenPrevious();
-    void slotOpenNext();
-
-    void slotShowWindow();
-    void slotSwapFocus();
-
-    void printRequested(QWebFrame *frame);
-    void geometryChangeRequested(const QRect &geometry);
 
+    // Settings Menu slots
+    void slotPreferences();
 
 private:
     SearchBar *m_searchBar;