Issue #39: Improve Node.js debug dialogs and preferences

Author: eharris369

dev/com.ibm.microclimate.ui/src/com/ibm/microclimate/ui/internal/debug/NodeJsBrowserDialog.java

@@ -68,6 +68,8 @@ protected Control createDialogArea(Composite PARENT) {
 		Text l = new Text(composite, SWT.READ_ONLY | SWT.WRAP);
 		l.setText(Messages.NodeJsBrowserDialogPasteMessage);
 		l.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 3, 1));
+		l.setBackground(composite.getBackground());
+		l.setForeground(composite.getForeground());
 
 		// Text for the URL
 		Text l2 = new Text(composite, SWT.BORDER);
@@ -120,7 +122,6 @@ public void widgetSelected(SelectionEvent e) {
 	protected boolean isResizable() {
 		return true;
 	}
-	
 
 	protected void launchWebBrowser(String browserName, String urlStr) {
 		MCLogger.log("Launch web browser " + browserName + " with url: " + url); //$NON-NLS-1$ //$NON-NLS-2$

dev/com.ibm.microclimate.ui/src/com/ibm/microclimate/ui/internal/debug/WebBrowserSelectionDialog.java

@@ -71,6 +71,8 @@ protected Control createCustomArea(Composite parent)
 
         Text label = new Text(composite, SWT.READ_ONLY | SWT.SINGLE );
         label.setText(Messages.BrowserSelectionListLabel);
+        label.setBackground(composite.getBackground());
+        label.setForeground(composite.getForeground());
 
         updateWebBrowserCombo(composite);
 
@@ -148,31 +150,36 @@ protected void updateWebBrowserCombo(Composite composite){
 			    		webBrowserCombo.add(tempBrowser.getName());
 			    		String location = tempBrowser.getLocation();
 		    			// Try to select the first Chrome browser that can be found (use location to determine if it's Chrome) 
-		    		   if (location != null && location.indexOf("chrome") >= 0){ //$NON-NLS-1$
+		    		   if (location != null && location.toLowerCase().indexOf("chrome") >= 0){ //$NON-NLS-1$
 		    			   selectedIndex = i;
 		    		   }
 		        	}
-		        }        
+		        }
 
+		        // Only enable the OK button if something is selected
 				Button okButton = this.getButton(IDialogConstants.OK_ID);
-		        
-				// Only show the OK button enabled if there is a browser to select
-				if(okButton != null){
-					okButton.setEnabled(len > 0);
+				if (okButton != null) {
+					okButton.setEnabled(selectedIndex >= 0);
 				}
-				
+		        
 		        if (selectedIndex >= 0){
 			        webBrowserCombo.select(selectedIndex);
 			        browserName = validBrowsers.get(selectedIndex).getName();
 		        }
 
 				webBrowserCombo.addSelectionListener(new SelectionAdapter() {
 					public void widgetSelected(SelectionEvent e) {
+						boolean valid = false;
 						if (validBrowsers != null){
 							if (webBrowserCombo.getSelectionIndex() >= 0){
 								browserName = validBrowsers.get(webBrowserCombo.getSelectionIndex()).getName();
+								valid = true;
 							}
 						}
+						Button okButton = getButton(IDialogConstants.OK_ID);
+						if (okButton != null) {
+							okButton.setEnabled(valid);
+						}
 					}
 				});
 	        }
@@ -189,10 +196,10 @@ public String getBrowserName(){
 	}
 
 	public int open(){
-		// Make sure the OK button is disabled if no valid browser exists
+		// Make sure the OK button is only enabled if there is a selection
 		Button okButton = this.getButton(IDialogConstants.OK_ID);		
-		if (okButton != null && validBrowsers != null){
-			okButton.setEnabled(validBrowsers.size() > 0);
+		if (okButton != null) {
+			okButton.setEnabled(webBrowserCombo != null && webBrowserCombo.getSelectionIndex() >= 0);
 		}
 
 		return super.open();

dev/com.ibm.microclimate.ui/src/com/ibm/microclimate/ui/internal/messages/messages.properties

@@ -97,7 +97,7 @@ NodeJSDebugURLError=Failed to get the debug URL for the {0} application.
 
 BrowserSelectionTitle=Launch the Node.js Debugger
 BrowserSelectionDescription=Select a Chromium based web browser for launching the Node.js debugger.
-BrowserSelectionLabel=Select a Chromium based web browser for launching the Node.js debugger
+BrowserSelectionLabel=Select a Chromium based web browser for launching the Node.js debugger:
 BrowserSelectionAlwaysUseMsg=Always use selected Chromium based web browser for Node.js debugging
 BrowserSelectionManageButtonText=Manage...
 BrowserSelectionListLabel=Web browser:

dev/com.ibm.microclimate.ui/src/com/ibm/microclimate/ui/internal/prefs/MicroclimatePrefsParentPage.java

@@ -99,21 +99,29 @@ public void modifyText(ModifyEvent arg0) {
 		Label separator = new Label(composite, SWT.HORIZONTAL);
 	    separator.setLayoutData(new GridData(GridData.FILL_HORIZONTAL, GridData.CENTER, true, false, 2, 1));
 
-	    final Group selectWebBrowserComposite = new Group(composite, SWT.NONE);
+	    Text browserSelectionLabel = new Text(composite, SWT.READ_ONLY | SWT.SINGLE);
+	    browserSelectionLabel.setText(Messages.BrowserSelectionLabel);
+	    browserSelectionLabel.setLayoutData(new GridData(GridData.BEGINNING, GridData.CENTER, false, false, 3, 1));
+	    browserSelectionLabel.setBackground(composite.getBackground());
+	    browserSelectionLabel.setForeground(composite.getForeground());
+	    
+	    
+	    final Composite selectWebBrowserComposite = new Composite(composite, SWT.NONE);
 	    layout = new GridLayout();
 		layout.horizontalSpacing = convertHorizontalDLUsToPixels(4);
 		layout.verticalSpacing = convertVerticalDLUsToPixels(3);
 		layout.marginWidth = 20;
-		layout.marginHeight = 10;
+		layout.marginHeight = 2;
 	    layout.numColumns = 3;
 	    selectWebBrowserComposite.setLayout(layout);
-	    selectWebBrowserComposite.setText(Messages.BrowserSelectionLabel);
 	    selectWebBrowserComposite.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, false, 2, 1));
 
         selectWebBrowserLabel = new Text(selectWebBrowserComposite, SWT.READ_ONLY | SWT.SINGLE );
         selectWebBrowserLabel.setText(Messages.BrowserSelectionListLabel);	
-        selectWebBrowserLabel.setLayoutData(new GridData(GridData.BEGINNING, GridData.FILL, false, false, 1, 1));
-	    
+        selectWebBrowserLabel.setLayoutData(new GridData(GridData.BEGINNING, GridData.CENTER, false, false, 1, 1));
+	    selectWebBrowserLabel.setBackground(selectWebBrowserComposite.getBackground());
+	    selectWebBrowserLabel.setForeground(selectWebBrowserComposite.getForeground());
+        
         webBrowserCombo = new Combo(selectWebBrowserComposite, SWT.BORDER | SWT.READ_ONLY);
 
 	    refreshPreferencesPage();