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

equal deleted inserted replaced

-:7cee158cb8cd
+:26b2b12093af
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.events.SelectionListener;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.internal.qt.WidgetConstant;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Widget;
 /**
 * Base class for different InstallerUi views.
 */
 abstract public class ViewBase
 {
 /** Maximum view height in percentage from display client area height. */
 protected static final int MAX_VIEW_HEIGHT = 80;
-/** Maximum view width in percentage from display client area width. */
-protected static final int MAX_VIEW_WIDTH = 90;
 /** Parent shell for this view. */
 protected Shell iParent = null;
 /** Container for the contents of the view */
 private Composite iContainer = null;
 /** ScrolledComposite for iComposite. */
 private boolean iVisible = false;
 /** Number of columns for this view's GridLayout. */
 private int iColumns = 1;
 /** Default content size. */
 private Point iDefaultContentSize = null;
-/** Certificate details view. */
+/** Certificate details view.  */
 private CertificateDetailsView iCertificateDetailsView = null;
 /** Certificates for this application. */
 protected SigningCertificate[] iCertificates = null;
 /** Constructor */
 // Each view gets a shell to be used as a parameter.
 iParent = (Shell)aParent;
 iContainer = new Composite(iParent, 0);
-setCssId(iContainer, "dialogArea");
 iContainer.setVisible(false);
 iColumns = aColumns;
 // Store the default bounds for later height adjustments.
 }
 /** Set title for this view. */
 public void setTitle(String aTitle)
 {
-// Dialog shells have no title.
+// Dialog shells have no title anymore
 }
 /** Disposes this view. */
 public void dispose()
 {
 getAppInfoComposite().setSize(
 getAppInfoComposite().computeSize(
 SWT.DEFAULT, SWT.DEFAULT));
 }
-int contentWidth = iDefaultContentSize.x * MAX_VIEW_WIDTH / 100;
+int contentWidth = iDefaultContentSize.x;
 if (aVerticalScrollBarVisible)
 {
 int verticalScrollBarWidth =
 getScrolledComposite().getVerticalBar().getSize().x;
-contentWidth -= verticalScrollBarWidth;
+contentWidth = iDefaultContentSize.x - verticalScrollBarWidth;
 }
 // Recalculate the size of the content.
 Point contentSize = comp.computeSize(contentWidth, SWT.DEFAULT);
 comp.setSize(contentSize);
 Point cmdContentSize = cmdComp.computeSize(iDefaultContentSize.x, SWT.DEFAULT);
 cmdComp.setSize(cmdContentSize);
-// Adjust Shell height and width.
+// Adjust Shell height. The Shell never changes the x position, nor the width.
 Rectangle dispRect = shell.getDisplay().getClientArea();
 int offset = iDefaultContentSize.y - contentSize.y - cmdContentSize.y;
 Rectangle defShellBounds = iInstallerUi.getDefaultShellBounds();
 int newHeight = defShellBounds.height - offset;
 if (newHeight > maxHeight)
 {
 offset -= maxHeight - newHeight;
 newHeight = maxHeight;
 }
-int newWidth = defShellBounds.width;
-int maxWidth = dispRect.width * MAX_VIEW_WIDTH / 100;
-if (newWidth > maxWidth)
-{
-newWidth = maxWidth;
-}
-// Always center horizontally and vertically.
 Rectangle dispBounds = shell.getDisplay().getBounds();
-int x = dispBounds.width - newWidth;
 int y = dispBounds.height - newHeight;
-x /= 2;
+// Always center vertically.
 y /= 2;
