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
This commit is contained in:
Dominik Riebeling 2007-08-01 22:55:22 +00:00
parent cb896cdd04
commit b1c61b95df
3 changed files with 201 additions and 99 deletions

View file

@ -8,15 +8,15 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>665</width> <width>600</width>
<height>499</height> <height>450</height>
</rect> </rect>
</property> </property>
<property name="windowTitle" > <property name="windowTitle" >
<string>Install Bootloader</string> <string>Install Bootloader</string>
</property> </property>
<layout class="QGridLayout" > <layout class="QGridLayout" >
<item rowspan="8" row="0" column="0" > <item rowspan="6" row="0" column="0" >
<widget class="QLabel" name="label" > <widget class="QLabel" name="label" >
<property name="text" > <property name="text" >
<string/> <string/>
@ -24,6 +24,9 @@
<property name="pixmap" > <property name="pixmap" >
<pixmap resource="rbutilqt.qrc" >:/icons/icons/wizard.xpm</pixmap> <pixmap resource="rbutilqt.qrc" >:/icons/icons/wizard.xpm</pixmap>
</property> </property>
<property name="alignment" >
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
</widget> </widget>
</item> </item>
<item row="0" column="1" colspan="3" > <item row="0" column="1" colspan="3" >
@ -37,36 +40,23 @@
<widget class="QLineEdit" name="lineMountPoint" /> <widget class="QLineEdit" name="lineMountPoint" />
</item> </item>
<item row="1" column="3" > <item row="1" column="3" >
<widget class="QToolButton" name="buttonBrowse" > <widget class="QPushButton" name="buttonBrowse" >
<property name="text" > <property name="text" >
<string>&amp;Browse</string> <string>&amp;Browse</string>
</property> </property>
</widget> <property name="icon" >
</item> <iconset resource="rbutilqt.qrc" >:/icons/icons/system-search.png</iconset>
<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> </property>
</widget> </widget>
</item> </item>
<item rowspan="4" row="4" column="1" colspan="3" > <item row="2" column="1" colspan="3" >
<spacer> <widget class="QLabel" name="label_3" >
<property name="orientation" > <property name="text" >
<enum>Qt::Vertical</enum> <string>Download and select an original Firmware</string>
</property> </property>
<property name="sizeHint" > </widget>
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item> </item>
<item row="3" column="1" > <item row="3" column="1" colspan="2" >
<widget class="QLineEdit" name="lineOriginalFirmware" > <widget class="QLineEdit" name="lineOriginalFirmware" >
<property name="sizePolicy" > <property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" > <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
@ -82,19 +72,65 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1" > <item row="3" column="3" >
<widget class="QLabel" name="label_3" > <widget class="QPushButton" name="buttonBrowseOF" >
<property name="text" > <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> </property>
</widget> </widget>
</item> </item>
<item row="3" column="2" > <item row="4" column="2" >
<widget class="QToolButton" name="buttonBrowseOF" > <spacer>
<property name="text" > <property name="orientation" >
<string>Browse</string> <enum>Qt::Vertical</enum>
</property> </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> </item>
</layout> </layout>
</widget> </widget>
@ -103,34 +139,34 @@
</resources> </resources>
<connections> <connections>
<connection> <connection>
<sender>buttonBox</sender> <sender>buttonOk_2</sender>
<signal>accepted()</signal> <signal>clicked()</signal>
<receiver>InstallBootloaderFrm</receiver> <receiver>InstallBootloaderFrm</receiver>
<slot>accept()</slot> <slot>accept()</slot>
<hints> <hints>
<hint type="sourcelabel" > <hint type="sourcelabel" >
<x>248</x> <x>476</x>
<y>254</y> <y>425</y>
</hint> </hint>
<hint type="destinationlabel" > <hint type="destinationlabel" >
<x>157</x> <x>531</x>
<y>274</y> <y>317</y>
</hint> </hint>
</hints> </hints>
</connection> </connection>
<connection> <connection>
<sender>buttonBox</sender> <sender>buttonCancel_2</sender>
<signal>rejected()</signal> <signal>clicked()</signal>
<receiver>InstallBootloaderFrm</receiver> <receiver>InstallBootloaderFrm</receiver>
<slot>reject()</slot> <slot>reject()</slot>
<hints> <hints>
<hint type="sourcelabel" > <hint type="sourcelabel" >
<x>316</x> <x>556</x>
<y>260</y> <y>428</y>
</hint> </hint>
<hint type="destinationlabel" > <hint type="destinationlabel" >
<x>286</x> <x>599</x>
<y>274</y> <y>325</y>
</hint> </hint>
</hints> </hints>
</connection> </connection>

