From 4c7cef82aa06a31a1a0a14c054e9389b048f7258 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Fri, 8 Apr 2016 17:33:57 +0200 Subject: [PATCH] CPlusPlus: New code model icons Change-Id: I9ad6445319d85ffb652377a00256a68d56754352 Reviewed-by: David Schulz Reviewed-by: Eike Ziller --- share/qtcreator/themes/dark.creatortheme | 9 + share/qtcreator/themes/default.creatortheme | 9 + .../qtcreator/themes/defaultflat.creatortheme | 9 + src/libs/cplusplus/Icons.cpp | 128 +++- src/libs/cplusplus/cplusplus.qrc | 47 +- src/libs/cplusplus/images/class.png | Bin 573 -> 0 bytes .../cplusplus/images/classmemberfunction.png | Bin 0 -> 139 bytes .../images/classmemberfunction@2x.png | Bin 0 -> 168 bytes .../cplusplus/images/classmembervariable.png | Bin 0 -> 136 bytes .../images/classmembervariable@2x.png | Bin 0 -> 165 bytes src/libs/cplusplus/images/classparent.png | Bin 0 -> 155 bytes src/libs/cplusplus/images/classparent@2x.png | Bin 0 -> 175 bytes src/libs/cplusplus/images/classrelation.png | Bin 0 -> 106 bytes .../cplusplus/images/classrelation@2x.png | Bin 0 -> 114 bytes .../images/classrelationbackground.png | Bin 0 -> 121 bytes .../images/classrelationbackground@2x.png | Bin 0 -> 133 bytes src/libs/cplusplus/images/enum.png | Bin 359 -> 112 bytes src/libs/cplusplus/images/enum@2x.png | Bin 0 -> 118 bytes src/libs/cplusplus/images/enumerator.png | Bin 478 -> 124 bytes src/libs/cplusplus/images/enumerator@2x.png | Bin 0 -> 129 bytes src/libs/cplusplus/images/func.png | Bin 583 -> 0 bytes src/libs/cplusplus/images/func_priv.png | Bin 656 -> 0 bytes src/libs/cplusplus/images/func_priv_st.png | Bin 685 -> 0 bytes src/libs/cplusplus/images/func_prot.png | Bin 647 -> 0 bytes src/libs/cplusplus/images/func_prot_st.png | Bin 679 -> 0 bytes src/libs/cplusplus/images/func_st.png | Bin 651 -> 0 bytes src/libs/cplusplus/images/keyword.png | Bin 341 -> 139 bytes src/libs/cplusplus/images/keyword@2x.png | Bin 0 -> 143 bytes src/libs/cplusplus/images/macro.png | Bin 405 -> 133 bytes src/libs/cplusplus/images/macro@2x.png | Bin 0 -> 217 bytes src/libs/cplusplus/images/member.png | Bin 0 -> 169 bytes src/libs/cplusplus/images/member@2x.png | Bin 0 -> 202 bytes src/libs/cplusplus/images/namespace.png | Bin 377 -> 130 bytes src/libs/cplusplus/images/namespace@2x.png | Bin 0 -> 169 bytes src/libs/cplusplus/images/private.png | Bin 0 -> 112 bytes src/libs/cplusplus/images/private@2x.png | Bin 0 -> 165 bytes .../cplusplus/images/privatebackground.png | Bin 0 -> 144 bytes .../cplusplus/images/privatebackground@2x.png | Bin 0 -> 153 bytes src/libs/cplusplus/images/protected.png | Bin 0 -> 115 bytes src/libs/cplusplus/images/protected@2x.png | Bin 0 -> 177 bytes .../cplusplus/images/protectedbackground.png | Bin 0 -> 216 bytes .../images/protectedbackground@2x.png | Bin 0 -> 385 bytes src/libs/cplusplus/images/signal.png | Bin 393 -> 199 bytes src/libs/cplusplus/images/signal@2x.png | Bin 0 -> 374 bytes src/libs/cplusplus/images/slot.png | Bin 498 -> 188 bytes src/libs/cplusplus/images/slot@2x.png | Bin 0 -> 210 bytes src/libs/cplusplus/images/slot_priv.png | Bin 468 -> 0 bytes src/libs/cplusplus/images/slot_prot.png | Bin 452 -> 0 bytes src/libs/cplusplus/images/static.png | Bin 164 -> 120 bytes src/libs/cplusplus/images/static@2x.png | Bin 0 -> 159 bytes .../cplusplus/images/staticbackground.png | Bin 0 -> 131 bytes .../cplusplus/images/staticbackground@2x.png | Bin 0 -> 173 bytes src/libs/cplusplus/images/struct.png | Bin 641 -> 0 bytes src/libs/cplusplus/images/var.png | Bin 530 -> 0 bytes src/libs/cplusplus/images/var_priv.png | Bin 632 -> 0 bytes src/libs/cplusplus/images/var_priv_st.png | Bin 676 -> 0 bytes src/libs/cplusplus/images/var_prot.png | Bin 619 -> 0 bytes src/libs/cplusplus/images/var_prot_st.png | Bin 658 -> 0 bytes src/libs/cplusplus/images/var_st.png | Bin 629 -> 0 bytes src/libs/utils/theme/theme.h | 12 + .../codeassist/genericproposalwidget.cpp | 1 + src/tools/icons/qtcreatoricons.svg | 581 ++++++++++++++++++ 62 files changed, 757 insertions(+), 39 deletions(-) delete mode 100644 src/libs/cplusplus/images/class.png create mode 100644 src/libs/cplusplus/images/classmemberfunction.png create mode 100644 src/libs/cplusplus/images/classmemberfunction@2x.png create mode 100644 src/libs/cplusplus/images/classmembervariable.png create mode 100644 src/libs/cplusplus/images/classmembervariable@2x.png create mode 100644 src/libs/cplusplus/images/classparent.png create mode 100644 src/libs/cplusplus/images/classparent@2x.png create mode 100644 src/libs/cplusplus/images/classrelation.png create mode 100644 src/libs/cplusplus/images/classrelation@2x.png create mode 100644 src/libs/cplusplus/images/classrelationbackground.png create mode 100644 src/libs/cplusplus/images/classrelationbackground@2x.png create mode 100644 src/libs/cplusplus/images/enum@2x.png create mode 100644 src/libs/cplusplus/images/enumerator@2x.png delete mode 100644 src/libs/cplusplus/images/func.png delete mode 100644 src/libs/cplusplus/images/func_priv.png delete mode 100644 src/libs/cplusplus/images/func_priv_st.png delete mode 100644 src/libs/cplusplus/images/func_prot.png delete mode 100644 src/libs/cplusplus/images/func_prot_st.png delete mode 100644 src/libs/cplusplus/images/func_st.png create mode 100644 src/libs/cplusplus/images/keyword@2x.png create mode 100644 src/libs/cplusplus/images/macro@2x.png create mode 100644 src/libs/cplusplus/images/member.png create mode 100644 src/libs/cplusplus/images/member@2x.png create mode 100644 src/libs/cplusplus/images/namespace@2x.png create mode 100644 src/libs/cplusplus/images/private.png create mode 100644 src/libs/cplusplus/images/private@2x.png create mode 100644 src/libs/cplusplus/images/privatebackground.png create mode 100644 src/libs/cplusplus/images/privatebackground@2x.png create mode 100644 src/libs/cplusplus/images/protected.png create mode 100644 src/libs/cplusplus/images/protected@2x.png create mode 100644 src/libs/cplusplus/images/protectedbackground.png create mode 100644 src/libs/cplusplus/images/protectedbackground@2x.png create mode 100644 src/libs/cplusplus/images/signal@2x.png create mode 100644 src/libs/cplusplus/images/slot@2x.png delete mode 100644 src/libs/cplusplus/images/slot_priv.png delete mode 100644 src/libs/cplusplus/images/slot_prot.png create mode 100644 src/libs/cplusplus/images/static@2x.png create mode 100644 src/libs/cplusplus/images/staticbackground.png create mode 100644 src/libs/cplusplus/images/staticbackground@2x.png delete mode 100644 src/libs/cplusplus/images/struct.png delete mode 100644 src/libs/cplusplus/images/var.png delete mode 100644 src/libs/cplusplus/images/var_priv.png delete mode 100644 src/libs/cplusplus/images/var_priv_st.png delete mode 100644 src/libs/cplusplus/images/var_prot.png delete mode 100644 src/libs/cplusplus/images/var_prot_st.png delete mode 100644 src/libs/cplusplus/images/var_st.png diff --git a/share/qtcreator/themes/dark.creatortheme b/share/qtcreator/themes/dark.creatortheme index c60e04cbda5..0935680bde8 100644 --- a/share/qtcreator/themes/dark.creatortheme +++ b/share/qtcreator/themes/dark.creatortheme @@ -71,6 +71,15 @@ IconsModeDebugActiveColor=ff99aaef IconsModeProjetcsActiveColor=ff80c342 IconsModeAnalyzeActiveColor=ff43adee IconsModeHelpActiveColor=fff4be04 +IconsCodeModelKeywordColor=ffaaaaaa +IconsCodeModelClassColor=ffc0b550 +IconsCodeModelStructColor=ff53b053 +IconsCodeModelFunctionColor=ffd34373 +IconsCodeModelVariableColor=ff2bbbcc +IconsCodeModelEnumColor=ffc0b550 +IconsCodeModelMacroColor=ff477ba0 +IconsCodeModelOverlayBackgroundColor=88000000 +IconsCodeModelOverlayForegroundColor=ffdcdcdc InfoBarBackground=ff505000 InfoBarText=text MenuBarEmptyAreaBackgroundColor=shadowBackground diff --git a/share/qtcreator/themes/default.creatortheme b/share/qtcreator/themes/default.creatortheme index 5a688c7d99d..690f4407d72 100644 --- a/share/qtcreator/themes/default.creatortheme +++ b/share/qtcreator/themes/default.creatortheme @@ -65,6 +65,15 @@ IconsModeDebugActiveColor=ffffffff IconsModeProjetcsActiveColor=ffffffff IconsModeAnalyzeActiveColor=ffffffff IconsModeHelpActiveColor=ffffffff +IconsCodeModelKeywordColor=ff777777 +IconsCodeModelClassColor=ffc0b550 +IconsCodeModelStructColor=ff53b053 +IconsCodeModelFunctionColor=fff36393 +IconsCodeModelVariableColor=ff2bbbcc +IconsCodeModelEnumColor=ffc0b550 +IconsCodeModelMacroColor=ff476ba0 +IconsCodeModelOverlayBackgroundColor=70ffffff +IconsCodeModelOverlayForegroundColor=ff232425 InfoBarBackground=ffffffe1 InfoBarText=ff000000 MenuBarEmptyAreaBackgroundColor=ffff0000 diff --git a/share/qtcreator/themes/defaultflat.creatortheme b/share/qtcreator/themes/defaultflat.creatortheme index b151c37aba4..a3bc13a8204 100644 --- a/share/qtcreator/themes/defaultflat.creatortheme +++ b/share/qtcreator/themes/defaultflat.creatortheme @@ -75,6 +75,15 @@ IconsModeDebugActiveColor=ff99aaef IconsModeProjetcsActiveColor=ff80c342 IconsModeAnalyzeActiveColor=ff43adee IconsModeHelpActiveColor=fff4be04 +IconsCodeModelKeywordColor=ff777777 +IconsCodeModelClassColor=ffc0b550 +IconsCodeModelStructColor=ff53b053 +IconsCodeModelFunctionColor=ffd34373 +IconsCodeModelVariableColor=ff2bbbcc +IconsCodeModelEnumColor=ffc0b550 +IconsCodeModelMacroColor=ff476ba0 +IconsCodeModelOverlayBackgroundColor=70ffffff +IconsCodeModelOverlayForegroundColor=ff232425 InfoBarBackground=ffffffe1 InfoBarText=text MenuBarEmptyAreaBackgroundColor=shadowBackground diff --git a/src/libs/cplusplus/Icons.cpp b/src/libs/cplusplus/Icons.cpp index 539516f4881..7a539c67eb8 100644 --- a/src/libs/cplusplus/Icons.cpp +++ b/src/libs/cplusplus/Icons.cpp @@ -30,6 +30,8 @@ #include #include +#include + using namespace CPlusPlus; using CPlusPlus::Icons; @@ -116,97 +118,177 @@ Icons::IconType Icons::iconTypeForSymbol(const Symbol *symbol) QIcon Icons::iconForType(IconType type) { + using namespace Utils; + + static const IconMaskAndColor classRelationIcon { + QLatin1String(":/codemodel/images/classrelation.png"), Theme::IconsCodeModelOverlayForegroundColor}; + static const IconMaskAndColor classRelationBackgroundIcon { + QLatin1String(":/codemodel/images/classrelationbackground.png"), Theme::IconsCodeModelOverlayBackgroundColor}; + static const IconMaskAndColor classMemberFunctionIcon { + QLatin1String(":/codemodel/images/classmemberfunction.png"), Theme::IconsCodeModelFunctionColor}; + static const IconMaskAndColor classMemberVariableIcon { + QLatin1String(":/codemodel/images/classmembervariable.png"), Theme::IconsCodeModelVariableColor}; + static const IconMaskAndColor functionIcon { + QLatin1String(":/codemodel/images/member.png"), Theme::IconsCodeModelFunctionColor}; + static const IconMaskAndColor variableIcon { + QLatin1String(":/codemodel/images/member.png"), Theme::IconsCodeModelVariableColor}; + static const IconMaskAndColor signalIcon { + QLatin1String(":/codemodel/images/signal.png"), Theme::IconsCodeModelFunctionColor}; + static const IconMaskAndColor slotIcon { + QLatin1String(":/codemodel/images/slot.png"), Theme::IconsCodeModelFunctionColor}; + static const IconMaskAndColor protectedIcon { + QLatin1String(":/codemodel/images/protected.png"), Theme::IconsCodeModelOverlayForegroundColor}; + static const IconMaskAndColor protectedBackgroundIcon { + QLatin1String(":/codemodel/images/protectedbackground.png"), Theme::IconsCodeModelOverlayBackgroundColor}; + static const IconMaskAndColor privateIcon { + QLatin1String(":/codemodel/images/private.png"), Theme::IconsCodeModelOverlayForegroundColor}; + static const IconMaskAndColor privateBackgroundIcon { + QLatin1String(":/codemodel/images/privatebackground.png"), Theme::IconsCodeModelOverlayBackgroundColor}; + static const IconMaskAndColor staticIcon { + QLatin1String(":/codemodel/images/static.png"), Theme::IconsCodeModelOverlayForegroundColor}; + static const IconMaskAndColor staticBackgroundIcon { + QLatin1String(":/codemodel/images/staticbackground.png"), Theme::IconsCodeModelOverlayBackgroundColor}; + switch (type) { case ClassIconType: { - const static QIcon icon(QLatin1String(":/codemodel/images/class.png")); + const static QIcon icon(Icon({ + classRelationBackgroundIcon, classRelationIcon, + {QLatin1String(":/codemodel/images/classparent.png"), Theme::IconsCodeModelClassColor}, + classMemberFunctionIcon, classMemberVariableIcon + }, Icon::Tint).icon()); return icon; } case StructIconType: { - const static QIcon icon(QLatin1String(":/codemodel/images/struct.png")); + const static QIcon icon(Icon({ + classRelationBackgroundIcon, classRelationIcon, + {QLatin1String(":/codemodel/images/classparent.png"), Theme::IconsCodeModelStructColor}, + classMemberFunctionIcon, classMemberVariableIcon + }, Icon::Tint).icon()); return icon; } case EnumIconType: { - const static QIcon icon(QLatin1String(":/codemodel/images/enum.png")); + const static QIcon icon(Icon({ + {QLatin1String(":/codemodel/images/enum.png"), Theme::IconsCodeModelEnumColor} + }, Icon::Tint).icon()); return icon; } case EnumeratorIconType: { - const static QIcon icon(QLatin1String(":/codemodel/images/enumerator.png")); + const static QIcon icon(Icon({ + {QLatin1String(":/codemodel/images/enumerator.png"), Theme::IconsCodeModelEnumColor} + }, Icon::Tint).icon()); return icon; } case FuncPublicIconType: { - const static QIcon icon(QLatin1String(":/codemodel/images/func.png")); + const static QIcon icon(Icon({ + functionIcon}, Icon::Tint).icon()); return icon; } case FuncProtectedIconType: { - const static QIcon icon(QLatin1String(":/codemodel/images/func_prot.png")); + const static QIcon icon(Icon({ + functionIcon, protectedBackgroundIcon, protectedIcon + }, Icon::Tint).icon()); return icon; } case FuncPrivateIconType: { - const static QIcon icon(QLatin1String(":/codemodel/images/func_priv.png")); + const static QIcon icon(Icon({ + functionIcon, privateBackgroundIcon, privateIcon + }, Icon::Tint).icon()); return icon; } case FuncPublicStaticIconType: { - const static QIcon icon(QLatin1String(":/codemodel/images/func_st.png")); + const static QIcon icon(Icon({ + functionIcon, staticBackgroundIcon, staticIcon + }, Icon::Tint).icon()); return icon; } case FuncProtectedStaticIconType: { - const static QIcon icon(QLatin1String(":/codemodel/images/func_prot_st.png")); + const static QIcon icon(Icon({ + functionIcon, staticBackgroundIcon, staticIcon, protectedBackgroundIcon, protectedIcon + }, Icon::Tint).icon()); return icon; } case FuncPrivateStaticIconType: { - const static QIcon icon(QLatin1String(":/codemodel/images/func_priv_st.png")); + const static QIcon icon(Icon({ + functionIcon, staticBackgroundIcon, staticIcon, privateBackgroundIcon, privateIcon + }, Icon::Tint).icon()); return icon; } case NamespaceIconType: { - const static QIcon icon(QLatin1String(":/codemodel/images/namespace.png")); + const static QIcon icon(Icon({ + {QLatin1String(":/codemodel/images/namespace.png"), Theme::IconsCodeModelKeywordColor} + }, Icon::Tint).icon()); return icon; } case VarPublicIconType: { - const static QIcon icon(QLatin1String(":/codemodel/images/var.png")); + const static QIcon icon(Icon({ + variableIcon + }, Icon::Tint).icon()); return icon; } case VarProtectedIconType: { - const static QIcon icon(QLatin1String(":/codemodel/images/var_prot.png")); + const static QIcon icon(Icon({ + variableIcon, protectedBackgroundIcon, protectedIcon + }, Icon::Tint).icon()); return icon; } case VarPrivateIconType: { - const static QIcon icon(QLatin1String(":/codemodel/images/var_priv.png")); + const static QIcon icon(Icon({ + variableIcon, privateBackgroundIcon, privateIcon + }, Icon::Tint).icon()); return icon; } case VarPublicStaticIconType: { - const static QIcon icon(QLatin1String(":/codemodel/images/var_st.png")); + const static QIcon icon(Icon({ + variableIcon, staticBackgroundIcon, staticIcon + }, Icon::Tint).icon()); return icon; } case VarProtectedStaticIconType: { - const static QIcon icon(QLatin1String(":/codemodel/images/var_prot_st.png")); + const static QIcon icon(Icon({ + variableIcon, staticBackgroundIcon, staticIcon, protectedBackgroundIcon, protectedIcon + }, Icon::Tint).icon()); return icon; } case VarPrivateStaticIconType: { - const static QIcon icon(QLatin1String(":/codemodel/images/var_priv_st.png")); + const static QIcon icon(Icon({ + variableIcon, staticBackgroundIcon, staticIcon, privateBackgroundIcon, privateIcon + }, Icon::Tint).icon()); return icon; } case SignalIconType: { - const static QIcon icon(QLatin1String(":/codemodel/images/signal.png")); + const static QIcon icon(Icon({ + signalIcon + }, Icon::Tint).icon()); return icon; } case SlotPublicIconType: { - const static QIcon icon(QLatin1String(":/codemodel/images/slot.png")); + const static QIcon icon(Icon({ + slotIcon + }, Icon::Tint).icon()); return icon; } case SlotProtectedIconType: { - const static QIcon icon(QLatin1String(":/codemodel/images/slot_prot.png")); + const static QIcon icon(Icon({ + slotIcon, protectedBackgroundIcon, protectedIcon + }, Icon::Tint).icon()); return icon; } case SlotPrivateIconType: { - const static QIcon icon(QLatin1String(":/codemodel/images/slot_priv.png")); + const static QIcon icon(Icon({ + slotIcon, privateBackgroundIcon, privateIcon + }, Icon::Tint).icon()); return icon; } case KeywordIconType: { - const static QIcon icon(QLatin1String(":/codemodel/images/keyword.png")); + const static QIcon icon(Icon({ + {QLatin1String(":/codemodel/images/keyword.png"), Theme::IconsCodeModelKeywordColor} + }, Icon::Tint).icon()); return icon; } case MacroIconType: { - const static QIcon icon(QLatin1String(":/codemodel/images/macro.png")); + const static QIcon icon(Icon({ + {QLatin1String(":/codemodel/images/macro.png"), Theme::IconsCodeModelMacroColor} + }, Icon::Tint).icon()); return icon; } default: diff --git a/src/libs/cplusplus/cplusplus.qrc b/src/libs/cplusplus/cplusplus.qrc index 9b5812d83c1..d0135fdee80 100644 --- a/src/libs/cplusplus/cplusplus.qrc +++ b/src/libs/cplusplus/cplusplus.qrc @@ -1,27 +1,42 @@ - images/class.png - images/struct.png images/enum.png + images/enum@2x.png images/enumerator.png - images/func.png - images/func_priv.png - images/func_prot.png + images/enumerator@2x.png images/keyword.png + images/keyword@2x.png images/macro.png + images/macro@2x.png images/namespace.png + images/namespace@2x.png images/signal.png + images/signal@2x.png images/slot.png - images/slot_priv.png - images/slot_prot.png - images/var.png - images/var_priv.png - images/var_prot.png - images/func_priv_st.png - images/func_prot_st.png - images/func_st.png - images/var_priv_st.png - images/var_prot_st.png - images/var_st.png + images/slot@2x.png + images/member.png + images/member@2x.png + images/private.png + images/private@2x.png + images/privatebackground.png + images/privatebackground@2x.png + images/protected.png + images/protected@2x.png + images/protectedbackground.png + images/protectedbackground@2x.png + images/static.png + images/static@2x.png + images/staticbackground.png + images/staticbackground@2x.png + images/classmemberfunction.png + images/classmemberfunction@2x.png + images/classmembervariable.png + images/classmembervariable@2x.png + images/classparent.png + images/classparent@2x.png + images/classrelation.png + images/classrelation@2x.png + images/classrelationbackground.png + images/classrelationbackground@2x.png diff --git a/src/libs/cplusplus/images/class.png b/src/libs/cplusplus/images/class.png deleted file mode 100644 index 88432d2cb10c43de91fdb7ec7989285090747b0a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 573 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7BuiW)N`mv#O3D+9QW+dm z@{>{(JaZG%Q-e|yQz{EjrrIztFy8lcaSW-rHD&U7Z)r!7A7c1La z{;|7iR0MxnBB1-_-NG+Rn%d*M_`hbX5?}g{q1WDV;;+^0j)n^ymn@CY`k`znSZ2PF z<#AvBvAYx2*mv;D8SnmVXMF$rJswWQfSmWYPCR&c=kFTnSt6b`sYT4^cSj{|uztCD zzEbHfy(cmMwEI5perEsk^8vNc>w6l?_O{-e#~-rfnd9a6hqssxmG-TrmX1VLRDt@-S;0n$p|^fJTZA|z#Y43>k17uZ1?uQiQv)x zHm&QWc>N@m=!e%7A0C^2KquaVHSb@m1m|j*J>4qWy6)=}{_)zV#?OkA4iBBWJWl+> z71fDyJZ!Dz?!~(gzB?oLPwaht4wvQiz&20OpIm%v>pOS)*G8D|N| zl}uaa;eCe=9aXL4~&vMP;?~fH37#J8lUHx3vIVCg!04d1;cmMzZ diff --git a/src/libs/cplusplus/images/classmemberfunction.png b/src/libs/cplusplus/images/classmemberfunction.png new file mode 100644 index 0000000000000000000000000000000000000000..f97d706e7fae3c0a313b66f6b3ed24a430ff0e9c GIT binary patch literal 139 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd7G?$phPQVgfdnK1d_r6q7#PaS%j@gw8yXrq zIy(06-+$o1f&c&in?y&QV_;y=^K@|x;fPMwXlG(Gag*#>sKA#fVrbwb!NqeX!A+C7 o*~;ZeqvWa`9+%^j>6FmHxfq{X+)78&qol`;+0I$+2%K!iX literal 0 HcmV?d00001 diff --git a/src/libs/cplusplus/images/classmemberfunction@2x.png b/src/libs/cplusplus/images/classmemberfunction@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..f30e61336b55643525094cc1049852518baafa66 GIT binary patch literal 168 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I7G?$phQ^Te;|vT8LIFM@t_%ze<>lq|_4N%6 z4ILdF|NsAg?_Io}fq@~=)5S4FW8&TO8+jWHcw8=ur?!0wFmU>HMxga?_`+Ua@7B}n z*MFXCJ@@>YSxjM2o23xo;wZ`*E41wbYwdrd6$@`HI=*c2GTqNry}zw180J^Z WS>AJY@?i!B1_n=8KbLh*2~7Y`Q$W`M literal 0 HcmV?d00001 diff --git a/src/libs/cplusplus/images/classmembervariable.png b/src/libs/cplusplus/images/classmembervariable.png new file mode 100644 index 0000000000000000000000000000000000000000..82f8024b2eb66ac7570fbb6bf9527d691a65fee1 GIT binary patch literal 136 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd7G?$phPQVgfdnK1d_r6q7#PaS%j@gw8yXrq zIy(06-+$o1f&c&in?y&QV_;y=_H=O!;fPMwXlG)3WppZmhqaJnaYv)zp@4)0He)YI li7Sdqd}jiVy1shKV06|jH2Zb`Tm}XP22WQ%mvv4FO#qrxEN}n- literal 0 HcmV?d00001 diff --git a/src/libs/cplusplus/images/classmembervariable@2x.png b/src/libs/cplusplus/images/classmembervariable@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..6f426c3a411cd27a921f15bba120850851452b6f GIT binary patch literal 165 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I7G?$phQ^Te;|vT8LIFM@t_%ze<>lq|_4N%6 z4ILdF|NsAg?_Io}fq}u#)5S4FW8&NXjl2wsJk0#5Y*qVy2wpOFcKH_HDz<#-(Wft` z+(_Z%k7-=rus~bFgpsktrJ;>WLhFIZLyKJufBqO9Tylfy`m)QXru{H3X6Af8XL+iF S>Kq0J1_n=8KbLh*2~7ZSNji=I literal 0 HcmV?d00001 diff --git a/src/libs/cplusplus/images/classparent.png b/src/libs/cplusplus/images/classparent.png new file mode 100644 index 0000000000000000000000000000000000000000..19bb952842824e9bce0b1e5768cb8ccaa5a1abf1 GIT binary patch literal 155 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd7G?$phPQVgfdr%jd_r6q7#QT_JzX3_IHHqZywK=;!NAnkSH>L3v3N$KpvsX8 zc?_u{#s&^cWF%%7St%$bFfNcf%)zl(c`fs)7YkY#8Orup+kSrav5kR&fx*+&&t;uc GLK6TNG&BJK literal 0 HcmV?d00001 diff --git a/src/libs/cplusplus/images/classparent@2x.png b/src/libs/cplusplus/images/classparent@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..5ae4e3689067a4ad1cba5c32d69265d6e9f79f3a GIT binary patch literal 175 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I7G?$phQ^Te;|vT8LIFM@t_%ze<>lq|_4N%6 z4ILdF|NsAg?_Io}fq@~y)5S4FBlzj*jl2y849o}J&p60)xh*))6Ik~@R6|K{j%dM8 ztHrNgT8Buxw;d8&cu-{pt6E}%rv$@0bDj<7y_q5#bR4pnUUD9ha(Kh&@>;xOTQ=v; c`d0RfIa63=yrTXxFfcH9y85}Sb4q9e07bVt^Z)<= literal 0 HcmV?d00001 diff --git a/src/libs/cplusplus/images/classrelation.png b/src/libs/cplusplus/images/classrelation.png new file mode 100644 index 0000000000000000000000000000000000000000..acf3c8e2690af1f66ff39baa73ef135bb46c2b6e GIT binary patch literal 106 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRdCT0c(hNQXTpBNYzI0Jk_TtR{Y0{{R2-|&ey zgn@xU#?!?yghMttf|Z3Qf|HF+w=GoLVUtDYRGt@Aj22ny-#(cgH)dd9VDNPHb6Mw< G&;$T|Q5n_% literal 0 HcmV?d00001 diff --git a/src/libs/cplusplus/images/classrelation@2x.png b/src/libs/cplusplus/images/classrelation@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..6da54dd223e6251a6a95421e58eb1bb96e9e55de GIT binary patch literal 114 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;ICT0c(20oEV=?n}EoB=)|t_%zeHa0f@|NqzX zl$yoBz@Xyk;us<^H93NnmB%E(fPqn*EBPwZ45=yu2?>QBRRgw{`xqGBDlTxGqVvj_ Qfq{X+)78&qol`;+0PJ-dGynhq literal 0 HcmV?d00001 diff --git a/src/libs/cplusplus/images/classrelationbackground.png b/src/libs/cplusplus/images/classrelationbackground.png new file mode 100644 index 0000000000000000000000000000000000000000..601c8b33211ee1f6bda70c8dbc0b930d6d60f250 GIT binary patch literal 121 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd7G?$phPQVgfdu#id_r6q7#LVsSlHOuDl04h z|NsB?XKWt>1B0rki(?2!baFu>6WbmhHid+P=L#5u^jIW$cm&#*dJ;L37u;fHh!&B2 V7nZ^$$H2hA;OXk;vd$@?2>^zO9$)|f literal 0 HcmV?d00001 diff --git a/src/libs/cplusplus/images/classrelationbackground@2x.png b/src/libs/cplusplus/images/classrelationbackground@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..530e3d4c1e29efd69c25837f7a076a4283e841dd GIT binary patch literal 133 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I7G?$phQ^Te;|vT8q5(c3t_%zef`WoVLP7-v z1%-u$KY#xG|NsBZIGG&`3=GFVdQ&MBb@08!;5rvLx| literal 0 HcmV?d00001 diff --git a/src/libs/cplusplus/images/enum.png b/src/libs/cplusplus/images/enum.png index 42a9e83bc7699ec47f244617862b3135b958132b..c76984637049b3c1bdf61af7f009789b53207842 100644 GIT binary patch delta 94 zcmaFPR4_pzf{B@dfgx$G_$LMi2F?JV5LX5UhT`Jl|NsA=oUD3*fq_BE)5S4_BRV;P zm4!!OQDY-#^9-p|M=l&Vz@a`PEK&8rG6sf&vf?LmJoFqG7#J8lUHx3vIVCg!0Dfg2 AjsO4v delta 343 zcmXST&NM-yo`a2nfkFQB|3n4`2FViFh?3y^w370~qErUQl>DSr1<%~X^wgl##FWay zlc_cg42+zfE{-7;x03$+|8LK%+Q2$9UXRpC3+k=7XE{8(QW^2(|8Mq#{~f=? zTbw%=JMCoC)tCv}|2dmBiZ;Kn7x)&h!S?auUIw=P^^Kxt^Z$y&;EVJ27mtaK4TSP;*;^)|6ftkA?d)^oJ#I*dP=f?{%~zuSa*o)j_0#uEDNMM zxUb3lIo~l$Xn!rEw^^W>>w_}KIc7(sBPM^^em>#(!_tErxps&bNHCP#+nJV;;KEOuNqx!g!XU4p{#eGY7TFxXcF|lT5kzlwfz47&hn-*#e3=9mOu6{1-oD!MmdKI;Vst06&=?&j0`b literal 0 HcmV?d00001 diff --git a/src/libs/cplusplus/images/enumerator.png b/src/libs/cplusplus/images/enumerator.png index 25fc49c6598a8a99c11ec688b4dc1d3153427507..292f387ff5439d250390b2ab31ce305adef260e7 100644 GIT binary patch delta 106 zcmcb|Tr)u;g^8Jgfgx$G_$LMi2A%+)5LX5UhT`Jl&6_v>|NsB^4F@X*1_o_U7sn8e z=;R;#EIa~_7?_RO3QecXe8|A8Y{21c;wuSfI(^w_Z#7P~0DG1_lNO MPgg&ebxsLQ06%ymng9R* delta 463 zcmb=q$2>uzo`a2nfkFQB|3n4`2FViFh?3y^w370~qErUQl>DSr1<%~X^wgl##FWay zlc_cg42%t)E{-7;x0VE3dmK&>_;;!0+Q!+DF=_9JbHGetMDAIOu7Ak^?iGCt)|Gy)K9Oj{eGgJDVgW=gehUK z+z-8tSi${d`x4FOs^aMr<=X^}^_p8=&syp=b4QJindhPey}vK4XBb>x?ym63O(Y{` z%kyt*=f8DNxXi%J{$g*qagP1Ia%Q=>ex0 gteIvyw%ljj!#+oM>Z3p#1_lNOPgg&ebxsLQ08*7EO#lD@ literal 0 HcmV?d00001 diff --git a/src/libs/cplusplus/images/func.png b/src/libs/cplusplus/images/func.png deleted file mode 100644 index e515e76e61f64cd285a4c67aaf1feaca38e84f8b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 583 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7BuiW)N`mv#O3D+9QW+dm z@{>{(JaZG%Q-e|yQz{EjrrIztFuwG3aSW-rwPf;ne_=8*t(SefQ)*P zb?LGu$8#o55~m|Nf;^OLtp2*l?ken-c)zdVfewq)a{<0Nk|KS4O3#gZpH%mrW)A;- z;^6c32Uvek&;D9+Tc+oe;&k1DE9||yR_p5PS*5OK=?PwN=b-1uxs0h>l<(Z}P`efy zefw5HU#_;uL&hE_*VR`9^WM5#{%n)``*~mR!X3;uxtF({YrXxo@#W%{(JaZG%Q-e|yQz{EjrrIztFd2EeIEGZ*YMFfAU)WLP`2C#iS9^PXO$vG0JvT^n zx&?do9*j3Un33#|D`Kl~q+8~P^qv)lGJ6UQ<19}0uCBOrj3w#HtEDm%v`h|(d1q|D zdvkm4_vxEw$HwFwoWAGHnKw22-k;rL{=`tGHTKN|ImZ)`(^Oyd9y2u4XRWu}`1!zJ z{(UA@@iitNb;SBy_HEwk{6FteS+joMJ>ly7WgPl%T6Z7jPp+}JqjcykN54UZf@{H2 zjlWi;Q!on4Sx#dIv*rZvax^^$qqGP6HS z%Y0*9^uXZf-*?;#mi@C`t-rv0hQ=&8pPET$bGLK31^4^=`)Q?C3WqFl2u$?58Ns?L zNMo9LL8e*puGq~gLY&)sR4*GmlHYeubLy%$T??3v7nW8E`<5l@*VoPaBw_uaulCdL z1u3)AY7$ceR|ZaNbXyoQ_2Ra-@A|`ctGM`VJAELM|C{5-m+>Y8$HybftRF{TEDNSbW@kJKvJo7Z?~A O7(8A5T-G@yGywqTj3xa5 diff --git a/src/libs/cplusplus/images/func_priv_st.png b/src/libs/cplusplus/images/func_priv_st.png deleted file mode 100644 index 1d6fa2da795a058ffad34a501f397b00a9459926..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 685 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4rT@h1`S>QU}O*?_8Fz`kHy06>MzL~M@dQ#Vyt!G|O-|}qI`Ukx$j|P;vsOo**dg|4*%}@H* zT+f|w#5Hfbe&kAJZy{d(=M&f8&YOJFIe(vN!dBhzHLAV~q#W6pSv2GnXL_fdcP}|= zow3_EZj)BXN+s_FvQDpOZ@=bObJ{WgkY(ylgXj$!LCY09o*g~+ynV$bkMfgtIS0&= zw&_KzRr6mW=l1l-xxm0cIXSsog;OrLmK?Lm+-s7sMJH^viq9e$=b7R*`%Dve8^vza z3SOb)HBHcbm9p(j zcT6o>HMdQ|K75_6yV2x%E@D3SVr6{osvM^Iq-itP&itydI&1f~)K9m*aY*mVHLG{(JaZG%Q-e|yQz{EjrrIztFllXB;`yB_WXXf@wvGqr#ECAIuSgNe()5HH1qvB$je!I_WlL zJa!M-zhmDjZFR$^Uhdzvo`3)Q+*eCC;{uLtk=5lJ-iY7c7PVF=X*zik! z&bj#K`Dbk(IX(Ok{zvE5JeOSd`RC#v_xq*@9Ddibdgp8zVXo4Sfd4Ja4Q=K*-YOC` zGn;jQuiKzZ^YlfY%SukH2bV8f{=?;)&84o;3^S<>-_~+G-Trw)+z-a)BzgCXTb?lb zu-7mjek?vgX>G%&y*&HHRRgYHcgTNXVRE6A_dr?3oO%ZL){lqP4Qo`4+p^x<9h$$C zDWi+&mf91p6}y;@&exvx*5a?;n^1=bA@8{AEoQn*ou2Qo_WJfaHtDY63w6Sy6O;sw zedt{2S+}8_AvC_8AvT!PVGidTtJMKNx87nDX1r~*yT$hRg;&2>FO-y?-k7~aJZW-z zLiiqbuFvz&+&Xjl$KP8_jjn+zAGB*+D})yBFb(>Zp_LS=R(P+rhNJEMlZ0uwd?fluhf8R9zYc+GX^m=@a=j##Wi9Z}Y?Dp|?cBeDGn5MUQLFZ?ql+&AjiA|sW z>h4Vwo0@+u2Yv>vxIO(fOY427Z5uhvFXhi{dpW_F%Wdi2N8h||sRxP$ai%5xKd|Dw zsMpdU#RnWI{W8Zn|IEI_-*zyv=C$8lTSoz=&;Pg#82;@2-)+jfU5|l*fx*+&&t;uc GLK6VSdMN+^ diff --git a/src/libs/cplusplus/images/func_prot_st.png b/src/libs/cplusplus/images/func_prot_st.png deleted file mode 100644 index d023fe1fd2111ab789b56268e3e73370f74fe85d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 679 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4rT@h1`S>QUOp5!(a5T`?~$?n;F}#Cv|<^Y@u1Y}E~4qw2dr%8`wkMMF+;rgz$T_mZR5 z8M}?+Hfe>dRPvrDY5#im_G^AMrycVTS*GqZh~A(Pv|Pbswz%!{_7#^r%1_$m9574T zrWdhR&3}oU+e}gGTZL0DxRxBV$=qv_utg_qe`Lj-mD^ukxW3Ocako+IMy=q33AJx7 z-YiPZT&3*0-78B@T1HMz?$V4E`N?T>r4`v27#K`Tg8YIRgr9#93%c^-LCU`mZ|zv+ z7XSOub9P$LzYmI4zdp@0eg5yORKcIG|DON*^jqfBKiyA%{@rWq3}WfyW?*30;OXKR zA|c6oaHCfkBSXW*_Xk9!TG%+V3NBtcBd}!QS=WFUjJK-#e{+0~tZ8;CC=qPcXl}AL zwX)Q_6K~@l%IZD!+Jl4Le{UaOddcd}{+i?We=ptAxH~-h!}~nXy@}Evp4Z^W|sSJlHqzw)r~YE}k*UmXaFTTfR%mvv4FO#npW6MX;x diff --git a/src/libs/cplusplus/images/func_st.png b/src/libs/cplusplus/images/func_st.png deleted file mode 100644 index 05119102edc36a447a52ca8c81ea512a9a57f5f3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 651 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4rT@h1`S>QUlacvAdQ&~K8bm~dk-fz& zvYt`3mO*)cT2nov%D&WwW=@?w@imQX8g+~+4J_&n%xd+_sxSK2ecgWc&5Ui=le)fa zJ@b0{mS>aJKj>X~G@$JB)>E&hZGO_f=6ddgBd&Sd^&?j*dw<$;>iNX=xAP{Sbk5&r zny^(je2uE_0x8E2>yO>fn|j{8Uzn;DQnqSRn$NWQ$VcO%pUKP-+?d3`z+hYw zbMNV?{#zT51}R2f7rWT1qTYKnTl_?CarbmRhiBWx&Ra69Tvq<- z_E#l#+l5*0t}d5(!x@s!Z}%)gVQ<#A$<0n|z8{{8d+pV=+@18`7bvnlUHx3vIVCg! E0L;h+&Hw-a diff --git a/src/libs/cplusplus/images/keyword.png b/src/libs/cplusplus/images/keyword.png index e5a51858d9ed96ab65bf6544891cb48730607fa4..335e63eeafd2bc828dd902b0e042b84efe54691c 100644 GIT binary patch delta 122 zcmcc0)Xg|SqL_u5fq~)e-A6$T3=E0^J|V6Q3=G`d+&nxyyu7^5&dx3_F0QVwZfBlY zt~zYM!}egmf4(1E`iV3S7NfLGzKMEvlk}&`EfOzKsE>3yQ1NlX^vD;wvRvl`UW92~ zP+G(9`JlVw!Q3B}tA86e++V!Na9OxlWLn;y?~9Ait$ST%&nl7pYg;b+TGJVlpKan9 zc`E1K-I2spTO7$(h9YY})O$ROxxbb8aiRjb@%uh*wW+A(}_fA7LF e{eAoa`x}cZ(m8%_n#jPwz~JfX=d#Wzp$P!8gMS+U diff --git a/src/libs/cplusplus/images/keyword@2x.png b/src/libs/cplusplus/images/keyword@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..bfbe3c49cbc31253cb701e40891e6939df3e58f5 GIT binary patch literal 143 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4h9AWhA=@@4G`t&;uvCaI{Ak`gF%m$gaWJd zo1Hsl%^rpYoMT`M-64{b(9m?&LgdC_5sOCw2bhBoczZC)^Re<7u=-hugRLos1!_uhkX4uAI5>M<>@I9*F~Kx=-sE8I+DK U`rGfbqa9?vr>mdKI;Vst0BOW5hX4Qo delta 389 zcmZo=oXR{wvYw5BfkFQB|3n4`#u!f*#}JFtb0?qoI_w~D?D?Cs>;f$3<@Wp#o2L_| z9oQ8lpfBgbVyLT_5*xUB)_!Gh<%i06H31DpncIJ4UyT-7bh-Kc6Gnpnpwg9E|G_K9h=ABB0=E`D;Gz; zOI-G+uj(c5)=S#U&h3&p+3@yIg3_@Uvn1a{pWky&+iDZz?N-|*@6W9F5m>{&MtuK0 z%gRZ-S3a-XpB(UDqQ$Epug})yxSQS3wYYOPS^K-f6~o725#DT_XL$1@bbDUw#$2Dh zBEz?5snm`+ISCH|3PR%u}=M$#-e&CWjDjYE@=iScPTLoDTI(^xGL5b1VVC}wN%@5BSEK>g^IpJlp zk-!S&`^`s-?(p`h+oCa8p00i_>zopr0H~-|4FCWD literal 0 HcmV?d00001 diff --git a/src/libs/cplusplus/images/member.png b/src/libs/cplusplus/images/member.png new file mode 100644 index 0000000000000000000000000000000000000000..e974865e93c25c63dceacc02ce59d25bc5fc5c81 GIT binary patch literal 169 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd7G?$phPQVgfdr%jd_r6q7#QT_lq|_4N%6 z4ILdF|NsAg?_Io}fq|je)5S4FW8%^a8wFb(I9xBjj%eO_>+t#QZ0Yg;*ZyIMm=JQv zTAd+4dSA=x*7nD;e%rz;4sdWMw6M5&B(yL+=qRYVVZ)N}U7%rpE0+uNBF2ji6Wmyx zW{GmJ-u&#inISqyWrKn6kHTa|{^G`p3v0!`sQzJWHmsGIumdKI;Vst E0Pdkl-2eap literal 0 HcmV?d00001 diff --git a/src/libs/cplusplus/images/namespace.png b/src/libs/cplusplus/images/namespace.png index 18d2941572e8a62e65954c4900aa9b1bdf21766f..b36b2a4acfe72e1d228fda163f6f6d8173729dc9 100644 GIT binary patch delta 113 zcmey#)WkSJB8!EYfq~)e-A6$T3=Gl%J|V6Q3=C{+Z0zjp+}zweJUr#)<&~9{)z#Ji z|NlRsz|qRUz@X&m;uyjao&2JKi7lt+K~I>mfwRNniJVg>23>sS7aA+T!0!0fTxG%H4tR8%D=b5a~ z=Hy8#&-cBzjlJ$Eb6mY4$98+}YsogpOD48|uO#pvy=<~DQNre5D9h0UvzFbQv5K*& z`Lm6F)Z*7xE*y@jk^izD&5ixc=6gdpZ$k4Yn|kdorkTqsALelTNinRpls7jCcb U-ozopr0GDGiQvd(} literal 0 HcmV?d00001 diff --git a/src/libs/cplusplus/images/private.png b/src/libs/cplusplus/images/private.png new file mode 100644 index 0000000000000000000000000000000000000000..8e25668d8059820812191ab5e07f56516001257c GIT binary patch literal 112 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4h9AW2CEqh_A)Rqn0vZ7hDd}b|LA9vc%f5p zf9CC{jGG#Qe@_n+Phs3W|9|}rMNR_;hD{Bxqr*cQKmC8o60%?>BQwK-JGTPAJnm`- O8RhBf=d#Wzp$Py5rzV8} literal 0 HcmV?d00001 diff --git a/src/libs/cplusplus/images/private@2x.png b/src/libs/cplusplus/images/private@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..348785c1ba6b55153804eac8f6d821887a76b208 GIT binary patch literal 165 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4h9AWhA=@@4F(2=98VX=5R22vKl~XCdbA`S zaecEcD7MZ!vUb7DPDYkj1)4X`AG!DS-(Q!qWz7~MH;hXfSMag9%Wzdl+-qL3ooA1Q zh=GB^Wu6(APBi4OGU~^(JqRs$`v1Rnh3KDO|No1pa&bgCUYID-%6w9jiy>xOhLHMn Rmt`RPJzf1=);T3K0RY9kIo|*P literal 0 HcmV?d00001 diff --git a/src/libs/cplusplus/images/privatebackground.png b/src/libs/cplusplus/images/privatebackground.png new file mode 100644 index 0000000000000000000000000000000000000000..0c482e5e3bae18a4a091dd163e09156e3600e09b GIT binary patch literal 144 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd7G?$phPQVgfdu3Nd_r6q7#O&@xs8pDO-xKo zO-*fVY&LG(xM|a-&6_v>|Nnpgs}m&*3=F!SE{-7_(aAG7S$R~9muW{iNO1D-%uQ%x uWNudPFr3=h*eH5r#sLN<7o!8a7~&R~NB-imi)Ub9VDNPHb6Mw<&;$UKbSfMcI@QMj(Zfe!M%@>=SNs__=fh0j9e1m6M{bk_A&CM+)EA&INZSUYJRIM6i;>r3v1Y;nmc?8rf*cH17%Fo!G~YaS=GcnZJs>+hUHx3vIVCg! E0FWFpL;wH) literal 0 HcmV?d00001 diff --git a/src/libs/cplusplus/images/protected.png b/src/libs/cplusplus/images/protected.png new file mode 100644 index 0000000000000000000000000000000000000000..2c87cf2c09c2264edb9dcbcd5974a3b19b44de72 GIT binary patch literal 115 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4h9AW2CEqh_JSx+7sn8Z@Z=x;Y!Yl+57egT zO=myBEh28)EM;I6d7^h!5e|DXNr-HoFhXYfOzg67CV8p;MeebiAjk4|~ PAk#cu{an^LB{Ts5_i!Yd literal 0 HcmV?d00001 diff --git a/src/libs/cplusplus/images/protected@2x.png b/src/libs/cplusplus/images/protected@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..ad1c62356c6a573fdf4aa7a0ee0e76fb6dbe52d1 GIT binary patch literal 177 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4h9AWhA=@@4F(2=3Qrfu5DWjer#A978;Gzy zj9=fuov^HdeQ~Ffq?KDD6U*-gcZ*dXE~h4+Hi@a8udzh>&V&4f%+;%A*M2ba40_*q z^w5mYA~~f8f|VVDo;O5ECR`5}zc9sNHK&3mQ_VNlGhBx^E^p7}TVU?F$y_d>w^Z1? d=EH6!3&yDmv(5>=D3k@c#naW#Wt~$(696qWK34z$ literal 0 HcmV?d00001 diff --git a/src/libs/cplusplus/images/protectedbackground.png b/src/libs/cplusplus/images/protectedbackground.png new file mode 100644 index 0000000000000000000000000000000000000000..d3c1b513340b4c207dd762f6541bb9a706fce87d GIT binary patch literal 216 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7=6kw0hFJ8zy{0TpnfLf%cQV5P`5(Ru zrZi>FQc(JEZ}GKXF%M#k&aqtR4eHt&_Accu!}B|AH>8t!l6#i(ZMe3Nhv9(%&l@X= z;~&>DIdeRJ*Bo@}Fke*mm8kM+!JB0TuFoo$bzG=Ee@)7>C~}%~Qct2+r^hA`~Uy{6%`dS zGBOMd42+D7OiWD7%*U2(nVC5`Ib~&K<>lp7RaMp1)wQ*?_4W0Qjg6~Tt=hSB z=kDFR_wCzv=+L3VhYue)a^&U9m+#)a`|#nz$B!RBfByXa`}g0!fB*aU@Bjb*?b-Kl zGB7Z(lmz(&fBpLFA8XNb2?hp+37#&FAr_~T4UX|kNVJ%fpt$2PXOy89Sa8G5Jq-A)-wUDb6P|? z1UE6YD@Q);yYkGfqwB?inKB&>L5=JpyQc|?_nd7Pxiafe$AW2XniJgnbZlKY{qi(Z n0}P~2d}wI)ymn!RAVZ|y^w(Sl2j(#_Ffe$!`njxgN@xNAaU7D* literal 0 HcmV?d00001 diff --git a/src/libs/cplusplus/images/signal.png b/src/libs/cplusplus/images/signal.png index 062b6261821a7b5b331411adaf7ea8b6ba00be73..ff712b86190c376a64953882b36cbe51fbca9445 100644 GIT binary patch delta 182 zcmeBVKF&BnvYvr~fx&9Vg1rn341Jz1jv*4^$v^lRPu>%bZ}-BG)uuBK8y`t;I8e*V#~Y43YMrY~D^%25v^h82zy z$L^)i`mn##_cQYeg(j(qxvtk4j5-!5zA$Uv!*s}CBb(S)ev7@#mv}<{$V4)4a#Z-{ zm74!%T|=hbglk{kU!E5H|NQRhf7U05G-|t;iAb#ol9=_K*|fesqW;bQzk60DF!x2J zAK;B#*|I_MD67HQ-$By<_Rib;_rK}>S^t;Ie*Q1N$>;C>%L>2#N14|1%nszqV9UBE z9RK-!Fqg#Xj#TV%QtUsgn z`G4HxmjBTuhyJY(`}lLe$FZM9|4S0RCoskv=D2-ok}$}!du#0bXa8-DZ~xuaKKQRa zWzRqT2}LZwC6~<%xYKQFu(~#C>6_p6Gn;<@uN3uktf#s4nCsZv^GLH#Z~i9T^2%N<@r|FD+U%^}@1_lNOPgg&ebxsLQ02F+@MgRZ+ diff --git a/src/libs/cplusplus/images/signal@2x.png b/src/libs/cplusplus/images/signal@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..241e3d7634226e76047813677e038fec744ee38c GIT binary patch literal 374 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4h9AWhA=@@4F(2ATTd6q5R21$FWGw^4iIVk zXfAYN!&UaXS z!E>Q!ocP+EFFO~fpLs8NXeaxXWm(hD-`}EtftfYo#=5UU%?oO`O=Ml;7UVD~G5c!6 z-HFWUxxX8qyw%y%pEQBlpjP67zS7kxP3M3A{i)~^H(9j!iuaH9bm_EK8;5793NIpB zcllon)|lvegV~YM;g`jd=?C@xa+)MHax<`r?fMe*j5oUN>SZSJ`^NX4sxD(%w?K^d z7oSdB%pt+q5q&Iz?0z@Q(j@wN_c)g*zb)pI^WM?$gkjx|cG-DJ!kd!kmY?{{X_nG{ zw119s{c5h8bHm@th1@y)u{)^q-)8oyPyV{DWch!0$t2rNS*lfEHcokRt62MBGW+9C f?;U2z422xYUsH}{2_!E+ zZpKz9kjxn@#H>AGWA<`J=7zopr05MxU0ssI2 delta 484 zcmdnP_=$OfL_G%^0|SHn=l_We42(NHT^vI!PAC8P|KFZjRl?_rk;dc0hjiyyou7SU zs~yA5B!j{vUWRPDDHlJzcm2QXzi-a00_P4xh9xr}Cb$_hPx$vg?bx>e*C+4#XTB+` zfmbnw!Q=D)=9g!A;CS+L!m2>n{IiKYzzRdymhR-zWY5 z?IZjz|0?hQ{ccyk|7X%X{{L&ws`$oNODFI${I0Bz625WlcV+NFss5<+KlgKGzSmC< zJMn+2*S-JGJ#R6au5K_@-p!Enxqjajwzlh=w;RWNUds=(~VS>KObZ}?kta`7C-XK!+=1pi-O_49wc((`Zi%T}0noz-A7*_2tc zE7aoYf7a_lJLYeH(egKb?W5226MH`Ye|c!y|JM^tlD*lJ4y^dO<-Ezq|9OjV{FmO^ z^gniez$Yg5YbK7xJZEW(*8dS8ueHcJQ3Uz`(%Z>FVdQ&MBb@01$-y A>;M1& diff --git a/src/libs/cplusplus/images/slot@2x.png b/src/libs/cplusplus/images/slot@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..f1a96a773a45e4d45f8ba17ba88227b9d3d1746d GIT binary patch literal 210 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I7G?$phQ^Te;|vT8LIFM@t_%ze<>lq|_4N%6 z4ILdF|NsAg?_Io}fq|jg)5S4FW8%{OoxBGWco_Io+rFr1yL>q#@bGWA=R^LC$Dc|* z-8^CThw(aF+&R&ZQ(RW7SR__V^7d5}S|-pbZXp}e6|%tM#Rmo%J~k`eX=OeFN(-AN zaPnE75jJ5Cb~-p^!_t`s25OG)UubGbXdcnmJEEVuNWjrCK?EQIR&$N2|U)TTUCtX&#ComyRLOSEbe{G?8YoE@#p7$_}`Iz@BiCh6aR;6RsUa~ z9`?H>x;X0ce*b8{zx8&7f9oea`}|Jz|M!_{f9|i6{#W0->ivJ#puYdFB}4Z!UG;wW z<@4V?D-(L%*BbxR5C8Dv|C<*(|8Fms`L*BUF87K^)?nikX(jgZn|%K6zpU`<|7GRp z|Jd2s{!O1exj9)te%%hq6_x%qyj}Ahx8+~%{;@yotbC5Khw!Ge3U+rI+{}9Yw{tE3 zv;RR9)A!F}b2t279a{5Ge^TK;d-s!~ISiXN2l6nuavEgWy*2jzv;VfnxBqTyAN<#z zvgbgfsqck9^(}jE$EQ3$ykYq zeGXg0k&BB1c|`UbyR7-=|Hzyzo6S=CCc})+8>JcyT)qa&1~p7fVVLCjfq~iWW?)Vn cLnkvsp&Yx*F*ikC1_lNOPgg&ebxsLQ0Fb8QDF6Tf diff --git a/src/libs/cplusplus/images/slot_prot.png b/src/libs/cplusplus/images/slot_prot.png deleted file mode 100644 index 92a868266300c15741a667495d179b5fa5f5adc2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 452 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7yFFbTLo7}wCoC{sks2VD z_wY*Py(8YmNWCH|zVo-&6a^e=pVd|39m|ZJZTqVA`DH_WiTs=_~)Oc^Cc9zrgWp zf6T$h|8okXeaN8i1?C)#Ymz`(%Z M>FVdQ&MBb@0GTe}0ssI2 diff --git a/src/libs/cplusplus/images/static.png b/src/libs/cplusplus/images/static.png index 12c244780de35d4ab03c74a147bc5890f82a2250..988d55d8257fe1833158d3a6f9166d20cf10b927 100644 GIT binary patch delta 102 zcmZ3&STR8&frXiYf#L1lM?nk>3_<}uA+8`=NJv;%xW2yr%9Shs|NlQ6eY>53fkDyJ z#W92%DiH+s(1jbVVjoloFuUI%r@)QX2ycIEIaM0E`E^Yp*f`Ng7!PC{xWt~$( F699dXAa4Kw delta 147 zcmb&Qo!Qa)(|8%e!--{^h7PSdfbZvW>VaQo|kXhBN zX6&3sU@BjJp=bt}+{{R24+?ONDz`$VX>EaloaXvYsl}+M=P)2b|f`cGO zf`f3t3YW`GiUJ1|CN<`1XwTYudFDrM1A_&bi4Nvdr1r@=GBE@nb4lA&e&+}S0|SGn LtDnm{r-UW|fL1a+ literal 0 HcmV?d00001 diff --git a/src/libs/cplusplus/images/staticbackground.png b/src/libs/cplusplus/images/staticbackground.png new file mode 100644 index 0000000000000000000000000000000000000000..314bace86a2a4417eb878c150f670657c90e858a GIT binary patch literal 131 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd7G?$phPQVgfdqsCd_r6q7#M_wg+)X}{Qdo( zKY#xJ|9=JzPCf<(1|3fq#}JO_WR6y*HUVe0FazZojHfu73>%b|CAcv#H*57U3JaF8 f8auFvN-#9IsLVL@+h2=;fq}u()z4*}Q$iB}bN(Ov literal 0 HcmV?d00001 diff --git a/src/libs/cplusplus/images/staticbackground@2x.png b/src/libs/cplusplus/images/staticbackground@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..912032dcaed9ea2a4c050e9ad988c9cfc74611a3 GIT binary patch literal 173 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I7G?$phQ^Te;|vT8>H$6>t_%zejEsyzLP81( z3Jwkqj*gB|QBhS@Rn^ti8#iv;v}x16ef$3Z|KA>wJ&}Qd!O_#jF+^ixvPCnS#0HKW zlFwFJsx{YT#a$NXmR6$x0o`bp#wPA^-CJqK(i<}pW=#@v zoAOjGVAm9(tR5CsBjbMy&h-2Fecqb!&b2kA>fwQhGV`W?pYvTNFtkitNG$ub)zrL* zpPd=161~~em{Z=gU%zd2*?W4P=Ywy~frghRZiq0I{1Ur*bGY>`<80ZxOdA4DT&#M& zZ-vJ%1!my~Zt;&dPCd8!bnCOQdgYpmwwgqC=BXYLJsC0D41X^rG0w|0FxYQ+YtCMQ zs9Rj~zCG;b?GEvB4cf@kAlsW=XMSgPjmp7YYMy6n_GRa7nfE_1%j(@>_g*RWdBo_6@H%hOP*GsSPOUmqXEsji`&El0JSmsPEn8r8IWsJp16-ZS1B~Sq0uJx*kemsMx;u{sHe# z4?bD0j;PPLnavn#Td-yO_SNR>M1MkixMktrS)!5RQhDK``qrellZffRDRoY s>bU&d7SQ^AOF*^|gKy6d-@lA~Iy`N%%`;vyFfcH9y85}Sb4q9e0Gopm+yDRo diff --git a/src/libs/cplusplus/images/var.png b/src/libs/cplusplus/images/var.png deleted file mode 100644 index 089cfb45e5fc0f9629c508538ffc5886f79f84c1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 530 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7BuiW)N`mv#O3D+9QW+dm z@{>{(JaZG%Q-e|yQz{EjrrIztFmCa5aSW-rwdC?yeP%}yh7a4f#%9jSn3C~GRyvt4t9|UUV9)9lg(_P%6y;WRoapT#oq4NW@ zV;<~YwqH!+p+|y_%%c_24KEJu@fX-9R`|Egy`61`NMM5`+ZWSo&J}4=-87~m! z=`dd{wWzFWTYFmCVlu~%_V!wv^UJ&E{#;dIa71>$fQ2Zhiu`7UQ$`Z2*mkvfYCd7i z+E8yC&)LuOrC7S0f5M@_&P56#x)}*slUN?To0nvCt?Su5{o|j7A2*)6Czto`4;RNG z{~z~WS=1K(KXB}uP*;VSkyOUZcaNs&uXEhIY*m!{>^UZEzoC{Z#Js87Tf61SCI`_wrFRUvvX^Tu(+E5I^!N-z9_0$*Zb8%U zDT#Lv37zOn3H|d|Emlc+-iX*k|x`^>bP0l+XkK26N@* diff --git a/src/libs/cplusplus/images/var_priv.png b/src/libs/cplusplus/images/var_priv.png deleted file mode 100644 index 8c6cf64fe7b564e2ac3f43519ab749fb7c6f2e74..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 632 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7BuiW)N`mv#O3D+9QW+dm z@{>{(JaZG%Q-e|yQz{EjrrIztFiCm3IEGZ*YMJbtA?zs9aDU0|s}~YBbT!JUeq5xm zFw0ffH&-W4tAxAiquRVH-ETczss;R&D#X4lu=PALd8c^JYbO;C0nLp;2OBb_ch7wD z=G?oSYuj(<+`W}s^P%F*`R~vE@-jZPDw*h9`>|r_-Mr(x=lUP+lCvw}Ua#=YzT(-f zkXJt^ANQ=Bzo)0#{oh`Z*L>P5wSUSy+-u}>)<-?Ha{J^6^NOULDN{6=6K@;T{7`t3 zf6qaEul1ZG-`a{fULVlqwll9g{5pU2hozni>uYQ@J%dacmU#R~>Z`f4B;caPitN`5 zURvE~`UgzIn1r zn@`_A_{G`uk2v#hGkYfg_jj6tRz7Ks<6P>i@~~syKjGsiH^1UHV7~AoBF{N_4bW~ek<2!Bz%s(<6uZgc(Sm%J<0vkcf@xGcGTPkiOdT&8@bHLK2uDiwGBTV;66 z&)xOG+xF)R^jbVN^LK|n+-3W~LUR3iK^ach4apN0e7?=6V6%aJkGINuZ?_X>Yc#sj o#RAT^zIx!TG%@0b@&SfDm(3lfz2wngU|?YIboFyt=akR{0E5jNHUIzs diff --git a/src/libs/cplusplus/images/var_priv_st.png b/src/libs/cplusplus/images/var_priv_st.png deleted file mode 100644 index 81ef73f3f94466e4357f94da7ba762ad0c291982..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 676 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4rT@h1`S>QU<3z`(*%ziB&L1d<@109!;NNDVs&ldvdDSOSPGDZ?F^oYdLN z7?uDsmV=X#o0l~*scz%8T^Fwu&RdHBh*1ux$kpSY;K|D@{n15(S^i_Twu`0=yA zz(6@Uxz3w+4UeAJ+prUer{4rqBOfvH1i|dW0yUm|C`AXf8 zP%+G1_IiGU)xNBfA^V2{{!_(EzWt~$(69BBr BAzlCg diff --git a/src/libs/cplusplus/images/var_prot.png b/src/libs/cplusplus/images/var_prot.png deleted file mode 100644 index a7496aada00956be7144f7fa6bf2654e3989a691..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 619 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7BuiW)N`mv#O3D+9QW+dm z@{>{(JaZG%Q-e|yQz{EjrrIztF!6f2IEGZ*N=o7AN<6^aveVLX{h#08`#=9aKR?Ui zpLWX0|JmZk27;GjgyeMWb}#Rp-#hoMSbz^tte|k+S;t3pdVD?hkvAopyt{thykWqb zcxd^}>o+HUJoG%Dr@rog+6Ga{^ej`8&fJwk)TNmJ9nE&i$|W!O@krfl=YCrQ^OwUSiLBc(=bZ z{=;DX)%u2;1@DzVFJBn)oK0Z<_vi0n-6f09T6{dG+$L|p>u|gGXN82*mQcwpKPn~r zVt4#m{_TzB*X`WPn@vxjK5cv;!!5x}Bsn#8ud=-C(ck?O8D%2OoS1l?{)*xWz7-|; z@6Vr~@pmqT?N?U&W8|Z3l+dD(Ic+ ZAaeR&@ryt1g$xV~44$rjF6*2UngGah9UlMy diff --git a/src/libs/cplusplus/images/var_prot_st.png b/src/libs/cplusplus/images/var_prot_st.png deleted file mode 100644 index f078b2fd34058828a59edd71fda8c87d77ae8b81..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 658 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4rT@h1`S>QU<3z`(*%ziB&L1d<@109!;NNDVs&ldvdDSOSPGDZ?F^oYdLN z7?uDsmV=X#o40P`w(_-`*dr3B?%XRBm%$pIn2?oSzIX*|c*4;ex8l+>KpMe#$V4$dt7pFcnEUeG%%`uWJ$&Z1_o%MDy%lh$Iff)IjX#QkL>C#5{uUe zOr5v+-6zY_S9A`YR^NF@apNwTl^ewtt`wL&XTi(2#wRXn??0)!{eaZ+^`i5a^G}@B zdGoH}(es*nkEv|kC%0y6;I4y9Z{0or@|DV_-AbEx%dXlSx##eO*Kbn_izFAUblSA@ z{OdQ;av(7E{H3J4{D9`X90mpkqmm%MUer{4rqBOQUprn_ggI-CHUob<^l^+jMgr9#9 zduzukH|O7np0m?j{(Vr)Kf3zEOjXanpHlDq{`Xbt-@i|vK7IXa)?+Tlz`(HB)5S4F zLX!2Mw)c`mhK7sJr}(?yVAN%PlzQwzk|4|MqxBEYn`Ri^>N!2TfP#ST=POpN zS|#)&>(H)CVtf3|`0MM}c;EhEJoEjhPuu)-Ka}s|*Z+U**5~@;zXd=1Suu6_(%1va zrZeX=)=AFNsb`Yw*|O2<=x4_7ZZDt66r_jDTB~=UH*jg1`}7@VtAfsoh3DD3hpwEZ jTUXPw$}3d1f7Pn|Z4T<@>t;Cdf+E+`)z4*}Q$iB}k%kIV diff --git a/src/libs/utils/theme/theme.h b/src/libs/utils/theme/theme.h index 884b76104fc..8dd54e5a79c 100644 --- a/src/libs/utils/theme/theme.h +++ b/src/libs/utils/theme/theme.h @@ -151,6 +151,18 @@ public: IconsModeAnalyzeActiveColor, IconsModeHelpActiveColor, + /* Code model Icons */ + + IconsCodeModelKeywordColor, + IconsCodeModelClassColor, + IconsCodeModelStructColor, + IconsCodeModelFunctionColor, + IconsCodeModelVariableColor, + IconsCodeModelEnumColor, + IconsCodeModelMacroColor, + IconsCodeModelOverlayBackgroundColor, + IconsCodeModelOverlayForegroundColor, + /* Output panes */ OutputPanes_DebugTextColor, diff --git a/src/plugins/texteditor/codeassist/genericproposalwidget.cpp b/src/plugins/texteditor/codeassist/genericproposalwidget.cpp index b1f72f79242..6a792c152c0 100644 --- a/src/plugins/texteditor/codeassist/genericproposalwidget.cpp +++ b/src/plugins/texteditor/codeassist/genericproposalwidget.cpp @@ -275,6 +275,7 @@ GenericProposalWidgetPrivate::GenericProposalWidgetPrivate(QWidget *completionWi , m_assistant(0) , m_autoWidth(true) { + m_completionListView->setIconSize(QSize(16, 16)); connect(m_completionListView, &QAbstractItemView::activated, this, &GenericProposalWidgetPrivate::handleActivation); diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg index 1435147586e..cb962e1c699 100644 --- a/src/tools/icons/qtcreatoricons.svg +++ b/src/tools/icons/qtcreatoricons.svg @@ -3405,6 +3405,587 @@ id="path5457-0-5" style="display:inline" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +