Add some more icons to a few dialogs and fix visual glitches.

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

3 files changed, 198 insertions, 96 deletions

diff --git a/rbutil/rbutilqt/installbootloaderfrm.ui b/rbutil/rbutilqt/installbootloaderfrm.ui
index ebca708cc6..b34b664d43 100644
--- a/rbutil/rbutilqt/installbootloaderfrm.ui
+++ b/rbutil/rbutilqt/installbootloaderfrm.ui
@@ -8,15 +8,15 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>665</width>
-    <height>499</height>
+    <width>600</width>
+    <height>450</height>
    </rect>
   </property>
   <property name="windowTitle" >
    <string>Install Bootloader</string>
   </property>
   <layout class="QGridLayout" >
-   <item rowspan="8" row="0" column="0" >
+   <item rowspan="6" row="0" column="0" >
     <widget class="QLabel" name="label" >
      <property name="text" >
       <string/>
@@ -24,6 +24,9 @@
      <property name="pixmap" >
       <pixmap resource="rbutilqt.qrc" >:/icons/icons/wizard.xpm</pixmap>
      </property>
+     <property name="alignment" >
+      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+     </property>
     </widget>
    </item>
    <item row="0" column="1" colspan="3" >
@@ -37,36 +40,23 @@
     <widget class="QLineEdit" name="lineMountPoint" />
    </item>
    <item row="1" column="3" >
-    <widget class="QToolButton" name="buttonBrowse" >
+    <widget class="QPushButton" name="buttonBrowse" >
      <property name="text" >
       <string>&amp;Browse</string>
      </property>
-    </widget>
-   </item>
-   <item row="9" column="2" colspan="2" >
-    <widget class="QDialogButtonBox" name="buttonBox" >
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="standardButtons" >
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
+     <property name="icon" >
+      <iconset resource="rbutilqt.qrc" >:/icons/icons/system-search.png</iconset>
      </property>
     </widget>
    </item>
-   <item rowspan="4" row="4" column="1" colspan="3" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" >
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
+   <item row="2" column="1" colspan="3" >
+    <widget class="QLabel" name="label_3" >
+     <property name="text" >
+      <string>Download and select an original Firmware</string>
      </property>
-    </spacer>
+    </widget>
    </item>
-   <item row="3" column="1" >
+   <item row="3" column="1" colspan="2" >
     <widget class="QLineEdit" name="lineOriginalFirmware" >
      <property name="sizePolicy" >
       <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
@@ -82,19 +72,65 @@
      </property>
     </widget>
    </item>
-   <item row="2" column="1" >
-    <widget class="QLabel" name="label_3" >
+   <item row="3" column="3" >
+    <widget class="QPushButton" name="buttonBrowseOF" >
      <property name="text" >
-      <string>Download and select an original Firmware</string>
+      <string>&amp;Browse</string>
+     </property>
+     <property name="icon" >
+      <iconset resource="rbutilqt.qrc" >:/icons/icons/system-search.png</iconset>
      </property>
     </widget>
    </item>
-   <item row="3" column="2" >
-    <widget class="QToolButton" name="buttonBrowseOF" >
-     <property name="text" >
-      <string>Browse</string>
+   <item row="4" column="2" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
      </property>
-    </widget>
+     <property name="sizeHint" >
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="5" column="1" >
+    <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="5" column="2" colspan="2" >
+    <layout class="QHBoxLayout" >
+     <item>
+      <widget class="QPushButton" name="buttonOk_2" >
+       <property name="text" >
+        <string>&amp;Ok</string>
+       </property>
+       <property name="icon" >
+        <iconset resource="rbutilqt.qrc" >:/icons/icons/go-next.png</iconset>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="buttonCancel_2" >
+       <property name="text" >
+        <string>&amp;Cancel</string>
+       </property>
+       <property name="icon" >
+        <iconset resource="rbutilqt.qrc" >:/icons/icons/process-stop.png</iconset>
+       </property>
+      </widget>
+     </item>
+    </layout>
    </item>
   </layout>
  </widget>
@@ -103,34 +139,34 @@
  </resources>
  <connections>
   <connection>
-   <sender>buttonBox</sender>
-   <signal>accepted()</signal>
+   <sender>buttonOk_2</sender>
+   <signal>clicked()</signal>
    <receiver>InstallBootloaderFrm</receiver>
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel" >
-     <x>248</x>
-     <y>254</y>
+     <x>476</x>
+     <y>425</y>
     </hint>
     <hint type="destinationlabel" >
