diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2008-06-23 20:08:22 +0000 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2008-06-23 20:08:22 +0000 |
commit | 24bb08ddd35f5cb9dcd2c4c49065688c1f336a88 (patch) | |
tree | 76fa5a8fd56ff0183c37a42d608b4829f5ed3e8f | |
parent | 9aa7ceb0dfc84c74599f288e3559b2d72980a5ff (diff) | |
download | rockbox-24bb08ddd35f5cb9dcd2c4c49065688c1f336a88.tar.gz rockbox-24bb08ddd35f5cb9dcd2c4c49065688c1f336a88.zip |
Explicitly set the dialog's result code for TTS / Encoder windows. Fixes an issue where one couldn't close the dialog anymore.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17766 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | rbutil/rbutilqt/encodersgui.cpp | 9 | ||||
-rw-r--r-- | rbutil/rbutilqt/ttsgui.cpp | 12 |
2 files changed, 11 insertions, 10 deletions
diff --git a/rbutil/rbutilqt/encodersgui.cpp b/rbutil/rbutilqt/encodersgui.cpp index b363e95e61..8771f4f4a4 100644 --- a/rbutil/rbutilqt/encodersgui.cpp +++ b/rbutil/rbutilqt/encodersgui.cpp | |||
@@ -80,12 +80,12 @@ void EncExesGui::accept(void) | |||
80 | 80 | ||
81 | // sync settings | 81 | // sync settings |
82 | settings->sync(); | 82 | settings->sync(); |
83 | this->close(); | 83 | this->done(0); |
84 | } | 84 | } |
85 | 85 | ||
86 | void EncExesGui::reject(void) | 86 | void EncExesGui::reject(void) |
87 | { | 87 | { |
88 | this->close(); | 88 | this->done(0); |
89 | } | 89 | } |
90 | 90 | ||
91 | void EncExesGui::reset() | 91 | void EncExesGui::reset() |
@@ -153,12 +153,12 @@ void EncRbSpeexGui::accept(void) | |||
153 | 153 | ||
154 | // sync settings | 154 | // sync settings |
155 | settings->sync(); | 155 | settings->sync(); |
156 | this->close(); | 156 | this->done(0); |
157 | } | 157 | } |
158 | 158 | ||
159 | void EncRbSpeexGui::reject(void) | 159 | void EncRbSpeexGui::reject(void) |
160 | { | 160 | { |
161 | this->close(); | 161 | this->done(0); |
162 | } | 162 | } |
163 | 163 | ||
164 | void EncRbSpeexGui::reset() | 164 | void EncRbSpeexGui::reset() |
@@ -168,3 +168,4 @@ void EncRbSpeexGui::reset() | |||
168 | ui.complexity->setValue(defaultComplexity); | 168 | ui.complexity->setValue(defaultComplexity); |
169 | ui.narrowband->setChecked(Qt::Unchecked); | 169 | ui.narrowband->setChecked(Qt::Unchecked); |
170 | } | 170 | } |
171 | |||
diff --git a/rbutil/rbutilqt/ttsgui.cpp b/rbutil/rbutilqt/ttsgui.cpp index 3ed2e87f0e..68a0566dcf 100644 --- a/rbutil/rbutilqt/ttsgui.cpp +++ b/rbutil/rbutilqt/ttsgui.cpp | |||
@@ -88,18 +88,18 @@ void TTSSapiGui::accept(void) | |||
88 | settings->setTTSUseSapi4(false); | 88 | settings->setTTSUseSapi4(false); |
89 | // sync settings | 89 | // sync settings |
90 | settings->sync(); | 90 | settings->sync(); |
91 | 91 | ||
92 | this->close(); | 92 | this->done(0); |
93 | } | 93 | } |
94 | 94 | ||
95 | void TTSSapiGui::reject(void) | 95 | void TTSSapiGui::reject(void) |
96 | { | 96 | { |
97 | this->close(); | 97 | this->done(0); |
98 | } | 98 | } |
99 | 99 | ||
100 | void TTSSapiGui::updateVoices(QString language) | 100 | void TTSSapiGui::updateVoices(QString language) |
101 | { | 101 | { |
102 | QStringList Voices = m_sapi->getVoiceList(language); | 102 | QStringList Voices = m_sapi->getVoiceList(language); |
103 | ui.voicecombo->clear(); | 103 | ui.voicecombo->clear(); |
104 | ui.voicecombo->addItems(Voices); | 104 | ui.voicecombo->addItems(Voices); |
105 | 105 | ||
@@ -182,12 +182,12 @@ void TTSExesGui::accept(void) | |||
182 | // sync settings | 182 | // sync settings |
183 | settings->sync(); | 183 | settings->sync(); |
184 | 184 | ||
185 | this->close(); | 185 | this->done(0); |
186 | } | 186 | } |
187 | 187 | ||
188 | void TTSExesGui::reject(void) | 188 | void TTSExesGui::reject(void) |
189 | { | 189 | { |
190 | this->close(); | 190 | this->done(0); |
191 | } | 191 | } |
192 | 192 | ||
193 | 193 | ||