move QTCREATORLOGO_BIG back to coreplugin
It was a regression from the "Move icons to Utils" commit which broke qbs builds. QTCREATORLOGO_BIG aka QtProject-qtcreator.png is only used in coreplugin and have some not moved install logic inside coreplugin.pro Change-Id: I8258b845108f8801581d7ee8d6771808b306a602 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
@@ -45,8 +45,6 @@
|
|||||||
<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 alias="images/qtcreatorlogo-big.png">images/logo/128/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>
|
||||||
|
|||||||
@@ -86,8 +86,6 @@ const Icon RESET_TOOLBAR({
|
|||||||
{QLatin1String(":/utils/images/reset.png"), Theme::IconsBaseColor}});
|
{QLatin1String(":/utils/images/reset.png"), Theme::IconsBaseColor}});
|
||||||
const Icon DARK_CLOSE(
|
const Icon DARK_CLOSE(
|
||||||
QLatin1String(":/utils/images/darkclose.png"));
|
QLatin1String(":/utils/images/darkclose.png"));
|
||||||
const Icon QTCREATORLOGO_BIG(
|
|
||||||
QLatin1String(":/utils/images/qtcreatorlogo-big.png"));
|
|
||||||
|
|
||||||
const Icon ARROW_UP({
|
const Icon ARROW_UP({
|
||||||
{QLatin1String(":/utils/images/arrowup.png"), Theme::IconsBaseColor}});
|
{QLatin1String(":/utils/images/arrowup.png"), Theme::IconsBaseColor}});
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
<RCC>
|
<RCC>
|
||||||
<qresource prefix="/core">
|
<qresource prefix="/core">
|
||||||
|
<file alias="images/qtcreatorlogo-big.png">images/logo/128/QtProject-qtcreator.png</file>
|
||||||
|
<file alias="images/qtcreatorlogo-big@2x.png">images/logo/256/QtProject-qtcreator.png</file>
|
||||||
</qresource>
|
</qresource>
|
||||||
</RCC>
|
</RCC>
|
||||||
|
|||||||
@@ -30,6 +30,8 @@ using namespace Utils;
|
|||||||
namespace Core {
|
namespace Core {
|
||||||
namespace Icons {
|
namespace Icons {
|
||||||
|
|
||||||
|
const Icon QTCREATORLOGO_BIG(
|
||||||
|
QLatin1String(":/core/images/qtcreatorlogo-big.png"));
|
||||||
const Icon FIND_CASE_INSENSITIVELY(
|
const Icon FIND_CASE_INSENSITIVELY(
|
||||||
QLatin1String(":/find/images/casesensitively.png"));
|
QLatin1String(":/find/images/casesensitively.png"));
|
||||||
const Icon FIND_WHOLE_WORD(
|
const Icon FIND_WHOLE_WORD(
|
||||||
|
|||||||
@@ -32,6 +32,7 @@
|
|||||||
namespace Core {
|
namespace Core {
|
||||||
namespace Icons {
|
namespace Icons {
|
||||||
|
|
||||||
|
CORE_EXPORT extern const Utils::Icon QTCREATORLOGO_BIG;
|
||||||
CORE_EXPORT extern const Utils::Icon FIND_CASE_INSENSITIVELY;
|
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;
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 3.7 KiB After Width: | Height: | Size: 3.7 KiB |
|
Before Width: | Height: | Size: 487 B After Width: | Height: | Size: 487 B |
|
Before Width: | Height: | Size: 650 B After Width: | Height: | Size: 650 B |
|
Before Width: | Height: | Size: 8.0 KiB After Width: | Height: | Size: 8.0 KiB |
|
Before Width: | Height: | Size: 976 B After Width: | Height: | Size: 976 B |
|
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 1.4 KiB |
|
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 18 KiB |
|
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 1.8 KiB |
@@ -50,6 +50,7 @@
|
|||||||
#include "externaltoolmanager.h"
|
#include "externaltoolmanager.h"
|
||||||
#include "editormanager/systemeditor.h"
|
#include "editormanager/systemeditor.h"
|
||||||
#include "windowsupport.h"
|
#include "windowsupport.h"
|
||||||
|
#include "coreicons.h"
|
||||||
|
|
||||||
#include <app/app_version.h>
|
#include <app/app_version.h>
|
||||||
#include <coreplugin/actionmanager/actioncontainer.h>
|
#include <coreplugin/actionmanager/actioncontainer.h>
|
||||||
@@ -147,7 +148,7 @@ MainWindow::MainWindow() :
|
|||||||
|
|
||||||
setWindowTitle(tr("Qt Creator"));
|
setWindowTitle(tr("Qt Creator"));
|
||||||
if (HostOsInfo::isLinuxHost())
|
if (HostOsInfo::isLinuxHost())
|
||||||
QApplication::setWindowIcon(Utils::Icons::QTCREATORLOGO_BIG.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));
|
||||||
|
|||||||
@@ -24,6 +24,7 @@
|
|||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
#include "versiondialog.h"
|
#include "versiondialog.h"
|
||||||
|
#include "coreicons.h"
|
||||||
|
|
||||||
#include <app/app_version.h>
|
#include <app/app_version.h>
|
||||||
#include <coreplugin/coreicons.h>
|
#include <coreplugin/coreicons.h>
|
||||||
@@ -48,7 +49,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(Utils::Icons::QTCREATORLOGO_BIG.icon());
|
setWindowIcon(Icons::QTCREATORLOGO_BIG.icon());
|
||||||
|
|
||||||
setWindowTitle(tr("About Qt Creator"));
|
setWindowTitle(tr("About Qt Creator"));
|
||||||
setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
|
setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
|
||||||
@@ -102,7 +103,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(Utils::Icons::QTCREATORLOGO_BIG.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);
|
||||||
|
|||||||