Author: jjohnstn Date: 2010-09-14 14:53:06 -0400 (Tue, 14 Sep 2010) New Revision: 24923 Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/ImageView.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceView.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ManageKeysPage.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionPage.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java Log: 2010-09-14 Jeff Johnston <jjohnstn(a)redhat.com&gt; * src/org/jboss/tools/deltacloud/ui/views/ImageView.java (createPartControl): For vertical centering, calculate the actual height difference between widgets and divide by 2 to find centering offset. Do not hard-code a value for this. * src/org/jboss/tools/deltacloud/ui/views/InstanceView.java (createPartControl): Ditto. * src/org/jboss/tools/internal/deltacloud/ui/wizards/ManageKeysPage.java (createControl): Ditto. * src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionPage.java (createControl): Ditto. * src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java (createControl): Ditto. Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-09-14 18:02:15 UTC (rev 24922) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-09-14 18:53:06 UTC (rev 24923) @@ -1,5 +1,15 @@ 2010-09-14 Jeff Johnston <jjohnstn(a)redhat.com&gt; + * src/org/jboss/tools/deltacloud/ui/views/ImageView.java (createPartControl): For vertical + centering, calculate the actual height difference between widgets and divide by + 2 to find centering offset. Do not hard-code a value for this. + * src/org/jboss/tools/deltacloud/ui/views/InstanceView.java (createPartControl): Ditto. + * src/org/jboss/tools/internal/deltacloud/ui/wizards/ManageKeysPage.java (createControl): Ditto. + * src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionPage.java (createControl): Ditto. + * src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java (createControl): Ditto. + +2010-09-14 Jeff Johnston <jjohnstn(a)redhat.com&gt; + * src/org/jboss/tools/deltacloud/ui/DeltaCloudPerspective.java (createInitialLayout): Fix initial view placement by putting all the bottom views into a single folder. * src/org/jboss/tools/deltacloud/ui/views/CVMessages.properties: Fix message for Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/ImageView.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/ImageView.java 2010-09-14 18:02:15 UTC (rev 24922) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/ImageView.java 2010-09-14 18:53:06 UTC (rev 24923) @@ -33,6 +33,7 @@ import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.events.VerifyEvent; import org.eclipse.swt.events.VerifyListener; +import org.eclipse.swt.graphics.Point; import org.eclipse.swt.layout.FormAttachment; import org.eclipse.swt.layout.FormData; import org.eclipse.swt.layout.FormLayout; @@ -206,8 +207,12 @@ currCloud.addImageListListener(parentView); } + Point p1 = cloudSelectorLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT); + Point p2 = cloudSelector.computeSize(SWT.DEFAULT, SWT.DEFAULT); + int centering = (p2.y - p1.y + 1) / 2; + FormData f = new FormData(); - f.top = new FormAttachment(0, 8); + f.top = new FormAttachment(0, 5 + centering); f.left = new FormAttachment(0, 30); cloudSelectorLabel.setLayoutData(f); Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceView.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceView.java 2010-09-14 18:02:15 UTC (rev 24922) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceView.java 2010-09-14 18:53:06 UTC (rev 24923) @@ -46,6 +46,7 @@ import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.events.VerifyEvent; import org.eclipse.swt.events.VerifyListener; +import org.eclipse.swt.graphics.Point; import org.eclipse.swt.layout.FormAttachment; import org.eclipse.swt.layout.FormData; import org.eclipse.swt.layout.FormLayout; @@ -236,8 +237,12 @@ currCloud.addInstanceListListener(parentView); } + Point p1 = cloudSelectorLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT); + Point p2 = cloudSelector.computeSize(SWT.DEFAULT, SWT.DEFAULT); + int centering = (p2.y - p1.y + 1) / 2; + FormData f = new FormData(); - f.top = new FormAttachment(0, 8); + f.top = new FormAttachment(0, 5 + centering); f.left = new FormAttachment(0, 30); cloudSelectorLabel.setLayoutData(f); Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ManageKeysPage.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ManageKeysPage.java 2010-09-14 18:02:15 UTC (rev 24922) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ManageKeysPage.java 2010-09-14 18:53:06 UTC (rev 24923) @@ -247,9 +247,15 @@ } }); + Point p1 = dirLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT); + Point p2 = directory.computeSize(SWT.DEFAULT, SWT.DEFAULT); + Point p3 = browseButton.computeSize(SWT.DEFAULT, SWT.DEFAULT); + int centering = (p2.y - p1.y + 1) / 2; + int centering2 = (p3.y - p2.y + 1) / 2; + FormData f = new FormData(); f.left = new FormAttachment(0, 5); - f.top = new FormAttachment(0, 8); + f.top = new FormAttachment(0, 5 + centering + centering2); dirLabel.setLayoutData(f); f = new FormData(); @@ -259,7 +265,7 @@ f = new FormData(); f.left = new FormAttachment(dirLabel, 5); - f.top = new FormAttachment(0, 5); + f.top = new FormAttachment(0, 5 + centering2); f.right = new FormAttachment(browseButton, -10); directory.setLayoutData(f); Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionPage.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionPage.java 2010-09-14 18:02:15 UTC (rev 24922) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionPage.java 2010-09-14 18:53:06 UTC (rev 24923) @@ -340,9 +340,15 @@ Label urlLabel = new Label(container, SWT.NULL); urlLabel.setText(WizardMessages.getString(URL_LABEL)); + Point p1 = urlLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT); + System.out.println("p1 is x:" + p1.x + " y:" + p1.y); urlText = new Text(container, SWT.BORDER | SWT.SINGLE); urlText.addModifyListener(textListener); + Point p2 = urlText.computeSize(SWT.DEFAULT, SWT.DEFAULT); + System.out.println("p2 text is x:" + p2.x + " y:" + p2.y); + + int centering = (p2.y - p1.y + 1) / 2; Label typeLabel = new Label(container, SWT.NULL); typeLabel.setText(WizardMessages.getString(TYPE_LABEL)); @@ -382,7 +388,7 @@ dummyLabel.setLayoutData(f); f = new FormData(); - f.top = new FormAttachment(dummyLabel, 11); + f.top = new FormAttachment(dummyLabel, 8 + centering); nameLabel.setLayoutData(f); f = new FormData(); @@ -392,7 +398,7 @@ nameText.setLayoutData(f); f = new FormData(); - f.top = new FormAttachment(nameText, 8); + f.top = new FormAttachment(nameText, 5 + centering); urlLabel.setLayoutData(f); f = new FormData(); @@ -402,17 +408,17 @@ urlText.setLayoutData(f); f = new FormData(); - f.top = new FormAttachment(urlText, 8); + f.top = new FormAttachment(urlText, 5 + centering); typeLabel.setLayoutData(f); f = new FormData(); f.left = new FormAttachment(urlText, 0, SWT.LEFT); - f.top = new FormAttachment(urlText, 8); + f.top = new FormAttachment(urlText, 5 + centering); f.right = new FormAttachment(100, 0); typeText.setLayoutData(f); f = new FormData(); - f.top = new FormAttachment(typeText, 16); + f.top = new FormAttachment(typeText, 10 + centering); usernameLabel.setLayoutData(f); f = new FormData(); @@ -427,7 +433,7 @@ ec2userLink.setLayoutData(f); f = new FormData(); - f.top = new FormAttachment(ec2userLink, 8); + f.top = new FormAttachment(ec2userLink, 5 + centering); passwordLabel.setLayoutData(f); f = new FormData(); Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java 2010-09-14 18:02:15 UTC (rev 24922) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java 2010-09-14 18:53:06 UTC (rev 24923) @@ -285,13 +285,17 @@ hardware.addModifyListener(comboListener); } + Point p1 = nameLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT); + Point p2 = nameText.computeSize(SWT.DEFAULT, SWT.DEFAULT); + int centering = (p2.y - p1.y + 1) / 2; + FormData f = new FormData(); f.left = new FormAttachment(0, 0); f.right = new FormAttachment(100, 0); dummyLabel.setLayoutData(f); f = new FormData(); - f.top = new FormAttachment(dummyLabel, 8); + f.top = new FormAttachment(dummyLabel, 8 + centering); f.left = new FormAttachment(0, 0); nameLabel.setLayoutData(f); @@ -323,7 +327,7 @@ arch.setLayoutData(f); f = new FormData(); - f.top = new FormAttachment(archLabel, 11); + f.top = new FormAttachment(arch, 8 + centering); f.left = new FormAttachment(0, 0); realmLabel.setLayoutData(f); @@ -348,9 +352,11 @@ keyManage = new Button(container, SWT.NULL); keyManage.setText(WizardMessages.getString(MANAGE_BUTTON_LABEL)); keyManage.addSelectionListener(manageListener); + Point p3 = keyManage.computeSize(SWT.DEFAULT, SWT.DEFAULT); + int centering2 = (p3.y - p2.y + 1) / 2; f = new FormData(); - f.top = new FormAttachment(realm, 11); + f.top = new FormAttachment(realm, 8 + centering + centering2); f.left = new FormAttachment(0, 0); keyLabel.setLayoutData(f); @@ -363,7 +369,7 @@ keyManage.setLayoutData(f); f = new FormData(); - f.top = new FormAttachment(realm, 8); + f.top = new FormAttachment(realm, 8 + centering2); f.left = new FormAttachment(hardwareLabel, 5); f.right = new FormAttachment(keyManage, -10); keyText.setLayoutData(f); @@ -372,7 +378,7 @@ } f = new FormData(); - f.top = new FormAttachment(control, 11); + f.top = new FormAttachment(control, 8 + centering); f.left = new FormAttachment(0, 0); hardwareLabel.setLayoutData(f);