FCL/sf/app/jrt: comparison javamanager/javainstaller/installerui/javasrc/com/nokia/mj/impl/installer/ui/eswt/InstallerUiEswt.java

equal deleted inserted replaced

-:023eef975703
+:abc41079b313
 import com.nokia.mj.impl.utils.StartUpTrace;
 import com.nokia.mj.impl.utils.exception.InstallerExceptionBase;
 import java.io.InputStream;
 import java.io.IOException;
+import java.util.Enumeration;
 import java.util.Hashtable;
 import org.eclipse.ercp.swt.midp.UIThreadSupport;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.ControlEvent;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.graphics.ImageData;
 import org.eclipse.swt.graphics.ImageLoader;
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.graphics.Rectangle;
+import org.eclipse.swt.internal.extension.DisplayExtension;
+import org.eclipse.swt.internal.extension.ImageUtil;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Listener;
 import org.eclipse.swt.widgets.Shell;
 if (!display.readAndDispatch())
 {
 display.sleep();
 }
 }
-if (iBoldFont != null && !iBoldFont.isDisposed())
+disposeResources();
-{
-iBoldFont.dispose();
-}
 display.dispose();
 log("uiMain: display disposed");
 synchronized (iExitWaitObject)
 {
 // Notify that UI main thread has been terminated.
 {
 if (iSecurityIcon != null)
 {
 return iSecurityIcon;
 }
-String iconFilename = ResourceUtil.UNTRUSTED_ICON_NAME;
+int id = ImageUtil.THEME_IMAGE_SECURITY_UNTRUSTED;
 if (aIdentified)
 {
-iconFilename = ResourceUtil.TRUSTED_ICON_NAME;
+id = ImageUtil.THEME_IMAGE_SECURITY_TRUSTED;
 }
-String resourceDir = ResourceUtil.getResourceDir(0);
-for (int i = 1; iSecurityIcon == null && resourceDir != null; i++)
+try
 {
-iSecurityIcon = loadImage(aDisplay, resourceDir + iconFilename, false);
+iSecurityIcon = ImageUtil.createImageFromTheme(aDisplay, id);
-resourceDir = ResourceUtil.getResourceDir(i);
+}
-}
+catch (Throwable t)
+{
+log("Can not load security icon: " + t);
+}
 return iSecurityIcon;
 }
 /**
 * Loads image from specified InputStream. This method scales the image
 return result;
 }
 try
 {
 long startTime = System.currentTimeMillis();
-ImageData[] imageDatas = new ImageLoader().load(aInputStream);
-ImageData imageData = imageDatas[0];
+Image image = new Image(aDisplay, aInputStream);
 if (aScaleImage)
 {
-Point bestSize = getBestImageSize(
+int maxWidth = DisplayExtension.getBestImageWidth(DisplayExtension.LIST_ELEMENT);
-imageData.width, imageData.height);
+int maxHeight = DisplayExtension.getBestImageHeight(DisplayExtension.LIST_ELEMENT);
-if (bestSize.x != imageData.width ||
+Rectangle rect = image.getBounds();
-bestSize.y != imageData.height)
+if (maxWidth != rect.width || maxHeight != rect.height)
 {
-imageData = imageData.scaledTo(bestSize.x, bestSize.y);
+// Copy and scale natively preserving the aspect ratio
-log("Image " + aImageName + " scaled from " +
+result = ImageUtil.scaleImage(aDisplay, image, new Point(maxWidth, maxHeight), true);
-imageDatas[0].width + "x" + imageDatas[0].height +
+image.dispose();
-" to " + bestSize.x + "x" + bestSize.y);
+image = null;
 }
 }
-result = new Image(aDisplay, imageData);
+if (result == null)
+{
+result = image;
+}
 long endTime = System.currentTimeMillis();
 log("Loaded image " + aImageName + " (load time " +
 (endTime - startTime) + " ms)");
 iImageTable.put(aImageName, result);
 }
 //logError("Exception while loading image " + aImageName, t);
 }
 return result;
 }
-/**
-* Determines the best image size for the image of given size.
-*/
-private static Point getBestImageSize(int aWidth, int aHeight)
-{
-// Actually maximum image width and height should be obtained with
-// org.eclipse.swt.internal.extension.DisplayExtension
-// getBestImageWidth() and getBestImageHeight().
-final int MAX_WIDTH = 50; // max width in pixels
-final int MAX_HEIGHT = 50; // max height in pixels
-Point result = new Point(aWidth, aHeight);
-if (result.x > MAX_WIDTH || result.y > MAX_HEIGHT)
-{
-if (result.x >= MAX_WIDTH)
-{
-result.x = MAX_WIDTH;
-result.y = MAX_WIDTH * aHeight / aWidth;
-}
-if (result.y >= MAX_HEIGHT)
-{
-result.x = MAX_HEIGHT * aWidth / aHeight;
-result.y = MAX_HEIGHT;
-}
-}
-return result;
-}
 /** Returns true if UI has been created and can be used. */
 protected boolean isUiReady()
 {
 if (iProgressView == null)
 {
 }
 iBoldFont = new Font(iParent.getDisplay(), boldFontDatas);
 }
 return iBoldFont;
 }
+int iconLabelTopMargin()
+{
+// Aproximating the space at the top of a Label.
+// eSWT's Label adds extra space around texts but not around images.
+return getBoldFont().getFontData()[0].getHeight();
+}
 void setActiveView(ViewBase aView)
 {
 if (iActiveView != null && iActiveView != aView &&
 !iActiveView.isDisposed())
 ViewBase getActiveView()
 {
 return iActiveView;
 }
+private void disposeResources() {
+if (iBoldFont != null && !iBoldFont.isDisposed())
+{
+iBoldFont.dispose();
+}
+if (iSecurityIcon != null && !iSecurityIcon.isDisposed())
+{
+iSecurityIcon.dispose();
+}
+Enumeration e = iImageTable.elements();
+while (e.hasMoreElements())
+{
+Image img = (Image)e.nextElement();
+if (img != null && !img.isDisposed())
+{
+img.dispose();
+}
+}
+}
 }

changeset 56	abc41079b313
parent 49	35baca0e7a2e
child 72	1f0034e370aa