skin: no need to load png icon file

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

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 674b221..737d9c0 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
@@ -59,7 +59,8 @@ import org.tizen.emulator.skin.util.StringUtil;
 import org.tizen.emulator.skin.util.SwtUtil;
 
 public class AboutDialog extends SkinDialog {
-       public static final String ABOUT_DIALOG_TITLE = "About Tizen Emulator";
+       public static final String ABOUT_DIALOG_TITLE = "About Emulator";
+       public static final String SDK_NAME = "Tizen SDK";
        public static final String ABOUT_PROP_FILENAME = "about.properties";
 
        public static final String PROP_KEY_VERSION = "version";
@@ -152,7 +153,7 @@ public class AboutDialog extends SkinDialog {
                gridData.grabExcessHorizontalSpace = true;
                gridData.horizontalAlignment = SWT.CENTER;
                titleLabel.setLayoutData(gridData);*/
-               titleLabel.setText("\nTizen SDK\n");
+               titleLabel.setText("\n" + SDK_NAME + "\n");
                /*Font systemFont = shell.getDisplay().getSystemFont();
                FontData[] fontData = systemFont.getFontData();
                fontData[0].setStyle(SWT.BOLD);

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 30cc6b7..399b9f7 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
@@ -89,8 +89,7 @@ public class ImageRegistry {
                DECREASE_SCALE("decrease_scale.png"),
                SAVE_SCREEN_SHOT("save_screenshot_dialog.png"),
 
-               EMULATOR_TITLE("emulator_icon.png"),
-               EMULATOR_TITLE_ICO("emulator_icon.ico");
+               EMULATOR_ICON("emulator_icon.ico");
                
                private String name;
                

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 637a47d..24c16b7 100644 (file)
--- 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
@@ -144,13 +144,8 @@ public class GeneralPurposeSkinComposer implements ISkinComposer {
                displayCanvas.setBackground(
                                shell.getDisplay().getSystemColor(SWT.COLOR_BLACK));
 
-               if (SwtUtil.isWindowsPlatform()) {
-                       shell.setImage(skin.getImageRegistry()
-                                       .getIcon(IconName.EMULATOR_TITLE_ICO));
-               } else {
-                       shell.setImage(skin.getImageRegistry()
-                                       .getIcon(IconName.EMULATOR_TITLE));
-               }
+               shell.setImage(skin.getImageRegistry().getIcon(
+                               IconName.EMULATOR_ICON));
 
                /* create a toggle button of key window */
                List<KeyMapType> keyMapList = SkinUtil.getHWKeyMapList(

diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/layout/ProfileSpecificSkinComposer.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/layout/ProfileSpecificSkinComposer.java
index 5a85ff5..50d45ec 100644 (file)
--- a/tizen/src/skin/client/src/org/tizen/emulator/skin/layout/ProfileSpecificSkinComposer.java
+++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/layout/ProfileSpecificSkinComposer.java
@@ -135,13 +135,8 @@ public class ProfileSpecificSkinComposer implements ISkinComposer {
                lcdCanvas.setBackground(
                                shell.getDisplay().getSystemColor(SWT.COLOR_BLACK));
 
-               if (SwtUtil.isWindowsPlatform()) {
-                       shell.setImage(skin.getImageRegistry()
-                                       .getIcon(IconName.EMULATOR_TITLE_ICO));
-               } else {
-                       shell.setImage(skin.getImageRegistry()
-                                       .getIcon(IconName.EMULATOR_TITLE));
-               }
+               shell.setImage(skin.getImageRegistry().getIcon(
+                               IconName.EMULATOR_ICON));
 
                /* create a progress bar for booting status */
                skin.bootingProgress = new CustomProgressBar(skin, SWT.NONE, true);