VM Button: Removed anination in VM create button.

Change-Id: Ide1fec4795694342215ee7dde1b9ba18e86b5535
Signed-off-by: minkee.lee <minkee.lee@samsung.com>

diff --git a/resource/res/emulator_list_image_new.gif b/resource/res/emulator_list_image_new.gif
new file mode 100644 (file)
index 0000000..f0e5737
Binary files /dev/null and b/resource/res/emulator_list_image_new.gif differ

diff --git a/resource/res/emulator_list_image_new_ani.gif b/resource/res/emulator_list_image_new_ani.gif
deleted file mode 100755 (executable)
index 2118f0d..0000000
Binary files a/resource/res/emulator_list_image_new_ani.gif and /dev/null differ

diff --git a/src/org/tizen/emulator/manager/plugin/PluginImageResources.java b/src/org/tizen/emulator/manager/plugin/PluginImageResources.java
index ae81d15..562a43e 100644 (file)
--- a/src/org/tizen/emulator/manager/plugin/PluginImageResources.java
+++ b/src/org/tizen/emulator/manager/plugin/PluginImageResources.java
@@ -46,7 +46,7 @@ import org.tizen.emulator.manager.resources.ImageType;
 public enum PluginImageResources {
        VM_IMAGE_NOMAL("emulator_list_image_nml"),
        VM_IMAGE_HOVER("emulator_list_image_hover"),
-       VM_IMAGE_CREATE("emulator_list_image_new_ani"),
+       VM_IMAGE_CREATE("emulator_list_image_new"),
        VM_IMAGE_SELECTED("emulator_list_selected"),
 
        ADD_NEW_NOMAL("add_new_nml"),

diff --git a/src/org/tizen/emulator/manager/ui/widgets/VMCreateButton.java b/src/org/tizen/emulator/manager/ui/widgets/VMCreateButton.java
index 50428d7..c73255c 100644 (file)
--- a/src/org/tizen/emulator/manager/ui/widgets/VMCreateButton.java
+++ b/src/org/tizen/emulator/manager/ui/widgets/VMCreateButton.java
@@ -1,21 +1,16 @@
 package org.tizen.emulator.manager.ui.widgets;
 
-import org.eclipse.swt.SWTException;
 import org.eclipse.swt.events.PaintEvent;
 import org.eclipse.swt.events.PaintListener;
 import org.eclipse.swt.graphics.GC;
 import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.ImageData;
 import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.widgets.Canvas;
 import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.tizen.emulator.manager.logging.EMLogger;
 import org.tizen.emulator.manager.platform.BaseImage;
 import org.tizen.emulator.manager.plugin.PluginImageResources;
 
 public class VMCreateButton extends VMButton {
-       private GifAnimationThread thread;
        private VMCreateButton button;
 
        public VMCreateButton(Composite parent, int style, BaseImage base) {
@@ -44,25 +39,10 @@ public class VMCreateButton extends VMButton {
                        setEnabled(false);
                        //VMsMainView.getInstance().drawCreateVM(false);
                } else {
-                       if (thread != null) {
-                               thread.isDisposed = true;
-                               try {
-                                       thread.join();
-                               } catch (InterruptedException e) {
-                                       EMLogger.getLogger().warning(e.getMessage());
-                               }
-                               thread = null;
-                               aniImageData = null;
-                       }
                        setEnabled(true);
                }
        }
 
-       private ImageData aniImageData = null;
-       public void setAnimationImmageData(ImageData data) {
-               aniImageData = data;
-       }
-
        private PaintListener CreateButtonPaintListener = new PaintListener() {
                private int W_OFFSET = 2;
                private int H_OFFSET = 3;
@@ -77,86 +57,10 @@ public class VMCreateButton extends VMButton {
                        GC gc = e.gc;
                        Rectangle rect = ((Canvas) e.widget).getClientArea();
 
-                       if (isSelection()) {
-                               if (thread == null) {
-                                       gc.setBackground(colors.get(state.getId()));
-                                       gc.fillRectangle(rect);
-                                       gc.drawImage(image, rect.x + W_OFFSET, rect.y + H_OFFSET);
+                       gc.setBackground(colors.get(state.getId()));
+                       gc.fillRectangle(rect);
+                       gc.drawImage(image, rect.x + W_OFFSET, rect.y + H_OFFSET);
 
-                                       gc.drawImage(PluginImageResources.VM_IMAGE_SELECTED.getImage(button.getBaseImage().getPlatform().getPluginPlatformName()), rect.x, rect.y);
-
-                                       thread = new GifAnimationThread(button, gc);
-                                       thread.isDisposed = false;
-                                       thread.start();
-                               } else {
-                                       if (aniImageData != null) {
-                                               Image newImage = new Image(Display.getCurrent(), aniImageData);
-                                               gc.drawImage(newImage, aniImageData.x +  W_OFFSET, aniImageData.y + H_OFFSET);
-                                               newImage.dispose();
-                                       }
-                               }
-                       } else {
-                               gc.setBackground(colors.get(state.getId()));
-                               gc.fillRectangle(rect);
-                               gc.drawImage(image, rect.x + W_OFFSET, rect.y + H_OFFSET);
-                       }
                }
        };
 }
-
-class GifAnimationThread extends Thread {
-       int currentFrame = 0;
-       boolean isDisposed = false;
-       ImageData[] frames;
-       Display display = Display.getCurrent();
-       VMCreateButton button;
-       GC gc;
-
-       GifAnimationThread(VMCreateButton button, GC gc) {
-               this.button = button;
-               this.gc = gc;
-               frames = PluginImageResources.VM_IMAGE_CREATE.getImageData(button.getBaseImage().getPlatform().getPluginPlatformName());
-       }
-
-       @Override
-       public void run() {
-
-               while(!isDisposed) {
-                       try {
-                               if (frames != null) {
-                                       //sleep(frames[currentFrame].delayTime * 10);
-                                       sleep(100);
-                               } else {
-                                       sleep(1000);
-                               }
-                       } catch (InterruptedException e) {
-                               EMLogger.getLogger().warning(e.getMessage());
-                       }
-
-                       if (frames != null) {
-                                currentFrame = (currentFrame + 1) % frames.length;
-                       }
-
-                       if (display.isDisposed()) {
-                               return;
-                       }
-
-                       if (frames != null) {
-                               display.asyncExec(new Runnable() {
-                                       @Override
-                                       public void run() {
-                                               if (currentFrame != 0) {
-                                               try {
-                                                       button.setAnimationImmageData(frames[currentFrame]);
-                                                       button.redraw();
-                                       } catch (SWTException e) {
-                                               isDisposed = true;
-                                               }
-                                       }
-                                       }
-                               }); /* end of asyncExec */
-                       }
-               }
-       }
-}
-