javamanager/javainstaller/installerui/javasrc/com/nokia/mj/impl/installer/ui/eswt2/PermissionConfirmationView.java
changeset 35 85266cc22c7f
parent 26 dc7c549001d5
child 48 e0d6e9bd3ca7
--- a/javamanager/javainstaller/installerui/javasrc/com/nokia/mj/impl/installer/ui/eswt2/PermissionConfirmationView.java	Thu May 27 12:49:31 2010 +0300
+++ b/javamanager/javainstaller/installerui/javasrc/com/nokia/mj/impl/installer/ui/eswt2/PermissionConfirmationView.java	Fri Jun 11 13:33:44 2010 +0300
@@ -35,7 +35,6 @@
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Link;
 import org.eclipse.swt.widgets.Listener;
 import org.eclipse.swt.widgets.Shell;
 
@@ -106,10 +105,11 @@
         addHeader(title, iInstallInfo, null);
 
         GridData gridData = null;
-        int horizontalSpan = getColumns();
         int labelStyle = SWT.WRAP;
 
         // Add permission query label.
+        int detailsColumns = 2;
+        int horizontalSpan = getColumns() - detailsColumns;
         Label domainLabel = createLabel(
             InstallerUiTexts.get(InstallerUiTexts.PERM_QUERY,
                                  new String[] { appName }),
@@ -120,12 +120,11 @@
                 iPermissionInfo.getPermissionNames() != null &&
                 iPermissionInfo.getPermissionNames().length > 0)
         {
-            Link detailsLink = new Link(getComposite(), SWT.NONE);
-            detailsLink.setText(
-                "<a>" +
-                InstallerUiTexts.get(InstallerUiTexts.PERM_VIEW_DETAILS) +
-                "</a>");
-            detailsLink.addListener(SWT.Selection, new Listener()
+            horizontalSpan = detailsColumns;
+            Button detailsButton = new Button(getComposite(), SWT.NONE);
+            detailsButton.setText(
+                InstallerUiTexts.get(InstallerUiTexts.PERM_VIEW_DETAILS));
+            detailsButton.addListener(SWT.Selection, new Listener()
             {
                 public void handleEvent(Event aEvent)
                 {
@@ -134,10 +133,12 @@
             });
             gridData = new GridData(GridData.FILL_HORIZONTAL);
             gridData.horizontalSpan = horizontalSpan;
-            detailsLink.setLayoutData(gridData);
-            addSoftKeyListenerFor(detailsLink);
+            detailsButton.setLayoutData(gridData);
+            addSoftKeyListenerFor(detailsButton);
         }
 
+        horizontalSpan = getColumns();
+
         // Number of pixels on top of the buttons.
         int verticalIndent = 5;
 
@@ -235,6 +236,10 @@
         gridData.verticalIndent = verticalIndent;
         iCancelButton.setLayoutData(gridData);
         addSoftKeyListenerFor(iCancelButton);
+
+        // After other widgets have been added, add content to
+        // application info Composite.
+        addAppInfo(iInstallInfo, false);
     }
 
     /**