From 2f7f9c1e6e66f7cd13f25057e13b47d469f608e6 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Sun, 10 Nov 2013 20:37:26 +0000 Subject: [PATCH] Add AKB icons https://www.argeo.org/bugzilla/show_bug.cgi?id=196 git-svn-id: https://svn.argeo.org/slc/trunk@6611 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../icons/addConnector.gif | Bin 0 -> 209 bytes .../org.argeo.slc.akb.ui/icons/addItem.gif | Bin 0 -> 318 bytes plugins/org.argeo.slc.akb.ui/icons/akb.gif | Bin 0 -> 595 bytes plugins/org.argeo.slc.akb.ui/icons/akb.png | Bin 306 -> 0 bytes .../org.argeo.slc.akb.ui/icons/connectors.gif | Bin 0 -> 205 bytes .../icons/environment.png | Bin 0 -> 345 bytes .../icons/environments.gif | Bin 0 -> 360 bytes .../org.argeo.slc.akb.ui/icons/itemFolder.gif | Bin 0 -> 213 bytes .../icons/jcrConnector.gif | Bin 0 -> 325 bytes .../org.argeo.slc.akb.ui/icons/jcrQuery.gif | Bin 0 -> 152 bytes .../icons/jdbcConnector.gif | Bin 0 -> 545 bytes .../org.argeo.slc.akb.ui/icons/jdbcQuery.gif | Bin 0 -> 582 bytes plugins/org.argeo.slc.akb.ui/icons/note.gif | Bin 0 -> 218 bytes .../org.argeo.slc.akb.ui/icons/searchView.png | Bin 0 -> 603 bytes .../org.argeo.slc.akb.ui/icons/sshCommand.png | Bin 0 -> 270 bytes .../icons/sshConnector.png | Bin 0 -> 443 bytes .../org.argeo.slc.akb.ui/icons/sshFile.gif | Bin 0 -> 354 bytes .../org.argeo.slc.akb.ui/icons/template.gif | Bin 0 -> 219 bytes .../org.argeo.slc.akb.ui/icons/treeView.png | Bin 0 -> 193 bytes plugins/org.argeo.slc.akb.ui/plugin.xml | 20 ++++---- .../java/org/argeo/slc/akb/ui/AkbImages.java | 19 ++++++++ .../ui/providers/AkbTreeLabelProvider.java | 43 +++++++++++------- 22 files changed, 56 insertions(+), 26 deletions(-) create mode 100644 plugins/org.argeo.slc.akb.ui/icons/addConnector.gif create mode 100644 plugins/org.argeo.slc.akb.ui/icons/addItem.gif create mode 100644 plugins/org.argeo.slc.akb.ui/icons/akb.gif delete mode 100644 plugins/org.argeo.slc.akb.ui/icons/akb.png create mode 100644 plugins/org.argeo.slc.akb.ui/icons/connectors.gif create mode 100644 plugins/org.argeo.slc.akb.ui/icons/environment.png create mode 100644 plugins/org.argeo.slc.akb.ui/icons/environments.gif create mode 100644 plugins/org.argeo.slc.akb.ui/icons/itemFolder.gif create mode 100644 plugins/org.argeo.slc.akb.ui/icons/jcrConnector.gif create mode 100644 plugins/org.argeo.slc.akb.ui/icons/jcrQuery.gif create mode 100644 plugins/org.argeo.slc.akb.ui/icons/jdbcConnector.gif create mode 100644 plugins/org.argeo.slc.akb.ui/icons/jdbcQuery.gif create mode 100644 plugins/org.argeo.slc.akb.ui/icons/note.gif create mode 100644 plugins/org.argeo.slc.akb.ui/icons/searchView.png create mode 100644 plugins/org.argeo.slc.akb.ui/icons/sshCommand.png create mode 100644 plugins/org.argeo.slc.akb.ui/icons/sshConnector.png create mode 100644 plugins/org.argeo.slc.akb.ui/icons/sshFile.gif create mode 100644 plugins/org.argeo.slc.akb.ui/icons/template.gif create mode 100644 plugins/org.argeo.slc.akb.ui/icons/treeView.png diff --git a/plugins/org.argeo.slc.akb.ui/icons/addConnector.gif b/plugins/org.argeo.slc.akb.ui/icons/addConnector.gif new file mode 100644 index 0000000000000000000000000000000000000000..b1526e931977e6a15cb0d3a707e33378f44ef1a4 GIT binary patch literal 209 zcmZ?wbhEHb6krfwIKsg2`OC-8Uq1Z%`~K0*Eq}k9|N8pa-_Pf_PE_7H35Zm-Pf^`9 zUG4Y%&foXD{ybm&=hgbJua3>D6kFCPwX8{MX_M5tF8TGH3LCo=H}@%R=vMrFw|QoX z@S0Zn|Ns9pfPvyq7DfgJSq2>t4`e3;t6ze8UrOe@)16!^t>iiy6!O9aTM`9AeFOVC zm#B4RD6P1b(OhLC=5;x3b3xd`2n|m`4jzWiwhEnDNnEY0PbOvV_7r1lKCD>w;@h4$ I5hey}06}S8rT_o{ literal 0 HcmV?d00001 diff --git a/plugins/org.argeo.slc.akb.ui/icons/addItem.gif b/plugins/org.argeo.slc.akb.ui/icons/addItem.gif new file mode 100644 index 0000000000000000000000000000000000000000..252d7ebcb8c74d6e5de66ef0eb8856622a0e9d89 GIT binary patch literal 318 zcmZ?wbhEHb6krfwxXQp_S{7na6>d=(Ze15;Qy1mX8t2lT^ zHOHgY9FJamJZkN+sI|wVk6ueSb}ixP)r4bLfn?%^+sU^crQUj&`rv8W|Ns9PC;*B- zSr{1@v>9|jW`O*}z!rUAYJrE2RKG`JYNRKhwpQrnor{(Ph`sVEnyR2Kc;c~(o$WdP zMb0Wl6K^dQ-0hgs;Xf2Iu<6Rd_`fg{IU-Wj4j< zwG~!0ryv&vg&`@>i@YL{^xD@|Lo)cQx|U~toon1;eXcp z|AkxrGXyVT@L$B>zmUOqZqfGtMLYkO?E3%m%m26E{xigGV2E7B5W2W<*Z;D;|6hFh z&yc!~m~3 zHkxegXvf#n-#=-}v>En}f|9c*8%?#J;m|K2;Am`UXgbw_-^s>uk>xI3?Y$*O41)JQSpYp`y@7M? zqkZOh1C=vI%Of<#h^A>o2to9H&-xzYeB_LjZ*qhaGINP8?)WZ_8iz*{^N)#wLD6z0 zH#NeB#j3#ILRb;j;8()AD(vDo?hRo_c+UNs#Y=zz0OIpn+a diff --git a/plugins/org.argeo.slc.akb.ui/icons/connectors.gif b/plugins/org.argeo.slc.akb.ui/icons/connectors.gif new file mode 100644 index 0000000000000000000000000000000000000000..e8abf43158c85c046c008bfe875f70aabe505c0e GIT binary patch literal 205 zcmZ?wbhEHb6krfwIKsg2>-YCxzrX!|zxvtj4Szly-PFmorJH+uKhOV1_5U9={CR(L zbv^6a2DUYgZ0lRtC#EqhuVVTC|33rKK=CIFBLjmVgAPas$W8`UuLKph(7t7-(Fny^yI?*O@>FC zjc)Iscd$zL`py~qOSKM`YhT|neS5CP?n13|tGibwC{GTRUze=9G)8Gbq~fATrQ-{l z3T?#a6+~3}JN*CuA7~^d;J!5P7En~OB*-rqs0J%wU^L;{4phXL)Wo+4>x^%y!FGqP48~6e{*x)r(3JuTwnL>@|rgnmwtJ6 z;oHm0-(FsMacs)-(+l2QSo-|*!l$Pf-&`DVV`0RD!*d=Uo%i_of(J+D-8(%0?xA^i z_RqSpd&cp0$4jdlu56ijefyM~yQW{?Iqg7&!QndV%bWTyZs@ja@2|4l zUu|`2S^K15#TALVYf|;6L};!}H`thEv?bSMNvw8(wM3zv-2eao8E^x|pDc_F3}y^E zASEC_F|f5d%)SsNE!Ds1V#iV$*N(9fJNx{t?P7}hER5n|&aT2dT=Mz?{32T68q(_8rfLeR8vdqA0JNqxY4nxQse*s{|u-= z@h1x-1A`QU4oDbeCj)EH0=2%B%z5bx*j~(-pf9D##cb)nI!=rkTAvtM^dZ)Z?Cc>r>kH8HUX-oqWtAZ{y0n_ccQ1 zcP~3{8n>)^)~RXhu2oGtRyX@}T+@;Ixu^GCdiVIB2OvNhYFM zn$Z_ij_g!&6D~|wp2c3Pti%gQ1w$j`*W$Lh-|K55D{PG5By#>I;j L7A$vmWUvMRnQ~`o literal 0 HcmV?d00001 diff --git a/plugins/org.argeo.slc.akb.ui/icons/jcrQuery.gif b/plugins/org.argeo.slc.akb.ui/icons/jcrQuery.gif new file mode 100644 index 0000000000000000000000000000000000000000..0dc862cbd7d883765b71f5d377a3aed0d13f3645 GIT binary patch literal 152 zcmZ?wbhEHb6krfw*v!BnlDS$Sv}@D-znky>op$N_rU!pFKlpp@&HrhazaM<@|J>XE z=imN+`0YOgFfcGE{$ycfVBllW0kVN62rw|PxL&YySiPrW(^-de2MTq%rq6l7%F`5B z;i$8k#Yy1a@~|oIyrOq_^@kI-zfbD?KCS!VgyZ{TP6rm+pV<&{Y@zM(MfQ)D zi5!|~dUT%kv4!@ZHp(BGYII<#$&uMskLC#P?bSat)%^ZU(H)K2yV`7awAyTIvE9{X zyS>F`TeI!fM%zOThKCvrpH{N%uQl3NWBjy|eM7F=<}~&H|Nk=#5uo^!g^_{5ok0iW zUQnDcu-7%XH#N7kwka6s7@C+Xv^7a7%d>Eb%IZt?>#E32nWpdBZ)GgWC@8J%=-h9o z$UkrT>NeYTEF2=!o%(GQ`B>S7clKNEWn~jO)MlZ?$HG3}zTaAvkC{tsy2B+kUM6nw lo0rTa7wm+wC{rAHMhT*Wdpw2cAth z_F~?dS3m#$zxw(A%b)*0{Qm#%@1uWzAOHEW_|K0ezrQZ|`|HBL-&YT9u{yCc?B}bJ zpRdY)zN-BBs`}@v`afTff4*-2>4y8K8y=r-czu7IG;><>%xNv3ui1RM;q&W3VtuL8 z;pN)LR+;{~8`WCjuy9uGfjP2=7pWXxtbTf>{`=DoeKmHg7nDBRCi&~6-i#*eryC_d z?o#`>Oa0d|?KM57i`y+8Z?WCfZ}R=guGjaEY_I1&)Ter|SM6~d=f+yA7dMVPtz`fI z|33pAf#OdVMh1px1|5){pg3V*U)&Jg)ZEhA)~xAh?c|`@-lXAcsjOqKuOEcXJxdMw2YXzgs2FMlJ>OFCLvaKPHtX4eilVt zWA9_pfpT(gH*N$f>RDWA@{^NylYcJnr)J<47188xYQ|vy)!tv-#3jPH$x}{&p+SN} l$x}=xVgZlVBSnS=J^^D9%O}q5N4u?RY;K*{n5@8H4FJ8>>N5ZU literal 0 HcmV?d00001 diff --git a/plugins/org.argeo.slc.akb.ui/icons/note.gif b/plugins/org.argeo.slc.akb.ui/icons/note.gif new file mode 100644 index 0000000000000000000000000000000000000000..6e63b990d9e699207b77dc19e7ae36f64bcc6e2d GIT binary patch literal 218 zcmZ?wbhEHb6krfwI3mShSG0Wlr6=M>u}hjwddn@>cN*3f+OBCgTG?v6smowmjd@*x z?W8Kp1&yY2>P>(A{r~6x|8IZ(|NQ&^%b)-M{{8>;@Bg2F|Ns8`Usq`R^WT3UU_b?m zKUo+V7^E0C;ijD34s>Fphs+rp0fGOp9g>oJ;IsJz0sMfzFq#LI7A{W_Zvp<~d{VBXv! IrO03n0CRs|WdHyG literal 0 HcmV?d00001 diff --git a/plugins/org.argeo.slc.akb.ui/icons/searchView.png b/plugins/org.argeo.slc.akb.ui/icons/searchView.png new file mode 100644 index 0000000000000000000000000000000000000000..aa0dc0be98db6b2fb711b970e1e606c625d94b3d GIT binary patch literal 603 zcmV-h0;K(kP)S_CM`$0H`p`dRU zJj?(B2yDQgf6PEvFfepi1cK>rzyB~yDRL(m9@%|682|zZV!&UZ3xGN+y4Evvlm#+; z{P73qs{agyt?L;2fi9Z3^eDsc-;nV5@dFq(K-^XC&+r+j4j_O~T+mhualw0_0%j&g zhDo)-V4I5KY_PiE-H%@k009II17=`M{AZ}`-N4XX9Ki7Y`!Awg@c#R627my9djVu~ zLty}z{`B)VPz(|#fBpge8flGWFC=Du|NY1C5g5$?0R;B~C=8k=Ze*y-_h7C-OH0d~z8Wfl&_08jNVF5J_TsQ#M1}#5r&U00D%Q5*ZoVCv9Y? z%=KqjzUc(klvtVT$H2|Yi()oF03o6gXmxpxADE8tHD~ybY&qC=MsPrL^75k?01!aX p%*4cSXv>;M1%58XR|{J~}0X(=wV zGQ*Zt6mRYiUtJWjx-bGrt}66hp6a_SHE}~i^S;LBy^WKPw*UV>|Ns5?{qybr|NiiQ zzx}M<;`{UM^L$n3WQ2uS7|6HyU0>C>3TQrKNswPKgTu2MX+Tbfr;B4q#jV~xPre2N z9_E|eQ%skd^#1?vAGUI*!b9gJF2c7Xzr_bGikq1#npRri@+9KpmeYPOz4uIiE7kcy z{b4@SiTr+nLysF-OAD8_n6rMiSr}w{;oGqi58ed!Znx4S9h)vJoj)aCR$7yN&8AlQ QexRKUp00i_>zopr02}nXQkUu#%s$>hSsT_51kx{Z)d!ReP*ed8v+^uaTd! zlAp2W?)mlj{8Wt4REy43iOW=p$W@5QREES=hQw8c!BmC7RfD`$fw)zFv{ikuRei5j ze5_S^sa1KVRe7arkG*@DzmcG_lAyAYpRwui`Reic_4xbv`uy4P{Q3F(KMVr=00001 zbW%=J06^y0W&i*Hok>JNRCwBr&siIRP!NFO7CW6JvK>o~rR+scCxr3;|C7ce-MH}0 z)x1|TlJrN>A}d00YFQ3~t3jIPA}ky5P@c+AR^<8$VPk+^E#=hvJa4QKb|wrynOlTW z2XwtsE*8{wbC2M4fyObVF}<}s1b+fEVp)U`tLGye8Jn{HgCv4fGYhm)>@lCgr3u!EAY?(+Kb_51ny z{P_9%hMK;NpTdTeu8Wqd@bvqWrpB7A%c8T-sJPRtyw%?5_}%CC-{|+`?D^;J`R(%h z^Y;7P=l9>~_}=LE;p+J6@cH)m`;eNb=I;6M_51Sn`<9)g_4xbu`TLcfq?@6kp`@Ir zsF8yg6Lgc~kJEFpM$VhkZHMJps4l$Db! zMJgGKdkh&TMI#`iq@*K74<3wT7#|i7MGhSu7qqms1VsV`2L`;o2Lc03#6v*atiDp{W#fG;S$h%aZO^ n52;T$8);2 z7fskzHf7)c|Nr|`n*)GqI7)*2f`MERV7S-3HxekunB?v5!Y-EB@fyhCEbxdd2GSm2 z>~=ES4#?2+ba4#fxSp)h&cvqE!^9?Wc!7?ti(urEIkM*%x)}|bn;koqx;W%apBf07 acr#W;7-basZI}nt$>8bg=d#Wzp$PzIxIJG0 literal 0 HcmV?d00001 diff --git a/plugins/org.argeo.slc.akb.ui/plugin.xml b/plugins/org.argeo.slc.akb.ui/plugin.xml index ab27bc70c..f762d1b3f 100644 --- a/plugins/org.argeo.slc.akb.ui/plugin.xml +++ b/plugins/org.argeo.slc.akb.ui/plugin.xml @@ -6,13 +6,13 @@ point="org.eclipse.ui.perspectives"> @@ -22,14 +22,14 @@ point="org.eclipse.ui.views"> @@ -40,32 +40,32 @@ point="org.eclipse.ui.editors"> @@ -104,4 +104,4 @@ - \ No newline at end of file + diff --git a/plugins/org.argeo.slc.akb.ui/src/main/java/org/argeo/slc/akb/ui/AkbImages.java b/plugins/org.argeo.slc.akb.ui/src/main/java/org/argeo/slc/akb/ui/AkbImages.java index 168d787c4..32241afd8 100644 --- a/plugins/org.argeo.slc.akb.ui/src/main/java/org/argeo/slc/akb/ui/AkbImages.java +++ b/plugins/org.argeo.slc.akb.ui/src/main/java/org/argeo/slc/akb/ui/AkbImages.java @@ -7,4 +7,23 @@ public class AkbImages { public final static Image LOGO_SMALL = AkbUiPlugin.getImageDescriptor( "icons/smallerOrnamentLogo.png").createImage(); + + public final static Image TEMPLATE = AkbUiPlugin.getImageDescriptor( + "icons/template.gif").createImage(); + public final static Image CONNECTOR_FOLDER = AkbUiPlugin + .getImageDescriptor("icons/connectors.gif").createImage(); + + public final static Image ITEM_FOLDER = AkbUiPlugin.getImageDescriptor( + "icons/itemFolder.gif").createImage(); + public final static Image JDBC_CONNECTOR = AkbUiPlugin.getImageDescriptor( + "icons/jdbcConnector.gif").createImage(); + public final static Image JDBC_QUERY = AkbUiPlugin.getImageDescriptor( + "icons/jdbcQuery.gif").createImage(); + + public final static Image SSH_CONNECTOR = AkbUiPlugin.getImageDescriptor( + "icons/sshConnector.png").createImage(); + public final static Image SSH_COMMAND = AkbUiPlugin.getImageDescriptor( + "icons/sshCommand.png").createImage(); + public final static Image SSH_FILE = AkbUiPlugin.getImageDescriptor( + "icons/sshFile.gif").createImage(); } diff --git a/plugins/org.argeo.slc.akb.ui/src/main/java/org/argeo/slc/akb/ui/providers/AkbTreeLabelProvider.java b/plugins/org.argeo.slc.akb.ui/src/main/java/org/argeo/slc/akb/ui/providers/AkbTreeLabelProvider.java index 8fb639cc7..167b57611 100644 --- a/plugins/org.argeo.slc.akb.ui/src/main/java/org/argeo/slc/akb/ui/providers/AkbTreeLabelProvider.java +++ b/plugins/org.argeo.slc.akb.ui/src/main/java/org/argeo/slc/akb/ui/providers/AkbTreeLabelProvider.java @@ -7,6 +7,8 @@ import javax.jcr.nodetype.NodeType; import org.argeo.eclipse.ui.TreeParent; import org.argeo.slc.akb.AkbException; +import org.argeo.slc.akb.AkbTypes; +import org.argeo.slc.akb.ui.AkbImages; import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.swt.graphics.Image; @@ -18,7 +20,6 @@ public class AkbTreeLabelProvider extends LabelProvider { @Override public String getText(Object element) { try { - if (element instanceof Node) { Node node = (Node) element; if (node.isNodeType(NodeType.MIX_TITLE)) @@ -33,21 +34,31 @@ public class AkbTreeLabelProvider extends LabelProvider { return ((TreeParent) element).getName(); } - public Image getImage(Object obj) { - // if (obj instanceof SingleResultNode) { - // // FIXME add realtime modification of process icon (SCHEDULED, - // // RUNNING, COMPLETED...) - // // Node resultNode = ((SingleResultNode) obj).getNode(); - // // int status = SlcJcrUtils.aggregateTestStatus(resultNode); - // return SlcImages.PROCESS_COMPLETED; - // } else if (obj instanceof ResultParent) { - // ResultParent rParent = (ResultParent) obj; - // if (SlcUiConstants.DEFAULT_MY_RESULTS_FOLDER_LABEL.equals(rParent - // .getName())) - // return SlcImages.MY_RESULTS_FOLDER; - // else - // return SlcImages.FOLDER; - // } else + public Image getImage(Object element) { + try { + if (element instanceof Node) { + Node node = (Node) element; + if (node.isNodeType(AkbTypes.AKB_ITEM_FOLDER)) + return AkbImages.ITEM_FOLDER; + else if (node.isNodeType(AkbTypes.AKB_SSH_CONNECTOR)) + return AkbImages.SSH_CONNECTOR; + else if (node.isNodeType(AkbTypes.AKB_SSH_COMMAND)) + return AkbImages.SSH_COMMAND; + else if (node.isNodeType(AkbTypes.AKB_SSH_FILE)) + return AkbImages.SSH_FILE; + else if (node.isNodeType(AkbTypes.AKB_JDBC_CONNECTOR)) + return AkbImages.JDBC_CONNECTOR; + else if (node.isNodeType(AkbTypes.AKB_JDBC_QUERY)) + return AkbImages.JDBC_QUERY; + else if (node.isNodeType(AkbTypes.AKB_ENV_TEMPLATE)) + return AkbImages.TEMPLATE; + else if (node.isNodeType(AkbTypes.AKB_CONNECTOR_FOLDER)) + return AkbImages.CONNECTOR_FOLDER; + } + } catch (RepositoryException e) { + throw new AkbException("Unexpected error while getting " + + "Custom node label", e); + } return null; } } -- 2.39.2