From 9d410c8850bebf101b23eed0ed7081aa1f9a1acc Mon Sep 17 00:00:00 2001 From: Serge Rider Date: Tue, 19 Feb 2019 14:27:50 +0300 Subject: [PATCH] Progress loading icons fix --- .../load/TreeNodeChildrenLoading.java | 33 +++++++++--------- .../icons/animation/loading01.png | Bin 0 -> 415 bytes .../icons/animation/loading02.png | Bin 0 -> 413 bytes .../icons/animation/loading03.png | Bin 0 -> 422 bytes .../icons/animation/loading04.png | Bin 0 -> 418 bytes .../icons/animation/loading05.png | Bin 0 -> 415 bytes .../icons/animation/loading06.png | Bin 0 -> 412 bytes .../icons/animation/loading07.png | Bin 0 -> 419 bytes .../icons/animation/loading1.gif | Bin 355 -> 0 bytes .../icons/animation/loading2.gif | Bin 348 -> 0 bytes .../icons/animation/loading3.gif | Bin 353 -> 0 bytes .../icons/animation/loading4.gif | Bin 349 -> 0 bytes .../src/org/jkiss/dbeaver/ui/LoadingJob.java | 2 +- .../src/org/jkiss/dbeaver/ui/UIIcon.java | 11 +++--- 14 files changed, 24 insertions(+), 22 deletions(-) create mode 100644 plugins/org.jkiss.dbeaver.ui/icons/animation/loading01.png create mode 100644 plugins/org.jkiss.dbeaver.ui/icons/animation/loading02.png create mode 100644 plugins/org.jkiss.dbeaver.ui/icons/animation/loading03.png create mode 100644 plugins/org.jkiss.dbeaver.ui/icons/animation/loading04.png create mode 100644 plugins/org.jkiss.dbeaver.ui/icons/animation/loading05.png create mode 100644 plugins/org.jkiss.dbeaver.ui/icons/animation/loading06.png create mode 100644 plugins/org.jkiss.dbeaver.ui/icons/animation/loading07.png delete mode 100644 plugins/org.jkiss.dbeaver.ui/icons/animation/loading1.gif delete mode 100644 plugins/org.jkiss.dbeaver.ui/icons/animation/loading2.gif delete mode 100644 plugins/org.jkiss.dbeaver.ui/icons/animation/loading3.gif delete mode 100644 plugins/org.jkiss.dbeaver.ui/icons/animation/loading4.gif diff --git a/plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/navigator/database/load/TreeNodeChildrenLoading.java b/plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/navigator/database/load/TreeNodeChildrenLoading.java index 16207fdd85..8d35e44ce0 100644 --- a/plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/navigator/database/load/TreeNodeChildrenLoading.java +++ b/plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/navigator/database/load/TreeNodeChildrenLoading.java @@ -32,15 +32,20 @@ public class TreeNodeChildrenLoading extends TreeNodeSpecial { public static final Object LOADING_FAMILY = new Object(); - private static Image IMG_LOADING1 = DBeaverIcons.getImage(UIIcon.LOADING1); - private static Image IMG_LOADING2 = DBeaverIcons.getImage(UIIcon.LOADING2); - private static Image IMG_LOADING3 = DBeaverIcons.getImage(UIIcon.LOADING3); - private static Image IMG_LOADING4 = DBeaverIcons.getImage(UIIcon.LOADING4); + private static Image[] IMG_LOADING = new Image[] { + DBeaverIcons.getImage(UIIcon.LOADING1), + DBeaverIcons.getImage(UIIcon.LOADING2), + DBeaverIcons.getImage(UIIcon.LOADING3), + DBeaverIcons.getImage(UIIcon.LOADING4), + DBeaverIcons.getImage(UIIcon.LOADING5), + DBeaverIcons.getImage(UIIcon.LOADING6), + DBeaverIcons.getImage(UIIcon.LOADING7) + }; private static String loadingText = "Loading"; - private static String text1 = loadingText + "."; //$NON-NLS-1$; + private static String text1 = loadingText + ".."; //$NON-NLS-1$; private static String text2 = loadingText + ".."; //$NON-NLS-1$; - private static String text3 = loadingText + ".."; //$NON-NLS-1$; + private static String text3 = loadingText + "..."; //$NON-NLS-1$; private int viewCount = 0; @@ -58,6 +63,8 @@ public class TreeNodeChildrenLoading extends TreeNodeSpecial { @Override public String getText(Object element) { + return text3; +/* switch (viewCount % 4) { case 0: return loadingText; @@ -69,21 +76,13 @@ public class TreeNodeChildrenLoading extends TreeNodeSpecial { default: return text3; } +*/ } @Override public Image getImage(Object element) { - switch (viewCount = (++viewCount % 4)) { - case 0: - return IMG_LOADING1; - case 1: - return IMG_LOADING2; - case 2: - return IMG_LOADING3; - case 3: - default: - return IMG_LOADING4; - } + int imgIndex = (++viewCount % IMG_LOADING.length); + return IMG_LOADING[imgIndex]; } public void dispose(Object parent) { diff --git a/plugins/org.jkiss.dbeaver.ui/icons/animation/loading01.png b/plugins/org.jkiss.dbeaver.ui/icons/animation/loading01.png new file mode 100644 index 0000000000000000000000000000000000000000..c466dd823b3c07f57043ec4df9311764952d0e89 GIT binary patch literal 415 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFxm8@piru(i(?4K_2dK~5J_lYaCI~|`euQ~ z2`PpYiQNWVEp1JbJUj_(o0*xJJ-T!mmrU5(uy8T+5eBU;-2=2xwZt`|BqgyV)hf9t z6-Y4{85mmX8W`ysT80=JSs5BznV4xC7+M(^6m8#RfubQdKP5A*61N8CS6sjlWnl1h L^>bP0l+XkK?^b|b literal 0 HcmV?d00001 diff --git a/plugins/org.jkiss.dbeaver.ui/icons/animation/loading02.png b/plugins/org.jkiss.dbeaver.ui/icons/animation/loading02.png new file mode 100644 index 0000000000000000000000000000000000000000..aff264a002468bf8c27dd458f11c70ac53100a8c GIT binary patch literal 413 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFF7oGaNo42#v87^f#ah&piKz+T1^kz2bO z6TjyfG(TsUad7K{Gm;xbm=Di14!B*($H2*8GfzU*{MP)pKTnYMwUm4QLg_DvQj8glbfGSez?YhZrG1q@FH22WQ% Jmvv4FO#tAXgt!0z literal 0 HcmV?d00001 diff --git a/plugins/org.jkiss.dbeaver.ui/icons/animation/loading03.png b/plugins/org.jkiss.dbeaver.ui/icons/animation/loading03.png new file mode 100644 index 0000000000000000000000000000000000000000..7c4846e99cc4bec7ddb4571eb31732ac2e92bbe3 GIT binary patch literal 422 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFnC}Q!>*kacf|H S#RUvl1_n=8KbLh*2~7ao#Dwku literal 0 HcmV?d00001 diff --git a/plugins/org.jkiss.dbeaver.ui/icons/animation/loading04.png b/plugins/org.jkiss.dbeaver.ui/icons/animation/loading04.png new file mode 100644 index 0000000000000000000000000000000000000000..7124b8f62d9e312e5bb340ec836a0f5a77ff311d GIT binary patch literal 418 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF};B7+a{%u{^w&G3WM7in0oz2KH=fe$0otir;u=wsl30>z zm0Xkxq!^403@vpHjC2hxLkx|q42`W!%(M**tqcr`wr{dP(U6;;l9^VCTLbeeE?}TC OFnGH9xvXY#W95AdU65~h$J*HI64{}U810I z;tfNJhNdBx#O?-39-aiY$xO`59$lskOD5EK@$hywPzZX%%EKeW%fmB=yJ1cr zA6whZ)dzUq@g}gjAAV<>pvl&Dw|c?0;(P`nhE+3#+B6(mzXL5)Epd$~Nl7e8wMs5Z z1yT$~28Ncp21dGumLY~lR))q_CT7|OhE@g!McX%7plHa=PsvQH#I1q(6&El>85lfW L{an^LB{Ts5biscg literal 0 HcmV?d00001 diff --git a/plugins/org.jkiss.dbeaver.ui/icons/animation/loading06.png b/plugins/org.jkiss.dbeaver.ui/icons/animation/loading06.png new file mode 100644 index 0000000000000000000000000000000000000000..f3335819fa4a5e0d01cf7c95066be8755f5a8ab1 GIT binary patch literal 412 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF_!@h zljQC0!uxGY;#VMty~NYkmHjc3FfXqj>xm8@piq*hi(?4K_2dK~5J_lYaC9^{xyfO zclH?vw=$kd(2v+U`#HmnZK1mtZY$1Z5MpqW71+zXcx@-pHq{c>h?11Vl2ohYqEsNo zU}RuuscT@QYiJo_Xk=w*Y-M7mZD43+U{JJulLd-~-29Zxv`X9>m|t-LgOh>5)78&q Iol`;+0G>5}G5`Po literal 0 HcmV?d00001 diff --git a/plugins/org.jkiss.dbeaver.ui/icons/animation/loading07.png b/plugins/org.jkiss.dbeaver.ui/icons/animation/loading07.png new file mode 100644 index 0000000000000000000000000000000000000000..3f4c0d9196f9f23ed5a18ef347d31824793fe85f GIT binary patch literal 419 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF&Xc~Ad=9);OJ;@bcuq- zi5!L$4NXHX3F&4@9-aiY$xO`59$iNnmrO8iICzxx2nVmL!407WK|F6*d3a=a9sDXS znVsF)Cm0s1U2nR(yOHM{=kl<^e1_X)S)y0U*0DM;G5F0E408P69uBlrwZt`|BqgyV z)hf9t6-Y4{85mmX8W`ysT80=JSs5BznV4xC7+M(^6m8#RfubQdKP5A*61N8CS6skQ PWnl1h^>bP0l+XkKkW7Jr literal 0 HcmV?d00001 diff --git a/plugins/org.jkiss.dbeaver.ui/icons/animation/loading1.gif b/plugins/org.jkiss.dbeaver.ui/icons/animation/loading1.gif deleted file mode 100644 index eae118ad1683ddb6ba797d1aa4636b1369c6e1f9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 355 zcmZ?wbhEHb6krfwxXQrr=hw}@f1dsMdGp`j_kVvs`wL|Je)jvr=HDN-{QkJ*_se;| zU(Wyic;dSo-M^ns`~7tK?-%p#oa+AlV*ac9TYleb{e8dl_k+&g4|{(<>OH%o^!MXQ z_pa`|vMv75%Ct-S+pZsEV{QvY)`Y;=1SpR4WhdmMYq<7>}e9) zQ75{(P;h0Q;M!uL)rCSE%7m9?3#`Z$T%IHN|NnmmLO}5+3nK%A34;zuA;?b*Yz+>x z3OsbA`nT|&ELNG=G56$V4=JD4tE&r4B&M`2KI!1hK7fZIWkxS0HZON`v3p{ diff --git a/plugins/org.jkiss.dbeaver.ui/icons/animation/loading2.gif b/plugins/org.jkiss.dbeaver.ui/icons/animation/loading2.gif deleted file mode 100644 index c37f13d7c8cb13bdeef6cf19d89c7ed1703af3c6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 348 zcmZ?wbhEHb6krfw_{zZW=hw}@f1dsMdGp`j_kVvs`wL|Je)jvr=HDN-{QkJ*_se;| zU(Wyic;dSo-M^ns`~7tK?-%p#oa+AlV*ac9TYleb{e8dl_k+&g4|{(<>OH%o^!MXQ z_pa`|vMv75%Ct-S+pZsEV{QvY)`Y;=1SpR4WhdmMYq<7>}e9) zQ75{(P;h0Q;M!uL)rCSE%7m9?3#`Z$T%IHN|NnmmLO}5+3nK%A34;zuA;?b*Y?ThP z3OsbAT9-W*Wb@SQTz8ylW7VYyo^}>R2hC`Sv(5)qdwMpXa^2&>!NV+M=(aIN;*v9? zocysAUHwP_4pt3Sl_J+BJ^^-KNq>cAPF{6?B^f?$c7`~Ay{J~fbT4@W-WWz<6OH%o^!MXQ z_pa`|vMv75%Ct-S+pZsEV{QvY)`Y;=1SpR4WhdmMYq<7>}e9) zQ75{(P;h0Q;M!uL)rCSE%7m9?3#`Z$T%IHN|NnmmLO}5+3nK%A34;zuA;?b*Y;_K^ z3OsbAS~uSKsImCWw4>9OUTW%cSbzO#Q=+839$)gA3mFo6kJz7OY?m)M&TM94s>0n- zw=v*>qMC`kA_oUMCwm)bD~G0&q97A111~QtE7MGEXGLK~K@D|D4K_9w4HqqDVP$7k eX6CgnD$FXIx4Nka%WmH0CZ{4DaQLtzgEauAc$m!q diff --git a/plugins/org.jkiss.dbeaver.ui/icons/animation/loading4.gif b/plugins/org.jkiss.dbeaver.ui/icons/animation/loading4.gif deleted file mode 100644 index 7c6cfa8a4f620fd8301371fa43d4ef51522f94f8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 349 zcmZ?wbhEHb6krfw_{zZW=hw}@f1dsMdGp`j_kVvs`wL|Je)jvr=HDN-{QkJ*_se;| zU(Wyic;dSo-M^ns`~7tK?-%p#oa+AlV*ac9TYleb{e8dl_k+&g4|{(<>OH%o^!MXQ z_pa`|vMv75%Ct-S+pZsEV{QvY)`Y;=1SpR4WhdmMYq<7>}e9) zQ75{(P;h0Q;M!uL)rCSE%7m9?3#`Z$T%IHN|NnmmLO}5+3nK%A34;zuA;?b*Y*h}k z+FgQLo#bZ~?Nsq)YxY!0@iLk^yU$p`!6f0@>LL+M1r@&OGdh`M#Q6F$*4mf~39vJ} zEKikUujJ8Ba#7VtYtq*>GV~2#W6kI15f>Bb>t|!)V!Z diff --git a/plugins/org.jkiss.dbeaver.ui/src/org/jkiss/dbeaver/ui/LoadingJob.java b/plugins/org.jkiss.dbeaver.ui/src/org/jkiss/dbeaver/ui/LoadingJob.java index 03e265f82d..04e2eb6395 100644 --- a/plugins/org.jkiss.dbeaver.ui/src/org/jkiss/dbeaver/ui/LoadingJob.java +++ b/plugins/org.jkiss.dbeaver.ui/src/org/jkiss/dbeaver/ui/LoadingJob.java @@ -140,7 +140,7 @@ public class LoadingJob extends AbstractJob { class LoadingUIJob extends AbstractUIJob { - private static final long DELAY = 200; + private static final long DELAY = 100; private ILoadVisualizer visualizer; diff --git a/plugins/org.jkiss.dbeaver.ui/src/org/jkiss/dbeaver/ui/UIIcon.java b/plugins/org.jkiss.dbeaver.ui/src/org/jkiss/dbeaver/ui/UIIcon.java index 66c6158aec..26da256b87 100644 --- a/plugins/org.jkiss.dbeaver.ui/src/org/jkiss/dbeaver/ui/UIIcon.java +++ b/plugins/org.jkiss.dbeaver.ui/src/org/jkiss/dbeaver/ui/UIIcon.java @@ -32,10 +32,13 @@ public class UIIcon { public static final DBIcon SEPARATOR_H = new DBIcon("separator_h", "misc/separator_h.png"); //$NON-NLS-1$ //$NON-NLS-2$ public static final DBIcon DOTS_BUTTON = new DBIcon("dots_button", "misc/dots_button.png"); //$NON-NLS-1$ //$NON-NLS-2$ - public static final DBIcon LOADING1 = new DBIcon("loading1", "animation/loading1.gif"); //$NON-NLS-1$ //$NON-NLS-2$ - public static final DBIcon LOADING2 = new DBIcon("loading2", "animation/loading2.gif"); //$NON-NLS-1$ //$NON-NLS-2$ - public static final DBIcon LOADING3 = new DBIcon("loading3", "animation/loading3.gif"); //$NON-NLS-1$ //$NON-NLS-2$ - public static final DBIcon LOADING4 = new DBIcon("loading4", "animation/loading4.gif"); //$NON-NLS-1$ //$NON-NLS-2$ + public static final DBIcon LOADING1 = new DBIcon("loading1", "animation/loading01.png"); //$NON-NLS-1$ //$NON-NLS-2$ + public static final DBIcon LOADING2 = new DBIcon("loading2", "animation/loading02.png"); //$NON-NLS-1$ //$NON-NLS-2$ + public static final DBIcon LOADING3 = new DBIcon("loading3", "animation/loading03.png"); //$NON-NLS-1$ //$NON-NLS-2$ + public static final DBIcon LOADING4 = new DBIcon("loading4", "animation/loading04.png"); //$NON-NLS-1$ //$NON-NLS-2$ + public static final DBIcon LOADING5 = new DBIcon("loading5", "animation/loading05.png"); //$NON-NLS-1$ //$NON-NLS-2$ + public static final DBIcon LOADING6 = new DBIcon("loading6", "animation/loading06.png"); //$NON-NLS-1$ //$NON-NLS-2$ + public static final DBIcon LOADING7 = new DBIcon("loading7", "animation/loading07.png"); //$NON-NLS-1$ //$NON-NLS-2$ public static final DBIcon PROGRESS0 = new DBIcon("progress0", "animation/progress_0.gif"); //$NON-NLS-1$ //$NON-NLS-2$ public static final DBIcon PROGRESS1 = new DBIcon("progress1", "animation/progress_1.gif"); //$NON-NLS-1$ //$NON-NLS-2$ -- GitLab