From 93d5f716298145fbb1a92da5f5a7afcfe251f835 2017-07-05 09:04:17
From: Alexandre Leroux <aleroux@itlink.fr>
Date: 2017-07-05 09:04:17
Subject: [PATCH] Changes data source item icons (1)

- Adds new type of item (component)
- Uses new icons

---

diff --git a/core/include/DataSource/DataSourceItem.h b/core/include/DataSource/DataSourceItem.h
index bffa393..37bee42 100644
--- a/core/include/DataSource/DataSourceItem.h
+++ b/core/include/DataSource/DataSourceItem.h
@@ -11,7 +11,7 @@ class DataSourceItemAction;
 /**
  * Possible types of an item
  */
-enum class DataSourceItemType { NODE, PRODUCT };
+enum class DataSourceItemType { NODE, PRODUCT, COMPONENT };
 
 /**
  * @brief The DataSourceItem class aims to represent a structure element of a data source.
diff --git a/gui/resources/icones/dataSourceComponent.png b/gui/resources/icones/dataSourceComponent.png
new file mode 100644
index 0000000000000000000000000000000000000000..38a2bfc5efe237b729acde561bbf5d965026ea99
GIT binary patch
literal 2150
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

literal 0
Hc$@<O00001

diff --git a/gui/resources/icones/dataSourceNode.png b/gui/resources/icones/dataSourceNode.png
new file mode 100644
index 0000000000000000000000000000000000000000..79d67dafcb8e7996f7b55916c59612e0cbfc60d5
GIT binary patch
literal 882
zc%17D@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSEX7WqAsj$Z!;#Vf<Z~8yL>4nJ
za0`PlBg3pY5)2H?BAzaeAr*7p-rbue5-8FB(OuZEN$SFigw$l^h)Tgpm#i;1y;m@Q
zAUebE2)96v>W!sg8w8H@d#!PC?LDSo7%w)tLBj0j-OBSbjjQL$&-s>`_I&>Lxo6Lu
zYf$l=go>OknPhxJ!drK-=`h<j&OMUN9l?5!@q5E%$#4GbGZ^hA{X4)Pb-r=($?rkT
zXD{D9ct6_vK*=lFx0^+bE6-nT+1hT(Z*$;tOJfk*gQP>Z7VmH^_FHg9?&4pLALY79
z>L;>hzT^M(|FxmP?4sqr)3g%bvOcIe^y~2sraLTt46k=*3*UHGFk9`K_^$um?|(<J
z$1$0^{dv<qElbUhxnAhn`m<~Wl0O7uEv{~Fu(bIxv5)b3u!x^%!=<$UDm$huTEY0D
zU*)<Pk3+r6&UF*D7{rCHu8myJl)&DR&Y)GU<$5uM(PH|Fyt7qT8Ex1*uCHb|qq-{E
z_<bJG+edfu+AQ9wzyEdii^==0HH06CofZAwdb`7Sd9Ssv9||0Q?jU&m&Hc$Qf|l}q
z<+ZrI%)y0WTl1@olISge9(o_KZ`#I`m0`30mRJYJf$a@aQs=*KW94z!zjljm0>iJf
zd;yls0haC#PrF_)#4`gGy0RSLyC4e`c*8K&m|<!$OUSwoz6aYI-fiJ?xRQE@w?-~r
zJS}6MlF_ym_gS~hbCtT8A0=1Q!QJqj@#ogO|3EW!mb`XjJs^DW55xrREEb6d5L;V|
zVIIq~=Nv0y0%Z>{JOTO}!cJg~-!&mRknx6MMzhJ5MQ#ihY(=-0R7!bgvn`l^=-qw;
zhQBEcTH<B<L?s#i%g*ti$hd*|$zzTcb7U73u`MX-Yd9r(lktz(1c*fN6OIpE33je!
z4Y?286Kr|IQWy>xPVk<n%wQvUCXt;vU~4GT{0nlj4d)Mj-Ex2ViKL5+6|yn@zxQ_P
zh{-mng9L-FOBc*=-BmyH(vo%J2R=UJKl*T)Quo^`ug^*=jSuLYW&7>7@Z(y>{Knr0
jWM`!_qbJizDj&rSvfD~;Rqqi1W*P=hS3j3^P6<r_5bk?T

literal 0
Hc$@<O00001

diff --git a/gui/resources/icones/dataSourceProduct.png b/gui/resources/icones/dataSourceProduct.png
new file mode 100644
index 0000000000000000000000000000000000000000..f2d820bd48d5852c6d76bb08b2c2e57f555dc552
GIT binary patch
literal 1213
zc%17D@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSEX7WqAsj$Z!;#Vf<Z~8yL>4nJ
za0`PlBg3pY5<oTao-U3d6?5L+we661l{o(KeP#Nd6&h|wlr@w(6g(U@2r&uv>a)cA
zZ4hJ))H!m<%_ChjXsN#<%UY&D7Dt}IEdn}Q0*d!Fx<(v)uv_MYs^PKANh}Y$-n@Bt
z#_so<&%X~8oPBrhPkP;*JLk^T^Shvelsqw>*KsWK*yb_hvFe%Tc=z!>NPZyjVP#?T
zo!x9dIDQ;Y{3%_rvS#{`jSPGG|2pvLo}d11hKAhXx({A|)hhNB+;927_N_U5)gR6~
z!P}~zy_bH&zAoh_^N!6K{Jk%Pnyt1=Ux~at^?>yfYsqpQCIk2DjPIGO*GgZS$`o+U
z_W<W5-F4Dj4)cT$tn7K5$A0hFMU&+WPksvC_<jGpSvli+X7AAGkPfB^??npiH_R)1
zWA}h#oA=vDk%qi$4ebq^C6C*=R^=%~o7}j+yIgmD-cO$24f~DG-?d+`K5gZ}I)`>P
zh6kPr#-IPBSADyxV|s%>qmzMQ&y31{tPdv2)tY+qeq)Z(Vqjo5T3;x3<L*X?CU2mo
zf@h`I8e?UDt+KkyI^`o%fzIO{t3A8D%&+JA*|9F@@x7FLzgqJ6x(V~7W8$~E&J<}V
zI>)?vNo{j(9%CPKcxY}Q8|#8KyqBa7UY9(6k8uxcOxRXeU6F=Qb<FRW_no#V<1d)9
z#rakXQ^4`eAdb3|7G+aQ#1owuS3Hk?;CN};Mzix1uL(P4Y}mj4eN>$EhsyVC=Tfh2
zPIs`)GXeVH`X;jv#_K0dYrg%;(r$yCxYQf=E&i3251!YVE$;h#U|ZwYlBA7^3l-na
zKmApsU{k=|^$g$nEb4iG%rS|mwQ=~(bfNdaciZ*%XSU~ht9vfgeE8+S=kmaM-TEtr
z7h@d?<d`-DeTcH=ipv(W@nMu_uovHPPN~4T@%5Rmc7~kgx8-{;HMVOyXazAe1>-=U
zH;DW(_%O3nxhhI&Z+OL~_q?A38uTR!n_XDbXB04)u(CW?WKjLi+><L9u`Tb&(TW*N
zUT@hqY~YE>zT46LQGnqs`-&5XMHECe84lt?l@VNeKkFLSO>6L<@!|2Eg*Ge;p8RI~
zHRH?YKMNriO#96!)_9ut_4;#%MG|((C(M-m|BGFo@j_ig7tmut6PX0&;6m+76HfnS
z$i4Gk{DT0)YalD;z4!$Ypg4oi&%X?l|NpC(<_|tF<vzc`&-eeg<8^Q(%YygzaeYZw
z{%zzqAlYnXdsAYwQ8z<PX25cBd&d2JkqccJ`lPPBJZkuwttXN3#{`q>EC0k_Yn;pc
z>*`d|2ik9}Yqe6DZ&<Hzm)*r=!SSczFGIxC;sdh}<TC%>w4HTz*Y+EXIh*s2oG@#=
k-^hK9R}ckEy!lgnZ_2fEkBpSB0?Qu;Pgg&ebxsLQ04T8ua{vGU

literal 0
Hc$@<O00001

diff --git a/gui/resources/sqpguiresources.qrc b/gui/resources/sqpguiresources.qrc
index bb88c82..82a8f43 100644
--- a/gui/resources/sqpguiresources.qrc
+++ b/gui/resources/sqpguiresources.qrc
@@ -1,5 +1,8 @@
 <RCC>
     <qresource prefix="/">
+		<file>icones/dataSourceComponent.png</file>
+		<file>icones/dataSourceNode.png</file>
+		<file>icones/dataSourceProduct.png</file>
 		<file>icones/delete.png</file>
         <file>icones/openInspector.png</file>
         <file>icones/next.png</file>
diff --git a/gui/src/DataSource/DataSourceTreeWidgetItem.cpp b/gui/src/DataSource/DataSourceTreeWidgetItem.cpp
index b4c516d..f0629ca 100644
--- a/gui/src/DataSource/DataSourceTreeWidgetItem.cpp
+++ b/gui/src/DataSource/DataSourceTreeWidgetItem.cpp
@@ -2,8 +2,6 @@
 #include <DataSource/DataSourceItemAction.h>
 #include <DataSource/DataSourceTreeWidgetItem.h>
 
-#include <SqpApplication.h>
-
 #include <QAction>
 
 Q_LOGGING_CATEGORY(LOG_DataSourceTreeWidgetItem, "DataSourceTreeWidgetItem")
@@ -19,9 +17,11 @@ QIcon itemIcon(const DataSourceItem *dataSource)
         auto dataSourceType = dataSource->type();
         switch (dataSourceType) {
             case DataSourceItemType::NODE:
-                return sqpApp->style()->standardIcon(QStyle::SP_DirIcon);
+                return QIcon{":/icones/dataSourceNode.png"};
             case DataSourceItemType::PRODUCT:
-                return sqpApp->style()->standardIcon(QStyle::SP_FileIcon);
+                return QIcon{":/icones/dataSourceProduct.png"};
+            case DataSourceItemType::COMPONENT:
+                return QIcon{":/icones/dataSourceComponent.png"};
             default:
                 // No action
                 break;