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

Core: HighDPI-aware Qt Creator logo

Browse Source 
This change makes sure that the usage of Qt Creator logo is HigDPI
aware. We use qrc file name aliases to be able to use the "@2x"
mechanism.

Change-Id: I8dbb77b6cd9a3b6ab4530b84c18e0f83a662d710
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
This commit is contained in:
Alessandro Portale
2016-05-27 10:34:20 +02:00
parent 1663b44a7f
commit addc397073
5 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/coreplugin/core.qrc
View File

@@ -13,8 +13,8 @@
<file>images/fileopen.png</file> <file>images/fileopen.png</file>
<file>images/filesave.png</file> <file>images/filesave.png</file>
<file>images/filesave@2x.png</file> <file>images/filesave@2x.png</file>
<file>images/logo/128/QtProject-qtcreator.png</file> <file alias="images/qtcreatorlogo-big.png">images/logo/128/QtProject-qtcreator.png</file>
<file>images/logo/32/QtProject-qtcreator.png</file> <file alias="images/qtcreatorlogo-big@2x.png">images/logo/256/QtProject-qtcreator.png</file>
<file>images/inputfield.png</file> <file>images/inputfield.png</file>
<file>images/inputfield@2x.png</file> <file>images/inputfield@2x.png</file>
<file>images/inputfield_disabled.png</file> <file>images/inputfield_disabled.png</file>

8
src/plugins/coreplugin/coreicons.cpp
View File

@@ -70,12 +70,8 @@ const Icon FIND_REGEXP(
QLatin1String(":/find/images/regexp.png")); QLatin1String(":/find/images/regexp.png"));
const Icon FIND_PRESERVE_CASE( const Icon FIND_PRESERVE_CASE(
QLatin1String(":/find/images/preservecase.png")); QLatin1String(":/find/images/preservecase.png"));
const Icon QTLOGO_32( const Icon QTCREATORLOGO_BIG(
QLatin1String(":/core/images/logo/32/QtProject-qtcreator.png")); QLatin1String(":/core/images/qtcreatorlogo-big.png"));
const Icon QTLOGO_64(
QLatin1String(":/core/images/logo/64/QtProject-qtcreator.png"));
const Icon QTLOGO_128(
QLatin1String(":/core/images/logo/128/QtProject-qtcreator.png"));
const Icon ARROW_UP({ const Icon ARROW_UP({
{QLatin1String(":/core/images/arrowup.png"), Theme::IconsBaseColor}}); {QLatin1String(":/core/images/arrowup.png"), Theme::IconsBaseColor}});

4
src/plugins/coreplugin/coreicons.h
View File

@@ -52,9 +52,7 @@ CORE_EXPORT extern const Utils::Icon FIND_CASE_INSENSITIVELY;
CORE_EXPORT extern const Utils::Icon FIND_WHOLE_WORD; CORE_EXPORT extern const Utils::Icon FIND_WHOLE_WORD;
CORE_EXPORT extern const Utils::Icon FIND_REGEXP; CORE_EXPORT extern const Utils::Icon FIND_REGEXP;
CORE_EXPORT extern const Utils::Icon FIND_PRESERVE_CASE; CORE_EXPORT extern const Utils::Icon FIND_PRESERVE_CASE;
CORE_EXPORT extern const Utils::Icon QTLOGO_32; CORE_EXPORT extern const Utils::Icon QTCREATORLOGO_BIG;
CORE_EXPORT extern const Utils::Icon QTLOGO_64;
CORE_EXPORT extern const Utils::Icon QTLOGO_128;
CORE_EXPORT extern const Utils::Icon ARROW_UP; CORE_EXPORT extern const Utils::Icon ARROW_UP;
CORE_EXPORT extern const Utils::Icon ARROW_DOWN; CORE_EXPORT extern const Utils::Icon ARROW_DOWN;

2
src/plugins/coreplugin/mainwindow.cpp
View File

@@ -147,7 +147,7 @@ MainWindow::MainWindow() :
setWindowTitle(tr("Qt Creator")); setWindowTitle(tr("Qt Creator"));
if (HostOsInfo::isLinuxHost()) if (HostOsInfo::isLinuxHost())
QApplication::setWindowIcon(Icons::QTLOGO_128.icon()); QApplication::setWindowIcon(Icons::QTCREATORLOGO_BIG.icon());
QCoreApplication::setApplicationName(QLatin1String("QtCreator")); QCoreApplication::setApplicationName(QLatin1String("QtCreator"));
QCoreApplication::setApplicationVersion(QLatin1String(Constants::IDE_VERSION_LONG)); QCoreApplication::setApplicationVersion(QLatin1String(Constants::IDE_VERSION_LONG));
QCoreApplication::setOrganizationName(QLatin1String(Constants::IDE_SETTINGSVARIANT_STR)); QCoreApplication::setOrganizationName(QLatin1String(Constants::IDE_SETTINGSVARIANT_STR));

4
src/plugins/coreplugin/versiondialog.cpp
View File

@@ -47,7 +47,7 @@ VersionDialog::VersionDialog(QWidget *parent)
// We need to set the window icon explicitly here since for some reason the // We need to set the window icon explicitly here since for some reason the
// application icon isn't used when the size of the dialog is fixed (at least not on X11/GNOME) // application icon isn't used when the size of the dialog is fixed (at least not on X11/GNOME)
if (Utils::HostOsInfo::isLinuxHost()) if (Utils::HostOsInfo::isLinuxHost())
setWindowIcon(Icons::QTLOGO_128.icon()); setWindowIcon(Icons::QTCREATORLOGO_BIG.icon());
setWindowTitle(tr("About Qt Creator")); setWindowTitle(tr("About Qt Creator"));
setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
@@ -101,7 +101,7 @@ VersionDialog::VersionDialog(QWidget *parent)
connect(buttonBox , &QDialogButtonBox::rejected, this, &QDialog::reject); connect(buttonBox , &QDialogButtonBox::rejected, this, &QDialog::reject);
QLabel *logoLabel = new QLabel; QLabel *logoLabel = new QLabel;
logoLabel->setPixmap(Icons::QTLOGO_128.pixmap()); logoLabel->setPixmap(Icons::QTCREATORLOGO_BIG.pixmap());
layout->addWidget(logoLabel , 0, 0, 1, 1); layout->addWidget(logoLabel , 0, 0, 1, 1);
layout->addWidget(copyRightLabel, 0, 1, 4, 4); layout->addWidget(copyRightLabel, 0, 1, 4, 4);
layout->addWidget(buttonBox, 4, 0, 1, 5); layout->addWidget(buttonBox, 4, 0, 1, 5);