menu: modified about image loading & etc

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

diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkin.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkin.java
index ee063eadd880148461db6f2dbb949726086fbb3d..be980840f3ae5818abebea2c267c46430a677596 100644 (file)
--- a/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkin.java
+++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkin.java
@@ -1588,7 +1588,7 @@ public class EmulatorSkin {
                        public void widgetSelected(SelectionEvent e) {
                                logger.info("Open the about dialog");
 
-                               AboutDialog dialog = new AboutDialog(shell, config);
+                               AboutDialog dialog = new AboutDialog(shell, config, imageRegistry);
                                dialog.open();
                        }
                };

diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/dialog/AboutDialog.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/dialog/AboutDialog.java
index 9b8b2a3ac0a7ad182e8e1996fd7ba19241e3e48e..93255e3e510a6155571db562ed40e0053c7df1f9 100644 (file)
--- a/tizen/src/skin/client/src/org/tizen/emulator/skin/dialog/AboutDialog.java
+++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/dialog/AboutDialog.java
@@ -51,6 +51,8 @@ import org.eclipse.swt.widgets.Link;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
 import org.tizen.emulator.skin.config.EmulatorConfig;
+import org.tizen.emulator.skin.image.ImageRegistry;
+import org.tizen.emulator.skin.image.ImageRegistry.ResourceImageName;
 import org.tizen.emulator.skin.log.SkinLogger;
 import org.tizen.emulator.skin.util.IOUtil;
 import org.tizen.emulator.skin.util.StringUtil;
