From d148afca3ba07b273525829781ee703f2197738a Mon Sep 17 00:00:00 2001
From: Dominik Riebeling <Dominik.Riebeling@gmail.com>
Date: Tue, 8 Dec 2020 21:53:05 +0100
Subject: [PATCH] rbutil: Improve HiDPI support.

Replace the Rockbox logo with an svg version. Since the file size (i.e.
the page size in the svg) that isn't intended for use as icon we need to
enable scaling, and since scaling the label content doesn't keep the
aspect ratio we need to explicitly set the desired values.

Notably improves representation on HiDPI monitors. Now only the player
icons are still raster images.

Change-Id: I03216391a4b0ac982b16f5bec2b48c073369a3f6
---
 rbutil/rbutilqt/rbutilqtfrm.ui | 37 +++++++++++++++++++++-------------
 1 file changed, 23 insertions(+), 14 deletions(-)

diff --git a/rbutil/rbutilqt/rbutilqtfrm.ui b/rbutil/rbutilqt/rbutilqtfrm.ui
index 4bdd929a93..af47fea72c 100644
--- a/rbutil/rbutilqt/rbutilqtfrm.ui
+++ b/rbutil/rbutilqt/rbutilqtfrm.ui
@@ -21,26 +21,35 @@
    <layout class="QGridLayout" name="gridLayout_3">
     <item row="0" column="0">
      <widget class="QLabel" name="logoLabel">
-      <property name="sizePolicy">
-       <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-        <horstretch>0</horstretch>
-        <verstretch>0</verstretch>
-       </sizepolicy>
+      <property name="minimumSize">
+       <size>
+        <width>200</width>
+        <height>62</height>
+       </size>
+      </property>
+      <property name="maximumSize">
+       <size>
+        <width>200</width>
+        <height>62</height>
+       </size>
       </property>
       <property name="baseSize">
        <size>
-        <width>0</width>
-        <height>0</height>
+        <width>200</width>
+        <height>62</height>
        </size>
       </property>
       <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>
+       <pixmap resource="rbutilqt.qrc">:/icons/rockbox-logo.svg</pixmap>
       </property>
       <property name="scaledContents">
-       <bool>false</bool>
+       <bool>true</bool>
+      </property>
+      <property name="alignment">
+       <set>Qt::AlignCenter</set>
       </property>
      </widget>
     </item>
@@ -473,7 +482,7 @@
   </action>
   <action name="actionComplete_Installation">
    <property name="icon">
-    <iconset resource="rbutilqt.qrc">
+    <iconset>
      <normaloff>:/icons/bootloader_btn.png</normaloff>:/icons/bootloader_btn.png</iconset>
    </property>
    <property name="text">
@@ -482,7 +491,7 @@
   </action>
   <action name="actionSmall_Installation">
    <property name="icon">
-    <iconset resource="rbutilqt.qrc">
+    <iconset>
      <normaloff>:/icons/rbinstall_btn.png</normaloff>:/icons/rbinstall_btn.png</iconset>
    </property>
    <property name="text">
@@ -491,7 +500,7 @@
   </action>
   <action name="actionInstall_Bootloader">
    <property name="icon">
-    <iconset resource="rbutilqt.qrc">
+    <iconset>
      <normaloff>:/icons/bootloader_btn.png</normaloff>:/icons/bootloader_btn.png</iconset>
    </property>
    <property name="text">
@@ -500,7 +509,7 @@
   </action>
   <action name="actionInstall_Rockbox">
    <property name="icon">
-    <iconset resource="rbutilqt.qrc">
+    <iconset>
      <normaloff>:/icons/rbinstall_btn.png</normaloff>:/icons/rbinstall_btn.png</iconset>
    </property>
    <property name="text">
@@ -509,7 +518,7 @@
   </action>
   <action name="actionFonts_Package">
    <property name="icon">
-    <iconset resource="rbutilqt.qrc">
+    <iconset>
      <normaloff>:/icons/font_btn.png</normaloff>:/icons/font_btn.png</iconset>
    </property>
    <property name="text">