Completely rework the talk files window: move settings to configuration dialog and add configuration presets. Remove some old cruft from talkfile handling and rely on values from rbutil.ini. Autodetection of executables is missing.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14495 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 37 insertions, 97 deletions

diff --git a/rbutil/rbutilqt/installtalkfrm.ui b/rbutil/rbutilqt/installtalkfrm.ui
index d43326dd6e..ef1a997826 100644
--- a/rbutil/rbutilqt/installtalkfrm.ui
+++ b/rbutil/rbutilqt/installtalkfrm.ui
@@ -8,15 +8,15 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>681</width>
-    <height>516</height>
+    <width>600</width>
+    <height>450</height>
    </rect>
   </property>
   <property name="windowTitle" >
    <string>Install Talk Files</string>
   </property>
   <layout class="QGridLayout" >
-   <item rowspan="5" row="0" column="0" >
+   <item rowspan="6" row="0" column="0" >
     <widget class="QLabel" name="label" >
      <property name="text" >
       <string/>
@@ -29,17 +29,17 @@
      </property>
     </widget>
    </item>
-   <item row="0" column="1" colspan="5" >
+   <item row="0" column="1" colspan="3" >
     <widget class="QLabel" name="label_2" >
      <property name="text" >
       <string>Select the Folder to generate Talkfiles for.</string>
      </property>
     </widget>
    </item>
-   <item row="1" column="1" colspan="4" >
+   <item row="1" column="1" colspan="2" >
     <widget class="QLineEdit" name="lineTalkFolder" />
    </item>
-   <item row="1" column="5" >
+   <item row="1" column="3" >
     <widget class="QPushButton" name="buttonBrowse" >
      <property name="text" >
       <string>&amp;Browse</string>
@@ -49,134 +49,74 @@
      </property>
     </widget>
    </item>
-   <item row="2" column="1" colspan="5" >
-    <widget class="QGroupBox" name="groupBox" >
+   <item row="2" column="1" colspan="3" >
+    <widget class="QGroupBox" name="groupBox_2" >
      <property name="title" >
-      <string>TTS Engine</string>
+      <string>Generation settings</string>
      </property>
      <layout class="QGridLayout" >
-      <item row="0" column="0" colspan="2" >
-       <widget class="QLabel" name="label_3" >
-        <property name="text" >
-         <string>Select a TTS Engine</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0" colspan="2" >
-       <widget class="QComboBox" name="TTScbx" />
-      </item>
-      <item row="2" column="0" colspan="2" >
-       <widget class="QLabel" name="label_4" >
-        <property name="text" >
-         <string>Select the TTS executable in your Filesystem</string>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="0" >
-       <widget class="QLineEdit" name="TTSpath" />
-      </item>
-      <item row="3" column="1" >
-       <widget class="QPushButton" name="buttonBrowseTTS" >
+      <item row="0" column="0" >
+       <widget class="QLabel" name="labelEncProfile" >
         <property name="text" >
-         <string>Browse</string>
+         <string>Encoder profile:</string>
         </property>
        </widget>
       </item>
-      <item row="4" column="0" >
-       <widget class="QLabel" name="label_7" >
+      <item row="1" column="0" >
+       <widget class="QLabel" name="labelTtsProfile" >
         <property name="text" >
-         <string>TTS Options</string>
+         <string>TTS profile:</string>
         </property>
        </widget>
       </item>
-      <item row="5" column="0" colspan="2" >
-       <widget class="QLineEdit" name="TTSOptions" />
-      </item>
      </layout>
     </widget>
    </item>
-   <item row="3" column="1" colspan="5" >
-    <widget class="QGroupBox" name="groupBox_2" >
+   <item row="3" column="1" colspan="3" >
+    <widget class="QGroupBox" name="groupBox" >
      <property name="title" >
-      <string>Encoder Engine</string>
+      <string>Generation options</string>
      </property>
      <layout class="QGridLayout" >