View file

@ -8,7 +8,7 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>702</width> <width>700</width>
<height>450</height> <height>450</height>
</rect> </rect>
</property> </property>
@ -24,6 +24,9 @@
<property name="pixmap" > <property name="pixmap" >
<pixmap resource="rbutilqt.qrc" >:/icons/icons/wizard.xpm</pixmap> <pixmap resource="rbutilqt.qrc" >:/icons/icons/wizard.xpm</pixmap>
</property> </property>
<property name="alignment" >
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
</widget> </widget>
</item> </item>
<item row="0" column="1" colspan="3" > <item row="0" column="1" colspan="3" >
@ -37,10 +40,13 @@
<widget class="QLineEdit" name="lineMountPoint" /> <widget class="QLineEdit" name="lineMountPoint" />
</item> </item>
<item row="1" column="3" > <item row="1" column="3" >
<widget class="QToolButton" name="buttonBrowse" > <widget class="QPushButton" name="buttonBrowse" >
<property name="text" > <property name="text" >
<string>&amp;Browse</string> <string>&amp;Browse</string>
</property> </property>
<property name="icon" >
<iconset resource="rbutilqt.qrc" >:/icons/icons/system-search.png</iconset>
</property>
</widget> </widget>
</item> </item>
<item row="2" column="1" colspan="3" > <item row="2" column="1" colspan="3" >
@ -122,28 +128,55 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="6" column="2" > <item row="6" column="2" colspan="2" >
<spacer> <spacer>
<property name="orientation" > <property name="orientation" >
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>
<property name="sizeHint" > <property name="sizeHint" >
<size> <size>
<width>185</width> <width>131</width>
<height>31</height> <height>41</height>
</size>
</property>
</spacer>
</item>
<item row="7" column="1" >
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" >
<size>
<width>291</width>
<height>20</height>
</size> </size>
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="7" column="2" colspan="2" > <item row="7" column="2" colspan="2" >
<widget class="QDialogButtonBox" name="buttonBox" > <layout class="QHBoxLayout" >
<property name="orientation" > <item>
<enum>Qt::Horizontal</enum> <widget class="QPushButton" name="buttonOk" >
</property> <property name="text" >
<property name="standardButtons" > <string>&amp;Ok</string>
<set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set> </property>
</property> <property name="icon" >
</widget> <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> </item>
</layout> </layout>
</widget> </widget>
@ -152,34 +185,34 @@
</resources> </resources>
<connections> <connections>
<connection> <connection>
<sender>buttonBox</sender> <sender>buttonOk</sender>
<signal>accepted()</signal> <signal>clicked()</signal>
<receiver>InstallFrm</receiver> <receiver>InstallFrm</receiver>
<slot>accept()</slot> <slot>accept()</slot>
<hints> <hints>
<hint type="sourcelabel" > <hint type="sourcelabel" >
<x>248</x> <x>562</x>
<y>254</y> <y>420</y>
</hint> </hint>
<hint type="destinationlabel" > <hint type="destinationlabel" >
<x>157</x> <x>500</x>
<y>274</y> <y>352</y>
</hint> </hint>
</hints> </hints>
</connection> </connection>
<connection> <connection>
<sender>buttonBox</sender> <sender>buttonCancel</sender>
<signal>rejected()</signal> <signal>clicked()</signal>
<receiver>InstallFrm</receiver> <receiver>InstallFrm</receiver>
<slot>reject()</slot> <slot>reject()</slot>
<hints> <hints>
<hint type="sourcelabel" > <hint type="sourcelabel" >
<x>316</x> <x>658</x>
<y>260</y> <y>429</y>
</hint> </hint>
<hint type="destinationlabel" > <hint type="destinationlabel" >
<x>286</x> <x>611</x>
<y>274</y> <y>360</y>
</hint> </hint>
</hints> </hints>
</connection> </connection>

View file

@ -8,15 +8,15 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>665</width> <width>600</width>
<height>499</height> <height>450</height>
</rect> </rect>
</property> </property>
<property name="windowTitle" > <property name="windowTitle" >
<string>Install Zip</string> <string>Install Zip</string>
</property> </property>
<layout class="QGridLayout" > <layout class="QGridLayout" >
<item rowspan="8" row="0" column="0" > <item rowspan="4" row="0" column="0" >
<widget class="QLabel" name="label" > <widget class="QLabel" name="label" >
<property name="text" > <property name="text" >
<string/> <string/>
@ -24,36 +24,32 @@
<property name="pixmap" > <property name="pixmap" >
<pixmap resource="rbutilqt.qrc" >:/icons/icons/wizard.xpm</pixmap> <pixmap resource="rbutilqt.qrc" >:/icons/icons/wizard.xpm</pixmap>
</property> </property>
<property name="alignment" >
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
</widget> </widget>
</item> </item>
<item row="0" column="1" colspan="3" > <item row="0" column="1" colspan="4" >
<widget class="QLabel" name="label_2" > <widget class="QLabel" name="label_2" >
<property name="text" > <property name="text" >
<string>Select your device in the filesystem</string> <string>Select your device in the filesystem</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1" colspan="2" > <item row="1" column="1" colspan="3" >
<widget class="QLineEdit" name="lineMountPoint" /> <widget class="QLineEdit" name="lineMountPoint" />
</item> </item>
<item row="1" column="3" > <item row="1" column="4" >
<widget class="QToolButton" name="buttonBrowse" > <widget class="QPushButton" name="buttonBrowse" >
<property name="text" > <property name="text" >
<string>&amp;Browse</string> <string>&amp;Browse</string>
</property> </property>
</widget> <property name="icon" >
</item> <iconset resource="rbutilqt.qrc" >:/icons/icons/system-search.png</iconset>
<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> </property>
</widget> </widget>
</item> </item>
<item rowspan="4" row="4" column="1" colspan="3" > <item row="2" column="2" >
<spacer> <spacer>
<property name="orientation" > <property name="orientation" >
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
@ -66,6 +62,43 @@
</property> </property>
</spacer> </spacer>
</item> </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> </layout>
</widget> </widget>
<resources> <resources>
@ -73,34 +106,34 @@
</resources> </resources>
<connections> <connections>
<connection> <connection>
<sender>buttonBox</sender> <sender>buttonOk</sender>
<signal>accepted()</signal> <signal>clicked()</signal>
<receiver>InstallZipFrm</receiver> <receiver>InstallZipFrm</receiver>
<slot>accept()</slot> <slot>accept()</slot>
<hints> <hints>
<hint type="sourcelabel" > <hint type="sourcelabel" >
<x>248</x> <x>472</x>
<y>254</y> <y>418</y>
</hint> </hint>
<hint type="destinationlabel" > <hint type="destinationlabel" >
<x>157</x> <x>382</x>
<y>274</y> <y>328</y>
</hint> </hint>
</hints> </hints>
</connection> </connection>
<connection> <connection>
<sender>buttonBox</sender> <sender>buttonCancel</sender>
<signal>rejected()</signal> <signal>clicked()</signal>
<receiver>InstallZipFrm</receiver> <receiver>InstallZipFrm</receiver>
<slot>reject()</slot> <slot>reject()</slot>
<hints> <hints>
<hint type="sourcelabel" > <hint type="sourcelabel" >
<x>316</x> <x>561</x>
<y>260</y> <y>428</y>
</hint> </hint>
<hint type="destinationlabel" > <hint type="destinationlabel" >
<x>286</x> <x>522</x>
<y>274</y> <y>332</y>
</hint> </hint>
</hints> </hints>
</connection> </connection>