javamanager/javainstaller/installerui/javasrc/com/nokia/mj/impl/installer/ui/eswt2/RuntimeConfirmationView.java
--- a/javamanager/javainstaller/installerui/javasrc/com/nokia/mj/impl/installer/ui/eswt2/RuntimeConfirmationView.java Wed Jun 23 18:07:10 2010 +0300
+++ b/javamanager/javainstaller/installerui/javasrc/com/nokia/mj/impl/installer/ui/eswt2/RuntimeConfirmationView.java Tue Jul 06 14:10:26 2010 +0300
@@ -57,10 +57,18 @@
String[] answerOptions = iConfirmData.getAnswerOptions();
switch (answerOptions.length)
{
- case 1: setCommands(answerOptions[0], null); break;
- case 2: setCommands(answerOptions[0], answerOptions[1]); break;
+ //case 1: setCommands(answerOptions[0], null); break;
+ case 1:
+ setCommands(InstallerUiTexts.get(InstallerUiTexts.OK), null);
+ break;
+ //case 2: setCommands(answerOptions[0], answerOptions[1]); break;
+ case 2:
+ setCommands(InstallerUiTexts.get(InstallerUiTexts.OK),
+ InstallerUiTexts.get(InstallerUiTexts.CANCEL));
+ break;
default: setCommands(null, null); break;
}
+
}
/**
@@ -68,27 +76,13 @@
*/
protected void createView()
{
- // Add title.
- if (iInstallerUi.getInstallInfo() != null)
- {
- Label titleLabel = createLabel(iAppName, getColumns() - 1, SWT.WRAP);
- titleLabel.setFont(iInstallerUi.getBoldFont());
- // Add security icon.
- iCertificates = iInstallerUi.getInstallInfo().getCertificates();
- createSecurityButton();
- }
- else
- {
- Label titleLabel = createLabel(iAppName, getColumns(), SWT.WRAP);
- titleLabel.setFont(iInstallerUi.getBoldFont());
- }
+ // Add header.
+ addHeader(null, iInstallerUi.getInstallInfo(), null);
GridData gridData = null;
int horizontalSpan = getColumns();
int labelStyle = SWT.WRAP;
- // Begin widgets creation.
-
// Add question label.
Label errorLabel = createLabel(
iConfirmData.getQuestion(), horizontalSpan, labelStyle);
@@ -132,7 +126,9 @@
iAnswerButtons[iConfirmData.getAnswerSuggestion()].setFocus();
}
- // End of widgets creation.
+ // After other widgets have been added, add content to
+ // application info Composite.
+ addAppInfo(iInstallerUi.getInstallInfo(), false);
}
/**