-      <item row="0" column="0" colspan="2" >
-       <widget class="QLabel" name="label_5" >
+      <item row="0" column="0" >
+       <widget class="QCheckBox" name="OverwriteWav" >
         <property name="text" >
-         <string>Select an Encoder</string>
+         <string>Overwrite Wavefiles</string>
         </property>
        </widget>
       </item>
-      <item row="1" column="0" colspan="2" >
-       <widget class="QComboBox" name="Encodercbx" />
+      <item row="1" column="0" >
+       <widget class="QCheckBox" name="RemoveWav" >
+        <property name="text" >
+         <string>Remove Wavefiles</string>
+        </property>
+       </widget>
       </item>
-      <item row="2" column="0" colspan="2" >
-       <widget class="QLabel" name="label_6" >
+      <item row="2" column="0" >
+       <widget class="QCheckBox" name="recursive" >
         <property name="text" >
-         <string>Select the Encoder executable in your Filesystem</string>
+         <string>Run recursive</string>
         </property>
        </widget>
       </item>
       <item row="3" column="0" >
-       <widget class="QLineEdit" name="Encoderpath" />
-      </item>
-      <item row="3" column="1" >
-       <widget class="QPushButton" name="buttonBrowseEncoder" >
+       <widget class="QCheckBox" name="StripExtensions" >
         <property name="text" >
-         <string>Browse</string>
+         <string>Strip Extensions</string>
         </property>
        </widget>
       </item>
       <item row="4" column="0" >
-       <widget class="QLabel" name="label_8" >
+       <widget class="QCheckBox" name="OverwriteTalk" >
         <property name="text" >
-         <string>Encoder Options</string>
+         <string>Overwrite Talkfiles</string>
         </property>
        </widget>
       </item>
-      <item row="5" column="0" colspan="2" >
-       <widget class="QLineEdit" name="EncoderOptions" />
-      </item>
      </layout>
     </widget>
    </item>
-   <item row="4" column="1" >
-    <widget class="QCheckBox" name="OverwriteWav" >
-     <property name="text" >
-      <string>Overwrite Wavefiles</string>
-     </property>
-    </widget>
-   </item>
    <item row="4" column="2" >
-    <widget class="QCheckBox" name="RemoveWav" >
-     <property name="text" >
-      <string>Remove Wavefiles</string>
-     </property>
-    </widget>
-   </item>
-   <item row="4" column="3" colspan="2" >
-    <widget class="QCheckBox" name="recursive" >
-     <property name="text" >
-      <string>Run recursive</string>
-     </property>
-    </widget>
-   </item>
-   <item row="5" column="1" >
-    <widget class="QCheckBox" name="OverwriteTalk" >
-     <property name="text" >
-      <string>Overwrite Talkfiles</string>
-     </property>
-    </widget>
-   </item>
-   <item row="5" column="2" >
-    <widget class="QCheckBox" name="StripExtensions" >
-     <property name="text" >
-      <string>Strip Extensions</string>
-     </property>
-    </widget>
-   </item>
-   <item row="5" column="4" >
     <spacer>
      <property name="orientation" >
       <enum>Qt::Vertical</enum>
@@ -184,12 +124,12 @@
      <property name="sizeHint" >
       <size>
        <width>20</width>
-       <height>111</height>
+       <height>40</height>
       </size>
      </property>
     </spacer>
    </item>
-   <item row="6" column="1" colspan="3" >
+   <item row="5" column="1" >
     <spacer>
      <property name="orientation" >
       <enum>Qt::Horizontal</enum>
@@ -202,7 +142,7 @@
      </property>
     </spacer>
    </item>
-   <item row="6" column="4" colspan="2" >
+   <item row="5" column="2" colspan="2" >
     <layout class="QHBoxLayout" >
      <item>
       <widget class="QPushButton" name="buttonOk" >