mirror of
https://github.com/Rockbox/rockbox.git
synced 2025-12-10 13:45:10 -05:00
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
This commit is contained in:
parent
da6b43b25b
commit
77e036af7d
4 changed files with 14 additions and 7 deletions
|
|
@ -36,7 +36,7 @@ void CreateVoiceWindow::change()
|
||||||
Config *cw = new Config(this,4);
|
Config *cw = new Config(this,4);
|
||||||
cw->setSettings(settings);
|
cw->setSettings(settings);
|
||||||
cw->show();
|
cw->show();
|
||||||
connect(cw, SIGNAL(settingsUpdated()), this, SLOT(settingsUpdated()));
|
connect(cw, SIGNAL(settingsUpdated()), this, SLOT(updateSettings()));
|
||||||
}
|
}
|
||||||
|
|
||||||
void CreateVoiceWindow::accept()
|
void CreateVoiceWindow::accept()
|
||||||
|
|
@ -70,13 +70,13 @@ void CreateVoiceWindow::accept()
|
||||||
void CreateVoiceWindow::setSettings(RbSettings* sett)
|
void CreateVoiceWindow::setSettings(RbSettings* sett)
|
||||||
{
|
{
|
||||||
settings = sett;
|
settings = sett;
|
||||||
settingsUpdated();
|
updateSettings();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/** @brief update displayed settings
|
/** @brief update displayed settings
|
||||||
*/
|
*/
|
||||||
void CreateVoiceWindow::settingsUpdated(void)
|
void CreateVoiceWindow::updateSettings(void)
|
||||||
{
|
{
|
||||||
// fill in language combobox
|
// fill in language combobox
|
||||||
QStringList languages = settings->allLanguages();
|
QStringList languages = settings->allLanguages();
|
||||||
|
|
@ -118,7 +118,7 @@ void CreateVoiceWindow::settingsUpdated(void)
|
||||||
else
|
else
|
||||||
ui.labelEncProfile->setText(tr("Selected Encoder: <b>%1</b>").arg("Invalid encoder configuration!"));
|
ui.labelEncProfile->setText(tr("Selected Encoder: <b>%1</b>").arg("Invalid encoder configuration!"));
|
||||||
ui.wavtrimthreshold->setValue(settings->wavtrimTh());
|
ui.wavtrimthreshold->setValue(settings->wavtrimTh());
|
||||||
|
emit settingsUpdated();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -38,6 +38,9 @@ class CreateVoiceWindow : public QDialog
|
||||||
public slots:
|
public slots:
|
||||||
void accept(void);
|
void accept(void);
|
||||||
void change(void);
|
void change(void);
|
||||||
|
void updateSettings(void);
|
||||||
|
|
||||||
|
signals:
|
||||||
void settingsUpdated(void);
|
void settingsUpdated(void);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
|
||||||
|
|
@ -68,7 +68,7 @@ void InstallTalkWindow::change()
|
||||||
Config *cw = new Config(this,4);
|
Config *cw = new Config(this,4);
|
||||||
cw->setSettings(settings);
|
cw->setSettings(settings);
|
||||||
cw->show();
|
cw->show();
|
||||||
connect(cw, SIGNAL(settingsUpdated()), this, SLOT(settingsUpdated()));
|
connect(cw, SIGNAL(settingsUpdated()), this, SLOT(updateSettings()));
|
||||||
}
|
}
|
||||||
|
|
||||||
void InstallTalkWindow::accept()
|
void InstallTalkWindow::accept()
|
||||||
|
|
@ -109,11 +109,11 @@ void InstallTalkWindow::accept()
|
||||||
void InstallTalkWindow::setSettings(RbSettings* sett)
|
void InstallTalkWindow::setSettings(RbSettings* sett)
|
||||||
{
|
{
|
||||||
settings = sett;
|
settings = sett;
|
||||||
settingsUpdated();
|
updateSettings();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void InstallTalkWindow::settingsUpdated(void)
|
void InstallTalkWindow::updateSettings(void)
|
||||||
{
|
{
|
||||||
QString ttsName = settings->curTTS();
|
QString ttsName = settings->curTTS();
|
||||||
TTSBase* tts = TTSBase::getTTS(ttsName);
|
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!"));
|
ui.labelEncProfile->setText(tr("Selected Encoder: <b>%1</b>").arg("Invalid encoder configuration!"));
|
||||||
|
|
||||||
setTalkFolder(settings->lastTalkedFolder());
|
setTalkFolder(settings->lastTalkedFolder());
|
||||||
|
emit settingsUpdated();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -41,6 +41,9 @@ class InstallTalkWindow : public QDialog
|
||||||
private slots:
|
private slots:
|
||||||
void browseFolder(void);
|
void browseFolder(void);
|
||||||
void setTalkFolder(QString folder);
|
void setTalkFolder(QString folder);
|
||||||
|
void updateSettings(void);
|
||||||
|
|
||||||
|
signals:
|
||||||
void settingsUpdated(void);
|
void settingsUpdated(void);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue