len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-12-08 12:45:26 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make Rockbox logo smaller and move device information up.

Browse source 
The original way of including the Rockbox logo wastes quite a bit of space.
Make it smaller and move it to the left, so the information about the
configured device can go next to it.

Change-Id: I790ffc423135e02e28cc963b0b565284b75bf98c
This commit is contained in:
Dominik Riebeling 2012-06-20 19:45:11 +02:00
parent 362f447ede
commit 40e306ba37
3 changed files with 53 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
rbutil/rbutilqt/icons/rblogo.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 38 KiB

After

Width:  |  Height:  |  Size: 23 KiB

Before After
Before After

4
rbutil/rbutilqt/rbutilqt.cpp
View file

@ -376,8 +376,8 @@ void RbUtilQt::updateDevice()
if(name.isEmpty()) name = "<none>"; if(name.isEmpty()) name = "<none>";
if(mountpoint.isEmpty()) if(mountpoint.isEmpty())
mountpoint = "<invalid>"; mountpoint = "<invalid>";
ui.labelDevice->setText(tr("<b>%1 %2</b> at <b>%3</b>") ui.labelDevice->setText(tr("<b>%1 %2</b>").arg(brand, name));
.arg(brand, name, mountdisplay)); ui.labelMountpoint->setText(tr("<b>%1</b>").arg(mountdisplay));
// hide quickstart buttons if no release available // hide quickstart buttons if no release available
bool installable = !ServerInfo::value(ServerInfo::CurReleaseVersion).toString().isEmpty(); bool installable = !ServerInfo::value(ServerInfo::CurReleaseVersion).toString().isEmpty();

109
rbutil/rbutilqt/rbutilqtfrm.ui
View file

@ -20,58 +20,58 @@
<widget class="QWidget" name="centralwidget"> <widget class="QWidget" name="centralwidget">
<layout class="QGridLayout"> <layout class="QGridLayout">
<item row="0" column="0"> <item row="0" column="0">
<layout class="QHBoxLayout"> <widget class="QLabel" name="logoLabel">
<property name="spacing"> <property name="sizePolicy">
<number>6</number> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property> </property>
<property name="margin"> <property name="baseSize">
<number>0</number> <size>
<width>0</width>
<height>0</height>
</size>
</property> </property>
<item> <property name="text">
<spacer> <string comment="Welcome to Rockbox Utility, the installation and housekeeping tool for Rockbox."/>
<property name="orientation"> </property>
<enum>Qt::Horizontal</enum> <property name="pixmap">
</property> <pixmap resource="rbutilqt.qrc">:/icons/rblogo.png</pixmap>
<property name="sizeHint" stdset="0"> </property>
<size> <property name="scaledContents">
<width>40</width> <bool>false</bool>
<height>20</height> </property>
</size> </widget>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="logoLabel">
<property name="text">
<string comment="Welcome to Rockbox Utility, the installation and housekeeping tool for Rockbox."/>
</property>
<property name="pixmap">
<pixmap resource="rbutilqt.qrc">:/icons/rblogo.png</pixmap>
</property>
</widget>
</item>
<item>
<spacer>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item> </item>
<item row="1" column="0"> <item row="0" column="1">
<widget class="QGroupBox" name="groupBox_3"> <widget class="QGroupBox" name="groupBoxDevice">
<property name="title"> <property name="title">
<string>Device</string> <string>Device</string>
</property> </property>
<layout class="QGridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="0" column="0"> <item row="1" column="2">
<widget class="QLabel" name="labelMountpoint">
<property name="text">
<string>mountpoint unknown or invalid</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLabel" name="labelMountpointTitle">
<property name="text">
<string>Mountpoint:</string>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QLabel" name="labelDevice">
<property name="text">
<string>device unknown or invalid</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="labelDeviceTitle"> <widget class="QLabel" name="labelDeviceTitle">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
@ -80,19 +80,12 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="text"> <property name="text">
<string>Selected device:</string> <string>Device:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="0" column="3">
<widget class="QLabel" name="labelDevice"> <spacer name="horizontalSpacer">
<property name="text">
<string>device / mountpoint unknown or invalid</string>
</property>
</widget>
</item>
<item row="0" column="2">
<spacer>
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
@ -118,10 +111,10 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="2" column="0"> <item row="1" column="0" colspan="2">
<widget class="QTabWidget" name="tabWidget"> <widget class="QTabWidget" name="tabWidget">
<property name="currentIndex"> <property name="currentIndex">
<number>0</number> <number>7</number>
</property> </property>
<widget class="QWidget" name="quickStart"> <widget class="QWidget" name="quickStart">
<attribute name="title"> <attribute name="title">