From 9c31cfa915f71adee8579aa97c12b64903ec9446 Mon Sep 17 00:00:00 2001
From: Tannin <devnull@localhost>
Date: Fri, 30 Aug 2013 20:59:12 +0200
Subject: - the download manager now registers download speed. Right now this
 is only used to display an average speed on the settings menu - added a
 python27.dll compiled with vc100. This can now be bundled without introducing
 more dependencies - bugfix: extracting now stops after an error - bugfix: the
 way hook.dll caused CREATE_ALWAYS/CREATE_NEW to always write into overwrite
 could lead to the file being created when the call should have failed
 (because the file existed and was protected) - bugfix:
 GetPrivateProfileString does NOT properly report files as missing. This means
 that the ini-query optimization could optimize away requests that should work
 - bugfix: fomod installer couldn't display images because they were unpacked
 to the wrong temporary location - bugfix: When disabling local saves and
 choosing to delete the saves nothing happened - bugfix: the python plugin
 couldn't find the pyqt libraries

---
 src/mainwindow.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'src/mainwindow.cpp')

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index ebfdfc42..8d5429b4 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -218,6 +218,7 @@ MainWindow::MainWindow(const QString &exeName, QSettings &initSettings, QWidget
   ui->savegameList->setMouseTracking(true);
 
   connect(&m_DownloadManager, SIGNAL(showMessage(QString)), this, SLOT(showMessage(QString)));
+  connect(&m_DownloadManager, SIGNAL(downloadSpeed(QString,int)), this, SLOT(downloadSpeed(QString,int)));
 
   connect(ui->savegameList, SIGNAL(itemEntered(QListWidgetItem*)), this, SLOT(saveSelectionChanged(QListWidgetItem*)));
 
@@ -1035,7 +1036,7 @@ void MainWindow::loadPlugins()
   }
 
   QString pluginPath = QDir::fromNativeSeparators(ToQString(GameInfo::instance().getOrganizerDirectory())) + "/" + ToQString(AppConfig::pluginPath());
-  qDebug("looking for plugins in %s", pluginPath.toUtf8().constData());
+  qDebug("looking for plugins in %s", QDir::toNativeSeparators(pluginPath).toUtf8().constData());
   QDirIterator iter(pluginPath, QDir::Files | QDir::NoDotAndDotDot);
   while (iter.hasNext()) {
     iter.next();
@@ -3592,6 +3593,12 @@ void MainWindow::linkMenu()
   }
 }
 
+void MainWindow::downloadSpeed(const QString &serverName, int bytesPerSecond)
+{
+  m_Settings.setDownloadSpeed(serverName, bytesPerSecond);
+}
+
+
 void MainWindow::on_actionSettings_triggered()
 {
   QString oldModDirectory(m_Settings.getModDirectory());
@@ -4098,7 +4105,6 @@ void MainWindow::updateDownloadListDelegate()
   ui->downloadView->setModel(sortProxy);
   ui->downloadView->sortByColumn(1, Qt::AscendingOrder);
   ui->downloadView->header()->resizeSections(QHeaderView::Fixed);
-//  ui->downloadView->setFirstColumnSpanned(0, QModelIndex(), true);
 
   connect(ui->downloadView->itemDelegate(), SIGNAL(installDownload(int)), this, SLOT(installDownload(int)));
   connect(ui->downloadView->itemDelegate(), SIGNAL(queryInfo(int)), &m_DownloadManager, SLOT(queryInfo(int)));
-- 
cgit v1.3.1