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

equal deleted inserted replaced

-:4ad59aaee882
+:2f468c1958d0
 private BaseCSSEngine iCssEngine = null;
 private Shell iParent = null;
 private Shell iDialog = null;
 private ProgressView iProgressView = null;
+private ProgressView iPreparingInstallationView = null;
 private ProgressView iDlProgressView = null;
 private ProgressView iOcspProgressView = null;
 private InstallConfirmationView iInstallConfirmationView = null;
 private PermissionConfirmationView iPermissionConfirmationView = null;
 private UsernamePasswordView iUsernamePasswordView = null;
 private CertificateDetailsView iCertificateDetailsView = null;
 /** Hashtable for storing the loaded icons. */
 private static Hashtable iImageTable = null;
 /** Best size for application icon. */
-private static Point iBestIconSize = null;
+private static Point iBestImageSize = null;
 /** Default shell bounds. */
 private Rectangle iDefaultShellBounds = null;
 private Rectangle iDefaultShellClientBounds = null;
 iDialog = new Shell(iParent, SHELL_STYLE);
 iDefaultShellBounds = iDialog.internal_getDefaultBounds();
 iDefaultShellClientBounds = iDialog.getClientArea();
 iBoldFont = getBoldFont();
 StartUpTrace.doTrace("InstallerUiEswt shell created");
-iProgressView = new ProgressView(this, iDialog, getTitle());
+iProgressView = new ProgressView(this, iDialog, getTitle(), false, true);
+//createPreparingInstallationView();
 iParent.addControlListener(new CListener(this));
 log("InstallerUiEswt CListener added");
 display.addListener(SWT.Dispose, new Listener()
 // Prevent UI from being automatically disposed.
 //aEvent.doit = false;
 }
 });
-// Initialize best icon size.
+// Initialize best image size.
-//iBestIconSize = new Point(
+iBestImageSize = new Point(
-//    display.getBestImageWidth(DisplayExtension.ALERT),
+DisplayExtension.getBestImageWidth(DisplayExtension.LIST_ELEMENT),
-//    display.getBestImageHeight(DisplayExtension.ALERT));
+DisplayExtension.getBestImageHeight(DisplayExtension.LIST_ELEMENT));
-//log("Best icon size: " + iBestIconSize);
+log("Best image size: " + iBestImageSize);
 synchronized (iInitWaitObject)
 {
 // Notify that UI is now ready.
 iInitWaitObject.notify();
 * Cancels all confirmation views that are currently displayed.
 */
 public void cancelConfirmations()
 {
 super.cancelConfirmations();
+if (iPreparingInstallationView != null &&
+!iPreparingInstallationView.isDisposed())
+{
+iPreparingInstallationView.dispose();
+iPreparingInstallationView = null;
+}
 if (iCertificateDetailsView != null)
 {
 iCertificateDetailsView.confirmCancel();
 }
 if (iInstallConfirmationView != null)
 if (!isUiReady())
 {
 // If UI is not ready by the time confirmation is requested,
 // throw an exception.
 throw new RuntimeException("JavaInstallerUi not ready");
+}
+if (iPreparingInstallationView != null &&
+!iPreparingInstallationView.isDisposed())
+{
+iPreparingInstallationView.setVisible(false);
+iPreparingInstallationView.dispose();
+iPreparingInstallationView = null;
 }
 boolean result = true;
 if (result)
 {
 iParent.getDisplay().syncExec(new Runnable()
 {
 public void run()
 {
 iProgressView = new ProgressView(
-self, iDialog, getTitle());
+self, iDialog, getTitle(), false, true);
 }
 });
 iProgressView.setVisible(true);
 }
 if (iDisplayProgress && !iProgressBarUpdateTraced)
 public void run()
 {
 iDlProgressView = new ProgressView(
 self, iDialog,
 InstallerUiTexts.get(InstallerUiTexts.DOWNLOADING),
-indeterminate);
+indeterminate, true);
 }
 });
-iDlProgressView.addCancelCommand();
 }
 synchronized (iProgressSyncObject)
 {
 if (iDisplayProgress && !iDlProgressView.isVisible() &&
 public void run()
 {
 iOcspProgressView = new ProgressView(
 self, iDialog,
 InstallerUiTexts.get(InstallerUiTexts.OCSP_CHECK_PROGRESS),
-true);
+true, true);
 }
 });
-iOcspProgressView.addCancelCommand();
 }
 if (iOcspProgressView != null)
 {
 if (!iOcspProgressView.isVisible() &&
 iCertificateDetailsView == null)
 return result;
 }
 try
 {
 long startTime = System.currentTimeMillis();
+aDisplay.setData("org.eclipse.swt.internal.image.loadSize",
+iBestImageSize);
 Image image = new Image(aDisplay, aInputStream);
-ImageData imageData = image.getImageData();
 if (aScaleImage)
 {
-Point bestSize = getBestImageSize(
+ImageData imageData = image.getImageData();
-imageData.width, imageData.height);
+if (iBestImageSize.x != imageData.width ||
-if (bestSize.x != imageData.width ||
+iBestImageSize.y != imageData.height)
-bestSize.y != imageData.height)
 {
 Point oldSize =
 new Point(imageData.width, imageData.height);
-imageData = imageData.scaledTo(bestSize.x, bestSize.y);
+imageData = imageData.scaledTo(iBestImageSize.x, iBestImageSize.y);
 log("Image " + aImageName + " scaled from " +
 oldSize.x + "x" + oldSize.y + " to " +
-bestSize.x + "x" + bestSize.y);
+iBestImageSize.x + "x" + iBestImageSize.y);
-}
+image = new Image(aDisplay, imageData);
 }
-result = new Image(aDisplay, imageData);
+}
+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)
-{
-final int MAX_WIDTH = (iBestIconSize == null? 50: iBestIconSize.x);
-final int MAX_HEIGHT = (iBestIconSize == null? 50: iBestIconSize.y);
-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)
 {
 }
 public void controlResized(ControlEvent aEvent)
 {
 iInstallerUi.screenOrientationChanged();
+}
+}
+/**
+* Creates preparing installation view.
+*/
+private void createPreparingInstallationView()
+{
+if (iPreparingInstallationView == null)
+{
+final InstallerUiEswt self = this;
+iParent.getDisplay().syncExec(new Runnable()
+{
+public void run()
+{
+iPreparingInstallationView = new ProgressView(
+self, iDialog, "Preparing installation", true, false);
+iPreparingInstallationView.setVisible(true);
+}
+});
 }
 }
 Rectangle getDefaultShellBounds()
 {

changeset 79	2f468c1958d0
parent 76	4ad59aaee882