diff --git a/src/plugins/qtsupport/exampleslistmodel.cpp b/src/plugins/qtsupport/exampleslistmodel.cpp index a9e4c208acf..199f581b6c1 100644 --- a/src/plugins/qtsupport/exampleslistmodel.cpp +++ b/src/plugins/qtsupport/exampleslistmodel.cpp @@ -40,6 +40,7 @@ #include #include #include +#include #include @@ -300,7 +301,8 @@ void ExamplesListModel::parseExamples(QXmlStreamReader *reader, item.projectPath = attributes.value(QLatin1String("projectPath")).toString(); item.hasSourceCode = !item.projectPath.isEmpty(); item.projectPath = relativeOrInstallPath(item.projectPath, projectsOffset, examplesInstallPath); - item.imageUrl = attributes.value(QLatin1String("imageUrl")).toString(); + item.imageUrl = Utils::StyleHelper::dpiSpecificImageFile( + attributes.value(QLatin1String("imageUrl")).toString()); item.docUrl = attributes.value(QLatin1String("docUrl")).toString(); item.isHighlighted = attributes.value(QLatin1String("isHighlighted")).toString() == QLatin1String("true"); diff --git a/src/plugins/qtsupport/gettingstartedwelcomepage.cpp b/src/plugins/qtsupport/gettingstartedwelcomepage.cpp index 045222fe77f..156c956ad54 100644 --- a/src/plugins/qtsupport/gettingstartedwelcomepage.cpp +++ b/src/plugins/qtsupport/gettingstartedwelcomepage.cpp @@ -440,18 +440,16 @@ public: QRect pixmapRect = inner; if (!pm.isNull()) { painter->setPen(foregroundColor2); - if (item.isVideo) - pixmapRect = inner.adjusted(6, 10, -6, -25); + pixmapRect = inner.adjusted(6, 20, -6, -15); QPoint pixmapPos = pixmapRect.center(); - pixmapPos.rx() -= pm.width() / 2; - pixmapPos.ry() -= pm.height() / 2; + pixmapPos.rx() -= pm.width() / pm.devicePixelRatio() / 2; + pixmapPos.ry() -= pm.height() / pm.devicePixelRatio() / 2; painter->drawPixmap(pixmapPos, pm); if (item.isVideo) { painter->setFont(sizedFont(13, option.widget)); - QRect lenRect(x, y + 120, w, 20); QString videoLen = item.videoLength; - lenRect = fm.boundingRect(lenRect, Qt::AlignHCenter, videoLen); - painter->drawText(lenRect.adjusted(0, 0, 5, 0), videoLen); + painter->drawText(pixmapRect.adjusted(0, 0, 0, painter->font().pixelSize() + 3), + videoLen, Qt::AlignBottom | Qt::AlignHCenter); } } else { // The description text as fallback. diff --git a/src/plugins/qtsupport/images/icons/qteventicon.png b/src/plugins/qtsupport/images/icons/qteventicon.png index b3ba23cbe3d..a4d27e29a28 100644 Binary files a/src/plugins/qtsupport/images/icons/qteventicon.png and b/src/plugins/qtsupport/images/icons/qteventicon.png differ diff --git a/src/plugins/qtsupport/images/icons/qteventicon@2x.png b/src/plugins/qtsupport/images/icons/qteventicon@2x.png new file mode 100644 index 00000000000..b3eb6e5eaf1 Binary files /dev/null and b/src/plugins/qtsupport/images/icons/qteventicon@2x.png differ diff --git a/src/plugins/qtsupport/images/icons/tutorialicon.png b/src/plugins/qtsupport/images/icons/tutorialicon.png index 955d29d92c6..a3ac270f8cd 100644 Binary files a/src/plugins/qtsupport/images/icons/tutorialicon.png and b/src/plugins/qtsupport/images/icons/tutorialicon.png differ diff --git a/src/plugins/qtsupport/images/icons/tutorialicon@2x.png b/src/plugins/qtsupport/images/icons/tutorialicon@2x.png new file mode 100644 index 00000000000..5c83982f2e7 Binary files /dev/null and b/src/plugins/qtsupport/images/icons/tutorialicon@2x.png differ diff --git a/src/plugins/qtsupport/images/icons/videotutorialicon.png b/src/plugins/qtsupport/images/icons/videotutorialicon.png index b3e88de859f..037adc27a35 100644 Binary files a/src/plugins/qtsupport/images/icons/videotutorialicon.png and b/src/plugins/qtsupport/images/icons/videotutorialicon.png differ diff --git a/src/plugins/qtsupport/images/icons/videotutorialicon@2x.png b/src/plugins/qtsupport/images/icons/videotutorialicon@2x.png new file mode 100644 index 00000000000..04071e206e6 Binary files /dev/null and b/src/plugins/qtsupport/images/icons/videotutorialicon@2x.png differ diff --git a/src/plugins/qtsupport/qtsupport.qrc b/src/plugins/qtsupport/qtsupport.qrc index 03d8dbc7e86..03c14062c04 100644 --- a/src/plugins/qtsupport/qtsupport.qrc +++ b/src/plugins/qtsupport/qtsupport.qrc @@ -7,7 +7,10 @@ images_areaofinterest.xml qtcreator_tutorials.xml images/icons/tutorialicon.png + images/icons/tutorialicon@2x.png images/icons/videotutorialicon.png + images/icons/videotutorialicon@2x.png images/icons/qteventicon.png + images/icons/qteventicon@2x.png diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg index 2fd16a1b7ae..cc5e8a30e0c 100644 --- a/src/tools/icons/qtcreatoricons.svg +++ b/src/tools/icons/qtcreatoricons.svg @@ -496,6 +496,37 @@ effect="fill_between_many" linkedpaths="#path2259-2-0-6,0" id="path-effect2469-8" /> + + + + + + + + + + + + + + + + + + + + + + +