From 0d752c3e574b416b55f4fa3bf1c4e7583e836b9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20D=C3=B6bber?= <doebber@in.tum.de> Date: Thu, 5 Jan 2012 13:58:07 +0000 Subject: [PATCH] added icons to operator panels and several views --- .../trunk/icons/debug.gif | Bin 0 -> 348 bytes .../trunk/icons/error.gif | Bin 0 -> 605 bytes .../trunk/icons/fatal.gif | Bin 0 -> 333 bytes .../trunk/icons/info.gif | Bin 0 -> 267 bytes .../trunk/icons/marker_view.gif | Bin 0 -> 577 bytes .../trunk/icons/navigator.gif | Bin 0 -> 366 bytes .../trunk/icons/warning.gif | Bin 0 -> 331 bytes .../trunk/plugin.xml | 4 +-- .../ui/internal/views/MarkerViewPart.java | 27 ++++++++++++++++++ 9 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 org.fortiss.tooling.kernel.ui/trunk/icons/debug.gif create mode 100644 org.fortiss.tooling.kernel.ui/trunk/icons/error.gif create mode 100644 org.fortiss.tooling.kernel.ui/trunk/icons/fatal.gif create mode 100644 org.fortiss.tooling.kernel.ui/trunk/icons/info.gif create mode 100644 org.fortiss.tooling.kernel.ui/trunk/icons/marker_view.gif create mode 100644 org.fortiss.tooling.kernel.ui/trunk/icons/navigator.gif create mode 100644 org.fortiss.tooling.kernel.ui/trunk/icons/warning.gif diff --git a/org.fortiss.tooling.kernel.ui/trunk/icons/debug.gif b/org.fortiss.tooling.kernel.ui/trunk/icons/debug.gif new file mode 100644 index 0000000000000000000000000000000000000000..ac5431fa311bc030ee3ed411a1d9db9915fe6397 GIT binary patch literal 348 zcmZ?wbhEHb6krfwxXQq=aotAQq)ORjAgYj0t&~rxP)My*N~=;#uT;sXQqQVZ&#uzS zt<lP@*3PTZ$*<NesIdqOHuUpSur$*3bF~QbGYs?6aI`e^bJg&$)o``c^{`d8Gg5X0 z%G&B>DOuHM2lv`cI#^%4JYw46%BhDc=O1recCvllxryt~P275E=Iz&Kwq2UJ<I<cR zm*yV3v+nBiL$_a@dH(tK@jL5}-ClS6_WINJw_JU8==kk*|NsAIzyOLrSr{1@EE#k_ zG9W)OuvH$I6A&RO)$e@Lpvi>Ej6rc(=EMLa0S*V@+-D2|k-FR`ef4~gzuCNNuN*_e zaityu#@-n@sl|r7+$5y9478O@bkw<hWjOWCER;3XIECfhV>ooRG!#|X1HGI@7+BcU g)l?N&JxZK}8JU?F<D6v+x4KF0bX&J)zaxV+08)i|_W%F@ literal 0 HcmV?d00001 diff --git a/org.fortiss.tooling.kernel.ui/trunk/icons/error.gif b/org.fortiss.tooling.kernel.ui/trunk/icons/error.gif new file mode 100644 index 0000000000000000000000000000000000000000..2ff6678993db0882f6a69fec5de642ad523f99a5 GIT binary patch literal 605 zcmZ?wbhEHb6krfwc*el+DJK4Na@yyV^snt5AN<2U1cbkfi2W2D|1mn@Q+m$(yyDln zg&&H`zgE?Mt!a4c9{ABW?4w`UU9XUP-of|%!@uU1e#tG}Eu?TrUi+M;#W8KOch(*k zEnM$9_<r<@dL5eZB_a26Sp1#Lq7!18CnU5^NNAss)IKDm`$XU2dUD?Vvc_{tmiK2Z zeYSe*saVf*d2xrLeZF@#d|x!{q`Td>`pRz&mESrV9wbJ8Ei3w5S@O2B^hbBc$DYnl zX=$JHbKf>KeDCi3(BArg|Nh(Cwmm*_<UbfN3>~2OlZBCi!Hq!&<YZ8sFtG1xaBFIA zX>D~j&@(pH(|2ie(>FG^H!`v}H`Z@8Ft#x>wX`%bv@$kmb~bjjuyeKBu-?(wxk*XH z+Sb;|)z;O?)<HzENrsz=oq@r1KL<M_w@i}?pTISNGXjEwtbD3X$_g5f_qaZOET?=_ zURrw3JJ+|;@|WC{WX1Sh`TsaM@rzn@2wX{OZDL^&((+lL;N0z~Wn_?%uwYRm8;{Wn jjU|tcw6HR>=}c%)WK|JUG>I`dsK~<YVZhDG#9$2oA#$?o literal 0 HcmV?d00001 diff --git a/org.fortiss.tooling.kernel.ui/trunk/icons/fatal.gif b/org.fortiss.tooling.kernel.ui/trunk/icons/fatal.gif new file mode 100644 index 0000000000000000000000000000000000000000..486faff8aacdbc43192d92dc975e5ce62c0f26b1 GIT binary patch literal 333 zcmZ?wbhEHb6krfwxXQrrsif>>R^IE}!k;^K{oJ+Z_qhxA{loA1hrf$RdK41<FeK)E zeA@4mXU=JupVPFs>)?CMC*pNz!pFGm$8EjmR87z6*_|_Rcz^Qzv(;PA=fzy_s=Ym} z>!iEg`KX{LX^Ed}YF^jWJU(*d^_46C!GM9<K=CIFBLjm9gAT}Gke?XXvK%HAc<4y= zdrZoh{4&KvDW&5vW2Ehz34uo#Yxc!6sC&(kV0dBjz(CW9sii5#Pr#u|^kl|)c~7l8 zL1vzo7G}ZnRDO=0UJm|T7jY2|?rGCF_{7~LcsUstaPdiahzkpd2?)>jT)S?)rz3+k E0Jl+U1poj5 literal 0 HcmV?d00001 diff --git a/org.fortiss.tooling.kernel.ui/trunk/icons/info.gif b/org.fortiss.tooling.kernel.ui/trunk/icons/info.gif new file mode 100644 index 0000000000000000000000000000000000000000..3679f84ad88360690aeef62e7cebad04805fd795 GIT binary patch literal 267 zcmZ?wbhEHb6krfwI3mUH?eBjkw;sNvC7~1cZ@cj1_>~J^e*d4g?dbPE|9|}b|LgDn z?|=XQ`S<_ppZ|aV{r~y*|C>)=zy0~o5i;ZVzyCZj^FMw5`u5Y;fB*h-$Ik!w>FfXh z{~1t$;!hSv1_mhx9gr}{P6pPF1!{dMkz&mPEQbPS+!Ew*nJVa9Fs0qWf}xS2K#`+t zk<$Zq4n9Ucrw2<Vc_e%pww+9faJ6#{{xQd=XA#4bj{@AYxmr~xw5hyf;9~o*!}*1j z9R~+DgOCt6cS}Ynb2A5nHZOx9N4%653ooy>wjgg%h@l<Z(q(QQ%0?zjEvyVQv~=_g KwyG*JSOWm^R&MYB literal 0 HcmV?d00001 diff --git a/org.fortiss.tooling.kernel.ui/trunk/icons/marker_view.gif b/org.fortiss.tooling.kernel.ui/trunk/icons/marker_view.gif new file mode 100644 index 0000000000000000000000000000000000000000..004f4acb6763e9c2d556af75d5b6ffd7531d1bb4 GIT binary patch literal 577 zcmZ?wbhEHb6krfwc*ekRP*ifisKkH&p#KTU|H~_`ib-D)lfEOR@ZUfDe{j@C|Iq)T zQ6GcDKZQpAk4^laSNzh{?tg6B|E$9Q?-&06^Y;Ji$^W1C{J&lF|6b$&N4@`FuKNG( z;Qtd*|1TE&ztZ^sYSaI#&HwLA|9@}J|K~gYpUL@url2}dxFJ-uDO{{GTB1E#q9;yj z|Dy7<-9{(d4bOI)-kD*4f40+uInEE4hQ2*H^J1^r?dcBpXF1)S>2#sj>GA&Q&(Ewo zQKkLv`u?ZO^45gQOmGuFtFL&$M(_W`&a;X#|MPSH=jQ%jy7d2w75~A2VQ>S*pDc_F z3|<U6AZLQ&gn@ltgIAN6wULo^b7z;iw6tN@1ZxXrWs8mp%?8qHYSLyinv6{q)HM`L zO%~{j%WG=ONjW*XICUE9O33U|a&dQcc6VvklT=aE(%I|j?tc1^mxGw9tgQgA+u74@ zOad3|M1@5d1vxl8J)a6PHrd-)TCsC;-gM{WW}hIyb@t3@uDcU>Y#fvhGEQP=b<os2 Xkifvm#wn`RSir#G&^d#Nk--`ONy@mT literal 0 HcmV?d00001 diff --git a/org.fortiss.tooling.kernel.ui/trunk/icons/navigator.gif b/org.fortiss.tooling.kernel.ui/trunk/icons/navigator.gif new file mode 100644 index 0000000000000000000000000000000000000000..68079f93b4395dcd9da86a7569afdd2b4aa7f5ba GIT binary patch literal 366 zcmZ?wbhEHb6krfwxXQqA!@(n?U_xP8S3y~qdC;`n?oHa^{f;Fo4qSXxTi?h~vBRRm zV*SbWKYnzaKYy~jvwZrbyah8de!ZOc|Ld7+mydnBKkfg=L;qiI{{MQ*|L+gqT<re; zbjkm(xBuVj{C|Jyf1vD#^Z!3w`2XqZ|BI!M57z#Fd*bG%!o!_rJL-&%cbo5PG1=Q} zvboY=eX0JATBE1ej%+Sadwk{ae=uMm0x14uVPs%1X3znt1^J1At^2@C16Lo;eh)>T zV^a=JIx)p1=;8z)*QAm|Z>!XgEll;%i$1jZ^3zF~yNzd@e!1dSfzpqfmd%l}vGPiS zyu5;3T!Kn+8tyu>iUKVH?E(r4`tG{Qs{C{3iEywjVt3Lt<YZvr<mTpJ=UB+$!L*W@ kn}?mvn4QIwaX%y9Mq@VC0FRA}*p?i3+IjfwSw{wI0P={POaK4? literal 0 HcmV?d00001 diff --git a/org.fortiss.tooling.kernel.ui/trunk/icons/warning.gif b/org.fortiss.tooling.kernel.ui/trunk/icons/warning.gif new file mode 100644 index 0000000000000000000000000000000000000000..2f1c5a8fa7b0daec8a56f57de75efab04032b6ae GIT binary patch literal 331 zcmZ?wbhEHb6krfwxXQrr?{@M3dyW4e_5XX+_y6(qe@~|We>U&m(|P~j9sGC5=ig!9 ze~115orwN_Hv8Y%?EhzT{#_{fe|P52T!toJhFEikBMmA?nsin*c&=^sUft-my2)!} zyWhGN-wo~lTf2fbbp#%m8nb^&%;6dF2dBjynVE26QU3ZC-_0F?ho{G%Ti1H`%+CM+ z|1(ek6o0ZXGB9W}=zz=s`H6uo<G|Dc4;`s~kA+<>L8|Q<EKXlyR=Q0*abhNmqKb%% zM&u_2E#a2sEq@rqUa&qW`7?!y>$HlX#>H-FMxN#tMp;)GW`2IY3_f07CN&ocR)OgW e(*;;0TqHHw+1VB^(Ufu(U%6^^=-Rc84AuaX)Op?j literal 0 HcmV?d00001 diff --git a/org.fortiss.tooling.kernel.ui/trunk/plugin.xml b/org.fortiss.tooling.kernel.ui/trunk/plugin.xml index e751003d0..0a39b9dfe 100644 --- a/org.fortiss.tooling.kernel.ui/trunk/plugin.xml +++ b/org.fortiss.tooling.kernel.ui/trunk/plugin.xml @@ -19,14 +19,14 @@ point="org.eclipse.ui.views"> <view class="org.fortiss.tooling.kernel.ui.internal.views.NavigatorViewPart" - icon="icons/tumlogo.png" + icon="icons/navigator.gif" id="org.fortiss.tooling.kernel.model.navigator" name="Model Navigator" restorable="true"> </view> <view class="org.fortiss.tooling.kernel.ui.internal.views.MarkerViewPart" - icon="icons/tumlogo.png" + icon="icons/marker_view.gif" id="org.fortiss.tooling.kernel.model.marker" name="Model Markers" restorable="true"> diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/views/MarkerViewPart.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/views/MarkerViewPart.java index 464c3e921..18d0539f5 100644 --- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/views/MarkerViewPart.java +++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/views/MarkerViewPart.java @@ -37,12 +37,14 @@ import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerCell; import org.eclipse.swt.SWT; +import org.eclipse.swt.graphics.Image; import org.eclipse.swt.layout.FillLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.part.ViewPart; import org.fortiss.tooling.kernel.extension.data.IConstraintViolation; import org.fortiss.tooling.kernel.extension.data.IConstraintViolation.ESeverity; import org.fortiss.tooling.kernel.service.IPersistencyService; +import org.fortiss.tooling.kernel.ui.ToolingKernelUIActivator; import org.fortiss.tooling.kernel.ui.extension.IModelElementHandler; import org.fortiss.tooling.kernel.ui.internal.MarkerService; import org.fortiss.tooling.kernel.ui.service.IMarkerService; @@ -136,10 +138,12 @@ public class MarkerViewPart extends ViewPart { public void update(ViewerCell cell) { if (cell.getElement() instanceof ESeverity) { cell.setText(((ESeverity) cell.getElement()).toString()); + cell.setImage(getImageFor((ESeverity) cell.getElement())); } else { cell.setText(""); } } + }); gui.getElementColumn().setLabelProvider(new CellLabelProvider() { @Override @@ -250,4 +254,27 @@ public class MarkerViewPart extends ViewPart { refresh(); } } + + public Image getImageFor(ESeverity severity) { + switch (severity) { + case FATAL: + return ToolingKernelUIActivator.getImageDescriptor( + "icons/fatal.gif").createImage(); + case ERROR: + return ToolingKernelUIActivator.getImageDescriptor( + "icons/error.gif").createImage(); + case WARNING: + return ToolingKernelUIActivator.getImageDescriptor( + "icons/warning.gif").createImage(); + case INFO: + return ToolingKernelUIActivator + .getImageDescriptor("icons/info.gif").createImage(); + case DEBUG: + return ToolingKernelUIActivator.getImageDescriptor( + "icons/debug.gif").createImage(); + + } + + return null; + } } -- GitLab