devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Remove encoder display from voice / talk dialogs.

Browse source 
The encoder is fixed depending on the selected target, so there is no real
benefit in displaying it in voice and talkfile generation dialogs.

Change-Id: I1389800d04fcdac558b243368acfee6b1b64afc9
This commit is contained in:
Dominik Riebeling 2012-06-12 23:35:16 +02:00
parent 4ea3f9ff2a
commit 47ea5b65b2
4 changed files with 4 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

11
rbutil/rbutilqt/createvoicefrm.ui
View file

@ -56,20 +56,13 @@
</property> </property>
<layout class="QGridLayout" > <layout class="QGridLayout" >
<item row="0" column="0" > <item row="0" column="0" >
<widget class="QLabel" name="labelEncProfile" >
<property name="text" >
<string>Encoder profile:</string>
</property>
</widget>
</item>
<item row="1" column="0" >
<widget class="QLabel" name="labelTtsProfile" > <widget class="QLabel" name="labelTtsProfile" >
<property name="text" > <property name="text" >
<string>TTS profile:</string> <string>TTS profile:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0" > <item row="0" column="1" >
<widget class="QPushButton" name="change" > <widget class="QPushButton" name="change" >
<property name="sizePolicy" > <property name="sizePolicy" >
<sizepolicy vsizetype="Minimum" hsizetype="Minimum" > <sizepolicy vsizetype="Minimum" hsizetype="Minimum" >
@ -82,7 +75,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1" > <item row="1" column="1" >
<spacer> <spacer>
<property name="orientation" > <property name="orientation" >
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>

14
rbutil/rbutilqt/createvoicewindow.cpp
View file

@ -100,20 +100,6 @@ void CreateVoiceWindow::updateSettings(void)
ui.labelTtsProfile->setText(tr("Selected TTS engine: <b>%1</b>") ui.labelTtsProfile->setText(tr("Selected TTS engine: <b>%1</b>")
.arg("Invalid TTS configuration!")); .arg("Invalid TTS configuration!"));
QString encoder = SystemInfo::value(SystemInfo::CurEncoder).toString();
// only proceed if encoder setting is set
EncoderBase* enc = EncoderBase::getEncoder(this,encoder);
if(enc != NULL) {
if(enc->configOk())
ui.labelEncProfile->setText(tr("Selected encoder: <b>%1</b>")
.arg(EncoderBase::getEncoderName(encoder)));
else
ui.labelEncProfile->setText(tr("Selected encoder: <b>%1</b>")
.arg("Invalid encoder configuration!"));
}
else
ui.labelEncProfile->setText(tr("Selected encoder: <b>%1</b>")
.arg("Invalid encoder configuration!"));
ui.wavtrimthreshold->setValue(RbSettings::value(RbSettings::WavtrimThreshold).toInt()); ui.wavtrimthreshold->setValue(RbSettings::value(RbSettings::WavtrimThreshold).toInt());
emit settingsUpdated(); emit settingsUpdated();
} }

11
rbutil/rbutilqt/installtalkfrm.ui
View file

@ -62,20 +62,13 @@
</property> </property>
<layout class="QGridLayout" name="gridLayout_3"> <layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="labelEncProfile">
<property name="text">
<string>Encoder profile:</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="labelTtsProfile"> <widget class="QLabel" name="labelTtsProfile">
<property name="text"> <property name="text">
<string>TTS profile:</string> <string>TTS profile:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0"> <item row="0" column="1">
<widget class="QPushButton" name="change"> <widget class="QPushButton" name="change">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Minimum"> <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
@ -88,7 +81,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1"> <item row="1" column="1">
<spacer> <spacer>
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>

14
rbutil/rbutilqt/installtalkwindow.cpp
View file

@ -125,20 +125,6 @@ void InstallTalkWindow::updateSettings(void)
ui.labelTtsProfile->setText(tr("Selected TTS engine: <b>%1</b>") ui.labelTtsProfile->setText(tr("Selected TTS engine: <b>%1</b>")
.arg("Invalid TTS configuration!")); .arg("Invalid TTS configuration!"));
QString encoder = SystemInfo::value(SystemInfo::CurEncoder).toString();
EncoderBase* enc = EncoderBase::getEncoder(this,encoder);
if(enc != NULL) {
if(enc->configOk())
ui.labelEncProfile->setText(tr("Selected encoder: <b>%1</b>")
.arg(EncoderBase::getEncoderName(encoder)));
else
ui.labelEncProfile->setText(tr("Selected encoder: <b>%1</b>")
.arg("Invalid encoder configuration!"));
}
else
ui.labelEncProfile->setText(tr("Selected encoder: <b>%1</b>")
.arg("Invalid encoder configuration!"));
ui.lineTalkFolder->setText( ui.lineTalkFolder->setText(
RbSettings::value(RbSettings::LastTalkedFolder).toString()); RbSettings::value(RbSettings::LastTalkedFolder).toString());
emit settingsUpdated(); emit settingsUpdated();