[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    extragear/network/ktorrent
From:       Joris Guisson <joris.guisson () gmail ! com>
Date:       2010-11-09 17:42:33
Message-ID: 20101109174233.9E2CBAC89B () svn ! kde ! org
[Download RAW message or body]

SVN commit 1194734 by guisson:

Ask if an existing file must be overwritten when exporting a torrent 

BUG: 256416

 M  +1 -0      ChangeLog  
 M  +16 -12    ktorrent/view/viewmanager.cpp  
 M  +1 -1      libktcore/interfaces/functions.cpp  


--- trunk/extragear/network/ktorrent/ChangeLog #1194733:1194734
@@ -28,6 +28,7 @@
 - Don't show an error message for each duplicate tracker which is added
 - Stop using hardcoded colors in system tray tooltip (255732)
 - Add support for tracking jobs inside the GUI of ktorrent
+- Ask if an existing file must be overwritten when exporting a torrent (256416)
 
 Changes in 4.0.5:
 - Fix crash due to uncaught exception when creating torrent (255020)
--- trunk/extragear/network/ktorrent/ktorrent/view/viewmanager.cpp #1194733:1194734
@@ -21,14 +21,15 @@
 #include <QWidget>
 #include <QClipboard>
 #include <QApplication>
-#include <ksharedconfig.h>
-#include <kconfiggroup.h>
-#include <kaction.h>
-#include <kactioncollection.h>
-#include <klocale.h>
-#include <kmenu.h>
-#include <kshortcut.h>
-#include <kfiledialog.h>
+#include <KSharedConfig>
+#include <KConfigGroup>
+#include <KAction>
+#include <KActionCollection>
+#include <KLocale>
+#include <KMenu>
+#include <KShortcut>
+#include <KFileDialog>
+#include <KMessageBox>
 #include <groups/group.h>
 #include <util/log.h>
 #include <util/indexofcompare.h>
@@ -48,9 +49,9 @@
 #include "dialogs/speedlimitsdlg.h"
 #include "viewdelegate.h"
 #include "scanextender.h"
+#include <util/fileops.h>
 
 
-
 using namespace bt;
 
 namespace kt
@@ -759,9 +760,12 @@
 		{
 			bt::TorrentInterface* tc = sel.front();
 			QString filter = kt::TorrentFileFilter(false);
-			QString fn = KFileDialog::getSaveFileName(KUrl("kfiledialog:///exportTorrent"),filter);
-			if (!fn.isEmpty())
-				KIO::file_copy(tc->getTorDir() + "torrent",fn);
+			QString fn = KFileDialog::getSaveFileName(KUrl("kfiledialog:///exportTorrent"),filter,gui,
+													  QString(),KFileDialog::ConfirmOverwrite);
+			if (fn.isEmpty())
+				return;
+			
+			KIO::file_copy(tc->getTorDir() + "torrent",fn,-1,KIO::Overwrite);
 		}
 	}
 	
--- trunk/extragear/network/ktorrent/libktcore/interfaces/functions.cpp #1194733:1194734
@@ -161,7 +161,7 @@
 	
 	QString TorrentFileFilter(bool all_files_included)
 	{
-		QString ret = QString("*torrent|%1").arg(i18n("Torrents"));
+		QString ret = QString("*.torrent|%1").arg(i18n("Torrents"));
 		if (all_files_included)
 			ret += "\n*|" + i18n("All files");
 		return ret;
[prev in list] [next in list] [prev in thread] [next in thread]