From a1d4b63f8d13cd7afe676c3673b752a50820d614 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Mon, 12 Jun 2017 18:27:57 +0200 Subject: CPlusPlus: Add a property icon Properties have been so useful in Qt for Years, and they will continue being so. Properties deserve a proper icon. Change-Id: Ifd19c97470a48a033bbe4017855f7b150befb365 Reviewed-by: Nikolai Kosjar Reviewed-by: Ivan Donchevskii --- src/libs/cplusplus/Icons.cpp | 12 ++++++++++++ src/libs/cplusplus/Icons.h | 1 + src/libs/cplusplus/cplusplus.qrc | 4 ++++ src/libs/cplusplus/images/property.png | Bin 0 -> 148 bytes src/libs/cplusplus/images/property@2x.png | Bin 0 -> 133 bytes src/libs/cplusplus/images/propertybackground.png | Bin 0 -> 131 bytes src/libs/cplusplus/images/propertybackground@2x.png | Bin 0 -> 187 bytes 7 files changed, 17 insertions(+) create mode 100644 src/libs/cplusplus/images/property.png create mode 100644 src/libs/cplusplus/images/property@2x.png create mode 100644 src/libs/cplusplus/images/propertybackground.png create mode 100644 src/libs/cplusplus/images/propertybackground@2x.png (limited to 'src/libs/cplusplus') diff --git a/src/libs/cplusplus/Icons.cpp b/src/libs/cplusplus/Icons.cpp index 27e4b92d09..5e5297b403 100644 --- a/src/libs/cplusplus/Icons.cpp +++ b/src/libs/cplusplus/Icons.cpp @@ -107,6 +107,8 @@ Icons::IconType Icons::iconTypeForSymbol(const Symbol *symbol) return NamespaceIconType; } else if (symbol->isTypenameArgument()) { return ClassIconType; + } else if (symbol->isQtPropertyDeclaration() || symbol->isObjCPropertyDeclaration()) { + return PropertyIconType; } else if (symbol->isUsingNamespaceDirective() || symbol->isUsingDeclaration()) { // TODO: Might be nice to have a different icons for these things @@ -136,6 +138,10 @@ QIcon Icons::iconForType(IconType type) QLatin1String(":/codemodel/images/signal.png"), Theme::IconsCodeModelFunctionColor}; static const IconMaskAndColor slotIcon { QLatin1String(":/codemodel/images/slot.png"), Theme::IconsCodeModelFunctionColor}; + static const IconMaskAndColor propertyIcon { + QLatin1String(":/codemodel/images/property.png"), Theme::IconsCodeModelOverlayForegroundColor}; + static const IconMaskAndColor propertyBackgroundIcon { + QLatin1String(":/codemodel/images/propertybackground.png"), Theme::IconsCodeModelOverlayBackgroundColor}; static const IconMaskAndColor protectedIcon { QLatin1String(":/codemodel/images/protected.png"), Theme::IconsCodeModelOverlayForegroundColor}; static const IconMaskAndColor protectedBackgroundIcon { @@ -291,6 +297,12 @@ QIcon Icons::iconForType(IconType type) }, Icon::Tint).icon()); return icon; } + case PropertyIconType: { + const static QIcon icon(Icon({ + variableIcon, propertyBackgroundIcon, propertyIcon + }, Icon::Tint).icon()); + return icon; + } default: break; } diff --git a/src/libs/cplusplus/Icons.h b/src/libs/cplusplus/Icons.h index 2b8ce0beee..a5aaa33d60 100644 --- a/src/libs/cplusplus/Icons.h +++ b/src/libs/cplusplus/Icons.h @@ -65,6 +65,7 @@ public: SlotPrivateIconType, KeywordIconType, MacroIconType, + PropertyIconType, UnknownIconType }; diff --git a/src/libs/cplusplus/cplusplus.qrc b/src/libs/cplusplus/cplusplus.qrc index 32d9a71249..357db691c0 100644 --- a/src/libs/cplusplus/cplusplus.qrc +++ b/src/libs/cplusplus/cplusplus.qrc @@ -18,6 +18,10 @@ images/private@2x.png images/privatebackground.png images/privatebackground@2x.png + images/property.png + images/property@2x.png + images/propertybackground.png + images/propertybackground@2x.png images/protected.png images/protected@2x.png images/protectedbackground.png diff --git a/src/libs/cplusplus/images/property.png b/src/libs/cplusplus/images/property.png new file mode 100644 index 0000000000..e3f2244ca5 Binary files /dev/null and b/src/libs/cplusplus/images/property.png differ diff --git a/src/libs/cplusplus/images/property@2x.png b/src/libs/cplusplus/images/property@2x.png new file mode 100644 index 0000000000..9e5b80909e Binary files /dev/null and b/src/libs/cplusplus/images/property@2x.png differ diff --git a/src/libs/cplusplus/images/propertybackground.png b/src/libs/cplusplus/images/propertybackground.png new file mode 100644 index 0000000000..7766b9fe82 Binary files /dev/null and b/src/libs/cplusplus/images/propertybackground.png differ diff --git a/src/libs/cplusplus/images/propertybackground@2x.png b/src/libs/cplusplus/images/propertybackground@2x.png new file mode 100644 index 0000000000..0557290218 Binary files /dev/null and b/src/libs/cplusplus/images/propertybackground@2x.png differ -- cgit v1.2.1