summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoradjam <adjam@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2009-05-17 09:58:51 +0000
committeradjam <adjam@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2009-05-17 09:58:51 +0000
commit96766d61724879a3dab8da115e0fb5ba019de973 (patch)
treeae54e03a3d64d362b68cce8e72260dd36985f2ba
parentMerge branch 'master' into local-svn (diff)
parentRemoved "DontshowAgain" check in download dialog (diff)
downloadrekonq-96766d61724879a3dab8da115e0fb5ba019de973.tar.xz
Merge branch 'develop' into local-svn
git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/playground/network/rekonq@969009 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-rw-r--r--TODO1
-rw-r--r--src/download.cpp16
2 files changed, 9 insertions, 8 deletions
diff --git a/TODO b/TODO
index 9ce53468..df2a72ac 100644
--- a/TODO
+++ b/TODO
@@ -16,6 +16,7 @@ TO 0.2 release
- unique url/search/history bar
- WebkitKDE (ask about status)
+- cookie system refactor
- bookmarks panel
- MimeType Manager
- BETTER KDE INTEGRATION (What else to be done??)
diff --git a/src/download.cpp b/src/download.cpp
index a5aa73bd..c365d3c5 100644
--- a/src/download.cpp
+++ b/src/download.cpp
@@ -69,14 +69,14 @@ void DownloadManager::newDownload(const KUrl &srcUrl, const KUrl &destUrl)
QString typeText = KMimeType::extractKnownExtension(srcUrl.fileName());
typeText += " (" + mimeType->name() + ')';
- int answer = KMessageBox::questionYesNoCancel(NULL,
- i18n("Download '%1'?\n""Type: %2", srcUrl.prettyUrl(), typeText),
- i18n("Download '%1'...", srcUrl.fileName()),
- KStandardGuiItem::save(),
- KStandardGuiItem::open(),
- KStandardGuiItem::cancel(),
- "showOpenSaveDownloadDialog"
- );
+ int answer = KMessageBox::questionYesNoCancel(
+ NULL,
+ i18n("Download '%1'?\n""Type: %2", srcUrl.prettyUrl(), typeText),
+ i18n("Download '%1'...", srcUrl.fileName()),
+ KStandardGuiItem::save(),
+ KStandardGuiItem::open(),
+ KStandardGuiItem::cancel()
+ );
switch (answer)
{