From: giwoong.kim Date: Fri, 24 Aug 2012 07:47:46 +0000 (+0900) Subject: [Title] prepare for a new menuitem X-Git-Tag: TizenStudio_2.0_p2.3~1372 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4167e89ade10e2f94c670851a7039888bfe8be72;p=sdk%2Femulator%2Fqemu.git [Title] prepare for a new menuitem [Type] feature [Module] Emulator / menu [Priority] minor [Jira#] [Redmine#] [Problem] [Cause] [Solution] [TestCase] --- 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 b1e3886..c9ed794 100644 --- a/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkin.java +++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkin.java @@ -1628,6 +1628,7 @@ public class EmulatorSkin { private void addMenuItems( final Shell shell, final Menu menu ) { + /* Emulator detail info menu */ final MenuItem detailInfoItem = new MenuItem( menu, SWT.PUSH ); String emulatorName = SkinUtil.makeEmulatorName( config ); @@ -1647,6 +1648,7 @@ public class EmulatorSkin { new MenuItem( menu, SWT.SEPARATOR ); + /* Always on top menu */ final MenuItem onTopItem = new MenuItem( menu, SWT.CHECK ); onTopItem.setText( "&Always On Top" ); onTopItem.setSelection( isOnTop ); @@ -1676,12 +1678,14 @@ public class EmulatorSkin { } } ); + /* Rotate menu */ final MenuItem rotateItem = new MenuItem( menu, SWT.CASCADE ); rotateItem.setText( "&Rotate" ); rotateItem.setImage( imageRegistry.getIcon( IconName.ROTATE ) ); Menu rotateMenu = createRotateMenu( menu.getShell() ); rotateItem.setMenu( rotateMenu ); + /* Scale menu */ final MenuItem scaleItem = new MenuItem( menu, SWT.CASCADE ); scaleItem.setText( "&Scale" ); scaleItem.setImage( imageRegistry.getIcon( IconName.SCALE ) ); @@ -1690,12 +1694,14 @@ public class EmulatorSkin { new MenuItem( menu, SWT.SEPARATOR ); + /* Advanced menu */ final MenuItem advancedItem = new MenuItem( menu, SWT.CASCADE ); advancedItem.setText( "Ad&vanced" ); advancedItem.setImage( imageRegistry.getIcon( IconName.ADVANCED ) ); Menu advancedMenu = createAdvancedMenu( menu.getShell() ); advancedItem.setMenu( advancedMenu ); + /* Shell menu */ final MenuItem shellItem = new MenuItem( menu, SWT.PUSH ); shellItem.setText( "S&hell" ); shellItem.setImage( imageRegistry.getIcon( IconName.SHELL ) ); @@ -1749,6 +1755,7 @@ public class EmulatorSkin { new MenuItem( menu, SWT.SEPARATOR ); + /* Close menu */ MenuItem closeItem = new MenuItem( menu, SWT.PUSH ); closeItem.setText( "&Close" ); closeItem.setImage( imageRegistry.getIcon( IconName.CLOSE ) ); @@ -1902,6 +1909,7 @@ public class EmulatorSkin { final Menu menu = new Menu( shell, SWT.DROP_DOWN ); + /* Screen shot menu */ final MenuItem screenshotItem = new MenuItem( menu, SWT.PUSH ); screenshotItem.setText( "&Screen Shot" ); screenshotItem.setImage( imageRegistry.getIcon( IconName.SCREENSHOT ) ); @@ -1941,10 +1949,11 @@ public class EmulatorSkin { } } ); + /* USB Keyboard menu */ final MenuItem usbKeyboardItem = new MenuItem( menu, SWT.CASCADE ); usbKeyboardItem.setText( "&USB Keyboard" ); usbKeyboardItem.setImage( imageRegistry.getIcon( IconName.USB_KEBOARD ) ); - + Menu usbKeyBoardMenu = new Menu( shell, SWT.DROP_DOWN ); final MenuItem usbOnItem = new MenuItem( usbKeyBoardMenu, SWT.RADIO ); @@ -1974,6 +1983,19 @@ public class EmulatorSkin { usbKeyboardItem.setMenu( usbKeyBoardMenu ); + /* + // Diagnosis menu + final MenuItem diagnosisItem = new MenuItem(menu, SWT.PUSH); + diagnosisItem.setText("Diagnosis"); + + // Force close menu + final MenuItem forceCloseItem = new MenuItem(menu, SWT.PUSH); + forceCloseItem.setText("Force Close"); + */ + + new MenuItem( menu, SWT.SEPARATOR ); + + /* About menu */ final MenuItem aboutItem = new MenuItem( menu, SWT.PUSH ); aboutItem.setText( "&About" ); aboutItem.setImage( imageRegistry.getIcon( IconName.ABOUT ) ); diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/dialog/DetailInfoDialog.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/dialog/DetailInfoDialog.java index 9891051..a3c7b7a 100644 --- a/tizen/src/skin/client/src/org/tizen/emulator/skin/dialog/DetailInfoDialog.java +++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/dialog/DetailInfoDialog.java @@ -227,8 +227,8 @@ public class DetailInfoDialog extends SkinDialog { if ( 0 == i ) { String exec = split[i].trim().toLowerCase(); - if( SwtUtil.isWindowsPlatform() ) { - if( 4 <= exec.length() ) { + if ( SwtUtil.isWindowsPlatform() ) { + if ( 4 <= exec.length() ) { // remove '.exe' in Windows exec = exec.substring( 0, exec.length() - 4 ); } @@ -370,7 +370,7 @@ public class DetailInfoDialog extends SkinDialog { if ( isHwVirtual ) { if( isHaxError ) { result.put( "HW Virtualization State", "Disable(insufficient memory for driver)" ); - }else { + } else { result.put( "HW Virtualization State", "Enable" ); } } else {