[Esbox-commits] r2024 - trunk/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/internal/vm/vmware/ui/wizards

[raul at garage.maemo.org]

Author: raul
Date: 2009-08-27 00:24:47 +0300 (Thu, 27 Aug 2009)
New Revision: 2024

Modified:
   trunk/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/internal/vm/vmware/ui/wizards/MaemoSDKVMConfigurationWizardPage.java
   trunk/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/internal/vm/vmware/ui/wizards/MaemoSDKVMSelectionWizardPage.java
Log:
Merge revs 2005:2022 from branch work_Raul

Modified: trunk/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/internal/vm/vmware/ui/wizards/MaemoSDKVMConfigurationWizardPage.java
===================================================================
--- trunk/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/internal/vm/vmware/ui/wizards/MaemoSDKVMConfigurationWizardPage.java	2009-08-26 21:10:52 UTC (rev 2023)
+++ trunk/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/internal/vm/vmware/ui/wizards/MaemoSDKVMConfigurationWizardPage.java	2009-08-26 21:24:47 UTC (rev 2024)
@@ -34,6 +34,8 @@
 
 	private Button installEverything;
 
+	private Label mainMessage;
+	
 	// installation details area
 	private Group installationDetailsGroup;
 	private Button installScratchbox;
@@ -71,12 +73,11 @@
 		GridDataFactory.fillDefaults().grab(true, true).applyTo(composite);
 		setControl(composite);
 
-		Label message = new Label(composite, SWT.WRAP);
-		String imageName = ((NewMaemoSDKVMWizard)getWizard()).getInstallData().getFileToDownload().getDescriptor().getName();
-		message.setText("You just selected virtual image ''" +  imageName + "'' to be installed on your machine.\n" +
-								" Please, select the following options in order to properly configure your Maemo SDK virtual machine");
+		mainMessage = new Label(composite, SWT.WRAP);
+		updateMainMessage();
+
 		GridDataFactory.swtDefaults().span(1, 1).align(SWT.LEFT, SWT.CENTER)
-				.applyTo(message);
+				.applyTo(mainMessage);
 
 		Label separator = new Label(composite, SWT.NONE);
 		GridDataFactory.swtDefaults().span(1, 1).align(SWT.LEFT, SWT.CENTER)
@@ -88,7 +89,6 @@
 				.applyTo(installEverything);
 		installEverything
 				.setToolTipText("If checked, install the complete Maemo SDK programming environment on virtual image");
-		installEverything.setSelection(true);
 		installEverything.addSelectionListener(new SelectionAdapter() {
 
 			public void widgetSelected(SelectionEvent evt) {
@@ -106,13 +106,9 @@
 		createInstallationDetailsArea(composite);
 
 		createProgrammingEnvironmentArea(composite);
-
-		setInstallationDetailsButtonsSelection(true);
-		setInstallationDetailsGroupEnabled(false);
-		setProgrammingEnvButtonsSelection(true);
-		setProgrammignEnvGroupEnabled(false);
 		
-		updateInstallData();
+		setValues();
+		
 	}
 
 	/**
@@ -289,5 +285,30 @@
 					installPythonEnv.getSelection());
 			installData.setInstallSbox(installScratchbox.getSelection() || installScratchboxTargets.getSelection());
 	}
+	
+	private void updateMainMessage() {
+		String imageName = ((NewMaemoSDKVMWizard)getWizard()).getInstallData().getFileToDownload().getDescriptor().getName();
+		mainMessage.setText("You just selected virtual image ''" +  imageName + "'' to be installed on your machine.\n" +
+								" Please, select the following options in order to properly configure your Maemo SDK virtual machine");
+	}
+	
+	private void setValues() {
+		boolean isServer = ((NewMaemoSDKVMWizard)getWizard()).getInstallData().getFileToDownload().getDescriptor().isServerImage();
 
+		installEverything.setSelection(isServer);
+		setInstallationDetailsButtonsSelection(isServer);
+		setInstallationDetailsGroupEnabled(false);
+		setProgrammingEnvButtonsSelection(true);
+		setProgrammignEnvGroupEnabled(false);
+		
+		updateInstallData();
+	}
+	
+	@Override
+	public void setVisible(boolean visible) {
+		super.setVisible(visible);
+		updateMainMessage();
+		setValues();
+	}
+
 }

Modified: trunk/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/internal/vm/vmware/ui/wizards/MaemoSDKVMSelectionWizardPage.java
===================================================================
--- trunk/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/internal/vm/vmware/ui/wizards/MaemoSDKVMSelectionWizardPage.java	2009-08-26 21:10:52 UTC (rev 2023)
+++ trunk/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/internal/vm/vmware/ui/wizards/MaemoSDKVMSelectionWizardPage.java	2009-08-26 21:24:47 UTC (rev 2024)
@@ -352,7 +352,7 @@
 		GridDataFactory.swtDefaults().align(SWT.LEFT, SWT.CENTER).span(4, 1)
 				.applyTo(label);
 		
-		imageDescription = new Text(composite,SWT.BORDER | SWT.MULTI | SWT.WRAP);
+		imageDescription = new Text(composite, SWT.BORDER | SWT.MULTI | SWT.WRAP | SWT.V_SCROLL);
 		imageDescription.setEditable(false);
 		GridDataFactory.fillDefaults().grab(true, true).span(4, 1).applyTo(
 				imageDescription);