[Title] modify context menu icon, remove rotation id in dbi contents

[Type] Feature
[Module] Skin
[Priority] Minor
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]

Change-Id: Icf93d7bb0e24edc7f710e14cf37da06e6aa27069

diff --git a/tizen/src/skin/client/skins/emul_320x480/default.dbi b/tizen/src/skin/client/skins/emul_320x480/default.dbi
index 6ac374d341e33fbcdcd90ae09e9ecac29743e78e..b57c94a10f6536dbb59c72ec3bf5fa190e00460f 100644 (file)
--- a/tizen/src/skin/client/skins/emul_320x480/default.dbi
+++ b/tizen/src/skin/client/skins/emul_320x480/default.dbi
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EmulatorUI xmlns="http://www.tizen.org/emulator/dbi" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <rotations>
-        <rotation id="0" name="Portrait">
+        <rotation name="Portrait">
             <lcd id="0">
                 <region left="26" top="70" width="320" height="480"/>
             </lcd>
@@ -44,7 +44,7 @@
                 </keyMap>
             </keyMapList>
         </rotation>
-        <rotation id="1" name="Landscape">
+        <rotation name="Landscape">
             <lcd id="0">
                 <region left="70" top="34" width="480" height="320"/>
             </lcd>
@@ -87,7 +87,7 @@
                 </keyMap>
             </keyMapList>
         </rotation>
-        <rotation id="2" name="Reverse Portrait">
+        <rotation name="Reverse Portrait">
             <lcd id="0">
                 <region left="34" top="70" width="320" height="480"/>
             </lcd>
@@ -130,7 +130,7 @@
                 </keyMap>
             </keyMapList>
         </rotation>
-        <rotation id="3" name="Reverse Landscape">
+        <rotation name="Reverse Landscape">
             <lcd id="0">
                 <region left="70" top="26" width="480" height="320"/>
             </lcd>

diff --git a/tizen/src/skin/client/skins/emul_3keys_320x480/default.dbi b/tizen/src/skin/client/skins/emul_3keys_320x480/default.dbi
index 0692e3aa2d57a622d852666988e9c8af6cc1e7d7..4b77adb04a4de33d6320f8effa67dad54a68358a 100644 (file)
--- a/tizen/src/skin/client/skins/emul_3keys_320x480/default.dbi
+++ b/tizen/src/skin/client/skins/emul_3keys_320x480/default.dbi
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EmulatorUI xmlns="http://www.tizen.org/emulator/dbi" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <rotations>
-        <rotation id="0" name="Portrait">
+        <rotation name="Portrait">
             <lcd id="0">
                 <region left="26" top="70" width="320" height="480"/>
             </lcd>
@@ -60,7 +60,7 @@
                 </keyMap>
             </keyMapList>
         </rotation>
-        <rotation id="1" name="Landscape">
+        <rotation name="Landscape">
             <lcd id="0">
                 <region left="70" top="34" width="480" height="320"/>
             </lcd>
@@ -119,7 +119,7 @@
                 </keyMap>
             </keyMapList>
         </rotation>
-        <rotation id="2" name="Reverse Portrait">
+        <rotation name="Reverse Portrait">
             <lcd id="0">
                 <region left="34" top="70" width="320" height="480"/>
             </lcd>
@@ -178,7 +178,7 @@
                 </keyMap>
             </keyMapList>
         </rotation>
-        <rotation id="3" name="Reverse Landscape">
+        <rotation name="Reverse Landscape">
             <lcd id="0">
                 <region left="70" top="26" width="480" height="320"/>
             </lcd>

diff --git a/tizen/src/skin/client/skins/emul_3keys_480x800/default.dbi b/tizen/src/skin/client/skins/emul_3keys_480x800/default.dbi
index 0ce98c7122ae515b33e79c9a908948f6f31dca14..c179d17c406746cef8adfae2104ddb54247263f2 100644 (file)
--- a/tizen/src/skin/client/skins/emul_3keys_480x800/default.dbi
+++ b/tizen/src/skin/client/skins/emul_3keys_480x800/default.dbi
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EmulatorUI xmlns="http://www.tizen.org/emulator/dbi" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <rotations>
-        <rotation id="0" name="Portrait">
+        <rotation id name="Portrait">
             <lcd id="0">
                 <region height="800" left="35" top="86" width="480"/>
             </lcd>
