diff options
Diffstat (limited to 'src/application.cpp')
| -rw-r--r-- | src/application.cpp | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/application.cpp b/src/application.cpp index 69acf2f2..41fcd515 100644 --- a/src/application.cpp +++ b/src/application.cpp @@ -249,8 +249,8 @@ KIcon Application::icon(const KUrl &url) if(url.isEmpty() && Application::instance()->mainWindow()->currentTab()->url().scheme() == "rekonq") return KIcon("arrow-right"); - if(url == KUrl("rekonq:allTabs")) - return KIcon("tab-duplicate"); + if(url == KUrl("rekonq:closedTabs")) + return KIcon("tab-close"); if(url == KUrl("rekonq:history")) return KIcon("view-history"); if(url == KUrl("rekonq:bookmarks")) @@ -339,12 +339,18 @@ void Application::loadUrl(const KUrl& url, const Rekonq::OpenType& type) return; } + // WARNING this is just a temporary hack waiting for the new "awesome bar" (rekonq 0.4 target) + // and it may not work in all cases. + // Known issues are (add that here to test the awesome bar code): + // - web shortcuts with space separator + // - relative urls + // - ... KUrl loadingUrl(url); if (loadingUrl.isRelative()) { QString fn = loadingUrl.url(KUrl::RemoveTrailingSlash); - if(loadingUrl.path().contains('.')) + if(loadingUrl.path().contains('.') && !loadingUrl.path().contains(' ')) { loadingUrl.setUrl("//" + fn); loadingUrl.setScheme("http"); @@ -365,6 +371,7 @@ void Application::loadUrl(const KUrl& url, const Rekonq::OpenType& type) { loadingUrl = data.uri().url(); } + // ------------------- END WARNING -------------------------------------- WebView *webView = 0; MainWindow *w = 0; @@ -442,7 +449,7 @@ MainWindowList Application::mainWindowList() bool Application::homePage(const KUrl &url) { - if ( url == KUrl("rekonq:allTabs") + if ( url == KUrl("rekonq:closedTabs") || url == KUrl("rekonq:history") || url == KUrl("rekonq:bookmarks") || url == KUrl("rekonq:favorites") |