diff options
Diffstat (limited to 'rbutil/rbutilqt/installtalkwindow.cpp')
-rw-r--r-- | rbutil/rbutilqt/installtalkwindow.cpp | 26 |
1 files changed, 9 insertions, 17 deletions
diff --git a/rbutil/rbutilqt/installtalkwindow.cpp b/rbutil/rbutilqt/installtalkwindow.cpp index cfe38ed2b9..6277313d3a 100644 --- a/rbutil/rbutilqt/installtalkwindow.cpp +++ b/rbutil/rbutilqt/installtalkwindow.cpp | |||
@@ -22,6 +22,7 @@ | |||
22 | 22 | ||
23 | #include "browsedirtree.h" | 23 | #include "browsedirtree.h" |
24 | #include "configure.h" | 24 | #include "configure.h" |
25 | #include "rbsettings.h" | ||
25 | 26 | ||
26 | InstallTalkWindow::InstallTalkWindow(QWidget *parent) : QDialog(parent) | 27 | InstallTalkWindow::InstallTalkWindow(QWidget *parent) : QDialog(parent) |
27 | { | 28 | { |
@@ -34,6 +35,8 @@ InstallTalkWindow::InstallTalkWindow(QWidget *parent) : QDialog(parent) | |||
34 | ui.recursive->setChecked(true); | 35 | ui.recursive->setChecked(true); |
35 | ui.OverwriteTalk->setChecked(true); | 36 | ui.OverwriteTalk->setChecked(true); |
36 | ui.StripExtensions->setChecked(true); | 37 | ui.StripExtensions->setChecked(true); |
38 | |||
39 | updateSettings(); | ||
37 | } | 40 | } |
38 | 41 | ||
39 | void InstallTalkWindow::browseFolder() | 42 | void InstallTalkWindow::browseFolder() |
@@ -64,7 +67,6 @@ void InstallTalkWindow::setTalkFolder(QString folder) | |||
64 | void InstallTalkWindow::change() | 67 | void InstallTalkWindow::change() |
65 | { | 68 | { |
66 | Config *cw = new Config(this,4); | 69 | Config *cw = new Config(this,4); |
67 | cw->setSettings(settings); | ||
68 | 70 | ||
69 | connect(cw, SIGNAL(settingsUpdated()), this, SLOT(updateSettings())); | 71 | connect(cw, SIGNAL(settingsUpdated()), this, SLOT(updateSettings())); |
70 | 72 | ||
@@ -88,13 +90,12 @@ void InstallTalkWindow::accept() | |||
88 | return; | 90 | return; |
89 | } | 91 | } |
90 | 92 | ||
91 | settings->setValue(RbSettings::LastTalkedFolder, folderToTalk); | 93 | RbSettings::setValue(RbSettings::LastTalkedFolder, folderToTalk); |
92 | 94 | ||
93 | settings->sync(); | 95 | RbSettings::sync(); |
94 | 96 | ||
95 | talkcreator->setSettings(settings); | ||
96 | talkcreator->setDir(QDir(folderToTalk)); | 97 | talkcreator->setDir(QDir(folderToTalk)); |
97 | talkcreator->setMountPoint(settings->value(RbSettings::Mountpoint).toString()); | 98 | talkcreator->setMountPoint(RbSettings::value(RbSettings::Mountpoint).toString()); |
98 | 99 | ||
99 | talkcreator->setOverwriteTalk(ui.OverwriteTalk->isChecked()); | 100 | talkcreator->setOverwriteTalk(ui.OverwriteTalk->isChecked()); |
100 | talkcreator->setRecursive(ui.recursive->isChecked()); | 101 | talkcreator->setRecursive(ui.recursive->isChecked()); |
@@ -106,18 +107,10 @@ void InstallTalkWindow::accept() | |||
106 | } | 107 | } |
107 | 108 | ||
108 | 109 | ||
109 | void InstallTalkWindow::setSettings(RbSettings* sett) | ||
110 | { | ||
111 | settings = sett; | ||
112 | updateSettings(); | ||
113 | } | ||
114 | |||
115 | |||
116 | void InstallTalkWindow::updateSettings(void) | 110 | void InstallTalkWindow::updateSettings(void) |
117 | { | 111 | { |
118 | QString ttsName = settings->value(RbSettings::Tts).toString(); | 112 | QString ttsName = RbSettings::value(RbSettings::Tts).toString(); |
119 | TTSBase* tts = TTSBase::getTTS(this,ttsName); | 113 | TTSBase* tts = TTSBase::getTTS(this,ttsName); |
120 | tts->setCfg(settings); | ||
121 | if(tts->configOk()) | 114 | if(tts->configOk()) |
122 | ui.labelTtsProfile->setText(tr("Selected TTS engine: <b>%1</b>") | 115 | ui.labelTtsProfile->setText(tr("Selected TTS engine: <b>%1</b>") |
123 | .arg(TTSBase::getTTSName(ttsName))); | 116 | .arg(TTSBase::getTTSName(ttsName))); |
@@ -125,10 +118,9 @@ void InstallTalkWindow::updateSettings(void) | |||
125 | ui.labelTtsProfile->setText(tr("Selected TTS engine: <b>%1</b>") | 118 | ui.labelTtsProfile->setText(tr("Selected TTS engine: <b>%1</b>") |
126 | .arg("Invalid TTS configuration!")); | 119 | .arg("Invalid TTS configuration!")); |
127 | 120 | ||
128 | QString encoder = settings->value(RbSettings::CurEncoder).toString(); | 121 | QString encoder = RbSettings::value(RbSettings::CurEncoder).toString(); |
129 | EncBase* enc = EncBase::getEncoder(this,encoder); | 122 | EncBase* enc = EncBase::getEncoder(this,encoder); |
130 | if(enc != NULL) { | 123 | if(enc != NULL) { |
131 | enc->setCfg(settings); | ||
132 | if(enc->configOk()) | 124 | if(enc->configOk()) |
133 | ui.labelEncProfile->setText(tr("Selected encoder: <b>%1</b>") | 125 | ui.labelEncProfile->setText(tr("Selected encoder: <b>%1</b>") |
134 | .arg(EncBase::getEncoderName(encoder))); | 126 | .arg(EncBase::getEncoderName(encoder))); |
@@ -140,7 +132,7 @@ void InstallTalkWindow::updateSettings(void) | |||
140 | ui.labelEncProfile->setText(tr("Selected encoder: <b>%1</b>") | 132 | ui.labelEncProfile->setText(tr("Selected encoder: <b>%1</b>") |
141 | .arg("Invalid encoder configuration!")); | 133 | .arg("Invalid encoder configuration!")); |
142 | 134 | ||
143 | setTalkFolder(settings->value(RbSettings::LastTalkedFolder).toString()); | 135 | setTalkFolder(RbSettings::value(RbSettings::LastTalkedFolder).toString()); |
144 | emit settingsUpdated(); | 136 | emit settingsUpdated(); |
145 | } | 137 | } |
146 | 138 | ||