From df241042a2517599cd69067f9945c052d75c8502 Mon Sep 17 00:00:00 2001 From: "giwoong.kim" Date: Mon, 14 Jan 2013 16:11:00 +0900 Subject: [PATCH] menu: modified popup message modified popup message for screenshot window Signed-off-by: GiWoong Kim --- .../src/org/tizen/emulator/skin/EmulatorSdlSkin.java | 10 +++++----- .../src/org/tizen/emulator/skin/EmulatorShmSkin.java | 11 ++++++----- .../src/org/tizen/emulator/skin/EmulatorSkin.java | 4 ++-- .../emulator/skin/screenshot/SdlScreenShotWindow.java | 2 +- 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSdlSkin.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSdlSkin.java index baf86ad7d0..5dac1956bd 100644 --- a/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSdlSkin.java +++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSdlSkin.java @@ -132,17 +132,17 @@ public class EmulatorSdlSkin extends EmulatorSkin { } catch (ScreenShotException ex) { screenShotDialog = null; - logger.log(Level.SEVERE, ex.getMessage(), ex); + SkinUtil.openMessage(shell, null, "Fail to create a screen shot.", SWT.ICON_ERROR, config); } catch (Exception ex) { screenShotDialog = null; - - /* defense exception handling */ logger.log(Level.SEVERE, ex.getMessage(), ex); - String errorMessage = "Internal Error.\n[" + ex.getMessage() + "]"; - SkinUtil.openMessage(shell, null, errorMessage, SWT.ICON_ERROR, config); + + SkinUtil.openMessage(shell, null, "ScreenShot is not ready.\n" + + "Please wait until the emulator is completely boot up.", + SWT.ICON_WARNING, config); } } diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorShmSkin.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorShmSkin.java index 0eb4dbaf38..c75613a81d 100644 --- a/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorShmSkin.java +++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorShmSkin.java @@ -248,18 +248,19 @@ public class EmulatorShmSkin extends EmulatorSkin { screenShotDialog.open(); } catch (ScreenShotException ex) { + screenShotDialog = null; logger.log(Level.SEVERE, ex.getMessage(), ex); + SkinUtil.openMessage(shell, null, "Fail to create a screen shot.", SWT.ICON_ERROR, config); } catch (Exception ex) { - // defense exception handling. + screenShotDialog = null; logger.log(Level.SEVERE, ex.getMessage(), ex); - String errorMessage = "Internal Error.\n[" + ex.getMessage() + "]"; - SkinUtil.openMessage(shell, null, errorMessage, SWT.ICON_ERROR, config); - } finally { - screenShotDialog = null; + SkinUtil.openMessage(shell, null, "ScreenShot is not ready.\n" + + "Please wait until the emulator is completely boot up.", + SWT.ICON_WARNING, config); } } } 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 f5eab8fb0c..1e45b9e5f7 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 @@ -1121,8 +1121,8 @@ public class EmulatorSkin { @Override public void widgetSelected(SelectionEvent e) { if (!communicator.isSensorDaemonStarted()) { - SkinUtil.openMessage(shell, null, - "SDB is not ready.\nPlease wait until the emulator is completely boot up.", + SkinUtil.openMessage(shell, null, "SDB is not ready.\n" + + "Please wait until the emulator is completely boot up.", SWT.ICON_WARNING, config); return; } diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/screenshot/SdlScreenShotWindow.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/screenshot/SdlScreenShotWindow.java index 24bfc4c0db..6d34eab2ff 100644 --- a/tizen/src/skin/client/src/org/tizen/emulator/skin/screenshot/SdlScreenShotWindow.java +++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/screenshot/SdlScreenShotWindow.java @@ -57,7 +57,7 @@ public class SdlScreenShotWindow extends ScreenShotDialog { EmulatorConfig config, Image icon) throws ScreenShotException { super(parent, communicator, emulatorSkin, config, icon); } - + protected void capture() throws ScreenShotException { DataTranfer dataTranfer = communicator.sendToQEMU( SendCommand.SCREEN_SHOT, null, true ); byte[] receivedData = communicator.getReceivedData( dataTranfer ); -- 2.34.1