diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2009-10-16 22:59:25 +0200 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2009-10-16 22:59:25 +0200 |
| commit | 65cfdcab8fb383f1e80ba99f152772c6555f5008 (patch) | |
| tree | bed82f435009db4ef6d1f5045f85094086f9d39f | |
| parent | Fixed pano issue about urlbar copy selection (diff) | |
| parent | Show homepages titles on tabs ("favorites", "history"...) (diff) | |
| download | rekonq-65cfdcab8fb383f1e80ba99f152772c6555f5008.tar.xz | |
Merge commit 'refs/merge-requests/1825' of git://gitorious.org/rekonq/mainline into MagicNoon2
| -rw-r--r-- | data/home.html | 12 | ||||
| -rw-r--r-- | src/homepage.cpp | 6 |
2 files changed, 12 insertions, 6 deletions
diff --git a/data/home.html b/data/home.html index eddc080a..8b5cf296 100644 --- a/data/home.html +++ b/data/home.html @@ -2,7 +2,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> -<title>rekonq home page</title> +<title>%1 - rekonq</title> <style type="text/css"> @@ -16,7 +16,7 @@ border:0; } body{ -background: url(%1/tile.gif) repeat-x #fff; +background: url(%2/tile.gif) repeat-x #fff; font-family: sans-serif; font-size: 90%; text-align: center; @@ -38,7 +38,7 @@ margin-top: 2em; } h3{ -background: url(%1/category.png) no-repeat; +background: url(%2/category.png) no-repeat; padding: 0.2em; margin-top: 1em; margin-bottom: 0.5em; @@ -112,7 +112,7 @@ margin-bottom: 3%; } .thumbnail object{ -background: url(%1/bg.png) no-repeat; +background: url(%2/bg.png) no-repeat; text-align: center; padding: 14px 16px; -webkit-background-size: 100% 100%; @@ -143,9 +143,9 @@ margin-bottom: 0.5em; <div id="container"> <div id="navigation"> -%2 +%3 </div> -<div id="content">%3</div> +<div id="content">%4</div> </div> </body> diff --git a/src/homepage.cpp b/src/homepage.cpp index 98304877..078f2391 100644 --- a/src/homepage.cpp +++ b/src/homepage.cpp @@ -74,24 +74,30 @@ QString HomePage::rekonqHomePage(const KUrl &url) QString menu = homePageMenu(url); QString speed; + QString title; if(url == KUrl("rekonq:allTabs")) { speed = fillAllTabs(); + title = i18n("Open Tabs"); } if(url == KUrl("rekonq:history")) { speed = fillHistory(); + title = i18n("History"); } if(url == KUrl("rekonq:bookmarks")) { speed = fillBookmarks(); + title = i18n("Bookmarks"); } if(url == KUrl("rekonq:home") || url == KUrl("rekonq:favorites")) { speed = fillFavorites(); + title = i18n("Favorites"); } QString html = QString(QLatin1String(file.readAll())) + .arg(title) .arg(imagesPath) .arg(menu) .arg(speed) |