diff options
-rw-r--r-- | rbutil/rbutilqt/autodetection.cpp | 12 | ||||
-rw-r--r-- | rbutil/rbutilqt/autodetection.h | 6 | ||||
-rw-r--r-- | rbutil/rbutilqt/browseof.cpp | 8 | ||||
-rw-r--r-- | rbutil/rbutilqt/browseof.h | 4 | ||||
-rw-r--r-- | rbutil/rbutilqt/configure.cpp | 26 | ||||
-rw-r--r-- | rbutil/rbutilqt/configure.h | 4 | ||||
-rw-r--r-- | rbutil/rbutilqt/install.cpp | 8 | ||||
-rw-r--r-- | rbutil/rbutilqt/installbootloader.cpp | 364 | ||||
-rw-r--r-- | rbutil/rbutilqt/installbootloader.h | 36 | ||||
-rw-r--r-- | rbutil/rbutilqt/installtalkwindow.cpp | 24 | ||||
-rw-r--r-- | rbutil/rbutilqt/installthemes.cpp | 12 | ||||
-rw-r--r-- | rbutil/rbutilqt/installzip.cpp | 12 | ||||
-rw-r--r-- | rbutil/rbutilqt/installzip.h | 22 | ||||
-rw-r--r-- | rbutil/rbutilqt/preview.cpp | 14 | ||||
-rw-r--r-- | rbutil/rbutilqt/preview.h | 16 | ||||
-rw-r--r-- | rbutil/rbutilqt/rbutilqt.cpp | 76 | ||||
-rw-r--r-- | rbutil/rbutilqt/rbutilqt.h | 14 | ||||
-rw-r--r-- | rbutil/rbutilqt/talkfile.cpp | 22 | ||||
-rw-r--r-- | rbutil/rbutilqt/talkfile.h | 8 | ||||
-rw-r--r-- | rbutil/rbutilqt/uninstall.h | 26 | ||||
-rw-r--r-- | rbutil/rbutilqt/uninstallwindow.cpp | 18 |
21 files changed, 366 insertions, 366 deletions
diff --git a/rbutil/rbutilqt/autodetection.cpp b/rbutil/rbutilqt/autodetection.cpp index c16b6976cc..dc1bb72428 100644 --- a/rbutil/rbutilqt/autodetection.cpp +++ b/rbutil/rbutilqt/autodetection.cpp | |||
@@ -155,22 +155,22 @@ QStringList Autodetection::getMountpoints() | |||
155 | tempList << list.at(i).absolutePath(); | 155 | tempList << list.at(i).absolutePath(); |
156 | } | 156 | } |
157 | return tempList; | 157 | return tempList; |
158 | 158 | ||
159 | #elif defined(Q_OS_MACX) | 159 | #elif defined(Q_OS_MACX) |
160 | QDir dir("/Volumes"); | 160 | QDir dir("/Volumes"); |
161 | return dir.entryList(); | 161 | return dir.entryList(); |
162 | #elif defined(Q_OS_LINUX) | 162 | #elif defined(Q_OS_LINUX) |
163 | QStringList tempList; | 163 | QStringList tempList; |
164 | 164 | ||
165 | FILE *mn = setmntent("/etc/mtab", "r"); | 165 | FILE *mn = setmntent("/etc/mtab", "r"); |
166 | if(!mn) | 166 | if(!mn) |
167 | return QStringList(""); | 167 | return QStringList(""); |
168 | 168 | ||
169 | struct mntent *ent; | 169 | struct mntent *ent; |
170 | while((ent = getmntent(mn))) | 170 | while((ent = getmntent(mn))) |
171 | tempList << QString(ent->mnt_dir); | 171 | tempList << QString(ent->mnt_dir); |
172 | endmntent(mn); | 172 | endmntent(mn); |
173 | 173 | ||
174 | return tempList; | 174 | return tempList; |
175 | #else | 175 | #else |
176 | #error Unknown Plattform | 176 | #error Unknown Plattform |
@@ -185,7 +185,7 @@ QString Autodetection::resolveMountPoint(QString device) | |||
185 | FILE *mn = setmntent("/etc/mtab", "r"); | 185 | FILE *mn = setmntent("/etc/mtab", "r"); |
186 | if(!mn) | 186 | if(!mn) |
187 | return QString(""); | 187 | return QString(""); |
188 | 188 | ||
189 | struct mntent *ent; | 189 | struct mntent *ent; |
190 | while((ent = getmntent(mn))) { | 190 | while((ent = getmntent(mn))) { |
191 | if(QString(ent->mnt_fsname).startsWith(device) | 191 | if(QString(ent->mnt_fsname).startsWith(device) |
@@ -221,7 +221,7 @@ bool Autodetection::detectUsb() | |||
221 | // the ini file needs to hold the IDs as hex values. | 221 | // the ini file needs to hold the IDs as hex values. |
222 | QMap<int, QString> usbids; | 222 | QMap<int, QString> usbids; |
223 | QMap<int, QString> usberror; | 223 | QMap<int, QString> usberror; |
224 | 224 | ||
225 | for(int i = 0; i < platforms.size(); i++) { | 225 | for(int i = 0; i < platforms.size(); i++) { |
226 | dev.beginGroup("platforms"); | 226 | dev.beginGroup("platforms"); |
227 | QString target = dev.value(platforms.at(i)).toString(); | 227 | QString target = dev.value(platforms.at(i)).toString(); |
diff --git a/rbutil/rbutilqt/autodetection.h b/rbutil/rbutilqt/autodetection.h index 85b69045ef..83eb3979fe 100644 --- a/rbutil/rbutilqt/autodetection.h +++ b/rbutil/rbutilqt/autodetection.h | |||
@@ -35,9 +35,9 @@ class Autodetection :public QObject | |||
35 | 35 | ||
36 | public: | 36 | public: |
37 | Autodetection(QObject* parent=0); | 37 | Autodetection(QObject* parent=0); |
38 | 38 | ||
39 | bool detect(); | 39 | bool detect(); |
40 | 40 | ||
41 | QString getDevice() {return m_device;} | 41 | QString getDevice() {return m_device;} |
42 | QString getMountPoint() {return m_mountpoint;} | 42 | QString getMountPoint() {return m_mountpoint;} |
43 | QString errdev(void) { return m_errdev; } | 43 | QString errdev(void) { return m_errdev; } |
@@ -46,7 +46,7 @@ private: | |||
46 | QStringList getMountpoints(void); | 46 | QStringList getMountpoints(void); |
47 | QString resolveMountPoint(QString); | 47 | QString resolveMountPoint(QString); |
48 | bool detectUsb(void); | 48 | bool detectUsb(void); |
49 | 49 | ||
50 | QString m_device; | 50 | QString m_device; |
51 | QString m_mountpoint; | 51 | QString m_mountpoint; |
52 | QString m_errdev; | 52 | QString m_errdev; |
diff --git a/rbutil/rbutilqt/browseof.cpp b/rbutil/rbutilqt/browseof.cpp index 93b768c263..28cde9c6fe 100644 --- a/rbutil/rbutilqt/browseof.cpp +++ b/rbutil/rbutilqt/browseof.cpp | |||
@@ -27,25 +27,25 @@ BrowseOF::BrowseOF(QWidget *parent) : QDialog(parent) | |||
27 | { | 27 | { |
28 | ui.setupUi(this); | 28 | ui.setupUi(this); |
29 | this->setModal(true); | 29 | this->setModal(true); |
30 | 30 | ||
31 | connect(ui.browseOFButton,SIGNAL(clicked()),this,SLOT(onBrowse())); | 31 | connect(ui.browseOFButton,SIGNAL(clicked()),this,SLOT(onBrowse())); |
32 | } | 32 | } |
33 | 33 | ||
34 | void BrowseOF::setFile(QString file) | 34 | void BrowseOF::setFile(QString file) |
35 | { | 35 | { |
36 | ui.OFlineEdit->setText(file); | 36 | ui.OFlineEdit->setText(file); |
37 | } | 37 | } |
38 | 38 | ||
39 | void BrowseOF::onBrowse() | 39 | void BrowseOF::onBrowse() |
40 | { | 40 | { |
41 | BrowseDirtree browser(this); | 41 | BrowseDirtree browser(this); |
42 | browser.setFilter(QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot); | 42 | browser.setFilter(QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot); |
43 | 43 | ||
44 | if(QFileInfo(ui.OFlineEdit->text()).exists()) | 44 | if(QFileInfo(ui.OFlineEdit->text()).exists()) |
45 | { | 45 | { |
46 | browser.setDir(ui.OFlineEdit->text()); | 46 | browser.setDir(ui.OFlineEdit->text()); |
47 | } | 47 | } |
48 | 48 | ||
49 | if(browser.exec() == QDialog::Accepted) | 49 | if(browser.exec() == QDialog::Accepted) |
50 | { | 50 | { |
51 | qDebug() << browser.getSelected(); | 51 | qDebug() << browser.getSelected(); |
diff --git a/rbutil/rbutilqt/browseof.h b/rbutil/rbutilqt/browseof.h index b76b3fb8b4..1e92023e99 100644 --- a/rbutil/rbutilqt/browseof.h +++ b/rbutil/rbutilqt/browseof.h | |||
@@ -31,11 +31,11 @@ class BrowseOF : public QDialog | |||
31 | BrowseOF(QWidget *parent = 0); | 31 | BrowseOF(QWidget *parent = 0); |
32 | void setFile(QString file); | 32 | void setFile(QString file); |
33 | QString getFile(); | 33 | QString getFile(); |
34 | 34 | ||
35 | 35 | ||
36 | private slots: | 36 | private slots: |
37 | void onBrowse(); | 37 | void onBrowse(); |
38 | 38 | ||
39 | private: | 39 | private: |
40 | Ui::BrowseOFFrm ui; | 40 | Ui::BrowseOFFrm ui; |
41 | 41 | ||
diff --git a/rbutil/rbutilqt/configure.cpp b/rbutil/rbutilqt/configure.cpp index 07947691e5..eaa68a2a1c 100644 --- a/rbutil/rbutilqt/configure.cpp +++ b/rbutil/rbutilqt/configure.cpp | |||
@@ -57,7 +57,7 @@ Config::Config(QWidget *parent) : QDialog(parent) | |||
57 | ui.listLanguages->setAlternatingRowColors(true); | 57 | ui.listLanguages->setAlternatingRowColors(true); |
58 | 58 | ||
59 | this->setModal(true); | 59 | this->setModal(true); |
60 | 60 | ||
61 | connect(ui.buttonOk, SIGNAL(clicked()), this, SLOT(accept())); | 61 | connect(ui.buttonOk, SIGNAL(clicked()), this, SLOT(accept())); |
62 | connect(ui.buttonCancel, SIGNAL(clicked()), this, SLOT(abort())); | 62 | connect(ui.buttonCancel, SIGNAL(clicked()), this, SLOT(abort())); |
63 | connect(ui.radioNoProxy, SIGNAL(toggled(bool)), this, SLOT(setNoProxy(bool))); | 63 | connect(ui.radioNoProxy, SIGNAL(toggled(bool)), this, SLOT(setNoProxy(bool))); |
@@ -212,7 +212,7 @@ void Config::setDevices(QSettings *dev) | |||
212 | devices->beginGroup("platforms"); | 212 | devices->beginGroup("platforms"); |
213 | QStringList a = devices->childKeys(); | 213 | QStringList a = devices->childKeys(); |
214 | devices->endGroup(); | 214 | devices->endGroup(); |
215 | 215 | ||
216 | QMap <QString, QString> manuf; | 216 | QMap <QString, QString> manuf; |
217 | QMap <QString, QString> devcs; | 217 | QMap <QString, QString> devcs; |
218 | for(int it = 0; it < a.size(); it++) { | 218 | for(int it = 0; it < a.size(); it++) { |
@@ -249,7 +249,7 @@ void Config::setDevices(QSettings *dev) | |||
249 | w->setFlags(Qt::ItemIsEnabled); | 249 | w->setFlags(Qt::ItemIsEnabled); |
250 | w->setText(0, brands.at(c)); | 250 | w->setText(0, brands.at(c)); |
251 | items.append(w); | 251 | items.append(w); |
252 | 252 | ||
253 | // go through platforms again for sake of order | 253 | // go through platforms again for sake of order |
254 | for(int it = 0; it < a.size(); it++) { | 254 | for(int it = 0; it < a.size(); it++) { |
255 | QString curdev; | 255 | QString curdev; |
@@ -284,7 +284,7 @@ void Config::setDevices(QSettings *dev) | |||
284 | 284 | ||
285 | // tts / encoder tab | 285 | // tts / encoder tab |
286 | QStringList keys; | 286 | QStringList keys; |
287 | 287 | ||
288 | devices->beginGroup("encoders"); | 288 | devices->beginGroup("encoders"); |
289 | keys = devices->allKeys(); | 289 | keys = devices->allKeys(); |
290 | for(int i=0; i < keys.size();i++) | 290 | for(int i=0; i < keys.size();i++) |
@@ -542,7 +542,7 @@ void Config::autodetect() | |||
542 | for(int a = 0; a < ui.treeDevices->topLevelItemCount(); a++) | 542 | for(int a = 0; a < ui.treeDevices->topLevelItemCount(); a++) |
543 | ui.treeDevices->topLevelItem(a)->setExpanded(false); | 543 | ui.treeDevices->topLevelItem(a)->setExpanded(false); |
544 | //deselect the selected item(s) | 544 | //deselect the selected item(s) |
545 | for(int a = 0; a < ui.treeDevices->selectedItems().size(); a++) | 545 | for(int a = 0; a < ui.treeDevices->selectedItems().size(); a++) |
546 | ui.treeDevices->selectedItems().at(a)->setSelected(false); | 546 | ui.treeDevices->selectedItems().at(a)->setSelected(false); |
547 | 547 | ||
548 | // find the new item | 548 | // find the new item |
@@ -554,7 +554,7 @@ void Config::autodetect() | |||
554 | for(int j=0;j < itmList.at(i)->childCount();j++) | 554 | for(int j=0;j < itmList.at(i)->childCount();j++) |
555 | { | 555 | { |
556 | QString data = itmList.at(i)->child(j)->data(0, Qt::UserRole).toString(); | 556 | QString data = itmList.at(i)->child(j)->data(0, Qt::UserRole).toString(); |
557 | 557 | ||
558 | if(devicename == data) // item found | 558 | if(devicename == data) // item found |
559 | { | 559 | { |
560 | itmList.at(i)->child(j)->setSelected(true); //select the item | 560 | itmList.at(i)->child(j)->setSelected(true); //select the item |
@@ -578,7 +578,7 @@ void Config::autodetect() | |||
578 | QMessageBox::critical(this, tr("Fatal error"), text, QMessageBox::Ok); | 578 | QMessageBox::critical(this, tr("Fatal error"), text, QMessageBox::Ok); |
579 | return; | 579 | return; |
580 | } | 580 | } |
581 | 581 | ||
582 | if(detector.getMountPoint() != "" ) | 582 | if(detector.getMountPoint() != "" ) |
583 | { | 583 | { |
584 | ui.mountPoint->setText(detector.getMountPoint()); | 584 | ui.mountPoint->setText(detector.getMountPoint()); |
@@ -597,7 +597,7 @@ void Config::autodetect() | |||
597 | tr("Could not detect a device.\n" | 597 | tr("Could not detect a device.\n" |
598 | "Select your device and Mountpoint manually."), | 598 | "Select your device and Mountpoint manually."), |
599 | QMessageBox::Ok ,QMessageBox::Ok); | 599 | QMessageBox::Ok ,QMessageBox::Ok); |
600 | 600 | ||
601 | } | 601 | } |
602 | } | 602 | } |
603 | 603 | ||
@@ -609,7 +609,7 @@ void Config::cacheClear() | |||
609 | "remove <b>all</b> files in this folder!").arg(ui.cachePath->text()), | 609 | "remove <b>all</b> files in this folder!").arg(ui.cachePath->text()), |
610 | QMessageBox::Yes | QMessageBox::No) != QMessageBox::Yes) | 610 | QMessageBox::Yes | QMessageBox::No) != QMessageBox::Yes) |
611 | return; | 611 | return; |
612 | 612 | ||
613 | QString cache = ui.cachePath->text() + "/rbutil-cache/"; | 613 | QString cache = ui.cachePath->text() + "/rbutil-cache/"; |
614 | if(!QFileInfo(cache).isDir()) { | 614 | if(!QFileInfo(cache).isDir()) { |
615 | QMessageBox::critical(this, tr("Path wrong!"), | 615 | QMessageBox::critical(this, tr("Path wrong!"), |
@@ -633,7 +633,7 @@ void Config::browseTts() | |||
633 | { | 633 | { |
634 | BrowseDirtree browser(this); | 634 | BrowseDirtree browser(this); |
635 | browser.setFilter(QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot); | 635 | browser.setFilter(QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot); |
636 | 636 | ||
637 | if(QFileInfo(ui.ttsExecutable->text()).isDir()) | 637 | if(QFileInfo(ui.ttsExecutable->text()).isDir()) |
638 | { | 638 | { |
639 | browser.setDir(ui.ttsExecutable->text()); | 639 | browser.setDir(ui.ttsExecutable->text()); |
@@ -646,7 +646,7 @@ void Config::browseTts() | |||
646 | return; | 646 | return; |
647 | ui.ttsExecutable->setText(exe); | 647 | ui.ttsExecutable->setText(exe); |
648 | } | 648 | } |
649 | 649 | ||
650 | } | 650 | } |
651 | 651 | ||
652 | 652 | ||
@@ -654,7 +654,7 @@ void Config::browseEnc() | |||
654 | { | 654 | { |
655 | BrowseDirtree browser(this); | 655 | BrowseDirtree browser(this); |
656 | browser.setFilter(QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot); | 656 | browser.setFilter(QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot); |
657 | 657 | ||
658 | if(QFileInfo(ui.encoderExecutable->text()).isDir()) | 658 | if(QFileInfo(ui.encoderExecutable->text()).isDir()) |
659 | { | 659 | { |
660 | browser.setDir(ui.encoderExecutable->text()); | 660 | browser.setDir(ui.encoderExecutable->text()); |
@@ -667,5 +667,5 @@ void Config::browseEnc() | |||
667 | return; | 667 | return; |
668 | ui.encoderExecutable->setText(exe); | 668 | ui.encoderExecutable->setText(exe); |
669 | } | 669 | } |
670 | 670 | ||
671 | } | 671 | } |
diff --git a/rbutil/rbutilqt/configure.h b/rbutil/rbutilqt/configure.h index f0bb20f418..40ffb79fe7 100644 --- a/rbutil/rbutilqt/configure.h +++ b/rbutil/rbutilqt/configure.h | |||
@@ -49,10 +49,10 @@ class Config : public QDialog | |||
49 | QString language; | 49 | QString language; |
50 | QString programPath; | 50 | QString programPath; |
51 | QUrl proxy; | 51 | QUrl proxy; |
52 | 52 | ||
53 | BrowseDirtree *browser; | 53 | BrowseDirtree *browser; |
54 | BrowseDirtree *cbrowser; | 54 | BrowseDirtree *cbrowser; |
55 | 55 | ||
56 | private slots: | 56 | private slots: |
57 | void setNoProxy(bool); | 57 | void setNoProxy(bool); |
58 | void setSystemProxy(bool); | 58 | void setSystemProxy(bool); |
diff --git a/rbutil/rbutilqt/install.cpp b/rbutil/rbutilqt/install.cpp index f6e4509e38..fe5f6830f5 100644 --- a/rbutil/rbutilqt/install.cpp +++ b/rbutil/rbutilqt/install.cpp | |||
@@ -106,9 +106,9 @@ void Install::accept() | |||
106 | installer->setLogVersion(myversion); | 106 | installer->setLogVersion(myversion); |
107 | installer->setMountPoint(mountPoint); | 107 | installer->setMountPoint(mountPoint); |
108 | installer->install(logger); | 108 | installer->install(logger); |
109 | 109 | ||
110 | connect(installer, SIGNAL(done(bool)), this, SLOT(done(bool))); | 110 | connect(installer, SIGNAL(done(bool)), this, SLOT(done(bool))); |
111 | 111 | ||
112 | } | 112 | } |
113 | 113 | ||
114 | // Zip installer has finished | 114 | // Zip installer has finished |
@@ -193,12 +193,12 @@ void Install::setVersionStrings(QMap<QString, QString> ver) | |||
193 | // rel_rev release version revision id | 193 | // rel_rev release version revision id |
194 | // rel_date release version release date | 194 | // rel_date release version release date |
195 | // same for arch_* and bleed_* | 195 | // same for arch_* and bleed_* |
196 | 196 | ||
197 | if(version.value("arch_rev").isEmpty()) { | 197 | if(version.value("arch_rev").isEmpty()) { |
198 | ui.radioArchived->setEnabled(false); | 198 | ui.radioArchived->setEnabled(false); |
199 | qDebug() << "no information about archived version available!"; | 199 | qDebug() << "no information about archived version available!"; |
200 | } | 200 | } |
201 | 201 | ||
202 | if(!version.value("rel_rev").isEmpty()) { | 202 | if(!version.value("rel_rev").isEmpty()) { |
203 | ui.radioStable->setChecked(true); | 203 | ui.radioStable->setChecked(true); |
204 | ui.radioStable->setEnabled(true); | 204 | ui.radioStable->setEnabled(true); |
diff --git a/rbutil/rbutilqt/installbootloader.cpp b/rbutil/rbutilqt/installbootloader.cpp index 5e743cb8dd..6265f519f9 100644 --- a/rbutil/rbutilqt/installbootloader.cpp +++ b/rbutil/rbutilqt/installbootloader.cpp | |||
@@ -16,13 +16,13 @@ | |||
16 | * KIND, either express or implied. | 16 | * KIND, either express or implied. |
17 | * | 17 | * |
18 | ****************************************************************************/ | 18 | ****************************************************************************/ |
19 | 19 | ||
20 | #include "installbootloader.h" | 20 | #include "installbootloader.h" |
21 | #include "irivertools/checksums.h" | 21 | #include "irivertools/checksums.h" |
22 | 22 | ||
23 | BootloaderInstaller::BootloaderInstaller(QObject* parent): QObject(parent) | 23 | BootloaderInstaller::BootloaderInstaller(QObject* parent): QObject(parent) |
24 | { | 24 | { |
25 | 25 | ||
26 | } | 26 | } |
27 | 27 | ||
28 | void BootloaderInstaller::install(ProgressloggerInterface* dp) | 28 | void BootloaderInstaller::install(ProgressloggerInterface* dp) |
@@ -31,50 +31,50 @@ void BootloaderInstaller::install(ProgressloggerInterface* dp) | |||
31 | m_install = true; | 31 | m_install = true; |
32 | m_dp->addItem(tr("Starting bootloader installation"),LOGINFO); | 32 | m_dp->addItem(tr("Starting bootloader installation"),LOGINFO); |
33 | connect(this, SIGNAL(done(bool)), this, SLOT(installEnded(bool))); | 33 | connect(this, SIGNAL(done(bool)), this, SLOT(installEnded(bool))); |
34 | 34 | ||
35 | if(m_bootloadermethod == "gigabeatf") | 35 | if(m_bootloadermethod == "gigabeatf") |
36 | { | 36 | { |
37 | // connect internal signal | 37 | // connect internal signal |
38 | connect(this,SIGNAL(prepare()),this,SLOT(gigabeatPrepare())); | 38 | connect(this,SIGNAL(prepare()),this,SLOT(gigabeatPrepare())); |
39 | connect(this,SIGNAL(finish()),this,SLOT(gigabeatFinish())); | 39 | connect(this,SIGNAL(finish()),this,SLOT(gigabeatFinish())); |
40 | } | 40 | } |
41 | else if(m_bootloadermethod == "iaudio") | 41 | else if(m_bootloadermethod == "iaudio") |
42 | { | 42 | { |
43 | // connect internal signal | 43 | // connect internal signal |
44 | connect(this,SIGNAL(prepare()),this,SLOT(iaudioPrepare())); | 44 | connect(this,SIGNAL(prepare()),this,SLOT(iaudioPrepare())); |
45 | connect(this,SIGNAL(finish()),this,SLOT(iaudioFinish())); | 45 | connect(this,SIGNAL(finish()),this,SLOT(iaudioFinish())); |
46 | } | 46 | } |
47 | else if(m_bootloadermethod == "h10") | 47 | else if(m_bootloadermethod == "h10") |
48 | { | 48 | { |
49 | // connect internal signal | 49 | // connect internal signal |
50 | connect(this,SIGNAL(prepare()),this,SLOT(h10Prepare())); | 50 | connect(this,SIGNAL(prepare()),this,SLOT(h10Prepare())); |
51 | connect(this,SIGNAL(finish()),this,SLOT(h10Finish())); | 51 | connect(this,SIGNAL(finish()),this,SLOT(h10Finish())); |
52 | } | 52 | } |
53 | else if(m_bootloadermethod == "ipodpatcher") | 53 | else if(m_bootloadermethod == "ipodpatcher") |
54 | { | 54 | { |
55 | // connect internal signal | 55 | // connect internal signal |
56 | connect(this,SIGNAL(prepare()),this,SLOT(ipodPrepare())); | 56 | connect(this,SIGNAL(prepare()),this,SLOT(ipodPrepare())); |
57 | connect(this,SIGNAL(finish()),this,SLOT(ipodFinish())); | 57 | connect(this,SIGNAL(finish()),this,SLOT(ipodFinish())); |
58 | } | 58 | } |
59 | else if(m_bootloadermethod == "sansapatcher") | 59 | else if(m_bootloadermethod == "sansapatcher") |
60 | { | 60 | { |
61 | // connect internal signal | 61 | // connect internal signal |
62 | connect(this,SIGNAL(prepare()),this,SLOT(sansaPrepare())); | 62 | connect(this,SIGNAL(prepare()),this,SLOT(sansaPrepare())); |
63 | connect(this,SIGNAL(finish()),this,SLOT(sansaFinish())); | 63 | connect(this,SIGNAL(finish()),this,SLOT(sansaFinish())); |
64 | } | 64 | } |
65 | else if(m_bootloadermethod == "fwpatcher") | 65 | else if(m_bootloadermethod == "fwpatcher") |
66 | { | 66 | { |
67 | // connect internal signal | 67 | // connect internal signal |
68 | connect(this,SIGNAL(prepare()),this,SLOT(iriverPrepare())); | 68 | connect(this,SIGNAL(prepare()),this,SLOT(iriverPrepare())); |
69 | connect(this,SIGNAL(finish()),this,SLOT(iriverFinish())); | 69 | connect(this,SIGNAL(finish()),this,SLOT(iriverFinish())); |
70 | } | 70 | } |
71 | else | 71 | else |
72 | { | 72 | { |
73 | m_dp->addItem(tr("unsupported install Method"),LOGERROR); | 73 | m_dp->addItem(tr("unsupported install Method"),LOGERROR); |
74 | emit done(true); | 74 | emit done(true); |
75 | return; | 75 | return; |
76 | } | 76 | } |
77 | 77 | ||
78 | emit prepare(); | 78 | emit prepare(); |
79 | } | 79 | } |
80 | 80 | ||
@@ -84,38 +84,38 @@ void BootloaderInstaller::uninstall(ProgressloggerInterface* dp) | |||
84 | m_install = false; | 84 | m_install = false; |
85 | m_dp->addItem(tr("Starting bootloader uninstallation"),LOGINFO); | 85 | m_dp->addItem(tr("Starting bootloader uninstallation"),LOGINFO); |
86 | connect(this, SIGNAL(done(bool)), this, SLOT(installEnded(bool))); | 86 | connect(this, SIGNAL(done(bool)), this, SLOT(installEnded(bool))); |
87 | 87 | ||
88 | if(m_bootloadermethod == "gigabeatf") | 88 | if(m_bootloadermethod == "gigabeatf") |
89 | { | 89 | { |
90 | // connect internal signal | 90 | // connect internal signal |
91 | connect(this,SIGNAL(prepare()),this,SLOT(gigabeatPrepare())); | 91 | connect(this,SIGNAL(prepare()),this,SLOT(gigabeatPrepare())); |
92 | } | 92 | } |
93 | else if(m_bootloadermethod == "iaudio") | 93 | else if(m_bootloadermethod == "iaudio") |
94 | { | 94 | { |
95 | m_dp->addItem(tr("No uninstallation possible"),LOGWARNING); | 95 | m_dp->addItem(tr("No uninstallation possible"),LOGWARNING); |
96 | emit done(true); | 96 | emit done(true); |
97 | return; | 97 | return; |
98 | } | 98 | } |
99 | else if(m_bootloadermethod == "iaudio") | 99 | else if(m_bootloadermethod == "iaudio") |
100 | { | 100 | { |
101 | // connect internal signal | 101 | // connect internal signal |
102 | connect(this,SIGNAL(prepare()),this,SLOT(h10Prepare())); | 102 | connect(this,SIGNAL(prepare()),this,SLOT(h10Prepare())); |
103 | } | 103 | } |
104 | else if(m_bootloadermethod == "ipodpatcher") | 104 | else if(m_bootloadermethod == "ipodpatcher") |
105 | { | 105 | { |
106 | // connect internal signal | 106 | // connect internal signal |
107 | connect(this,SIGNAL(prepare()),this,SLOT(ipodPrepare())); | 107 | connect(this,SIGNAL(prepare()),this,SLOT(ipodPrepare())); |
108 | } | 108 | } |
109 | else if(m_bootloadermethod == "sansapatcher") | 109 | else if(m_bootloadermethod == "sansapatcher") |
110 | { | 110 | { |
111 | // connect internal signal | 111 | // connect internal signal |
112 | connect(this,SIGNAL(prepare()),this,SLOT(sansaPrepare())); | 112 | connect(this,SIGNAL(prepare()),this,SLOT(sansaPrepare())); |
113 | } | 113 | } |
114 | else if(m_bootloadermethod == "fwpatcher") | 114 | else if(m_bootloadermethod == "fwpatcher") |
115 | { | 115 | { |
116 | m_dp->addItem(tr("No uninstallation possible"),LOGWARNING); | 116 | m_dp->addItem(tr("No uninstallation possible"),LOGWARNING); |
117 | emit done(true); | 117 | emit done(true); |
118 | return; | 118 | return; |
119 | } | 119 | } |
120 | else | 120 | else |
121 | { | 121 | { |
@@ -123,7 +123,7 @@ void BootloaderInstaller::uninstall(ProgressloggerInterface* dp) | |||
123 | emit done(true); | 123 | emit done(true); |
124 | return; | 124 | return; |
125 | } | 125 | } |
126 | 126 | ||
127 | emit prepare(); | 127 | emit prepare(); |
128 | } | 128 | } |
129 | 129 | ||
@@ -138,9 +138,9 @@ void BootloaderInstaller::downloadRequestFinished(int id, bool error) | |||
138 | void BootloaderInstaller::downloadDone(bool error) | 138 | void BootloaderInstaller::downloadDone(bool error) |
139 | { | 139 | { |
140 | qDebug() << "Install::downloadDone, error:" << error; | 140 | qDebug() << "Install::downloadDone, error:" << error; |
141 | 141 | ||
142 | // update progress bar | 142 | // update progress bar |
143 | 143 | ||
144 | int max = m_dp->getProgressMax(); | 144 | int max = m_dp->getProgressMax(); |
145 | if(max == 0) { | 145 | if(max == 0) { |
146 | max = 100; | 146 | max = 100; |
@@ -160,9 +160,9 @@ void BootloaderInstaller::downloadDone(bool error) | |||
160 | return; | 160 | return; |
161 | } | 161 | } |
162 | else m_dp->addItem(tr("Download finished."),LOGOK); | 162 | else m_dp->addItem(tr("Download finished."),LOGOK); |
163 | 163 | ||
164 | emit finish(); | 164 | emit finish(); |
165 | 165 | ||
166 | } | 166 | } |
167 | 167 | ||
168 | void BootloaderInstaller::updateDataReadProgress(int read, int total) | 168 | void BootloaderInstaller::updateDataReadProgress(int read, int total) |
@@ -183,7 +183,7 @@ bool BootloaderInstaller::downloadInfo() | |||
183 | { | 183 | { |
184 | // try to get the current build information | 184 | // try to get the current build information |
185 | infodownloader = new HttpGet(this); | 185 | infodownloader = new HttpGet(this); |
186 | 186 | ||
187 | connect(infodownloader, SIGNAL(done(bool)), this, SLOT(infoDownloadDone(bool))); | 187 | connect(infodownloader, SIGNAL(done(bool)), this, SLOT(infoDownloadDone(bool))); |
188 | connect(infodownloader, SIGNAL(requestFinished(int, bool)), this, SLOT(infoRequestFinished(int, bool))); | 188 | connect(infodownloader, SIGNAL(requestFinished(int, bool)), this, SLOT(infoRequestFinished(int, bool))); |
189 | 189 | ||
@@ -192,7 +192,7 @@ bool BootloaderInstaller::downloadInfo() | |||
192 | qDebug() << "downloading bootloader info"; | 192 | qDebug() << "downloading bootloader info"; |
193 | infodownloader->setFile(&bootloaderInfo); | 193 | infodownloader->setFile(&bootloaderInfo); |
194 | infodownloader->getFile(QUrl(m_bootloaderinfoUrl)); | 194 | infodownloader->getFile(QUrl(m_bootloaderinfoUrl)); |
195 | 195 | ||
196 | // block until its downloaded | 196 | // block until its downloaded |
197 | qDebug() << "Waiting for Download finished"; | 197 | qDebug() << "Waiting for Download finished"; |
198 | infoDownloaded=false; | 198 | infoDownloaded=false; |
@@ -204,27 +204,27 @@ bool BootloaderInstaller::downloadInfo() | |||
204 | 204 | ||
205 | void BootloaderInstaller::infoDownloadDone(bool error) | 205 | void BootloaderInstaller::infoDownloadDone(bool error) |
206 | { | 206 | { |
207 | if(error) | 207 | if(error) |
208 | { | 208 | { |
209 | qDebug() << "network error:" << infodownloader->error(); | 209 | qDebug() << "network error:" << infodownloader->error(); |
210 | return; | 210 | return; |
211 | } | 211 | } |
212 | qDebug() << "network status:" << infodownloader->error(); | 212 | qDebug() << "network status:" << infodownloader->error(); |
213 | 213 | ||
214 | infoDownloaded = true; | 214 | infoDownloaded = true; |
215 | } | 215 | } |
216 | 216 | ||
217 | void BootloaderInstaller::infoRequestFinished(int id, bool error) | 217 | void BootloaderInstaller::infoRequestFinished(int id, bool error) |
218 | { | 218 | { |
219 | 219 | ||
220 | if(error) | 220 | if(error) |
221 | { | 221 | { |
222 | QString errorString; | 222 | QString errorString; |
223 | errorString = tr("Network error: %1. Please check your network and proxy settings.") | 223 | errorString = tr("Network error: %1. Please check your network and proxy settings.") |
224 | .arg(infodownloader->errorString()); | 224 | .arg(infodownloader->errorString()); |
225 | if(error) QMessageBox::about(NULL, "Network Error", errorString); | 225 | if(error) QMessageBox::about(NULL, "Network Error", errorString); |
226 | qDebug() << "downloadDone:" << id << error; | 226 | qDebug() << "downloadDone:" << id << error; |
227 | 227 | ||
228 | infoError = true; | 228 | infoError = true; |
229 | infoDownloaded = true; | 229 | infoDownloaded = true; |
230 | } | 230 | } |
@@ -241,7 +241,7 @@ void BootloaderInstaller::createInstallLog() | |||
241 | QSettings info(bootloaderInfo.fileName(), QSettings::IniFormat, this); | 241 | QSettings info(bootloaderInfo.fileName(), QSettings::IniFormat, this); |
242 | bootloaderInfo.close(); | 242 | bootloaderInfo.close(); |
243 | info.beginGroup(m_device); | 243 | info.beginGroup(m_device); |
244 | 244 | ||
245 | installlog.beginGroup("Bootloader"); | 245 | installlog.beginGroup("Bootloader"); |
246 | installlog.setValue("md5sum",info.value("md5sum").toString()); | 246 | installlog.setValue("md5sum",info.value("md5sum").toString()); |
247 | installlog.endGroup(); | 247 | installlog.endGroup(); |
@@ -263,19 +263,19 @@ bool BootloaderInstaller::uptodate() | |||
263 | { | 263 | { |
264 | QString installedMd5; | 264 | QString installedMd5; |
265 | QString serverMd5; | 265 | QString serverMd5; |
266 | 266 | ||
267 | QSettings installlog(m_mountpoint + "/.rockbox/rbutil.log", QSettings::IniFormat, 0); | 267 | QSettings installlog(m_mountpoint + "/.rockbox/rbutil.log", QSettings::IniFormat, 0); |
268 | installlog.beginGroup("Bootloader"); | 268 | installlog.beginGroup("Bootloader"); |
269 | installedMd5 = installlog.value("md5sum").toString(); | 269 | installedMd5 = installlog.value("md5sum").toString(); |
270 | installlog.endGroup(); | 270 | installlog.endGroup(); |
271 | 271 | ||
272 | bootloaderInfo.open(); | 272 | bootloaderInfo.open(); |
273 | QSettings info(bootloaderInfo.fileName(), QSettings::IniFormat, this); | 273 | QSettings info(bootloaderInfo.fileName(), QSettings::IniFormat, this); |
274 | bootloaderInfo.close(); | 274 | bootloaderInfo.close(); |
275 | info.beginGroup(m_device); | 275 | info.beginGroup(m_device); |
276 | serverMd5 = info.value("md5sum").toString(); | 276 | serverMd5 = info.value("md5sum").toString(); |
277 | info.endGroup(); | 277 | info.endGroup(); |
278 | 278 | ||
279 | if(installedMd5 != serverMd5) | 279 | if(installedMd5 != serverMd5) |
280 | return false; | 280 | return false; |
281 | else | 281 | else |
@@ -283,7 +283,7 @@ bool BootloaderInstaller::uptodate() | |||
283 | } | 283 | } |
284 | 284 | ||
285 | /************************************************** | 285 | /************************************************** |
286 | *** gigabeat secific code | 286 | *** gigabeat secific code |
287 | ***************************************************/ | 287 | ***************************************************/ |
288 | 288 | ||
289 | void BootloaderInstaller::gigabeatPrepare() | 289 | void BootloaderInstaller::gigabeatPrepare() |
@@ -291,7 +291,7 @@ void BootloaderInstaller::gigabeatPrepare() | |||
291 | if(m_install) // Installation | 291 | if(m_install) // Installation |
292 | { | 292 | { |
293 | QString url = m_bootloaderUrlBase + "/gigabeat/" + m_bootloadername; | 293 | QString url = m_bootloaderUrlBase + "/gigabeat/" + m_bootloadername; |
294 | 294 | ||
295 | m_dp->addItem(tr("Downloading file %1.%2") | 295 | m_dp->addItem(tr("Downloading file %1.%2") |
296 | .arg(QFileInfo(url).baseName(), QFileInfo(url).completeSuffix()),LOGINFO); | 296 | .arg(QFileInfo(url).baseName(), QFileInfo(url).completeSuffix()),LOGINFO); |
297 | 297 | ||
@@ -307,75 +307,75 @@ void BootloaderInstaller::gigabeatPrepare() | |||
307 | // connect signals from HttpGet | 307 | // connect signals from HttpGet |
308 | connect(getter, SIGNAL(done(bool)), this, SLOT(downloadDone(bool))); | 308 | connect(getter, SIGNAL(done(bool)), this, SLOT(downloadDone(bool))); |
309 | connect(getter, SIGNAL(dataReadProgress(int, int)), this, SLOT(updateDataReadProgress(int, int))); | 309 | connect(getter, SIGNAL(dataReadProgress(int, int)), this, SLOT(updateDataReadProgress(int, int))); |
310 | connect(m_dp, SIGNAL(aborted()), getter, SLOT(abort())); | 310 | connect(m_dp, SIGNAL(aborted()), getter, SLOT(abort())); |
311 | } | 311 | } |
312 | else //UnInstallation | 312 | else //UnInstallation |
313 | { | 313 | { |
314 | QString firmware = m_mountpoint + "/GBSYSTEM/FWIMG/FWIMG01.DAT"; | 314 | QString firmware = m_mountpoint + "/GBSYSTEM/FWIMG/FWIMG01.DAT"; |
315 | QString firmwareOrig = firmware.append(".ORIG"); | 315 | QString firmwareOrig = firmware.append(".ORIG"); |
316 | 316 | ||
317 | QFileInfo firmwareOrigFI(firmwareOrig); | 317 | QFileInfo firmwareOrigFI(firmwareOrig); |
318 | 318 | ||
319 | // check if original firmware exists | 319 | // check if original firmware exists |
320 | if(!firmwareOrigFI.exists()) | 320 | if(!firmwareOrigFI.exists()) |
321 | { | 321 | { |
322 | m_dp->addItem(tr("Could not find the Original Firmware at: %1") | 322 | m_dp->addItem(tr("Could not find the Original Firmware at: %1") |
323 | .arg(firmwareOrig),LOGERROR); | 323 | .arg(firmwareOrig),LOGERROR); |
324 | emit done(true); | 324 | emit done(true); |
325 | return; | 325 | return; |
326 | } | 326 | } |
327 | 327 | ||
328 | QFile firmwareFile(firmware); | 328 | QFile firmwareFile(firmware); |
329 | QFile firmwareOrigFile(firmwareOrig); | 329 | QFile firmwareOrigFile(firmwareOrig); |
330 | 330 | ||
331 | //remove modified firmware | 331 | //remove modified firmware |
332 | if(!firmwareFile.remove()) | 332 | if(!firmwareFile.remove()) |
333 | { | 333 | { |
334 | m_dp->addItem(tr("Could not remove the Firmware at: %1") | 334 | m_dp->addItem(tr("Could not remove the Firmware at: %1") |
335 | .arg(firmware),LOGERROR); | 335 | .arg(firmware),LOGERROR); |
336 | emit done(true); | 336 | emit done(true); |
337 | return; | 337 | return; |
338 | } | 338 | } |
339 | 339 | ||
340 | //copy original firmware | 340 | //copy original firmware |
341 | if(!firmwareOrigFile.copy(firmware)) | 341 | if(!firmwareOrigFile.copy(firmware)) |
342 | { | 342 | { |
343 | m_dp->addItem(tr("Could not copy the Firmware from: %1 to %2") | 343 | m_dp->addItem(tr("Could not copy the Firmware from: %1 to %2") |
344 | .arg(firmwareOrig,firmware),LOGERROR); | 344 | .arg(firmwareOrig,firmware),LOGERROR); |
345 | emit done(true); | 345 | emit done(true); |
346 | return; | 346 | return; |
347 | } | 347 | } |
348 | 348 | ||
349 | removeInstallLog(); | 349 | removeInstallLog(); |
350 | 350 | ||
351 | emit done(false); //success | 351 | emit done(false); //success |
352 | } | 352 | } |
353 | 353 | ||
354 | } | 354 | } |
355 | 355 | ||
356 | void BootloaderInstaller::gigabeatFinish() | 356 | void BootloaderInstaller::gigabeatFinish() |
357 | { | 357 | { |
358 | // this step is only need for installation, so no code for uninstall here | 358 | // this step is only need for installation, so no code for uninstall here |
359 | 359 | ||
360 | m_dp->addItem(tr("Finishing bootloader install"),LOGINFO); | 360 | m_dp->addItem(tr("Finishing bootloader install"),LOGINFO); |
361 | 361 | ||
362 | QString firmware = m_mountpoint + "/GBSYSTEM/FWIMG/" + m_bootloadername; | 362 | QString firmware = m_mountpoint + "/GBSYSTEM/FWIMG/" + m_bootloadername; |
363 | 363 | ||
364 | QFileInfo firmwareFI(firmware); | 364 | QFileInfo firmwareFI(firmware); |
365 | 365 | ||
366 | // check if firmware exists | 366 | // check if firmware exists |
367 | if(!firmwareFI.exists()) | 367 | if(!firmwareFI.exists()) |
368 | { | 368 | { |
369 | m_dp->addItem(tr("Could not find the Firmware at: %1") | 369 | m_dp->addItem(tr("Could not find the Firmware at: %1") |
370 | .arg(firmware),LOGERROR); | 370 | .arg(firmware),LOGERROR); |
371 | emit done(true); | 371 | emit done(true); |
372 | return; | 372 | return; |
373 | } | 373 | } |
374 | 374 | ||
375 | QString firmwareOrig = firmware; | 375 | QString firmwareOrig = firmware; |
376 | firmwareOrig.append(".ORIG"); | 376 | firmwareOrig.append(".ORIG"); |
377 | QFileInfo firmwareOrigFI(firmwareOrig); | 377 | QFileInfo firmwareOrigFI(firmwareOrig); |
378 | 378 | ||
379 | // rename the firmware, if there is no original firmware there | 379 | // rename the firmware, if there is no original firmware there |
380 | if(!firmwareOrigFI.exists()) | 380 | if(!firmwareOrigFI.exists()) |
381 | { | 381 | { |
@@ -393,7 +393,7 @@ void BootloaderInstaller::gigabeatFinish() | |||
393 | QFile firmwareFile(firmware); | 393 | QFile firmwareFile(firmware); |
394 | firmwareFile.remove(); | 394 | firmwareFile.remove(); |
395 | } | 395 | } |
396 | 396 | ||
397 | //copy the firmware | 397 | //copy the firmware |
398 | if(!downloadFile.copy(firmware)) | 398 | if(!downloadFile.copy(firmware)) |
399 | { | 399 | { |
@@ -402,11 +402,11 @@ void BootloaderInstaller::gigabeatFinish() | |||
402 | emit done(true); | 402 | emit done(true); |
403 | return; | 403 | return; |
404 | } | 404 | } |
405 | 405 | ||
406 | downloadFile.remove(); | 406 | downloadFile.remove(); |
407 | 407 | ||
408 | createInstallLog(); | 408 | createInstallLog(); |
409 | 409 | ||
410 | m_dp->addItem(tr("Bootloader install finished successfully."),LOGOK); | 410 | m_dp->addItem(tr("Bootloader install finished successfully."),LOGOK); |
411 | m_dp->addItem(tr("To finish the Bootloader installation, follow the steps below."),LOGINFO); | 411 | m_dp->addItem(tr("To finish the Bootloader installation, follow the steps below."),LOGINFO); |
412 | m_dp->addItem(tr("1. Eject/Unmount your Device."),LOGINFO); | 412 | m_dp->addItem(tr("1. Eject/Unmount your Device."),LOGINFO); |
@@ -414,22 +414,22 @@ void BootloaderInstaller::gigabeatFinish() | |||
414 | m_dp->addItem(tr("3. Hold POWER to turn the Device off."),LOGINFO); | 414 | m_dp->addItem(tr("3. Hold POWER to turn the Device off."),LOGINFO); |
415 | m_dp->addItem(tr("4. Toggle the Battery switch on the Device."),LOGINFO); | 415 | m_dp->addItem(tr("4. Toggle the Battery switch on the Device."),LOGINFO); |
416 | m_dp->addItem(tr("5. Hold POWER to boot the Rockbox bootloader."),LOGINFO); | 416 | m_dp->addItem(tr("5. Hold POWER to boot the Rockbox bootloader."),LOGINFO); |
417 | 417 | ||
418 | 418 | ||
419 | m_dp->abort(); | 419 | m_dp->abort(); |
420 | 420 | ||
421 | emit done(false); // success | 421 | emit done(false); // success |
422 | 422 | ||
423 | } | 423 | } |
424 | 424 | ||
425 | /************************************************** | 425 | /************************************************** |
426 | *** iaudio secific code | 426 | *** iaudio secific code |
427 | ***************************************************/ | 427 | ***************************************************/ |
428 | void BootloaderInstaller::iaudioPrepare() | 428 | void BootloaderInstaller::iaudioPrepare() |
429 | { | 429 | { |
430 | 430 | ||
431 | QString url = m_bootloaderUrlBase + "/iaudio/" + m_bootloadername; | 431 | QString url = m_bootloaderUrlBase + "/iaudio/" + m_bootloadername; |
432 | 432 | ||
433 | m_dp->addItem(tr("Downloading file %1.%2") | 433 | m_dp->addItem(tr("Downloading file %1.%2") |
434 | .arg(QFileInfo(url).baseName(), QFileInfo(url).completeSuffix()),LOGINFO); | 434 | .arg(QFileInfo(url).baseName(), QFileInfo(url).completeSuffix()),LOGINFO); |
435 | 435 | ||
@@ -444,14 +444,14 @@ void BootloaderInstaller::iaudioPrepare() | |||
444 | getter->getFile(QUrl(url)); | 444 | getter->getFile(QUrl(url)); |
445 | // connect signals from HttpGet | 445 | // connect signals from HttpGet |
446 | connect(getter, SIGNAL(done(bool)), this, SLOT(downloadDone(bool))); | 446 | connect(getter, SIGNAL(done(bool)), this, SLOT(downloadDone(bool))); |
447 | connect(getter, SIGNAL(dataReadProgress(int, int)), this, SLOT(updateDataReadProgress(int, int))); | 447 | connect(getter, SIGNAL(dataReadProgress(int, int)), this, SLOT(updateDataReadProgress(int, int))); |
448 | connect(m_dp, SIGNAL(aborted()), getter, SLOT(abort())); | 448 | connect(m_dp, SIGNAL(aborted()), getter, SLOT(abort())); |
449 | } | 449 | } |
450 | 450 | ||
451 | void BootloaderInstaller::iaudioFinish() | 451 | void BootloaderInstaller::iaudioFinish() |
452 | { | 452 | { |
453 | QString firmware = m_mountpoint + "/FIRMWARE/" + m_bootloadername; | 453 | QString firmware = m_mountpoint + "/FIRMWARE/" + m_bootloadername; |
454 | 454 | ||
455 | //copy the firmware | 455 | //copy the firmware |
456 | if(!downloadFile.copy(firmware)) | 456 | if(!downloadFile.copy(firmware)) |
457 | { | 457 | { |
@@ -460,33 +460,33 @@ void BootloaderInstaller::iaudioFinish() | |||
460 | emit done(true); | 460 | emit done(true); |
461 | return; | 461 | return; |
462 | } | 462 | } |
463 | 463 | ||
464 | downloadFile.remove(); | 464 | downloadFile.remove(); |
465 | 465 | ||
466 | createInstallLog(); | 466 | createInstallLog(); |
467 | 467 | ||
468 | m_dp->addItem(tr("Bootloader install finished successfully."),LOGOK); | 468 | m_dp->addItem(tr("Bootloader install finished successfully."),LOGOK); |
469 | m_dp->addItem(tr("To finish the Bootloader installation, follow the steps below."),LOGINFO); | 469 | m_dp->addItem(tr("To finish the Bootloader installation, follow the steps below."),LOGINFO); |
470 | m_dp->addItem(tr("1. Eject/Unmount your Device."),LOGINFO); | 470 | m_dp->addItem(tr("1. Eject/Unmount your Device."),LOGINFO); |
471 | m_dp->addItem(tr("2. Turn you Device OFF."),LOGINFO); | 471 | m_dp->addItem(tr("2. Turn you Device OFF."),LOGINFO); |
472 | m_dp->addItem(tr("3. Insert Charger."),LOGINFO); | 472 | m_dp->addItem(tr("3. Insert Charger."),LOGINFO); |
473 | 473 | ||
474 | m_dp->abort(); | 474 | m_dp->abort(); |
475 | 475 | ||
476 | emit done(false); // success | 476 | emit done(false); // success |
477 | 477 | ||
478 | } | 478 | } |
479 | 479 | ||
480 | 480 | ||
481 | /************************************************** | 481 | /************************************************** |
482 | *** h10 secific code | 482 | *** h10 secific code |
483 | ***************************************************/ | 483 | ***************************************************/ |
484 | void BootloaderInstaller::h10Prepare() | 484 | void BootloaderInstaller::h10Prepare() |
485 | { | 485 | { |
486 | if(m_install) // Installation | 486 | if(m_install) // Installation |
487 | { | 487 | { |
488 | QString url = m_bootloaderUrlBase + "/iriver/" + m_bootloadername; | 488 | QString url = m_bootloaderUrlBase + "/iriver/" + m_bootloadername; |
489 | 489 | ||
490 | m_dp->addItem(tr("Downloading file %1.%2") | 490 | m_dp->addItem(tr("Downloading file %1.%2") |
491 | .arg(QFileInfo(url).baseName(), QFileInfo(url).completeSuffix()),LOGINFO); | 491 | .arg(QFileInfo(url).baseName(), QFileInfo(url).completeSuffix()),LOGINFO); |
492 | 492 | ||
@@ -501,17 +501,17 @@ void BootloaderInstaller::h10Prepare() | |||
501 | getter->getFile(QUrl(url)); | 501 | getter->getFile(QUrl(url)); |
502 | // connect signals from HttpGet | 502 | // connect signals from HttpGet |
503 | connect(getter, SIGNAL(done(bool)), this, SLOT(downloadDone(bool))); | 503 | connect(getter, SIGNAL(done(bool)), this, SLOT(downloadDone(bool))); |
504 | connect(getter, SIGNAL(dataReadProgress(int, int)), this, SLOT(updateDataReadProgress(int, int))); | 504 | connect(getter, SIGNAL(dataReadProgress(int, int)), this, SLOT(updateDataReadProgress(int, int))); |
505 | connect(m_dp, SIGNAL(aborted()), getter, SLOT(abort())); | 505 | connect(m_dp, SIGNAL(aborted()), getter, SLOT(abort())); |
506 | } | 506 | } |
507 | else // Uninstallation | 507 | else // Uninstallation |
508 | { | 508 | { |
509 | 509 | ||
510 | QString firmwarename = m_bootloadername.section('/', -1); | 510 | QString firmwarename = m_bootloadername.section('/', -1); |
511 | 511 | ||
512 | QString firmware = m_mountpoint + "/SYSTEM/" + firmwarename; | 512 | QString firmware = m_mountpoint + "/SYSTEM/" + firmwarename; |
513 | QString firmwareOrig = m_mountpoint + "/SYSTEM/Original.mi4"; | 513 | QString firmwareOrig = m_mountpoint + "/SYSTEM/Original.mi4"; |
514 | 514 | ||
515 | QFileInfo firmwareFI(firmware); | 515 | QFileInfo firmwareFI(firmware); |
516 | if(!firmwareFI.exists()) //Firmware dosent exists on player | 516 | if(!firmwareFI.exists()) //Firmware dosent exists on player |
517 | { | 517 | { |
@@ -525,7 +525,7 @@ void BootloaderInstaller::h10Prepare() | |||
525 | return; | 525 | return; |
526 | } | 526 | } |
527 | } | 527 | } |
528 | 528 | ||
529 | QFileInfo firmwareOrigFI(firmwareOrig); | 529 | QFileInfo firmwareOrigFI(firmwareOrig); |
530 | if(!firmwareOrigFI.exists()) //Original Firmware dosent exists on player | 530 | if(!firmwareOrigFI.exists()) //Original Firmware dosent exists on player |
531 | { | 531 | { |
@@ -534,32 +534,32 @@ void BootloaderInstaller::h10Prepare() | |||
534 | emit done(true); | 534 | emit done(true); |
535 | return; | 535 | return; |
536 | } | 536 | } |
537 | 537 | ||
538 | QFile firmwareFile(firmware); | 538 | QFile firmwareFile(firmware); |
539 | QFile firmwareOrigFile(firmwareOrig); | 539 | QFile firmwareOrigFile(firmwareOrig); |
540 | 540 | ||
541 | //remove modified firmware | 541 | //remove modified firmware |
542 | if(!firmwareFile.remove()) | 542 | if(!firmwareFile.remove()) |
543 | { | 543 | { |
544 | m_dp->addItem(tr("Could not remove the Firmware at: %1") | 544 | m_dp->addItem(tr("Could not remove the Firmware at: %1") |
545 | .arg(firmware),LOGERROR); | 545 | .arg(firmware),LOGERROR); |
546 | emit done(true); | 546 | emit done(true); |
547 | return; | 547 | return; |
548 | } | 548 | } |
549 | 549 | ||
550 | //copy original firmware | 550 | //copy original firmware |
551 | if(!firmwareOrigFile.copy(firmware)) | 551 | if(!firmwareOrigFile.copy(firmware)) |
552 | { | 552 | { |
553 | m_dp->addItem(tr("Could not copy the Firmware from: %1 to %2") | 553 | m_dp->addItem(tr("Could not copy the Firmware from: %1 to %2") |
554 | .arg(firmwareOrig,firmware),LOGERROR); | 554 | .arg(firmwareOrig,firmware),LOGERROR); |
555 | emit done(true); | 555 | emit done(true); |
556 | return; | 556 | return; |
557 | } | 557 | } |
558 | 558 | ||
559 | removeInstallLog(); | 559 | removeInstallLog(); |
560 | 560 | ||
561 | emit done(false); //success | 561 | emit done(false); //success |
562 | 562 | ||
563 | } | 563 | } |
564 | } | 564 | } |
565 | 565 | ||
@@ -569,9 +569,9 @@ void BootloaderInstaller::h10Finish() | |||
569 | 569 | ||
570 | QString firmware = m_mountpoint + "/SYSTEM/" + firmwarename; | 570 | QString firmware = m_mountpoint + "/SYSTEM/" + firmwarename; |
571 | QString firmwareOrig = m_mountpoint + "/SYSTEM/Original.mi4"; | 571 | QString firmwareOrig = m_mountpoint + "/SYSTEM/Original.mi4"; |
572 | 572 | ||
573 | QFileInfo firmwareFI(firmware); | 573 | QFileInfo firmwareFI(firmware); |
574 | 574 | ||
575 | if(!firmwareFI.exists()) //Firmware dosent exists on player | 575 | if(!firmwareFI.exists()) //Firmware dosent exists on player |
576 | { | 576 | { |
577 | firmware = m_mountpoint + "/SYSTEM/H10EMP.mi4"; //attempt other firmwarename | 577 | firmware = m_mountpoint + "/SYSTEM/H10EMP.mi4"; //attempt other firmwarename |
@@ -584,9 +584,9 @@ void BootloaderInstaller::h10Finish() | |||
584 | return; | 584 | return; |
585 | } | 585 | } |
586 | } | 586 | } |
587 | 587 | ||
588 | QFileInfo firmwareOrigFI(firmwareOrig); | 588 | QFileInfo firmwareOrigFI(firmwareOrig); |
589 | 589 | ||
590 | if(!firmwareOrigFI.exists()) //there is already a original firmware | 590 | if(!firmwareOrigFI.exists()) //there is already a original firmware |
591 | { | 591 | { |
592 | QFile firmwareFile(firmware); | 592 | QFile firmwareFile(firmware); |
@@ -611,20 +611,20 @@ void BootloaderInstaller::h10Finish() | |||
611 | emit done(true); | 611 | emit done(true); |
612 | return; | 612 | return; |
613 | } | 613 | } |
614 | 614 | ||
615 | downloadFile.remove(); | 615 | downloadFile.remove(); |
616 | 616 | ||
617 | createInstallLog(); | 617 | createInstallLog(); |
618 | 618 | ||
619 | m_dp->addItem(tr("Bootloader install finished successfully."),LOGOK); | 619 | m_dp->addItem(tr("Bootloader install finished successfully."),LOGOK); |
620 | m_dp->abort(); | 620 | m_dp->abort(); |
621 | 621 | ||
622 | emit done(false); // success | 622 | emit done(false); // success |
623 | 623 | ||
624 | } | 624 | } |
625 | 625 | ||
626 | /************************************************** | 626 | /************************************************** |
627 | *** ipod secific code | 627 | *** ipod secific code |
628 | ***************************************************/ | 628 | ***************************************************/ |
629 | int verbose =0; | 629 | int verbose =0; |
630 | // reserves memory for ipodpatcher | 630 | // reserves memory for ipodpatcher |
@@ -651,12 +651,12 @@ void BootloaderInstaller::ipodPrepare() | |||
651 | m_dp->addItem(tr("Too many Ipods found"),LOGERROR); | 651 | m_dp->addItem(tr("Too many Ipods found"),LOGERROR); |
652 | emit done(true); | 652 | emit done(true); |
653 | } | 653 | } |
654 | 654 | ||
655 | if(m_install) // Installation | 655 | if(m_install) // Installation |
656 | { | 656 | { |
657 | 657 | ||
658 | QString url = m_bootloaderUrlBase + "/ipod/bootloader-" + m_bootloadername + ".ipod"; | 658 | QString url = m_bootloaderUrlBase + "/ipod/bootloader-" + m_bootloadername + ".ipod"; |
659 | 659 | ||
660 | m_dp->addItem(tr("Downloading file %1.%2") | 660 | m_dp->addItem(tr("Downloading file %1.%2") |
661 | .arg(QFileInfo(url).baseName(), QFileInfo(url).completeSuffix()),LOGINFO); | 661 | .arg(QFileInfo(url).baseName(), QFileInfo(url).completeSuffix()),LOGINFO); |
662 | 662 | ||
@@ -671,8 +671,8 @@ void BootloaderInstaller::ipodPrepare() | |||
671 | getter->getFile(QUrl(url)); | 671 | getter->getFile(QUrl(url)); |
672 | // connect signals from HttpGet | 672 | // connect signals from HttpGet |
673 | connect(getter, SIGNAL(done(bool)), this, SLOT(downloadDone(bool))); | 673 | connect(getter, SIGNAL(done(bool)), this, SLOT(downloadDone(bool))); |
674 | connect(getter, SIGNAL(dataReadProgress(int, int)), this, SLOT(updateDataReadProgress(int, int))); | 674 | connect(getter, SIGNAL(dataReadProgress(int, int)), this, SLOT(updateDataReadProgress(int, int))); |
675 | connect(m_dp, SIGNAL(aborted()), getter, SLOT(abort())); | 675 | connect(m_dp, SIGNAL(aborted()), getter, SLOT(abort())); |
676 | } | 676 | } |
677 | else // Uninstallation | 677 | else // Uninstallation |
678 | { | 678 | { |
@@ -693,13 +693,13 @@ void BootloaderInstaller::ipodPrepare() | |||
693 | if (ipod.pinfo[0].start==0) | 693 | if (ipod.pinfo[0].start==0) |
694 | { | 694 | { |
695 | m_dp->addItem(tr("No partition 0 on disk"),LOGERROR); | 695 | m_dp->addItem(tr("No partition 0 on disk"),LOGERROR); |
696 | 696 | ||
697 | int i; | 697 | int i; |
698 | double sectors_per_MB = (1024.0*1024.0)/ipod.sector_size; | 698 | double sectors_per_MB = (1024.0*1024.0)/ipod.sector_size; |
699 | m_dp->addItem(tr("[INFO] Part Start Sector End Sector Size (MB) Type\n"),LOGINFO); | 699 | m_dp->addItem(tr("[INFO] Part Start Sector End Sector Size (MB) Type\n"),LOGINFO); |
700 | for ( i = 0; i < 4; i++ ) | 700 | for ( i = 0; i < 4; i++ ) |
701 | { | 701 | { |
702 | if (ipod.pinfo[i].start != 0) | 702 | if (ipod.pinfo[i].start != 0) |
703 | { | 703 | { |
704 | m_dp->addItem(tr("[INFO] %1 %2 %3 %4 %5 (%6)").arg( | 704 | m_dp->addItem(tr("[INFO] %1 %2 %3 %4 %5 (%6)").arg( |
705 | i).arg( | 705 | i).arg( |
@@ -734,43 +734,43 @@ void BootloaderInstaller::ipodPrepare() | |||
734 | { | 734 | { |
735 | m_dp->addItem(tr("Warning this is a MacPod, Rockbox doesnt work on this. Convert it to WinPod"),LOGWARNING); | 735 | m_dp->addItem(tr("Warning this is a MacPod, Rockbox doesnt work on this. Convert it to WinPod"),LOGWARNING); |
736 | } | 736 | } |
737 | 737 | ||
738 | if (ipod_reopen_rw(&ipod) < 0) | 738 | if (ipod_reopen_rw(&ipod) < 0) |
739 | { | 739 | { |
740 | m_dp->addItem(tr("Could not open Ipod in RW mode"),LOGERROR); | 740 | m_dp->addItem(tr("Could not open Ipod in RW mode"),LOGERROR); |
741 | emit done(true); | 741 | emit done(true); |
742 | return; | 742 | return; |
743 | } | 743 | } |
744 | 744 | ||
745 | if (ipod.ipod_directory[0].entryOffset==0) { | 745 | if (ipod.ipod_directory[0].entryOffset==0) { |
746 | m_dp->addItem(tr("No bootloader detected."),LOGERROR); | 746 | m_dp->addItem(tr("No bootloader detected."),LOGERROR); |
747 | emit done(true); | 747 | emit done(true); |
748 | return; | 748 | return; |
749 | } | 749 | } |
750 | 750 | ||
751 | if (delete_bootloader(&ipod)==0) | 751 | if (delete_bootloader(&ipod)==0) |
752 | { | 752 | { |
753 | m_dp->addItem(tr("Successfully removed Bootloader"),LOGOK); | 753 | m_dp->addItem(tr("Successfully removed Bootloader"),LOGOK); |
754 | removeInstallLog(); | 754 | removeInstallLog(); |
755 | emit done(false); | 755 | emit done(false); |
756 | ipod_close(&ipod); | 756 | ipod_close(&ipod); |
757 | return; | 757 | return; |
758 | } | 758 | } |
759 | else | 759 | else |
760 | { | 760 | { |
761 | m_dp->addItem(tr("--delete-bootloader failed."),LOGERROR); | 761 | m_dp->addItem(tr("--delete-bootloader failed."),LOGERROR); |
762 | emit done(true); | 762 | emit done(true); |
763 | ipod_close(&ipod); | 763 | ipod_close(&ipod); |
764 | return; | 764 | return; |
765 | } | 765 | } |
766 | } | 766 | } |
767 | } | 767 | } |
768 | 768 | ||
769 | void BootloaderInstaller::ipodFinish() | 769 | void BootloaderInstaller::ipodFinish() |
770 | { | 770 | { |
771 | struct ipod_t ipod; | 771 | struct ipod_t ipod; |
772 | ipod_scan(&ipod); | 772 | ipod_scan(&ipod); |
773 | 773 | ||
774 | if (ipod_open(&ipod, 0) < 0) | 774 | if (ipod_open(&ipod, 0) < 0) |
775 | { | 775 | { |
776 | m_dp->addItem(tr("could not open ipod"),LOGERROR); | 776 | m_dp->addItem(tr("could not open ipod"),LOGERROR); |
@@ -788,15 +788,15 @@ void BootloaderInstaller::ipodFinish() | |||
788 | if (ipod.pinfo[0].start==0) | 788 | if (ipod.pinfo[0].start==0) |
789 | { | 789 | { |
790 | m_dp->addItem(tr("No partition 0 on disk"),LOGERROR); | 790 | m_dp->addItem(tr("No partition 0 on disk"),LOGERROR); |
791 | 791 | ||
792 | int i; | 792 | int i; |
793 | double sectors_per_MB = (1024.0*1024.0)/ipod.sector_size; | 793 | double sectors_per_MB = (1024.0*1024.0)/ipod.sector_size; |
794 | 794 | ||
795 | m_dp->addItem(tr("[INFO] Part Start Sector End Sector Size (MB) Type\n"),LOGINFO); | 795 | m_dp->addItem(tr("[INFO] Part Start Sector End Sector Size (MB) Type\n"),LOGINFO); |
796 | 796 | ||
797 | for ( i = 0; i < 4; i++ ) | 797 | for ( i = 0; i < 4; i++ ) |
798 | { | 798 | { |
799 | if (ipod.pinfo[i].start != 0) | 799 | if (ipod.pinfo[i].start != 0) |
800 | { | 800 | { |
801 | m_dp->addItem(tr("[INFO] %1 %2 %3 %4 %5 (%6)").arg( | 801 | m_dp->addItem(tr("[INFO] %1 %2 %3 %4 %5 (%6)").arg( |
802 | i).arg( | 802 | i).arg( |
@@ -832,32 +832,32 @@ void BootloaderInstaller::ipodFinish() | |||
832 | m_dp->addItem(tr("Warning this is a MacPod, Rockbox doesnt work on this. Convert it to WinPod"),LOGWARNING); | 832 | m_dp->addItem(tr("Warning this is a MacPod, Rockbox doesnt work on this. Convert it to WinPod"),LOGWARNING); |
833 | } | 833 | } |
834 | 834 | ||
835 | if (ipod_reopen_rw(&ipod) < 0) | 835 | if (ipod_reopen_rw(&ipod) < 0) |
836 | { | 836 | { |
837 | m_dp->addItem(tr("Could not open Ipod in RW mode"),LOGERROR); | 837 | m_dp->addItem(tr("Could not open Ipod in RW mode"),LOGERROR); |
838 | emit done(true); | 838 | emit done(true); |
839 | return; | 839 | return; |
840 | } | 840 | } |
841 | 841 | ||
842 | if (add_bootloader(&ipod, m_tempfilename.toLatin1().data(), FILETYPE_DOT_IPOD)==0) | 842 | if (add_bootloader(&ipod, m_tempfilename.toLatin1().data(), FILETYPE_DOT_IPOD)==0) |
843 | { | 843 | { |
844 | m_dp->addItem(tr("Successfully added Bootloader"),LOGOK); | 844 | m_dp->addItem(tr("Successfully added Bootloader"),LOGOK); |
845 | createInstallLog(); | 845 | createInstallLog(); |
846 | emit done(false); | 846 | emit done(false); |
847 | ipod_close(&ipod); | 847 | ipod_close(&ipod); |
848 | return; | 848 | return; |
849 | } | 849 | } |
850 | else | 850 | else |
851 | { | 851 | { |
852 | m_dp->addItem(tr("failed to add Bootloader"),LOGERROR); | 852 | m_dp->addItem(tr("failed to add Bootloader"),LOGERROR); |
853 | ipod_close(&ipod); | 853 | ipod_close(&ipod); |
854 | emit done(true); | 854 | emit done(true); |
855 | return; | 855 | return; |
856 | } | 856 | } |
857 | } | 857 | } |
858 | 858 | ||
859 | /************************************************** | 859 | /************************************************** |
860 | *** sansa secific code | 860 | *** sansa secific code |
861 | ***************************************************/ | 861 | ***************************************************/ |
862 | // reserves memory for sansapatcher | 862 | // reserves memory for sansapatcher |
863 | bool initSansapatcher() | 863 | bool initSansapatcher() |
@@ -884,11 +884,11 @@ void BootloaderInstaller::sansaPrepare() | |||
884 | m_dp->addItem(tr("Too many Sansas found"),LOGERROR); | 884 | m_dp->addItem(tr("Too many Sansas found"),LOGERROR); |
885 | emit done(true); | 885 | emit done(true); |
886 | } | 886 | } |
887 | 887 | ||
888 | if(m_install) // Installation | 888 | if(m_install) // Installation |
889 | { | 889 | { |
890 | QString url = m_bootloaderUrlBase + "/sandisk-sansa/e200/" + m_bootloadername; | 890 | QString url = m_bootloaderUrlBase + "/sandisk-sansa/e200/" + m_bootloadername; |
891 | 891 | ||
892 | m_dp->addItem(tr("Downloading file %1.%2") | 892 | m_dp->addItem(tr("Downloading file %1.%2") |
893 | .arg(QFileInfo(url).baseName(), QFileInfo(url).completeSuffix()),LOGINFO); | 893 | .arg(QFileInfo(url).baseName(), QFileInfo(url).completeSuffix()),LOGINFO); |
894 | 894 | ||
@@ -903,19 +903,19 @@ void BootloaderInstaller::sansaPrepare() | |||
903 | getter->getFile(QUrl(url)); | 903 | getter->getFile(QUrl(url)); |
904 | // connect signals from HttpGet | 904 | // connect signals from HttpGet |
905 | connect(getter, SIGNAL(done(bool)), this, SLOT(downloadDone(bool))); | 905 | connect(getter, SIGNAL(done(bool)), this, SLOT(downloadDone(bool))); |
906 | connect(getter, SIGNAL(dataReadProgress(int, int)), this, SLOT(updateDataReadProgress(int, int))); | 906 | connect(getter, SIGNAL(dataReadProgress(int, int)), this, SLOT(updateDataReadProgress(int, int))); |
907 | connect(m_dp, SIGNAL(aborted()), getter, SLOT(abort())); | 907 | connect(m_dp, SIGNAL(aborted()), getter, SLOT(abort())); |
908 | } | 908 | } |
909 | else // Uninstallation | 909 | else // Uninstallation |
910 | { | 910 | { |
911 | 911 | ||
912 | if (sansa_open(&sansa, 0) < 0) | 912 | if (sansa_open(&sansa, 0) < 0) |
913 | { | 913 | { |
914 | m_dp->addItem(tr("could not open Sansa"),LOGERROR); | 914 | m_dp->addItem(tr("could not open Sansa"),LOGERROR); |
915 | emit done(true); | 915 | emit done(true); |
916 | return; | 916 | return; |
917 | } | 917 | } |
918 | 918 | ||
919 | if (sansa_read_partinfo(&sansa,0) < 0) | 919 | if (sansa_read_partinfo(&sansa,0) < 0) |
920 | { | 920 | { |
921 | m_dp->addItem(tr("could not read partitiontable"),LOGERROR); | 921 | m_dp->addItem(tr("could not read partitiontable"),LOGERROR); |
@@ -941,45 +941,45 @@ void BootloaderInstaller::sansaPrepare() | |||
941 | emit done(true); | 941 | emit done(true); |
942 | return; | 942 | return; |
943 | } | 943 | } |
944 | |||
945 | 944 | ||
946 | if (sansa_reopen_rw(&sansa) < 0) | 945 | |
946 | if (sansa_reopen_rw(&sansa) < 0) | ||
947 | { | 947 | { |
948 | m_dp->addItem(tr("Could not open Sansa in RW mode"),LOGERROR); | 948 | m_dp->addItem(tr("Could not open Sansa in RW mode"),LOGERROR); |
949 | emit done(true); | 949 | emit done(true); |
950 | return; | 950 | return; |
951 | } | 951 | } |
952 | 952 | ||
953 | if (sansa_delete_bootloader(&sansa)==0) | 953 | if (sansa_delete_bootloader(&sansa)==0) |
954 | { | 954 | { |
955 | m_dp->addItem(tr("Successfully removed Bootloader"),LOGOK); | 955 | m_dp->addItem(tr("Successfully removed Bootloader"),LOGOK); |
956 | removeInstallLog(); | 956 | removeInstallLog(); |
957 | emit done(false); | 957 | emit done(false); |
958 | sansa_close(&sansa); | 958 | sansa_close(&sansa); |
959 | return; | 959 | return; |
960 | } | 960 | } |
961 | else | 961 | else |
962 | { | 962 | { |
963 | m_dp->addItem(tr("--delete-bootloader failed."),LOGERROR); | 963 | m_dp->addItem(tr("--delete-bootloader failed."),LOGERROR); |
964 | emit done(true); | 964 | emit done(true); |
965 | sansa_close(&sansa); | 965 | sansa_close(&sansa); |
966 | return; | 966 | return; |
967 | } | 967 | } |
968 | } | 968 | } |
969 | } | 969 | } |
970 | 970 | ||
971 | void BootloaderInstaller::sansaFinish() | 971 | void BootloaderInstaller::sansaFinish() |
972 | { | 972 | { |
973 | struct sansa_t sansa; | 973 | struct sansa_t sansa; |
974 | sansa_scan(&sansa); | 974 | sansa_scan(&sansa); |
975 | 975 | ||
976 | if (sansa_open(&sansa, 0) < 0) | 976 | if (sansa_open(&sansa, 0) < 0) |
977 | { | 977 | { |
978 | m_dp->addItem(tr("could not open Sansa"),LOGERROR); | 978 | m_dp->addItem(tr("could not open Sansa"),LOGERROR); |
979 | emit done(true); | 979 | emit done(true); |
980 | return; | 980 | return; |
981 | } | 981 | } |
982 | 982 | ||
983 | if (sansa_read_partinfo(&sansa,0) < 0) | 983 | if (sansa_read_partinfo(&sansa,0) < 0) |
984 | { | 984 | { |
985 | m_dp->addItem(tr("could not read partitiontable"),LOGERROR); | 985 | m_dp->addItem(tr("could not read partitiontable"),LOGERROR); |
@@ -990,7 +990,7 @@ void BootloaderInstaller::sansaFinish() | |||
990 | 990 | ||
991 | int i = is_e200(&sansa); | 991 | int i = is_e200(&sansa); |
992 | if (i < 0) { | 992 | if (i < 0) { |
993 | 993 | ||
994 | m_dp->addItem(tr("Disk is not an E200 (%1), aborting.").arg(i),LOGERROR); | 994 | m_dp->addItem(tr("Disk is not an E200 (%1), aborting.").arg(i),LOGERROR); |
995 | emit done(true); | 995 | emit done(true); |
996 | return; | 996 | return; |
@@ -1008,33 +1008,33 @@ void BootloaderInstaller::sansaFinish() | |||
1008 | return; | 1008 | return; |
1009 | } | 1009 | } |
1010 | 1010 | ||
1011 | if (sansa_reopen_rw(&sansa) < 0) | 1011 | if (sansa_reopen_rw(&sansa) < 0) |
1012 | { | 1012 | { |
1013 | m_dp->addItem(tr("Could not open Sansa in RW mode"),LOGERROR); | 1013 | m_dp->addItem(tr("Could not open Sansa in RW mode"),LOGERROR); |
1014 | emit done(true); | 1014 | emit done(true); |
1015 | return; | 1015 | return; |
1016 | } | 1016 | } |
1017 | 1017 | ||
1018 | if (sansa_add_bootloader(&sansa, m_tempfilename.toLatin1().data(), FILETYPE_MI4)==0) | 1018 | if (sansa_add_bootloader(&sansa, m_tempfilename.toLatin1().data(), FILETYPE_MI4)==0) |
1019 | { | 1019 | { |
1020 | m_dp->addItem(tr("Successfully added Bootloader"),LOGOK); | 1020 | m_dp->addItem(tr("Successfully added Bootloader"),LOGOK); |
1021 | createInstallLog(); | 1021 | createInstallLog(); |
1022 | emit done(false); | 1022 | emit done(false); |
1023 | sansa_close(&sansa); | 1023 | sansa_close(&sansa); |
1024 | return; | 1024 | return; |
1025 | } | 1025 | } |
1026 | else | 1026 | else |
1027 | { | 1027 | { |
1028 | m_dp->addItem(tr("failed to add Bootloader"),LOGERROR); | 1028 | m_dp->addItem(tr("failed to add Bootloader"),LOGERROR); |
1029 | sansa_close(&sansa); | 1029 | sansa_close(&sansa); |
1030 | emit done(true); | 1030 | emit done(true); |
1031 | return; | 1031 | return; |
1032 | } | 1032 | } |
1033 | 1033 | ||
1034 | } | 1034 | } |
1035 | 1035 | ||
1036 | /************************************************** | 1036 | /************************************************** |
1037 | *** iriver /fwpatcher secific code | 1037 | *** iriver /fwpatcher secific code |
1038 | ***************************************************/ | 1038 | ***************************************************/ |
1039 | 1039 | ||
1040 | void BootloaderInstaller::iriverPrepare() | 1040 | void BootloaderInstaller::iriverPrepare() |
@@ -1045,7 +1045,7 @@ void BootloaderInstaller::iriverPrepare() | |||
1045 | emit done(true); | 1045 | emit done(true); |
1046 | return; | 1046 | return; |
1047 | } | 1047 | } |
1048 | 1048 | ||
1049 | /* Check firmware against md5sums in h120sums and h100sums */ | 1049 | /* Check firmware against md5sums in h120sums and h100sums */ |
1050 | series = 0; | 1050 | series = 0; |
1051 | table_entry = intable(md5sum_str, &h120pairs[0], | 1051 | table_entry = intable(md5sum_str, &h120pairs[0], |
@@ -1053,15 +1053,15 @@ void BootloaderInstaller::iriverPrepare() | |||
1053 | if (table_entry >= 0) { | 1053 | if (table_entry >= 0) { |
1054 | series = 120; | 1054 | series = 120; |
1055 | } | 1055 | } |
1056 | else | 1056 | else |
1057 | { | 1057 | { |
1058 | table_entry = intable(md5sum_str, &h100pairs[0], | 1058 | table_entry = intable(md5sum_str, &h100pairs[0], |
1059 | sizeof(h100pairs)/sizeof(struct sumpairs)); | 1059 | sizeof(h100pairs)/sizeof(struct sumpairs)); |
1060 | if (table_entry >= 0) | 1060 | if (table_entry >= 0) |
1061 | { | 1061 | { |
1062 | series = 100; | 1062 | series = 100; |
1063 | } | 1063 | } |
1064 | else | 1064 | else |
1065 | { | 1065 | { |
1066 | table_entry = intable(md5sum_str, &h300pairs[0], | 1066 | table_entry = intable(md5sum_str, &h300pairs[0], |
1067 | sizeof(h300pairs)/sizeof(struct sumpairs)); | 1067 | sizeof(h300pairs)/sizeof(struct sumpairs)); |
@@ -1075,9 +1075,9 @@ void BootloaderInstaller::iriverPrepare() | |||
1075 | emit done(true); | 1075 | emit done(true); |
1076 | return; | 1076 | return; |
1077 | } | 1077 | } |
1078 | 1078 | ||
1079 | QString url = m_bootloaderUrlBase + "/iriver/" + m_bootloadername; | 1079 | QString url = m_bootloaderUrlBase + "/iriver/" + m_bootloadername; |
1080 | 1080 | ||
1081 | m_dp->addItem(tr("Downloading file %1.%2") | 1081 | m_dp->addItem(tr("Downloading file %1.%2") |
1082 | .arg(QFileInfo(url).baseName(), QFileInfo(url).completeSuffix()),LOGINFO); | 1082 | .arg(QFileInfo(url).baseName(), QFileInfo(url).completeSuffix()),LOGINFO); |
1083 | 1083 | ||
@@ -1092,8 +1092,8 @@ void BootloaderInstaller::iriverPrepare() | |||
1092 | getter->getFile(QUrl(url)); | 1092 | getter->getFile(QUrl(url)); |
1093 | // connect signals from HttpGet | 1093 | // connect signals from HttpGet |
1094 | connect(getter, SIGNAL(done(bool)), this, SLOT(downloadDone(bool))); | 1094 | connect(getter, SIGNAL(done(bool)), this, SLOT(downloadDone(bool))); |
1095 | connect(getter, SIGNAL(dataReadProgress(int, int)), this, SLOT(updateDataReadProgress(int, int))); | 1095 | connect(getter, SIGNAL(dataReadProgress(int, int)), this, SLOT(updateDataReadProgress(int, int))); |
1096 | connect(m_dp, SIGNAL(aborted()), getter, SLOT(abort())); | 1096 | connect(m_dp, SIGNAL(aborted()), getter, SLOT(abort())); |
1097 | } | 1097 | } |
1098 | 1098 | ||
1099 | void BootloaderInstaller::iriverFinish() | 1099 | void BootloaderInstaller::iriverFinish() |
@@ -1118,7 +1118,7 @@ void BootloaderInstaller::iriverFinish() | |||
1118 | origin = 0x3f0000; | 1118 | origin = 0x3f0000; |
1119 | break; | 1119 | break; |
1120 | } | 1120 | } |
1121 | 1121 | ||
1122 | // temporary files needs to be opened to get the filename | 1122 | // temporary files needs to be opened to get the filename |
1123 | QTemporaryFile firmwareBin, newBin, newHex; | 1123 | QTemporaryFile firmwareBin, newBin, newHex; |
1124 | firmwareBin.open(); | 1124 | firmwareBin.open(); |
@@ -1130,9 +1130,9 @@ void BootloaderInstaller::iriverFinish() | |||
1130 | firmwareBin.close(); | 1130 | firmwareBin.close(); |
1131 | newBin.close(); | 1131 | newBin.close(); |
1132 | newHex.close(); | 1132 | newHex.close(); |
1133 | 1133 | ||
1134 | // iriver decode | 1134 | // iriver decode |
1135 | if (iriver_decode(m_origfirmware, firmwareBinName, FALSE, STRIP_NONE,m_dp) == -1) | 1135 | if (iriver_decode(m_origfirmware, firmwareBinName, FALSE, STRIP_NONE,m_dp) == -1) |
1136 | { | 1136 | { |
1137 | m_dp->addItem(tr("Error in descramble"),LOGERROR); | 1137 | m_dp->addItem(tr("Error in descramble"),LOGERROR); |
1138 | firmwareBin.remove(); | 1138 | firmwareBin.remove(); |
@@ -1142,7 +1142,7 @@ void BootloaderInstaller::iriverFinish() | |||
1142 | return; | 1142 | return; |
1143 | } | 1143 | } |
1144 | // mkboot | 1144 | // mkboot |
1145 | if (!mkboot(firmwareBinName, newBinName, m_tempfilename, origin,m_dp)) | 1145 | if (!mkboot(firmwareBinName, newBinName, m_tempfilename, origin,m_dp)) |
1146 | { | 1146 | { |
1147 | m_dp->addItem(tr("Error in patching"),LOGERROR); | 1147 | m_dp->addItem(tr("Error in patching"),LOGERROR); |
1148 | firmwareBin.remove(); | 1148 | firmwareBin.remove(); |
@@ -1152,7 +1152,7 @@ void BootloaderInstaller::iriverFinish() | |||
1152 | return; | 1152 | return; |
1153 | } | 1153 | } |
1154 | // iriver_encode | 1154 | // iriver_encode |
1155 | if (iriver_encode(newBinName, newHexName, FALSE,m_dp) == -1) | 1155 | if (iriver_encode(newBinName, newHexName, FALSE,m_dp) == -1) |
1156 | { | 1156 | { |
1157 | m_dp->addItem(tr("Error in scramble"),LOGERROR); | 1157 | m_dp->addItem(tr("Error in scramble"),LOGERROR); |
1158 | firmwareBin.remove(); | 1158 | firmwareBin.remove(); |
@@ -1161,9 +1161,9 @@ void BootloaderInstaller::iriverFinish() | |||
1161 | emit done(true); | 1161 | emit done(true); |
1162 | return; | 1162 | return; |
1163 | } | 1163 | } |
1164 | 1164 | ||
1165 | /* now md5sum it */ | 1165 | /* now md5sum it */ |
1166 | if (!FileMD5(newHexName, md5sum_str)) | 1166 | if (!FileMD5(newHexName, md5sum_str)) |
1167 | { | 1167 | { |
1168 | m_dp->addItem(tr("Error in checksumming"),LOGERROR); | 1168 | m_dp->addItem(tr("Error in checksumming"),LOGERROR); |
1169 | firmwareBin.remove(); | 1169 | firmwareBin.remove(); |
@@ -1177,7 +1177,7 @@ void BootloaderInstaller::iriverFinish() | |||
1177 | firmwareBin.remove(); | 1177 | firmwareBin.remove(); |
1178 | newBin.remove(); | 1178 | newBin.remove(); |
1179 | } | 1179 | } |
1180 | 1180 | ||
1181 | // Load patched Firmware to player | 1181 | // Load patched Firmware to player |
1182 | QString dest; | 1182 | QString dest; |
1183 | if(series == 100) | 1183 | if(series == 100) |
@@ -1186,7 +1186,7 @@ void BootloaderInstaller::iriverFinish() | |||
1186 | dest = m_mountpoint + "/ihp_120.hex"; | 1186 | dest = m_mountpoint + "/ihp_120.hex"; |
1187 | else if(series == 300) | 1187 | else if(series == 300) |
1188 | dest = m_mountpoint + "/H300.hex"; | 1188 | dest = m_mountpoint + "/H300.hex"; |
1189 | 1189 | ||
1190 | // copy file | 1190 | // copy file |
1191 | QFile destfile(dest); | 1191 | QFile destfile(dest); |
1192 | if(destfile.exists()) destfile.remove(); | 1192 | if(destfile.exists()) destfile.remove(); |
@@ -1197,12 +1197,12 @@ void BootloaderInstaller::iriverFinish() | |||
1197 | emit done(true); | 1197 | emit done(true); |
1198 | return; | 1198 | return; |
1199 | } | 1199 | } |
1200 | 1200 | ||
1201 | downloadFile.remove(); | 1201 | downloadFile.remove(); |
1202 | newHex.remove(); | 1202 | newHex.remove(); |
1203 | 1203 | ||
1204 | createInstallLog(); | 1204 | createInstallLog(); |
1205 | 1205 | ||
1206 | m_dp->addItem(tr("Bootloader install finished successfully."),LOGOK); | 1206 | m_dp->addItem(tr("Bootloader install finished successfully."),LOGOK); |
1207 | m_dp->addItem(tr("To finish the Bootloader installation, follow the steps below."),LOGINFO); | 1207 | m_dp->addItem(tr("To finish the Bootloader installation, follow the steps below."),LOGINFO); |
1208 | m_dp->addItem(tr("1. Eject/Unmount your Device."),LOGINFO); | 1208 | m_dp->addItem(tr("1. Eject/Unmount your Device."),LOGINFO); |
@@ -1210,7 +1210,7 @@ void BootloaderInstaller::iriverFinish() | |||
1210 | m_dp->addItem(tr("3. Use the Firmware flash option in the Original Firmware."),LOGINFO); | 1210 | m_dp->addItem(tr("3. Use the Firmware flash option in the Original Firmware."),LOGINFO); |
1211 | m_dp->addItem(tr("4. Reboot."),LOGINFO); | 1211 | m_dp->addItem(tr("4. Reboot."),LOGINFO); |
1212 | m_dp->abort(); | 1212 | m_dp->abort(); |
1213 | 1213 | ||
1214 | emit done(false); // success | 1214 | emit done(false); // success |
1215 | 1215 | ||
1216 | 1216 | ||
diff --git a/rbutil/rbutilqt/installbootloader.h b/rbutil/rbutilqt/installbootloader.h index 496389e9dc..03b715c15e 100644 --- a/rbutil/rbutilqt/installbootloader.h +++ b/rbutil/rbutilqt/installbootloader.h | |||
@@ -16,7 +16,7 @@ | |||
16 | * KIND, either express or implied. | 16 | * KIND, either express or implied. |
17 | * | 17 | * |
18 | ****************************************************************************/ | 18 | ****************************************************************************/ |
19 | 19 | ||
20 | #ifndef INSTALLBOOTLOADER_H | 20 | #ifndef INSTALLBOOTLOADER_H |
21 | #define INSTALLBOOTLOADER_H | 21 | #define INSTALLBOOTLOADER_H |
22 | 22 | ||
@@ -38,14 +38,14 @@ bool initSansapatcher(); | |||
38 | class BootloaderInstaller : public QObject | 38 | class BootloaderInstaller : public QObject |
39 | { | 39 | { |
40 | Q_OBJECT | 40 | Q_OBJECT |
41 | 41 | ||
42 | public: | 42 | public: |
43 | BootloaderInstaller(QObject* parent); | 43 | BootloaderInstaller(QObject* parent); |
44 | ~BootloaderInstaller() {} | 44 | ~BootloaderInstaller() {} |
45 | 45 | ||
46 | void install(ProgressloggerInterface* dp); | 46 | void install(ProgressloggerInterface* dp); |
47 | void uninstall(ProgressloggerInterface* dp); | 47 | void uninstall(ProgressloggerInterface* dp); |
48 | 48 | ||
49 | void setMountPoint(QString mountpoint) {m_mountpoint = mountpoint;} | 49 | void setMountPoint(QString mountpoint) {m_mountpoint = mountpoint;} |
50 | void setProxy(QUrl proxy) {m_proxy= proxy;} | 50 | void setProxy(QUrl proxy) {m_proxy= proxy;} |
51 | void setDevice(QString device) {m_device= device;} //!< the current plattform | 51 | void setDevice(QString device) {m_device= device;} //!< the current plattform |
@@ -56,14 +56,14 @@ public: | |||
56 | void setBootloaderInfoUrl(QString url) {m_bootloaderinfoUrl =url; } //!< the url for the info file | 56 | void setBootloaderInfoUrl(QString url) {m_bootloaderinfoUrl =url; } //!< the url for the info file |
57 | bool downloadInfo(); //!< should be called before install/uninstall, blocks until downloaded. | 57 | bool downloadInfo(); //!< should be called before install/uninstall, blocks until downloaded. |
58 | bool uptodate(); //!< returns wether the bootloader is uptodate | 58 | bool uptodate(); //!< returns wether the bootloader is uptodate |
59 | 59 | ||
60 | signals: | 60 | signals: |
61 | void done(bool error); //installation finished. | 61 | void done(bool error); //installation finished. |
62 | 62 | ||
63 | signals: // internal signals. Dont use this from out side. | 63 | signals: // internal signals. Dont use this from out side. |
64 | void prepare(); | 64 | void prepare(); |
65 | void finish(); | 65 | void finish(); |
66 | 66 | ||
67 | private slots: | 67 | 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 |
@@ -74,23 +74,23 @@ private slots: | |||
74 | void infoDownloadDone(bool); | 74 | void infoDownloadDone(bool); |
75 | void infoRequestFinished(int, bool); | 75 | void infoRequestFinished(int, bool); |
76 | void installEnded(bool); | 76 | void installEnded(bool); |
77 | 77 | ||
78 | // gigabeat specific routines | 78 | // gigabeat specific routines |
79 | void gigabeatPrepare(); | 79 | void gigabeatPrepare(); |
80 | void gigabeatFinish(); | 80 | void gigabeatFinish(); |
81 | 81 | ||
82 | //iaudio specific routines | 82 | //iaudio specific routines |
83 | void iaudioPrepare(); | 83 | void iaudioPrepare(); |
84 | void iaudioFinish(); | 84 | void iaudioFinish(); |
85 | 85 | ||
86 | //h10 specific routines | 86 | //h10 specific routines |
87 | void h10Prepare(); | 87 | void h10Prepare(); |
88 | void h10Finish(); | 88 | void h10Finish(); |
89 | 89 | ||
90 | //ipod specific routines | 90 | //ipod specific routines |
91 | void ipodPrepare(); | 91 | void ipodPrepare(); |
92 | void ipodFinish(); | 92 | void ipodFinish(); |
93 | 93 | ||
94 | //sansa specific routines | 94 | //sansa specific routines |
95 | void sansaPrepare(); | 95 | void sansaPrepare(); |
96 | void sansaFinish(); | 96 | void sansaFinish(); |
@@ -98,25 +98,25 @@ private slots: | |||
98 | //iriver specific routines | 98 | //iriver specific routines |
99 | void iriverPrepare(); | 99 | void iriverPrepare(); |
100 | void iriverFinish(); | 100 | void iriverFinish(); |
101 | 101 | ||
102 | private: | 102 | private: |
103 | 103 | ||
104 | HttpGet *infodownloader; | 104 | HttpGet *infodownloader; |
105 | QTemporaryFile bootloaderInfo; | 105 | QTemporaryFile bootloaderInfo; |
106 | volatile bool infoDownloaded; | 106 | volatile bool infoDownloaded; |
107 | volatile bool infoError; | 107 | volatile bool infoError; |
108 | 108 | ||
109 | QString m_mountpoint, m_device,m_bootloadermethod,m_bootloadername; | 109 | QString m_mountpoint, m_device,m_bootloadermethod,m_bootloadername; |
110 | QString m_bootloaderUrlBase,m_tempfilename,m_origfirmware; | 110 | QString m_bootloaderUrlBase,m_tempfilename,m_origfirmware; |
111 | QUrl m_proxy; | 111 | QUrl m_proxy; |
112 | QString m_bootloaderinfoUrl; | 112 | QString m_bootloaderinfoUrl; |
113 | bool m_install; | 113 | bool m_install; |
114 | 114 | ||
115 | int series,table_entry; // for fwpatcher | 115 | int series,table_entry; // for fwpatcher |
116 | 116 | ||
117 | HttpGet *getter; | 117 | HttpGet *getter; |
118 | QTemporaryFile downloadFile; | 118 | QTemporaryFile downloadFile; |
119 | 119 | ||
120 | ProgressloggerInterface* m_dp; | 120 | ProgressloggerInterface* m_dp; |
121 | 121 | ||
122 | }; | 122 | }; |
diff --git a/rbutil/rbutilqt/installtalkwindow.cpp b/rbutil/rbutilqt/installtalkwindow.cpp index f273721437..4324f693a9 100644 --- a/rbutil/rbutilqt/installtalkwindow.cpp +++ b/rbutil/rbutilqt/installtalkwindow.cpp | |||
@@ -26,7 +26,7 @@ InstallTalkWindow::InstallTalkWindow(QWidget *parent) : QDialog(parent) | |||
26 | { | 26 | { |
27 | ui.setupUi(this); | 27 | ui.setupUi(this); |
28 | talkcreator = new TalkFileCreator(this); | 28 | talkcreator = new TalkFileCreator(this); |
29 | 29 | ||
30 | connect(ui.buttonBrowse, SIGNAL(clicked()), this, SLOT(browseFolder())); | 30 | connect(ui.buttonBrowse, SIGNAL(clicked()), this, SLOT(browseFolder())); |
31 | 31 | ||
32 | ui.OverwriteWav->setChecked(true); | 32 | ui.OverwriteWav->setChecked(true); |
@@ -40,7 +40,7 @@ void InstallTalkWindow::browseFolder() | |||
40 | { | 40 | { |
41 | BrowseDirtree browser(this); | 41 | BrowseDirtree browser(this); |
42 | browser.setFilter(QDir::AllDirs | QDir::NoDotAndDotDot | QDir::NoSymLinks); | 42 | browser.setFilter(QDir::AllDirs | QDir::NoDotAndDotDot | QDir::NoSymLinks); |
43 | 43 | ||
44 | if(QFileInfo(ui.lineTalkFolder->text()).isDir()) | 44 | if(QFileInfo(ui.lineTalkFolder->text()).isDir()) |
45 | { | 45 | { |
46 | browser.setDir(ui.lineTalkFolder->text()); | 46 | browser.setDir(ui.lineTalkFolder->text()); |
@@ -67,7 +67,7 @@ void InstallTalkWindow::accept() | |||
67 | logger = new ProgressLoggerGui(this); | 67 | logger = new ProgressLoggerGui(this); |
68 | logger->show(); | 68 | logger->show(); |
69 | connect(logger,SIGNAL(closed()),this,SLOT(close())); | 69 | connect(logger,SIGNAL(closed()),this,SLOT(close())); |
70 | 70 | ||
71 | QString folderToTalk = ui.lineTalkFolder->text(); | 71 | QString folderToTalk = ui.lineTalkFolder->text(); |
72 | QString pathEncoder = userSettings->value("encbin").toString(); | 72 | QString pathEncoder = userSettings->value("encbin").toString(); |
73 | QString pathTTS = userSettings->value("ttsbin").toString(); | 73 | QString pathTTS = userSettings->value("ttsbin").toString(); |
@@ -78,23 +78,23 @@ void InstallTalkWindow::accept() | |||
78 | logger->abort(); | 78 | logger->abort(); |
79 | return; | 79 | return; |
80 | } | 80 | } |
81 | 81 | ||
82 | if(!QFileInfo(pathEncoder).isExecutable()) | 82 | if(!QFileInfo(pathEncoder).isExecutable()) |
83 | { | 83 | { |
84 | logger->addItem(tr("Path to Encoder is wrong!"),LOGERROR); | 84 | logger->addItem(tr("Path to Encoder is wrong!"),LOGERROR); |
85 | logger->abort(); | 85 | logger->abort(); |
86 | return; | 86 | return; |
87 | } | 87 | } |
88 | 88 | ||
89 | if(!QFileInfo(pathTTS).isExecutable()) | 89 | if(!QFileInfo(pathTTS).isExecutable()) |
90 | { | 90 | { |
91 | logger->addItem(tr("Path to TTS is wrong!"),LOGERROR); | 91 | logger->addItem(tr("Path to TTS is wrong!"),LOGERROR); |
92 | logger->abort(); | 92 | logger->abort(); |
93 | return; | 93 | return; |
94 | } | 94 | } |
95 | 95 | ||
96 | userSettings->setValue("last_talked_folder", folderToTalk); | 96 | userSettings->setValue("last_talked_folder", folderToTalk); |
97 | 97 | ||
98 | userSettings->sync(); | 98 | userSettings->sync(); |
99 | 99 | ||
100 | talkcreator->setDir(folderToTalk); | 100 | talkcreator->setDir(folderToTalk); |
@@ -102,7 +102,7 @@ void InstallTalkWindow::accept() | |||
102 | talkcreator->setEncexe(pathEncoder); | 102 | talkcreator->setEncexe(pathEncoder); |
103 | talkcreator->setEncOpts(userSettings->value("encopts").toString()); | 103 | talkcreator->setEncOpts(userSettings->value("encopts").toString()); |
104 | talkcreator->setTTsOpts(userSettings->value("ttsopts").toString()); | 104 | talkcreator->setTTsOpts(userSettings->value("ttsopts").toString()); |
105 | 105 | ||
106 | devices->beginGroup(userSettings->value("ttspreset").toString()); | 106 | devices->beginGroup(userSettings->value("ttspreset").toString()); |
107 | talkcreator->setTTsType(devices->value("tts").toString()); | 107 | talkcreator->setTTsType(devices->value("tts").toString()); |
108 | talkcreator->setTTsOpts(devices->value("options").toString()); | 108 | talkcreator->setTTsOpts(devices->value("options").toString()); |
@@ -113,7 +113,7 @@ void InstallTalkWindow::accept() | |||
113 | talkcreator->setEncOpts(devices->value("options").toString()); | 113 | talkcreator->setEncOpts(devices->value("options").toString()); |
114 | talkcreator->setEncTemplate(devices->value("template").toString()); | 114 | talkcreator->setEncTemplate(devices->value("template").toString()); |
115 | devices->endGroup(); | 115 | devices->endGroup(); |
116 | 116 | ||
117 | talkcreator->setOverwriteTalk(ui.OverwriteTalk->isChecked()); | 117 | talkcreator->setOverwriteTalk(ui.OverwriteTalk->isChecked()); |
118 | talkcreator->setOverwriteWav(ui.OverwriteWav->isChecked()); | 118 | talkcreator->setOverwriteWav(ui.OverwriteWav->isChecked()); |
119 | talkcreator->setRemoveWav(ui.RemoveWav->isChecked()); | 119 | talkcreator->setRemoveWav(ui.RemoveWav->isChecked()); |
@@ -128,7 +128,7 @@ void InstallTalkWindow::setDeviceSettings(QSettings *dev) | |||
128 | { | 128 | { |
129 | devices = dev; | 129 | devices = dev; |
130 | qDebug() << "Install::setDeviceSettings:" << devices; | 130 | qDebug() << "Install::setDeviceSettings:" << devices; |
131 | 131 | ||
132 | QString profile; | 132 | QString profile; |
133 | 133 | ||
134 | profile = userSettings->value("ttspreset", "none").toString(); | 134 | profile = userSettings->value("ttspreset", "none").toString(); |
@@ -151,9 +151,9 @@ void InstallTalkWindow::setDeviceSettings(QSettings *dev) | |||
151 | void InstallTalkWindow::setUserSettings(QSettings *user) | 151 | void InstallTalkWindow::setUserSettings(QSettings *user) |
152 | { | 152 | { |
153 | userSettings = user; | 153 | userSettings = user; |
154 | 154 | ||
155 | talkcreator->setMountPoint(userSettings->value("mountpoint").toString()); | 155 | talkcreator->setMountPoint(userSettings->value("mountpoint").toString()); |
156 | 156 | ||
157 | setTalkFolder(userSettings->value("last_talked_folder").toString()); | 157 | setTalkFolder(userSettings->value("last_talked_folder").toString()); |
158 | 158 | ||
159 | } | 159 | } |
diff --git a/rbutil/rbutilqt/installthemes.cpp b/rbutil/rbutilqt/installthemes.cpp index 9c98ede32a..cf04280654 100644 --- a/rbutil/rbutilqt/installthemes.cpp +++ b/rbutil/rbutilqt/installthemes.cpp | |||
@@ -153,7 +153,7 @@ void ThemesInstallWindow::downloadDone(bool error) | |||
153 | void ThemesInstallWindow::updateDetails(int row) | 153 | void ThemesInstallWindow::updateDetails(int row) |
154 | { | 154 | { |
155 | if(row == currentItem) return; | 155 | if(row == currentItem) return; |
156 | 156 | ||
157 | currentItem = row; | 157 | currentItem = row; |
158 | qDebug() << "updateDetails(int) =" << row; | 158 | qDebug() << "updateDetails(int) =" << row; |
159 | QSettings iniDetails(themesInfo.fileName(), QSettings::IniFormat, this); | 159 | QSettings iniDetails(themesInfo.fileName(), QSettings::IniFormat, this); |
@@ -161,7 +161,7 @@ void ThemesInstallWindow::updateDetails(int row) | |||
161 | .arg(ui.listThemes->item(row)->data(Qt::DisplayRole).toString())); | 161 | .arg(ui.listThemes->item(row)->data(Qt::DisplayRole).toString())); |
162 | ui.themePreview->clear(); | 162 | ui.themePreview->clear(); |
163 | ui.themePreview->setText(tr("fetching preview ...")); | 163 | ui.themePreview->setText(tr("fetching preview ...")); |
164 | 164 | ||
165 | int size = 0; | 165 | int size = 0; |
166 | 166 | ||
167 | iniDetails.beginGroup(ui.listThemes->item(row)->data(Qt::UserRole).toString()); | 167 | iniDetails.beginGroup(ui.listThemes->item(row)->data(Qt::UserRole).toString()); |
@@ -184,7 +184,7 @@ void ThemesInstallWindow::updateDetails(int row) | |||
184 | text = tr("<b>Author:</b> %1<hr/>").arg(iniDetails.value("author", tr("unknown")).toString()); | 184 | text = tr("<b>Author:</b> %1<hr/>").arg(iniDetails.value("author", tr("unknown")).toString()); |
185 | text += tr("<b>Version:</b> %1<hr/>").arg(iniDetails.value("version", tr("unknown")).toString()); | 185 | text += tr("<b>Version:</b> %1<hr/>").arg(iniDetails.value("version", tr("unknown")).toString()); |
186 | text += tr("<b>Description:</b> %1<hr/>").arg(iniDetails.value("about", tr("no description")).toString()); | 186 | text += tr("<b>Description:</b> %1<hr/>").arg(iniDetails.value("about", tr("no description")).toString()); |
187 | 187 | ||
188 | ui.themeDescription->setHtml(text); | 188 | ui.themeDescription->setHtml(text); |
189 | iniDetails.endGroup(); | 189 | iniDetails.endGroup(); |
190 | 190 | ||
@@ -211,7 +211,7 @@ void ThemesInstallWindow::updateImage(bool error) | |||
211 | { | 211 | { |
212 | qDebug() << "updateImage(bool) =" << error; | 212 | qDebug() << "updateImage(bool) =" << error; |
213 | if(error) return; | 213 | if(error) return; |
214 | 214 | ||
215 | QPixmap p; | 215 | QPixmap p; |
216 | if(!error) { | 216 | if(!error) { |
217 | imgData = igetter.readAll(); | 217 | imgData = igetter.readAll(); |
@@ -221,7 +221,7 @@ void ThemesInstallWindow::updateImage(bool error) | |||
221 | ui.themePreview->clear(); | 221 | ui.themePreview->clear(); |
222 | ui.themePreview->setText(tr("no theme preview")); | 222 | ui.themePreview->setText(tr("no theme preview")); |
223 | } | 223 | } |
224 | else | 224 | else |
225 | ui.themePreview->setPixmap(p); | 225 | ui.themePreview->setPixmap(p); |
226 | } | 226 | } |
227 | } | 227 | } |
@@ -302,7 +302,7 @@ void ThemesInstallWindow::accept() | |||
302 | iniDetails.endGroup(); | 302 | iniDetails.endGroup(); |
303 | } | 303 | } |
304 | qDebug() << "installing themes:" << themes; | 304 | qDebug() << "installing themes:" << themes; |
305 | 305 | ||
306 | logger = new ProgressLoggerGui(this); | 306 | logger = new ProgressLoggerGui(this); |
307 | logger->show(); | 307 | logger->show(); |
308 | QString mountPoint = userSettings->value("mountpoint").toString(); | 308 | QString mountPoint = userSettings->value("mountpoint").toString(); |
diff --git a/rbutil/rbutilqt/installzip.cpp b/rbutil/rbutilqt/installzip.cpp index 68bbdc02a9..41f88171c5 100644 --- a/rbutil/rbutilqt/installzip.cpp +++ b/rbutil/rbutilqt/installzip.cpp | |||
@@ -16,13 +16,13 @@ | |||
16 | * KIND, either express or implied. | 16 | * KIND, either express or implied. |
17 | * | 17 | * |
18 | ****************************************************************************/ | 18 | ****************************************************************************/ |
19 | 19 | ||
20 | #include "installzip.h" | 20 | #include "installzip.h" |
21 | 21 | ||
22 | #include "zip/zip.h" | 22 | #include "zip/zip.h" |
23 | #include "zip/unzip.h" | 23 | #include "zip/unzip.h" |
24 | 24 | ||
25 | ZipInstaller::ZipInstaller(QObject* parent): QObject(parent) | 25 | ZipInstaller::ZipInstaller(QObject* parent): QObject(parent) |
26 | { | 26 | { |
27 | m_unzip = true; | 27 | m_unzip = true; |
28 | m_cache = ""; | 28 | m_cache = ""; |
@@ -46,7 +46,7 @@ void ZipInstaller::install(ProgressloggerInterface *dp) | |||
46 | void ZipInstaller::installContinue() | 46 | void ZipInstaller::installContinue() |
47 | { | 47 | { |
48 | qDebug() << "installContinue()"; | 48 | qDebug() << "installContinue()"; |
49 | 49 | ||
50 | runner++; // this gets called when a install finished, so increase first. | 50 | runner++; // this gets called when a install finished, so increase first. |
51 | qDebug() << "runner is now at" << runner << "size is" << m_urllist.size(); | 51 | qDebug() << "runner is now at" << runner << "size is" << m_urllist.size(); |
52 | if(runner < m_urllist.size()) { | 52 | if(runner < m_urllist.size()) { |
@@ -115,7 +115,7 @@ void ZipInstaller::downloadDone(bool error) | |||
115 | qDebug() << "Install::downloadDone, error:" << error; | 115 | qDebug() << "Install::downloadDone, error:" << error; |
116 | QStringList zipContents; // needed later | 116 | QStringList zipContents; // needed later |
117 | // update progress bar | 117 | // update progress bar |
118 | 118 | ||
119 | int max = m_dp->getProgressMax(); | 119 | int max = m_dp->getProgressMax(); |
120 | if(max == 0) { | 120 | if(max == 0) { |
121 | max = 100; | 121 | max = 100; |
@@ -155,7 +155,7 @@ void ZipInstaller::downloadDone(bool error) | |||
155 | emit done(false); | 155 | emit done(false); |
156 | return; | 156 | return; |
157 | } | 157 | } |
158 | 158 | ||
159 | ec = uz.extractAll(m_mountpoint); | 159 | ec = uz.extractAll(m_mountpoint); |
160 | if(ec != UnZip::Ok) { | 160 | if(ec != UnZip::Ok) { |
161 | m_dp->addItem(tr("Extracting failed: %1.") | 161 | m_dp->addItem(tr("Extracting failed: %1.") |
@@ -185,7 +185,7 @@ void ZipInstaller::downloadDone(bool error) | |||
185 | emit done(false); | 185 | emit done(false); |
186 | return; | 186 | return; |
187 | } | 187 | } |
188 | 188 | ||
189 | // add file to log | 189 | // add file to log |
190 | zipContents.append( m_target); | 190 | zipContents.append( m_target); |
191 | } | 191 | } |
diff --git a/rbutil/rbutilqt/installzip.h b/rbutil/rbutilqt/installzip.h index 629445d28f..9becbb1b8e 100644 --- a/rbutil/rbutilqt/installzip.h +++ b/rbutil/rbutilqt/installzip.h | |||
@@ -16,11 +16,11 @@ | |||
16 | * KIND, either express or implied. | 16 | * KIND, either express or implied. |
17 | * | 17 | * |
18 | ****************************************************************************/ | 18 | ****************************************************************************/ |
19 | 19 | ||
20 | 20 | ||
21 | #ifndef INSTALLZIP_H | 21 | #ifndef INSTALLZIP_H |
22 | #define INSTALLZIP_H | 22 | #define INSTALLZIP_H |
23 | 23 | ||
24 | 24 | ||
25 | 25 | ||
26 | #include <QtGui> | 26 | #include <QtGui> |
@@ -28,9 +28,9 @@ | |||
28 | 28 | ||
29 | #include "progressloggerinterface.h" | 29 | #include "progressloggerinterface.h" |
30 | #include "httpget.h" | 30 | #include "httpget.h" |
31 | 31 | ||
32 | class ZipInstaller : public QObject | 32 | class ZipInstaller : public QObject |
33 | { | 33 | { |
34 | Q_OBJECT | 34 | Q_OBJECT |
35 | public: | 35 | public: |
36 | ZipInstaller(QObject* parent) ; | 36 | ZipInstaller(QObject* parent) ; |
@@ -48,11 +48,11 @@ public: | |||
48 | void setTarget(QString t) { m_target = t; } | 48 | void setTarget(QString t) { m_target = t; } |
49 | void setCache(QDir c) { m_cache = c; }; | 49 | void setCache(QDir c) { m_cache = c; }; |
50 | void setCache(QString c) { m_cache = QDir(c);} | 50 | void setCache(QString c) { m_cache = QDir(c);} |
51 | 51 | ||
52 | signals: | 52 | signals: |
53 | void done(bool error); | 53 | void done(bool error); |
54 | void cont(); | 54 | void cont(); |
55 | 55 | ||
56 | private slots: | 56 | private slots: |
57 | void updateDataReadProgress(int, int); | 57 | void updateDataReadProgress(int, int); |
58 | void downloadDone(bool); | 58 | void downloadDone(bool); |
@@ -69,14 +69,14 @@ private: | |||
69 | QString m_target; | 69 | QString m_target; |
70 | int runner; | 70 | int runner; |
71 | QDir m_cache; | 71 | QDir m_cache; |
72 | 72 | ||
73 | HttpGet *getter; | 73 | HttpGet *getter; |
74 | QTemporaryFile *downloadFile; | 74 | QTemporaryFile *downloadFile; |
75 | 75 | ||
76 | ProgressloggerInterface* m_dp; | 76 | ProgressloggerInterface* m_dp; |
77 | }; | 77 | }; |
78 | 78 | ||
79 | 79 | ||
80 | 80 | ||
81 | #endif | 81 | #endif |
82 | 82 | ||
diff --git a/rbutil/rbutilqt/preview.cpp b/rbutil/rbutilqt/preview.cpp index 21e0711851..be1430c6a1 100644 --- a/rbutil/rbutilqt/preview.cpp +++ b/rbutil/rbutilqt/preview.cpp | |||
@@ -27,7 +27,7 @@ PreviewDlg::PreviewDlg(QWidget *parent) : QDialog(parent) | |||
27 | this->setModal(true); | 27 | this->setModal(true); |
28 | this->setMouseTracking(true); | 28 | this->setMouseTracking(true); |
29 | this->setWindowFlags(Qt::Dialog | Qt::FramelessWindowHint); | 29 | this->setWindowFlags(Qt::Dialog | Qt::FramelessWindowHint); |
30 | 30 | ||
31 | } | 31 | } |
32 | 32 | ||
33 | void PreviewDlg::setText(QString text) | 33 | void PreviewDlg::setText(QString text) |
@@ -39,7 +39,7 @@ void PreviewDlg::setPixmap(QPixmap p) | |||
39 | { | 39 | { |
40 | ui.themePreview->setFixedSize(p.size()); | 40 | ui.themePreview->setFixedSize(p.size()); |
41 | this->resize(QSize(10,10)); | 41 | this->resize(QSize(10,10)); |
42 | ui.themePreview->setPixmap(p); | 42 | ui.themePreview->setPixmap(p); |
43 | } | 43 | } |
44 | 44 | ||
45 | void PreviewDlg::mouseMoveEvent(QMouseEvent * event) | 45 | void PreviewDlg::mouseMoveEvent(QMouseEvent * event) |
@@ -58,9 +58,9 @@ PreviewLabel::PreviewLabel(QWidget * parent, Qt::WindowFlags f) | |||
58 | :QLabel(parent,f) | 58 | :QLabel(parent,f) |
59 | { | 59 | { |
60 | this->setMouseTracking(true); | 60 | this->setMouseTracking(true); |
61 | 61 | ||
62 | preview = new PreviewDlg(parent); | 62 | preview = new PreviewDlg(parent); |
63 | 63 | ||
64 | hovertimer.setInterval(1500); // wait for 1.5 seconds before showing the Fullsize Preview | 64 | hovertimer.setInterval(1500); // wait for 1.5 seconds before showing the Fullsize Preview |
65 | hovertimer.setSingleShot(true); | 65 | hovertimer.setSingleShot(true); |
66 | connect(&hovertimer,SIGNAL(timeout ()),this,SLOT(timeout())); | 66 | connect(&hovertimer,SIGNAL(timeout ()),this,SLOT(timeout())); |
@@ -89,11 +89,11 @@ void PreviewLabel::timeout() | |||
89 | preview->setVisible(true); | 89 | preview->setVisible(true); |
90 | } | 90 | } |
91 | 91 | ||
92 | void PreviewLabel::setPixmap(QPixmap p) | 92 | void PreviewLabel::setPixmap(QPixmap p) |
93 | { | 93 | { |
94 | // set the image for the Fullsize Preview | 94 | // set the image for the Fullsize Preview |
95 | preview->setPixmap(p); | 95 | preview->setPixmap(p); |
96 | 96 | ||
97 | //scale the image for use in the label | 97 | //scale the image for use in the label |
98 | QSize img; | 98 | QSize img; |
99 | img.setHeight(this->height()); | 99 | img.setHeight(this->height()); |
diff --git a/rbutil/rbutilqt/preview.h b/rbutil/rbutilqt/preview.h index c84a02a764..f46ca5e8a5 100644 --- a/rbutil/rbutilqt/preview.h +++ b/rbutil/rbutilqt/preview.h | |||
@@ -30,27 +30,27 @@ class PreviewDlg : public QDialog | |||
30 | 30 | ||
31 | public: | 31 | public: |
32 | PreviewDlg(QWidget *parent = 0); | 32 | PreviewDlg(QWidget *parent = 0); |
33 | void setPixmap(QPixmap p); | 33 | void setPixmap(QPixmap p); |
34 | void setText(QString text); | 34 | void setText(QString text); |
35 | 35 | ||
36 | private slots: | 36 | private slots: |
37 | void mouseMoveEvent(QMouseEvent * event); | 37 | void mouseMoveEvent(QMouseEvent * event); |
38 | void leaveEvent(QEvent * event); | 38 | void leaveEvent(QEvent * event); |
39 | 39 | ||
40 | private: | 40 | private: |
41 | Ui::PreviewFrm ui; | 41 | Ui::PreviewFrm ui; |
42 | 42 | ||
43 | 43 | ||
44 | }; | 44 | }; |
45 | 45 | ||
46 | 46 | ||
47 | class PreviewLabel : public QLabel | 47 | class PreviewLabel : public QLabel |
48 | { | 48 | { |
49 | Q_OBJECT | 49 | Q_OBJECT |
50 | 50 | ||
51 | public: | 51 | public: |
52 | PreviewLabel(QWidget * parent = 0, Qt::WindowFlags f = 0); | 52 | PreviewLabel(QWidget * parent = 0, Qt::WindowFlags f = 0); |
53 | 53 | ||
54 | void setPixmap(QPixmap p); | 54 | void setPixmap(QPixmap p); |
55 | void setText(QString text); | 55 | void setText(QString text); |
56 | private slots: | 56 | private slots: |
@@ -58,7 +58,7 @@ private slots: | |||
58 | void enterEvent(QEvent * event); | 58 | void enterEvent(QEvent * event); |
59 | void leaveEvent(QEvent * event); | 59 | void leaveEvent(QEvent * event); |
60 | void timeout(); | 60 | void timeout(); |
61 | 61 | ||
62 | private: | 62 | private: |
63 | QTimer hovertimer; | 63 | QTimer hovertimer; |
64 | int mousex; | 64 | int mousex; |
diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp index a2ac2b73ea..f06669d5c5 100644 --- a/rbutil/rbutilqt/rbutilqt.cpp +++ b/rbutil/rbutilqt/rbutilqt.cpp | |||
@@ -96,7 +96,7 @@ RbUtilQt::RbUtilQt(QWidget *parent) : QMainWindow(parent) | |||
96 | connect(ui.buttonDownloadManual, SIGNAL(clicked()), this, SLOT(downloadManual())); | 96 | connect(ui.buttonDownloadManual, SIGNAL(clicked()), this, SLOT(downloadManual())); |
97 | connect(ui.buttonSmall, SIGNAL(clicked()), this, SLOT(smallInstall())); | 97 | connect(ui.buttonSmall, SIGNAL(clicked()), this, SLOT(smallInstall())); |
98 | connect(ui.buttonComplete, SIGNAL(clicked()), this, SLOT(completeInstall())); | 98 | connect(ui.buttonComplete, SIGNAL(clicked()), this, SLOT(completeInstall())); |
99 | 99 | ||
100 | #if !defined(STATIC) | 100 | #if !defined(STATIC) |
101 | ui.actionInstall_Rockbox_Utility_on_player->setEnabled(false); | 101 | ui.actionInstall_Rockbox_Utility_on_player->setEnabled(false); |
102 | #else | 102 | #else |
@@ -145,7 +145,7 @@ void RbUtilQt::downloadDone(bool error) | |||
145 | return; | 145 | return; |
146 | } | 146 | } |
147 | qDebug() << "network status:" << daily->error(); | 147 | qDebug() << "network status:" << daily->error(); |
148 | 148 | ||
149 | buildInfo.open(); | 149 | buildInfo.open(); |
150 | QSettings info(buildInfo.fileName(), QSettings::IniFormat, this); | 150 | QSettings info(buildInfo.fileName(), QSettings::IniFormat, this); |
151 | buildInfo.close(); | 151 | buildInfo.close(); |
@@ -195,7 +195,7 @@ void RbUtilQt::about() | |||
195 | Ui::aboutBox about; | 195 | Ui::aboutBox about; |
196 | about.setupUi(window); | 196 | about.setupUi(window); |
197 | window->setModal(true); | 197 | window->setModal(true); |
198 | 198 | ||
199 | QFile licence(":/docs/gpl-2.0.html"); | 199 | QFile licence(":/docs/gpl-2.0.html"); |
200 | licence.open(QIODevice::ReadOnly); | 200 | licence.open(QIODevice::ReadOnly); |
201 | QTextStream c(&licence); | 201 | QTextStream c(&licence); |
@@ -288,7 +288,7 @@ void RbUtilQt::updateManual() | |||
288 | devices->beginGroup(userSettings->value("platform").toString()); | 288 | devices->beginGroup(userSettings->value("platform").toString()); |
289 | QString manual; | 289 | QString manual; |
290 | manual = devices->value("manualname", "").toString(); | 290 | manual = devices->value("manualname", "").toString(); |
291 | 291 | ||
292 | if(manual == "") | 292 | if(manual == "") |
293 | manual = "rockbox-" + devices->value("platform").toString(); | 293 | manual = "rockbox-" + devices->value("platform").toString(); |
294 | devices->endGroup(); | 294 | devices->endGroup(); |
@@ -314,18 +314,18 @@ void RbUtilQt::completeInstall() | |||
314 | if(QMessageBox::question(this, tr("Confirm Installation"), | 314 | if(QMessageBox::question(this, tr("Confirm Installation"), |
315 | tr("Do you really want to make a complete Installation?"), | 315 | tr("Do you really want to make a complete Installation?"), |
316 | QMessageBox::Yes | QMessageBox::No) != QMessageBox::Yes) return; | 316 | QMessageBox::Yes | QMessageBox::No) != QMessageBox::Yes) return; |
317 | 317 | ||
318 | // create logger | 318 | // create logger |
319 | logger = new ProgressLoggerGui(this); | 319 | logger = new ProgressLoggerGui(this); |
320 | logger->show(); | 320 | logger->show(); |
321 | 321 | ||
322 | QString mountpoint = userSettings->value("mountpoint").toString(); | 322 | QString mountpoint = userSettings->value("mountpoint").toString(); |
323 | // show dialog with error if mount point is wrong | 323 | // show dialog with error if mount point is wrong |
324 | if(!QFileInfo(mountpoint).isDir()) { | 324 | if(!QFileInfo(mountpoint).isDir()) { |
325 | logger->addItem(tr("Mount point is wrong!"),LOGERROR); | 325 | logger->addItem(tr("Mount point is wrong!"),LOGERROR); |
326 | logger->abort(); | 326 | logger->abort(); |
327 | return; | 327 | return; |
328 | } | 328 | } |
329 | // Bootloader | 329 | // Bootloader |
330 | devices->beginGroup(userSettings->value("platform").toString()); | 330 | devices->beginGroup(userSettings->value("platform").toString()); |
331 | if(devices->value("needsbootloader", "") == "yes") { | 331 | if(devices->value("needsbootloader", "") == "yes") { |
@@ -357,7 +357,7 @@ void RbUtilQt::completeInstall() | |||
357 | } | 357 | } |
358 | if(m_error) return; | 358 | if(m_error) return; |
359 | logger->undoAbort(); | 359 | logger->undoAbort(); |
360 | 360 | ||
361 | // Fonts | 361 | // Fonts |
362 | m_error = false; | 362 | m_error = false; |
363 | m_installed = false; | 363 | m_installed = false; |
@@ -371,7 +371,7 @@ void RbUtilQt::completeInstall() | |||
371 | } | 371 | } |
372 | if(m_error) return; | 372 | if(m_error) return; |
373 | logger->undoAbort(); | 373 | logger->undoAbort(); |
374 | 374 | ||
375 | // Doom | 375 | // Doom |
376 | if(hasDoom()) | 376 | if(hasDoom()) |
377 | { | 377 | { |
@@ -393,7 +393,7 @@ void RbUtilQt::completeInstall() | |||
393 | // it has its own logger window,so close our. | 393 | // it has its own logger window,so close our. |
394 | logger->close(); | 394 | logger->close(); |
395 | installThemes(); | 395 | installThemes(); |
396 | 396 | ||
397 | } | 397 | } |
398 | 398 | ||
399 | void RbUtilQt::smallInstall() | 399 | void RbUtilQt::smallInstall() |
@@ -401,7 +401,7 @@ void RbUtilQt::smallInstall() | |||
401 | if(QMessageBox::question(this, tr("Confirm Installation"), | 401 | if(QMessageBox::question(this, tr("Confirm Installation"), |
402 | tr("Do you really want to make a small Installation?"), | 402 | tr("Do you really want to make a small Installation?"), |
403 | QMessageBox::Yes | QMessageBox::No) != QMessageBox::Yes) return; | 403 | QMessageBox::Yes | QMessageBox::No) != QMessageBox::Yes) return; |
404 | 404 | ||
405 | // create logger | 405 | // create logger |
406 | logger = new ProgressLoggerGui(this); | 406 | logger = new ProgressLoggerGui(this); |
407 | logger->show(); | 407 | logger->show(); |
@@ -412,7 +412,7 @@ void RbUtilQt::smallInstall() | |||
412 | logger->addItem(tr("Mount point is wrong!"),LOGERROR); | 412 | logger->addItem(tr("Mount point is wrong!"),LOGERROR); |
413 | logger->abort(); | 413 | logger->abort(); |
414 | return; | 414 | return; |
415 | } | 415 | } |
416 | // Bootloader | 416 | // Bootloader |
417 | devices->beginGroup(userSettings->value("platform").toString()); | 417 | devices->beginGroup(userSettings->value("platform").toString()); |
418 | if(devices->value("needsbootloader", "") == "yes") { | 418 | if(devices->value("needsbootloader", "") == "yes") { |
@@ -461,7 +461,7 @@ bool RbUtilQt::installAuto() | |||
461 | QString file = QString("%1%2/rockbox.zip") | 461 | QString file = QString("%1%2/rockbox.zip") |
462 | .arg(devices->value("bleeding_url").toString(), | 462 | .arg(devices->value("bleeding_url").toString(), |
463 | userSettings->value("platform").toString()); | 463 | userSettings->value("platform").toString()); |
464 | 464 | ||
465 | buildInfo.open(); | 465 | buildInfo.open(); |
466 | QSettings info(buildInfo.fileName(), QSettings::IniFormat, this); | 466 | QSettings info(buildInfo.fileName(), QSettings::IniFormat, this); |
467 | buildInfo.close(); | 467 | buildInfo.close(); |
@@ -475,9 +475,9 @@ bool RbUtilQt::installAuto() | |||
475 | versmap.insert("rel_rev", devices->value("last_release").toString()); | 475 | versmap.insert("rel_rev", devices->value("last_release").toString()); |
476 | versmap.insert("rel_date", ""); // FIXME: provide the release timestamp | 476 | versmap.insert("rel_date", ""); // FIXME: provide the release timestamp |
477 | } | 477 | } |
478 | 478 | ||
479 | QString myversion = "r" + versmap.value("bleed_rev"); | 479 | QString myversion = "r" + versmap.value("bleed_rev"); |
480 | 480 | ||
481 | ZipInstaller* installer = new ZipInstaller(this); | 481 | ZipInstaller* installer = new ZipInstaller(this); |
482 | installer->setUrl(file); | 482 | installer->setUrl(file); |
483 | installer->setProxy(proxy()); | 483 | installer->setProxy(proxy()); |
@@ -487,9 +487,9 @@ bool RbUtilQt::installAuto() | |||
487 | installer->setCache(userSettings->value("cachepath", QDir::tempPath()).toString()); | 487 | installer->setCache(userSettings->value("cachepath", QDir::tempPath()).toString()); |
488 | installer->setMountPoint(userSettings->value("mountpoint").toString()); | 488 | installer->setMountPoint(userSettings->value("mountpoint").toString()); |
489 | installer->install(logger); | 489 | installer->install(logger); |
490 | 490 | ||
491 | connect(installer, SIGNAL(done(bool)), this, SLOT(installdone(bool))); | 491 | connect(installer, SIGNAL(done(bool)), this, SLOT(installdone(bool))); |
492 | 492 | ||
493 | return true; | 493 | return true; |
494 | } | 494 | } |
495 | 495 | ||
@@ -530,23 +530,23 @@ void RbUtilQt::installBootloaderBtn() | |||
530 | if(QMessageBox::question(this, tr("Confirm Installation"), | 530 | if(QMessageBox::question(this, tr("Confirm Installation"), |
531 | tr("Do you really want to install the Bootloader?"), | 531 | tr("Do you really want to install the Bootloader?"), |
532 | QMessageBox::Yes | QMessageBox::No) != QMessageBox::Yes) return; | 532 | QMessageBox::Yes | QMessageBox::No) != QMessageBox::Yes) return; |
533 | 533 | ||
534 | // create logger | 534 | // create logger |
535 | logger = new ProgressLoggerGui(this); | 535 | logger = new ProgressLoggerGui(this); |
536 | logger->show(); | 536 | logger->show(); |
537 | 537 | ||
538 | installBootloader(); | 538 | installBootloader(); |
539 | } | 539 | } |
540 | 540 | ||
541 | void RbUtilQt::installBootloader() | 541 | void RbUtilQt::installBootloader() |
542 | { | 542 | { |
543 | QString platform = userSettings->value("platform").toString(); | 543 | QString platform = userSettings->value("platform").toString(); |
544 | 544 | ||
545 | // create installer | 545 | // create installer |
546 | blinstaller = new BootloaderInstaller(this); | 546 | blinstaller = new BootloaderInstaller(this); |
547 | 547 | ||
548 | blinstaller->setMountPoint(userSettings->value("mountpoint").toString()); | 548 | blinstaller->setMountPoint(userSettings->value("mountpoint").toString()); |
549 | 549 | ||
550 | blinstaller->setProxy(proxy()); | 550 | blinstaller->setProxy(proxy()); |
551 | blinstaller->setDevice(platform); | 551 | blinstaller->setDevice(platform); |
552 | blinstaller->setBootloaderMethod(devices->value(platform + "/bootloadermethod").toString()); | 552 | blinstaller->setBootloaderMethod(devices->value(platform + "/bootloadermethod").toString()); |
@@ -560,7 +560,7 @@ void RbUtilQt::installBootloader() | |||
560 | m_error = true; | 560 | m_error = true; |
561 | return; | 561 | return; |
562 | } | 562 | } |
563 | 563 | ||
564 | if(blinstaller->uptodate()) | 564 | if(blinstaller->uptodate()) |
565 | { | 565 | { |
566 | int ret = QMessageBox::question(this, tr("Bootloader Installation"), | 566 | int ret = QMessageBox::question(this, tr("Bootloader Installation"), |
@@ -583,7 +583,7 @@ void RbUtilQt::installBootloader() | |||
583 | return; | 583 | return; |
584 | } | 584 | } |
585 | } | 585 | } |
586 | 586 | ||
587 | // if fwpatcher , ask for extra file | 587 | // if fwpatcher , ask for extra file |
588 | QString offirmware; | 588 | QString offirmware; |
589 | if(devices->value(platform + "/bootloadermethod").toString() == "fwpatcher") | 589 | if(devices->value(platform + "/bootloadermethod").toString() == "fwpatcher") |
@@ -616,7 +616,7 @@ void RbUtilQt::installBootloader() | |||
616 | } | 616 | } |
617 | } | 617 | } |
618 | blinstaller->setOrigFirmwarePath(offirmware); | 618 | blinstaller->setOrigFirmwarePath(offirmware); |
619 | 619 | ||
620 | blinstaller->install(logger); | 620 | blinstaller->install(logger); |
621 | } | 621 | } |
622 | 622 | ||
@@ -642,7 +642,7 @@ void RbUtilQt::installFonts() | |||
642 | { | 642 | { |
643 | // create zip installer | 643 | // create zip installer |
644 | installer = new ZipInstaller(this); | 644 | installer = new ZipInstaller(this); |
645 | 645 | ||
646 | installer->setUrl(devices->value("font_url").toString()); | 646 | installer->setUrl(devices->value("font_url").toString()); |
647 | installer->setProxy(proxy()); | 647 | installer->setProxy(proxy()); |
648 | installer->setLogSection("Fonts"); | 648 | installer->setLogSection("Fonts"); |
@@ -650,7 +650,7 @@ void RbUtilQt::installFonts() | |||
650 | installer->setMountPoint(userSettings->value("mountpoint").toString()); | 650 | installer->setMountPoint(userSettings->value("mountpoint").toString()); |
651 | if(!userSettings->value("cachedisable").toBool()) | 651 | if(!userSettings->value("cachedisable").toBool()) |
652 | installer->setCache(userSettings->value("cachepath", QDir::tempPath()).toString()); | 652 | installer->setCache(userSettings->value("cachepath", QDir::tempPath()).toString()); |
653 | installer->install(logger); | 653 | installer->install(logger); |
654 | } | 654 | } |
655 | 655 | ||
656 | 656 | ||
@@ -666,7 +666,7 @@ void RbUtilQt::installVoice() | |||
666 | // create zip installer | 666 | // create zip installer |
667 | installer = new ZipInstaller(this); | 667 | installer = new ZipInstaller(this); |
668 | installer->setUnzip(false); | 668 | installer->setUnzip(false); |
669 | 669 | ||
670 | QString voiceurl = devices->value("voice_url").toString() + "/" + | 670 | QString voiceurl = devices->value("voice_url").toString() + "/" + |
671 | userSettings->value("platform").toString() + "-" + | 671 | userSettings->value("platform").toString() + "-" + |
672 | versmap.value("arch_date") + "-english.voice"; | 672 | versmap.value("arch_date") + "-english.voice"; |
@@ -681,7 +681,7 @@ void RbUtilQt::installVoice() | |||
681 | if(!userSettings->value("cachedisable").toBool()) | 681 | if(!userSettings->value("cachedisable").toBool()) |
682 | installer->setCache(userSettings->value("cachepath", QDir::tempPath()).toString()); | 682 | installer->setCache(userSettings->value("cachepath", QDir::tempPath()).toString()); |
683 | installer->install(logger); | 683 | installer->install(logger); |
684 | 684 | ||
685 | //connect(installer, SIGNAL(done(bool)), this, SLOT(done(bool))); | 685 | //connect(installer, SIGNAL(done(bool)), this, SLOT(done(bool))); |
686 | } | 686 | } |
687 | 687 | ||
@@ -718,7 +718,7 @@ void RbUtilQt::installDoom() | |||
718 | { | 718 | { |
719 | // create zip installer | 719 | // create zip installer |
720 | installer = new ZipInstaller(this); | 720 | installer = new ZipInstaller(this); |
721 | 721 | ||
722 | installer->setUrl(devices->value("doom_url").toString()); | 722 | installer->setUrl(devices->value("doom_url").toString()); |
723 | installer->setProxy(proxy()); | 723 | installer->setProxy(proxy()); |
724 | installer->setLogSection("Game Addons"); | 724 | installer->setLogSection("Game Addons"); |
@@ -767,7 +767,7 @@ void RbUtilQt::uninstallBootloader(void) | |||
767 | // create logger | 767 | // create logger |
768 | ProgressLoggerGui* logger = new ProgressLoggerGui(this); | 768 | ProgressLoggerGui* logger = new ProgressLoggerGui(this); |
769 | logger->show(); | 769 | logger->show(); |
770 | 770 | ||
771 | QString plattform = userSettings->value("platform").toString(); | 771 | QString plattform = userSettings->value("platform").toString(); |
772 | BootloaderInstaller blinstaller(this); | 772 | BootloaderInstaller blinstaller(this); |
773 | blinstaller.setMountPoint(userSettings->value("mountpoint").toString()); | 773 | blinstaller.setMountPoint(userSettings->value("mountpoint").toString()); |
@@ -782,9 +782,9 @@ void RbUtilQt::uninstallBootloader(void) | |||
782 | logger->abort(); | 782 | logger->abort(); |
783 | return; | 783 | return; |
784 | } | 784 | } |
785 | 785 | ||
786 | blinstaller.uninstall(logger); | 786 | blinstaller.uninstall(logger); |
787 | 787 | ||
788 | } | 788 | } |
789 | 789 | ||
790 | 790 | ||
@@ -795,18 +795,18 @@ void RbUtilQt::downloadManual(void) | |||
795 | "to the root folder of your player."), | 795 | "to the root folder of your player."), |
796 | QMessageBox::Yes | QMessageBox::No) != QMessageBox::Yes) | 796 | QMessageBox::Yes | QMessageBox::No) != QMessageBox::Yes) |
797 | return; | 797 | return; |
798 | 798 | ||
799 | buildInfo.open(); | 799 | buildInfo.open(); |
800 | QSettings info(buildInfo.fileName(), QSettings::IniFormat, this); | 800 | QSettings info(buildInfo.fileName(), QSettings::IniFormat, this); |
801 | buildInfo.close(); | 801 | buildInfo.close(); |
802 | 802 | ||
803 | devices->beginGroup(userSettings->value("platform").toString()); | 803 | devices->beginGroup(userSettings->value("platform").toString()); |
804 | QString manual; | 804 | QString manual; |
805 | manual = devices->value("manualname", "rockbox-" + devices->value("platform").toString()).toString(); | 805 | manual = devices->value("manualname", "rockbox-" + devices->value("platform").toString()).toString(); |
806 | devices->endGroup(); | 806 | devices->endGroup(); |
807 | 807 | ||
808 | QString date = (info.value("dailies/date").toString()); | 808 | QString date = (info.value("dailies/date").toString()); |
809 | 809 | ||
810 | QString manualurl; | 810 | QString manualurl; |
811 | QString target; | 811 | QString target; |
812 | QString section; | 812 | QString section; |
@@ -872,7 +872,7 @@ void RbUtilQt::installPortable(void) | |||
872 | } | 872 | } |
873 | logger->addItem(tr("Successfully installed Rockbox Utility."), LOGOK); | 873 | logger->addItem(tr("Successfully installed Rockbox Utility."), LOGOK); |
874 | logger->abort(); | 874 | logger->abort(); |
875 | 875 | ||
876 | } | 876 | } |
877 | 877 | ||
878 | 878 | ||
@@ -913,7 +913,7 @@ void RbUtilQt::updateInfo() | |||
913 | if(log.value(keys.at(b)).toString() < min) | 913 | if(log.value(keys.at(b)).toString() < min) |
914 | min = log.value(keys.at(b)).toString(); | 914 | min = log.value(keys.at(b)).toString(); |
915 | } | 915 | } |
916 | 916 | ||
917 | for(int b = 0; b < keys.size(); b++) { | 917 | for(int b = 0; b < keys.size(); b++) { |
918 | QString file; | 918 | QString file; |
919 | file = userSettings->value("mountpoint").toString() + "/" + keys.at(b); | 919 | file = userSettings->value("mountpoint").toString() + "/" + keys.at(b); |
diff --git a/rbutil/rbutilqt/rbutilqt.h b/rbutil/rbutilqt/rbutilqt.h index d30732bb99..087152db3c 100644 --- a/rbutil/rbutilqt/rbutilqt.h +++ b/rbutil/rbutilqt/rbutilqt.h | |||
@@ -56,7 +56,7 @@ class RbUtilQt : public QMainWindow | |||
56 | BootloaderInstaller* blinstaller; | 56 | BootloaderInstaller* blinstaller; |
57 | QUrl proxy(void); | 57 | QUrl proxy(void); |
58 | QMap<QString, QString> versmap; | 58 | QMap<QString, QString> versmap; |
59 | 59 | ||
60 | volatile bool m_installed; | 60 | volatile bool m_installed; |
61 | volatile bool m_error; | 61 | volatile bool m_error; |
62 | 62 | ||
@@ -66,28 +66,28 @@ class RbUtilQt : public QMainWindow | |||
66 | void configDialog(void); | 66 | void configDialog(void); |
67 | void updateDevice(void); | 67 | void updateDevice(void); |
68 | void updateSettings(void); | 68 | void updateSettings(void); |
69 | 69 | ||
70 | void completeInstall(void); | 70 | void completeInstall(void); |
71 | void smallInstall(void); | 71 | void smallInstall(void); |
72 | void installdone(bool error); | 72 | void installdone(bool error); |
73 | 73 | ||
74 | void installBtn(void); | 74 | void installBtn(void); |
75 | bool installAuto(void); | 75 | bool installAuto(void); |
76 | void install(void); | 76 | void install(void); |
77 | 77 | ||
78 | void installBootloaderBtn(void); | 78 | void installBootloaderBtn(void); |
79 | bool installBootloaderAuto(void); | 79 | bool installBootloaderAuto(void); |
80 | void installBootloader(void); | 80 | void installBootloader(void); |
81 | 81 | ||
82 | void installFontsBtn(void); | 82 | void installFontsBtn(void); |
83 | bool installFontsAuto(void); | 83 | bool installFontsAuto(void); |
84 | void installFonts(void); | 84 | void installFonts(void); |
85 | 85 | ||
86 | bool hasDoom(void); | 86 | bool hasDoom(void); |
87 | void installDoomBtn(void); | 87 | void installDoomBtn(void); |
88 | bool installDoomAuto(void); | 88 | bool installDoomAuto(void); |
89 | void installDoom(void); | 89 | void installDoom(void); |
90 | 90 | ||
91 | void createTalkFiles(void); | 91 | void createTalkFiles(void); |
92 | void downloadDone(bool); | 92 | void downloadDone(bool); |
93 | void downloadDone(int, bool); | 93 | void downloadDone(int, bool); |
diff --git a/rbutil/rbutilqt/talkfile.cpp b/rbutil/rbutilqt/talkfile.cpp index 5b8bb3f175..2096c8150b 100644 --- a/rbutil/rbutilqt/talkfile.cpp +++ b/rbutil/rbutilqt/talkfile.cpp | |||
@@ -41,7 +41,7 @@ bool TalkFileCreator::initEncoder() | |||
41 | bool TalkFileCreator::initTTS() | 41 | bool TalkFileCreator::initTTS() |
42 | { | 42 | { |
43 | QFileInfo tts(m_TTSexec); | 43 | QFileInfo tts(m_TTSexec); |
44 | 44 | ||
45 | if(tts.exists()) | 45 | if(tts.exists()) |
46 | { | 46 | { |
47 | return true; | 47 | return true; |
@@ -68,14 +68,14 @@ bool TalkFileCreator::createTalkFiles(ProgressloggerInterface* logger) | |||
68 | return false; | 68 | return false; |
69 | } | 69 | } |
70 | QApplication::processEvents(); | 70 | QApplication::processEvents(); |
71 | 71 | ||
72 | connect(logger,SIGNAL(aborted()),this,SLOT(abort())); | 72 | connect(logger,SIGNAL(aborted()),this,SLOT(abort())); |
73 | m_logger->setProgressMax(0); | 73 | m_logger->setProgressMax(0); |
74 | QDirIterator it(m_dir,QDirIterator::Subdirectories); | 74 | QDirIterator it(m_dir,QDirIterator::Subdirectories); |
75 | QSettings installlog(m_mountpoint + "/.rockbox/rbutil.log", QSettings::IniFormat, 0); | 75 | QSettings installlog(m_mountpoint + "/.rockbox/rbutil.log", QSettings::IniFormat, 0); |
76 | installlog.beginGroup("talkfiles"); | 76 | installlog.beginGroup("talkfiles"); |
77 | // iterate over all entrys | 77 | // iterate over all entrys |
78 | while (it.hasNext()) | 78 | while (it.hasNext()) |
79 | { | 79 | { |
80 | if(m_abort) | 80 | if(m_abort) |
81 | { | 81 | { |
@@ -88,7 +88,7 @@ bool TalkFileCreator::createTalkFiles(ProgressloggerInterface* logger) | |||
88 | QString toSpeak; | 88 | QString toSpeak; |
89 | QString filename; | 89 | QString filename; |
90 | QString wavfilename; | 90 | QString wavfilename; |
91 | 91 | ||
92 | if(fileInf.fileName() == "." || fileInf.fileName() == ".." || fileInf.suffix() == "talk") | 92 | if(fileInf.fileName() == "." || fileInf.fileName() == ".." || fileInf.suffix() == "talk") |
93 | { | 93 | { |
94 | it.next(); | 94 | it.next(); |
@@ -108,10 +108,10 @@ bool TalkFileCreator::createTalkFiles(ProgressloggerInterface* logger) | |||
108 | filename = fileInf.absoluteFilePath() + ".talk"; | 108 | filename = fileInf.absoluteFilePath() + ".talk"; |
109 | } | 109 | } |
110 | wavfilename = filename + ".wav"; | 110 | wavfilename = filename + ".wav"; |
111 | 111 | ||
112 | QFileInfo filenameInf(filename); | 112 | QFileInfo filenameInf(filename); |
113 | QFileInfo wavfilenameInf(wavfilename); | 113 | QFileInfo wavfilenameInf(wavfilename); |
114 | 114 | ||
115 | if(!filenameInf.exists() || m_overwriteTalk) | 115 | if(!filenameInf.exists() || m_overwriteTalk) |
116 | { | 116 | { |
117 | if(!wavfilenameInf.exists() || m_overwriteWav) | 117 | if(!wavfilenameInf.exists() || m_overwriteWav) |
@@ -132,7 +132,7 @@ bool TalkFileCreator::createTalkFiles(ProgressloggerInterface* logger) | |||
132 | return false; | 132 | return false; |
133 | } | 133 | } |
134 | } | 134 | } |
135 | 135 | ||
136 | QString now = QDate::currentDate().toString("yyyyMMdd"); | 136 | QString now = QDate::currentDate().toString("yyyyMMdd"); |
137 | if(m_removeWav) | 137 | if(m_removeWav) |
138 | { | 138 | { |
@@ -142,18 +142,18 @@ bool TalkFileCreator::createTalkFiles(ProgressloggerInterface* logger) | |||
142 | } | 142 | } |
143 | else | 143 | else |
144 | installlog.setValue(wavfilename.remove(m_mountpoint),now); | 144 | installlog.setValue(wavfilename.remove(m_mountpoint),now); |
145 | 145 | ||
146 | installlog.setValue(filename.remove(m_mountpoint),now); | 146 | installlog.setValue(filename.remove(m_mountpoint),now); |
147 | it.next(); | 147 | it.next(); |
148 | } | 148 | } |
149 | 149 | ||
150 | installlog.endGroup(); | 150 | installlog.endGroup(); |
151 | m_logger->addItem("Finished creating Talkfiles",LOGOK); | 151 | m_logger->addItem("Finished creating Talkfiles",LOGOK); |
152 | m_logger->setProgressMax(1); | 152 | m_logger->setProgressMax(1); |
153 | m_logger->setProgressValue(1); | 153 | m_logger->setProgressValue(1); |
154 | m_logger->abort(); | 154 | m_logger->abort(); |
155 | 155 | ||
156 | return true; | 156 | return true; |
157 | 157 | ||
158 | } | 158 | } |
159 | 159 | ||
diff --git a/rbutil/rbutilqt/talkfile.h b/rbutil/rbutilqt/talkfile.h index dfdf8ae033..f2119bc447 100644 --- a/rbutil/rbutilqt/talkfile.h +++ b/rbutil/rbutilqt/talkfile.h | |||
@@ -38,7 +38,7 @@ public: | |||
38 | void setTTsType(QString tts) { m_curTTS = tts; } | 38 | void setTTsType(QString tts) { m_curTTS = tts; } |
39 | void setTTsOpts(QString opts) {m_TTSOpts=opts;} | 39 | void setTTsOpts(QString opts) {m_TTSOpts=opts;} |
40 | void setTTsTemplate(QString t) { m_curTTSTemplate = t; } | 40 | void setTTsTemplate(QString t) { m_curTTSTemplate = t; } |
41 | 41 | ||
42 | void setEncType(QString enc) { m_curEnc = enc; } | 42 | void setEncType(QString enc) { m_curEnc = enc; } |
43 | void setEncOpts(QString opts) {m_EncOpts=opts;} | 43 | void setEncOpts(QString opts) {m_EncOpts=opts;} |
44 | void setEncTemplate(QString t) { m_curEncTemplate = t; } | 44 | void setEncTemplate(QString t) { m_curEncTemplate = t; } |
@@ -75,15 +75,15 @@ private: | |||
75 | QString m_EncExec; | 75 | QString m_EncExec; |
76 | QString m_EncOpts; | 76 | QString m_EncOpts; |
77 | QString m_curEncTemplate; | 77 | QString m_curEncTemplate; |
78 | 78 | ||
79 | bool m_overwriteTalk; | 79 | bool m_overwriteTalk; |
80 | bool m_overwriteWav; | 80 | bool m_overwriteWav; |
81 | bool m_removeWav; | 81 | bool m_removeWav; |
82 | bool m_recursive; | 82 | bool m_recursive; |
83 | bool m_stripExtensions; | 83 | bool m_stripExtensions; |
84 | 84 | ||
85 | ProgressloggerInterface* m_logger; | 85 | ProgressloggerInterface* m_logger; |
86 | 86 | ||
87 | bool m_abort; | 87 | bool m_abort; |
88 | }; | 88 | }; |
89 | 89 | ||
diff --git a/rbutil/rbutilqt/uninstall.h b/rbutil/rbutilqt/uninstall.h index 4c774876e3..b4aa49a77b 100644 --- a/rbutil/rbutilqt/uninstall.h +++ b/rbutil/rbutilqt/uninstall.h | |||
@@ -16,11 +16,11 @@ | |||
16 | * KIND, either express or implied. | 16 | * KIND, either express or implied. |
17 | * | 17 | * |
18 | ****************************************************************************/ | 18 | ****************************************************************************/ |
19 | 19 | ||
20 | 20 | ||
21 | #ifndef UNINSTALL_H | 21 | #ifndef UNINSTALL_H |
22 | #define UNINSTALL_H | 22 | #define UNINSTALL_H |
23 | 23 | ||
24 | 24 | ||
25 | 25 | ||
26 | #include <QtGui> | 26 | #include <QtGui> |
@@ -28,36 +28,36 @@ | |||
28 | 28 | ||
29 | #include "progressloggerinterface.h" | 29 | #include "progressloggerinterface.h" |
30 | 30 | ||
31 | 31 | ||
32 | class Uninstaller : public QObject | 32 | class Uninstaller : public QObject |
33 | { | 33 | { |
34 | Q_OBJECT | 34 | Q_OBJECT |
35 | public: | 35 | public: |
36 | Uninstaller(QObject* parent,QString mountpoint) ; | 36 | Uninstaller(QObject* parent,QString mountpoint) ; |
37 | ~Uninstaller(){} | 37 | ~Uninstaller(){} |
38 | 38 | ||
39 | void deleteAll(ProgressloggerInterface* dp); | 39 | void deleteAll(ProgressloggerInterface* dp); |
40 | void uninstall(ProgressloggerInterface* dp); | 40 | void uninstall(ProgressloggerInterface* dp); |
41 | 41 | ||
42 | bool uninstallPossible(); | 42 | bool uninstallPossible(); |
43 | 43 | ||
44 | QStringList getAllSections(); | 44 | QStringList getAllSections(); |
45 | 45 | ||
46 | void setSections(QStringList sections) {uninstallSections = sections;} | 46 | void setSections(QStringList sections) {uninstallSections = sections;} |
47 | 47 | ||
48 | 48 | ||
49 | private slots: | 49 | private slots: |
50 | 50 | ||
51 | 51 | ||
52 | private: | 52 | private: |
53 | QString m_mountpoint; | 53 | QString m_mountpoint; |
54 | 54 | ||
55 | QStringList uninstallSections; | 55 | QStringList uninstallSections; |
56 | 56 | ||
57 | ProgressloggerInterface* m_dp; | 57 | ProgressloggerInterface* m_dp; |
58 | }; | 58 | }; |
59 | 59 | ||
60 | 60 | ||
61 | 61 | ||
62 | #endif | 62 | #endif |
63 | 63 | ||
diff --git a/rbutil/rbutilqt/uninstallwindow.cpp b/rbutil/rbutilqt/uninstallwindow.cpp index 5dcfbb894b..61ca8410be 100644 --- a/rbutil/rbutilqt/uninstallwindow.cpp +++ b/rbutil/rbutilqt/uninstallwindow.cpp | |||
@@ -24,7 +24,7 @@ | |||
24 | UninstallWindow::UninstallWindow(QWidget *parent) : QDialog(parent) | 24 | UninstallWindow::UninstallWindow(QWidget *parent) : QDialog(parent) |
25 | { | 25 | { |
26 | ui.setupUi(this); | 26 | ui.setupUi(this); |
27 | ui.UninstalllistWidget->setAlternatingRowColors(true); | 27 | ui.UninstalllistWidget->setAlternatingRowColors(true); |
28 | connect(ui.UninstalllistWidget,SIGNAL(itemSelectionChanged()),this,SLOT(selectionChanged())); | 28 | connect(ui.UninstalllistWidget,SIGNAL(itemSelectionChanged()),this,SLOT(selectionChanged())); |
29 | connect(ui.CompleteRadioBtn,SIGNAL(toggled(bool)),this,SLOT(UninstallMethodChanged(bool))); | 29 | connect(ui.CompleteRadioBtn,SIGNAL(toggled(bool)),this,SLOT(UninstallMethodChanged(bool))); |
30 | } | 30 | } |
@@ -43,7 +43,7 @@ void UninstallWindow::accept() | |||
43 | { | 43 | { |
44 | uninstaller->uninstall(logger); | 44 | uninstaller->uninstall(logger); |
45 | } | 45 | } |
46 | connect(logger,SIGNAL(closed()),this,SLOT(close())); | 46 | connect(logger,SIGNAL(closed()),this,SLOT(close())); |
47 | } | 47 | } |
48 | 48 | ||
49 | 49 | ||
@@ -55,7 +55,7 @@ void UninstallWindow::selectionChanged() | |||
55 | { | 55 | { |
56 | seletedStrings << itemlist.at(i)->text(); | 56 | seletedStrings << itemlist.at(i)->text(); |
57 | } | 57 | } |
58 | 58 | ||
59 | uninstaller->setSections(seletedStrings); | 59 | uninstaller->setSections(seletedStrings); |
60 | } | 60 | } |
61 | 61 | ||
@@ -64,7 +64,7 @@ void UninstallWindow::UninstallMethodChanged(bool complete) | |||
64 | if(complete) | 64 | if(complete) |
65 | ui.smartGroupBox->setEnabled(false); | 65 | ui.smartGroupBox->setEnabled(false); |
66 | else | 66 | else |
67 | ui.smartGroupBox->setEnabled(true); | 67 | ui.smartGroupBox->setEnabled(true); |
68 | } | 68 | } |
69 | 69 | ||
70 | void UninstallWindow::setDeviceSettings(QSettings *dev) | 70 | void UninstallWindow::setDeviceSettings(QSettings *dev) |
@@ -77,12 +77,12 @@ void UninstallWindow::setDeviceSettings(QSettings *dev) | |||
77 | void UninstallWindow::setUserSettings(QSettings *user) | 77 | void UninstallWindow::setUserSettings(QSettings *user) |
78 | { | 78 | { |
79 | userSettings = user; | 79 | userSettings = user; |
80 | 80 | ||
81 | QString mountpoint =userSettings->value("mountpoint").toString(); | 81 | QString mountpoint =userSettings->value("mountpoint").toString(); |
82 | uninstaller = new Uninstaller(this,mountpoint); | 82 | uninstaller = new Uninstaller(this,mountpoint); |
83 | 83 | ||
84 | // disable smart uninstall, if not possible | 84 | // disable smart uninstall, if not possible |
85 | if(!uninstaller->uninstallPossible()) | 85 | if(!uninstaller->uninstallPossible()) |
86 | { | 86 | { |
87 | ui.smartRadioButton->setEnabled(false); | 87 | ui.smartRadioButton->setEnabled(false); |
88 | ui.smartGroupBox->setEnabled(false); | 88 | ui.smartGroupBox->setEnabled(false); |
@@ -90,7 +90,7 @@ void UninstallWindow::setUserSettings(QSettings *user) | |||
90 | } | 90 | } |
91 | else // fill in installed parts | 91 | else // fill in installed parts |
92 | { | 92 | { |
93 | ui.smartRadioButton->setChecked(true); | 93 | ui.smartRadioButton->setChecked(true); |
94 | ui.UninstalllistWidget->addItems(uninstaller->getAllSections()); | 94 | ui.UninstalllistWidget->addItems(uninstaller->getAllSections()); |
95 | } | 95 | } |
96 | } | 96 | } |