-     <x>157</x>
-     <y>274</y>
+     <x>531</x>
+     <y>317</y>
     </hint>
    </hints>
   </connection>
   <connection>
-   <sender>buttonBox</sender>
-   <signal>rejected()</signal>
+   <sender>buttonCancel_2</sender>
+   <signal>clicked()</signal>
    <receiver>InstallBootloaderFrm</receiver>
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel" >
-     <x>316</x>
-     <y>260</y>
+     <x>556</x>
+     <y>428</y>
     </hint>
     <hint type="destinationlabel" >
-     <x>286</x>
-     <y>274</y>
+     <x>599</x>
+     <y>325</y>
     </hint>
    </hints>
   </connection>
diff --git a/rbutil/rbutilqt/installfrm.ui b/rbutil/rbutilqt/installfrm.ui
index a3ec2a92d1..5edb5bb09c 100644
--- a/rbutil/rbutilqt/installfrm.ui
+++ b/rbutil/rbutilqt/installfrm.ui
@@ -8,7 +8,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>702</width>
+    <width>700</width>
     <height>450</height>
    </rect>
   </property>
@@ -24,6 +24,9 @@
      <property name="pixmap" >
       <pixmap resource="rbutilqt.qrc" >:/icons/icons/wizard.xpm</pixmap>
      </property>
+     <property name="alignment" >
+      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+     </property>
     </widget>
    </item>
    <item row="0" column="1" colspan="3" >
@@ -37,10 +40,13 @@
     <widget class="QLineEdit" name="lineMountPoint" />
    </item>
    <item row="1" column="3" >
-    <widget class="QToolButton" name="buttonBrowse" >
+    <widget class="QPushButton" name="buttonBrowse" >
      <property name="text" >
       <string>&amp;Browse</string>
      </property>
+     <property name="icon" >
+      <iconset resource="rbutilqt.qrc" >:/icons/icons/system-search.png</iconset>
+     </property>
     </widget>
    </item>
    <item row="2" column="1" colspan="3" >
@@ -122,28 +128,55 @@
      </property>
     </widget>
    </item>
-   <item row="6" column="2" >
+   <item row="6" column="2" colspan="2" >
     <spacer>
      <property name="orientation" >
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeHint" >
       <size>
-       <width>185</width>
-       <height>31</height>
+       <width>131</width>
+       <height>41</height>
       </size>
      </property>
     </spacer>
    </item>
-   <item row="7" column="2" colspan="2" >
-    <widget class="QDialogButtonBox" name="buttonBox" >
+   <item row="7" column="1" >
+    <spacer>
      <property name="orientation" >
       <enum>Qt::Horizontal</enum>
      </property>
-     <property name="standardButtons" >
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
+     <property name="sizeHint" >
+      <size>
+       <width>291</width>
+       <height>20</height>
+      </size>
      </property>
-    </widget>
+    </spacer>
+   </item>
+   <item row="7" column="2" colspan="2" >
+    <layout class="QHBoxLayout" >
+     <item>
+      <widget class="QPushButton" name="buttonOk" >
+       <property name="text" >
+        <string>&amp;Ok</string>
+       </property>
+       <property name="icon" >
+        <iconset resource="rbutilqt.qrc" >:/icons/icons/go-next.png</iconset>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="buttonCancel" >
+       <property name="text" >
+        <string>&amp;Cancel</string>
+       </property>
+       <property name="icon" >
+        <iconset resource="rbutilqt.qrc" >:/icons/icons/process-stop.png</iconset>
+       </property>
+      </widget>
+     </item>
+    </layout>
    </item>
   </layout>
  </widget>
@@ -152,34 +185,34 @@
  </resources>
  <connections>
   <connection>
-   <sender>buttonBox</sender>
-   <signal>accepted()</signal>
+   <sender>buttonOk</sender>
+   <signal>clicked()</signal>
    <receiver>InstallFrm</receiver>
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel" >
-     <x>248</x>
-     <y>254</y>
+     <x>562</x>
+     <y>420</y>
     </hint>
     <hint type="destinationlabel" >
-     <x>157</x>
-     <y>274</y>
+     <x>500</x>
+     <y>352</y>
     </hint>
    </hints>
   </connection>
   <connection>
-   <sender>buttonBox</sender>
-   <signal>rejected()</signal>
+   <sender>buttonCancel</sender>
+   <signal>clicked()</signal>
    <receiver>InstallFrm</receiver>
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel" >
-     <x>316</x>
-     <y>260</y>
+     <x>658</x>
+     <y>429</y>
     </hint>
     <hint type="destinationlabel" >
