summaryrefslogtreecommitdiff
path: root/rbutil/rbutilqt/themesinstallwindow.cpp
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2009-05-02 18:40:04 +0000
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2009-05-02 18:40:04 +0000
commit7cfdd4758767e6c5a6fceb0cb5d12ef3b1c99b5d (patch)
tree9814a23e24cd9be26f0009835a463b5a9c097f7f /rbutil/rbutilqt/themesinstallwindow.cpp
parentb10ba5e8b34eaac0c4b72bcf3be3db180c43126a (diff)
downloadrockbox-7cfdd4758767e6c5a6fceb0cb5d12ef3b1c99b5d.tar.gz
rockbox-7cfdd4758767e6c5a6fceb0cb5d12ef3b1c99b5d.zip
Clean up ProgressLogger state handling:
- use better names for member functions - don't emit aborted() when exiting a successful log git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20844 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'rbutil/rbutilqt/themesinstallwindow.cpp')
-rw-r--r--rbutil/rbutilqt/themesinstallwindow.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/rbutil/rbutilqt/themesinstallwindow.cpp b/rbutil/rbutilqt/themesinstallwindow.cpp
index 75d3eeb698..56a917cfc6 100644
--- a/rbutil/rbutilqt/themesinstallwindow.cpp
+++ b/rbutil/rbutilqt/themesinstallwindow.cpp
@@ -101,7 +101,7 @@ void ThemesInstallWindow::downloadDone(bool error)
101 "Please check your network and proxy settings.") 101 "Please check your network and proxy settings.")
102 .arg(getter->errorString()), LOGERROR); 102 .arg(getter->errorString()), LOGERROR);
103 getter->abort(); 103 getter->abort();
104 logger->abort(); 104 logger->setFinished();
105 disconnect(getter, SIGNAL(done(bool)), this, SLOT(downloadDone(bool))); 105 disconnect(getter, SIGNAL(done(bool)), this, SLOT(downloadDone(bool)));
106 connect(logger, SIGNAL(closed()), this, SLOT(close())); 106 connect(logger, SIGNAL(closed()), this, SLOT(close()));
107 return; 107 return;
@@ -111,12 +111,12 @@ void ThemesInstallWindow::downloadDone(bool error)
111 qDebug() << "error!"; 111 qDebug() << "error!";
112 logger->addItem(tr("the following error occured:\n%1") 112 logger->addItem(tr("the following error occured:\n%1")
113 .arg(iniDetails.value("error/description", "unknown error").toString()), LOGERROR); 113 .arg(iniDetails.value("error/description", "unknown error").toString()), LOGERROR);
114 logger->abort(); 114 logger->setFinished();
115 connect(logger, SIGNAL(closed()), this, SLOT(close())); 115 connect(logger, SIGNAL(closed()), this, SLOT(close()));
116 return; 116 return;
117 } 117 }
118 logger->addItem(tr("done."), LOGOK); 118 logger->addItem(tr("done."), LOGOK);
119 logger->abort(); 119 logger->setFinished();
120 logger->close(); 120 logger->close();
121 121
122 // setup list 122 // setup list
@@ -289,7 +289,7 @@ void ThemesInstallWindow::show()
289void ThemesInstallWindow::abort() 289void ThemesInstallWindow::abort()
290{ 290{
291 igetter.abort(); 291 igetter.abort();
292 logger->abort(); 292 logger->setFinished();
293 this->close(); 293 this->close();
294} 294}
295 295
@@ -326,7 +326,7 @@ void ThemesInstallWindow::accept()
326 // show dialog with error if mount point is wrong 326 // show dialog with error if mount point is wrong
327 if(!QFileInfo(mountPoint).isDir()) { 327 if(!QFileInfo(mountPoint).isDir()) {
328 logger->addItem(tr("Mount point is wrong!"),LOGERROR); 328 logger->addItem(tr("Mount point is wrong!"),LOGERROR);
329 logger->abort(); 329 logger->setFinished();
330 return; 330 return;
331 } 331 }
332 332