diff options
-rw-r--r-- | rbutil/rbutilqt/createvoicewindow.cpp | 8 | ||||
-rw-r--r-- | rbutil/rbutilqt/createvoicewindow.h | 3 | ||||
-rw-r--r-- | rbutil/rbutilqt/installtalkwindow.cpp | 7 | ||||
-rw-r--r-- | rbutil/rbutilqt/installtalkwindow.h | 3 |
4 files changed, 14 insertions, 7 deletions
diff --git a/rbutil/rbutilqt/createvoicewindow.cpp b/rbutil/rbutilqt/createvoicewindow.cpp index 2698732afb..35582297c8 100644 --- a/rbutil/rbutilqt/createvoicewindow.cpp +++ b/rbutil/rbutilqt/createvoicewindow.cpp | |||
@@ -36,7 +36,7 @@ void CreateVoiceWindow::change() | |||
36 | Config *cw = new Config(this,4); | 36 | Config *cw = new Config(this,4); |
37 | cw->setSettings(settings); | 37 | cw->setSettings(settings); |
38 | cw->show(); | 38 | cw->show(); |
39 | connect(cw, SIGNAL(settingsUpdated()), this, SLOT(settingsUpdated())); | 39 | connect(cw, SIGNAL(settingsUpdated()), this, SLOT(updateSettings())); |
40 | } | 40 | } |
41 | 41 | ||
42 | void CreateVoiceWindow::accept() | 42 | void CreateVoiceWindow::accept() |
@@ -70,13 +70,13 @@ void CreateVoiceWindow::accept() | |||
70 | void CreateVoiceWindow::setSettings(RbSettings* sett) | 70 | void CreateVoiceWindow::setSettings(RbSettings* sett) |
71 | { | 71 | { |
72 | settings = sett; | 72 | settings = sett; |
73 | settingsUpdated(); | 73 | updateSettings(); |
74 | } | 74 | } |
75 | 75 | ||
76 | 76 | ||
77 | /** @brief update displayed settings | 77 | /** @brief update displayed settings |
78 | */ | 78 | */ |
79 | void CreateVoiceWindow::settingsUpdated(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->allLanguages(); |
@@ -118,7 +118,7 @@ void CreateVoiceWindow::settingsUpdated(void) | |||
118 | else | 118 | else |
119 | ui.labelEncProfile->setText(tr("Selected Encoder: <b>%1</b>").arg("Invalid encoder configuration!")); | 119 | ui.labelEncProfile->setText(tr("Selected Encoder: <b>%1</b>").arg("Invalid encoder configuration!")); |
120 | ui.wavtrimthreshold->setValue(settings->wavtrimTh()); | 120 | ui.wavtrimthreshold->setValue(settings->wavtrimTh()); |
121 | 121 | emit settingsUpdated(); | |
122 | } | 122 | } |
123 | 123 | ||
124 | 124 | ||
diff --git a/rbutil/rbutilqt/createvoicewindow.h b/rbutil/rbutilqt/createvoicewindow.h index 2010c0ad1f..a4aa656bf2 100644 --- a/rbutil/rbutilqt/createvoicewindow.h +++ b/rbutil/rbutilqt/createvoicewindow.h | |||
@@ -38,6 +38,9 @@ class CreateVoiceWindow : public QDialog | |||
38 | public slots: | 38 | public slots: |
39 | void accept(void); | 39 | void accept(void); |
40 | void change(void); | 40 | void change(void); |
41 | void updateSettings(void); | ||
42 | |||
43 | signals: | ||
41 | void settingsUpdated(void); | 44 | void settingsUpdated(void); |
42 | 45 | ||
43 | private: | 46 | private: |
diff --git a/rbutil/rbutilqt/installtalkwindow.cpp b/rbutil/rbutilqt/installtalkwindow.cpp index de57384b49..158365c460 100644 --- a/rbutil/rbutilqt/installtalkwindow.cpp +++ b/rbutil/rbutilqt/installtalkwindow.cpp | |||
@@ -68,7 +68,7 @@ void InstallTalkWindow::change() | |||
68 | Config *cw = new Config(this,4); | 68 | Config *cw = new Config(this,4); |
69 | cw->setSettings(settings); | 69 | cw->setSettings(settings); |
70 | cw->show(); | 70 | cw->show(); |
71 | connect(cw, SIGNAL(settingsUpdated()), this, SLOT(settingsUpdated())); | 71 | connect(cw, SIGNAL(settingsUpdated()), this, SLOT(updateSettings())); |
72 | } | 72 | } |
73 | 73 | ||
74 | void InstallTalkWindow::accept() | 74 | void InstallTalkWindow::accept() |
@@ -109,11 +109,11 @@ void InstallTalkWindow::accept() | |||
109 | void InstallTalkWindow::setSettings(RbSettings* sett) | 109 | void InstallTalkWindow::setSettings(RbSettings* sett) |
110 | { | 110 | { |
111 | settings = sett; | 111 | settings = sett; |
112 | settingsUpdated(); | 112 | updateSettings(); |
113 | } | 113 | } |
114 | 114 | ||
115 | 115 | ||
116 | void InstallTalkWindow::settingsUpdated(void) | 116 | void InstallTalkWindow::updateSettings(void) |
117 | { | 117 | { |
118 | QString ttsName = settings->curTTS(); | 118 | QString ttsName = settings->curTTS(); |
119 | TTSBase* tts = TTSBase::getTTS(ttsName); | 119 | TTSBase* tts = TTSBase::getTTS(ttsName); |
@@ -136,5 +136,6 @@ void InstallTalkWindow::settingsUpdated(void) | |||
136 | ui.labelEncProfile->setText(tr("Selected Encoder: <b>%1</b>").arg("Invalid encoder configuration!")); | 136 | ui.labelEncProfile->setText(tr("Selected Encoder: <b>%1</b>").arg("Invalid encoder configuration!")); |
137 | 137 | ||
138 | setTalkFolder(settings->lastTalkedFolder()); | 138 | setTalkFolder(settings->lastTalkedFolder()); |
139 | emit settingsUpdated(); | ||
139 | } | 140 | } |
140 | 141 | ||
diff --git a/rbutil/rbutilqt/installtalkwindow.h b/rbutil/rbutilqt/installtalkwindow.h index cad2587121..718168c3e4 100644 --- a/rbutil/rbutilqt/installtalkwindow.h +++ b/rbutil/rbutilqt/installtalkwindow.h | |||
@@ -41,6 +41,9 @@ class InstallTalkWindow : public QDialog | |||
41 | private slots: | 41 | private slots: |
42 | void browseFolder(void); | 42 | void browseFolder(void); |
43 | void setTalkFolder(QString folder); | 43 | void setTalkFolder(QString folder); |
44 | void updateSettings(void); | ||
45 | |||
46 | signals: | ||
44 | void settingsUpdated(void); | 47 | void settingsUpdated(void); |
45 | 48 | ||
46 | private: | 49 | private: |