rbutil: correct some UI texts, and made the rbspeex config dialog a bit nicer.

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

2 files changed, 82 insertions, 75 deletions

diff --git a/rbutil/rbutilqt/rbspeexcfgfrm.ui b/rbutil/rbutilqt/rbspeexcfgfrm.ui
index c4942184bb..d7f6c4801f 100644
--- a/rbutil/rbutilqt/rbspeexcfgfrm.ui
+++ b/rbutil/rbutilqt/rbspeexcfgfrm.ui
@@ -14,80 +14,89 @@
   </property>
   <layout class="QGridLayout" >
    <item row="0" column="0" colspan="4" >
-    <widget class="QLabel" name="labelTitle" >
-     <property name="text" >
+    <widget class="QGroupBox" name="groupBox" >
+     <property name="title" >
       <string>Configure RbSpeex Encoder</string>
      </property>
+     <layout class="QGridLayout" >
+      <item row="0" column="0" >
+       <widget class="QDoubleSpinBox" name="volume" >
+        <property name="maximum" >
+         <double>10.000000000000000</double>
+        </property>
+        <property name="singleStep" >
+         <double>0.010000000000000</double>
+        </property>
+        <property name="value" >
+         <double>1.000000000000000</double>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1" >
+       <widget class="QLabel" name="label_2" >
+        <property name="text" >
+         <string>Volume</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2" >
+       <widget class="QCheckBox" name="narrowband" >
+        <property name="text" >
+         <string>Narrowband</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" >
+       <widget class="QDoubleSpinBox" name="quality" >
+        <property name="decimals" >
+         <number>1</number>
+        </property>
+        <property name="maximum" >
+         <double>10.000000000000000</double>
+        </property>
+        <property name="singleStep" >
+         <double>1.000000000000000</double>
+        </property>
+        <property name="value" >
+         <double>8.000000000000000</double>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1" colspan="2" >
+       <widget class="QLabel" name="label" >
+        <property name="text" >
+         <string>Quality</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0" >
+       <widget class="QSpinBox" name="complexity" >
+        <property name="maximum" >
+         <number>10</number>
+        </property>
+        <property name="value" >
+         <number>10</number>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1" colspan="2" >
+       <widget class="QLabel" name="label_3" >
+        <property name="text" >
+         <string>Complexity</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
     </widget>
    </item>
    <item row="1" column="0" >
-    <widget class="QDoubleSpinBox" name="volume" >
-     <property name="maximum" >
-      <double>10.000000000000000</double>
-     </property>
-     <property name="singleStep" >
-      <double>0.010000000000000</double>
-     </property>
-     <property name="value" >
-      <double>1.000000000000000</double>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="1" >
-    <widget class="QLabel" name="label_2" >
-     <property name="text" >
-      <string>Volume</string>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="2" colspan="2" >
-    <widget class="QCheckBox" name="narrowband" >
-     <property name="text" >
-      <string>Narrowband</string>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="0" >
-    <widget class="QDoubleSpinBox" name="quality" >
-     <property name="decimals" >
-      <number>1</number>
-     </property>
-     <property name="maximum" >
-      <double>10.000000000000000</double>
-     </property>
-     <property name="singleStep" >
-      <double>1.000000000000000</double>
-     </property>
-     <property name="value" >
-      <double>8.000000000000000</double>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="1" >
-    <widget class="QLabel" name="label" >
-     <property name="text" >
-      <string>Quality</string>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="0" >
-    <widget class="QSpinBox" name="complexity" >
-     <property name="maximum" >
-      <number>10</number>
-     </property>
-     <property name="value" >
-      <number>10</number>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="1" >
-    <widget class="QLabel" name="label_3" >
+    <widget class="QPushButton" name="reset" >
      <property name="text" >
-      <string>Complexity</string>
+      <string>Reset</string>
      </property>
     </widget>
    </item>
-   <item row="4" column="1" >
+   <item row="1" column="1" >
     <spacer>
      <property name="orientation" >
       <enum>Qt::Horizontal</enum>
@@ -100,7 +109,7 @@
      </property>
     </spacer>
    </item>
-   <item row="4" column="2" >
+   <item row="1" column="2" >
     <widget class="QPushButton" name="buttonOk" >
      <property name="text" >
       <string>&amp;Ok</string>
@@ -110,7 +119,7 @@
      </property>
     </widget>
    </item>
-   <item row="4" column="3" >
+   <item row="1" column="3" >
     <widget class="QPushButton" name="buttonCancel" >
      <property name="text" >
       <string>&amp;Cancel</string>
@@ -120,13 +129,6 @@
      </property>
     </widget>
    </item>
-   <item row="4" column="0" >
-    <widget class="QPushButton" name="reset" >
-     <property name="text" >
-      <string>Reset</string>
-     </property>
-    </widget>
-   </item>
   </layout>
  </widget>
  <resources>
diff --git a/rbutil/rbutilqt/rbutilqtfrm.ui b/rbutil/rbutilqt/rbutilqtfrm.ui
index 2eec1be54c..590a904a61 100644
--- a/rbutil/rbutilqt/rbutilqtfrm.ui
+++ b/rbutil/rbutilqt/rbutilqtfrm.ui
@@ -555,7 +555,7 @@ p, li { white-space: pre-wrap; }
         <item row="1" column="0" >
          <widget class="QToolButton" name="buttonCreateVoice" >
           <property name="text" >
-           <string>Install Voice files</string>
+           <string>Create Voice files</string>
           </property>
           <property name="icon" >
            <iconset resource="rbutilqt.qrc" >:/icons/icons/talkfile_btn.png</iconset>
@@ -1080,6 +1080,11 @@ e File</string>
   <tabstop>radioPdf</tabstop>
   <tabstop>radioHtmlzip</tabstop>
   <tabstop>buttonDownloadManual</tabstop>
+  <tabstop>buttonChangeDevice</tabstop>
+  <tabstop>buttonVoice</tabstop>
+  <tabstop>buttonCreateVoice</tabstop>
+  <tabstop>buttonTalk</tabstop>
+  <tabstop>treeInfo</tabstop>
  </tabstops>
  <resources>
   <include location="rbutilqt.qrc" />