-shell.setBounds(x, y, newWidth, newHeight);
+// For landscape orientation center vertically
+//if (dispRect.width > dispRect.height)
+//{
+//    y /= 2;
+//}
+// Set bounds when command Buttons are in use.
+shell.setBounds(defShellBounds.x, y, defShellBounds.width, newHeight);
 Rectangle clientArea = shell.getClientArea();
 iContainer.setSize(clientArea.width, clientArea.height);
 iContainer.layout(true);
 }
 {
 return iColumns;
 }
 /**
-* Sets CSS id for given widget.
-*/
-protected void setCssId(Widget aWidget, String aCssId)
-{
-aWidget.setData(WidgetConstant.CSS_ID, aCssId);
-}
-/**
 * Adds header used in installation views.
 */
 protected void addHeader(
 String aTitle, InstallInfo aInstallInfo, UninstallInfo aUninstallInfo)
 {
 protected void addHeader(
 String aTitle, InstallInfo aInstallInfo, UninstallInfo aUninstallInfo,
 boolean aSecurityButton)
 {
 // Add title.
-if (aTitle == null)
+String title = InstallerUiTexts.get(InstallerUiTexts.INSTALL_QUERY);
-{
+if (aInstallInfo != null)
-aTitle = InstallerUiTexts.get(InstallerUiTexts.INSTALL_QUERY);
+{
-if (aInstallInfo != null && aInstallInfo.getOldVersion() != null)
+if (aInstallInfo.getOldVersion() != null)
 {
-aTitle = InstallerUiTexts.get(InstallerUiTexts.UPDATE_QUERY);
+title = InstallerUiTexts.get(InstallerUiTexts.UPDATE_QUERY);
 }
+iCertificates = aInstallInfo.getCertificates();
+}
+if (aUninstallInfo != null)
+{
+title = "Uninstall?";
+iCertificates = aUninstallInfo.getCertificates();
 }
 Label titleLabel = createLabel(aTitle, getColumns() - 1, SWT.WRAP);
-setCssId(titleLabel, "heading");
+titleLabel.setFont(iInstallerUi.getBoldFont());
-if (aInstallInfo != null)
-{
-iCertificates = aInstallInfo.getCertificates();
-}
-else if (aUninstallInfo != null)
-{
-iCertificates = aUninstallInfo.getCertificates();
-}
 if (aSecurityButton)
 {
-// Add security button.
+// Add security icon.
 createSecurityButton();
 }
 else
 {
 // Add security icon.
 int iconColumns = 0;
 if (iSuiteIcon != null)
 {
 iconColumns = 2;
 Label iconLabel = createLabel(iSuiteIcon, iconColumns, SWT.NONE);
-setCssId(iconLabel, "contentIcon");
 }
 // Create a Composite for displaying application info.
 iAppInfoScrolledComposite =
-new ScrolledComposite(getComposite(), SWT.V_SCROLL);
+new ScrolledComposite(getComposite(), SWT.H_SCROLL | SWT.V_SCROLL);
 iAppInfoScrolledComposite.setAlwaysShowScrollBars(false);
 iAppInfoScrolledComposite.setExpandHorizontal(true);
 GridData gridData = new GridData(GridData.FILL_BOTH);
 gridData.horizontalSpan = getColumns() - iconColumns;
 iAppInfoScrolledComposite.setLayoutData(gridData);
 iAppInfoComposite = new Composite(iAppInfoScrolledComposite, SWT.NONE);
 iAppInfoComposite.setLayout(new GridLayout(1, true));
 iAppInfoScrolledComposite.setContent(iAppInfoComposite);
-setCssId(iAppInfoScrolledComposite, "appInfoArea");
 }
 /**
 * Adds application information to the header.
 */
 }
 // Add suite name and version.
 createAppInfoLabel(
 InstallerUiTexts.get(
-InstallerUiTexts.SUITE_NAME_VERSION,
+InstallerUiTexts.SUITE_NAME,
 new String[] { aInstallInfo.getName(),
 aInstallInfo.getVersion() }));
 if (aFull)
 {
 // Add vendor.
 {
 size += aInstallInfo.getDataSize();
 }
 if (size > 0)
 {
-if (size > 1024*1024)
+createAppInfoLabel(
-{
+InstallerUiTexts.get(
-createAppInfoLabel(
+InstallerUiTexts.SIZE_KB,
-InstallerUiTexts.get(
+new String[] { Long.toString(1 + size/1024) }));
-InstallerUiTexts.SIZE_MB,
-new Object[] { new Integer((int)(1 + size/(1024*1024))) }));
-}
-else
-{
-createAppInfoLabel(
-InstallerUiTexts.get(
-InstallerUiTexts.SIZE_KB,
-new Object[] { new Integer((int)(1 + size/1024)) }));
-}
 }
 if (aFull)
 {
 // Add application names.
 ApplicationInfo[] apps = aInstallInfo.getApplications();
 Label label = new Label(getComposite(), aStyle);
 label.setImage(aImage);
 GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
 gridData.horizontalSpan = aColumns;
 gridData.horizontalAlignment = SWT.CENTER;
-gridData.verticalAlignment = SWT.TOP;
+gridData.verticalAlignment = SWT.CENTER;
 label.setLayoutData(gridData);
 return label;
 }
 /**
 * @return label that was added to this view
 */
 protected Label createSecurityLabel(boolean aIdentified)
 {
 Label label = createLabel((Image)null, 1, SWT.NONE);
-setCssId(label, "securityLabel");
 Image securityIcon = null;
 if (iInstallerUi != null)
 {
 securityIcon = iInstallerUi.getSecurityIcon(
 getDisplay(), aIdentified);
 }
 protected Button createSecurityButton()
 {
 Button button = new Button(getComposite(), SWT.PUSH);
-setCssId(button, "securityButton");
 GridData gridData = new GridData(
 GridData.FILL_HORIZONTAL | GridData.FILL_VERTICAL);
 gridData.horizontalSpan = 1;
 gridData.horizontalAlignment = SWT.CENTER;
 gridData.verticalAlignment = SWT.CENTER;
 // where this method gets executed.
 new Thread(new Runnable()
 {
 public void run()
 {
-iInstallerUi.setCertificateDetailsView(iCertificateDetailsView);
 if (iCertificateDetailsView.confirm())
 {
 log("certificateDetailsView confirmed");
 }
 else
 {
 log("certificateDetailsView cancelled");
 }
 iCertificateDetailsView.dispose();
 iCertificateDetailsView = null;
-iInstallerUi.setCertificateDetailsView(null);
 setVisible(true);
 }
 }, "InstallerUiCertViewThread").start();
 }
 }

branch	RCL_3
changeset 83	26b2b12093af
parent 77	7cee158cb8cd