diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2008-03-01 13:42:14 +0000 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2008-03-01 13:42:14 +0000 |
commit | 05f24a1ec49d63100bf5eaa2d83b5bad4a4f61df (patch) | |
tree | 21ade9d518a94eb977b7f3c9916ea5add36e3080 | |
parent | dfac61e89cf93eb968cc16154f6d643fc5b1360e (diff) | |
download | rockbox-05f24a1ec49d63100bf5eaa2d83b5bad4a4f61df.tar.gz 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.cpp | 13 | ||||
-rw-r--r-- | rbutil/rbutilqt/createvoicewindow.h | 8 | ||||
-rw-r--r-- | rbutil/rbutilqt/installtalkwindow.cpp | 10 | ||||
-rw-r--r-- | 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 843041fde7..2698732afb 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, SIGNAL(settingsUpdated())); | 39 | connect(cw, SIGNAL(settingsUpdated()), this, SLOT(settingsUpdated())); |
40 | } | 40 | } |
41 | 41 | ||
42 | void CreateVoiceWindow::accept() | 42 | void CreateVoiceWindow::accept() |
@@ -58,7 +58,6 @@ void CreateVoiceWindow::accept() | |||
58 | voicecreator->setMountPoint(settings->mountpoint()); | 58 | voicecreator->setMountPoint(settings->mountpoint()); |
59 | voicecreator->setTargetId(settings->curTargetId()); | 59 | voicecreator->setTargetId(settings->curTargetId()); |
60 | voicecreator->setLang(lang); | 60 | voicecreator->setLang(lang); |
61 | voicecreator->setProxy(m_proxy); | ||
62 | voicecreator->setWavtrimThreshold(wvThreshold); | 61 | voicecreator->setWavtrimThreshold(wvThreshold); |
63 | 62 | ||
64 | //start creating | 63 | //start creating |
@@ -66,11 +65,19 @@ void CreateVoiceWindow::accept() | |||
66 | } | 65 | } |
67 | 66 | ||
68 | 67 | ||
69 | 68 | /** @brief set settings object | |
69 | */ | ||
70 | void CreateVoiceWindow::setSettings(RbSettings* sett) | 70 | void CreateVoiceWindow::setSettings(RbSettings* sett) |
71 | { | 71 | { |
72 | settings = sett; | 72 | settings = sett; |
73 | settingsUpdated(); | ||
74 | } | ||
73 | 75 | ||
76 | |||
77 | /** @brief update displayed settings | ||
78 | */ | ||
79 | void CreateVoiceWindow::settingsUpdated(void) | ||
80 | { | ||
74 | // fill in language combobox | 81 | // fill in language combobox |
75 | QStringList languages = settings->allLanguages(); | 82 | QStringList languages = settings->allLanguages(); |
76 | languages.sort(); | 83 | 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 | |||
33 | public: | 33 | public: |
34 | CreateVoiceWindow(QWidget *parent = 0); | 34 | CreateVoiceWindow(QWidget *parent = 0); |
35 | void setSettings(RbSettings* sett); | 35 | void setSettings(RbSettings* sett); |
36 | void setProxy(QUrl proxy){m_proxy = proxy;} | 36 | |
37 | |||
38 | signals: | ||
39 | void settingsUpdated(void); | ||
40 | |||
41 | public slots: | 37 | public slots: |
42 | void accept(void); | 38 | void accept(void); |
43 | void change(void); | 39 | void change(void); |
40 | void settingsUpdated(void); | ||
44 | 41 | ||
45 | private: | 42 | private: |
46 | VoiceFileCreator* voicecreator; | 43 | VoiceFileCreator* voicecreator; |
47 | Ui::CreateVoiceFrm ui; | 44 | Ui::CreateVoiceFrm ui; |
48 | ProgressLoggerGui* logger; | 45 | ProgressLoggerGui* logger; |
49 | RbSettings* settings; | 46 | RbSettings* settings; |
50 | QUrl m_proxy; | ||
51 | }; | 47 | }; |
52 | 48 | ||
53 | #endif | 49 | #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() | |||
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, SIGNAL(settingsUpdated())); | 71 | connect(cw, SIGNAL(settingsUpdated()), this, SLOT(settingsUpdated())); |
72 | } | 72 | } |
73 | 73 | ||
74 | void InstallTalkWindow::accept() | 74 | void InstallTalkWindow::accept() |
@@ -109,7 +109,12 @@ void InstallTalkWindow::accept() | |||
109 | void InstallTalkWindow::setSettings(RbSettings* sett) | 109 | void InstallTalkWindow::setSettings(RbSettings* sett) |
110 | { | 110 | { |
111 | settings = sett; | 111 | settings = sett; |
112 | 112 | settingsUpdated(); | |
113 | } | ||
114 | |||
115 | |||
116 | void InstallTalkWindow::settingsUpdated(void) | ||
117 | { | ||
113 | QString ttsName = settings->curTTS(); | 118 | QString ttsName = settings->curTTS(); |
114 | TTSBase* tts = TTSBase::getTTS(ttsName); | 119 | TTSBase* tts = TTSBase::getTTS(ttsName); |
115 | tts->setCfg(settings); | 120 | tts->setCfg(settings); |
@@ -131,6 +136,5 @@ void InstallTalkWindow::setSettings(RbSettings* sett) | |||
131 | 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!")); |
132 | 137 | ||
133 | setTalkFolder(settings->lastTalkedFolder()); | 138 | setTalkFolder(settings->lastTalkedFolder()); |
134 | |||
135 | } | 139 | } |
136 | 140 | ||
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 | |||
34 | InstallTalkWindow(QWidget *parent = 0); | 34 | InstallTalkWindow(QWidget *parent = 0); |
35 | void setSettings(RbSettings* sett); | 35 | void setSettings(RbSettings* sett); |
36 | 36 | ||
37 | signals: | ||
38 | void settingsUpdated(void); | ||
39 | |||
40 | public slots: | 37 | public slots: |
41 | void accept(void); | 38 | void accept(void); |
42 | void change(void); | 39 | void change(void); |
@@ -44,6 +41,7 @@ class InstallTalkWindow : public QDialog | |||
44 | private slots: | 41 | private slots: |
45 | void browseFolder(void); | 42 | void browseFolder(void); |
46 | void setTalkFolder(QString folder); | 43 | void setTalkFolder(QString folder); |
44 | void settingsUpdated(void); | ||
47 | 45 | ||
48 | private: | 46 | private: |
49 | TalkFileCreator* talkcreator; | 47 | TalkFileCreator* talkcreator; |