feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/12.0'

Browse Source 
Conflicts:
	src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp

Change-Id: If96d0f0a3d48c2581e765e4afb8b23924c48bdd6
This commit is contained in:
Eike Ziller
2023-12-12 10:17:39 +01:00
parent 27ef041d28 c4464eb072
commit 10e5a27c27
10 changed files with 93 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
src/plugins/python/images/qtforpython_neon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

30
src/plugins/python/pyside.cpp
View File

@@ -132,20 +132,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);

1
src/plugins/python/python.qrc
View File

@@ -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>