From c4464eb072dfff073809fc3207a29c55773dcb9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cristi=C3=A1n=20Maureira-Fredes?=
 <Cristian.Maureira-Fredes@qt.io>
Date: Sat, 9 Dec 2023 00:23:33 +0100
Subject: [PATCH] Add logo and title to PySide install dialog

Change-Id: I7888ee906334de2c93c24c5da2394c9e73101a28
Fixes: QTCREATORBUG-30041
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
---
 .../python/images/qtforpython_neon.png        | Bin 0 -> 1049 bytes
 src/plugins/python/pyside.cpp                 |  30 +++++++++++++++---
 src/plugins/python/python.qrc                 |   1 +
 3 files changed, 26 insertions(+), 5 deletions(-)
 create mode 100644 src/plugins/python/images/qtforpython_neon.png

diff --git a/src/plugins/python/images/qtforpython_neon.png b/src/plugins/python/images/qtforpython_neon.png
new file mode 100644
index 0000000000000000000000000000000000000000..71a7299c3910771477bacb0e785ec46641e5158d
GIT binary patch
literal 1049
zcmeAS@N?(olHy`uVBq!ia0y~yU~phyV9?`WW?*1g@A>{10|R4ifKQ0)|Ns9PK&T<~
z|0?4%GqtZaDBN$beB7t^qFeiFgUam&-G}Ykj~fhcx9Qw#)qmWgce_*bUW>u~cFnuZ
z`ghy(?ltQ?Xx4t%ruCp*??J2Xop$ZJ?b`QRwC=a*-EYx-(57>zMf+}x?!6Y>`)xY+
zo3$Ub>fLSCz1ysFuT}egtL}qVox80%ciXh@L6w2T@3rdQZ`HZi1|sjaY2R(pzSpXA
zzf~Kgu|?-zs}9JtR^7X8I(J*OLCV@d3c%vp_gl2@wt@_~4>lQ0f@PuNAY(x)K?Z`1
z0;|`(2Qe0G4p=)_3S<t50k$2i2BZvZ8cYhL7$gW)1~HjvlJ`l)RR#uzx{@HjU<O7e
zW>z*1PHrAPK_O9bX&HG1RW)@@Ekh$?Q!{f5ODh{Ydk05n7gu*rZy(>_(3rS{<h0DJ
z?EJ!_;*#=;%9^^Sme%%;p1ujwrq7%+f8mnVYu0Yrx^4T8-Fx;OIC%8<snci9UATPn
z?xV*~p1*qi=Iy)pA3lEi^7Y&IpTGb7{r8pW05<~z<5^D^#}JR>ORq!*3p+}*J`6Vq
zH1685;GizYsRv!&0)n@AC%UqV2F6@m5Ex>jvsmEF&$n@BL`1cxyez3NugyAV9D4UM
zGegOmQ-zP}&h3<E-YHti=<fB2=~nHprf>5<F>R`=-KgUKV1DS+r_X94N*K*n%-S|F
z)t=$o`D&&uHKmNtxLTbaz763&AS#|<8yUkMq{{ywoUP&+;|raFc>i9*qbfhsdMY#c
zpD-@wd=NLuhspWdfzStST@K}wV%XwtFxwv3aE0sTR*THmkQCmKZ;btqukV|tBHHNp
z+jkD@4;^2|?W&&q4ZE)$_!Fm~p2_%Pg34E>_pg|pk4apv-z9m&OxZJcLv3hKDu2o;
z-n*@go<Z^k$}g1*7EV09rP#!8K11`QV-1De3LH%eH)<c;dGTH4??skK&*zQ)y)~z1
zPi|f2I@S0>P$3grW9C`L=}%Z}*ngSw`0Qc~<l<W?{o@ha3zY&xUiPOPcRcyN&C>p$
z#<=V?WBnlmp3__X*UslW9D5;V75ks`Yh?!lD;YK)(3MYMsCddO)Al8wKVjjk>ruAe
z+YTrvEHR6-OXL2+^gjFd@r|r`&py{mM}J*wUf3OJ*(feh`iRvfwu15E${qj3Gab%m
V>@_{Qn}LCW!PC{xWt~$(69AZo>-_)#

literal 0
HcmV?d00001

diff --git a/src/plugins/python/pyside.cpp b/src/plugins/python/pyside.cpp
index b2483c7cac6..d6ce264ccb4 100644
--- a/src/plugins/python/pyside.cpp
+++ b/src/plugins/python/pyside.cpp
@@ -128,20 +128,40 @@ void PySideInstaller::installPyside(const FilePath &python,
     } else {
         QDialog dialog;
         dialog.setWindowTitle(Tr::tr("Select PySide Version"));
-        dialog.setLayout(new QVBoxLayout());
-        dialog.layout()->addWidget(new QLabel(Tr::tr("Select which PySide version to install:")));
+
+        // Logo for the corner in the QDialog
+        QPixmap logo(":/python/images/qtforpython_neon.png");
+        QLabel *logoLabel = new QLabel();
+        logoLabel->setPixmap(logo);
+
+        QVBoxLayout *dialogLayout = new QVBoxLayout();
+        QHBoxLayout *hlayout = new QHBoxLayout();
+        hlayout->addWidget(logoLabel);
+        hlayout->addWidget(new QLabel("<b>" + Tr::tr("Installing PySide") + "</b>"));
+        dialogLayout->addLayout(hlayout);
+
+        QLabel *installDescription = new QLabel(Tr::tr("You can install PySide "
+                                                       "from PyPi (Community OSS version) or from your Qt "
+                                                       "installation location, if you are using the Qt "
+                                                       "Installer and have a commercial license."));
+        installDescription->setWordWrap(true);
+        dialogLayout->addWidget(installDescription);
+
+        dialogLayout->addWidget(new QLabel(Tr::tr("Select which version to install:")));
         QComboBox *pySideSelector = new QComboBox();
-        pySideSelector->addItem(Tr::tr("Latest PySide from the Python Package Index"));
+        pySideSelector->addItem(Tr::tr("Latest PySide from the PyPI"));
         for (const Utils::FilePath &version : std::as_const(availablePySides)) {
             const FilePath dir = version.parentDir();
             const QString text
                 = Tr::tr("PySide %1 Wheel (%2)").arg(dir.fileName(), dir.toUserOutput());
             pySideSelector->addItem(text, version.toVariant());
         }
-        dialog.layout()->addWidget(pySideSelector);
+        dialogLayout->addWidget(pySideSelector);
         QDialogButtonBox box;
         box.setStandardButtons(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
-        dialog.layout()->addWidget(&box);
+        dialogLayout->addWidget(&box);
+
+        dialog.setLayout(dialogLayout);
         connect(&box, &QDialogButtonBox::accepted, &dialog, &QDialog::accept);
         connect(&box, &QDialogButtonBox::rejected, &dialog, &QDialog::reject);
 
diff --git a/src/plugins/python/python.qrc b/src/plugins/python/python.qrc
index 1a6da2a242b..6b0fe17637a 100644
--- a/src/plugins/python/python.qrc
+++ b/src/plugins/python/python.qrc
@@ -2,5 +2,6 @@
     <qresource prefix="/python">
         <file>images/settingscategory_python.png</file>
         <file>images/settingscategory_python@2x.png</file>
+        <file>images/qtforpython_neon.png</file>
     </qresource>
 </RCC>