summaryrefslogtreecommitdiff
path: root/rbutil
diff options
context:
space:
mode:
Diffstat (limited to 'rbutil')
-rw-r--r--rbutil/rbutilqt/rbutilqt.cpp11
-rw-r--r--rbutil/rbutilqt/rbutilqt.h3
2 files changed, 3 insertions, 11 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
544void RbUtilQt::updateDataReadProgress(int read, int total)
545{
546 logger->setProgressMax(total);
547 logger->setProgressValue(read);
548 //qDebug() << "progress:" << read << "/" << total;
549
550}
551 544
552void RbUtilQt::install() 545void RbUtilQt::install()
553{ 546{
diff --git a/rbutil/rbutilqt/rbutilqt.h b/rbutil/rbutilqt/rbutilqt.h
index 3c6cbd0784..bb882e9ec0 100644
--- a/rbutil/rbutilqt/rbutilqt.h
+++ b/rbutil/rbutilqt/rbutilqt.h
@@ -107,8 +107,7 @@ class RbUtilQt : public QMainWindow
107 void installPortable(void); 107 void installPortable(void);
108 void updateInfo(void); 108 void updateInfo(void);
109 void updateTabs(int); 109 void updateTabs(int);
110
111 void updateDataReadProgress(int read, int total);
112}; 110};
113 111
114#endif 112#endif
113