diff options
| author | Benjamin Poulain <benjamin.poulain@nokia.com> | 2010-11-20 19:05:33 +0100 |
|---|---|---|
| committer | Benjamin Poulain <benjamin.poulain@nokia.com> | 2010-11-20 19:10:14 +0100 |
| commit | 11769558f3f9107c45457ba7c735a1991e42f625 (patch) | |
| tree | ffd7057c77794364291a030aa73aa534fb0ea863 /src/webpage.cpp | |
| parent | Remove the destructor of MainView (diff) | |
| parent | Fix markup: (diff) | |
| download | rekonq-11769558f3f9107c45457ba7c735a1991e42f625.tar.xz | |
Merge branch 'master' of git://git.kde.org/rekonq
Conflicts:
src/mainview.cpp
src/mainview.h
src/webtab.cpp
src/webtab.h
Diffstat (limited to 'src/webpage.cpp')
| -rw-r--r-- | src/webpage.cpp | 40 |
1 files changed, 15 insertions, 25 deletions
diff --git a/src/webpage.cpp b/src/webpage.cpp index 4bbed2f5..b04c5e89 100644 --- a/src/webpage.cpp +++ b/src/webpage.cpp @@ -109,11 +109,12 @@ static bool downloadResource (const KUrl& srcUrl, const KIO::MetaData& metaData KUrl destUrl; int result = KIO::R_OVERWRITE; - const QUrl fileName ((suggestedName.isEmpty() ? srcUrl.fileName() : suggestedName)); + const QString fileName ((suggestedName.isEmpty() ? srcUrl.fileName() : suggestedName)); do { - destUrl = KFileDialog::getSaveFileName(fileName, QString(), parent); + // follow bug:184202 fixes + destUrl = KFileDialog::getSaveFileName(KUrl::fromPath(fileName), QString(), parent); if(destUrl.isEmpty()) return false; @@ -229,7 +230,13 @@ WebPage::~WebPage() bool WebPage::acceptNavigationRequest(QWebFrame *frame, const QNetworkRequest &request, NavigationType type) { - _isOnRekonqPage = false; + if(_isOnRekonqPage) + { + WebView *view = qobject_cast<WebView *>(parent()); + WebTab *tab = qobject_cast<WebTab *>(view->parent()); + _isOnRekonqPage = false; + tab->setPart(0, KUrl()); // re-enable the view page + } _loadingUrl = request.url(); KIO::AccessManager *manager = qobject_cast<KIO::AccessManager*>(networkAccessManager()); @@ -439,32 +446,15 @@ void WebPage::handleUnsupportedContent(QNetworkReply *reply) } // case KParts::BrowserRun::Embed - KService::List partServices = KMimeTypeTrader::self()->query(mimeType, QL1S("KParts/ReadOnlyPart")); - if (partServices.count() > 0) + KParts::ReadOnlyPart *pa = KMimeTypeTrader::createPartInstanceFromQuery<KParts::ReadOnlyPart>(mimeType, view(), this, QString()); + if (pa) { - QString p = replyUrl.pathOrUrl(); - - // A part can handle this. Embed it! - QString html; - html += "<html>"; - html += "<head>"; - html += "<title>"; - html += p; - html += "</title>"; - html += "<style type=\"text/css\">"; - html += "* { border: 0; padding: 0; margin: 0; }"; - html += "</style>"; - html += "</head>"; - html += "<body>"; - html += "<object type=\"" + mimeType + "\" data=\"" + p + "\" width=\"100%\" height=\"100%\" />"; - html += "</body>"; - html += "</html>"; - - mainFrame()->setHtml(html); _isOnRekonqPage = true; - + WebView *view = qobject_cast<WebView *>(parent()); WebTab *tab = qobject_cast<WebTab *>(view->parent()); + tab->setPart(pa,replyUrl); + UrlBar *bar = tab->urlBar(); bar->setQUrl(replyUrl); |