From 9f0ea77d22c3a43905cc3c3da41f972e9c1c8b75 Mon Sep 17 00:00:00 2001
From: Dominik Riebeling <Dominik.Riebeling@gmail.com>
Date: Fri, 27 Jun 2008 20:36:41 +0000
Subject: connect progress signal directly to the logger.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17811 a1c6a512-1295-4272-9138-f99709370657
---
 rbutil/rbutilqt/rbutilqt.cpp | 11 ++---------
 rbutil/rbutilqt/rbutilqt.h   |  3 +--
 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()
            tr("Rockbox installation detected. Do you want to backup first?"),
            QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes)
         {
-            logger->addItem(tr("Beginning Backup..."),LOGINFO);
+            logger->addItem(tr("Starting backup..."),LOGINFO);
             QString backupName = settings->mountpoint() + "/.backup/rockbox-backup-"+rbVersion+".zip";
             
             //! create dir, if it doesnt exist
@@ -512,7 +512,7 @@ bool RbUtilQt::installAuto()
         
             //! create backup
             RbZip backup;
-            connect(&backup,SIGNAL(zipProgress(int,int)),this,SLOT(updateDataReadProgress(int,int)));
+            connect(&backup,SIGNAL(zipProgress(int,int)),logger, SLOT(setProgress(int,int)));
             if(backup.createZip(backupName,settings->mountpoint() + "/.rockbox") == Zip::Ok)
             {
                 logger->addItem(tr("Backup successfull"),LOGOK);
@@ -541,13 +541,6 @@ bool RbUtilQt::installAuto()
     return true;
 }
 
-void RbUtilQt::updateDataReadProgress(int read, int total)
-{
-    logger->setProgressMax(total);
-    logger->setProgressValue(read);
-    //qDebug() << "progress:" << read << "/" << total;
-
-}
 
 void RbUtilQt::install()
 {
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
         void installPortable(void);
         void updateInfo(void);
         void updateTabs(int);
-
-        void updateDataReadProgress(int read, int total);
 };
 
 #endif
+
-- 
cgit