when changing settings from the Talk and Voice window also update the main widgets settings.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16668 a1c6a512-1295-4272-9138-f99709370657

4 files changed, 14 insertions, 7 deletions

diff --git a/rbutil/rbutilqt/createvoicewindow.cpp b/rbutil/rbutilqt/createvoicewindow.cpp
index 2698732..3558229 100644
--- a/rbutil/rbutilqt/createvoicewindow.cpp
+++ b/rbutil/rbutilqt/createvoicewindow.cpp
@@ -36,7 +36,7 @@ void CreateVoiceWindow::change()
     Config *cw = new Config(this,4);
     cw->setSettings(settings);
     cw->show();
-    connect(cw, SIGNAL(settingsUpdated()), this, SLOT(settingsUpdated()));
+    connect(cw, SIGNAL(settingsUpdated()), this, SLOT(updateSettings()));
 }
 
 void CreateVoiceWindow::accept()
@@ -70,13 +70,13 @@ void CreateVoiceWindow::accept()
 void CreateVoiceWindow::setSettings(RbSettings* sett)
 {
     settings = sett;
-    settingsUpdated();
+    updateSettings();
 }
 
 
 /** @brief update displayed settings
  */
-void CreateVoiceWindow::settingsUpdated(void)
+void CreateVoiceWindow::updateSettings(void)
 {
     // fill in language combobox
     QStringList languages = settings->allLanguages();
@@ -118,7 +118,7 @@ void CreateVoiceWindow::settingsUpdated(void)
     else
         ui.labelEncProfile->setText(tr("Selected Encoder: <b>%1</b>").arg("Invalid encoder configuration!"));
     ui.wavtrimthreshold->setValue(settings->wavtrimTh());
-
+    emit settingsUpdated();
 }
 
 
diff --git a/rbutil/rbutilqt/createvoicewindow.h b/rbutil/rbutilqt/createvoicewindow.h
index 2010c0a..a4aa656 100644
--- a/rbutil/rbutilqt/createvoicewindow.h
+++ b/rbutil/rbutilqt/createvoicewindow.h
@@ -38,6 +38,9 @@ class CreateVoiceWindow : public QDialog
     public slots:
         void accept(void);
         void change(void);
+        void updateSettings(void);
+
+    signals:
         void settingsUpdated(void);
 
     private:
diff --git a/rbutil/rbutilqt/installtalkwindow.cpp b/rbutil/rbutilqt/installtalkwindow.cpp
index de57384..158365c 100644
--- a/rbutil/rbutilqt/installtalkwindow.cpp
+++ b/rbutil/rbutilqt/installtalkwindow.cpp
@@ -68,7 +68,7 @@ void InstallTalkWindow::change()
     Config *cw = new Config(this,4);
     cw->setSettings(settings);
     cw->show();
-    connect(cw, SIGNAL(settingsUpdated()), this, SLOT(settingsUpdated()));
+    connect(cw, SIGNAL(settingsUpdated()), this, SLOT(updateSettings()));
 }
 
 void InstallTalkWindow::accept()
@@ -109,11 +109,11 @@ void InstallTalkWindow::accept()
 void InstallTalkWindow::setSettings(RbSettings* sett)
 {
     settings = sett;
-    settingsUpdated();
+    updateSettings();
 }
 
 
-void InstallTalkWindow::settingsUpdated(void)
+void InstallTalkWindow::updateSettings(void)
 {
     QString ttsName = settings->curTTS();
     TTSBase* tts = TTSBase::getTTS(ttsName);
@@ -136,5 +136,6 @@ void InstallTalkWindow::settingsUpdated(void)
         ui.labelEncProfile->setText(tr("Selected Encoder: <b>%1</b>").arg("Invalid encoder configuration!"));
 
     setTalkFolder(settings->lastTalkedFolder());
+    emit settingsUpdated();
 }
 
diff --git a/rbutil/rbutilqt/installtalkwindow.h b/rbutil/rbutilqt/installtalkwindow.h
index cad2587..718168c 100644
--- a/rbutil/rbutilqt/installtalkwindow.h
+++ b/rbutil/rbutilqt/installtalkwindow.h
@@ -41,6 +41,9 @@ class InstallTalkWindow : public QDialog
     private slots:
         void browseFolder(void);
         void setTalkFolder(QString folder);
+        void updateSettings(void);
+
+    signals:
         void settingsUpdated(void);
 
     private: