[title] added icon at screenshot window

[Type]
[Module] Emulator
[Priority]
[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 ae56898..ce8b3c0 100755 (executable)
--- a/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkin.java
+++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkin.java
@@ -1524,7 +1524,8 @@ public class EmulatorSkin {
 
                                        isScreenShotOpened = true;
 
-                                       screenShotDialog = new ScreenShotDialog( shell, communicator, EmulatorSkin.this, config );
+                                       screenShotDialog = new ScreenShotDialog( shell, communicator, EmulatorSkin.this, config,
+                                                       imageRegistry.getIcon(IconName.SCREENSHOT) );
                                        screenShotDialog.open();
 
                                } catch ( ScreenShotException ex ) {

diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/screenshot/ScreenShotDialog.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/screenshot/ScreenShotDialog.java
index 6b131b4..ff7209f 100644 (file)
--- a/tizen/src/skin/client/src/org/tizen/emulator/skin/screenshot/ScreenShotDialog.java
+++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/screenshot/ScreenShotDialog.java
@@ -108,7 +108,7 @@ public class ScreenShotDialog {
        private boolean reserveImage;
 
        public ScreenShotDialog( Shell parent, SocketCommunicator communicator, EmulatorSkin emulatorSkin,
-                       EmulatorConfig config ) throws ScreenShotException {
+                       EmulatorConfig config, Image icon ) throws ScreenShotException {
 
                this.communicator = communicator;
                this.emulatorSkin = emulatorSkin;
@@ -116,6 +116,10 @@ public class ScreenShotDialog {
 
                shell = new Shell( Display.getDefault(), SWT.DIALOG_TRIM | SWT.RESIZE | SWT.MAX );
                shell.setText( "Screen Shot - " + SkinUtil.makeEmulatorName( config ) );
+               if (icon != null) {
+                       shell.setImage(icon);
+               }
+
                shell.addListener( SWT.Close, new Listener() {
                        @Override
                        public void handleEvent( Event event ) {