From 26e8ea8a515781579d126f9628ffe9546b436ebe Mon Sep 17 00:00:00 2001
From: Eyck Jentzsch <eyck@minres.com>
Date: Thu, 14 Jan 2021 21:57:27 +0100
Subject: [PATCH] change design browser icons

---
 .../icons/lightbulb_off.png                    | Bin 0 -> 700 bytes
 .../icons/stream.png                           | Bin 444 -> 536 bytes
 .../icons/stream_hier.png                      | Bin 0 -> 688 bytes
 .../provider/TxDbLabelProvider.java            |  17 +++++++++++++----
 4 files changed, 13 insertions(+), 4 deletions(-)
 create mode 100644 plugins/com.minres.scviewer.e4.application/icons/lightbulb_off.png
 mode change 100755 => 100644 plugins/com.minres.scviewer.e4.application/icons/stream.png
 create mode 100755 plugins/com.minres.scviewer.e4.application/icons/stream_hier.png

diff --git a/plugins/com.minres.scviewer.e4.application/icons/lightbulb_off.png b/plugins/com.minres.scviewer.e4.application/icons/lightbulb_off.png
new file mode 100644
index 0000000000000000000000000000000000000000..e95b8c5b1244a41c9dfacd733ec652a532052a45
GIT binary patch
literal 700
zcmV;t0z>_YP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!PDw;TR5;6(
zlHE@dP#DI&=&nDY^#^oU>!y2hX0`01t+}>V>!L2Ii?(iJ%bC$d(ON6}*wnOwG9V2N
zOG`{7!B5mwL_|_S2m}#C`CdG|@7W+M+U(-lIXipb-}9Vv-Vy*Mg_?2)&x|dud>nH6
z+<mjliLS}TWV^)~Y8iG+(t7jH`ohND-&}z%n>Pg4Y7{H$F@$4DL`b~nbIs5knvB+k
zHj8ub763Kx9CrFf76K8`6xv9LChyt?+yu)3H<M{lDm?r&9@37^@5%$r4)0xdh$d24
zjmE{ANN4afn-z+uGWZeR6e)PGrX<e{)17%h_w<s7-ME?Exu{U=%*p0_YoKe2M0a!}
zi9A3z{yoKw9M?l2j?0d@D=Y=q;qZq+NkO#&CesdP^8k9`Wv2QgG0>}{cgBtWFDjV(
zT46G1p#RVaN{MFkER1%KNN}rd=ywA89=YD?5^*~T(5|_U4sv3(jyQy?qF#!I-YIcK
zeuGD!Ck%N2HSJIh+U=tYeo@e&trgAm(x7tzP$_D_zeF>F>u*g-I^VNp4(M<9KQ~%~
z3}FWb=nBN{ra3RFTFe<mzwPv2gTx}o12ibU$K4Yk7+!vz;laUcy8AVCKW@Amh$>CC
z!$l`CCu*vADm$NUP}Jde?Il#nFW_p845!NWW$Et^{&SQIRV}^fRyMzZQmIB=eG~3I
zc!HA^Wx-;#MFG+)=LYmWJqQGXuvo_MLh%Zf$0hUI2Iy7tvy~@~#>&eNWlKvX*<(i}
i@%N3@m$wc0AN>MB3Mf9{XhoL*0000<MNUMnLSTZ&hCoLE

literal 0
HcmV?d00001

diff --git a/plugins/com.minres.scviewer.e4.application/icons/stream.png b/plugins/com.minres.scviewer.e4.application/icons/stream.png
old mode 100755
new mode 100644
index c32d25c16f8b399f0cf5681651d2871a48207627..5d59c0e49baca92a1b52715cf75211946403b464
GIT binary patch
delta 510
zcmV<a0RjHJ1DFJmB!32COGiWi{{U<N9*E_0)Bpeg32;bRa{vGf6951U69E94oEQKA
z00(qQO+^Rg0S*)|8l$tcsQ>^0rAb6VR5;7clC5r)K@f(Yoo{w$=bW|>NN6hP1rR`i
zsQ|~HLSR7R(cA(gI3yO!9nc0vFklD{)sUc&ko4^Cw}|g>IDbtMIGE(kjMzLo@4E~C
zy2AIHcY2sPGRuf(BpbmJAu0g!<XHgNz45s3?j4)}sNcT_s*n;yo#tQKf4w?r9(j2C
z5lIuKM$|;qh;pzG*}xslrr9!FxeDXB0@N~6TH)i@Pq;arW?bI6gi;C&0>c2Z>_dUp
z=%uaztu|^a9DkJ~M1&y>v{q5BU7yyC@wk-}fRWlN7k4g9Hlk6+g4XvR{wnRUjl6jE
z9CO2GMxJMUo(TYF_uh8#f#8a`Aag-IvN0D<SzyBxn=Z^^VD5@X!IJRw!MUISy}_-!
z+awKm6mk+Q3OR+TN5M2;DUei1gYfS2kLei!Sd7%#`FHYdfhRdG6J|+p8^|$`qp*Ei
zSuEpOZcwQsELvw+leSK5ozg(-h>B38Gj?cgTmw|7t#kfNA}w#3^xHyC0n-7Cf!aEY
zx(;ZaH!lyTFKqCqK(}1j$^)COY`8GD!2eM{0Z~+iwhE|(Y5)KL07*qoM6N<$g4T}X
AEC2ui

delta 418
zcmV;T0bTx>1iS-~B!2{FK}|sb0I$e51&Zka000?uMObuGZ)S9NVRB^vL1b@YWgtmy
zVP|DhWnpA_ami&o0003_Nkl<ZILozCyGjF55Ir0AD~#G&_&}{gK#Zi&R%|2){(yg?
zl@?pr*xE#N%a{*P6s-M*?B?#>`yTJE?1ErIG<smT!_4K(nSa9sM1*+|PHJ2ZGvdmC
z35A3UoF6R(-~DS$BH+@Xy#VYsLyQ>zxq>v8$ny|FSR~0W2u4ic`k5mcbEIiLksz4Y
z#KyE{9LLn}_oq&%6$}Oga?Zh83$3-^U4V1$eaMkz85m>bTh*c{3ch%tltQ=L4Q7$u
z>-Ff*JP6K)r+;Lfh4u2Cf3G?>rHYe>Ly|^9NaaHyK7K6gTNmr3q=wN3aD;}j2A$>s
z_7?Y{eO^Imfp&8Tt>qSSDeJoOm$|vJhV9i2Kada_TTC~e%%aFE<U%4<378uDT-5bq
za-rDy)#;PK;O_mlT%l;x1YY+2TMX$}D58S1gs0aRR2$a)?;*{C4|dJt5@URouK)l5
M07*qoM6N<$f^6r;_y7O^

diff --git a/plugins/com.minres.scviewer.e4.application/icons/stream_hier.png b/plugins/com.minres.scviewer.e4.application/icons/stream_hier.png
new file mode 100755
index 0000000000000000000000000000000000000000..93bdec436bcc20502791621b1c5908ceef1c15ca
GIT binary patch
literal 688
zcmV;h0#E&kP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI4N
z03L|tbJPF;010qNS#tmY3ljhU3ljkVnw%H_000McNliru<pB;9I1Ezcg>C=<0zFAY
zK~y-)t&>ZLj&T&mfB)Az6Y{YUF-DOXm&AmHrm4wTXw1USmMz&x7FM#elH3+kiWSn7
z!Nfw6lte?yrLa(p%P`+J@Atm{+xZ`hK?<|s)aleY&v|-IJqP|V%v8gZw+k(Oq_CcP
zX*srY@o)HSDuU8Qx);Khww&>z{39lxil9+Bsw&4?p<e$B!HcUKMyAhRwaS=Z#VBs#
z)!XA=EN35;)F(<Bjf&@2*39{SbhD%XX#~iPW*zNaXIqRhpp(lOL$sfl9vnIBpM33W
z4I$7u@1~p9+CQoiJ{Iq99RMx@n3sba$Cvfrnd3)KbMNIkQc8#jAq1?olx0a(RWzGT
zilU&|Z2s&G3=Ei@U@}b}@vV68+1!4g(ENayjF#yOKm#O?Y6K#+j)S}z?kkQAuADWg
z;L=9Fq;II@z=K0b5+o&35>EA;X4j3~xahFXW1Z#t&Otg)bmLthh6qW?2pRc|c|?iy
zwrywYqCSE|l7EK{mhQG5x)yg)IY;?wAKrS_tyn|n>b0b#<OEd}OB6v;B&iTZ2xCK3
z*3s~F3O_+*EgD9NAtFggs%TPj9I7c2B{KB-GLjOK1P!04oaNfnVVv_g=Skr+NtB0=
zM^OD?B(G`^POjgE#_`FNIvU3q+%zAJ6R0#$NvM=O+kb&K=l0m;dmqdI$knH>u^gKj
ziq;ybmZ`Qts)5c$#Q`48CacK=u~yY5_tS}L-O<-)c5FiF#Za5_^%O97JxR~=zv3Hx
Wvv~0S{K`E50000<MNUMnLSTaZ%RA@*

literal 0
HcmV?d00001

diff --git a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/provider/TxDbLabelProvider.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/provider/TxDbLabelProvider.java
index df52c1a..2a44844 100644
--- a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/provider/TxDbLabelProvider.java
+++ b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/provider/TxDbLabelProvider.java
@@ -52,12 +52,17 @@ public class TxDbLabelProvider implements ILabelProvider {
 	/**
 	 * Instantiates a new tx db label provider.
 	 */
-	public TxDbLabelProvider() {
+	public TxDbLabelProvider(boolean isTree) {
 		super();
 		loadinDatabase=ResourceManager.getPluginImage(Constants.PLUGIN_ID, "icons/database_go.png"); //$NON-NLS-1$ //$NON-NLS-2$
 		database=ResourceManager.getPluginImage(Constants.PLUGIN_ID, "icons/database.png"); //$NON-NLS-1$ //$NON-NLS-2$
-		stream=ResourceManager.getPluginImage(Constants.PLUGIN_ID, "icons/stream.png"); //$NON-NLS-1$ //$NON-NLS-2$
 		folder=ResourceManager.getPluginImage(Constants.PLUGIN_ID, "icons/folder.png"); //$NON-NLS-1$ //$NON-NLS-2$
+		if(isTree) {
+			stream=ResourceManager.getPluginImage(Constants.PLUGIN_ID, "icons/stream_hier.png"); //$NON-NLS-1$ //$NON-NLS-2$
+		} else {
+			stream=ResourceManager.getPluginImage(Constants.PLUGIN_ID, "icons/stream.png"); //$NON-NLS-1$ //$NON-NLS-2$
+			
+		}
 		signal=ResourceManager.getPluginImage(Constants.PLUGIN_ID, "icons/signal.png"); //$NON-NLS-1$ //$NON-NLS-2$
 		wave=ResourceManager.getPluginImage(Constants.PLUGIN_ID, "icons/wave.png"); //$NON-NLS-1$ //$NON-NLS-2$
 	}
@@ -134,7 +139,7 @@ public class TxDbLabelProvider implements ILabelProvider {
 			case FILTER:
 				break;
 			case SIGNAL:
-				if(((IWaveform) element).getWidth()==1)
+				if(((IWaveform) element).getRowCount()==1)
 					return signal;
 				else 
 					return wave;
@@ -159,7 +164,11 @@ public class TxDbLabelProvider implements ILabelProvider {
 	 */
 	@Override
 	public String getText(Object element) {
-		return ((IHierNode)element).getName();
+		if(element instanceof IWaveformDb){
+			IWaveformDb db = (IWaveformDb) element;
+			return db.getName()+(db.isLoaded()?"":" (loading)");
+		} else
+			return ((IHierNode)element).getName();
 	}
 
 }