@@ -60,7 +60,7 @@
                 </keyMap>
             </keyMapList>
         </rotation>
-        <rotation id="1" name="Landscape">
+        <rotation name="Landscape">
             <lcd id="0">
                 <region height="480" left="86" top="46" width="800"/>
             </lcd>
@@ -119,7 +119,7 @@
                 </keyMap>
             </keyMapList>
         </rotation>
-        <rotation id="2" name="Reverse Portrait">
+        <rotation name="Reverse Portrait">
             <lcd id="0">
                 <region left="46" top="89" width="480" height="800"/>
             </lcd>
@@ -178,7 +178,7 @@
                 </keyMap>
             </keyMapList>
         </rotation>
-        <rotation id="3" name="Reverse Landscape">
+        <rotation name="Reverse Landscape">
             <lcd id="0">
                 <region left="90" top="35" width="800" height="480"/>
             </lcd>

diff --git a/tizen/src/skin/client/skins/emul_3keys_600x1024/default.dbi b/tizen/src/skin/client/skins/emul_3keys_600x1024/default.dbi
index 4b5f1db7d601bd2d834381b0962ce95d65624d8d..889518888d44b38f1c3fbef8a7ccaecbd7795429 100644 (file)
--- a/tizen/src/skin/client/skins/emul_3keys_600x1024/default.dbi
+++ b/tizen/src/skin/client/skins/emul_3keys_600x1024/default.dbi
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EmulatorUI xmlns="http://www.tizen.org/emulator/dbi" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <rotations>
-        <rotation id="0" name="Portrait">
+        <rotation name="Portrait">
             <lcd id="0">
                 <region left="52" top="109" width="600" height="1024" scale="1"/>
             </lcd>
@@ -60,7 +60,7 @@
                 </keyMap>
             </keyMapList>
         </rotation>
-        <rotation id="1" name="Landscape">
+        <rotation name="Landscape">
             <lcd id="0">
                 <region left="109" top="62" width="1024" height="600" scale="1"/>
             </lcd>
@@ -119,7 +119,7 @@
                 </keyMap>
             </keyMapList>
         </rotation>
-        <rotation id="2" name="Reverse Portrait">
+        <rotation name="Reverse Portrait">
             <lcd id="0">
                 <region left="62" top="113" width="600" height="1024" scale="1"/>
             </lcd>
@@ -178,7 +178,7 @@
                 </keyMap>
             </keyMapList>
         </rotation>
-        <rotation id="3" name="Reverse Landscape">
+        <rotation name="Reverse Landscape">
             <lcd id="0">
                 <region left="113" top="52" width="1024" height="600" scale="1"/>
             </lcd>

diff --git a/tizen/src/skin/client/skins/emul_3keys_720x1280/default.dbi b/tizen/src/skin/client/skins/emul_3keys_720x1280/default.dbi
index a89d0018f4906611f12585e759ed88a96df82476..b2ee97fc51f835a3fbb127ce6329d631654c1f71 100644 (file)
--- a/tizen/src/skin/client/skins/emul_3keys_720x1280/default.dbi
+++ b/tizen/src/skin/client/skins/emul_3keys_720x1280/default.dbi
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EmulatorUI xmlns="http://www.tizen.org/emulator/dbi" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <rotations>
-        <rotation id="0" name="Portrait">
+        <rotation name="Portrait">
             <lcd id="0">
                 <region left="67" top="116" width="720" height="1280"/>
             </lcd>
@@ -60,7 +60,7 @@
                 </keyMap>
             </keyMapList>
         </rotation>
-        <rotation id="1" name="Landscape">
+        <rotation name="Landscape">
             <lcd id="0">
                 <region left="116" top="78" width="1280" height="720"/>
             </lcd>
@@ -119,7 +119,7 @@
                 </keyMap>
             </keyMapList>
         </rotation>
-        <rotation id="2" name="Reverse Portrait">
+        <rotation name="Reverse Portrait">
             <lcd id="0">
                 <region left="78" top="117" width="720" height="1280"/>
             </lcd>
@@ -178,7 +178,7 @@
                 </keyMap>
             </keyMapList>
         </rotation>
