2 files changed, 89 insertions, 6 deletions

diff --git a/rbutil/rbutilqt/rbutil.ini b/rbutil/rbutilqt/rbutil.ini
index 4052ef45e5..5e8b61bf72 100644
--- a/rbutil/rbutilqt/rbutil.ini
+++ b/rbutil/rbutilqt/rbutil.ini
@@ -11,6 +11,7 @@ bootloader_url=http://download.rockbox.org/bootloader
 themes_url=http://www.rockbox-themes.org/
 manual_url=http://download.rockbox.org/manual
 doom_url=http://download.rockbox.org/useful/rockdoom.zip
+voice_url=http://www.rockbox.org/voices/
 
 [platforms]
 platform01=player
@@ -354,4 +355,5 @@ template = "\"%exe\" %options -w \"%wavfile\" \"%text\""
 
 [flite]
 options = ""
-template = "\"%exe\" %options -o \"%wavfile\" \"%text\""
\ No newline at end of file
+template = "\"%exe\" %options -o \"%wavfile\" \"%text\""
+
diff --git a/rbutil/rbutilqt/rbutilqtfrm.ui b/rbutil/rbutilqt/rbutilqtfrm.ui
index afa3bb0e76..927cc19810 100644
--- a/rbutil/rbutilqt/rbutilqtfrm.ui
+++ b/rbutil/rbutilqt/rbutilqtfrm.ui
@@ -130,12 +130,15 @@ p, li { white-space: pre-wrap; }
     <item row="2" column="0" >
      <widget class="QTabWidget" name="tabWidget" >
       <property name="currentIndex" >
-       <number>2</number>
+       <number>0</number>
       </property>
       <widget class="QWidget" name="quickStart" >
        <attribute name="title" >
         <string>&amp;Quick Start</string>
        </attribute>
+       <attribute name="toolTip" >
+        <string>Welcome</string>
+       </attribute>
        <layout class="QGridLayout" >
         <item row="0" column="0" >
          <widget class="QToolButton" name="buttonComplete" >
@@ -238,6 +241,9 @@ p, li { white-space: pre-wrap; }
        <attribute name="title" >
         <string>&amp;Installation</string>
        </attribute>
+       <attribute name="toolTip" >
+        <string>Basic Rockbox installation</string>
+       </attribute>
        <layout class="QGridLayout" >
         <item row="0" column="0" >
          <widget class="QToolButton" name="buttonBootloader" >
@@ -345,6 +351,9 @@ p, li { white-space: pre-wrap; }
        <attribute name="title" >
         <string>&amp;Extras</string>
        </attribute>
+       <attribute name="toolTip" >
+        <string>Install extras for Rockbox</string>
+       </attribute>
        <layout class="QGridLayout" >
         <item row="0" column="0" >
          <widget class="QToolButton" name="buttonFonts" >
@@ -462,7 +471,47 @@ p, li { white-space: pre-wrap; }
           </property>
          </spacer>
         </item>
-        <item row="3" column="0" >
+       </layout>
+      </widget>
+      <widget class="QWidget" name="accessibility" >
+       <attribute name="title" >
+        <string>&amp;Accessibility</string>
+       </attribute>
+       <attribute name="toolTip" >
+        <string>Install accessibility add-ons</string>
+       </attribute>
+       <layout class="QGridLayout" >
+        <item row="0" column="0" >
+         <widget class="QToolButton" name="buttonVoice" >
+          <property name="text" >
+           <string>Install Voice files</string>
+          </property>
+          <property name="icon" >
+           <iconset resource="rbutilqt.qrc" >:/icons/icons/talkfile_btn.png</iconset>
+          </property>
+          <property name="iconSize" >
+           <size>
+            <width>56</width>
+            <height>46</height>
+           </size>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="1" >
+         <widget class="QLabel" name="labelVoice" >
+          <property name="text" >
+           <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
+p, li { white-space: pre-wrap; }
+&lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;">
+&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;span style=" font-weight:600;">Install Voice file&lt;/span>&lt;/p>
+&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Voice files are needed to make Rockbox speak the user interface. Speaking is enabled by default, so if you installed the voice file Rockbox will speak.&lt;/p>&lt;/body>&lt;/html></string>
+          </property>
+          <property name="wordWrap" >
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="0" >
          <widget class="QToolButton" name="buttonTalk" >
           <property name="text" >
            <string>Install Talk files</string>
@@ -478,8 +527,8 @@ p, li { white-space: pre-wrap; }
           </property>
          </widget>
         </item>
-        <item row="3" column="1" >
-         <widget class="QLabel" name="label" >
+        <item row="1" column="1" >
+         <widget class="QLabel" name="labelTalk" >
           <property name="text" >
            <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
 p, li { white-space: pre-wrap; }
@@ -489,12 +538,41 @@ p, li { white-space: pre-wrap; }
           </property>
          </widget>
         </item>
+        <item row="2" column="0" >
+         <spacer>
+          <property name="orientation" >
+           <enum>Qt::Vertical</enum>
+          </property>
+          <property name="sizeHint" >
+           <size>
+            <width>20</width>
+            <height>51</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item row="2" column="1" >
+         <spacer>
+          <property name="orientation" >
+           <enum>Qt::Vertical</enum>
+          </property>
+          <property name="sizeHint" >
+           <size>
+            <width>20</width>
+            <height>51</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
        </layout>
       </widget>
       <widget class="QWidget" name="uninstall" >
        <attribute name="title" >
         <string>&amp;Uninstallation</string>
        </attribute>
+       <attribute name="toolTip" >
+        <string>Uninstall Rockbox</string>
+       </attribute>
        <layout class="QGridLayout" >
         <item row="0" column="0" >
          <widget class="QToolButton" name="buttonRemoveBootloader" >
@@ -594,6 +672,9 @@ p, li { white-space: pre-wrap; }
        <attribute name="title" >
         <string>&amp;Manual</string>
        </attribute>
+       <attribute name="toolTip" >
+        <string>View and download the manual</string>
+       </attribute>
        <layout class="QGridLayout" >
         <item row="0" column="0" >
          <widget class="QGroupBox" name="groupBox_2" >
@@ -702,7 +783,7 @@ p, li { white-space: pre-wrap; }
      <x>0</x>
      <y>0</y>
      <width>600</width>
-     <height>21</height>
+     <height>29</height>
     </rect>
    </property>
    <widget class="QMenu" name="menu_File" >