From 01bf96f3f07f5ccd7456237f4cb7d60637ad13b4 Mon Sep 17 00:00:00 2001 From: "giwoong.kim" Date: Tue, 27 Nov 2012 11:49:38 +0900 Subject: [PATCH] menu: added HW Key Window menu Popup menu>HW Key Window Signed-off-by: GiWoong Kim --- .../org/tizen/emulator/skin/EmulatorSkin.java | 56 +++++++++++-------- 1 file changed, 33 insertions(+), 23 deletions(-) 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 000815394b..c0a4e7a7b3 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 @@ -145,6 +145,7 @@ public class EmulatorSkin { private boolean isShutdownRequested; private boolean isAboutToReopen; private boolean isOnTop; + private boolean isControlPanel; private boolean isOnKbd; private ControlPanel controlPanel; //not used yet @@ -178,6 +179,7 @@ public class EmulatorSkin { this.config = config; this.skinInfo = skinInfo; this.isOnTop = isOnTop; + this.isControlPanel = false; this.pressedKeyEventList = new LinkedList(); int style = SWT.NO_TRIM | SWT.DOUBLE_BUFFERED; @@ -1588,39 +1590,47 @@ public class EmulatorSkin { new MenuItem(menu, SWT.SEPARATOR); - /* HW Key Panel menu */ - /*final MenuItem panelItem = new MenuItem(menu, SWT.PUSH); - panelItem.setText("&HW Key Panel"); + /* HW Key Window menu */ + final MenuItem panelItem = new MenuItem(menu, SWT.CHECK); + panelItem.setText("&HW Key Window"); + panelItem.setSelection(isControlPanel); panelItem.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { - logger.info("HW Key Panel Menu is selected"); + final boolean isControlPanel = panelItem.getSelection(); - if (controlPanel != null) { - //TODO: move a window focus to controlPanel - return; - } + logger.info("Select HW Key Window : " + isControlPanel); - List keyMapList = - SkinUtil.getHWKeyMapList(currentState.getCurrentRotationId()); + if (isControlPanel == true) { + if (controlPanel != null) { + controlPanel.getShell().setVisible(true); + return; + } - if (keyMapList == null) { - logger.info("keyMapList is null"); - return; - } else if (keyMapList.isEmpty() == true) { - logger.info("keyMapList is empty"); - return; - } + /* create a HW key window */ + List keyMapList = + SkinUtil.getHWKeyMapList(currentState.getCurrentRotationId()); - try { - controlPanel = new ControlPanel(shell, communicator, keyMapList); - controlPanel.open(); - } finally { - controlPanel = null; + if (keyMapList == null) { + logger.info("keyMapList is null"); + return; + } else if (keyMapList.isEmpty() == true) { + logger.info("keyMapList is empty"); + return; + } + + try { + controlPanel = new ControlPanel(shell, communicator, keyMapList); + controlPanel.open(); + } finally { + controlPanel = null; + } + } else { /* isControlPanel == false */ + controlPanel.getShell().setVisible(false); } } - } );*/ + } ); /* Advanced menu */ final MenuItem advancedItem = new MenuItem( menu, SWT.CASCADE ); -- 2.34.1