From: giwoong.kim Date: Wed, 14 Nov 2012 06:39:29 +0000 (+0900) Subject: menu: added force close menu X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.1~1355 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=30143e255d65c3298aefbb550a0608b262f07702;p=sdk%2Femulator%2Fqemu.git menu: added force close menu Advanced>Force Close Signed-off-by: GiWoong Kim --- 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 714f33c76e..dca0e1ee09 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 @@ -1915,45 +1915,52 @@ public class EmulatorSkin { diagnosisItem.setMenu(diagnosisMenu); } - /* - // Force close menu - final MenuItem forceCloseItem = new MenuItem(menu, SWT.PUSH); - forceCloseItem.setText("&Force Close"); - //forceCloseItem.setImage(imageRegistry.getIcon(IconName.XXX)); - forceCloseItem.addSelectionListener( new SelectionAdapter() { - @Override - public void widgetSelected( SelectionEvent e ) { - logger.info("Force close is selected"); - - //TODO : y or n popup - System.exit(-1); - } - }); - */ - - new MenuItem( menu, SWT.SEPARATOR ); + new MenuItem(menu, SWT.SEPARATOR); /* About menu */ - final MenuItem aboutItem = new MenuItem( menu, SWT.PUSH ); - aboutItem.setText( "&About" ); - aboutItem.setImage( imageRegistry.getIcon( IconName.ABOUT ) ); + final MenuItem aboutItem = new MenuItem(menu, SWT.PUSH); + aboutItem.setText("&About"); + aboutItem.setImage(imageRegistry.getIcon(IconName.ABOUT)); - aboutItem.addSelectionListener( new SelectionAdapter() { + aboutItem.addSelectionListener(new SelectionAdapter() { private boolean isOpen; @Override - public void widgetSelected( SelectionEvent e ) { - if ( !isOpen ) { + public void widgetSelected(SelectionEvent e) { + if (!isOpen) { isOpen = true; logger.info("Open the about dialog"); - AboutDialog dialog = new AboutDialog( shell ); + AboutDialog dialog = new AboutDialog(shell); dialog.open(); isOpen = false; } } } ); + new MenuItem(menu, SWT.SEPARATOR); + + /* Force close menu */ + final MenuItem forceCloseItem = new MenuItem(menu, SWT.PUSH); + forceCloseItem.setText("&Force Close"); + forceCloseItem.setImage(imageRegistry.getIcon(IconName.FORCE_CLOSE)); + forceCloseItem.addSelectionListener(new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent e) { + logger.info("Force close is selected"); + + int answer = SkinUtil.openMessage(shell, null, + "If you force stop an emulator, it may cause some problems.\n" + + "Are you sure you want to contiue?", + SWT.ICON_QUESTION | SWT.OK | SWT.CANCEL, config); + + if (answer == SWT.OK) { + logger.info("force close!!!"); + System.exit(-1); + } + } + }); + return menu; } diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/image/ImageRegistry.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/image/ImageRegistry.java index 1d60b5f122..3c48822fde 100644 --- a/tizen/src/skin/client/src/org/tizen/emulator/skin/image/ImageRegistry.java +++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/image/ImageRegistry.java @@ -71,30 +71,31 @@ public class ImageRegistry { public enum IconName { - DETAIL_INFO( "detail_info.png" ), - ROTATE( "rotate.png" ), - SCALE( "scale.png" ), - SHELL( "shell.png" ), - ADVANCED( "advanced.png" ), - CLOSE( "close.png" ), - SCREENSHOT( "screenshot.png" ), - USB_KEYBOARD( "usb_keyboard.png" ), - HOST_KEYBOARD( "host_keyboard.png" ), - DIAGNOSIS( "diagnosis.png" ), - ABOUT( "about.png" ), - - COPY_SCREEN_SHOT( "copy_screenshot_dialog.png" ), - REFRESH_SCREEN_SHOT( "refresh_screenshot_dialog.png" ), - INCREASE_SCALE( "increase_scale.png" ), - DECREASE_SCALE( "decrease_scale.png" ), - SAVE_SCREEN_SHOT( "save_screenshot_dialog.png" ), - - EMULATOR_TITLE( "emulator_icon.png" ), - EMULATOR_TITLE_ICO( "emulator_icon.ico" ); + DETAIL_INFO("detail_info.png"), + ROTATE("rotate.png"), + SCALE("scale.png"), + SHELL("shell.png"), + ADVANCED("advanced.png"), + CLOSE("close.png"), + SCREENSHOT("screenshot.png"), + USB_KEYBOARD("usb_keyboard.png"), + HOST_KEYBOARD("host_keyboard.png"), + DIAGNOSIS("diagnosis.png"), + FORCE_CLOSE("force_close.png"), + ABOUT("about.png"), + + COPY_SCREEN_SHOT("copy_screenshot_dialog.png"), + REFRESH_SCREEN_SHOT("refresh_screenshot_dialog.png"), + INCREASE_SCALE("increase_scale.png"), + DECREASE_SCALE("decrease_scale.png"), + SAVE_SCREEN_SHOT("save_screenshot_dialog.png"), + + EMULATOR_TITLE("emulator_icon.png"), + EMULATOR_TITLE_ICO("emulator_icon.ico"); private String name; - private IconName( String name ) { + private IconName(String name) { this.name = name; } diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/util/SkinUtil.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/util/SkinUtil.java index 76df3fb77b..b68b3ab950 100644 --- a/tizen/src/skin/client/src/org/tizen/emulator/skin/util/SkinUtil.java +++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/util/SkinUtil.java @@ -283,20 +283,19 @@ public class SkinUtil { return false; } } - - public static void openMessage( Shell shell, String title, String message, int style, EmulatorConfig config ) { - - MessageBox messageBox = new MessageBox( shell, style ); - - if( !StringUtil.isEmpty( title ) ) { - messageBox.setText( title ); - }else { - messageBox.setText( makeEmulatorName( config ) ); + + public static int openMessage(Shell shell, + String title, String message, int style, EmulatorConfig config) { + MessageBox messageBox = new MessageBox(shell, style); + + if (!StringUtil.isEmpty(title)) { + messageBox.setText(title); + } else { + messageBox.setText(makeEmulatorName(config)); } - - messageBox.setMessage( StringUtil.nvl( message ) ); - messageBox.open(); - + + messageBox.setMessage(StringUtil.nvl(message)); + return messageBox.open(); } }