diff options
-rw-r--r-- | rbutil/rbutilqt/createvoicefrm.ui | 11 | ||||
-rw-r--r-- | rbutil/rbutilqt/createvoicewindow.cpp | 14 | ||||
-rw-r--r-- | rbutil/rbutilqt/installtalkfrm.ui | 11 | ||||
-rw-r--r-- | rbutil/rbutilqt/installtalkwindow.cpp | 14 |
4 files changed, 4 insertions, 46 deletions
diff --git a/rbutil/rbutilqt/createvoicefrm.ui b/rbutil/rbutilqt/createvoicefrm.ui index 96b16f6126..d361b9b250 100644 --- a/rbutil/rbutilqt/createvoicefrm.ui +++ b/rbutil/rbutilqt/createvoicefrm.ui | |||
@@ -56,20 +56,13 @@ | |||
56 | </property> | 56 | </property> |
57 | <layout class="QGridLayout" > | 57 | <layout class="QGridLayout" > |
58 | <item row="0" column="0" > | 58 | <item row="0" column="0" > |
59 | <widget class="QLabel" name="labelEncProfile" > | ||
60 | <property name="text" > | ||
61 | <string>Encoder profile:</string> | ||
62 | </property> | ||
63 | </widget> | ||
64 | </item> | ||
65 | <item row="1" column="0" > | ||
66 | <widget class="QLabel" name="labelTtsProfile" > | 59 | <widget class="QLabel" name="labelTtsProfile" > |
67 | <property name="text" > | 60 | <property name="text" > |
68 | <string>TTS profile:</string> | 61 | <string>TTS profile:</string> |
69 | </property> | 62 | </property> |
70 | </widget> | 63 | </widget> |
71 | </item> | 64 | </item> |
72 | <item row="2" column="0" > | 65 | <item row="0" column="1" > |
73 | <widget class="QPushButton" name="change" > | 66 | <widget class="QPushButton" name="change" > |
74 | <property name="sizePolicy" > | 67 | <property name="sizePolicy" > |
75 | <sizepolicy vsizetype="Minimum" hsizetype="Minimum" > | 68 | <sizepolicy vsizetype="Minimum" hsizetype="Minimum" > |
@@ -82,7 +75,7 @@ | |||
82 | </property> | 75 | </property> |
83 | </widget> | 76 | </widget> |
84 | </item> | 77 | </item> |
85 | <item row="2" column="1" > | 78 | <item row="1" column="1" > |
86 | <spacer> | 79 | <spacer> |
87 | <property name="orientation" > | 80 | <property name="orientation" > |
88 | <enum>Qt::Horizontal</enum> | 81 | <enum>Qt::Horizontal</enum> |
diff --git a/rbutil/rbutilqt/createvoicewindow.cpp b/rbutil/rbutilqt/createvoicewindow.cpp index a45425a0ef..abae0457b5 100644 --- a/rbutil/rbutilqt/createvoicewindow.cpp +++ b/rbutil/rbutilqt/createvoicewindow.cpp | |||
@@ -100,20 +100,6 @@ void CreateVoiceWindow::updateSettings(void) | |||
100 | ui.labelTtsProfile->setText(tr("Selected TTS engine: <b>%1</b>") | 100 | ui.labelTtsProfile->setText(tr("Selected TTS engine: <b>%1</b>") |
101 | .arg("Invalid TTS configuration!")); | 101 | .arg("Invalid TTS configuration!")); |
102 | 102 | ||
103 | QString encoder = SystemInfo::value(SystemInfo::CurEncoder).toString(); | ||
104 | // only proceed if encoder setting is set | ||
105 | EncoderBase* enc = EncoderBase::getEncoder(this,encoder); | ||
106 | if(enc != NULL) { | ||
107 | if(enc->configOk()) | ||
108 | ui.labelEncProfile->setText(tr("Selected encoder: <b>%1</b>") | ||
109 | .arg(EncoderBase::getEncoderName(encoder))); | ||
110 | else | ||
111 | ui.labelEncProfile->setText(tr("Selected encoder: <b>%1</b>") | ||
112 | .arg("Invalid encoder configuration!")); | ||
113 | } | ||
114 | else | ||
115 | ui.labelEncProfile->setText(tr("Selected encoder: <b>%1</b>") | ||
116 | .arg("Invalid encoder configuration!")); | ||
117 | ui.wavtrimthreshold->setValue(RbSettings::value(RbSettings::WavtrimThreshold).toInt()); | 103 | ui.wavtrimthreshold->setValue(RbSettings::value(RbSettings::WavtrimThreshold).toInt()); |
118 | emit settingsUpdated(); | 104 | emit settingsUpdated(); |
119 | } | 105 | } |
diff --git a/rbutil/rbutilqt/installtalkfrm.ui b/rbutil/rbutilqt/installtalkfrm.ui index 41eda68ae6..de9a199ac7 100644 --- a/rbutil/rbutilqt/installtalkfrm.ui +++ b/rbutil/rbutilqt/installtalkfrm.ui | |||
@@ -62,20 +62,13 @@ | |||
62 | </property> | 62 | </property> |
63 | <layout class="QGridLayout" name="gridLayout_3"> | 63 | <layout class="QGridLayout" name="gridLayout_3"> |
64 | <item row="0" column="0"> | 64 | <item row="0" column="0"> |
65 | <widget class="QLabel" name="labelEncProfile"> | ||
66 | <property name="text"> | ||
67 | <string>Encoder profile:</string> | ||
68 | </property> | ||
69 | </widget> | ||
70 | </item> | ||
71 | <item row="1" column="0"> | ||
72 | <widget class="QLabel" name="labelTtsProfile"> | 65 | <widget class="QLabel" name="labelTtsProfile"> |
73 | <property name="text"> | 66 | <property name="text"> |
74 | <string>TTS profile:</string> | 67 | <string>TTS profile:</string> |
75 | </property> | 68 | </property> |
76 | </widget> | 69 | </widget> |
77 | </item> | 70 | </item> |
78 | <item row="2" column="0"> | 71 | <item row="0" column="1"> |
79 | <widget class="QPushButton" name="change"> | 72 | <widget class="QPushButton" name="change"> |
80 | <property name="sizePolicy"> | 73 | <property name="sizePolicy"> |
81 | <sizepolicy hsizetype="Minimum" vsizetype="Minimum"> | 74 | <sizepolicy hsizetype="Minimum" vsizetype="Minimum"> |
@@ -88,7 +81,7 @@ | |||
88 | </property> | 81 | </property> |
89 | </widget> | 82 | </widget> |
90 | </item> | 83 | </item> |
91 | <item row="2" column="1"> | 84 | <item row="1" column="1"> |
92 | <spacer> | 85 | <spacer> |
93 | <property name="orientation"> | 86 | <property name="orientation"> |
94 | <enum>Qt::Horizontal</enum> | 87 | <enum>Qt::Horizontal</enum> |
diff --git a/rbutil/rbutilqt/installtalkwindow.cpp b/rbutil/rbutilqt/installtalkwindow.cpp index c751b3aad3..de723ae33e 100644 --- a/rbutil/rbutilqt/installtalkwindow.cpp +++ b/rbutil/rbutilqt/installtalkwindow.cpp | |||
@@ -125,20 +125,6 @@ void InstallTalkWindow::updateSettings(void) | |||
125 | ui.labelTtsProfile->setText(tr("Selected TTS engine: <b>%1</b>") | 125 | ui.labelTtsProfile->setText(tr("Selected TTS engine: <b>%1</b>") |
126 | .arg("Invalid TTS configuration!")); | 126 | .arg("Invalid TTS configuration!")); |
127 | 127 | ||
128 | QString encoder = SystemInfo::value(SystemInfo::CurEncoder).toString(); | ||
129 | EncoderBase* enc = EncoderBase::getEncoder(this,encoder); | ||
130 | if(enc != NULL) { | ||
131 | if(enc->configOk()) | ||
132 | ui.labelEncProfile->setText(tr("Selected encoder: <b>%1</b>") | ||
133 | .arg(EncoderBase::getEncoderName(encoder))); | ||
134 | else | ||
135 | ui.labelEncProfile->setText(tr("Selected encoder: <b>%1</b>") | ||
136 | .arg("Invalid encoder configuration!")); | ||
137 | } | ||
138 | else | ||
139 | ui.labelEncProfile->setText(tr("Selected encoder: <b>%1</b>") | ||
140 | .arg("Invalid encoder configuration!")); | ||
141 | |||
142 | ui.lineTalkFolder->setText( | 128 | ui.lineTalkFolder->setText( |
143 | RbSettings::value(RbSettings::LastTalkedFolder).toString()); | 129 | RbSettings::value(RbSettings::LastTalkedFolder).toString()); |
144 | emit settingsUpdated(); | 130 | emit settingsUpdated(); |