Move device and mountpoint selection to configuration to eliminate the need of asking for the mountpoint in every installation window. Use a QListWidget to make the devices list nicer. Remove scrobbler settings as this will most likely get implemented as plugin.

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

1 files changed, 76 insertions, 66 deletions

diff --git a/rbutil/rbutilqt/configurefrm.ui b/rbutil/rbutilqt/configurefrm.ui
index 8310c71ae7..da0a1c1574 100644
--- a/rbutil/rbutilqt/configurefrm.ui
+++ b/rbutil/rbutilqt/configurefrm.ui
@@ -5,8 +5,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>476</width>
-    <height>384</height>
+    <width>500</width>
+    <height>400</height>
    </rect>
   </property>
   <property name="windowTitle" >
@@ -58,6 +58,79 @@
      <property name="currentIndex" >
       <number>0</number>
      </property>
+     <widget class="QWidget" name="tabDevice" >
+      <attribute name="title" >
+       <string>&amp;Device</string>
+      </attribute>
+      <layout class="QGridLayout" >
+       <item row="0" column="0" >
+        <widget class="QLabel" name="labelMountPoint" >
+         <property name="text" >
+          <string>Select your device in the &amp;filesystem</string>
+         </property>
+         <property name="buddy" >
+          <cstring>mountPoint</cstring>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="0" colspan="2" >
+        <layout class="QHBoxLayout" >
+         <item>
+          <widget class="QLineEdit" name="mountPoint" />
+         </item>
+         <item>
+          <widget class="QPushButton" name="browseMountPoint" >
+           <property name="text" >
+            <string>&amp;Browse</string>
+           </property>
+           <property name="icon" >
+            <iconset resource="rbutilqt.qrc" >:/icons/icons/system-search.png</iconset>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item row="2" column="0" >
+        <widget class="QLabel" name="labelPlayer" >
+         <property name="text" >
+          <string>&amp;Select your audio player</string>
+         </property>
+         <property name="buddy" >
+          <cstring>treeDevices</cstring>
+         </property>
+        </widget>
+       </item>
+       <item row="3" column="0" colspan="2" >
+        <widget class="QTreeWidget" name="treeDevices" >
+         <column>
+          <property name="text" >
+           <string>1</string>
+          </property>
+         </column>
+        </widget>
+       </item>
+       <item row="4" column="0" >
+        <spacer>
+         <property name="orientation" >
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" >
+          <size>
+           <width>40</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item row="4" column="1" >
+        <widget class="QPushButton" name="buttonAutodetect" >
+         <property name="text" >
+          <string>&amp;Autodetect</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </widget>
      <widget class="QWidget" name="tabProxy" >
       <attribute name="title" >
        <string>&amp;Proxy</string>
@@ -183,7 +256,7 @@
      </widget>
      <widget class="QWidget" name="tabCache" >
       <attribute name="title" >
-       <string>C&amp;ache</string>
+       <string>Cac&amp;he</string>
       </attribute>
       <attribute name="toolTip" >
        <string>Download cache settings</string>
@@ -286,69 +359,6 @@
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="tabScrobbler" >
-      <attribute name="title" >
-       <string>&amp;Scrobbler</string>
-      </attribute>
-      <layout class="QGridLayout" >
-       <item row="0" column="0" >
-        <widget class="QLabel" name="label_8" >
-         <property name="text" >
-          <string>&amp;Username</string>
-         </property>
-         <property name="buddy" >
-          <cstring>scrobblerUser</cstring>
-         </property>
-        </widget>
-       </item>
-       <item row="0" column="1" >
-        <widget class="QLineEdit" name="scrobblerUser" />
-       </item>
-       <item row="1" column="0" >
-        <widget class="QLabel" name="label_9" >
-         <property name="text" >
-          <string>P&amp;assword</string>
-         </property>
-         <property name="buddy" >
-          <cstring>scrobblerPass</cstring>
-         </property>
-        </widget>
-       </item>
-       <item row="1" column="1" >
-        <widget class="QLineEdit" name="scrobblerPass" >
-         <property name="echoMode" >
-          <enum>QLineEdit::Password</enum>
-         </property>
-        </widget>
-       </item>
-       <item row="2" column="0" >
-        <widget class="QLabel" name="label_10" >
-         <property name="text" >
-          <string>&amp;Timezone</string>
-         </property>
-         <property name="buddy" >
-          <cstring>scrobblerTimezone</cstring>
-         </property>
-        </widget>
-       </item>
-       <item row="2" column="1" >
-        <widget class="QComboBox" name="scrobblerTimezone" />
-       </item>
-       <item row="4" column="1" >
-        <spacer>
-         <property name="orientation" >
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" >
-          <size>
-           <width>20</width>
-           <height>40</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-      </layout>
-     </widget>
     </widget>
    </item>
   </layout>