diff options
| author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2012-07-01 14:58:39 +0200 |
|---|---|---|
| committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2012-07-01 14:58:39 +0200 |
| commit | b7931594f9b9a55ba58b4087ab08a4e820e66e7b (patch) | |
| tree | e2c08838c51f82d12cb76c605b5f3cf72a92ded9 | |
| parent | d0f7a8181bb761ce627b10b002c5906129664804 (diff) | |
| download | rockbox-b7931594f9b9a55ba58b4087ab08a4e820e66e7b.zip rockbox-b7931594f9b9a55ba58b4087ab08a4e820e66e7b.tar.gz rockbox-b7931594f9b9a55ba58b4087ab08a4e820e66e7b.tar.bz2 rockbox-b7931594f9b9a55ba58b4087ab08a4e820e66e7b.tar.xz | |
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
| -rw-r--r-- | rbutil/rbutilqt/gui/selectiveinstallwidget.cpp | 2 | ||||
| -rw-r--r-- | rbutil/rbutilqt/themesinstallwindow.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/rbutil/rbutilqt/gui/selectiveinstallwidget.cpp b/rbutil/rbutilqt/gui/selectiveinstallwidget.cpp index 555c99c..dbbe4af 100644 --- a/rbutil/rbutilqt/gui/selectiveinstallwidget.cpp +++ b/rbutil/rbutilqt/gui/selectiveinstallwidget.cpp @@ -465,10 +465,10 @@ void SelectiveInstallWidget::installThemes(void) if(m_themesinstaller == NULL) m_themesinstaller = new ThemesInstallWindow(this); + connect(m_themesinstaller, SIGNAL(done(bool)), this, SLOT(continueInstall(bool))); m_themesinstaller->setLogger(m_logger); m_themesinstaller->setModal(true); m_themesinstaller->install(); - connect(m_themesinstaller, SIGNAL(done(bool)), this, SLOT(continueInstall(bool))); } else { qDebug() << "[SelectiveInstallWidget] Themes install disabled."; diff --git a/rbutil/rbutilqt/themesinstallwindow.cpp b/rbutil/rbutilqt/themesinstallwindow.cpp index 9218a08..1b10ce9 100644 --- a/rbutil/rbutilqt/themesinstallwindow.cpp +++ b/rbutil/rbutilqt/themesinstallwindow.cpp @@ -321,7 +321,8 @@ void ThemesInstallWindow::accept(void) void ThemesInstallWindow::install() { if(ui.listThemes->selectedItems().size() == 0) { - this->close(); + logger->addItem(tr("No themes selected, skipping"), LOGINFO); + emit done(false); return; } QStringList themes; |