diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2008-06-27 20:36:41 +0000 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2008-06-27 20:36:41 +0000 |
commit | 9f0ea77d22c3a43905cc3c3da41f972e9c1c8b75 (patch) | |
tree | 96ad7ad92af80d08159c06df9da489e35f077129 /rbutil/rbutilqt/rbutilqt.cpp | |
parent | 7135f2d9f45835a304701eb8d09255e9171651b2 (diff) | |
download | rockbox-9f0ea77d22c3a43905cc3c3da41f972e9c1c8b75.tar.gz rockbox-9f0ea77d22c3a43905cc3c3da41f972e9c1c8b75.zip |
connect progress signal directly to the logger.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17811 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'rbutil/rbutilqt/rbutilqt.cpp')
-rw-r--r-- | rbutil/rbutilqt/rbutilqt.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp index b7231977b2..461d45f076 100644 --- a/rbutil/rbutilqt/rbutilqt.cpp +++ b/rbutil/rbutilqt/rbutilqt.cpp | |||
@@ -499,7 +499,7 @@ bool RbUtilQt::installAuto() | |||
499 | tr("Rockbox installation detected. Do you want to backup first?"), | 499 | tr("Rockbox installation detected. Do you want to backup first?"), |
500 | QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) | 500 | QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) |
501 | { | 501 | { |
502 | logger->addItem(tr("Beginning Backup..."),LOGINFO); | 502 | logger->addItem(tr("Starting backup..."),LOGINFO); |
503 | QString backupName = settings->mountpoint() + "/.backup/rockbox-backup-"+rbVersion+".zip"; | 503 | QString backupName = settings->mountpoint() + "/.backup/rockbox-backup-"+rbVersion+".zip"; |
504 | 504 | ||
505 | //! create dir, if it doesnt exist | 505 | //! create dir, if it doesnt exist |
@@ -512,7 +512,7 @@ bool RbUtilQt::installAuto() | |||
512 | 512 | ||
513 | //! create backup | 513 | //! create backup |
514 | RbZip backup; | 514 | RbZip backup; |
515 | connect(&backup,SIGNAL(zipProgress(int,int)),this,SLOT(updateDataReadProgress(int,int))); | 515 | connect(&backup,SIGNAL(zipProgress(int,int)),logger, SLOT(setProgress(int,int))); |
516 | if(backup.createZip(backupName,settings->mountpoint() + "/.rockbox") == Zip::Ok) | 516 | if(backup.createZip(backupName,settings->mountpoint() + "/.rockbox") == Zip::Ok) |
517 | { | 517 | { |
518 | logger->addItem(tr("Backup successfull"),LOGOK); | 518 | logger->addItem(tr("Backup successfull"),LOGOK); |
@@ -541,13 +541,6 @@ bool RbUtilQt::installAuto() | |||
541 | return true; | 541 | return true; |
542 | } | 542 | } |
543 | 543 | ||
544 | void RbUtilQt::updateDataReadProgress(int read, int total) | ||
545 | { | ||
546 | logger->setProgressMax(total); | ||
547 | logger->setProgressValue(read); | ||
548 | //qDebug() << "progress:" << read << "/" << total; | ||
549 | |||
550 | } | ||
551 | 544 | ||
552 | void RbUtilQt::install() | 545 | void RbUtilQt::install() |
553 | { | 546 | { |