-        <rotation id="3" name="Reverse Landscape">
+        <rotation name="Reverse Landscape">
             <lcd id="0">
                 <region left="117" top="67" width="1280" height="720"/>
             </lcd>

diff --git a/tizen/src/skin/client/skins/emul_480x800/default.dbi b/tizen/src/skin/client/skins/emul_480x800/default.dbi
index 529d17661fd555254fa4badb3828b45e4863db86..5519f5618efa3c21573794df82b93e5447134681 100644 (file)
--- a/tizen/src/skin/client/skins/emul_480x800/default.dbi
+++ b/tizen/src/skin/client/skins/emul_480x800/default.dbi
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EmulatorUI xmlns="http://www.tizen.org/emulator/dbi" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <rotations>
-        <rotation id="0" name="Portrait">
+        <rotation name="Portrait">
             <lcd id="0">
                 <region height="800" left="35" top="86" width="480"/>
             </lcd>
@@ -44,7 +44,7 @@
                 </keyMap>
             </keyMapList>
         </rotation>
-        <rotation id="1" name="Landscape">
+        <rotation name="Landscape">
             <lcd id="0">
                 <region height="480" left="86" top="46" width="800"/>
             </lcd>
@@ -87,7 +87,7 @@
                 </keyMap>
             </keyMapList>
         </rotation>
-        <rotation id="2" name="Reverse Portrait">
+        <rotation name="Reverse Portrait">
             <lcd id="0">
                 <region left="46" top="89" width="480" height="800"/>
             </lcd>
@@ -130,7 +130,7 @@
                 </keyMap>
             </keyMapList>
         </rotation>
-        <rotation id="3" name="Reverse Landscape">
+        <rotation name="Reverse Landscape">
             <lcd id="0">
                 <region left="90" top="35" width="800" height="480"/>
             </lcd>

diff --git a/tizen/src/skin/client/skins/emul_600x1024/default.dbi b/tizen/src/skin/client/skins/emul_600x1024/default.dbi
index ebc651d20629f38fcffc1a4d7261eeb6b5ebf912..42b5d6fbf9bef15e9b0f9c6b6421e7b2fe595efe 100644 (file)
--- a/tizen/src/skin/client/skins/emul_600x1024/default.dbi
+++ b/tizen/src/skin/client/skins/emul_600x1024/default.dbi
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EmulatorUI xmlns="http://www.tizen.org/emulator/dbi" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <rotations>
-        <rotation id="0" name="Portrait">
+        <rotation name="Portrait">
             <lcd id="0">
                 <region left="52" top="109" width="600" height="1024" scale="1"/>
             </lcd>
@@ -44,7 +44,7 @@
                 </keyMap>
             </keyMapList>
         </rotation>
-        <rotation id="1" name="Landscape">
+        <rotation name="Landscape">
             <lcd id="0">
                 <region left="109" top="62" width="1024" height="600" scale="1"/>
             </lcd>
@@ -87,7 +87,7 @@
                 </keyMap>
             </keyMapList>
         </rotation>
-        <rotation id="2" name="Reverse Portrait">
+        <rotation name="Reverse Portrait">
             <lcd id="0">
                 <region left="62" top="113" width="600" height="1024" scale="1"/>
             </lcd>
@@ -130,7 +130,7 @@
                 </keyMap>
             </keyMapList>
         </rotation>
-        <rotation id="3" name="Reverse Landscape">
+        <rotation name="Reverse Landscape">
             <lcd id="0">
                 <region left="113" top="52" width="1024" height="600" scale="1"/>
             </lcd>

diff --git a/tizen/src/skin/client/skins/emul_720x1280/default.dbi b/tizen/src/skin/client/skins/emul_720x1280/default.dbi
index fd0eb7bbfb906737add6c8d0b0a9bcb0cac4be9b..3f4fbb641747b9e2591d66559fd23638e490d76f 100644 (file)
--- a/tizen/src/skin/client/skins/emul_720x1280/default.dbi
+++ b/tizen/src/skin/client/skins/emul_720x1280/default.dbi
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EmulatorUI xmlns="http://www.tizen.org/emulator/dbi" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <rotations>
-        <rotation id="0" name="Portrait">
+        <rotation name="Portrait">
             <lcd id="0">
                 <region left="67" top="116" width="720" height="1280"/>
             </lcd>
