summaryrefslogtreecommitdiff
path: root/rbutil/rbutilqt
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2012-07-01 14:58:39 +0200
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2012-07-01 14:58:39 +0200
commitb7931594f9b9a55ba58b4087ab08a4e820e66e7b (patch)
treee2c08838c51f82d12cb76c605b5f3cf72a92ded9 /rbutil/rbutilqt
parentd0f7a8181bb761ce627b10b002c5906129664804 (diff)
downloadrockbox-b7931594f9b9a55ba58b4087ab08a4e820e66e7b.tar.gz
rockbox-b7931594f9b9a55ba58b4087ab08a4e820e66e7b.zip
Handle no selected themes properly.
When installing themes without any themes selected show a notice in the log and continue instead of stopping. Change-Id: Ieeb03e4656b041ce1dda25b2c44b6b6f0aa0ca80
Diffstat (limited to 'rbutil/rbutilqt')
-rw-r--r--rbutil/rbutilqt/gui/selectiveinstallwidget.cpp2
-rw-r--r--rbutil/rbutilqt/themesinstallwindow.cpp3
2 files changed, 3 insertions, 2 deletions
diff --git a/rbutil/rbutilqt/gui/selectiveinstallwidget.cpp b/rbutil/rbutilqt/gui/selectiveinstallwidget.cpp
index 555c99c546..dbbe4afb4d 100644
--- a/rbutil/rbutilqt/gui/selectiveinstallwidget.cpp
+++ b/rbutil/rbutilqt/gui/selectiveinstallwidget.cpp
@@ -465,10 +465,10 @@ void SelectiveInstallWidget::installThemes(void)
465 if(m_themesinstaller == NULL) 465 if(m_themesinstaller == NULL)
466 m_themesinstaller = new ThemesInstallWindow(this); 466 m_themesinstaller = new ThemesInstallWindow(this);
467 467
468 connect(m_themesinstaller, SIGNAL(done(bool)), this, SLOT(continueInstall(bool)));
468 m_themesinstaller->setLogger(m_logger); 469 m_themesinstaller->setLogger(m_logger);
469 m_themesinstaller->setModal(true); 470 m_themesinstaller->setModal(true);
470 m_themesinstaller->install(); 471 m_themesinstaller->install();
471 connect(m_themesinstaller, SIGNAL(done(bool)), this, SLOT(continueInstall(bool)));
472 } 472 }
473 else { 473 else {
474 qDebug() << "[SelectiveInstallWidget] Themes install disabled."; 474 qDebug() << "[SelectiveInstallWidget] Themes install disabled.";
diff --git a/rbutil/rbutilqt/themesinstallwindow.cpp b/rbutil/rbutilqt/themesinstallwindow.cpp
index 9218a085d0..1b10ce9e6c 100644
--- a/rbutil/rbutilqt/themesinstallwindow.cpp
+++ b/rbutil/rbutilqt/themesinstallwindow.cpp
@@ -321,7 +321,8 @@ void ThemesInstallWindow::accept(void)
321void ThemesInstallWindow::install() 321void ThemesInstallWindow::install()
322{ 322{
323 if(ui.listThemes->selectedItems().size() == 0) { 323 if(ui.listThemes->selectedItems().size() == 0) {
324 this->close(); 324 logger->addItem(tr("No themes selected, skipping"), LOGINFO);
325 emit done(false);
325 return; 326 return;
326 } 327 }
327 QStringList themes; 328 QStringList themes;