diff --git a/dist/installer/ifw/config/logo.png b/dist/installer/ifw/config/logo.png index d892f85fe2c..38c0aa5d03e 100644 Binary files a/dist/installer/ifw/config/logo.png and b/dist/installer/ifw/config/logo.png differ diff --git a/doc/images/creator-gs-01.png b/doc/images/creator-gs-01.png index a48f0b717fe..1bbf086b495 100644 Binary files a/doc/images/creator-gs-01.png and b/doc/images/creator-gs-01.png differ diff --git a/share/qtcreator/templates/wizards/qtcreatorplugin/qtcreator_logo_24.png b/share/qtcreator/templates/wizards/qtcreatorplugin/qtcreator_logo_24.png index 1f651b212f1..cbdd4f4018c 100644 Binary files a/share/qtcreator/templates/wizards/qtcreatorplugin/qtcreator_logo_24.png and b/share/qtcreator/templates/wizards/qtcreatorplugin/qtcreator_logo_24.png differ diff --git a/share/qtcreator/welcomescreen/widgets/ProjectItem.qml b/share/qtcreator/welcomescreen/widgets/ProjectItem.qml index 1804c1eb910..91f5785ff89 100644 --- a/share/qtcreator/welcomescreen/widgets/ProjectItem.qml +++ b/share/qtcreator/welcomescreen/widgets/ProjectItem.qml @@ -45,17 +45,18 @@ Item { property alias projectPath: pathText.text Image { + id: icon source: "images/project.png" anchors.verticalCenter: projectNameText.verticalCenter - width: 12 - height: 12 + width: 16 + height: 16 } LinkedText { id: projectNameText y: 2 anchors.left: parent.left - anchors.leftMargin: 7 + 12 + anchors.leftMargin: 5 + icon.width onClicked: projectWelcomePage.requestProject(filePath) } @@ -66,7 +67,7 @@ Item { color: "#6b6b6b" anchors.left: parent.left - anchors.leftMargin: 7 + 12 + anchors.leftMargin: projectNameText.anchors.leftMargin font: fonts.smallPath MouseArea { anchors.fill: parent diff --git a/share/qtcreator/welcomescreen/widgets/images/project.png b/share/qtcreator/welcomescreen/widgets/images/project.png index d9f511f94c7..7a0f8b3089b 100644 Binary files a/share/qtcreator/welcomescreen/widgets/images/project.png and b/share/qtcreator/welcomescreen/widgets/images/project.png differ diff --git a/share/qtcreator/welcomescreen/widgets/images/project@2x.png b/share/qtcreator/welcomescreen/widgets/images/project@2x.png new file mode 100644 index 00000000000..1cb309c8965 Binary files /dev/null and b/share/qtcreator/welcomescreen/widgets/images/project@2x.png differ diff --git a/share/qtcreator/welcomescreen/widgets/images/qtcreator.png b/share/qtcreator/welcomescreen/widgets/images/qtcreator.png index fca5342d45b..775e1bd83b2 100644 Binary files a/share/qtcreator/welcomescreen/widgets/images/qtcreator.png and b/share/qtcreator/welcomescreen/widgets/images/qtcreator.png differ diff --git a/src/app/qtcreator.ico b/src/app/qtcreator.ico index 05d0811d4f6..4d61c01b131 100644 Binary files a/src/app/qtcreator.ico and b/src/app/qtcreator.ico differ diff --git a/src/plugins/coreplugin/images/logo/128/QtProject-qtcreator.png b/src/plugins/coreplugin/images/logo/128/QtProject-qtcreator.png index 64cb7c437a0..62a76fe8a5f 100644 Binary files a/src/plugins/coreplugin/images/logo/128/QtProject-qtcreator.png and b/src/plugins/coreplugin/images/logo/128/QtProject-qtcreator.png differ diff --git a/src/plugins/coreplugin/images/logo/16/QtProject-qtcreator.png b/src/plugins/coreplugin/images/logo/16/QtProject-qtcreator.png index d9f511f94c7..7a0f8b3089b 100644 Binary files a/src/plugins/coreplugin/images/logo/16/QtProject-qtcreator.png and b/src/plugins/coreplugin/images/logo/16/QtProject-qtcreator.png differ diff --git a/src/plugins/coreplugin/images/logo/24/QtProject-qtcreator.png b/src/plugins/coreplugin/images/logo/24/QtProject-qtcreator.png index 1f651b212f1..cbdd4f4018c 100644 Binary files a/src/plugins/coreplugin/images/logo/24/QtProject-qtcreator.png and b/src/plugins/coreplugin/images/logo/24/QtProject-qtcreator.png differ diff --git a/src/plugins/coreplugin/images/logo/256/QtProject-qtcreator.png b/src/plugins/coreplugin/images/logo/256/QtProject-qtcreator.png index 2fc9eef4ddd..7cad3fcb411 100644 Binary files a/src/plugins/coreplugin/images/logo/256/QtProject-qtcreator.png and b/src/plugins/coreplugin/images/logo/256/QtProject-qtcreator.png differ diff --git a/src/plugins/coreplugin/images/logo/32/QtProject-qtcreator.png b/src/plugins/coreplugin/images/logo/32/QtProject-qtcreator.png index 274fb8342f3..bfffa6fa123 100644 Binary files a/src/plugins/coreplugin/images/logo/32/QtProject-qtcreator.png and b/src/plugins/coreplugin/images/logo/32/QtProject-qtcreator.png differ diff --git a/src/plugins/coreplugin/images/logo/48/QtProject-qtcreator.png b/src/plugins/coreplugin/images/logo/48/QtProject-qtcreator.png index fca5342d45b..775e1bd83b2 100644 Binary files a/src/plugins/coreplugin/images/logo/48/QtProject-qtcreator.png and b/src/plugins/coreplugin/images/logo/48/QtProject-qtcreator.png differ diff --git a/src/plugins/coreplugin/images/logo/512/QtProject-qtcreator.png b/src/plugins/coreplugin/images/logo/512/QtProject-qtcreator.png index 0e82d780865..31a4ce602f9 100644 Binary files a/src/plugins/coreplugin/images/logo/512/QtProject-qtcreator.png and b/src/plugins/coreplugin/images/logo/512/QtProject-qtcreator.png differ diff --git a/src/plugins/coreplugin/images/logo/64/QtProject-qtcreator.png b/src/plugins/coreplugin/images/logo/64/QtProject-qtcreator.png index 6fca3ee7c82..dc48122eb0d 100644 Binary files a/src/plugins/coreplugin/images/logo/64/QtProject-qtcreator.png and b/src/plugins/coreplugin/images/logo/64/QtProject-qtcreator.png differ diff --git a/src/plugins/welcome/images/mode_welcome.png b/src/plugins/welcome/images/mode_welcome.png new file mode 100644 index 00000000000..24cfcd8cc8e Binary files /dev/null and b/src/plugins/welcome/images/mode_welcome.png differ diff --git a/src/plugins/welcome/images/mode_welcome@2x.png b/src/plugins/welcome/images/mode_welcome@2x.png new file mode 100644 index 00000000000..f1e91895231 Binary files /dev/null and b/src/plugins/welcome/images/mode_welcome@2x.png differ diff --git a/src/plugins/welcome/welcome.pro b/src/plugins/welcome/welcome.pro index a6ad04e43e2..250dbda65da 100644 --- a/src/plugins/welcome/welcome.pro +++ b/src/plugins/welcome/welcome.pro @@ -15,3 +15,6 @@ HEADERS += welcomeplugin.h SOURCES += welcomeplugin.cpp DEFINES += WELCOME_LIBRARY + +RESOURCES += \ + welcome.qrc diff --git a/src/plugins/welcome/welcome.qrc b/src/plugins/welcome/welcome.qrc new file mode 100644 index 00000000000..05531f04b1d --- /dev/null +++ b/src/plugins/welcome/welcome.qrc @@ -0,0 +1,6 @@ + + + images/mode_welcome.png + images/mode_welcome@2x.png + + diff --git a/src/plugins/welcome/welcomeplugin.cpp b/src/plugins/welcome/welcomeplugin.cpp index 678ebede311..4e8b45c4625 100644 --- a/src/plugins/welcome/welcomeplugin.cpp +++ b/src/plugins/welcome/welcomeplugin.cpp @@ -114,11 +114,7 @@ WelcomeMode::WelcomeMode() : m_activePlugin(0) { setDisplayName(tr("Welcome")); - QIcon qtLogo; - qtLogo.addFile(QLatin1String(Core::Constants::ICON_QTLOGO_32)); - qtLogo.addFile(QLatin1String(Core::Constants::ICON_QTLOGO_64)); - qtLogo.addFile(QLatin1String(Core::Constants::ICON_QTLOGO_128)); - setIcon(qtLogo); + setIcon(QIcon(QLatin1String(":/welcome/images/mode_welcome.png"))); setPriority(Core::Constants::P_MODE_WELCOME); setId(Core::Constants::MODE_WELCOME); setContextHelpId(QLatin1String("Qt Creator Manual")); diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg index d9ae51a58e0..568aa5f1138 100644 --- a/src/tools/icons/qtcreatoricons.svg +++ b/src/tools/icons/qtcreatoricons.svg @@ -581,6 +581,66 @@ y1="587" x2="181" y2="599" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1482,7 +1788,7 @@ sodipodi:cy="544" sodipodi:rx="7" sodipodi:ry="7" - d="m 63,544 c 0,3.86599 -3.134007,7 -7,7 -3.865993,0 -7,-3.13401 -7,-7 0,-3.86599 3.134007,-7 7,-7 3.865993,0 7,3.13401 7,7 z" + d="m 63,544 a 7,7 0 0 1 -7,7 7,7 0 0 1 -7,-7 7,7 0 0 1 7,-7 7,7 0 0 1 7,7 z" transform="translate(438,48)" />