From 8d462a1edd6e7446746947bcb9537f1c800d38ef Mon Sep 17 00:00:00 2001
From: Dominik Riebeling <Dominik.Riebeling@gmail.com>
Date: Mon, 21 Feb 2022 19:16:49 +0100
Subject: rbutil: Rework Logo display.

Replace QLabel with QSvgWidget so the widget draws the svg directly
instead of first creating a pixmap from it.

This also avoids an issue when building with mxe which causes the image
to not show due to a missing svg plugin (which doesn't happen for svg
icons.)

Change-Id: Ic4e265f0567984d1ffe7a3e1cc641df27755e90b
---
 utils/rbutilqt/CMakeLists.txt |  3 ++-
 utils/rbutilqt/rbutilqt.cpp   |  1 +
 utils/rbutilqt/rbutilqtfrm.ui | 40 +++++++++++++++++++++-------------------
 3 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/utils/rbutilqt/CMakeLists.txt b/utils/rbutilqt/CMakeLists.txt
index cc1ecd575c..d0ac4d9a54 100644
--- a/utils/rbutilqt/CMakeLists.txt
+++ b/utils/rbutilqt/CMakeLists.txt
@@ -123,7 +123,8 @@ if(APPLE)
 endif()
 
 target_link_libraries(RockboxUtility rbbase cutelogger gitversion
-    Qt${QT_VERSION_MAJOR}::Widgets Qt${QT_VERSION_MAJOR}::Multimedia)
+    Qt${QT_VERSION_MAJOR}::Widgets Qt${QT_VERSION_MAJOR}::Multimedia
+    Qt${QT_VERSION_MAJOR}::Svg)
 
 target_include_directories(RockboxUtility PRIVATE
     ${CMAKE_CURRENT_LIST_DIR}/gui
diff --git a/utils/rbutilqt/rbutilqt.cpp b/utils/rbutilqt/rbutilqt.cpp
index aa405418be..271d252391 100644
--- a/utils/rbutilqt/rbutilqt.cpp
+++ b/utils/rbutilqt/rbutilqt.cpp
@@ -88,6 +88,7 @@ RbUtilQt::RbUtilQt(QWidget *parent) : QMainWindow(parent)
     ui.setupUi(this);
     QIcon windowIcon(":/icons/rockbox-clef.svg");
     this->setWindowIcon(windowIcon);
+    ui.logoLabel->load(QLatin1String(":/icons/rockbox-logo.svg"));
 #if defined(Q_OS_MACX)
     // don't translate menu entries that are handled specially on OS X
     // (Configure, Quit). Qt handles them for us if they use english string.
diff --git a/utils/rbutilqt/rbutilqtfrm.ui b/utils/rbutilqt/rbutilqtfrm.ui
index af47fea72c..5c78c812a8 100644
--- a/utils/rbutilqt/rbutilqtfrm.ui
+++ b/utils/rbutilqt/rbutilqtfrm.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>650</width>
-    <height>399</height>
+    <width>631</width>
+    <height>441</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -19,8 +19,8 @@
   </property>
   <widget class="QWidget" name="centralwidget">
    <layout class="QGridLayout" name="gridLayout_3">
-    <item row="0" column="0">
-     <widget class="QLabel" name="logoLabel">
+    <item row="0" column="1">
+     <widget class="QSvgWidget" name="logoLabel" native="true">
       <property name="minimumSize">
        <size>
         <width>200</width>
@@ -39,21 +39,15 @@
         <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/rockbox-logo.svg</pixmap>
+      <property name="toolTip">
+       <string>Welcome to Rockbox Utility, the installation and housekeeping tool for Rockbox.</string>
       </property>
-      <property name="scaledContents">
-       <bool>true</bool>
-      </property>
-      <property name="alignment">
-       <set>Qt::AlignCenter</set>
+      <property name="accessibleName">
+       <string>Rockbox Logo</string>
       </property>
      </widget>
     </item>
-    <item row="0" column="1">
+    <item row="0" column="2">
      <widget class="QGroupBox" name="groupBoxDevice">
       <property name="sizePolicy">
        <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
@@ -74,7 +68,7 @@
           <string/>
          </property>
          <property name="pixmap">
-          <pixmap resource="rbutilqt.qrc">:/icons/rockbox-32.png</pixmap>
+          <pixmap>:/icons/rockbox-32.png</pixmap>
          </property>
          <property name="scaledContents">
           <bool>false</bool>
@@ -159,7 +153,7 @@
       </layout>
      </widget>
     </item>
-    <item row="1" column="0" colspan="2">
+    <item row="1" column="0" colspan="3">
      <widget class="QTabWidget" name="tabWidget">
       <property name="currentIndex">
        <number>0</number>
@@ -384,8 +378,8 @@
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>650</width>
-     <height>22</height>
+     <width>631</width>
+     <height>30</height>
     </rect>
    </property>
    <widget class="QMenu" name="menu_File">
@@ -632,6 +626,14 @@
    </property>
   </action>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>QSvgWidget</class>
+   <extends>QWidget</extends>
+   <header location="global">QSvgWidget</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
  <tabstops>
   <tabstop>tabWidget</tabstop>
   <tabstop>buttonChangeDevice</tabstop>
-- 
cgit v1.2.3