diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2012-10-06 11:30:26 +0200 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2012-10-06 13:53:09 +0200 |
commit | a2dd1625bcfb1272cb711dc35896924817af3c0c (patch) | |
tree | 03db39ad5a2f3ff120dd89dd1a91865b80c44e66 | |
parent | 4d96b4c7b0a7560edd1cbb47f4f31938541a53dd (diff) | |
download | rockbox-a2dd1625bcfb1272cb711dc35896924817af3c0c.tar.gz rockbox-a2dd1625bcfb1272cb711dc35896924817af3c0c.zip |
Check selection before trying to create talk files.
This prevents users from accidentially trying to create talk files for nothing.
Change-Id: I92eae0e0dc14a772c786bcdad67f404fe3786376
-rw-r--r-- | rbutil/rbutilqt/installtalkwindow.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/rbutil/rbutilqt/installtalkwindow.cpp b/rbutil/rbutilqt/installtalkwindow.cpp index f6e67720f5..95aad659ed 100644 --- a/rbutil/rbutilqt/installtalkwindow.cpp +++ b/rbutil/rbutilqt/installtalkwindow.cpp | |||
@@ -87,12 +87,20 @@ void InstallTalkWindow::change() | |||
87 | 87 | ||
88 | void InstallTalkWindow::accept() | 88 | void InstallTalkWindow::accept() |
89 | { | 89 | { |
90 | saveSettings(); | ||
91 | QStringList foldersToTalk | ||
92 | = RbSettings::value(RbSettings::TalkFolders).toStringList(); | ||
93 | if(foldersToTalk.size() == 0) { | ||
94 | QMessageBox::information(this, tr("Empty selection"), | ||
95 | tr("No files or folders selected. Please select files or " | ||
96 | "folders first.")); | ||
97 | return; | ||
98 | } | ||
99 | |||
90 | logger = new ProgressLoggerGui(this); | 100 | logger = new ProgressLoggerGui(this); |
91 | 101 | ||
92 | saveSettings(); | ||
93 | connect(logger,SIGNAL(closed()),this,SLOT(close())); | 102 | connect(logger,SIGNAL(closed()),this,SLOT(close())); |
94 | logger->show(); | 103 | logger->show(); |
95 | saveSettings(); | ||
96 | 104 | ||
97 | talkcreator->setMountPoint(RbSettings::value(RbSettings::Mountpoint).toString()); | 105 | talkcreator->setMountPoint(RbSettings::value(RbSettings::Mountpoint).toString()); |
98 | 106 | ||
@@ -108,8 +116,6 @@ void InstallTalkWindow::accept() | |||
108 | connect(talkcreator, SIGNAL(logProgress(int, int)), logger, SLOT(setProgress(int, int))); | 116 | connect(talkcreator, SIGNAL(logProgress(int, int)), logger, SLOT(setProgress(int, int))); |
109 | connect(logger,SIGNAL(aborted()),talkcreator,SLOT(abort())); | 117 | connect(logger,SIGNAL(aborted()),talkcreator,SLOT(abort())); |
110 | 118 | ||
111 | QStringList foldersToTalk | ||
112 | = RbSettings::value(RbSettings::TalkFolders).toStringList(); | ||
113 | for(int i = 0; i < foldersToTalk.size(); i++) { | 119 | for(int i = 0; i < foldersToTalk.size(); i++) { |
114 | qDebug() << "[InstallTalkWindow] creating talk files for folder" | 120 | qDebug() << "[InstallTalkWindow] creating talk files for folder" |
115 | << foldersToTalk.at(i); | 121 | << foldersToTalk.at(i); |