From 47ea5b65b28dcc95e4fe06b1a88bd70a2d1bb06b Mon Sep 17 00:00:00 2001
From: Dominik Riebeling <Dominik.Riebeling@gmail.com>
Date: Tue, 12 Jun 2012 23:35:16 +0200
Subject: [PATCH] Remove encoder display from voice / talk dialogs.

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
---
 rbutil/rbutilqt/createvoicefrm.ui     | 11 ++---------
 rbutil/rbutilqt/createvoicewindow.cpp | 14 --------------
 rbutil/rbutilqt/installtalkfrm.ui     | 11 ++---------
 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 @@
      </property>
      <layout class="QGridLayout" >
       <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" >
         <property name="text" >
          <string>TTS profile:</string>
         </property>
        </widget>
       </item>
-      <item row="2" column="0" >
+      <item row="0" column="1" >
        <widget class="QPushButton" name="change" >
         <property name="sizePolicy" >
          <sizepolicy vsizetype="Minimum" hsizetype="Minimum" >
@@ -82,7 +75,7 @@
         </property>
        </widget>
       </item>
-      <item row="2" column="1" >
+      <item row="1" column="1" >
        <spacer>
         <property name="orientation" >
          <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)
         ui.labelTtsProfile->setText(tr("Selected TTS engine: <b>%1</b>")
             .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());
     emit settingsUpdated();
 }
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 @@
      </property>
      <layout class="QGridLayout" name="gridLayout_3">
       <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">
         <property name="text">
          <string>TTS profile:</string>
         </property>
        </widget>
       </item>
-      <item row="2" column="0">
+      <item row="0" column="1">
        <widget class="QPushButton" name="change">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
@@ -88,7 +81,7 @@
         </property>
        </widget>
       </item>
-      <item row="2" column="1">
+      <item row="1" column="1">
        <spacer>
         <property name="orientation">
          <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)
         ui.labelTtsProfile->setText(tr("Selected TTS engine: <b>%1</b>")
             .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(
             RbSettings::value(RbSettings::LastTalkedFolder).toString());
     emit settingsUpdated();