diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/homepage.cpp | 8 | ||||
| -rw-r--r-- | src/websnap.cpp | 19 | ||||
| -rw-r--r-- | src/websnap.h | 2 |
3 files changed, 16 insertions, 13 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>"; diff --git a/src/websnap.cpp b/src/websnap.cpp index 5727bc6f..bb2baf49 100644 --- a/src/websnap.cpp +++ b/src/websnap.cpp @@ -74,7 +74,7 @@ void WebSnap::load() } -QPixmap WebSnap::renderPreview(const QWebPage &page,int w, int h) +QPixmap WebSnap::renderPreview(const QWebPage &page,int w, int h, bool border) { // prepare page page.mainFrame()->setScrollBarPolicy(Qt::Vertical, Qt::ScrollBarAlwaysOff); // Why it doesn't work with one setScrollBarPolicy? @@ -105,6 +105,15 @@ QPixmap WebSnap::renderPreview(const QWebPage &page,int w, int h) p.end(); pageImage = pageImage.scaled(w, h, Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation); + // restore page settings + page.mainFrame()->setScrollBarPolicy(Qt::Horizontal, Qt::ScrollBarAsNeeded); + page.mainFrame()->setScrollBarPolicy(Qt::Horizontal, Qt::ScrollBarAsNeeded); + page.mainFrame()->setScrollBarPolicy(Qt::Vertical, Qt::ScrollBarAsNeeded); + page.mainFrame()->setScrollBarPolicy(Qt::Vertical, Qt::ScrollBarAsNeeded); + + if(!border) + return QPixmap::fromImage(pageImage); + // background image QSize fixedSize(w + 30, h + 26); QImage backImage = QImage(fixedSize, QImage::Format_ARGB32_Premultiplied); @@ -126,12 +135,6 @@ QPixmap WebSnap::renderPreview(const QWebPage &page,int w, int h) pt.fillRect(resultImage.rect(), Qt::transparent); pt.end(); - // restore page settings - page.mainFrame()->setScrollBarPolicy(Qt::Horizontal, Qt::ScrollBarAsNeeded); - page.mainFrame()->setScrollBarPolicy(Qt::Horizontal, Qt::ScrollBarAsNeeded); - page.mainFrame()->setScrollBarPolicy(Qt::Vertical, Qt::ScrollBarAsNeeded); - page.mainFrame()->setScrollBarPolicy(Qt::Vertical, Qt::ScrollBarAsNeeded); - return QPixmap::fromImage(resultImage); } @@ -145,7 +148,7 @@ void WebSnap::saveResult(bool ok) return; } - m_image = renderPreview(m_page, WIDTH, HEIGHT); + m_image = renderPreview(m_page, WIDTH, HEIGHT, true); emit finished(); } diff --git a/src/websnap.h b/src/websnap.h index 6c5b4af9..026c236c 100644 --- a/src/websnap.h +++ b/src/websnap.h @@ -52,7 +52,7 @@ public: ~WebSnap(); QPixmap previewImage(); - static QPixmap renderPreview(const QWebPage &page, int w, int h); + static QPixmap renderPreview(const QWebPage &page, int w, int h, bool border = false); QString snapTitle(); QUrl snapUrl(); |