summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2012-11-29 18:47:49 +0100
committerAndrea Diamantini <adjam7@gmail.com>2012-12-10 02:48:06 +0100
commit171650e888d296959bd4eda2e61562447497a00a (patch)
tree7701c66645a651456dbc45f5dcb745f1b1851d34 /src
parentFix RekonqWindow behaviour while opening new windows (diff)
downloadrekonq-171650e888d296959bd4eda2e61562447497a00a.tar.xz
Ensure settings respect
Honor settings when opening new tab (fix for the rekonq2 port)
Diffstat (limited to 'src')
-rw-r--r--src/settings/settings_tabs.ui10
-rw-r--r--src/tabwindow/tabwindow.cpp18
-rw-r--r--src/webtab/protocolhandler.cpp14
3 files changed, 23 insertions, 19 deletions
diff --git a/src/settings/settings_tabs.ui b/src/settings/settings_tabs.ui
index ab43097c..f687eada 100644
--- a/src/settings/settings_tabs.ui
+++ b/src/settings/settings_tabs.ui
@@ -101,11 +101,6 @@
</item>
<item>
<property name="text">
- <string>Closed Tabs</string>
- </property>
- </item>
- <item>
- <property name="text">
<string>Bookmarks</string>
</property>
</item>
@@ -119,11 +114,6 @@
<string>Downloads</string>
</property>
</item>
- <item>
- <property name="text">
- <string>Tabs</string>
- </property>
- </item>
</widget>
</item>
</layout>
diff --git a/src/tabwindow/tabwindow.cpp b/src/tabwindow/tabwindow.cpp
index 60a9a0eb..a37cc249 100644
--- a/src/tabwindow/tabwindow.cpp
+++ b/src/tabwindow/tabwindow.cpp
@@ -28,6 +28,9 @@
#include "tabwindow.h"
#include "tabwindow.moc"
+// Auto Includes
+#include "rekonq.h"
+
// Local Includes
#include "application.h"
#include "webpage.h"
@@ -254,7 +257,20 @@ void TabWindow::newTab()
addTab(tab, i18n("new tab"));
setCurrentWidget(tab);
- tab->load(KUrl("about:home"));
+ switch (ReKonfig::newTabsBehaviour())
+ {
+ case 0: // new tab page
+ tab->load(KUrl("about:home"));
+ break;
+ case 2: // homepage
+ tab->load(KUrl(ReKonfig::homePage()));
+ break;
+ case 1: // blank page
+ default:
+ tab->load(KUrl("about:blank"));
+ break;
+ }
+
}
diff --git a/src/webtab/protocolhandler.cpp b/src/webtab/protocolhandler.cpp
index dcf9d1a4..c21915f7 100644
--- a/src/webtab/protocolhandler.cpp
+++ b/src/webtab/protocolhandler.cpp
@@ -134,6 +134,7 @@ bool ProtocolHandler::preHandling(const QNetworkRequest &request, QWebFrame *fra
if (_url.protocol() == QL1S("about"))
{
QByteArray encodedUrl = _url.toEncoded();
+
// let webkit manage the about:blank url...
if (encodedUrl.startsWith(QByteArray("about:blank")))
{
@@ -147,21 +148,18 @@ bool ProtocolHandler::preHandling(const QNetworkRequest &request, QWebFrame *fra
case 0: // favorites
_url = KUrl("about:favorites");
break;
- case 1: // closed tabs
- _url = KUrl("about:closedTabs");
- break;
- case 2: // bookmarks
+ case 1: // bookmarks
_url = KUrl("about:bookmarks");
break;
- case 3: // history
+ case 2: // history
_url = KUrl("about:history");
break;
- case 4: // downloads
+ case 3: // downloads
_url = KUrl("about:downloads");
break;
- case 5: // tabs
- _url = KUrl("about:tabs");
default: // unuseful
+ kDebug() << "oops... this should NOT happen...";
+ _url = KUrl("about:favorites");
break;
}
}