summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2008-03-01 13:42:14 +0000
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2008-03-01 13:42:14 +0000
commit05f24a1ec49d63100bf5eaa2d83b5bad4a4f61df (patch)
tree21ade9d518a94eb977b7f3c9916ea5add36e3080
parentdfac61e89cf93eb968cc16154f6d643fc5b1360e (diff)
downloadrockbox-05f24a1ec49d63100bf5eaa2d83b5bad4a4f61df.tar.gz
rockbox-05f24a1ec49d63100bf5eaa2d83b5bad4a4f61df.tar.bz2
rockbox-05f24a1ec49d63100bf5eaa2d83b5bad4a4f61df.zip
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
-rw-r--r--rbutil/rbutilqt/createvoicewindow.cpp13
-rw-r--r--rbutil/rbutilqt/createvoicewindow.h8
-rw-r--r--rbutil/rbutilqt/installtalkwindow.cpp10
-rw-r--r--rbutil/rbutilqt/installtalkwindow.h4
4 files changed, 20 insertions, 15 deletions
diff --git a/rbutil/rbutilqt/createvoicewindow.cpp b/rbutil/rbutilqt/createvoicewindow.cpp
index 843041fde7..2698732afb 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 d9fefc6750..79d312dc1e 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 59ec12fa11..de57384b49 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 7ac9e45fc0..cad2587121 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;