[jbosstools-commits] JBoss Tools SVN: r39332 - in branches/jbosstools-3.3.0.Beta1/vpe/plugins/org.jboss.tools.vpe.browsersim: src/org/jboss/tools/vpe/browsersim/resources and 1 other directories.

[jbosstools-commits at lists.jboss.org]

Author: yradtsevich
Date: 2012-03-07 06:51:01 -0500 (Wed, 07 Mar 2012)
New Revision: 39332

Added:
   branches/jbosstools-3.3.0.Beta1/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/icons/
Modified:
   branches/jbosstools-3.3.0.Beta1/vpe/plugins/org.jboss.tools.vpe.browsersim/
   branches/jbosstools-3.3.0.Beta1/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/BrowserSim.java
Log:
https://issues.jboss.org/browse/JBIDE-11045 : BrowserSim: set taskbar icon for application
- merged changeset 39114 with Beta1


Property changes on: branches/jbosstools-3.3.0.Beta1/vpe/plugins/org.jboss.tools.vpe.browsersim
___________________________________________________________________
Added: svn:mergeinfo
   + /trunk/vpe/plugins/org.jboss.tools.vpe.browsersim:39114

Modified: branches/jbosstools-3.3.0.Beta1/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/BrowserSim.java
===================================================================
--- branches/jbosstools-3.3.0.Beta1/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/BrowserSim.java	2012-03-07 07:13:28 UTC (rev 39331)
+++ branches/jbosstools-3.3.0.Beta1/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/BrowserSim.java	2012-03-07 11:51:01 UTC (rev 39332)
@@ -34,6 +34,7 @@
 import org.eclipse.swt.events.MenuEvent;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.program.Program;
@@ -53,19 +54,21 @@
 import org.jboss.tools.vpe.browsersim.model.DevicesListStorage;
 import org.jboss.tools.vpe.browsersim.model.SkinMap;
 import org.jboss.tools.vpe.browsersim.ui.skin.BrowserSimSkin;
+import org.jboss.tools.vpe.browsersim.util.ResourcesUtil;
 
 /**
  * @author Yahor Radtsevich (yradtsevich)
  */
 public class BrowserSim {
 	private static final String DEFAULT_URL = "about:blank"; //"http://www.w3schools.com/js/tryit_view.asp?filename=try_nav_useragent"; //$NON-NLS-1$
+	private static final String[] BROWSERSIM_ICONS = {"icons/browsersim_16px.png", "icons/browsersim_32px.png", "icons/browsersim_64px.png", "icons/browsersim_128px.png", "icons/browsersim_256px.png", }; //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$//$NON-NLS-4$//$NON-NLS-5$
 	private Display display;
 	private String homeUrl;
 	private DevicesListHolder devicesListHolder;
 	private DeviceOrientation deviceOrientation;
 	private BrowserSimSkin skin;
-//	private BrowserSimBrowser browser;
 	private ControlHandler controlHandler;
+	private Image[] icons;
 
 	public static void main(String[] args) {
 		if (PlatformUtil.OS_MACOSX.equals(PlatformUtil.getOs())) {
@@ -92,7 +95,7 @@
 		}
 		Device defaultDevice = devicesList.getDevices().get(devicesList.getSelectedDeviceIndex());
 		Display display = new Display();
-		BrowserSim browserSim = new BrowserSim(display, homeUrl);
+		BrowserSim browserSim = new BrowserSim(display, homeUrl);		
 		browserSim.initSkin(getSkinClass(defaultDevice, devicesList.getUseSkins()));
 		browserSim.initDevicesListHolder();
 		browserSim.devicesListHolder.setDevicesList(devicesList);
@@ -103,14 +106,28 @@
 			if (!display.readAndDispatch())
 				display.sleep();
 		}
+		browserSim.dispose();
 		display.dispose();
 	}
 
 	public BrowserSim(Display display, String homeUrl) {
 		this.display = display;
 		this.homeUrl = homeUrl;
+		
+		this.icons = new Image[BROWSERSIM_ICONS.length];
+		for (int i = 0; i < BROWSERSIM_ICONS.length; i++) {
+			String iconLocation = BROWSERSIM_ICONS[i];
+			icons[i] = new Image(display, ResourcesUtil.getResourceAsStream(iconLocation));
+		}
 	}
 	
+	private void dispose() {
+		for (Image icon : icons) {
+			icon.dispose();
+		}
+		icons = null;
+	}
+	
 	public void initSkin(Class<? extends BrowserSimSkin> skinClass) {
 		try {
 			skin = skinClass.newInstance();//new AppleIPhone3Skin();//new NativeSkin();
@@ -139,7 +156,7 @@
 				}
 			}
 		});
-		shell.setText(Messages.BrowserSim_BROWSER_SIM);
+		setShellAttibutes();
 		
 		BrowserSimBrowser browser = skin.getBrowser();
 		controlHandler = new ControlHandlerImpl(browser);
@@ -231,6 +248,14 @@
 			}
 		});
 	}
+	
+	private void setShellAttibutes() {
+		Shell shell = skin.getShell();
+		if (shell != null) {
+			shell.setImages(icons);
+			shell.setText(Messages.BrowserSim_BROWSER_SIM);
+		}
+	}
 
 	private void initDevicesListHolder() {
 		devicesListHolder = new DevicesListHolder();