From 7cfdd4758767e6c5a6fceb0cb5d12ef3b1c99b5d Mon Sep 17 00:00:00 2001 From: Dominik Riebeling Date: Sat, 2 May 2009 18:40:04 +0000 Subject: 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 --- rbutil/rbutilqt/themesinstallwindow.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'rbutil/rbutilqt/themesinstallwindow.cpp') 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) "Please check your network and proxy settings.") .arg(getter->errorString()), LOGERROR); getter->abort(); - logger->abort(); + logger->setFinished(); disconnect(getter, SIGNAL(done(bool)), this, SLOT(downloadDone(bool))); connect(logger, SIGNAL(closed()), this, SLOT(close())); return; @@ -111,12 +111,12 @@ void ThemesInstallWindow::downloadDone(bool error) qDebug() << "error!"; logger->addItem(tr("the following error occured:\n%1") .arg(iniDetails.value("error/description", "unknown error").toString()), LOGERROR); - logger->abort(); + logger->setFinished(); connect(logger, SIGNAL(closed()), this, SLOT(close())); return; } logger->addItem(tr("done."), LOGOK); - logger->abort(); + logger->setFinished(); logger->close(); // setup list @@ -289,7 +289,7 @@ void ThemesInstallWindow::show() void ThemesInstallWindow::abort() { igetter.abort(); - logger->abort(); + logger->setFinished(); this->close(); } @@ -326,7 +326,7 @@ void ThemesInstallWindow::accept() // show dialog with error if mount point is wrong if(!QFileInfo(mountPoint).isDir()) { logger->addItem(tr("Mount point is wrong!"),LOGERROR); - logger->abort(); + logger->setFinished(); return; } -- cgit v1.2.3