[Title] emulator-manager : fix bug in Mac os

[Desc.]  fix bug in Mac os
[Issue] N/A

Change-Id: I135ca12e18192f2f7cf86b86da89d6be9a77c460
Signed-off-by: jihye kim <jihye1128.kim@samsung.com>

diff --git a/package/changelog b/package/changelog
index c14aa5c..b4fe984 100644 (file)
--- a/package/changelog
+++ b/package/changelog
@@ -1,3 +1,7 @@
+* 2.2.3
+- fix bug in Mac os
+== jihye kim <jihye1128.kim@samsung.com> 2013-06-17
+
 * 2.2.2
 - add execute permissions(+x)
 == jihye kim <jihye1128.kim@samsung.com> 2013-06-14

diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index 6448ab1..0f429ca 100644 (file)
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,5 +1,5 @@
 Source: emulator-manager
-Version: 2.2.2
+Version: 2.2.3
 Maintainer: Yeong-Kyoon Lee<yeongkyoon.lee@samsung.com>
 
 Package: emulator-manager

diff --git a/src/org/tizen/emulator/manager/resources/FontResources.java b/src/org/tizen/emulator/manager/resources/FontResources.java
index 8ee4cf0..03daa9c 100644 (file)
--- a/src/org/tizen/emulator/manager/resources/FontResources.java
+++ b/src/org/tizen/emulator/manager/resources/FontResources.java
@@ -109,6 +109,11 @@ public enum FontResources {
                if (defaultFont == null) {\r
                        defaultFont = getDADefaultFont();\r
                }\r
+\r
+               if (EmulatorManager.isMac()) {\r
+                       size = size + 2;\r
+               }\r
+\r
                FontData[] fontData = defaultFont.getFontData();\r
                for (int i = 0; i < fontData.length; i++) {\r
                        fontData[i].setHeight(size);\r
@@ -131,6 +136,11 @@ public enum FontResources {
                if (defaultFont == null) {\r
                        defaultFont = getDADefaultFont();\r
                }\r
+\r
+               if (EmulatorManager.isMac()) {\r
+                       size = size + 2;\r
+               }\r
+\r
                FontData[] fontData = defaultFont.getFontData();\r
                for (int i = 0; i < fontData.length; i++) {\r
                        fontData[i].setStyle(style);\r
@@ -152,7 +162,9 @@ public enum FontResources {
                                defaultFont = Display.getCurrent().getSystemFont();\r
                                return defaultFont;\r
                        }\r
-                       defaultFont = new Font(Display.getCurrent(), new FontData[] { new FontData(fontName, 9, SWT.NORMAL) });\r
+                       defaultFont = EmulatorManager.isMac()\r
+                                       ? new Font(Display.getCurrent(), new FontData[] { new FontData(fontName, 11, SWT.NORMAL) })\r
+                                       : new Font(Display.getCurrent(), new FontData[] { new FontData(fontName, 9, SWT.NORMAL) });\r
                }\r
 \r
                return defaultFont;\r

diff --git a/src/org/tizen/emulator/manager/ui/detail/PEmptyViewPage.java b/src/org/tizen/emulator/manager/ui/detail/PEmptyViewPage.java
index 17938f5..16e68c4 100644 (file)
--- a/src/org/tizen/emulator/manager/ui/detail/PEmptyViewPage.java
+++ b/src/org/tizen/emulator/manager/ui/detail/PEmptyViewPage.java
@@ -33,6 +33,7 @@ import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.FormAttachment;
 import org.eclipse.swt.layout.FormData;
 import org.eclipse.swt.widgets.Label;
+import org.tizen.emulator.manager.EmulatorManager;
 import org.tizen.emulator.manager.resources.ColorResources;
 import org.tizen.emulator.manager.resources.FontResources;
 import org.tizen.emulator.manager.ui.VMsDetailView;
@@ -68,6 +69,9 @@ public class PEmptyViewPage extends DetailViewPage {
        @Override
        public void drawPropertyView(VMPropertyValue propertyValue, boolean isCreate) {
                title.setText(NO_ITEM);
+               if (EmulatorManager.isMac()) {
+                       settingItemList();
+               }
        }
 
        @Override

diff --git a/src/org/tizen/emulator/manager/ui/list/TreeListView.java b/src/org/tizen/emulator/manager/ui/list/TreeListView.java
index f55960b..080ed3f 100644 (file)
--- a/src/org/tizen/emulator/manager/ui/list/TreeListView.java
+++ b/src/org/tizen/emulator/manager/ui/list/TreeListView.java
@@ -85,6 +85,7 @@ public class TreeListView extends AbstractListView {
        }
 
        private boolean isLaunchButton = false;
+       private boolean isSelection = false;
        private void settingListener() {
                /*
                vmsTree.addFocusListener(new FocusListener() {
@@ -153,30 +154,7 @@ public class TreeListView extends AbstractListView {
                vmsTree.addSelectionListener(new SelectionListener() {
                        @Override
                        public void widgetSelected(SelectionEvent e) {
-                               if (vmsTree.getSelectionCount() == 1) {
-                                       oldItem = currentItem;
-                                       currentItem = vmsTree.getSelection()[0];
-                                       Object data = currentItem.getData();
-
-                                       if(!(data instanceof RowItem)) {
-                                               return;
-                                       }
-
-                                       // TODO : select template using platform
-                                       if (data instanceof CreateMarker) {
-                                               VMsMainView.getInstance().drawCreateVM(
-                                                               ((CreateMarker)data).getBaseImage(), false);
-                                               //setSelectProperty();
-                                               vmsTree.setSelection(((CreateMarker) data).getItem());
-                                       } else if(data instanceof TreeMarker) {
-                                               VMsMainView.getInstance().drawEmptyDetailVM();
-                                               VMsMainView.getInstance().setCurrentProperty(null);
-                                       } else {
-                                               PropertyContent content = (PropertyContent)data;
-                                               //currentProp = content;
-                                               VMsMainView.getInstance().drawDetailVM(content.property, -1);
-                                       }
-                               }
+                               selectTreeItem();
                        }
 
                        @Override
@@ -239,6 +217,34 @@ public class TreeListView extends AbstractListView {
                });
        }
 
+       protected void selectTreeItem() {
+               isSelection = true;
+               if (vmsTree.getSelectionCount() == 1) {
+                       oldItem = currentItem;
+                       currentItem = vmsTree.getSelection()[0];
+                       Object data = currentItem.getData();
+
+                       if(!(data instanceof RowItem)) {
+                               return;
+                       }
+
+                       // TODO : select template using platform
+                       if (data instanceof CreateMarker) {
+                               VMsMainView.getInstance().drawCreateVM(
+                                               ((CreateMarker)data).getBaseImage(), false);
+                               //setSelectProperty();
+                               vmsTree.setSelection(((CreateMarker) data).getItem());
+                       } else if(data instanceof TreeMarker) {
+                               VMsMainView.getInstance().drawEmptyDetailVM();
+                               VMsMainView.getInstance().setCurrentProperty(null);
+                       } else {
+                               PropertyContent content = (PropertyContent)data;
+                               //currentProp = content;
+                               VMsMainView.getInstance().drawDetailVM(content.property, -1);
+                       }
+               }
+       }
+
        protected void packAll() {
                for(TreeColumn column : vmsTree.getColumns()) {
                        column.pack();
@@ -333,6 +339,10 @@ public class TreeListView extends AbstractListView {
                if (currentItem != null) {
                        vmsTree.setFocus();
                        vmsTree.setSelection(currentItem);
+                       if (!isSelection) {
+                               selectTreeItem();
+                               isSelection = false;
+                       }
                } else {
                        vmsTree.deselectAll();
                }

diff --git a/src/org/tizen/emulator/manager/ui/widgets/VMButton.java b/src/org/tizen/emulator/manager/ui/widgets/VMButton.java
index 8f63c9c..91cc6ff 100644 (file)
--- a/src/org/tizen/emulator/manager/ui/widgets/VMButton.java
+++ b/src/org/tizen/emulator/manager/ui/widgets/VMButton.java
@@ -93,6 +93,7 @@ public class VMButton extends ImageButton {
                images.set(WSTATE.HOVER.getId(), ImageResources.VM_IMAGE_HOVER.getImage());
                images.set(WSTATE.SELECTED_HOVER.getId(), ImageResources.VM_IMAGE_HOVER.getImage());
                fontColors.set(WSTATE.SELECTED.getId(), ColorResources.BLUE.getColor());
+               fontColors.set(WSTATE.SELECTED_HOVER.getId(), ColorResources.BLUE.getColor());
        }
 
        private void settingLaunchButton() {