[client] Change upload page layout a bit

1 files changed, 14 insertions, 17 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageUploadPageLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageUploadPageLayout.java
index e072b6b4..e0b074ef 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageUploadPageLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageUploadPageLayout.java
@@ -27,9 +27,9 @@ public abstract class ImageUploadPageLayout extends WizardPage {
 	 *            one
 	 */
 	public ImageUploadPageLayout() {
-		super("Eingabe Ihrer Daten");
-		setTitle("Eingabe Ihrer Daten");
-		setDescription("Geben Sie bitte einen aussagekräftigen Namen für das neue Image ein.");
+		super("Neue VM anlegen");
+		setTitle("Neue VM anlegen");
+		setDescription("Wählen Sie bitte zunächst die VM auf Ihrem lokalen Speicher aus");
 	}
 
 	@Override
@@ -38,37 +38,34 @@ public abstract class ImageUploadPageLayout extends WizardPage {
 		GridLayout layout = new GridLayout();
 		layout.verticalSpacing = 16;
 		container.setLayout(layout);
-		layout.numColumns = 4;
+		layout.numColumns = 3;
 
 		// -- Browse for VM --
 		Label imageFileCaption = new Label(container, SWT.NONE);
 		imageFileCaption.setText("Virtuelle Maschine");
 		imageFileTextField = new Text(container, SWT.BORDER | SWT.SINGLE);
 		imageFileTextField.setEditable(false);
-		GridData gdImageFileTextField = new GridData(SWT.FILL, SWT.FILL, true, false);
-		gdImageFileTextField.horizontalSpan = 2;
-		imageFileTextField.setLayoutData(gdImageFileTextField);
+		imageFileTextField.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
 		imageFileBrowseButton = new Button(container, SWT.PUSH);
-		imageFileBrowseButton.setText("Browse");
+		imageFileBrowseButton.setText("&Browse");
 
+		// -- Name --
 		Label imageNameCaption = new Label(container, SWT.NONE);
 		imageNameCaption.setText("Name des Images");
-
 		imageNameTextField = new Text(container, SWT.BORDER | SWT.SINGLE);
-		GridData gdImageNameTextField = new GridData(GridData.FILL_HORIZONTAL);
-		gdImageNameTextField.horizontalSpan = 2;
-		imageNameTextField.setLayoutData(gdImageNameTextField);
-
+		imageNameTextField.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false, 2, 1));
 		startUploadButton = new Button(container, SWT.PUSH);
-		startUploadButton.setText("Upload");
+		startUploadButton.setText("&Upload starten");
+		startUploadButton.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, true, false, 3, 1));
 
 		blockProgressBar = new BlockProgressBar(container, null);
-		GridData gdBlockProgressBar = new GridData(SWT.FILL, SWT.END, false, false, 3, 1);
-		gdBlockProgressBar.heightHint = 25;
+		GridData gdBlockProgressBar = new GridData(SWT.FILL, SWT.DOWN, true, true, 2, 1);
+		gdBlockProgressBar.heightHint = 30;
 		blockProgressBar.setLayoutData(gdBlockProgressBar);
 
 		cancelUpload = new Button(container, SWT.PUSH);
-		cancelUpload.setText("Cancel");
+		cancelUpload.setText("&Abbrechen");
+		cancelUpload.setLayoutData(new GridData(SWT.CENTER, SWT.BOTTOM, false, true));
 
 		setControl(container);
 	}