diff options
-rw-r--r-- | rbutil/rbutilqt/install.cpp | 9 | ||||
-rw-r--r-- | rbutil/rbutilqt/install.h | 1 | ||||
-rw-r--r-- | rbutil/rbutilqt/installbootloader.cpp | 21 | ||||
-rw-r--r-- | rbutil/rbutilqt/installbootloader.h | 1 | ||||
-rw-r--r-- | rbutil/rbutilqt/installzip.cpp | 12 | ||||
-rw-r--r-- | rbutil/rbutilqt/installzip.h | 1 |
6 files changed, 10 insertions, 35 deletions
diff --git a/rbutil/rbutilqt/install.cpp b/rbutil/rbutilqt/install.cpp index 30c054be9c..dbdd2d4820 100644 --- a/rbutil/rbutilqt/install.cpp +++ b/rbutil/rbutilqt/install.cpp | |||
@@ -136,7 +136,7 @@ void Install::accept() | |||
136 | 136 | ||
137 | //! create backup | 137 | //! create backup |
138 | RbZip backup; | 138 | RbZip backup; |
139 | connect(&backup,SIGNAL(zipProgress(int,int)),this,SLOT(updateDataReadProgress(int,int))); | 139 | connect(&backup,SIGNAL(zipProgress(int,int)),logger,SLOT(setProgress(int,int))); |
140 | if(backup.createZip(m_backupName,settings->mountpoint() + "/.rockbox") == Zip::Ok) | 140 | if(backup.createZip(m_backupName,settings->mountpoint() + "/.rockbox") == Zip::Ok) |
141 | { | 141 | { |
142 | logger->addItem(tr("Backup successfull"),LOGOK); | 142 | logger->addItem(tr("Backup successfull"),LOGOK); |
@@ -178,13 +178,6 @@ void Install::changeBackupPath() | |||
178 | } | 178 | } |
179 | } | 179 | } |
180 | 180 | ||
181 | void Install::updateDataReadProgress(int read, int total) | ||
182 | { | ||
183 | logger->setProgressMax(total); | ||
184 | logger->setProgressValue(read); | ||
185 | //qDebug() << "progress:" << read << "/" << total; | ||
186 | |||
187 | } | ||
188 | 181 | ||
189 | // Zip installer has finished | 182 | // Zip installer has finished |
190 | void Install::done(bool error) | 183 | void Install::done(bool error) |
diff --git a/rbutil/rbutilqt/install.h b/rbutil/rbutilqt/install.h index 37fac4f8b7..6a5dae6544 100644 --- a/rbutil/rbutilqt/install.h +++ b/rbutil/rbutilqt/install.h | |||
@@ -55,7 +55,6 @@ class Install : public QDialog | |||
55 | void setDetailsStable(bool); | 55 | void setDetailsStable(bool); |
56 | void setDetailsArchived(bool); | 56 | void setDetailsArchived(bool); |
57 | void done(bool); | 57 | void done(bool); |
58 | void updateDataReadProgress(int read, int total); | ||
59 | void changeBackupPath(); | 58 | void changeBackupPath(); |
60 | void backupCheckboxChanged(int state); | 59 | void backupCheckboxChanged(int state); |
61 | 60 | ||
diff --git a/rbutil/rbutilqt/installbootloader.cpp b/rbutil/rbutilqt/installbootloader.cpp index 10f6a9f678..dae82b6fd2 100644 --- a/rbutil/rbutilqt/installbootloader.cpp +++ b/rbutil/rbutilqt/installbootloader.cpp | |||
@@ -182,13 +182,6 @@ void BootloaderInstaller::downloadDone(bool error) | |||
182 | 182 | ||
183 | } | 183 | } |
184 | 184 | ||
185 | void BootloaderInstaller::updateDataReadProgress(int read, int total) | ||
186 | { | ||
187 | m_dp->setProgressMax(total); | ||
188 | m_dp->setProgressValue(read); | ||
189 | qDebug() << "progress:" << read << "/" << total; | ||
190 | } | ||
191 | |||
192 | 185 | ||
193 | void BootloaderInstaller::installEnded(bool error) | 186 | void BootloaderInstaller::installEnded(bool error) |
194 | { | 187 | { |
@@ -323,7 +316,7 @@ void BootloaderInstaller::gigabeatPrepare() | |||
323 | getter->setFile(&downloadFile); | 316 | getter->setFile(&downloadFile); |
324 | // connect signals from HttpGet | 317 | // connect signals from HttpGet |
325 | connect(getter, SIGNAL(done(bool)), this, SLOT(downloadDone(bool))); | 318 | connect(getter, SIGNAL(done(bool)), this, SLOT(downloadDone(bool))); |
326 | connect(getter, SIGNAL(dataReadProgress(int, int)), this, SLOT(updateDataReadProgress(int, int))); | 319 | connect(getter, SIGNAL(dataReadProgress(int, int)), m_dp, SLOT(setProgress(int, int))); |
327 | connect(m_dp, SIGNAL(aborted()), getter, SLOT(abort())); | 320 | connect(m_dp, SIGNAL(aborted()), getter, SLOT(abort())); |
328 | 321 | ||
329 | getter->getFile(QUrl(url)); | 322 | getter->getFile(QUrl(url)); |
@@ -469,7 +462,7 @@ void BootloaderInstaller::iaudioPrepare() | |||
469 | getter->getFile(QUrl(url)); | 462 | getter->getFile(QUrl(url)); |
470 | // connect signals from HttpGet | 463 | // connect signals from HttpGet |
471 | connect(getter, SIGNAL(done(bool)), this, SLOT(downloadDone(bool))); | 464 | connect(getter, SIGNAL(done(bool)), this, SLOT(downloadDone(bool))); |
472 | connect(getter, SIGNAL(dataReadProgress(int, int)), this, SLOT(updateDataReadProgress(int, int))); | 465 | connect(getter, SIGNAL(dataReadProgress(int, int)), m_dp, SLOT(setProgress(int, int))); |
473 | connect(m_dp, SIGNAL(aborted()), getter, SLOT(abort())); | 466 | connect(m_dp, SIGNAL(aborted()), getter, SLOT(abort())); |
474 | } | 467 | } |
475 | 468 | ||
@@ -525,7 +518,7 @@ void BootloaderInstaller::h10Prepare() | |||
525 | getter->setFile(&downloadFile); | 518 | getter->setFile(&downloadFile); |
526 | // connect signals from HttpGet | 519 | // connect signals from HttpGet |
527 | connect(getter, SIGNAL(done(bool)), this, SLOT(downloadDone(bool))); | 520 | connect(getter, SIGNAL(done(bool)), this, SLOT(downloadDone(bool))); |
528 | connect(getter, SIGNAL(dataReadProgress(int, int)), this, SLOT(updateDataReadProgress(int, int))); | 521 | connect(getter, SIGNAL(dataReadProgress(int, int)), m_dp, SLOT(setProgress(int, int))); |
529 | connect(m_dp, SIGNAL(aborted()), getter, SLOT(abort())); | 522 | connect(m_dp, SIGNAL(aborted()), getter, SLOT(abort())); |
530 | 523 | ||
531 | getter->getFile(QUrl(url)); | 524 | getter->getFile(QUrl(url)); |
@@ -684,7 +677,7 @@ void BootloaderInstaller::mrobe100Prepare() | |||
684 | 677 | ||
685 | // connect signals from HttpGet | 678 | // connect signals from HttpGet |
686 | connect(getter, SIGNAL(done(bool)), this, SLOT(downloadDone(bool))); | 679 | connect(getter, SIGNAL(done(bool)), this, SLOT(downloadDone(bool))); |
687 | connect(getter, SIGNAL(dataReadProgress(int, int)), this, SLOT(updateDataReadProgress(int, int))); | 680 | connect(getter, SIGNAL(dataReadProgress(int, int)), m_dp, SLOT(setProgress(int, int))); |
688 | connect(m_dp, SIGNAL(aborted()), getter, SLOT(abort())); | 681 | connect(m_dp, SIGNAL(aborted()), getter, SLOT(abort())); |
689 | 682 | ||
690 | getter->getFile(QUrl(url)); | 683 | getter->getFile(QUrl(url)); |
@@ -854,7 +847,7 @@ void BootloaderInstaller::ipodPrepare() | |||
854 | 847 | ||
855 | // connect signals from HttpGet | 848 | // connect signals from HttpGet |
856 | connect(getter, SIGNAL(done(bool)), this, SLOT(downloadDone(bool))); | 849 | connect(getter, SIGNAL(done(bool)), this, SLOT(downloadDone(bool))); |
857 | connect(getter, SIGNAL(dataReadProgress(int, int)), this, SLOT(updateDataReadProgress(int, int))); | 850 | connect(getter, SIGNAL(dataReadProgress(int, int)), m_dp, SLOT(setProgress(int, int))); |
858 | connect(m_dp, SIGNAL(aborted()), getter, SLOT(abort())); | 851 | connect(m_dp, SIGNAL(aborted()), getter, SLOT(abort())); |
859 | 852 | ||
860 | getter->getFile(QUrl(url)); | 853 | getter->getFile(QUrl(url)); |
@@ -1098,7 +1091,7 @@ void BootloaderInstaller::sansaPrepare() | |||
1098 | 1091 | ||
1099 | // connect signals from HttpGet | 1092 | // connect signals from HttpGet |
1100 | connect(getter, SIGNAL(done(bool)), this, SLOT(downloadDone(bool))); | 1093 | connect(getter, SIGNAL(done(bool)), this, SLOT(downloadDone(bool))); |
1101 | connect(getter, SIGNAL(dataReadProgress(int, int)), this, SLOT(updateDataReadProgress(int, int))); | 1094 | connect(getter, SIGNAL(dataReadProgress(int, int)), m_dp, SLOT(setProgress(int, int))); |
1102 | connect(m_dp, SIGNAL(aborted()), getter, SLOT(abort())); | 1095 | connect(m_dp, SIGNAL(aborted()), getter, SLOT(abort())); |
1103 | 1096 | ||
1104 | getter->getFile(QUrl(url)); | 1097 | getter->getFile(QUrl(url)); |
@@ -1288,7 +1281,7 @@ void BootloaderInstaller::iriverPrepare() | |||
1288 | 1281 | ||
1289 | // connect signals from HttpGet | 1282 | // connect signals from HttpGet |
1290 | connect(getter, SIGNAL(done(bool)), this, SLOT(downloadDone(bool))); | 1283 | connect(getter, SIGNAL(done(bool)), this, SLOT(downloadDone(bool))); |
1291 | connect(getter, SIGNAL(dataReadProgress(int, int)), this, SLOT(updateDataReadProgress(int, int))); | 1284 | connect(getter, SIGNAL(dataReadProgress(int, int)), m_dp, SLOT(setProgress(int, int))); |
1292 | connect(m_dp, SIGNAL(aborted()), getter, SLOT(abort())); | 1285 | connect(m_dp, SIGNAL(aborted()), getter, SLOT(abort())); |
1293 | 1286 | ||
1294 | getter->getFile(QUrl(url)); | 1287 | getter->getFile(QUrl(url)); |
diff --git a/rbutil/rbutilqt/installbootloader.h b/rbutil/rbutilqt/installbootloader.h index 727b8bfbe7..cb283b5c85 100644 --- a/rbutil/rbutilqt/installbootloader.h +++ b/rbutil/rbutilqt/installbootloader.h | |||
@@ -68,7 +68,6 @@ private slots: | |||
68 | void createInstallLog(); // adds the bootloader entry to the log | 68 | void createInstallLog(); // adds the bootloader entry to the log |
69 | void removeInstallLog(); // removes the bootloader entry from the log | 69 | void removeInstallLog(); // removes the bootloader entry from the log |
70 | 70 | ||
71 | void updateDataReadProgress(int, int); | ||
72 | void downloadDone(bool); | 71 | void downloadDone(bool); |
73 | void downloadRequestFinished(int, bool); | 72 | void downloadRequestFinished(int, bool); |
74 | void infoDownloadDone(bool); | 73 | void infoDownloadDone(bool); |
diff --git a/rbutil/rbutilqt/installzip.cpp b/rbutil/rbutilqt/installzip.cpp index 6514c6d13d..5842e00d3f 100644 --- a/rbutil/rbutilqt/installzip.cpp +++ b/rbutil/rbutilqt/installzip.cpp | |||
@@ -91,7 +91,7 @@ void ZipInstaller::installStart() | |||
91 | getter->setFile(downloadFile); | 91 | getter->setFile(downloadFile); |
92 | 92 | ||
93 | connect(getter, SIGNAL(done(bool)), this, SLOT(downloadDone(bool))); | 93 | connect(getter, SIGNAL(done(bool)), this, SLOT(downloadDone(bool))); |
94 | connect(getter, SIGNAL(dataReadProgress(int, int)), this, SLOT(updateDataReadProgress(int, int))); | 94 | connect(getter, SIGNAL(dataReadProgress(int, int)), m_dp, SLOT(setProgress(int, int))); |
95 | connect(m_dp, SIGNAL(aborted()), getter, SLOT(abort())); | 95 | connect(m_dp, SIGNAL(aborted()), getter, SLOT(abort())); |
96 | 96 | ||
97 | getter->getFile(QUrl(m_url)); | 97 | getter->getFile(QUrl(m_url)); |
@@ -135,7 +135,7 @@ void ZipInstaller::downloadDone(bool error) | |||
135 | qDebug() << "file to unzip: " << m_file; | 135 | qDebug() << "file to unzip: " << m_file; |
136 | UnZip::ErrorCode ec; | 136 | UnZip::ErrorCode ec; |
137 | RbUnZip uz; | 137 | RbUnZip uz; |
138 | connect(&uz, SIGNAL(unzipProgress(int, int)), this, SLOT(updateDataReadProgress(int, int))); | 138 | connect(&uz, SIGNAL(unzipProgress(int, int)), m_dp, SLOT(setProgress(int, int))); |
139 | connect(m_dp, SIGNAL(aborted()), &uz, SLOT(abortUnzip())); | 139 | connect(m_dp, SIGNAL(aborted()), &uz, SLOT(abortUnzip())); |
140 | ec = uz.openArchive(m_file); | 140 | ec = uz.openArchive(m_file); |
141 | if(ec != UnZip::Ok) { | 141 | if(ec != UnZip::Ok) { |
@@ -200,12 +200,4 @@ void ZipInstaller::downloadDone(bool error) | |||
200 | emit cont(); | 200 | emit cont(); |
201 | } | 201 | } |
202 | 202 | ||
203 | void ZipInstaller::updateDataReadProgress(int read, int total) | ||
204 | { | ||
205 | m_dp->setProgressMax(total); | ||
206 | m_dp->setProgressValue(read); | ||
207 | //qDebug() << "progress:" << read << "/" << total; | ||
208 | |||
209 | } | ||
210 | |||
211 | 203 | ||
diff --git a/rbutil/rbutilqt/installzip.h b/rbutil/rbutilqt/installzip.h index 63de08e2c9..3b3dd79602 100644 --- a/rbutil/rbutilqt/installzip.h +++ b/rbutil/rbutilqt/installzip.h | |||
@@ -54,7 +54,6 @@ signals: | |||
54 | void cont(); | 54 | void cont(); |
55 | 55 | ||
56 | private slots: | 56 | private slots: |
57 | void updateDataReadProgress(int, int); | ||
58 | void downloadDone(bool); | 57 | void downloadDone(bool); |
59 | void installStart(void); | 58 | void installStart(void); |
60 | void installContinue(void); | 59 | void installContinue(void); |