diff options
| -rw-r--r-- | src/bookmarks/bookmarksmanager.cpp | 4 | ||||
| -rw-r--r-- | src/history/historypanel.cpp | 4 | ||||
| -rw-r--r-- | src/mainwindow.cpp | 15 | ||||
| -rw-r--r-- | src/newtabpage.cpp | 2 |
4 files changed, 20 insertions, 5 deletions
diff --git a/src/bookmarks/bookmarksmanager.cpp b/src/bookmarks/bookmarksmanager.cpp index 503e1df8..c06375b5 100644 --- a/src/bookmarks/bookmarksmanager.cpp +++ b/src/bookmarks/bookmarksmanager.cpp @@ -100,7 +100,9 @@ void BookmarkOwner::openFolderinTabs(const KBookmarkGroup &bookmark) if (urlList.length() > 8) { if ( !(KMessageBox::warningContinueCancel( Application::instance()->mainWindow(), - i18n("You are about to open %1 tabs.\nAre you sure?", + i18ncp("%1=Number of tabs. Value is always >=8", + "You are about to open %1 tabs.\nAre you sure?", + "You are about to open %1 tabs.\nAre you sure?", QString::number( urlList.length() )) ) == KMessageBox::Continue) ) diff --git a/src/history/historypanel.cpp b/src/history/historypanel.cpp index 65c9de81..28284e0a 100644 --- a/src/history/historypanel.cpp +++ b/src/history/historypanel.cpp @@ -172,7 +172,9 @@ void HistoryPanel::openAll() if (allChild.length() > 8) { if (!(KMessageBox::warningContinueCancel(this, - i18n("You are about to open %1 tabs.\nAre you sure?", + i18ncp("%1=Number of tabs. Value is always >=8", + "You are about to open %1 tabs.\nAre you sure?", + "You are about to open %1 tabs.\nAre you sure?", QString::number(allChild.length()))) == KMessageBox::Continue) ) return; diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 43418ed3..95fbd92d 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -609,8 +609,19 @@ void MainWindow::openLocation() void MainWindow::fileSaveAs() { - KUrl srcUrl = currentTab()->url(); - + KUrl srcUrl; + WebTab *w = currentTab(); + if (w->page()->isOnRekonqPage()) + { + QWebElement el = w->page()->mainFrame()->documentElement(); + srcUrl = KUrl( el.findFirst("object").attribute("data") ); + } + else + { + srcUrl = w->url(); + } + kDebug() << "URL to save: " << srcUrl; + QString name = srcUrl.fileName(); if (name.isNull()) { diff --git a/src/newtabpage.cpp b/src/newtabpage.cpp index b3b9cf65..015e655b 100644 --- a/src/newtabpage.cpp +++ b/src/newtabpage.cpp @@ -582,7 +582,7 @@ void NewTabPage::downloadsPage() div.appendInside("<em>" + date + "</em>"); div.appendInside("<br/>"); - div.appendInside(item.srcUrlString); + div.appendInside("<a href=" + item.srcUrlString + ">" + item.srcUrlString + "</a>"); div.appendInside("<br/>"); div.appendInside(markup("a")); |