From a115f5129c19f7a82eb32c85ff0b572d626e87f0 Mon Sep 17 00:00:00 2001
From: bluebrother <bluebrother@a1c6a512-1295-4272-9138-f99709370657>
Date: Sat, 1 Mar 2008 13:42:14 +0000
Subject: [PATCH] Fix voicefile / talkfile generation windows not updating the
 displayed settings if the user used the "change" button.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16462 a1c6a512-1295-4272-9138-f99709370657
---
 rbutil/rbutilqt/createvoicewindow.cpp | 13 ++++++++++---
 rbutil/rbutilqt/createvoicewindow.h   |  8 ++------
 rbutil/rbutilqt/installtalkwindow.cpp | 10 +++++++---
 rbutil/rbutilqt/installtalkwindow.h   |  4 +---
 4 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/rbutil/rbutilqt/createvoicewindow.cpp b/rbutil/rbutilqt/createvoicewindow.cpp
index 843041fde..2698732af 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, SIGNAL(settingsUpdated()));
+    connect(cw, SIGNAL(settingsUpdated()), this, SLOT(settingsUpdated()));
 }
 
 void CreateVoiceWindow::accept()
@@ -58,7 +58,6 @@ void CreateVoiceWindow::accept()
     voicecreator->setMountPoint(settings->mountpoint());
     voicecreator->setTargetId(settings->curTargetId());
     voicecreator->setLang(lang);
-    voicecreator->setProxy(m_proxy);
     voicecreator->setWavtrimThreshold(wvThreshold);
        
     //start creating
@@ -66,11 +65,19 @@ void CreateVoiceWindow::accept()
 }
 
 
-
+/** @brief set settings object
+ */
 void CreateVoiceWindow::setSettings(RbSettings* sett)
 {
     settings = sett;
+    settingsUpdated();
+}
 
+
+/** @brief update displayed settings
+ */
+void CreateVoiceWindow::settingsUpdated(void)
+{
     // fill in language combobox
     QStringList languages = settings->allLanguages();
     languages.sort();
diff --git a/rbutil/rbutilqt/createvoicewindow.h b/rbutil/rbutilqt/createvoicewindow.h
index d9fefc675..79d312dc1 100644
--- a/rbutil/rbutilqt/createvoicewindow.h
+++ b/rbutil/rbutilqt/createvoicewindow.h
@@ -33,21 +33,17 @@ class CreateVoiceWindow : public QDialog
     public:
         CreateVoiceWindow(QWidget *parent = 0);
         void setSettings(RbSettings* sett);
-        void setProxy(QUrl proxy){m_proxy = proxy;}
-        
-    signals:
-        void settingsUpdated(void);
-        
+
     public slots:
         void accept(void);
         void change(void);
+        void settingsUpdated(void);
 
     private:
         VoiceFileCreator* voicecreator;
         Ui::CreateVoiceFrm ui;
         ProgressLoggerGui* logger;
         RbSettings* settings;
-        QUrl m_proxy;
 };
 
 #endif
diff --git a/rbutil/rbutilqt/installtalkwindow.cpp b/rbutil/rbutilqt/installtalkwindow.cpp
index 59ec12fa1..de57384b4 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, SIGNAL(settingsUpdated()));
+    connect(cw, SIGNAL(settingsUpdated()), this, SLOT(settingsUpdated()));
 }
 
 void InstallTalkWindow::accept()
@@ -109,7 +109,12 @@ void InstallTalkWindow::accept()
 void InstallTalkWindow::setSettings(RbSettings* sett)
 {
     settings = sett;
-    
+    settingsUpdated();
+}
+
+
+void InstallTalkWindow::settingsUpdated(void)
+{
     QString ttsName = settings->curTTS();
     TTSBase* tts = TTSBase::getTTS(ttsName);
     tts->setCfg(settings);
@@ -131,6 +136,5 @@ void InstallTalkWindow::setSettings(RbSettings* sett)
         ui.labelEncProfile->setText(tr("Selected Encoder: <b>%1</b>").arg("Invalid encoder configuration!"));
 
     setTalkFolder(settings->lastTalkedFolder());
-
 }
 
diff --git a/rbutil/rbutilqt/installtalkwindow.h b/rbutil/rbutilqt/installtalkwindow.h
index 7ac9e45fc..cad258712 100644
--- a/rbutil/rbutilqt/installtalkwindow.h
+++ b/rbutil/rbutilqt/installtalkwindow.h
@@ -34,9 +34,6 @@ class InstallTalkWindow : public QDialog
         InstallTalkWindow(QWidget *parent = 0);
         void setSettings(RbSettings* sett);
 
-    signals:
-        void settingsUpdated(void);
-        
     public slots:
         void accept(void);
         void change(void);
@@ -44,6 +41,7 @@ class InstallTalkWindow : public QDialog
     private slots:
         void browseFolder(void);
         void setTalkFolder(QString folder);
+        void settingsUpdated(void);
 
     private:
         TalkFileCreator* talkcreator;
-- 
2.11.4.GIT