From: giwoong.kim <giwoong.kim@samsung.com>
Date: Wed, 12 Dec 2012 06:50:44 +0000 (+0900)
Subject: skin: dispose the ProgressBar when progress is completed
X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.1~1295
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f3173f23756318456e49a9adf7452cd99a362b50;p=sdk%2Femulator%2Fqemu.git

skin: dispose the ProgressBar when progress is completed

Dispose the ProgressBar when booting is completed.

Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
---

diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/comm/sock/SocketCommunicator.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/comm/sock/SocketCommunicator.java
index 2e93863ece..7a7f906c80 100644
--- a/tizen/src/skin/client/src/org/tizen/emulator/skin/comm/sock/SocketCommunicator.java
+++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/comm/sock/SocketCommunicator.java
@@ -48,6 +48,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import org.eclipse.swt.widgets.Display;
 import org.tizen.emulator.skin.EmulatorSkin;
 import org.tizen.emulator.skin.comm.ICommunicator;
 import org.tizen.emulator.skin.comm.ICommunicator.SendCommand;
@@ -328,9 +329,18 @@ public class SocketCommunicator implements ICommunicator {
 						/* draw progress bar */
 						if (skin.bootingProgress != null) {
 							skin.bootingProgress.setSelection(value);
+
+							if (value == 100 | value == 0) {
+								/* this means progressbar will be
+								dispose soon */
+								if (skin.bootingProgress != null) {
+									skin.bootingProgress = null;
+								}
+							}
 						}
 					}
-					//TODO: resetDataTransfer(progressDataTransfer)
+
+					resetDataTransfer(progressDataTransfer);
 
 					break;
 				}
diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/layout/GeneralPurposeSkinComposer.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/layout/GeneralPurposeSkinComposer.java
index 48280b8aad..897cb1e6c6 100644
--- a/tizen/src/skin/client/src/org/tizen/emulator/skin/layout/GeneralPurposeSkinComposer.java
+++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/layout/GeneralPurposeSkinComposer.java
@@ -265,7 +265,8 @@ public class GeneralPurposeSkinComposer implements ISkinComposer {
 			skin.bootingProgress.setBounds(lcdBounds.x,
 					lcdBounds.y + lcdBounds.height + 1, lcdBounds.width, 2);
 
-			skin.bootingProgress.dispose(); //TODO
+			//TODO : delete this line
+			skin.bootingProgress.setSelection(0); /* dispose */
 			skin.bootingProgress = null;
 		}
 
diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/layout/PhoneShapeSkinComposer.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/layout/PhoneShapeSkinComposer.java
index 3f7b708a26..2ed182d2ce 100644
--- a/tizen/src/skin/client/src/org/tizen/emulator/skin/layout/PhoneShapeSkinComposer.java
+++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/layout/PhoneShapeSkinComposer.java
@@ -212,7 +212,8 @@ public class PhoneShapeSkinComposer implements ISkinComposer {
 			skin.bootingProgress.setBounds(lcdBounds.x,
 					lcdBounds.y + lcdBounds.height + 1, lcdBounds.width, 2);
 
-			skin.bootingProgress.dispose(); //TODO:
+			//TODO : delete this line
+			skin.bootingProgress.setSelection(0); /* dispose */
 			skin.bootingProgress = null;
 		}
 
diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/window/CustomProgressBar.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/window/CustomProgressBar.java
index e9f04ff336..7880cb9d10 100644
--- a/tizen/src/skin/client/src/org/tizen/emulator/skin/window/CustomProgressBar.java
+++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/window/CustomProgressBar.java
@@ -37,7 +37,6 @@ import org.eclipse.swt.graphics.RGB;
 import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.widgets.Canvas;
 import org.eclipse.swt.widgets.Composite;
-import org.tizen.emulator.skin.dialog.DetailInfoDialog;
 import org.tizen.emulator.skin.log.SkinLogger;
 
 public class CustomProgressBar extends Canvas {
@@ -45,12 +44,13 @@ public class CustomProgressBar extends Canvas {
 			SkinLogger.getSkinLogger(CustomProgressBar.class).getLogger();
 
 	private Composite parent;
-	private int selection = 0;
+	private int selection;
 
 	public CustomProgressBar(final Composite parent, int style) {
 		super(parent, style);
 
 		this.parent = parent;
+		this.selection = 1;
 
 		this.addPaintListener(new PaintListener() {
 			@Override
@@ -61,6 +61,17 @@ public class CustomProgressBar extends Canvas {
 				Rectangle bounds = getBounds();
 				int width = (bounds.width * selection) / 100; 
 				e.gc.fillRectangle(0, 0, width, bounds.height);
+
+				if (selection == 0) {
+					logger.info("progress : complete!");
+
+					parent.getDisplay().asyncExec(new Runnable() {
+						@Override
+						public void run() {
+							dispose();
+						}
+					});
+				}
 			}
 		});
 	}
@@ -79,6 +90,10 @@ public class CustomProgressBar extends Canvas {
 			@Override
 			public void run() {
 				redraw();
+
+				if (selection == 100) {
+					selection = 0;
+				}
 			}
 		});
 	}