diff options
| author | matgic78 <matgic78@gmail.com> | 2010-02-06 11:19:18 +0100 |
|---|---|---|
| committer | matgic78 <matgic78@gmail.com> | 2010-02-06 11:22:47 +0100 |
| commit | 6f3b61c0462b08d3c2a34ac1923470a3690233ee (patch) | |
| tree | 51fd464c3713fc60a927742742b7d2b2a488cfef /src/websnap.cpp | |
| parent | Do not try to load homepage if url is not valid (diff) | |
| download | rekonq-6f3b61c0462b08d3c2a34ac1923470a3690233ee.tar.xz | |
Fix loading previews : when load finished, result wasn't shown
Diffstat (limited to 'src/websnap.cpp')
| -rw-r--r-- | src/websnap.cpp | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/src/websnap.cpp b/src/websnap.cpp index 983da716..11b70e9e 100644 --- a/src/websnap.cpp +++ b/src/websnap.cpp @@ -29,6 +29,9 @@ #include "websnap.h" #include "websnap.moc" +// Local Includes +#include "newtabpage.h" + // KDE Includes #include <KDebug> #include <KStandardDirs> @@ -42,10 +45,12 @@ #include <QFile> -WebSnap::WebSnap(const QUrl &url) +WebSnap::WebSnap(const QUrl& url, QWebPage* originatingPage, int previewIndex) : QObject() { m_url = url; + m_originatingPage = originatingPage; + m_previewIndex = previewIndex; // this to not register websnap history m_page.settings()->setAttribute(QWebSettings::PrivateBrowsingEnabled, true); @@ -120,18 +125,6 @@ KUrl WebSnap::fileForUrl(KUrl url) } -void WebSnap::SetData(QVariant data) -{ - m_data = data; -} - -QVariant& WebSnap::data() -{ - return m_data; -} - - - QString WebSnap::guessNameFromUrl(QUrl url) { QString name = url.toString( QUrl::RemoveScheme | QUrl::RemoveUserInfo | QUrl::StripTrailingSlash ); @@ -163,12 +156,16 @@ void WebSnap::saveResult(bool ok) else { m_image = renderPreview(m_page, WIDTH, HEIGHT); + m_snapTitle = m_page.mainFrame()->title(); } QFile::remove(fileForUrl(m_url).toLocalFile()); m_image.save(fileForUrl(m_url).toLocalFile()); - kDebug() << "finished"; - emit finished(); + //m_originatingPage->mainFrame()->load(KUrl("about:preview/replace/" + QVariant(m_previewIndex).toString())); + NewTabPage p(m_originatingPage->mainFrame()); + p.snapFinished(m_previewIndex, m_url, m_snapTitle); + + deleteLater(); } |