@@ -70,15 +72,18 @@ public class AboutDialog extends SkinDialog {
 
        private Image aboutImage;
        private EmulatorConfig config;
+       private ImageRegistry imageRegistry;
 
        /**
         *  Constructor
         */
-       public AboutDialog(Shell parent, EmulatorConfig config) {
+       public AboutDialog(Shell parent,
+                       EmulatorConfig config, ImageRegistry imageRegistry) {
                super(parent, "About Tizen Emulator",
                                SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
 
                this.config = config;
+               this.imageRegistry = imageRegistry;
        }
 
        private GridLayout getNopaddedGridLayout(int numColumns, boolean makeColumnEqualWidth) {
@@ -129,8 +134,7 @@ public class AboutDialog extends SkinDialog {
                compositeLeft.setLayout(getNopaddedGridLayout(1, false));
 
                Label imageLabel = new Label(compositeLeft, SWT.NONE);
-               aboutImage = new Image(shell.getDisplay(),
-                               this.getClass().getClassLoader().getResourceAsStream("images/about_Tizen_SDK.png"));
+               aboutImage = imageRegistry.getResourceImage(ResourceImageName.RESOURCE_ABOUT);
                imageLabel.setImage(aboutImage);
 
                /* right side */
@@ -166,10 +170,6 @@ public class AboutDialog extends SkinDialog {
 
                /* SDK version */
                Text versionText = new Text(compositeRight, SWT.NONE);
-               /*String version = getValue(properties, PROP_KEY_VERSION);
-               if (version.isEmpty()) {
-                       version = "Not identified";
-               }*/
                String version = config.getSkinProperty(
                                EmulatorConfig.SkinInfoConstants.SDK_VERSION_NAME);
 
@@ -200,7 +200,7 @@ public class AboutDialog extends SkinDialog {
                visit.addSelectionListener(new SelectionListener() {
                        @Override
                        public void widgetDefaultSelected(SelectionEvent arg0) {
-                               //do nothing
+                               /* do nothing */
                        }
 
                        @Override

diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/image/ImageRegistry.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/image/ImageRegistry.java
index 06ec76a3b3bc1bf24adbb69039cb3212f71d692a..4b4651b3c13d347faa5a5b5ff37ad48d588aafd8 100644 (file)
--- a/tizen/src/skin/client/src/org/tizen/emulator/skin/image/ImageRegistry.java
+++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/image/ImageRegistry.java
@@ -205,12 +205,10 @@ public class ImageRegistry {
                return id + ":" + imageType.ordinal();
        }
 
-       public ImageData getSkinImageData(Short id, ImageType imageType) {
+       public Image getSkinImage(Short id, ImageType imageType) {
                Image image = skinImageMap.get(makeKey(id, imageType));
 
-               if (null != image) {
-                       return image.getImageData();
-               } else {
+               if (image == null) {
                        RotationsType rotations = dbiContents.getRotations();
 
                        if (null == rotations) {
@@ -218,7 +216,7 @@ public class ImageRegistry {
                                return null;
                        }
 
-                       logger.info("get image data of skin from " + skinPath);
+                       logger.info("get skin image from " + skinPath);
 
                        RotationType targetRotation = SkinRotation.getRotation(id);
                        List<RotationType> rotationList = rotations.getRotation();
@@ -245,14 +243,10 @@ public class ImageRegistry {
                                }
                        }
 
-                       Image registeredImage = skinImageMap.get(makeKey(id, imageType));
-
-                       if (null != registeredImage) {
-                               return registeredImage.getImageData();
-                       }
+                       image = skinImageMap.get(makeKey(id, imageType));
                }
 
-               return null;
+               return image;
        }
 
        public Image getResourceImage(ResourceImageName name) {

diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/util/SkinUtil.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/util/SkinUtil.java
index c07a51dcfa39d8af7bde75e5dde6ae0030577e5c..0f02ec16ac83c61e7668386e7f557ded15f5f548 100644 (file)
--- a/tizen/src/skin/client/src/org/tizen/emulator/skin/util/SkinUtil.java
+++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/util/SkinUtil.java
@@ -194,11 +194,10 @@ public class SkinUtil {
                return false;
        }
 
-       public static void trimShell( Shell shell, Image image ) {
-
-               // trim transparent pixels in image. especially, corner round areas.
-
-               if ( null == image ) {
+       public static void trimShell(Shell shell, Image image) {
+               /* trim transparent pixels in image.
+                * especially, corner round areas. */
+               if (null == image) {
                        return;
                }
 
@@ -208,24 +207,22 @@ public class SkinUtil {
                int height = imageData.height;
 
                Region region = new Region();
-               region.add( new Rectangle( 0, 0, width, height ) );
+               region.add(new Rectangle(0, 0, width, height));
 
-               for ( int i = 0; i < width; i++ ) {
-                       for ( int j = 0; j < height; j++ ) {
-                               int alpha = imageData.getAlpha( i, j );
-                               if ( 0 == alpha ) {
-                                       region.subtract( i, j, 1, 1 );
+               for (int i = 0; i < width; i++) {
+                       for (int j = 0; j < height; j++) {
+                               int alpha = imageData.getAlpha(i, j);
+                               if (0 == alpha) {
+                                       region.subtract(i, j, 1, 1);
                                }
                        }
                }
 
-               shell.setRegion( region );
-
+               shell.setRegion(region);
        }
 
        public static void trimShell(Shell shell, Image image,
                        int left, int top, int width, int height) {
-
                if (null == image) {
                        return;
                }
@@ -283,26 +280,24 @@ public class SkinUtil {
        public static Image createScaledImage(ImageRegistry imageRegistry,
                        Shell shell, short rotationId, int scale, ImageType type) {
 
-               ImageData originalImageData = imageRegistry.getSkinImageData( rotationId, type );
-
-               if ( null == originalImageData ) {
+               Image imageOrigin = imageRegistry.getSkinImage(rotationId, type);
+               if (imageOrigin == null) {
                        return null;
                }
 
-               ImageData imageData = (ImageData) originalImageData.clone();
+               ImageData imageDataSrc = imageOrigin.getImageData();
+               ImageData imageDataDst = (ImageData) imageDataSrc.clone();
 
-               float convertedScale = convertScale( scale );
-
-               int width = (int) ( originalImageData.width * convertedScale );
-               int height = (int) ( originalImageData.height * convertedScale );
-               imageData = imageData.scaledTo( width, height );
+               float convertedScale = convertScale(scale);
 
-               Image image = new Image( shell.getDisplay(), imageData );
-               return image;
+               int width = (int) (imageDataSrc.width * convertedScale);
+               int height = (int) (imageDataSrc.height * convertedScale);
+               imageDataDst = imageDataDst.scaledTo(width, height);
 
+               return new Image(shell.getDisplay(), imageDataDst);
        }
 
-       public static float convertScale( int scale ) {
+       public static float convertScale(int scale) {
                return (float) scale / SCALE_CONVERTER;
        }