@@ -44,7 +44,7 @@
                 </keyMap>
             </keyMapList>
         </rotation>
-        <rotation id="1" name="Landscape">
+        <rotation name="Landscape">
             <lcd id="0">
                 <region left="116" top="78" width="1280" height="720"/>
             </lcd>
@@ -87,7 +87,7 @@
                 </keyMap>
             </keyMapList>
         </rotation>
-        <rotation id="2" name="Reverse Portrait">
+        <rotation name="Reverse Portrait">
             <lcd id="0">
                 <region left="78" top="117" width="720" height="1280"/>
             </lcd>
@@ -130,7 +130,7 @@
                 </keyMap>
             </keyMapList>
         </rotation>
-        <rotation id="3" name="Reverse Landscape">
+        <rotation name="Reverse Landscape">
             <lcd id="0">
                 <region left="117" top="67" width="1280" height="720"/>
             </lcd>

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 c66db90870c1517a625d9d002dce813fbd4ee15b..13bcbcb6a783a003ac39bb33ddb19c39ddf5aa7a 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
@@ -42,11 +42,8 @@ import org.eclipse.swt.events.DragDetectEvent;
 import org.eclipse.swt.events.DragDetectListener;
 import org.eclipse.swt.events.KeyEvent;
 import org.eclipse.swt.events.KeyListener;
-import org.eclipse.swt.events.MenuAdapter;
 import org.eclipse.swt.events.MenuDetectEvent;
 import org.eclipse.swt.events.MenuDetectListener;
-import org.eclipse.swt.events.MenuEvent;
-import org.eclipse.swt.events.MenuListener;
 import org.eclipse.swt.events.MouseEvent;
 import org.eclipse.swt.events.MouseListener;
 import org.eclipse.swt.events.MouseMoveListener;
