[Title] emulator-manager : modify skin select rountine
authorjihye kim <jihye1128.kim@samsung.com>
Thu, 8 Nov 2012 06:13:28 +0000 (15:13 +0900)
committerjihye kim <jihye1128.kim@samsung.com>
Thu, 8 Nov 2012 06:13:28 +0000 (15:13 +0900)
[Desc.] change default skin to the phone shape skin
[Issue] N/A

src/org/tizen/emulator/manager/ui/detail/TableWidget.java
src/org/tizen/emulator/manager/vms/RESOLUTION.java

index e068a49..662e4a6 100644 (file)
@@ -515,22 +515,34 @@ class SkinCombo extends TableWidget {
 
                helper = new VMCreateHelper();
                skinCombo = helper.makeCombo(table);
-               helper.addComboItem(skinCombo, skinList.toArray(), 0);
 
+               Skin tempSkin = null;
+               for (Skin s : skinList) {
+                       if (s.getResolution() != StringResource.SKIN_GENERAL) {
+                               tempSkin = s;
+                       }
+                       skinCombo.add(s.getName());
+               }
                if (!isCreateMode() && oldSkin != null) {
-                       boolean find = false;
+                       tempSkin = oldSkin;
+               }
+
+               boolean find = false;
+               if (tempSkin != null) {
                        for (int i = 0; i < skinCombo.getItemCount(); i++) {
-                               if (skinCombo.getItem(i).equals(oldSkin.toString())) {
+                               if (skinCombo.getItem(i).equals(tempSkin.toString())) {
                                        skinCombo.select(i);
                                        find = true;
                                        break;
                                }
                        }
-                       if (!find) {
-                               skinCombo.add(oldSkin.toString(), 0);
-                               skinCombo.select(0);
-                       }
                }
+
+               if (!find) {
+                       skinCombo.add(oldSkin.toString(), 0);
+                       skinCombo.select(0);
+               }
+
                return true;
        }
 
@@ -666,7 +678,7 @@ class FileShareTypeCombo extends TableWidget {
 
        public String getValue(VMPropertyValue value) {
                return value.isFileShareSupport && !EmulatorManager.isMac()
-                               ? StringResource.SUPPORTED : StringResource.NOT_SUPPORTED;
+                               ? StringResource.SUPPORTED + "        ": StringResource.NOT_SUPPORTED + "    ";
        }
 
        public void setValue(VMPropertyValue value) {
index b79bf90..70f6591 100644 (file)
@@ -33,7 +33,7 @@ import org.tizen.emulator.manager.vms.xml.DisplayType.Resolution;
 
 public enum RESOLUTION {
        HVGA(320, 480,"HVGA", 160), WVGA(480,800,"WVGA", 207), /*WSVGA(600,1024, "WSVGA", 224),*/ HD(720, 1280, "HD", 316),
-       WXGA(1280, 800, "WXGA", 300), HD1080(1920, 1080, "HD1080", 314), WQXGA(2560, 1600, "WQXGA", 301);
+       WXGA(1280, 800, "WXGA", 300), HD1080(1920, 1080, "HD1080", 314)/*, WQXGA(2560, 1600, "WQXGA", 301)*/;
 
        private Resolution resolution;
        private String type;