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 16207fdd8511eca9ce29a1b2675a38a9ac33f2d7..8d35e44ce09453e79dbf4a4fc93addd9be2ea83a 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 Binary files /dev/null and b/plugins/org.jkiss.dbeaver.ui/icons/animation/loading01.png differ 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 Binary files /dev/null and b/plugins/org.jkiss.dbeaver.ui/icons/animation/loading02.png differ 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 Binary files /dev/null and b/plugins/org.jkiss.dbeaver.ui/icons/animation/loading03.png differ 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 Binary files /dev/null and b/plugins/org.jkiss.dbeaver.ui/icons/animation/loading04.png differ diff --git a/plugins/org.jkiss.dbeaver.ui/icons/animation/loading05.png b/plugins/org.jkiss.dbeaver.ui/icons/animation/loading05.png new file mode 100644 index 0000000000000000000000000000000000000000..98cf1ad5ae81f35ab23b91f670760b68aeb6a0c7 Binary files /dev/null and b/plugins/org.jkiss.dbeaver.ui/icons/animation/loading05.png differ 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 Binary files /dev/null and b/plugins/org.jkiss.dbeaver.ui/icons/animation/loading06.png differ 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 Binary files /dev/null and b/plugins/org.jkiss.dbeaver.ui/icons/animation/loading07.png differ 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 Binary files a/plugins/org.jkiss.dbeaver.ui/icons/animation/loading1.gif and /dev/null differ 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 Binary files a/plugins/org.jkiss.dbeaver.ui/icons/animation/loading2.gif and /dev/null differ diff --git a/plugins/org.jkiss.dbeaver.ui/icons/animation/loading3.gif b/plugins/org.jkiss.dbeaver.ui/icons/animation/loading3.gif deleted file mode 100644 index 10a87c20006d6a430b256fae745c6fdc2c40bdda..0000000000000000000000000000000000000000 Binary files a/plugins/org.jkiss.dbeaver.ui/icons/animation/loading3.gif and /dev/null differ 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 Binary files a/plugins/org.jkiss.dbeaver.ui/icons/animation/loading4.gif and /dev/null differ 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 03e265f82db009ccd76ef5cb1fb340b004bd5c3f..04e2eb6395f8062c0a62e9b7940ab49af6f37240 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 66c6158aec3dd790345a8fff7e2ae0b65c9dcf6a..26da256b87360b8ab0964b156e724413f25a9585 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$