diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2009-10-23 00:13:54 +0200 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2009-10-23 00:13:54 +0200 |
| commit | 0cd8eaf723eaaa4b6aa3ad7125f1d8ce0569d55e (patch) | |
| tree | 24fce08448f43744d5ad4a3864be7b82567315fc /src/mainwindow.cpp | |
| parent | Merge commit 'refs/merge-requests/1884' of git://gitorious.org/rekonq/mainlin... (diff) | |
| parent | (LAST hopefully) BIG change (before 0.3) (diff) | |
| download | rekonq-0cd8eaf723eaaa4b6aa3ad7125f1d8ce0569d55e.tar.xz | |
Merge branch 'StartRekonq'
Diffstat (limited to 'src/mainwindow.cpp')
| -rw-r--r-- | src/mainwindow.cpp | 29 |
1 files changed, 21 insertions, 8 deletions
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 02102ae1..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" @@ -767,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()) ); } @@ -1095,3 +1089,22 @@ void MainWindow::slotOpenActionUrl(QAction *action) } } + + +bool MainWindow::homePage(const KUrl &url) +{ + if ( url == KUrl("rekonq:closedTabs") + || url == KUrl("rekonq:history") + || url == KUrl("rekonq:bookmarks") + || url == KUrl("rekonq:favorites") + || url == KUrl("rekonq:home") + ) + { + kDebug() << "loading home: " << url; + WebView *w = currentTab(); + HomePage p(w); + w->setHtml( p.rekonqHomePage(url), url); + return true; + } + return false; +}
\ No newline at end of file |