-     <x>286</x>
-     <y>274</y>
+     <x>611</x>
+     <y>360</y>
     </hint>
    </hints>
   </connection>
diff --git a/rbutil/rbutilqt/installzipfrm.ui b/rbutil/rbutilqt/installzipfrm.ui
index fe88e024f4..4a107ce189 100644
--- a/rbutil/rbutilqt/installzipfrm.ui
+++ b/rbutil/rbutilqt/installzipfrm.ui
@@ -8,15 +8,15 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>665</width>
-    <height>499</height>
+    <width>600</width>
+    <height>450</height>
    </rect>
   </property>
   <property name="windowTitle" >
    <string>Install Zip</string>
   </property>
   <layout class="QGridLayout" >
-   <item rowspan="8" row="0" column="0" >
+   <item rowspan="4" row="0" column="0" >
     <widget class="QLabel" name="label" >
      <property name="text" >
       <string/>
@@ -24,36 +24,32 @@
      <property name="pixmap" >
       <pixmap resource="rbutilqt.qrc" >:/icons/icons/wizard.xpm</pixmap>
      </property>
+     <property name="alignment" >
+      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+     </property>
     </widget>
    </item>
-   <item row="0" column="1" colspan="3" >
+   <item row="0" column="1" colspan="4" >
     <widget class="QLabel" name="label_2" >
      <property name="text" >
       <string>Select your device in the filesystem</string>
      </property>
     </widget>
    </item>
-   <item row="1" column="1" colspan="2" >
+   <item row="1" column="1" colspan="3" >
     <widget class="QLineEdit" name="lineMountPoint" />
    </item>
-   <item row="1" column="3" >
-    <widget class="QToolButton" name="buttonBrowse" >
+   <item row="1" column="4" >
+    <widget class="QPushButton" name="buttonBrowse" >
      <property name="text" >
       <string>&amp;Browse</string>
      </property>
-    </widget>
-   </item>
-   <item row="9" column="2" colspan="2" >
-    <widget class="QDialogButtonBox" name="buttonBox" >
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="standardButtons" >
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
+     <property name="icon" >
+      <iconset resource="rbutilqt.qrc" >:/icons/icons/system-search.png</iconset>
      </property>
     </widget>
    </item>
-   <item rowspan="4" row="4" column="1" colspan="3" >
+   <item row="2" column="2" >
     <spacer>
      <property name="orientation" >
       <enum>Qt::Vertical</enum>
@@ -66,6 +62,43 @@
      </property>
     </spacer>
    </item>
+   <item row="3" column="1" >
+    <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="3" column="3" colspan="2" >
+    <layout class="QHBoxLayout" >
+     <item>
+      <widget class="QPushButton" name="buttonOk" >
+       <property name="text" >
+        <string>&amp;Ok</string>
+       </property>
+       <property name="icon" >
+        <iconset resource="rbutilqt.qrc" >:/icons/icons/go-next.png</iconset>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="buttonCancel" >
+       <property name="text" >
+        <string>&amp;Cancel</string>
+       </property>
+       <property name="icon" >
+        <iconset resource="rbutilqt.qrc" >:/icons/icons/process-stop.png</iconset>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
   </layout>
  </widget>
  <resources>
@@ -73,34 +106,34 @@
  </resources>
  <connections>
   <connection>
-   <sender>buttonBox</sender>
-   <signal>accepted()</signal>
+   <sender>buttonOk</sender>
+   <signal>clicked()</signal>
    <receiver>InstallZipFrm</receiver>
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel" >
-     <x>248</x>
-     <y>254</y>
+     <x>472</x>
+     <y>418</y>
     </hint>
     <hint type="destinationlabel" >
-     <x>157</x>
-     <y>274</y>
+     <x>382</x>
+     <y>328</y>
     </hint>
    </hints>
   </connection>
   <connection>
-   <sender>buttonBox</sender>
-   <signal>rejected()</signal>
+   <sender>buttonCancel</sender>
+   <signal>clicked()</signal>
    <receiver>InstallZipFrm</receiver>
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel" >
-     <x>316</x>
-     <y>260</y>
+     <x>561</x>
+     <y>428</y>
     </hint>
     <hint type="destinationlabel" >
-     <x>286</x>
-     <y>274</y>
+     <x>522</x>
+     <y>332</y>
     </hint>
    </hints>
   </connection>