diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2009-10-21 11:38:46 +0200 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2009-10-21 11:38:46 +0200 |
| commit | 719cda157b81fcebdeb35a9c5d8c075e112c4e40 (patch) | |
| tree | b751ae1b465e6fc945af09cda5ab383ba72403f0 /src | |
| parent | Me stupid.. fixing tab previews! (diff) | |
| parent | fix button (diff) | |
| download | rekonq-719cda157b81fcebdeb35a9c5d8c075e112c4e40.tar.xz | |
Fixing merge due to recent changes in master
Merge commit 'refs/merge-requests/1836' of git://gitorious.org/rekonq/mainline into NewHomePageSytle
Conflicts:
src/homepage.cpp
Diffstat (limited to 'src')
| -rw-r--r-- | src/homepage.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/homepage.cpp b/src/homepage.cpp index 1328fc8d..835be043 100644 --- a/src/homepage.cpp +++ b/src/homepage.cpp @@ -158,7 +158,7 @@ QString HomePage::homePageMenu(KUrl currentUrl) if(currentUrl == "rekonq:favorites" || currentUrl == "rekonq:home") menu += " current"; menu += "\"><a href=\"rekonq:favorites\">"; - menu += "<img src=\"file:///" + loader->iconPath("emblem-favorite", KIconLoader::Desktop) + "\" />"; + menu += "<img src=\"file:///" + loader->iconPath("emblem-favorite", KIconLoader::Desktop || KIconLoader::SizeSmall) + "\" />"; menu += i18n("Favorites"); menu += "</a></div>"; @@ -166,7 +166,7 @@ QString HomePage::homePageMenu(KUrl currentUrl) if(currentUrl == "rekonq:closedTabs") menu += " current"; menu += "\"><a href=\"rekonq:closedTabs\">"; - menu += "<img src=\"file:///" + loader->iconPath("tab-close", KIconLoader::Desktop) + "\" />"; + menu += "<img src=\"file:///" + loader->iconPath("tab-close", KIconLoader::Desktop || KIconLoader::SizeSmall) + "\" />"; menu += i18n("Closed Tabs"); menu += "</a></div>"; @@ -174,7 +174,7 @@ QString HomePage::homePageMenu(KUrl currentUrl) if(currentUrl == "rekonq:bookmarks") menu += " current"; menu += "\"><a href=\"rekonq:bookmarks\">"; - menu += "<img src=\"file:///" + loader->iconPath("bookmarks", KIconLoader::Desktop) + "\" />"; + menu += "<img src=\"file:///" + loader->iconPath("bookmarks", KIconLoader::Desktop || KIconLoader::SizeSmall) + "\" />"; menu += i18n("Bookmarks"); menu += "</a></div>"; @@ -182,7 +182,7 @@ QString HomePage::homePageMenu(KUrl currentUrl) if(currentUrl == "rekonq:history") menu += " current"; menu += "\"><a href=\"rekonq:history\">"; - menu += "<img src=\"file:///" + loader->iconPath("view-history", KIconLoader::Desktop) + "\" />"; + menu += "<img src=\"file:///" + loader->iconPath("view-history", KIconLoader::Desktop || KIconLoader::SizeSmall) + "\" />"; menu += i18n("History"); menu += "</a></div>"; |