rbutil: improve talkfile generation. remove the options to keep and overwrite the wavfiles.

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

1 files changed, 23 insertions, 35 deletions

diff --git a/rbutil/rbutilqt/installtalkfrm.ui b/rbutil/rbutilqt/installtalkfrm.ui
index 5a899f8c74..9e183e15a9 100644
--- a/rbutil/rbutilqt/installtalkfrm.ui
+++ b/rbutil/rbutilqt/installtalkfrm.ui
@@ -15,7 +15,7 @@
   <property name="windowTitle" >
    <string>Install Talk Files</string>
   </property>
-  <layout class="QGridLayout" >
+  <layout class="QGridLayout" name="gridLayout_2" >
    <item rowspan="6" row="0" column="0" >
     <widget class="QLabel" name="label" >
      <property name="text" >
@@ -45,7 +45,8 @@
       <string>&amp;Browse</string>
      </property>
      <property name="icon" >
-      <iconset resource="rbutilqt.qrc" >:/icons/system-search.png</iconset>
+      <iconset resource="rbutilqt.qrc" >
+       <normaloff>:/icons/system-search.png</normaloff>:/icons/system-search.png</iconset>
      </property>
     </widget>
    </item>
@@ -87,7 +88,7 @@
         <property name="orientation" >
          <enum>Qt::Horizontal</enum>
         </property>
-        <property name="sizeHint" >
+        <property name="sizeHint" stdset="0" >
          <size>
           <width>40</width>
           <height>20</height>
@@ -103,28 +104,8 @@
      <property name="title" >
       <string>Generation options</string>
      </property>
-     <layout class="QGridLayout" >
-      <item row="2" column="0" >
-       <widget class="QCheckBox" name="OverwriteWav" >
-        <property name="text" >
-         <string>Overwrite Wavefiles</string>
-        </property>
-        <property name="checked" >
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="0" >
-       <widget class="QCheckBox" name="RemoveWav" >
-        <property name="text" >
-         <string>Remove Wavefiles</string>
-        </property>
-        <property name="checked" >
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="0" >
+     <layout class="QGridLayout" name="gridLayout" >
+      <item row="2" column="0" colspan="2" >
        <widget class="QCheckBox" name="recursive" >
         <property name="text" >
          <string>Run recursive</string>
@@ -134,7 +115,7 @@
         </property>
        </widget>
       </item>
-      <item row="5" column="0" >
+      <item row="3" column="0" colspan="2" >
        <widget class="QCheckBox" name="StripExtensions" >
         <property name="text" >
          <string>Strip Extensions</string>
@@ -144,7 +125,7 @@
         </property>
        </widget>
       </item>
-      <item row="6" column="0" >
+      <item row="4" column="0" colspan="2" >
        <widget class="QCheckBox" name="OverwriteTalk" >
         <property name="text" >
          <string>Overwrite Talkfiles</string>
@@ -154,7 +135,7 @@
         </property>
        </widget>
       </item>
-      <item row="1" column="0" >
+      <item row="1" column="0" colspan="2" >
        <widget class="QCheckBox" name="talkFolders" >
         <property name="text" >
          <string>Generate .talk files for Folders</string>
@@ -164,7 +145,7 @@
         </property>
        </widget>
       </item>
-      <item row="0" column="0" >
+      <item row="0" column="0" colspan="2" >
        <widget class="QCheckBox" name="talkFiles" >
         <property name="text" >
          <string>Generate .talk files for Files</string>
@@ -178,6 +159,13 @@
        </widget>
       </item>
      </layout>
+     <zorder>recursive</zorder>
+     <zorder>StripExtensions</zorder>
+     <zorder>OverwriteTalk</zorder>
+     <zorder>talkFolders</zorder>
+     <zorder>talkFiles</zorder>
+     <zorder>label_3</zorder>
+     <zorder>fileFilter</zorder>
     </widget>
    </item>
    <item row="4" column="2" >
@@ -185,7 +173,7 @@
      <property name="orientation" >
       <enum>Qt::Vertical</enum>
      </property>
-     <property name="sizeHint" >
+     <property name="sizeHint" stdset="0" >
       <size>
        <width>20</width>
        <height>40</height>
@@ -198,7 +186,7 @@
      <property name="orientation" >
       <enum>Qt::Horizontal</enum>
      </property>
-     <property name="sizeHint" >
+     <property name="sizeHint" stdset="0" >
       <size>
        <width>40</width>
        <height>20</height>
@@ -214,7 +202,8 @@
         <string>&amp;Install</string>
        </property>
        <property name="icon" >
-        <iconset resource="rbutilqt.qrc" >:/icons/go-next.png</iconset>
+        <iconset resource="rbutilqt.qrc" >
+         <normaloff>:/icons/go-next.png</normaloff>:/icons/go-next.png</iconset>
        </property>
       </widget>
      </item>
@@ -224,7 +213,8 @@
         <string>&amp;Cancel</string>
        </property>
        <property name="icon" >
-        <iconset resource="rbutilqt.qrc" >:/icons/process-stop.png</iconset>
+        <iconset resource="rbutilqt.qrc" >
+         <normaloff>:/icons/process-stop.png</normaloff>:/icons/process-stop.png</iconset>
        </property>
       </widget>
      </item>
@@ -238,8 +228,6 @@
   <tabstop>change</tabstop>
   <tabstop>talkFiles</tabstop>
   <tabstop>talkFolders</tabstop>
-  <tabstop>OverwriteWav</tabstop>
-  <tabstop>RemoveWav</tabstop>
   <tabstop>recursive</tabstop>
   <tabstop>StripExtensions</tabstop>
   <tabstop>OverwriteTalk</tabstop>