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

Kit: Use FileName for icon path

Browse Source 
Change-Id: Ica6cf20c4ae1c7d58386d4970e468a105a3263b3
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Tobias Hunger
2013-08-21 13:04:00 +02:00
parent a31b1ef562
commit 1b4b6ed6ca
7 changed files with 29 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/android/androidconfigurations.cpp
View File

@@ -775,7 +775,7 @@ void AndroidConfigurations::updateAutomaticKitList()
foreach (QtSupport::BaseQtVersion *qt, qtVersions) { foreach (QtSupport::BaseQtVersion *qt, qtVersions) {
Kit *newKit = new Kit; Kit *newKit = new Kit;
newKit->setAutoDetected(true); newKit->setAutoDetected(true);
newKit->setIconPath(QLatin1String(Constants::ANDROID_SETTINGS_CATEGORY_ICON)); newKit->setIconPath(Utils::FileName::fromString(QLatin1String(Constants::ANDROID_SETTINGS_CATEGORY_ICON)));
DeviceTypeKitInformation::setDeviceTypeId(newKit, Core::Id(Constants::ANDROID_DEVICE_TYPE)); DeviceTypeKitInformation::setDeviceTypeId(newKit, Core::Id(Constants::ANDROID_DEVICE_TYPE));
ToolChainKitInformation::setToolChain(newKit, tc); ToolChainKitInformation::setToolChain(newKit, tc);
QtSupport::QtKitInformation::setQtVersion(newKit, qt); QtSupport::QtKitInformation::setQtVersion(newKit, qt);

20
src/plugins/projectexplorer/kit.cpp
View File

@@ -100,7 +100,7 @@ public:
bool m_isValid; bool m_isValid;
bool m_hasWarning; bool m_hasWarning;
QIcon m_icon; QIcon m_icon;
QString m_iconPath; Utils::FileName m_iconPath;
int m_nestedBlockingLevel; int m_nestedBlockingLevel;
bool m_mustNotify; bool m_mustNotify;
bool m_mustNotifyAboutDisplayName; bool m_mustNotifyAboutDisplayName;
@@ -123,7 +123,7 @@ Kit::Kit(Core::Id id) :
setValue(sti->dataId(), sti->defaultValue(this)); setValue(sti->dataId(), sti->defaultValue(this));
setDisplayName(QCoreApplication::translate("ProjectExplorer::Kit", "Unnamed")); setDisplayName(QCoreApplication::translate("ProjectExplorer::Kit", "Unnamed"));
setIconPath(QLatin1String(":///DESKTOP///")); setIconPath(Utils::FileName::fromString(QLatin1String(":///DESKTOP///")));
} }
Kit::~Kit() Kit::~Kit()
@@ -298,25 +298,25 @@ QIcon Kit::icon() const
return d->m_icon; return d->m_icon;
} }
QIcon Kit::icon(const QString &path) QIcon Kit::icon(const Utils::FileName &path)
{ {
if (path.isEmpty()) if (path.isEmpty())
return QIcon(); return QIcon();
if (path == QLatin1String(":///DESKTOP///")) if (path == Utils::FileName::fromString(QLatin1String(":///DESKTOP///")))
return qApp->style()->standardIcon(QStyle::SP_ComputerIcon); return qApp->style()->standardIcon(QStyle::SP_ComputerIcon);
QFileInfo fi(path); QFileInfo fi(path.toString());
if (fi.isFile() && fi.isReadable()) if (fi.isFile() && fi.isReadable())
return QIcon(path); return QIcon(path.toString());
return QIcon(); return QIcon();
} }
QString Kit::iconPath() const Utils::FileName Kit::iconPath() const
{ {
return d->m_iconPath; return d->m_iconPath;
} }
void Kit::setIconPath(const QString &path) void Kit::setIconPath(const Utils::FileName &path)
{ {
if (d->m_iconPath == path) if (d->m_iconPath == path)
return; return;
@@ -378,7 +378,7 @@ QVariantMap Kit::toMap() const
data.insert(QLatin1String(DISPLAYNAME_KEY), d->m_displayName); data.insert(QLatin1String(DISPLAYNAME_KEY), d->m_displayName);
data.insert(QLatin1String(AUTODETECTED_KEY), d->m_autodetected); data.insert(QLatin1String(AUTODETECTED_KEY), d->m_autodetected);
data.insert(QLatin1String(SDK_PROVIDED_KEY), d->m_sdkProvided); data.insert(QLatin1String(SDK_PROVIDED_KEY), d->m_sdkProvided);
data.insert(QLatin1String(ICON_KEY), d->m_iconPath); data.insert(QLatin1String(ICON_KEY), d->m_iconPath.toString());
QVariantMap extra; QVariantMap extra;
@@ -465,7 +465,7 @@ bool Kit::fromMap(const QVariantMap &data)
else else
d->m_sdkProvided = d->m_autodetected; d->m_sdkProvided = d->m_autodetected;
setDisplayName(data.value(QLatin1String(DISPLAYNAME_KEY)).toString()); setDisplayName(data.value(QLatin1String(DISPLAYNAME_KEY)).toString());
setIconPath(data.value(QLatin1String(ICON_KEY)).toString()); setIconPath(Utils::FileName::fromString(data.value(QLatin1String(ICON_KEY)).toString()));
QVariantMap extra = data.value(QLatin1String(DATA_KEY)).toMap(); QVariantMap extra = data.value(QLatin1String(DATA_KEY)).toMap();
d->m_data.clear(); // remove default values d->m_data.clear(); // remove default values

6
src/plugins/projectexplorer/kit.h
View File

@@ -80,9 +80,9 @@ public:
Core::Id id() const; Core::Id id() const;
QIcon icon() const; QIcon icon() const;
static QIcon icon(const QString &path); static QIcon icon(const Utils::FileName &path);
QString iconPath() const; Utils::FileName iconPath() const;
void setIconPath(const QString &path); void setIconPath(const Utils::FileName &path);
QVariant value(Core::Id key, const QVariant &unset = QVariant()) const; QVariant value(Core::Id key, const QVariant &unset = QVariant()) const;
bool hasValue(Core::Id key) const; bool hasValue(Core::Id key) const;

2
src/plugins/projectexplorer/kitmanager.cpp
View File

@@ -244,7 +244,7 @@ void KitManager::restoreKits()
defaultKit->setDisplayName(tr("Desktop")); defaultKit->setDisplayName(tr("Desktop"));
defaultKit->setSdkProvided(false); defaultKit->setSdkProvided(false);
defaultKit->setAutoDetected(false); defaultKit->setAutoDetected(false);
defaultKit->setIconPath(QLatin1String(":///DESKTOP///")); defaultKit->setIconPath(Utils::FileName::fromString(QLatin1String(":///DESKTOP///")));
defaultKit->setup(); defaultKit->setup();

7
src/plugins/projectexplorer/kitmanagerconfigwidget.cpp
View File

@@ -242,11 +242,14 @@ void KitManagerConfigWidget::removeKit()
void KitManagerConfigWidget::setIcon() void KitManagerConfigWidget::setIcon()
{ {
const QString path = QFileDialog::getOpenFileName(this, tr("Select Icon"), m_modifiedKit->iconPath(), tr("Images (*.png *.xpm *.jpg)")); const Utils::FileName path = Utils::FileName::fromString(
QFileDialog::getOpenFileName(this, tr("Select Icon"),
m_modifiedKit->iconPath().toString(),
tr("Images (*.png *.xpm *.jpg)")));
if (path.isEmpty()) if (path.isEmpty())
return; return;
const QIcon icon = QIcon(path); const QIcon icon = Kit::icon(path);
if (icon.isNull()) if (icon.isNull())
return; return;

16
src/plugins/projectexplorer/settingsaccessor.cpp
View File

@@ -2396,35 +2396,35 @@ QVariantMap Version11Handler::update(Project *project, const QVariantMap &map)
Kit *tmpKit = rawKit; Kit *tmpKit = rawKit;
if (oldTargetId == QLatin1String("Qt4ProjectManager.Target.AndroidDeviceTarget")) { if (oldTargetId == QLatin1String("Qt4ProjectManager.Target.AndroidDeviceTarget")) {
tmpKit->setIconPath(QLatin1String(":/android/images/QtAndroid.png")); tmpKit->setIconPath(Utils::FileName::fromString(QLatin1String(":/android/images/QtAndroid.png")));
tmpKit->setValue(Core::Id("PE.Profile.DeviceType"), QString::fromLatin1("Desktop")); tmpKit->setValue(Core::Id("PE.Profile.DeviceType"), QString::fromLatin1("Desktop"));
tmpKit->setValue(Core::Id("PE.Profile.Device"), QString()); tmpKit->setValue(Core::Id("PE.Profile.Device"), QString());
} else if (oldTargetId == QLatin1String("RemoteLinux.EmbeddedLinuxTarget")) { } else if (oldTargetId == QLatin1String("RemoteLinux.EmbeddedLinuxTarget")) {
tmpKit->setIconPath(QLatin1String(":///DESKTOP///")); tmpKit->setIconPath(Utils::FileName::fromString(QLatin1String(":///DESKTOP///")));
tmpKit->setValue(Core::Id("PE.Profile.DeviceType"), QString::fromLatin1("GenericLinuxOsType")); tmpKit->setValue(Core::Id("PE.Profile.DeviceType"), QString::fromLatin1("GenericLinuxOsType"));
tmpKit->setValue(Core::Id("PE.Profile.Device"), QString()); tmpKit->setValue(Core::Id("PE.Profile.Device"), QString());
} else if (oldTargetId == QLatin1String("Qt4ProjectManager.Target.HarmattanDeviceTarget")) { } else if (oldTargetId == QLatin1String("Qt4ProjectManager.Target.HarmattanDeviceTarget")) {
tmpKit->setIconPath(QLatin1String(":/projectexplorer/images/MaemoDevice.png")); tmpKit->setIconPath(Utils::FileName::fromString(QLatin1String(":/projectexplorer/images/MaemoDevice.png")));
tmpKit->setValue(Core::Id("PE.Profile.DeviceType"), QString::fromLatin1("HarmattanOsType")); tmpKit->setValue(Core::Id("PE.Profile.DeviceType"), QString::fromLatin1("HarmattanOsType"));
tmpKit->setValue(Core::Id("PE.Profile.Device"), QString()); tmpKit->setValue(Core::Id("PE.Profile.Device"), QString());
} else if (oldTargetId == QLatin1String("Qt4ProjectManager.Target.MaemoDeviceTarget")) { } else if (oldTargetId == QLatin1String("Qt4ProjectManager.Target.MaemoDeviceTarget")) {
tmpKit->setIconPath(QLatin1String(":/projectexplorer/images/MaemoDevice.png")); tmpKit->setIconPath(Utils::FileName::fromString(QLatin1String(":/projectexplorer/images/MaemoDevice.png")));
tmpKit->setValue(Core::Id("PE.Profile.DeviceType"), QString::fromLatin1("Maemo5OsType")); tmpKit->setValue(Core::Id("PE.Profile.DeviceType"), QString::fromLatin1("Maemo5OsType"));
tmpKit->setValue(Core::Id("PE.Profile.Device"), QString()); tmpKit->setValue(Core::Id("PE.Profile.Device"), QString());
} else if (oldTargetId == QLatin1String("Qt4ProjectManager.Target.MeegoDeviceTarget")) { } else if (oldTargetId == QLatin1String("Qt4ProjectManager.Target.MeegoDeviceTarget")) {
tmpKit->setIconPath(QLatin1String(":/projectexplorer/images/MaemoDevice.png")); tmpKit->setIconPath(Utils::FileName::fromString(QLatin1String(":/projectexplorer/images/MaemoDevice.png")));
tmpKit->setValue(Core::Id("PE.Profile.DeviceType"), QString::fromLatin1("MeegoOsType")); tmpKit->setValue(Core::Id("PE.Profile.DeviceType"), QString::fromLatin1("MeegoOsType"));
tmpKit->setValue(Core::Id("PE.Profile.Device"), QString()); tmpKit->setValue(Core::Id("PE.Profile.Device"), QString());
} else if (oldTargetId == QLatin1String("Qt4ProjectManager.Target.S60DeviceTarget")) { } else if (oldTargetId == QLatin1String("Qt4ProjectManager.Target.S60DeviceTarget")) {
tmpKit->setIconPath(QLatin1String(":/projectexplorer/images/SymbianDevice.png")); tmpKit->setIconPath(Utils::FileName::fromString(QLatin1String(":/projectexplorer/images/SymbianDevice.png")));
tmpKit->setValue(Core::Id("PE.Profile.DeviceType"), QString::fromLatin1("Qt4ProjectManager.SymbianDevice")); tmpKit->setValue(Core::Id("PE.Profile.DeviceType"), QString::fromLatin1("Qt4ProjectManager.SymbianDevice"));
tmpKit->setValue(Core::Id("PE.Profile.Device"), QString::fromLatin1("Symbian Device")); tmpKit->setValue(Core::Id("PE.Profile.Device"), QString::fromLatin1("Symbian Device"));
} else if (oldTargetId == QLatin1String("Qt4ProjectManager.Target.QtSimulatorTarget")) { } else if (oldTargetId == QLatin1String("Qt4ProjectManager.Target.QtSimulatorTarget")) {
tmpKit->setIconPath(QLatin1String(":/projectexplorer/images/Simulator.png")); tmpKit->setIconPath(Utils::FileName::fromString(QLatin1String(":/projectexplorer/images/Simulator.png")));
tmpKit->setValue(Core::Id("PE.Profile.DeviceType"), QString::fromLatin1("Desktop")); tmpKit->setValue(Core::Id("PE.Profile.DeviceType"), QString::fromLatin1("Desktop"));
tmpKit->setValue(Core::Id("PE.Profile.Device"), QString::fromLatin1("Desktop Device")); tmpKit->setValue(Core::Id("PE.Profile.Device"), QString::fromLatin1("Desktop Device"));
} else { } else {
tmpKit->setIconPath(QLatin1String(":///DESKTOP///")); tmpKit->setIconPath(Utils::FileName::fromString(QLatin1String(":///DESKTOP///")));
tmpKit->setValue(Core::Id("PE.Profile.DeviceType"), QString::fromLatin1("Desktop")); tmpKit->setValue(Core::Id("PE.Profile.DeviceType"), QString::fromLatin1("Desktop"));
tmpKit->setValue(Core::Id("PE.Profile.Device"), QString::fromLatin1("Desktop Device")); tmpKit->setValue(Core::Id("PE.Profile.Device"), QString::fromLatin1("Desktop Device"));
} }

2
src/plugins/qnx/blackberryconfiguration.cpp
View File

@@ -264,7 +264,7 @@ ProjectExplorer::Kit *BlackBerryConfiguration::createKit(QnxArchitecture arch, Q
kit->setAutoDetected(m_isAutoDetected); kit->setAutoDetected(m_isAutoDetected);
kit->setIconPath(QLatin1String(Constants::QNX_BB_CATEGORY_ICON)); kit->setIconPath(Utils::FileName::fromString(QLatin1String(Constants::QNX_BB_CATEGORY_ICON)));
setSticky(kit); setSticky(kit);
ProjectExplorer::DeviceTypeKitInformation::setDeviceTypeId(kit, Constants::QNX_BB_OS_TYPE); ProjectExplorer::DeviceTypeKitInformation::setDeviceTypeId(kit, Constants::QNX_BB_OS_TYPE);
ProjectExplorer::SysRootKitInformation::setSysRoot(kit, m_sysRoot); ProjectExplorer::SysRootKitInformation::setSysRoot(kit, m_sysRoot);