Author: yradtsevich Date: 2012-04-13 14:24:03 -0400 (Fri, 13 Apr 2012) New Revision: 40185 Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/back-selected.png trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/back.png trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/forward-selected.png trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/forward.png trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/home-selected.png trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/home.png trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/nav-1.png trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/nav-2.png trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/nav-3.png trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/refresh-selected.png trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/refresh.png trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/stop-selected.png trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/stop.png trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/time-1.png trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/time-2.png trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/time-3.png trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/AbstractTimeComposite.java trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/DeviceComposite.java trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ImageButtonComposite.java trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ImageDescriptor.java trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/WidgetDescriptor.java trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/android/AndroidComposite.java trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/android/AndroidNavBarComposite.java trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/android/AndroidSkinDescriptor.java trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/android/AndroidTimeComposite.java Removed: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/ImageButtonComposite.java trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/ImageDescriptor.java trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/WidgetDescriptor.java Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/config/devices.cfg trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/android/AndroidResizableSkin.java trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/AppleIPhone3ResizableSkin.java trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/AppleIPhoneComposite.java trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/IOSNavBarComposite.java trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/IOsTimeComposite.java trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/IPhoneSkinDescriptor.java Log: JBIDE-10945 BrowserSim: create more skins - created Android screen Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/back-selected.png =================================================================== (Binary files differ) Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/back-selected.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/back.png =================================================================== (Binary files differ) Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/back.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/forward-selected.png =================================================================== (Binary files differ) Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/forward-selected.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/forward.png =================================================================== (Binary files differ) Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/forward.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/home-selected.png =================================================================== (Binary files differ) Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/home-selected.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/home.png =================================================================== (Binary files differ) Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/home.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/nav-1.png =================================================================== (Binary files differ) Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/nav-1.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/nav-2.png =================================================================== (Binary files differ) Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/nav-2.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/nav-3.png =================================================================== (Binary files differ) Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/nav-3.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/refresh-selected.png =================================================================== (Binary files differ) Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/refresh-selected.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/refresh.png =================================================================== (Binary files differ) Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/refresh.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/stop-selected.png =================================================================== (Binary files differ) Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/stop-selected.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/stop.png =================================================================== (Binary files differ) Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/stop.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/time-1.png =================================================================== (Binary files differ) Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/time-1.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/time-2.png =================================================================== (Binary files differ) Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/time-2.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/time-3.png =================================================================== (Binary files differ) Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/android/time-3.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/config/devices.cfg =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/config/devices.cfg 2012-04-13 16:32:33 UTC (rev 40184) +++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/config/devices.cfg 2012-04-13 18:24:03 UTC (rev 40185) @@ -5,7 +5,7 @@ Apple iPad 2 768 1024 Mozilla/5.0 (iPad; U; CPU OS 4_3_1 like Mac OS X; en-us) AppleWebKit/533.17.9 (KHTML, like Gecko) Version/5.0.2 Mobile/8G4 Safari/6533.18.5 Apple iPhone 3 Apple iPhone 3 320 480 Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7 Apple iPhone 3 Apple iPhone 4 640 960 Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7 Apple iPhone 3 -RIM BlackBerry Bold Touch 9900 640 480 Mozilla/5.0 (BlackBerry; U; BlackBerry 9900; en-US) AppleWebKit/534.1+ (KHTML, like Gecko) Version/6.0.0.246 Mobile Safari/534.1+ Apple iPhone 3 -Samsung Galaxy S 480 800 Mozilla/5.0 (Linux; U; Android 2.3.3; en-us; GT-I9000 Build/GINGERBREAD) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1 Apple iPhone 3 -Samsung Galaxy S II 480 800 Mozilla/5.0 (Linux; U; Android 2.3; en-us; GT-I9100 Build/GRH78) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1 Apple iPhone 3 -Samsung Galaxy Tab 10.1 800 1280 Mozilla/5.0 (Linux; U; Android 3.0.1; en-us; GT-P7100 Build/HRI83) AppleWebKit/534.13 (KHTML, like Gecko) Version/4.0 MobileSafari/534.13 Apple iPhone 3 +RIM BlackBerry Bold Touch 9900 640 480 Mozilla/5.0 (BlackBerry; U; BlackBerry 9900; en-US) AppleWebKit/534.1+ (KHTML, like Gecko) Version/6.0.0.246 Mobile Safari/534.1+ Android +Samsung Galaxy S 480 800 Mozilla/5.0 (Linux; U; Android 2.3.3; en-us; GT-I9000 Build/GINGERBREAD) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1 Android +Samsung Galaxy S II 480 800 Mozilla/5.0 (Linux; U; Android 2.3; en-us; GT-I9100 Build/GRH78) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1 Android +Samsung Galaxy Tab 10.1 800 1280 Mozilla/5.0 (Linux; U; Android 3.0.1; en-us; GT-P7100 Build/HRI83) AppleWebKit/534.13 (KHTML, like Gecko) Version/4.0 MobileSafari/534.13 Android Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/AbstractTimeComposite.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/AbstractTimeComposite.java (rev 0) +++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/AbstractTimeComposite.java 2012-04-13 18:24:03 UTC (rev 40185) @@ -0,0 +1,62 @@ +package org.jboss.tools.vpe.browsersim.ui.skin; + +import org.eclipse.swt.SWT; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Listener; + +public abstract class AbstractTimeComposite extends Composite { + + /** + * Create the composite. + * @param parent + * @param style + */ + public AbstractTimeComposite(Composite parent, ImageList imageList) { + super(parent, SWT.NONE); + GridLayout gridLayout = new GridLayout(5, false); + gridLayout.verticalSpacing = 0; + gridLayout.horizontalSpacing = 0; + gridLayout.marginWidth = 0; + gridLayout.marginHeight = 0; + setLayout(gridLayout); + + for (ImageDescriptor descriptor : getBodyDescriptor()) { + descriptor.createWidget(this, imageList); + } + } + + protected abstract ImageDescriptor[] getBodyDescriptor(); + + @Override + protected void checkSubclass() { + // Disable the check that prevents subclassing of SWT components + } + + @Override + public void addListener(int eventType, Listener listener) { + super.addListener(eventType, listener); + switch (eventType) { + case SWT.MouseDown: + case SWT.MouseUp: + case SWT.MouseMove: + for (Control child : getChildren()) { + child.addListener(eventType, listener); + } + } + } + + @Override + public void removeListener(int eventType, Listener listener) { + super.removeListener(eventType, listener); + switch (eventType) { + case SWT.MouseDown: + case SWT.MouseUp: + case SWT.MouseMove: + for (Control child : getChildren()) { + child.removeListener(eventType, listener); + } + } + } +} Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/DeviceComposite.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/DeviceComposite.java (rev 0) +++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/DeviceComposite.java 2012-04-13 18:24:03 UTC (rev 40185) @@ -0,0 +1,44 @@ +package org.jboss.tools.vpe.browsersim.ui.skin; + +import org.eclipse.swt.custom.StyledText; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Listener; +import org.eclipse.swt.widgets.Menu; +import org.eclipse.swt.widgets.ProgressBar; +import org.eclipse.swt.widgets.Text; + +public interface DeviceComposite { + + public abstract ImageButtonComposite getBackButtonComposite(); + + public abstract ImageButtonComposite getForwardButtonComposite(); + + public abstract Composite getBrowserContainer(); + + public abstract void setNavBarCompositeVisible(boolean visible); + + public abstract boolean isNavBarCompositeVisible(); + + public abstract ImageButtonComposite getStopButtonComposite(); + + public abstract ImageButtonComposite getRefreshButtonComposite(); + + public abstract Text getUrlText(); + + public abstract ProgressBar getProgressBar(); + + public abstract StyledText getPageTitleStyledText(); + + public abstract void addListener(int eventType, Listener listener); + + public abstract void removeListener(int eventType, Listener listener); + + public abstract void setMenu(Menu menu); + + ImageButtonComposite getHomeButtonComposite(); + + public abstract Menu getMenu(); + + public abstract void dispose(); + +} Copied: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ImageButtonComposite.java (from rev 40140, trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/ImageButtonComposite.java) =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ImageButtonComposite.java (rev 0) +++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ImageButtonComposite.java 2012-04-13 18:24:03 UTC (rev 40185) @@ -0,0 +1,95 @@ +package org.jboss.tools.vpe.browsersim.ui.skin; +import org.eclipse.swt.SWT; +import org.eclipse.swt.events.MouseEvent; +import org.eclipse.swt.events.MouseTrackListener; +import org.eclipse.swt.graphics.Image; +import org.eclipse.swt.graphics.Rectangle; +import org.eclipse.swt.layout.FormData; +import org.eclipse.swt.widgets.Composite; +import org.jboss.tools.vpe.browsersim.ui.skin.ios.ButtonDescriptor; + + +public class ImageButtonComposite extends Composite { + + private MouseTrackListener mouseTrackListener; + private Image enabledImage; + private Image disabledImage; + private Image selectedImage; + protected boolean enabled; + + /** + * Create the composite. + * @param parent + * @param style + */ + public ImageButtonComposite(Composite parent, Image enabledImage, Image disabledImage, Image selectedImage) { + super(parent, SWT.NONE); + this.enabledImage = enabledImage; + this.disabledImage = disabledImage; + this.selectedImage = selectedImage; + setEnabled(true); + addMouseTrackListener(getMouseTrackListener()); + } + + public ImageButtonComposite(Composite parent, ImageList imageList, ButtonDescriptor buttonDescriptor) { + this( parent, imageList.getImage(buttonDescriptor.getEnabledImageName()), + imageList.getImage(buttonDescriptor.getDisabledImageName()), + imageList.getImage(buttonDescriptor.getSelectedImageName()) ); + + FormData formData = buttonDescriptor.getFormData(); + FormData actualFormData = new FormData(); + actualFormData.left = formData.left; + actualFormData.top = formData.top; + actualFormData.right = formData.right; + actualFormData.bottom = formData.bottom; + + Rectangle size = enabledImage.getBounds(); + actualFormData.width = size.width; + actualFormData.height = size.height; + + this.setLayoutData(actualFormData); + } + + public void setEnabled(boolean enabled) { + this.enabled = enabled; + if (enabled) { + setBackgroundImage(enabledImage); + } else { + setBackgroundImage(disabledImage); + } + } + + public boolean getEnabled() { + return enabled; + } + + @Override + protected void checkSubclass() { + // Disable the check that prevents subclassing of SWT components + } + + private MouseTrackListener getMouseTrackListener() { + if (mouseTrackListener == null) { + mouseTrackListener = new MouseTrackListener() { + @Override + public void mouseHover(MouseEvent e) { + } + + @Override + public void mouseExit(MouseEvent e) { + if (enabled) { + setBackgroundImage(enabledImage); + } + } + + @Override + public void mouseEnter(MouseEvent e) { + if (enabled) { + setBackgroundImage(selectedImage); + } + } + }; + } + return mouseTrackListener; + } +} Copied: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ImageDescriptor.java (from rev 40140, trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/ImageDescriptor.java) =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ImageDescriptor.java (rev 0) +++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ImageDescriptor.java 2012-04-13 18:24:03 UTC (rev 40185) @@ -0,0 +1,53 @@ +package org.jboss.tools.vpe.browsersim.ui.skin; + +import org.eclipse.swt.SWT; +import org.eclipse.swt.graphics.Image; +import org.eclipse.swt.graphics.Rectangle; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.widgets.Composite; + + +public class ImageDescriptor extends WidgetDescriptor { + protected String imageName; + + public ImageDescriptor(String imageName, int horizontalSpan, int verticalSpan, int stretching) { + super(horizontalSpan, verticalSpan, stretching); + this.imageName = imageName; + } + public ImageDescriptor(String imageName, int horizontalSpan, int verticalSpan) { + this(imageName, horizontalSpan, verticalSpan, SWT.NONE); + } + public ImageDescriptor(String imageName) { + this(imageName, 1, 1); + } + + public Composite createWidget(Composite parent, ImageList imageList) { + Composite composite = new Composite(parent, SWT.NONE); + boolean fillHorizontal = (getStretching() & SWT.HORIZONTAL) != 0; + boolean fillVertical = (getStretching() & SWT.VERTICAL) != 0; + GridData gridData = new GridData( + fillHorizontal ? SWT.FILL: SWT.CENTER, + fillVertical ? SWT.FILL: SWT.CENTER, + fillHorizontal, fillVertical, + getHorizontalSpan(), getVerticalSpan()); + + String imageName = getImageName(); + if (imageName != null) { + Image image = imageList.getImage(imageName); + composite.setBackgroundImage(image); + Rectangle bounds = image.getBounds(); + gridData.widthHint = fillHorizontal ? SWT.DEFAULT : bounds.width; + gridData.heightHint = fillVertical ? SWT.DEFAULT : bounds.height; + } else { + composite.setBackground(parent.getDisplay().getSystemColor(SWT.COLOR_WHITE)); + } + + composite.setLayoutData(gridData); + + return composite; + } + + public String getImageName() { + return imageName; + } +} Copied: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/WidgetDescriptor.java (from rev 40140, trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/WidgetDescriptor.java) =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/WidgetDescriptor.java (rev 0) +++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/WidgetDescriptor.java 2012-04-13 18:24:03 UTC (rev 40185) @@ -0,0 +1,31 @@ +package org.jboss.tools.vpe.browsersim.ui.skin; +import org.eclipse.swt.SWT; + +public class WidgetDescriptor { + protected int horizontalSpan; + protected int verticalSpan; + protected int stretching; + + public WidgetDescriptor(int horizontalSpan, int verticalSpan, int stretching) { + this.verticalSpan = verticalSpan; + this.horizontalSpan = horizontalSpan; + this.stretching = stretching; + } + + public WidgetDescriptor(int horizontalSpan, int verticalSpan) { + this(horizontalSpan, verticalSpan, SWT.NONE); + } + public WidgetDescriptor() { + this(1, 1); + } + + public int getHorizontalSpan() { + return horizontalSpan; + } + public int getVerticalSpan() { + return verticalSpan; + } + public int getStretching() { + return stretching; + } +} Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/android/AndroidComposite.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/android/AndroidComposite.java (rev 0) +++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/android/AndroidComposite.java 2012-04-13 18:24:03 UTC (rev 40185) @@ -0,0 +1,256 @@ +package org.jboss.tools.vpe.browsersim.ui.skin.android; + +import org.eclipse.swt.SWT; +import org.eclipse.swt.custom.StyledText; +import org.eclipse.swt.events.MouseAdapter; +import org.eclipse.swt.events.MouseEvent; +import org.eclipse.swt.layout.FormAttachment; +import org.eclipse.swt.layout.FormData; +import org.eclipse.swt.layout.FormLayout; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Listener; +import org.eclipse.swt.widgets.Menu; +import org.eclipse.swt.widgets.ProgressBar; +import org.eclipse.swt.widgets.Text; +import org.jboss.tools.vpe.browsersim.ui.skin.ImageButtonComposite; +import org.jboss.tools.vpe.browsersim.ui.skin.ImageDescriptor; +import org.jboss.tools.vpe.browsersim.ui.skin.ImageList; +import org.jboss.tools.vpe.browsersim.ui.skin.DeviceComposite; + +public class AndroidComposite extends Composite implements DeviceComposite { + private ImageList imageList; + private Composite androidOsCompositeContainer; + +// ImageDescriptor I_OS_DESCRIPTOR = new ImageDescriptor(null, 5, 3, SWT.VERTICAL | SWT.HORIZONTAL); +// ImageDescriptor[] BODY_DESCRIPTOR = { +// new ImageDescriptor("01.png"), new ImageDescriptor("02.png"), new ImageDescriptor("03.png", 1, 1, SWT.HORIZONTAL), new ImageDescriptor("04.png"), new ImageDescriptor("05.png", 1, 1, SWT.HORIZONTAL), new ImageDescriptor("06.png"), new ImageDescriptor("07.png"), +// new ImageDescriptor("08.png"), I_OS_DESCRIPTOR, new ImageDescriptor("14.png"), +// new ImageDescriptor("21.png", 1, 1, SWT.VERTICAL), new ImageDescriptor("22.png", 1, 1, SWT.VERTICAL), +// new ImageDescriptor("23.png"), new ImageDescriptor("24.png"), +// new ImageDescriptor("25.png"), new ImageDescriptor("26.png"), new ImageDescriptor("27.png", 1, 1, SWT.HORIZONTAL), new ImageDescriptor("28.png"), new ImageDescriptor("29.png", 1, 1, SWT.HORIZONTAL), new ImageDescriptor("30.png"), new ImageDescriptor("31.png"), +// }; + + private Composite browserContainer; + private AndroidNavBarComposite navBarComposite; + private ImageButtonComposite forwardButtonComposite; + private ImageButtonComposite backButtonComposite; + private ImageButtonComposite homeButtonComposite; + private ImageButtonComposite refreshButtonComposite; + + private Composite bodyComposite; + + /** + * Create the composite. + * @param parent + * @param skinDescriptor + * @param style + */ + public AndroidComposite(Composite parent, AndroidSkinDescriptor skinDescriptor) { + super(parent, SWT.NONE); + + imageList = new ImageList(this); + setLayout(new FormLayout()); + + backButtonComposite = new ImageButtonComposite(this, imageList, skinDescriptor.getBackButton()); + forwardButtonComposite = new ImageButtonComposite(this, imageList, skinDescriptor.getForwardButton()); + refreshButtonComposite = new ImageButtonComposite(this, imageList, skinDescriptor.getRefreshButton()); + homeButtonComposite = new ImageButtonComposite(this, imageList, skinDescriptor.getHomeButton()); + + bodyComposite = new Composite(this, SWT.NONE); + FormData formData = new FormData(); + formData.left = new FormAttachment(0); + formData.top = new FormAttachment(0); + formData.right = new FormAttachment(100); + formData.bottom = new FormAttachment(100); + bodyComposite.setLayoutData(formData); + + GridLayout gridLayout = new GridLayout(skinDescriptor.getBodyGridSize(), false); + gridLayout.verticalSpacing = 0; + gridLayout.horizontalSpacing = 0; + gridLayout.marginWidth = 0; + gridLayout.marginHeight = 0; + bodyComposite.setLayout(gridLayout); + + for (ImageDescriptor descriptor : skinDescriptor.getBodyGridImageDescriptors()) { + Composite composite = descriptor.createWidget(bodyComposite, imageList); + if (descriptor == skinDescriptor.getAndroidOSDescriptor()) { + androidOsCompositeContainer = composite; + } + } + + gridLayout = new GridLayout(1, false); + gridLayout.verticalSpacing = 0; + gridLayout.horizontalSpacing = 0; + gridLayout.marginWidth = 0; + gridLayout.marginHeight = 0; + androidOsCompositeContainer.setLayout(gridLayout); + AndroidTimeComposite timeComposite = new AndroidTimeComposite(androidOsCompositeContainer, imageList); + GridData gridData = new GridData(SWT.FILL, SWT.BEGINNING, true, false, 1, 1); + timeComposite.setLayoutData(gridData); + + navBarComposite = new AndroidNavBarComposite(androidOsCompositeContainer, imageList); + gridData = new GridData(SWT.FILL, SWT.BEGINNING, true, false, 1, 1); + navBarComposite.setLayoutData(gridData); + + browserContainer = new Composite(androidOsCompositeContainer, SWT.NONE); + gridData = new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1); + browserContainer.setLayoutData(gridData); + + timeComposite.addMouseListener(new MouseAdapter() { + public void mouseDown(MouseEvent e) { + if (e.button == 1) { + setNavBarCompositeVisible(!isNavBarCompositeVisible()); + } + } + }); + } + + /* (non-Javadoc) + * @see org.jboss.tools.vpe.browsersim.ui.skin.ios.PhoneComposite#getBackButtonComposite() + */ + @Override + public ImageButtonComposite getBackButtonComposite() { + return backButtonComposite; + } + + /* (non-Javadoc) + * @see org.jboss.tools.vpe.browsersim.ui.skin.ios.PhoneComposite#getForwardButtonComposite() + */ + @Override + public ImageButtonComposite getForwardButtonComposite() { + return forwardButtonComposite; + } + + /* (non-Javadoc) + * @see org.jboss.tools.vpe.browsersim.ui.skin.ios.PhoneComposite#getBrowserContainer() + */ + @Override + public Composite getBrowserContainer() { + return browserContainer; + } + + @Override + protected void checkSubclass() { + // Disable the check that prevents subclassing of SWT components + } + + /* (non-Javadoc) + * @see org.jboss.tools.vpe.browsersim.ui.skin.ios.PhoneComposite#setNavBarCompositeVisible(boolean) + */ + @Override + public void setNavBarCompositeVisible(boolean visible) { + GridData gridData = (GridData) navBarComposite.getLayoutData(); + if (visible) { + gridData.heightHint = SWT.DEFAULT; + } else { + gridData.heightHint = 0; + } + androidOsCompositeContainer.layout(); + } + + /* (non-Javadoc) + * @see org.jboss.tools.vpe.browsersim.ui.skin.ios.PhoneComposite#isNavBarCompositeVisible() + */ + @Override + public boolean isNavBarCompositeVisible() { + GridData gridData = (GridData) navBarComposite.getLayoutData(); + return gridData.heightHint != 0; + } + + /* (non-Javadoc) + * @see org.jboss.tools.vpe.browsersim.ui.skin.ios.PhoneComposite#getStopButtonComposite() + */ + @Override + public ImageButtonComposite getStopButtonComposite() { + return navBarComposite.getStopButtonComposite(); + } + + /* (non-Javadoc) + * @see org.jboss.tools.vpe.browsersim.ui.skin.ios.PhoneComposite#getRefreshButtonComposite() + */ + @Override + public ImageButtonComposite getRefreshButtonComposite() { + return refreshButtonComposite; + } + + /* (non-Javadoc) + * @see org.jboss.tools.vpe.browsersim.ui.skin.ios.PhoneComposite#getRefreshButtonComposite() + */ + @Override + public ImageButtonComposite getHomeButtonComposite() { + return homeButtonComposite; + } + + /* (non-Javadoc) + * @see org.jboss.tools.vpe.browsersim.ui.skin.ios.PhoneComposite#getUrlText() + */ + @Override + public Text getUrlText() { + return navBarComposite.getUrlText(); + } + + /* (non-Javadoc) + * @see org.jboss.tools.vpe.browsersim.ui.skin.ios.PhoneComposite#getProgressBar() + */ + @Override + public ProgressBar getProgressBar() { + return navBarComposite.getProgressBar(); + } + + /* (non-Javadoc) + * @see org.jboss.tools.vpe.browsersim.ui.skin.ios.PhoneComposite#getPageTitleStyledText() + */ + @Override + public StyledText getPageTitleStyledText() { + return null; + } + + /* (non-Javadoc) + * @see org.jboss.tools.vpe.browsersim.ui.skin.ios.PhoneComposite#addListener(int, org.eclipse.swt.widgets.Listener) + */ + @Override + public void addListener(int eventType, Listener listener) { + super.addListener(eventType, listener); + switch (eventType) { + case SWT.MouseDown: + case SWT.MouseUp: + case SWT.MouseMove: + bodyComposite.addListener(eventType, listener); + for (Control child : bodyComposite.getChildren()) { + child.addListener(eventType, listener); + } + } + } + + /* (non-Javadoc) + * @see org.jboss.tools.vpe.browsersim.ui.skin.ios.PhoneComposite#removeListener(int, org.eclipse.swt.widgets.Listener) + */ + @Override + public void removeListener(int eventType, Listener listener) { + super.removeListener(eventType, listener); + switch (eventType) { + case SWT.MouseDown: + case SWT.MouseUp: + case SWT.MouseMove: + bodyComposite.removeListener(eventType, listener); + for (Control child :bodyComposite.getChildren()) { + child.removeListener(eventType, listener); + } + } + } + + /* (non-Javadoc) + * @see org.jboss.tools.vpe.browsersim.ui.skin.ios.PhoneComposite#setMenu(org.eclipse.swt.widgets.Menu) + */ + @Override + public void setMenu(Menu menu) { + super.setMenu(menu); + bodyComposite.setMenu(menu); + for (Control child :bodyComposite.getChildren()) { + child.setMenu(menu); + } + } +} Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/android/AndroidNavBarComposite.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/android/AndroidNavBarComposite.java (rev 0) +++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/android/AndroidNavBarComposite.java 2012-04-13 18:24:03 UTC (rev 40185) @@ -0,0 +1,99 @@ +package org.jboss.tools.vpe.browsersim.ui.skin.android; + +import org.eclipse.swt.SWT; +import org.eclipse.swt.graphics.Rectangle; +import org.eclipse.swt.layout.FormAttachment; +import org.eclipse.swt.layout.FormData; +import org.eclipse.swt.layout.FormLayout; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.ProgressBar; +import org.eclipse.swt.widgets.Text; +import org.jboss.tools.vpe.browsersim.ui.skin.ImageButtonComposite; +import org.jboss.tools.vpe.browsersim.ui.skin.ImageDescriptor; +import org.jboss.tools.vpe.browsersim.ui.skin.ImageList; + +public class AndroidNavBarComposite extends Composite { + private final String BD = "android/"; + private final ImageDescriptor[] BODY_DESCRIPTOR = { + new ImageDescriptor(BD + "nav-1.png"), new ImageDescriptor(BD + "nav-2.png", 1, 1, SWT.HORIZONTAL), new ImageDescriptor(BD + "nav-3.png") + }; + private ImageButtonComposite stopButtonComposite; + private Text urlText; + private ProgressBar progressBar; + + /** + * Create the composite. + * @param parent + * @param style + */ + public AndroidNavBarComposite(Composite parent, ImageList imageList) { + super(parent, SWT.NONE); + + this.setLayout(new FormLayout()); + + urlText = new Text(this, SWT.SINGLE); + + FormData formData = new FormData(); + formData.left = new FormAttachment(0, 17); + formData.right = new FormAttachment(100, -55); + formData.top = new FormAttachment(0, 22); + formData.bottom = new FormAttachment(100, -20); + urlText.setLayoutData(formData); + + stopButtonComposite = new ImageButtonComposite(this, imageList.getImage(BD + "stop.png"), imageList.getImage(BD + "stop.png"), imageList.getImage(BD + "stop-selected.png")); + formData = new FormData(); + Rectangle stopImageBounds = imageList.getImage(BD + "stop.png").getBounds(); + formData.right = new FormAttachment(100, -12); + formData.bottom = new FormAttachment(100, -11); + formData.width = stopImageBounds.width; + formData.height = stopImageBounds.height; + stopButtonComposite.setLayoutData(formData); + + progressBar = new ProgressBar(this, SWT.NONE); + progressBar.setVisible(false); + formData = new FormData(); + formData.left = new FormAttachment(0, 10); + formData.right = new FormAttachment(100, -10); + formData.top = new FormAttachment(0, 2); + formData.height = 5; + progressBar.setLayoutData(formData); + + Composite imagesComposite = new Composite(this, SWT.NONE); + formData = new FormData(); + formData.left = new FormAttachment(0); + formData.right = new FormAttachment(100); + formData.top = new FormAttachment(0); + formData.bottom = new FormAttachment(100); + imagesComposite.setLayoutData(formData); + + GridLayout gridLayout = new GridLayout(5, false); + gridLayout.verticalSpacing = 0; + gridLayout.horizontalSpacing = 0; + gridLayout.marginWidth = 0; + gridLayout.marginHeight = 0; + + imagesComposite.setLayout(gridLayout); + + for (ImageDescriptor descriptor : BODY_DESCRIPTOR) { + descriptor.createWidget(imagesComposite, imageList); + } + } + + @Override + protected void checkSubclass() { + // Disable the check that prevents subclassing of SWT components + } + + public ImageButtonComposite getStopButtonComposite() { + return stopButtonComposite; + } + + public Text getUrlText() { + return urlText; + } + + public ProgressBar getProgressBar() { + return progressBar; + } +} Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/android/AndroidResizableSkin.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/android/AndroidResizableSkin.java 2012-04-13 16:32:33 UTC (rev 40184) +++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/android/AndroidResizableSkin.java 2012-04-13 18:24:03 UTC (rev 40185) @@ -4,10 +4,12 @@ import org.eclipse.swt.graphics.Point; import org.eclipse.swt.layout.FormAttachment; import org.eclipse.swt.layout.FormData; +import org.eclipse.swt.widgets.Composite; +import org.jboss.tools.vpe.browsersim.ui.skin.DeviceComposite; +import org.jboss.tools.vpe.browsersim.ui.skin.ImageDescriptor; import org.jboss.tools.vpe.browsersim.ui.skin.ios.AppleIPhone3ResizableSkin; import org.jboss.tools.vpe.browsersim.ui.skin.ios.ButtonDescriptor; import org.jboss.tools.vpe.browsersim.ui.skin.ios.IPhoneSkinDescriptor; -import org.jboss.tools.vpe.browsersim.ui.skin.ios.ImageDescriptor; public class AndroidResizableSkin extends AppleIPhone3ResizableSkin { private static final Point NORMAL_SKREEN_SIZE = new Point(240, 1); @@ -22,7 +24,7 @@ 1, 23, 1}; private static final Point VERTICAL_BORDERS_SIZE = new Point(NORMAL_SKIN_SIZE.x - NORMAL_SKREEN_SIZE.x, NORMAL_SKIN_SIZE.y - NORMAL_SKREEN_SIZE.y); private static final Point HORIZONTAL_BORDERS_SIZE = new Point(VERTICAL_BORDERS_SIZE.y, VERTICAL_BORDERS_SIZE.x); - private static final IPhoneSkinDescriptor VERTICAL_DESCRIPTOR; + private static final AndroidSkinDescriptor VERTICAL_DESCRIPTOR; static { String bd = "android/droid/vertical/"; ImageDescriptor iOsDescriptor = new ImageDescriptor(null, 3, 1, SWT.VERTICAL | SWT.HORIZONTAL); @@ -33,23 +35,38 @@ }; int bodyGridSize = 5; - String bd2 = "ios/"; + String bd2 = "android/"; ButtonDescriptor backButtonDescriptor; { FormData formData = new FormData(); - formData.left = new FormAttachment(0, 52); - formData.bottom = new FormAttachment(100, -132); - backButtonDescriptor = new ButtonDescriptor(formData, bd2 + "back.png", bd2 + "back-disabled.png", bd2 + "back-selected.png"); + formData.left = new FormAttachment(0, 61); + formData.bottom = new FormAttachment(100, -41); + backButtonDescriptor = new ButtonDescriptor(formData, bd2 + "back.png", bd2 + "back.png", bd2 + "back-selected.png");//XXX } ButtonDescriptor forwardButtonDescriptor; { FormData formData = new FormData(); - formData.left = new FormAttachment(0, 115); - formData.bottom = new FormAttachment(100, -132); - forwardButtonDescriptor = new ButtonDescriptor(formData, bd2 + "forward.png", bd2 + "forward-disabled.png", bd2 + "forward-selected.png"); + formData.left = new FormAttachment(33, 12); + formData.bottom = new FormAttachment(100, -41); + forwardButtonDescriptor = new ButtonDescriptor(formData, bd2 + "forward.png", bd2 + "forward.png", bd2 + "forward-selected.png");//XXX } - VERTICAL_DESCRIPTOR = new IPhoneSkinDescriptor(bodyGridSize, bodyGridImageDescriptors, iOsDescriptor, backButtonDescriptor, forwardButtonDescriptor); + ButtonDescriptor homeButtonDescriptor; + { + FormData formData = new FormData(); + formData.left = new FormAttachment(67, -45); + formData.bottom = new FormAttachment(100, -41); + homeButtonDescriptor = new ButtonDescriptor(formData, bd2 + "home.png", bd2 + "home.png", bd2 + "home-selected.png");//XXX + } + ButtonDescriptor refreshButtonDescriptor; + { + FormData formData = new FormData(); + formData.left = new FormAttachment(100, -61 - 28); + formData.bottom = new FormAttachment(100, -41); + refreshButtonDescriptor = new ButtonDescriptor(formData, bd2 + "refresh.png", bd2 + "refresh.png", bd2 + "refresh-selected.png");//XXX + } + VERTICAL_DESCRIPTOR = new AndroidSkinDescriptor(bodyGridSize, bodyGridImageDescriptors, iOsDescriptor, + backButtonDescriptor, forwardButtonDescriptor, homeButtonDescriptor, refreshButtonDescriptor); } private static final IPhoneSkinDescriptor HORIZONTAL_IPHONE3_DESCRIPTOR; static { @@ -91,14 +108,14 @@ } @Override - protected IPhoneSkinDescriptor getSkinDescriptor(boolean vertical) { - IPhoneSkinDescriptor skinDescriptor; + protected DeviceComposite createDeviceComposite(Composite parent, boolean vertical) { + AndroidSkinDescriptor skinDescriptor; if (vertical) { skinDescriptor = VERTICAL_DESCRIPTOR; } else { skinDescriptor = VERTICAL_DESCRIPTOR; } - return skinDescriptor; + return new AndroidComposite(parent, skinDescriptor); } @Override Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/android/AndroidSkinDescriptor.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/android/AndroidSkinDescriptor.java (rev 0) +++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/android/AndroidSkinDescriptor.java 2012-04-13 18:24:03 UTC (rev 40185) @@ -0,0 +1,55 @@ +package org.jboss.tools.vpe.browsersim.ui.skin.android; + +import org.jboss.tools.vpe.browsersim.ui.skin.ImageDescriptor; +import org.jboss.tools.vpe.browsersim.ui.skin.ios.ButtonDescriptor; + +public class AndroidSkinDescriptor { + private int bodyGridSize; + private ImageDescriptor[] bodyGridImageDescriptors; + private ImageDescriptor iOSDescriptor; + private ButtonDescriptor backButton; + private ButtonDescriptor forwardButton; + private ButtonDescriptor homeButton; + private ButtonDescriptor refreshButton; + + public AndroidSkinDescriptor(int bodyGridSize, + ImageDescriptor[] bodyGridImageDescriptors, + ImageDescriptor iOSDescriptor, ButtonDescriptor backButton, + ButtonDescriptor forwardButton, ButtonDescriptor homeButton, + ButtonDescriptor refreshButton) { + this.bodyGridSize = bodyGridSize; + this.bodyGridImageDescriptors = bodyGridImageDescriptors; + this.iOSDescriptor = iOSDescriptor; + this.backButton = backButton; + this.forwardButton = forwardButton; + this.homeButton = homeButton; + this.refreshButton = refreshButton; + } + + public int getBodyGridSize() { + return bodyGridSize; + } + + public ImageDescriptor[] getBodyGridImageDescriptors() { + return bodyGridImageDescriptors; + } + + public ImageDescriptor getAndroidOSDescriptor() { + return iOSDescriptor; + } + + public ButtonDescriptor getBackButton() { + return backButton; + } + + public ButtonDescriptor getForwardButton() { + return forwardButton; + } + public ButtonDescriptor getHomeButton() { + return homeButton; + } + + public ButtonDescriptor getRefreshButton() { + return refreshButton; + } +} Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/android/AndroidTimeComposite.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/android/AndroidTimeComposite.java (rev 0) +++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/android/AndroidTimeComposite.java 2012-04-13 18:24:03 UTC (rev 40185) @@ -0,0 +1,22 @@ +package org.jboss.tools.vpe.browsersim.ui.skin.android; + +import org.eclipse.swt.SWT; +import org.eclipse.swt.widgets.Composite; +import org.jboss.tools.vpe.browsersim.ui.skin.AbstractTimeComposite; +import org.jboss.tools.vpe.browsersim.ui.skin.ImageDescriptor; +import org.jboss.tools.vpe.browsersim.ui.skin.ImageList; + +public class AndroidTimeComposite extends AbstractTimeComposite { + private static final String BD = "android/"; + private static final ImageDescriptor[] BODY_DESCRIPTOR = { + new ImageDescriptor(BD + "time-1.png"), new ImageDescriptor(BD + "time-2.png", 1, 1, SWT.HORIZONTAL), new ImageDescriptor(BD + "time-3.png") + }; + + public AndroidTimeComposite(Composite parent, ImageList imageList) { + super(parent, imageList); + } + + protected ImageDescriptor[] getBodyDescriptor() { + return BODY_DESCRIPTOR; + } +} Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/AppleIPhone3ResizableSkin.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/AppleIPhone3ResizableSkin.java 2012-04-13 16:32:33 UTC (rev 40184) +++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/AppleIPhone3ResizableSkin.java 2012-04-13 18:24:03 UTC (rev 40185) @@ -24,6 +24,8 @@ import org.jboss.tools.vpe.browsersim.ui.ControlHandler; import org.jboss.tools.vpe.browsersim.ui.skin.AppleIPhone3Skin; import org.jboss.tools.vpe.browsersim.ui.skin.BrowserSimSkin; +import org.jboss.tools.vpe.browsersim.ui.skin.DeviceComposite; +import org.jboss.tools.vpe.browsersim.ui.skin.ImageDescriptor; public class AppleIPhone3ResizableSkin implements BrowserSimSkin { private static final Point NORMAL_SKREEN_SIZE = new Point(320, 480); @@ -100,7 +102,7 @@ private Shell shell; private BrowserSimBrowser browser; private ControlHandler controlHandler; - private AppleIPhoneComposite iPhoneComposite; + private DeviceComposite deviceComposite; @Override public void setBrowserFactory(IBrowserSimBrowserFactory browserFactory) { @@ -113,10 +115,10 @@ shell = new Shell(display, SWT.NO_TRIM | SWT.NO_BACKGROUND); shell.setLayout(new FillLayout()); - iPhoneComposite = new AppleIPhoneComposite(shell, VERTICAL_IPHONE3_DESCRIPTOR); + deviceComposite = new AppleIPhoneComposite(shell, VERTICAL_IPHONE3_DESCRIPTOR); vertical = true; bindIPhoneCompositeControls(); - Composite browserContainer = iPhoneComposite.getBrowserContainer(); + Composite browserContainer = deviceComposite.getBrowserContainer(); browserContainer.setLayout(new FillLayout()); browser = browserFactory.createBrowser(browserContainer, SWT.NONE); @@ -185,35 +187,35 @@ } private void bindIPhoneCompositeControls() { - iPhoneComposite.getBackButtonComposite().addMouseListener(new MouseAdapter() { + deviceComposite.getBackButtonComposite().addMouseListener(new MouseAdapter() { public void mouseDown(MouseEvent e) { if (e.button == 1) { controlHandler.goBack(); } } }); - iPhoneComposite.getForwardButtonComposite().addMouseListener(new MouseAdapter() { + deviceComposite.getForwardButtonComposite().addMouseListener(new MouseAdapter() { public void mouseDown(MouseEvent e) { if (e.button == 1) { controlHandler.goForward(); } } }); - iPhoneComposite.getStopButtonComposite().addMouseListener(new MouseAdapter() { + deviceComposite.getStopButtonComposite().addMouseListener(new MouseAdapter() { public void mouseDown(MouseEvent e) { if (e.button == 1) { controlHandler.stop(); } } }); - iPhoneComposite.getRefreshButtonComposite().addMouseListener(new MouseAdapter() { + deviceComposite.getRefreshButtonComposite().addMouseListener(new MouseAdapter() { public void mouseDown(MouseEvent e) { if (e.button == 1) { controlHandler.refresh(); } } }); - iPhoneComposite.getUrlText().addListener(SWT.DefaultSelection, new Listener() { + deviceComposite.getUrlText().addListener(SWT.DefaultSelection, new Listener() { public void handleEvent(Event e) { controlHandler.goToAddress(((Text)e.widget).getText()); } @@ -244,9 +246,9 @@ } } }; - iPhoneComposite.addListener(SWT.MouseDown, l); - iPhoneComposite.addListener(SWT.MouseUp, l); - iPhoneComposite.addListener(SWT.MouseMove, l); + deviceComposite.addListener(SWT.MouseDown, l); + deviceComposite.addListener(SWT.MouseUp, l); + deviceComposite.addListener(SWT.MouseMove, l); } @Override @@ -272,20 +274,22 @@ @Override public void locationChanged(String newLocation, boolean backEnabled, boolean forwardEnabled) { - iPhoneComposite.getUrlText().setText(newLocation); - iPhoneComposite.getBackButtonComposite().setEnabled(backEnabled); - iPhoneComposite.getForwardButtonComposite().setEnabled(forwardEnabled); + deviceComposite.getUrlText().setText(newLocation); + deviceComposite.getBackButtonComposite().setEnabled(backEnabled); + deviceComposite.getForwardButtonComposite().setEnabled(forwardEnabled); } @Override public void pageTitleChanged(String newTitle) { - iPhoneComposite.getPageTitleStyledText().setText(newTitle); + if (deviceComposite.getPageTitleStyledText() != null) { + deviceComposite.getPageTitleStyledText().setText(newTitle); + } } @Override public void progressChanged(int percents) { - ProgressBar progressBar = iPhoneComposite.getProgressBar(); + ProgressBar progressBar = deviceComposite.getProgressBar(); if (percents > 0) { progressBar.setVisible(true); progressBar.setSelection(percents); @@ -303,22 +307,21 @@ @Override public void setOrientationAndSize(Point maximumShellSize, int orientation, Point browserSize) { vertical = (orientation == DeviceOrientation.PORTRAIT || orientation == DeviceOrientation.PORTRAIT_INVERTED); - String urlTextText = iPhoneComposite.getUrlText().getText(); - String pageTitle = iPhoneComposite.getPageTitleStyledText().getText(); - boolean backEnabled = iPhoneComposite.getBackButtonComposite().getEnabled(); - boolean forwardEnabled = iPhoneComposite.getForwardButtonComposite().getEnabled(); - boolean navBarVisible = iPhoneComposite.isNavBarCompositeVisible(); - Menu contextMenu = iPhoneComposite.getMenu(); - iPhoneComposite.setMenu(null); + String urlTextText = deviceComposite.getUrlText().getText(); + String pageTitle = deviceComposite.getPageTitleStyledText() != null ? deviceComposite.getPageTitleStyledText().getText() : ""; + boolean backEnabled = deviceComposite.getBackButtonComposite().getEnabled(); + boolean forwardEnabled = deviceComposite.getForwardButtonComposite().getEnabled(); + boolean navBarVisible = deviceComposite.isNavBarCompositeVisible(); + Menu contextMenu = deviceComposite.getMenu(); + deviceComposite.setMenu(null); - AppleIPhoneComposite oldIPhoneComposite = iPhoneComposite; - IPhoneSkinDescriptor skinDescriptor = getSkinDescriptor(vertical); - iPhoneComposite = new AppleIPhoneComposite(shell, skinDescriptor); + DeviceComposite oldDeviceComposite = deviceComposite; + deviceComposite = createDeviceComposite(shell, vertical); bindIPhoneCompositeControls(); - Composite browserContainer = iPhoneComposite.getBrowserContainer(); + Composite browserContainer = deviceComposite.getBrowserContainer(); browserContainer.setLayout(new FillLayout()); browser.setParent(browserContainer); - oldIPhoneComposite.dispose(); + oldDeviceComposite.dispose(); Point bordersSize = getBordersSize(vertical); int shellWidth; if (browserSize.x == SWT.DEFAULT) { @@ -337,12 +340,14 @@ shell.layout(true); setShellRegion(); - iPhoneComposite.getUrlText().setText(urlTextText); - iPhoneComposite.getPageTitleStyledText().setText(pageTitle); - iPhoneComposite.getBackButtonComposite().setEnabled(backEnabled); - iPhoneComposite.getForwardButtonComposite().setEnabled(forwardEnabled); - iPhoneComposite.setNavBarCompositeVisible(navBarVisible); - iPhoneComposite.setMenu(contextMenu); + deviceComposite.getUrlText().setText(urlTextText); + if (deviceComposite.getPageTitleStyledText() != null) { + deviceComposite.getPageTitleStyledText().setText(pageTitle); + } + deviceComposite.getBackButtonComposite().setEnabled(backEnabled); + deviceComposite.getForwardButtonComposite().setEnabled(forwardEnabled); + deviceComposite.setNavBarCompositeVisible(navBarVisible); + deviceComposite.setMenu(contextMenu); } protected Point getBordersSize(boolean vertical) { @@ -350,14 +355,15 @@ return bordersSize; } - protected IPhoneSkinDescriptor getSkinDescriptor(boolean vertical) { + protected DeviceComposite createDeviceComposite(Composite parent, boolean vertical) { IPhoneSkinDescriptor skinDescriptor; if (vertical) { skinDescriptor = VERTICAL_IPHONE3_DESCRIPTOR; } else { skinDescriptor = HORIZONTAL_IPHONE3_DESCRIPTOR; } - return skinDescriptor; + + return new AppleIPhoneComposite(parent, skinDescriptor); } protected int[] getNormalRegion(boolean vertical) { @@ -372,11 +378,11 @@ @Override public void setAddressBarVisible(boolean visible) { - iPhoneComposite.setNavBarCompositeVisible(visible); + deviceComposite.setNavBarCompositeVisible(visible); } @Override public void setContextMenu(Menu contextMenu) { - iPhoneComposite.setMenu(contextMenu); + deviceComposite.setMenu(contextMenu); } } Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/AppleIPhoneComposite.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/AppleIPhoneComposite.java 2012-04-13 16:32:33 UTC (rev 40184) +++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/AppleIPhoneComposite.java 2012-04-13 18:24:03 UTC (rev 40185) @@ -14,10 +14,13 @@ import org.eclipse.swt.widgets.Menu; import org.eclipse.swt.widgets.ProgressBar; import org.eclipse.swt.widgets.Text; +import org.jboss.tools.vpe.browsersim.ui.skin.ImageButtonComposite; +import org.jboss.tools.vpe.browsersim.ui.skin.ImageDescriptor; import org.jboss.tools.vpe.browsersim.ui.skin.ImageList; +import org.jboss.tools.vpe.browsersim.ui.skin.DeviceComposite; -public class AppleIPhoneComposite extends Composite { +public class AppleIPhoneComposite extends Composite implements DeviceComposite { private ImageList imageList; private Composite iOsCompositeContainer; @@ -101,14 +104,26 @@ }); } + /* (non-Javadoc) + * @see org.jboss.tools.vpe.browsersim.ui.skin.ios.PhoneComposite#getBackButtonComposite() + */ + @Override public ImageButtonComposite getBackButtonComposite() { return backButtonComposite; } + /* (non-Javadoc) + * @see org.jboss.tools.vpe.browsersim.ui.skin.ios.PhoneComposite#getForwardButtonComposite() + */ + @Override public ImageButtonComposite getForwardButtonComposite() { return forwardButtonComposite; } + /* (non-Javadoc) + * @see org.jboss.tools.vpe.browsersim.ui.skin.ios.PhoneComposite#getBrowserContainer() + */ + @Override public Composite getBrowserContainer() { return browserContainer; } @@ -118,6 +133,10 @@ // Disable the check that prevents subclassing of SWT components } + /* (non-Javadoc) + * @see org.jboss.tools.vpe.browsersim.ui.skin.ios.PhoneComposite#setNavBarCompositeVisible(boolean) + */ + @Override public void setNavBarCompositeVisible(boolean visible) { GridData gridData = (GridData) navBarComposite.getLayoutData(); if (visible) { @@ -128,31 +147,58 @@ iOsCompositeContainer.layout(); } + /* (non-Javadoc) + * @see org.jboss.tools.vpe.browsersim.ui.skin.ios.PhoneComposite#isNavBarCompositeVisible() + */ + @Override public boolean isNavBarCompositeVisible() { GridData gridData = (GridData) navBarComposite.getLayoutData(); return gridData.heightHint != 0; } + /* (non-Javadoc) + * @see org.jboss.tools.vpe.browsersim.ui.skin.ios.PhoneComposite#getStopButtonComposite() + */ + @Override public ImageButtonComposite getStopButtonComposite() { return navBarComposite.getStopButtonComposite(); } + /* (non-Javadoc) + * @see org.jboss.tools.vpe.browsersim.ui.skin.ios.PhoneComposite#getRefreshButtonComposite() + */ + @Override public ImageButtonComposite getRefreshButtonComposite() { return navBarComposite.getRefreshButtonComposite(); } + /* (non-Javadoc) + * @see org.jboss.tools.vpe.browsersim.ui.skin.ios.PhoneComposite#getUrlText() + */ + @Override public Text getUrlText() { return navBarComposite.getUrlText(); } + /* (non-Javadoc) + * @see org.jboss.tools.vpe.browsersim.ui.skin.ios.PhoneComposite#getProgressBar() + */ + @Override public ProgressBar getProgressBar() { return navBarComposite.getProgressBar(); } + /* (non-Javadoc) + * @see org.jboss.tools.vpe.browsersim.ui.skin.ios.PhoneComposite#getPageTitleStyledText() + */ + @Override public StyledText getPageTitleStyledText() { return navBarComposite.getPageTitleStyledText(); } + /* (non-Javadoc) + * @see org.jboss.tools.vpe.browsersim.ui.skin.ios.PhoneComposite#addListener(int, org.eclipse.swt.widgets.Listener) + */ @Override public void addListener(int eventType, Listener listener) { super.addListener(eventType, listener); @@ -167,6 +213,9 @@ } } + /* (non-Javadoc) + * @see org.jboss.tools.vpe.browsersim.ui.skin.ios.PhoneComposite#removeListener(int, org.eclipse.swt.widgets.Listener) + */ @Override public void removeListener(int eventType, Listener listener) { super.removeListener(eventType, listener); @@ -181,6 +230,9 @@ } } + /* (non-Javadoc) + * @see org.jboss.tools.vpe.browsersim.ui.skin.ios.PhoneComposite#setMenu(org.eclipse.swt.widgets.Menu) + */ @Override public void setMenu(Menu menu) { super.setMenu(menu); @@ -189,4 +241,9 @@ child.setMenu(menu); } } + + @Override + public ImageButtonComposite getHomeButtonComposite() { + return null; + } } Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/IOSNavBarComposite.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/IOSNavBarComposite.java 2012-04-13 16:32:33 UTC (rev 40184) +++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/IOSNavBarComposite.java 2012-04-13 18:24:03 UTC (rev 40185) @@ -9,6 +9,8 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.ProgressBar; import org.eclipse.swt.widgets.Text; +import org.jboss.tools.vpe.browsersim.ui.skin.ImageButtonComposite; +import org.jboss.tools.vpe.browsersim.ui.skin.ImageDescriptor; import org.jboss.tools.vpe.browsersim.ui.skin.ImageList; Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/IOsTimeComposite.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/IOsTimeComposite.java 2012-04-13 16:32:33 UTC (rev 40184) +++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/IOsTimeComposite.java 2012-04-13 18:24:03 UTC (rev 40185) @@ -1,65 +1,23 @@ package org.jboss.tools.vpe.browsersim.ui.skin.ios; import org.eclipse.swt.SWT; -import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Listener; +import org.jboss.tools.vpe.browsersim.ui.skin.AbstractTimeComposite; +import org.jboss.tools.vpe.browsersim.ui.skin.ImageDescriptor; import org.jboss.tools.vpe.browsersim.ui.skin.ImageList; -public class IOsTimeComposite extends Composite { - private final String BD = "ios/"; - private final ImageDescriptor[] BODY_DESCRIPTOR = { +public class IOsTimeComposite extends AbstractTimeComposite { + private static final String BD = "ios/"; + private static final ImageDescriptor[] BODY_DESCRIPTOR = { new ImageDescriptor(BD + "time-1.png"), new ImageDescriptor(BD + "time-2.png", 1, 1, SWT.HORIZONTAL), new ImageDescriptor(BD + "time-3.png"), new ImageDescriptor(BD + "time-4.png", 1, 1, SWT.HORIZONTAL), new ImageDescriptor(BD + "time-5.png") }; - - /** - * Create the composite. - * @param parent - * @param style - */ + public IOsTimeComposite(Composite parent, ImageList imageList) { - super(parent, SWT.NONE); - GridLayout gridLayout = new GridLayout(5, false); - gridLayout.verticalSpacing = 0; - gridLayout.horizontalSpacing = 0; - gridLayout.marginWidth = 0; - gridLayout.marginHeight = 0; - setLayout(gridLayout); - - for (ImageDescriptor descriptor : BODY_DESCRIPTOR) { - descriptor.createWidget(this, imageList); - } + super(parent, imageList); + System.out.println("ss"); } - @Override - protected void checkSubclass() { - // Disable the check that prevents subclassing of SWT components + protected ImageDescriptor[] getBodyDescriptor() { + return BODY_DESCRIPTOR; } - - @Override - public void addListener(int eventType, Listener listener) { - super.addListener(eventType, listener); - switch (eventType) { - case SWT.MouseDown: - case SWT.MouseUp: - case SWT.MouseMove: - for (Control child : getChildren()) { - child.addListener(eventType, listener); - } - } - } - - @Override - public void removeListener(int eventType, Listener listener) { - super.removeListener(eventType, listener); - switch (eventType) { - case SWT.MouseDown: - case SWT.MouseUp: - case SWT.MouseMove: - for (Control child : getChildren()) { - child.removeListener(eventType, listener); - } - } - } } Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/IPhoneSkinDescriptor.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/IPhoneSkinDescriptor.java 2012-04-13 16:32:33 UTC (rev 40184) +++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/IPhoneSkinDescriptor.java 2012-04-13 18:24:03 UTC (rev 40185) @@ -1,5 +1,7 @@ package org.jboss.tools.vpe.browsersim.ui.skin.ios; +import org.jboss.tools.vpe.browsersim.ui.skin.ImageDescriptor; + public class IPhoneSkinDescriptor { private int bodyGridSize; private ImageDescriptor[] bodyGridImageDescriptors; Deleted: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/ImageButtonComposite.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/ImageButtonComposite.java 2012-04-13 16:32:33 UTC (rev 40184) +++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/ImageButtonComposite.java 2012-04-13 18:24:03 UTC (rev 40185) @@ -1,95 +0,0 @@ -package org.jboss.tools.vpe.browsersim.ui.skin.ios; -import org.eclipse.swt.SWT; -import org.eclipse.swt.events.MouseEvent; -import org.eclipse.swt.events.MouseTrackListener; -import org.eclipse.swt.graphics.Image; -import org.eclipse.swt.graphics.Rectangle; -import org.eclipse.swt.layout.FormData; -import org.eclipse.swt.widgets.Composite; -import org.jboss.tools.vpe.browsersim.ui.skin.ImageList; - - -public class ImageButtonComposite extends Composite { - - private MouseTrackListener mouseTrackListener; - private Image enabledImage; - private Image disabledImage; - private Image selectedImage; - protected boolean enabled; - - /** - * Create the composite. - * @param parent - * @param style - */ - public ImageButtonComposite(Composite parent, Image enabledImage, Image disabledImage, Image selectedImage) { - super(parent, SWT.NONE); - this.enabledImage = enabledImage; - this.disabledImage = disabledImage; - this.selectedImage = selectedImage; - setEnabled(true); - addMouseTrackListener(getMouseTrackListener()); - } - - public ImageButtonComposite(Composite parent, ImageList imageList, ButtonDescriptor buttonDescriptor) { - this( parent, imageList.getImage(buttonDescriptor.getEnabledImageName()), - imageList.getImage(buttonDescriptor.getDisabledImageName()), - imageList.getImage(buttonDescriptor.getSelectedImageName()) ); - - FormData formData = buttonDescriptor.getFormData(); - FormData actualFormData = new FormData(); - actualFormData.left = formData.left; - actualFormData.top = formData.top; - actualFormData.right = formData.right; - actualFormData.bottom = formData.bottom; - - Rectangle size = enabledImage.getBounds(); - actualFormData.width = size.width; - actualFormData.height = size.height; - - this.setLayoutData(actualFormData); - } - - public void setEnabled(boolean enabled) { - this.enabled = enabled; - if (enabled) { - setBackgroundImage(enabledImage); - } else { - setBackgroundImage(disabledImage); - } - } - - public boolean getEnabled() { - return enabled; - } - - @Override - protected void checkSubclass() { - // Disable the check that prevents subclassing of SWT components - } - - private MouseTrackListener getMouseTrackListener() { - if (mouseTrackListener == null) { - mouseTrackListener = new MouseTrackListener() { - @Override - public void mouseHover(MouseEvent e) { - } - - @Override - public void mouseExit(MouseEvent e) { - if (enabled) { - setBackgroundImage(enabledImage); - } - } - - @Override - public void mouseEnter(MouseEvent e) { - if (enabled) { - setBackgroundImage(selectedImage); - } - } - }; - } - return mouseTrackListener; - } -} Deleted: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/ImageDescriptor.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/ImageDescriptor.java 2012-04-13 16:32:33 UTC (rev 40184) +++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/ImageDescriptor.java 2012-04-13 18:24:03 UTC (rev 40185) @@ -1,55 +0,0 @@ -package org.jboss.tools.vpe.browsersim.ui.skin.ios; -import org.jboss.tools.vpe.browsersim.ui.skin.ImageList; -import org.jboss.tools.vpe.browsersim.ui.skin.ios.WidgetDescriptor; - -import org.eclipse.swt.SWT; -import org.eclipse.swt.graphics.Image; -import org.eclipse.swt.graphics.Rectangle; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.widgets.Composite; - - -public class ImageDescriptor extends WidgetDescriptor { - protected String imageName; - - public ImageDescriptor(String imageName, int horizontalSpan, int verticalSpan, int stretching) { - super(horizontalSpan, verticalSpan, stretching); - this.imageName = imageName; - } - public ImageDescriptor(String imageName, int horizontalSpan, int verticalSpan) { - this(imageName, horizontalSpan, verticalSpan, SWT.NONE); - } - public ImageDescriptor(String imageName) { - this(imageName, 1, 1); - } - - public Composite createWidget(Composite parent, ImageList imageList) { - Composite composite = new Composite(parent, SWT.NONE); - boolean fillHorizontal = (getStretching() & SWT.HORIZONTAL) != 0; - boolean fillVertical = (getStretching() & SWT.VERTICAL) != 0; - GridData gridData = new GridData( - fillHorizontal ? SWT.FILL: SWT.CENTER, - fillVertical ? SWT.FILL: SWT.CENTER, - fillHorizontal, fillVertical, - getHorizontalSpan(), getVerticalSpan()); - - String imageName = getImageName(); - if (imageName != null) { - Image image = imageList.getImage(imageName); - composite.setBackgroundImage(image); - Rectangle bounds = image.getBounds(); - gridData.widthHint = fillHorizontal ? SWT.DEFAULT : bounds.width; - gridData.heightHint = fillVertical ? SWT.DEFAULT : bounds.height; - } else { - composite.setBackground(parent.getDisplay().getSystemColor(SWT.COLOR_WHITE)); - } - - composite.setLayoutData(gridData); - - return composite; - } - - public String getImageName() { - return imageName; - } -} Deleted: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/WidgetDescriptor.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/WidgetDescriptor.java 2012-04-13 16:32:33 UTC (rev 40184) +++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/WidgetDescriptor.java 2012-04-13 18:24:03 UTC (rev 40185) @@ -1,31 +0,0 @@ -package org.jboss.tools.vpe.browsersim.ui.skin.ios; -import org.eclipse.swt.SWT; - -class WidgetDescriptor { - protected int horizontalSpan; - protected int verticalSpan; - protected int stretching; - - public WidgetDescriptor(int horizontalSpan, int verticalSpan, int stretching) { - this.verticalSpan = verticalSpan; - this.horizontalSpan = horizontalSpan; - this.stretching = stretching; - } - - public WidgetDescriptor(int horizontalSpan, int verticalSpan) { - this(horizontalSpan, verticalSpan, SWT.NONE); - } - public WidgetDescriptor() { - this(1, 1); - } - - public int getHorizontalSpan() { - return horizontalSpan; - } - public int getVerticalSpan() { - return verticalSpan; - } - public int getStretching() { - return stretching; - } -}