1 files changed, 19 insertions, 47 deletions

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 4e9c4b26..6ec6a3a6 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -46,6 +46,7 @@
 #include "sidepanel.h"
 #include "urlbar.h"
 #include "tabbar.h"
+#include "homepage.h"
 
 // Ui Includes
 #include "ui_cleardata.h"
@@ -147,7 +148,6 @@ MainWindow::~MainWindow()
 {
     Application::instance()->removeMainWindow(this);
     delete m_popup;
-//     delete m_view;
 }
 
 
@@ -381,11 +381,6 @@ void MainWindow::setupActions()
     bmMenu->setIcon(KIcon("bookmarks"));
     bmMenu->setDelayed(false);
     actionCollection()->addAction(QLatin1String("bookmarksActionMenu"), bmMenu);
-
-    // Add to favorites
-    a = new KAction(KIcon("rating"), i18n("Add to Favorites"), this);
-    actionCollection()->addAction(QLatin1String("add_to_favorites"), a);
-    connect(a, SIGNAL(triggered(bool)), this, SLOT(addFavoriteLink()));
 }
 
 
@@ -394,6 +389,7 @@ void MainWindow::setupTools()
     KActionMenu *toolsMenu = new KActionMenu(KIcon("configure"), i18n("&Tools"), this);
     toolsMenu->setDelayed(false);
 
+    toolsMenu->addAction(actionByName(KStandardAction::name(KStandardAction::Open)));
     toolsMenu->addAction(actionByName(KStandardAction::name(KStandardAction::SaveAs)));
     toolsMenu->addAction(actionByName(KStandardAction::name(KStandardAction::Print)));
     toolsMenu->addAction(actionByName(KStandardAction::name(KStandardAction::Find)));
@@ -576,8 +572,8 @@ void MainWindow::slotUpdateWindowTitle(const QString &title)
 void MainWindow::slotFileOpen()
 {
     QString filePath = KFileDialog::getOpenFileName(KUrl(),
-                       i18n("*.html *.htm *.svg *.png *.gif *.svgz|Web Resources (*.html *.htm *.svg *.png *.gif *.svgz)\n" \
-                            "*.*|All files (*.*)"),
+                       i18n("*.html *.htm *.svg *.png *.gif *.svgz|Web Resources (*.html *.htm *.svg *.png *.gif *.svgz)\n" 
+                       "*.*|All files (*.*)"),
                        this,
                        i18n("Open Web Resource"));
 
@@ -772,14 +768,7 @@ void MainWindow::slotViewPageSource()
 
 void MainWindow::slotHome()
 {
-    if(ReKonfig::newTabHomePage())
-    {
-        Application::instance()->homePage();
-    }
-    else
-    {
-        currentTab()->load( QUrl(ReKonfig::homePage()) );
-    }
+    currentTab()->load( QUrl(ReKonfig::homePage()) );
 }
 
 
@@ -1102,37 +1091,20 @@ void MainWindow::slotOpenActionUrl(QAction *action)
 }
 
 
-void MainWindow::addFavoriteLink()
+bool MainWindow::homePage(const KUrl &url)
 {
-    QString name = currentTab()->title();
-    QString url = currentTab()->url().prettyUrl(KUrl::RemoveTrailingSlash);
-    
-    QStringList names = ReKonfig::previewNames();
-    QStringList urls = ReKonfig::previewUrls();
-    
-    
-    for (int i = 0; i < 8 && i < urls.size() ; ++i) 
+    if (    url == KUrl("rekonq:closedTabs") 
+         || url == KUrl("rekonq:history") 
+         || url == KUrl("rekonq:bookmarks")
+         || url == KUrl("rekonq:favorites")
+         || url == KUrl("rekonq:home")
+    )
     {
-        if(urls.at(i).isEmpty() || urls.at(i) == url)
-        {
-            names.replace(i, name);
-            urls.replace(i, url);
-            break;
-        }
-        if(i == 7)
-        {
-            names.prepend(name);
-            if(names.count() > 8)
-                names.removeLast();
-            
-            urls.prepend(url);
-            if(urls.count() > 8)
-                urls.removeLast();
-            
-            break;
-        }
+        kDebug() << "loading home: " << url;
+        WebView *w = currentTab();
+        HomePage p(w);
+        w->setHtml( p.rekonqHomePage(url), url);
+        return true;
     }
-
-    ReKonfig::setPreviewNames(names);
-    ReKonfig::setPreviewUrls(urls);
-}
+    return false;
+}
\ No newline at end of file