Fixing (hopefully better than the previous time :) the mr

Merge commit 'refs/merge-requests/1724' of git://gitorious.org/rekonq/mainline into matgicMerge

Conflicts:
	src/homepage.cpp

1 files changed, 20 insertions, 12 deletions

diff --git a/src/homepage.cpp b/src/homepage.cpp
index bd0fb22b..6aef42a9 100644
--- a/src/homepage.cpp
+++ b/src/homepage.cpp
@@ -76,13 +76,21 @@ QString HomePage::rekonqHomePage(const KUrl &url)
     
     QString speed;
     if(url == KUrl("rekonq:lastSites"))
+    {
         speed = lastVisitedSites();
+    }
     if(url == KUrl("rekonq:history"))
+    {
         speed = fillHistory();
+    }
     if(url == KUrl("rekonq:bookmarks"))
+    {
         speed = fillBookmarks();
+    }
     if(url == KUrl("rekonq:home") || url == KUrl("rekonq:favorites"))
+    {
         speed = fillFavorites();
+    }
     
     QString html = QString(QLatin1String(file.readAll()))
                         .arg(imagesPath)
@@ -167,6 +175,13 @@ QString HomePage::homePageMenu(KUrl currentUrl)
     KIconLoader *loader = KIconLoader::global();
     
     menu += "<div class=\"link";
+    if(currentUrl == "rekonq:favorites" || currentUrl == "rekonq:home")
+        menu += " current";
+    menu += "\"><a href=\"rekonq:favorites\">";
+    menu += "<img src=\"file:///" + loader->iconPath("rating", KIconLoader::Desktop) + "\" />";
+    menu += "Favorites</a></div>";
+    
+    menu += "<div class=\"link";
     if(currentUrl == "rekonq:lastSites")
         menu += " current";
     menu += "\"><a href=\"rekonq:lastSites\">";
@@ -174,13 +189,6 @@ QString HomePage::homePageMenu(KUrl currentUrl)
     menu += "Last Visited</a></div>";
     
     menu += "<div class=\"link";
-    if(currentUrl == "rekonq:history")
-        menu += " current";
-    menu += "\"><a href=\"rekonq:history\">";
-    menu += "<img src=\"file:///" + loader->iconPath("view-history", KIconLoader::Desktop) + "\" />";
-    menu += "History</a></div>";
-    
-    menu += "<div class=\"link";
     if(currentUrl == "rekonq:bookmarks")
         menu += " current";
     menu += "\"><a href=\"rekonq:bookmarks\">";
@@ -188,11 +196,11 @@ QString HomePage::homePageMenu(KUrl currentUrl)
     menu += "Bookmarks</a></div>";
     
     menu += "<div class=\"link";
-    if(currentUrl == "rekonq:favorites" || currentUrl == "rekonq:home")
+    if(currentUrl == "rekonq:history")
         menu += " current";
-    menu += "\"><a href=\"rekonq:favorites\">";
-    menu += "<img src=\"file:///" + loader->iconPath("rating", KIconLoader::Desktop) + "\" />";
-    menu += "Favorites</a></div>";
+    menu += "\"><a href=\"rekonq:history\">";
+    menu += "<img src=\"file:///" + loader->iconPath("view-history", KIconLoader::Desktop) + "\" />";
+    menu += "History</a></div>";
     
     
     return menu;
@@ -256,7 +264,7 @@ QString HomePage::createBookItem(const KBookmark &bookmark)
         QString result = QString("");
         KBookmarkGroup group = bookmark.toGroup();
         KBookmark bm = group.first();
-        result += "<h4>" + bookmark.text() + "</h4>";
+        result += "<h3>" + bookmark.text() + "</h3>";
         result += "<p class=\"bookfolder\">";
         while (!bm.isNull())
         {