[Title] emulator-manager : change default skin phone shape skin -> general skin

[Desc.] change default skin phone shape skin -> general skin
[Issue] N/A

diff --git a/package/changelog b/package/changelog
index bcdaf1c..96ef2cb 100644 (file)
--- a/package/changelog
+++ b/package/changelog
@@ -1,3 +1,7 @@
+* 1.3.66
+- modify default skin phone shape skin -> general skina
+== jihye kim <jihye1128.kim@samsung.com> 2012-12-10
+
 * 1.3.65
 - set x86 image id 1 (arm image start 2)
 == jihye kim <jihye1128.kim@samsung.com> 2012-12-04

diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index dac4125..c3cd0f8 100644 (file)
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,5 +1,5 @@
 Source: emulator-manager
-Version: 1.3.65
+Version: 1.3.66
 Maintainer: Yeong-Kyoon Lee<yeongkyoon.lee@samsung.com>
 
 Package: emulator-manager

diff --git a/src/org/tizen/emulator/manager/image/SkinList.java b/src/org/tizen/emulator/manager/image/SkinList.java
index a05115f..c17d06f 100644 (file)
--- a/src/org/tizen/emulator/manager/image/SkinList.java
+++ b/src/org/tizen/emulator/manager/image/SkinList.java
@@ -106,6 +106,7 @@ public class SkinList {
 
        private ArrayList<Skin> returnSkins = new ArrayList<Skin>();
        public ArrayList<Skin> findSkinList(String resolution) {
+               boolean isGeneral = false;
                returnSkins.clear();
                if (skinList != null) {
                        for (Skin skin : skinList) {
@@ -113,7 +114,12 @@ public class SkinList {
                                        returnSkins.add(skin);
                                }
                                if (skin.getResolution().equals(StringResource.SKIN_GENERAL)) {
-                                       returnSkins.add(skin);
+                                       if (!isGeneral) {
+                                               returnSkins.add(0, skin);
+                                               isGeneral = true;
+                                       } else {
+                                               returnSkins.add(skin);
+                                       }
                                }
                        }
                }

diff --git a/src/org/tizen/emulator/manager/ui/detail/TableWidget.java b/src/org/tizen/emulator/manager/ui/detail/TableWidget.java
index df28dc6..196109c 100644 (file)
--- a/src/org/tizen/emulator/manager/ui/detail/TableWidget.java
+++ b/src/org/tizen/emulator/manager/ui/detail/TableWidget.java
@@ -49,6 +49,7 @@ import org.eclipse.swt.widgets.Spinner;
 import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.Text;
 import org.tizen.emulator.manager.EmulatorManager;
+import org.tizen.emulator.manager.EmulatorManager.ManagerModeType;
 import org.tizen.emulator.manager.image.SkinList;
 import org.tizen.emulator.manager.image.Skin;
 import org.tizen.emulator.manager.tool.CheckVirtualization;
@@ -392,6 +393,7 @@ class ResolutionCombo extends TableWidget {
 
                VMCreateHelper helper = new VMCreateHelper();
                resolutionCombo = helper.makeCombo(table);
+
                DisplayResolution.getInstance().initialize(oldResolution);
 
                helper.addComboItem(resolutionCombo, DisplayResolution.getInstance().getList(),
@@ -407,14 +409,16 @@ class ResolutionCombo extends TableWidget {
                        public void widgetSelected(SelectionEvent e) {
                                String re = resolutionCombo.getItem(resolutionCombo.getSelectionIndex());
                                resolutionCombo.setToolTipText(re);
+
                                RESOLUTION d = DisplayResolution.getInstance().findResolution(re);
                                if (d != null) {
                                        newResolution = d;
-                                       Spinner dpi = (Spinner)(TableWidgetList.getInstance()
-                                                       .findVMWidget("dpi", isCreateMode()).getWidget());
-                                       dpi.setSelection(d.getDPI());
+                                       DPISpinner dpi = (DPISpinner)TableWidgetList.getInstance()
+                                                       .findVMWidget("dpi", isCreateMode());
+                                       dpi.selectDPI(d);
+
                                        SkinCombo skin = (SkinCombo)TableWidgetList.getInstance().findVMWidget("skin", isCreateMode());
-                                       skin.selectResolution(d.getValue());
+                                       skin.selectResolution(d);
                                }
 
                                if (!isCreateMode()) {
@@ -483,6 +487,15 @@ class DPISpinner extends TableWidget {
        public void closeWidget() {
                dpiSpinner.dispose();
        }
+
+       public void selectDPI(RESOLUTION resolution) {
+               if (!DisplayResolution.getInstance().isMinResoluion(resolution)
+                               && EmulatorManager.getInstance().getManagerMode() != ManagerModeType.INHOUSE_MODE) {
+                       dpiSpinner.setSelection(oldDPI);
+               } else {
+                       dpiSpinner.setSelection(resolution.getDPI());
+               }
+       }
 }
 
 class SkinCombo extends TableWidget {
@@ -521,48 +534,36 @@ class SkinCombo extends TableWidget {
        public boolean settingWidget(Table table, VMPropertyValue value) {
                oldSkin = newSkin = value.skin;
 
-               ArrayList<Skin> skinList = null;
-               skinList = SkinList.getInstance().findSkinList(value.resolution.getValue());
+               ArrayList<Skin> skinList = SkinList.getInstance()
+                                                                       .findSkinList(value.resolution.getValue());
 
                helper = new VMCreateHelper();
                skinCombo = helper.makeCombo(table);
-
-               Skin tempSkin = null;
-               for (Skin s : skinList) {
-                       if (s.getResolution() != StringResource.SKIN_GENERAL) {
-                               tempSkin = s;
-                       }
-                       skinCombo.add(s.getName());
-               }
+               helper.addComboItem(skinCombo, skinList.toArray(), 0);
+               skinCombo.setToolTipText(skinCombo.getItem(0));
 
                if (!isCreateMode() && oldSkin != null) {
-                       tempSkin = oldSkin;
-               }
-
-               boolean find = false;
-               if (tempSkin != null) {
-                       for (int i = 0; i < skinCombo.getItemCount(); i++) {
-                               if (skinCombo.getItem(i).equals(tempSkin.toString())) {
-                                       skinCombo.select(i);
-                                       skinCombo.setToolTipText(skinCombo.getItem(i));
-                                       find = true;
-                                       break;
+                       boolean find = false;
+                       if (!DisplayResolution.getInstance().isMinResoluion(value.resolution)
+                                       && EmulatorManager.getInstance().getManagerMode() != ManagerModeType.INHOUSE_MODE) {
+                               skinCombo.removeAll();
+                       } else {
+                               for (int i = 0; i < skinCombo.getItemCount(); i++) {
+                                       if (skinCombo.getItem(i).equals(oldSkin.toString())) {
+                                               skinCombo.select(i);
+                                               skinCombo.setToolTipText(skinCombo.getItem(i));
+                                               find = true;
+                                               break;
+                                       }
                                }
                        }
-               }
 
-               if (!find) {
-                       if (oldSkin != null) {
+                       if (!find) {
                                skinCombo.add(oldSkin.toString(), 0);
                                skinCombo.select(0);
                                skinCombo.setToolTipText(skinCombo.getItem(0));
                        }
-               } else {
-                       newSkin = tempSkin;
                }
-
-               selectSkin = newSkin;
-
                return true;
        }
 
@@ -590,49 +591,42 @@ class SkinCombo extends TableWidget {
                return true;
        }
 
-       public void selectResolution(String resolution) {
+       public void selectResolution(RESOLUTION resolution) {
                skinCombo.removeAll();
                ArrayList<Skin> skinList = null;
-               skinList = SkinList.getInstance().findSkinList(resolution);
-
-               Skin tempSkin = null;
-               for (Skin s : skinList) {
-                       if (s.getResolution() != StringResource.SKIN_GENERAL) {
-                               tempSkin = s;
-                       }
-                       skinCombo.add(s.getName());
-               }
+               skinList = SkinList.getInstance().findSkinList(resolution.getValue());
+               helper.addComboItem(skinCombo, skinList.toArray(), 0);
 
-               if (!isCreateMode() && selectSkin != null
+               int selection = 0;
+               if (selectSkin != null
                                && selectSkin.getResolution().equals(StringResource.SKIN_GENERAL)) {
-                               boolean find = false;
-                               for (int i = 0; i < skinCombo.getItemCount(); i++) {
-                                       if (skinCombo.getItem(i).equals(selectSkin.toString())) {
-                                               find = true;
-                                               break;
-                                       }
+                       boolean find = false;
+                       for (int i = 0; i < skinCombo.getItemCount(); i++) {
+                               if (skinCombo.getItem(i).equals(selectSkin.toString())) {
+                                       selection = i;
+                                       find = true;
+                                       break;
                                }
+                       }
 
-                               if (!find) {
-                                       skinList.add(0, selectSkin);
-                                       skinCombo.add(selectSkin.toString(), 0);
-                               }
-                               tempSkin = selectSkin;
-               } else if (tempSkin == null) {
-                       if (!skinList.isEmpty()) {
-                               tempSkin = skinList.get(0);
+                       if (!find) {
+                               skinList.add(0, selectSkin);
+                               skinCombo.add(selectSkin.toString(), 0);
                        }
                }
 
-               if (tempSkin != null) {
-                       for (int i = 0; i < skinCombo.getItemCount(); i++) {
-                               if (skinCombo.getItem(i).equals(tempSkin.toString())) {
-                                       skinCombo.select(i);
-                                       skinCombo.setToolTipText(skinCombo.getItem(i));
-                                       break;
-                               }
-                       }
-                       newSkin = tempSkin;
+               if (!isCreateMode()
+                               && !DisplayResolution.getInstance().isMinResoluion(resolution)
+                               && EmulatorManager.getInstance().getManagerMode() != ManagerModeType.INHOUSE_MODE) {
+                       selection = 0;
+                       skinCombo.removeAll();
+                       skinCombo.add(oldSkin.toString());
+               }
+
+               if (!skinList.isEmpty()) {
+                       skinCombo.select(selection);
+                       skinCombo.setToolTipText(skinCombo.getItem(selection));
+                       newSkin = skinList.get(selection);
                } else {
                        newSkin = null;
                }

diff --git a/src/org/tizen/emulator/manager/ui/detail/VMResource.java b/src/org/tizen/emulator/manager/ui/detail/VMResource.java
index f31e23f..eb382ca 100644 (file)
--- a/src/org/tizen/emulator/manager/ui/detail/VMResource.java
+++ b/src/org/tizen/emulator/manager/ui/detail/VMResource.java
@@ -79,6 +79,10 @@ class StringArrayResource
        public void setDefaultIndex(int index) {
                defaultIndex = index;
        }
+
+       public void clear() {
+               list.clear();
+       }
 }
 
 class SupportType extends StringArrayResource
@@ -122,6 +126,11 @@ class DisplayResolution extends StringArrayResource
 
        private DisplayResolution()
        {
+       }
+
+       public void initialize(RESOLUTION re) {
+               clear();
+
                int i = 0;
                if (EmulatorManager.getInstance().getManagerMode() == ManagerModeType.INHOUSE_MODE) {
                        for (RESOLUTION r : RESOLUTION.values()) {
@@ -138,9 +147,7 @@ class DisplayResolution extends StringArrayResource
                                add(i++, r.toString());
                        }
                }
-       }
 
-       public void initialize(RESOLUTION re) {
                if (!(EmulatorManager.getInstance().getManagerMode() == ManagerModeType.INHOUSE_MODE)) {
                        for (String s : getList()) {
                                if (s.equals(re.toString())) {
@@ -152,19 +159,12 @@ class DisplayResolution extends StringArrayResource
        }
 
        public RESOLUTION findResolution(String resolution) {
-               if (EmulatorManager.getInstance().getManagerMode() == ManagerModeType.INHOUSE_MODE) {
-                       for (RESOLUTION r : RESOLUTION.values()) {
-                               if (resolution.equals(r.toString())) {
-                                       return r;
-                               }
-                       }
-               } else {
-                       for (RESOLUTION r : minResoultion) {
-                               if (resolution.equals(r.toString())) {
-                                       return r;
-                               }
+               for (RESOLUTION r : RESOLUTION.values()) {
+                       if (resolution.equals(r.toString())) {
+                               return r;
                        }
                }
+
                return null;
        }
 
@@ -180,6 +180,15 @@ class DisplayResolution extends StringArrayResource
 
                return getDefaultIndex();
        }
+
+       public boolean isMinResoluion(RESOLUTION resolution) {
+               for (RESOLUTION r : minResoultion) {
+                       if (resolution.getValue().equals(r.getValue())) {
+                               return true;
+                       }
+               }
+               return false;
+       }
 }
 
 class RamSize extends StringArrayResource