@@ -125,8 +122,6 @@ public class EmulatorSkin {
 
        private Logger logger = SkinLogger.getSkinLogger( EmulatorSkin.class ).getLogger();
 
-       private static final String MENU_ITEM_IMAGE = "ITEM_IMAGE";
-
        private EmulatorConfig config;
        private Shell shell;
        private ImageRegistry imageRegistry;
@@ -170,8 +165,6 @@ public class EmulatorSkin {
        private KeyListener canvasKeyListener;
        private MenuDetectListener canvasMenuDetectListener;
 
-       private MenuListener menuListener;
-
        private EmulatorSkin reopenSkin;
 
        protected EmulatorSkin( EmulatorConfig config, boolean isOnTop ) {
@@ -246,34 +239,6 @@ public class EmulatorSkin {
 
                Menu contextMenu = new Menu( shell );
 
-               menuListener = new MenuAdapter() {
-                       @Override
-                       public void menuShown( MenuEvent e ) {
-
-                               Menu menu = (Menu) e.getSource();
-                               MenuItem[] items = menu.getItems();
-
-                               for ( MenuItem menuItem : items ) {
-
-                                       Image image = (Image) menuItem.getData( MENU_ITEM_IMAGE );
-                                       if ( null != image ) {
-                                               menuItem.setImage( image );
-                                       }
-
-                                       Menu subMenu = menuItem.getMenu();
-                                       if ( null != subMenu ) {
-                                               subMenu.removeMenuListener( menuListener );
-                                               subMenu.addMenuListener( menuListener );
-                                       }
-
-                               }
-
-                       }
-
-               };
-
-               contextMenu.addMenuListener( menuListener );
-
                addMenuItems( shell, contextMenu );
 
                addShellListener( shell );
@@ -833,7 +798,7 @@ public class EmulatorSkin {
 
                String emulatorName = SkinUtil.makeEmulatorName( config );
                detailInfoItem.setText( emulatorName );
-               detailInfoItem.setData( MENU_ITEM_IMAGE, imageRegistry.getIcon( IconName.DETAIL_INFO ) );
+               detailInfoItem.setImage( imageRegistry.getIcon( IconName.DETAIL_INFO ) );
                detailInfoItem.addSelectionListener( new SelectionAdapter() {
                        @Override
                        public void widgetSelected( SelectionEvent e ) {
@@ -870,15 +835,13 @@ public class EmulatorSkin {
 
                final MenuItem rotateItem = new MenuItem( menu, SWT.CASCADE );
                rotateItem.setText( "Rotate" );
-               rotateItem.setData( MENU_ITEM_IMAGE, imageRegistry.getIcon( IconName.ROTATE ) );
-
+               rotateItem.setImage( imageRegistry.getIcon( IconName.ROTATE ) );
                Menu rotateMenu = createRotateMenu( menu.getShell() );
                rotateItem.setMenu( rotateMenu );
 
                final MenuItem scaleItem = new MenuItem( menu, SWT.CASCADE );
                scaleItem.setText( "Scale" );
-               scaleItem.setData( MENU_ITEM_IMAGE, imageRegistry.getIcon( IconName.SCALE ) );
-
+               scaleItem.setImage( imageRegistry.getIcon( IconName.SCALE ) );
                Menu scaleMenu = createScaleMenu( menu.getShell() );
                scaleItem.setMenu( scaleMenu );
 
@@ -886,15 +849,14 @@ public class EmulatorSkin {
 
                final MenuItem advancedItem = new MenuItem( menu, SWT.CASCADE );
                advancedItem.setText( "Advanced" );
-               advancedItem.setData( MENU_ITEM_IMAGE, imageRegistry.getIcon( IconName.ADVANCED ) );
-
+               advancedItem.setImage( imageRegistry.getIcon( IconName.ADVANCED ) );
                Menu advancedMenu = createAdvancedMenu( menu.getShell() );
                advancedItem.setMenu( advancedMenu );
 
                final MenuItem shellItem = new MenuItem( menu, SWT.PUSH );
                shellItem.setText( "Shell" );
-               shellItem.setData( MENU_ITEM_IMAGE, imageRegistry.getIcon( IconName.SHELL ) );
-
+               shellItem.setImage( imageRegistry.getIcon( IconName.SHELL ) );
+               
                shellItem.addSelectionListener( new SelectionAdapter() {
                        @Override
                        public void widgetSelected( SelectionEvent e ) {
@@ -936,7 +898,7 @@ public class EmulatorSkin {
 
                MenuItem closeItem = new MenuItem( menu, SWT.PUSH );
                closeItem.setText( "Close" );
-               closeItem.setData( MENU_ITEM_IMAGE, imageRegistry.getIcon( IconName.CLOSE ) );
+               closeItem.setImage( imageRegistry.getIcon( IconName.CLOSE ) );
                closeItem.addSelectionListener( new SelectionAdapter() {
                        @Override
                        public void widgetSelected( SelectionEvent e ) {
@@ -1092,7 +1054,7 @@ public class EmulatorSkin {
 
                final MenuItem screenshotItem = new MenuItem( menu, SWT.PUSH );
                screenshotItem.setText( "Screen Shot" );
-               screenshotItem.setData( MENU_ITEM_IMAGE, imageRegistry.getIcon( IconName.SCREENSHOT ) );
+               screenshotItem.setImage( imageRegistry.getIcon( IconName.SCREENSHOT ) );
                screenshotItem.addSelectionListener( new SelectionAdapter() {
 
                        @Override
@@ -1130,8 +1092,8 @@ public class EmulatorSkin {
 
                final MenuItem usbKeyboardItem = new MenuItem( menu, SWT.CASCADE );
                usbKeyboardItem.setText( "USB Keyboard" );
-               usbKeyboardItem.setData( MENU_ITEM_IMAGE, imageRegistry.getIcon( IconName.USB_KEBOARD ) );
-
+               usbKeyboardItem.setImage( imageRegistry.getIcon( IconName.USB_KEBOARD ) );
+               
                Menu usbKeyBoardMenu = new Menu( shell, SWT.DROP_DOWN );
 
                final MenuItem usbOnItem = new MenuItem( usbKeyBoardMenu, SWT.RADIO );
@@ -1161,7 +1123,7 @@ public class EmulatorSkin {
 
                final MenuItem aboutItem = new MenuItem( menu, SWT.PUSH );
                aboutItem.setText( "About" );
-               aboutItem.setData( MENU_ITEM_IMAGE, imageRegistry.getIcon( IconName.ABOUT ) );
+               aboutItem.setImage( imageRegistry.getIcon( IconName.ABOUT ) );
 
                aboutItem.addSelectionListener( new SelectionAdapter() {
                        private boolean isOpen;