Merge pull request #109 from kaviththiranga/developer-studio-3.7.0

UI Adjustments.
wso2-attic · Jul 3, 2014 · bc70da8 · bc70da8
2 parents cd7518e + a2dd69a
commit bc70da8
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/...studio.appfactory.ui/src/org/wso2/developerstudio/appfactory/ui/utils/messages.properties b/...studio.appfactory.ui/src/org/wso2/developerstudio/appfactory/ui/utils/messages.properties
@@ -91,7 +91,7 @@ APP_CLOUD_URL=https://apps.cloud.wso2.com
 PasswordDialog_USER=User:
 PasswordDialog_Cloud_USER=Email:
 AppfactoryApplicationDetailsView_createToolbar_refresh_menu=data-source
-APP_CLOUD_ZERO_TENANTS_WARNING=You do not have any registered domains. Please visit App Cloud to create one and retry.
+APP_CLOUD_ZERO_TENANTS_WARNING=You do not have any registered organizations.\nPlease visit App Cloud to create one and retry.
 APP_CLOUD_ORG_NOT_SELECT_ERROR=An organization must be selected to conitnue. Plase try again.
 TenantSelectionDialog_Title=Select an organization
 TenantSelectionDialog_Title_2=Select an organization to continue

diff --git a/...studio.appfactory.ui/src/org/wso2/developerstudio/appfactory/ui/views/PasswordDialog.java b/...studio.appfactory.ui/src/org/wso2/developerstudio/appfactory/ui/views/PasswordDialog.java
@@ -200,8 +200,9 @@ public void widgetSelected(SelectionEvent e) {
     new Label(container, SWT.NONE);
 
     error = new Label(container, SWT.NONE);
-    error.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false,
-            1, 1));
+    GridData data = new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1);
+    data.heightHint = 35;
+    error.setLayoutData(data);
     error.setForeground(container.getDisplay().getSystemColor(SWT.COLOR_RED));
     FocusAdapter adapter = new FocusAdapter() {
     	@Override
@@ -358,6 +359,7 @@ private boolean login() {
 						.getTenantDomains(new UserPasswordCredentials(getUser(), getPassword()));
 				if(tenants.size()==0){
 					error.setText(Messages.APP_CLOUD_ZERO_TENANTS_WARNING);
+					val = false;
 				}
 				else if(tenants.size()==1){					
 					Authenticator.getInstance().setSelectedTenant(tenants.entrySet().iterator().next().getValue());
@@ -398,7 +400,7 @@ else if(tenants.size()==1){
 		    resetCredintials(val, oldCredentials, oldServerURL);
 		} catch (Exception e) {
 	        log.error("Login failed", e);
-	        error.setText("Login failed due to system error");
+	        error.setText("Login failed.");
 	        setCursorNormal();
 	        resetCredintials(val, oldCredentials, oldServerURL);
 	        return false;

diff --git a/...tform.core/src/org/wso2/developerstudio/eclipse/platform/core/intro/ui/DashboardPage.java b/...tform.core/src/org/wso2/developerstudio/eclipse/platform/core/intro/ui/DashboardPage.java
@@ -161,7 +161,7 @@ public void selectionChanged(IWorkbenchPart workbenchPart, ISelection sel) {
 		toolkit.paintBordersFor(body);
 
 		Section sctnCreate = managedForm.getToolkit().createSection(managedForm.getForm().getBody(), Section.TWISTIE | Section.TITLE_BAR);
-		sctnCreate.setBounds(10, 10, 600, 1200);
+		sctnCreate.setBounds(10, 10, 650, 1200);
 		managedForm.getToolkit().paintBordersFor(sctnCreate);
 		sctnCreate.setText("Create");
 		sctnCreate.setExpanded(true);
@@ -181,7 +181,7 @@ public void selectionChanged(IWorkbenchPart workbenchPart, ISelection sel) {
 
 		sctnCreate.setExpanded(true);
 		Section sctnDistribution = managedForm.getToolkit().createSection(managedForm.getForm().getBody(), Section.TWISTIE | Section.TITLE_BAR);
-		sctnDistribution.setBounds(650, 10, 300, 75);
+		sctnDistribution.setBounds(700, 10, 300, 75);
 		managedForm.getToolkit().paintBordersFor(sctnDistribution);
 		sctnDistribution.setText("Distribution");
 
@@ -196,7 +196,7 @@ public void selectionChanged(IWorkbenchPart workbenchPart, ISelection sel) {
 		sctnDistribution.setExpanded(true);
 
 		Section sctnMaven = managedForm.getToolkit().createSection(managedForm.getForm().getBody(), Section.TWISTIE | Section.TITLE_BAR);
-		sctnMaven.setBounds(650, 90, 300, 75);
+		sctnMaven.setBounds(700, 90, 300, 75);
 		managedForm.getToolkit().paintBordersFor(sctnMaven);
 		sctnMaven.setText("Maven");
 
@@ -211,7 +211,7 @@ public void selectionChanged(IWorkbenchPart workbenchPart, ISelection sel) {
 		sctnMaven.setExpanded(true);		
 
 		Section sctnAddServer = managedForm.getToolkit().createSection(managedForm.getForm().getBody(), Section.TWISTIE | Section.TITLE_BAR);
-		sctnAddServer.setBounds(650, 170, 300, 75);
+		sctnAddServer.setBounds(700, 170, 300, 75);
 		managedForm.getToolkit().paintBordersFor(sctnAddServer);
 		sctnAddServer.setText("Add Server");
 
@@ -226,7 +226,7 @@ public void selectionChanged(IWorkbenchPart workbenchPart, ISelection sel) {
 		sctnAddServer.setExpanded(true);	
 
 		Section sctnSamples = managedForm.getToolkit().createSection(managedForm.getForm().getBody(), Section.TWISTIE | Section.TITLE_BAR);
-		sctnSamples.setBounds(650, 250, 300, 800);
+		sctnSamples.setBounds(700, 250, 300, 800);
 		managedForm.getToolkit().paintBordersFor(sctnSamples);
 		sctnSamples.setText("Samples");