r19788 by craig - Update dl mgr again

[scribus-commit]

Author: craig
Date: Tue Feb  3 20:05:34 2015
New Revision: 19788

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19788
Log:
Update dl mgr again

Modified:
    trunk/Scribus/scribus/downloadmanager/scdlmgr.cpp
    trunk/Scribus/scribus/ui/downloadspalette.cpp

Modified: trunk/Scribus/scribus/downloadmanager/scdlmgr.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19788&path=/trunk/Scribus/scribus/downloadmanager/scdlmgr.cpp
==============================================================================
--- trunk/Scribus/scribus/downloadmanager/scdlmgr.cpp (original)
+++ trunk/Scribus/scribus/downloadmanager/scdlmgr.cpp Tue Feb  3 20:05:34 2015
@@ -14,10 +14,10 @@
 {
 	dlID=0;
 	thread=new ScDLThread();
-//	connect(thread, SIGNAL(received(const QString &)), this, SLOT(dlReceived(const QString&)));
-//	connect(thread, SIGNAL(failed(const QString &)), this, SLOT(dlFailed(const QString&)));
+	connect(thread, SIGNAL(received(const QString &)), this, SLOT(dlReceived(const QString&)));
+	connect(thread, SIGNAL(failed(const QString &)), this, SLOT(dlFailed(const QString&)));
 	connect(thread, SIGNAL(finished()), this, SIGNAL(finished()));
-//	connect(thread, SIGNAL(finished()), this, SLOT(moveFinishedDownloads()));
+	connect(thread, SIGNAL(finished()), this, SLOT(moveFinishedDownloads()));
 }
 
 ScDLManager::~ScDLManager()
@@ -90,6 +90,7 @@
 		{
 			qDebug()<<"success"<<i.value().downloadLocation+i.value().name<<t;
 			i.value().state=DownloadData::Successful;
+			break;
 		}
 	}
 }
@@ -107,6 +108,7 @@
 		{
 			qDebug()<<"fail"<<i.value().downloadLocation+i.value().name<<t;
 			i.value().state=DownloadData::Failed;
+			break;
 		}
 	}
 }

Modified: trunk/Scribus/scribus/ui/downloadspalette.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19788&path=/trunk/Scribus/scribus/ui/downloadspalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/downloadspalette.cpp (original)
+++ trunk/Scribus/scribus/ui/downloadspalette.cpp Tue Feb  3 20:05:34 2015
@@ -18,3 +18,8 @@
 	removeAllButton->setText( tr( "Remove All" ) );
 }
 
+void DownloadsPalette::addDownload(const QString& name, const QString& source, const QString& destination)
+{
+
+}
+