diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2009-04-29 20:58:47 +0000 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2009-04-29 20:58:47 +0000 |
commit | 3d2e42ab4cc6306db4036983badea0c92750210b (patch) | |
tree | dd4303f36be8df6c4f808878da00963cb7316415 /rbutil/rbutilqt/createvoicewindow.cpp | |
parent | 3c5e67516bfab95afc26f618840ca3db67998028 (diff) | |
download | rockbox-3d2e42ab4cc6306db4036983badea0c92750210b.tar.gz rockbox-3d2e42ab4cc6306db4036983badea0c92750210b.zip |
Completely rework RbSettings class.
- use a single member function for accessing a settings value.
- use an enum to figure the correct value in the settings file instead of functions.
- return the settings value as QVariant instead and leave converting to the caller.
- accept QVariant as value when setting values.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20823 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'rbutil/rbutilqt/createvoicewindow.cpp')
-rw-r--r-- | rbutil/rbutilqt/createvoicewindow.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/rbutil/rbutilqt/createvoicewindow.cpp b/rbutil/rbutilqt/createvoicewindow.cpp index bb047cb196..2b45386589 100644 --- a/rbutil/rbutilqt/createvoicewindow.cpp +++ b/rbutil/rbutilqt/createvoicewindow.cpp | |||
@@ -49,14 +49,14 @@ void CreateVoiceWindow::accept() | |||
49 | int wvThreshold = ui.wavtrimthreshold->value(); | 49 | int wvThreshold = ui.wavtrimthreshold->value(); |
50 | 50 | ||
51 | //safe selected language | 51 | //safe selected language |
52 | settings->setVoiceLanguage(lang); | 52 | settings->setValue(RbSettings::Language, lang); |
53 | settings->setWavtrimTh(wvThreshold); | 53 | settings->setValue(RbSettings::WavtrimThreshold, wvThreshold); |
54 | settings->sync(); | 54 | settings->sync(); |
55 | 55 | ||
56 | //configure voicecreator | 56 | //configure voicecreator |
57 | voicecreator->setSettings(settings); | 57 | voicecreator->setSettings(settings); |
58 | voicecreator->setMountPoint(settings->mountpoint()); | 58 | voicecreator->setMountPoint(settings->value(RbSettings::Mountpoint).toString()); |
59 | voicecreator->setTargetId(settings->curTargetId()); | 59 | voicecreator->setTargetId(settings->value(RbSettings::CurTargetId).toInt()); |
60 | voicecreator->setLang(lang); | 60 | voicecreator->setLang(lang); |
61 | voicecreator->setWavtrimThreshold(wvThreshold); | 61 | voicecreator->setWavtrimThreshold(wvThreshold); |
62 | 62 | ||
@@ -79,14 +79,14 @@ void CreateVoiceWindow::setSettings(RbSettings* sett) | |||
79 | void CreateVoiceWindow::updateSettings(void) | 79 | void CreateVoiceWindow::updateSettings(void) |
80 | { | 80 | { |
81 | // fill in language combobox | 81 | // fill in language combobox |
82 | QStringList languages = settings->allLanguages(); | 82 | QStringList languages = settings->languages(); |
83 | languages.sort(); | 83 | languages.sort(); |
84 | ui.comboLanguage->addItems(languages); | 84 | ui.comboLanguage->addItems(languages); |
85 | // set saved lang | 85 | // set saved lang |
86 | int sel = ui.comboLanguage->findText(settings->voiceLanguage()); | 86 | int sel = ui.comboLanguage->findText(settings->value(RbSettings::VoiceLanguage).toString()); |
87 | // if no saved language is found try to figure the language from the UI lang | 87 | // if no saved language is found try to figure the language from the UI lang |
88 | if(sel == -1) { | 88 | if(sel == -1) { |
89 | QString f = settings->curLang(); | 89 | QString f = settings->value(RbSettings::Language).toString(); |
90 | // if no language is set default to english. Make sure not to check an empty string. | 90 | // if no language is set default to english. Make sure not to check an empty string. |
91 | if(f.isEmpty()) f = "english"; | 91 | if(f.isEmpty()) f = "english"; |
92 | sel = ui.comboLanguage->findText(f, Qt::MatchStartsWith); | 92 | sel = ui.comboLanguage->findText(f, Qt::MatchStartsWith); |
@@ -97,7 +97,7 @@ void CreateVoiceWindow::updateSettings(void) | |||
97 | } | 97 | } |
98 | ui.comboLanguage->setCurrentIndex(sel); | 98 | ui.comboLanguage->setCurrentIndex(sel); |
99 | 99 | ||
100 | QString ttsName = settings->curTTS(); | 100 | QString ttsName = settings->value(RbSettings::Tts).toString(); |
101 | TTSBase* tts = TTSBase::getTTS(ttsName); | 101 | TTSBase* tts = TTSBase::getTTS(ttsName); |
102 | tts->setCfg(settings); | 102 | tts->setCfg(settings); |
103 | if(tts->configOk()) | 103 | if(tts->configOk()) |
@@ -107,7 +107,7 @@ void CreateVoiceWindow::updateSettings(void) | |||
107 | ui.labelTtsProfile->setText(tr("Selected TTS engine: <b>%1</b>") | 107 | ui.labelTtsProfile->setText(tr("Selected TTS engine: <b>%1</b>") |
108 | .arg("Invalid TTS configuration!")); | 108 | .arg("Invalid TTS configuration!")); |
109 | 109 | ||
110 | QString encoder = settings->curEncoder(); | 110 | QString encoder = settings->value(RbSettings::CurEncoder).toString(); |
111 | // only proceed if encoder setting is set | 111 | // only proceed if encoder setting is set |
112 | EncBase* enc = EncBase::getEncoder(encoder); | 112 | EncBase* enc = EncBase::getEncoder(encoder); |
113 | if(enc != NULL) { | 113 | if(enc != NULL) { |
@@ -122,7 +122,7 @@ void CreateVoiceWindow::updateSettings(void) | |||
122 | else | 122 | else |
123 | ui.labelEncProfile->setText(tr("Selected encoder: <b>%1</b>") | 123 | ui.labelEncProfile->setText(tr("Selected encoder: <b>%1</b>") |
124 | .arg("Invalid encoder configuration!")); | 124 | .arg("Invalid encoder configuration!")); |
125 | ui.wavtrimthreshold->setValue(settings->wavtrimTh()); | 125 | ui.wavtrimthreshold->setValue(settings->value(RbSettings::WavtrimThreshold).toInt()); |
126 | emit settingsUpdated(); | 126 | emit settingsUpdated(); |
127 | } | 127 | } |
128 | 128 | ||