Wed Oct 14 22:24:15 EEST 2009

Author: eswartz
Date: 2009-10-14 22:24:13 +0300 (Wed, 14 Oct 2009)
New Revision: 2304

Added:
   branches/work_Ed/org.maemo.esbox.help/html/tasks/SettingUpSharedFolders.html
Modified:
   branches/work_Ed/org.maemo.esbox.help/html/context_help/esbox_dialogs_help.xml
   branches/work_Ed/org.maemo.esbox.help/html/tocgettingstarted.html
   branches/work_Ed/org.maemo.esbox.help/html/toctasks.html
   branches/work_Ed/org.maemo.esbox.help/toctasks.xml
   branches/work_Ed/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/api/maemosdk/ui/preferences/SharedFolderTreeViewer.java
   branches/work_Ed/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/api/maemosdk/ui/preferences/SharedFoldersPreferencePage.java
   branches/work_Ed/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/maemosdk/ui/IHelpID.java
   branches/work_Ed/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/Scratchbox1SDKInstallerDataContentLabelProvider.java
   branches/work_Ed/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/Scratchbox1TargetInstallerDataContentLabelProvider.java
   branches/work_Ed/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/internal/vm/vmware/VMwareMachineController.java
   branches/work_Ed/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/internal/vm/vmware/VMwareSettingsPreferencePage.java
   branches/work_Ed/org.maemo.esbox.vm/conf/vm_prefs.xml
   branches/work_Ed/org.maemo.esbox.vm/src/org/maemo/esbox/internal/api/vm/ui/preferences/AddressFieldEditor.java
Log:
Checkpoint for shared folder work

Modified: branches/work_Ed/org.maemo.esbox.help/html/context_help/esbox_dialogs_help.xml
===================================================================

--- branches/work_Ed/org.maemo.esbox.help/html/context_help/esbox_dialogs_help.xml	2009-10-14 17:43:38 UTC (rev 2303)
+++ branches/work_Ed/org.maemo.esbox.help/html/context_help/esbox_dialogs_help.xml	2009-10-14 19:24:13 UTC (rev 2304)
@@ -12,11 +12,16 @@
     <!-- PLUGIN: org.maemo.esbox.maemosdk.ui -->
 	<!-- ESbox preferences -->
 	<context id="global_pref_esbox_buildmachines" >
-		<description>Select the build machine for ESbox.</description>
+		<description>Configure the build machine or virtual machine for ESbox.</description>
 		<topic label="Build Machines"  		href="html/tasks/SettingPreferences.html#build_machines" />
  		 <topic href="html/tasks/UsingVirtualMachines.html" label="Using Virtual Machines with ESbox"/>
 	</context>
 
+	<context id="global_pref_esbox_sharedfolders" >
+		<description>Shared folders in ESbox</description>
+		<topic label="Understanding Shared Folders"  		href="html/concepts/SharedFolders.html" />
+	</context>
+
 	<context id="global_pref_esbox_xserver" >
 		<description>Display settings for X server</description>
 		<topic label="X server"	  href="html/tasks/SettingPreferences.html#x_server" />

Added: branches/work_Ed/org.maemo.esbox.help/html/tasks/SettingUpSharedFolders.html
===================================================================
--- branches/work_Ed/org.maemo.esbox.help/html/tasks/SettingUpSharedFolders.html	                        (rev 0)
+++ branches/work_Ed/org.maemo.esbox.help/html/tasks/SettingUpSharedFolders.html	2009-10-14 19:24:13 UTC (rev 2304)
@@ -0,0 +1,15 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<html><head>
+  <title>Setting Up Shared Folders</title>
+</head><body>
+
+<iframe src="http://esbox.garage.maemo.org/2nd_edition/shared_folders.html" align="left"
+ height="100%" width="100%">
+<a href="http://esbox.garage.maemo.org/2nd_edition/shared_folders.html">Visit
+the current documentation online.</a>
+</iframe>
+
+
+
+</body></html>
\ No newline at end of file

Modified: branches/work_Ed/org.maemo.esbox.help/html/tocgettingstarted.html
===================================================================
--- branches/work_Ed/org.maemo.esbox.help/html/tocgettingstarted.html	2009-10-14 17:43:38 UTC (rev 2303)
+++ branches/work_Ed/org.maemo.esbox.help/html/tocgettingstarted.html	2009-10-14 19:24:13 UTC (rev 2304)
@@ -15,8 +15,10 @@
 <ul>
 <li><h3>Installation and Setup</h3>
 <ul>
-<li><a href="../html/tasks/UsingVirtualMachines.html">Running ESbox on Virtual Machine</a>
+<li><a href="../html/tasks/UsingVirtualMachines.html">Running ESbox on a Virtual Machine</a>
 </li>
+<li><a href="../html/tasks/SettingUpSharedFolders.html">Setting Up Shared Folders</a>
+</li>
 <li><a href="../html/tasks/InstallingScratchbox1.html">Installing Scratchbox 1</a>
 </li>
 <li><a href="../html/tasks/InstallingScratchbox1Targets.html">Installing Scratchbox 1 Targets</a>

Modified: branches/work_Ed/org.maemo.esbox.help/html/toctasks.html
===================================================================
--- branches/work_Ed/org.maemo.esbox.help/html/toctasks.html	2009-10-14 17:43:38 UTC (rev 2303)
+++ branches/work_Ed/org.maemo.esbox.help/html/toctasks.html	2009-10-14 19:24:13 UTC (rev 2304)
@@ -14,6 +14,7 @@
 <h2>Tasks</h2>
 <ul>
 <li><h3><a href="../html/tasks/UsingVirtualMachines.html">Using ESbox with Virtual Machines</a>
+<h3><a href="../html/tasks/SettingUpSharedFolders.html">Setting Up Shared Folders</a>
 </h3><li><h3><a href="../html/tasks/InstallingScratchbox1.html">Install Scratchbox 1</a>
 </h3><li><h3><a href="../html/tasks/InstallingScratchbox1Targets.html">Install Scratchbox 1 Targets</a>
 </h3><li><h3><a href="../html/tasks/InstallingScratchbox2Targets.html">Install Scratchbox 2 Targets</a>

Modified: branches/work_Ed/org.maemo.esbox.help/toctasks.xml
===================================================================
--- branches/work_Ed/org.maemo.esbox.help/toctasks.xml	2009-10-14 17:43:38 UTC (rev 2303)
+++ branches/work_Ed/org.maemo.esbox.help/toctasks.xml	2009-10-14 19:24:13 UTC (rev 2304)
@@ -4,6 +4,8 @@
 <toc label="Tasks" link_to="toc.xml#tasks" topic="html/toctasks.html">
      <topic href="html/tasks/UsingVirtualMachines.html" label="Using ESbox with Virtual Machines">
     </topic>
+     <topic href="html/tasks/SettingUpSharedFolders.html" label="Setting Up Shared Folders">
+    </topic>
      <topic href="html/tasks/InstallingScratchbox1.html" label="Install Scratchbox 1">
     </topic>
      <topic href="html/tasks/InstallingScratchbox1Targets.html" label="Install Scratchbox 1 Targets">

Modified: branches/work_Ed/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/api/maemosdk/ui/preferences/SharedFolderTreeViewer.java
===================================================================
--- branches/work_Ed/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/api/maemosdk/ui/preferences/SharedFolderTreeViewer.java	2009-10-14 17:43:38 UTC (rev 2303)
+++ branches/work_Ed/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/api/maemosdk/ui/preferences/SharedFolderTreeViewer.java	2009-10-14 19:24:13 UTC (rev 2304)
@@ -441,12 +441,14 @@
 		public Image getColumnImage(Object element, int columnIndex) {
 			ISharedFolder folder = null;
 			if (scanFolders && element instanceof ISharedFolder && columnIndex == COLUMN_FIELD) {
-				folder = (ISharedFolder) element;
-				IStatus status = getShareStatus(folder);
-				if (status != null)
-					return CommonUIImages.getStatusLightIcon(status);
-				else if (scanSharedFoldersThread != null)
+				if (scanSharedFoldersThread != null)
 					return CommonUIImages.getImage(CommonUIImages.STATUS_PENDING_ICON);
+				else {
+					folder = (ISharedFolder) element;
+					IStatus status = getShareStatus(folder);
+					if (status != null)
+						return CommonUIImages.getStatusLightIcon(status);
+				}
 			}
 			return null;
 		}
@@ -462,23 +464,25 @@
 							? folder.getLocalPath().toOSString() 
 									: folder.getRemotePath().toPortableString());
 				} else if (scanFolders && columnIndex == COLUMN_CONTENT) {
-					IStatus status = getShareStatus(folder);
-					if (status != null) {
-						if (!status.isOK() && status.getSeverity() != IStatus.CANCEL) {
-							String prefix = "";
-							if (status.getSeverity() == IStatus.WARNING)
-								prefix = "Warning: ";
-							else if (status.getSeverity() == IStatus.ERROR)
-								prefix = "Error: ";
-							else if (status.getSeverity() == IStatus.INFO)
-								prefix = "Info: ";
-							return prefix + status.getMessage();
-						} else if (status.isOK()) {
-							return "Connected";
+					if (scanSharedFoldersThread != null) {
+						return "Scanning...";
+					} else {
+						IStatus status = getShareStatus(folder);
+						if (status != null) {
+							if (!status.isOK() && status.getSeverity() != IStatus.CANCEL) {
+								String prefix = "";
+								if (status.getSeverity() == IStatus.WARNING)
+									prefix = "Warning: ";
+								else if (status.getSeverity() == IStatus.ERROR)
+									prefix = "Error: ";
+								else if (status.getSeverity() == IStatus.INFO)
+									prefix = "Info: ";
+								return prefix + status.getMessage();
+							} else if (status.isOK()) {
+								return "Connected";
+							}
+							return "";
 						}
-						return "";
-					} else if (scanSharedFoldersThread != null) {
-						return "Scanning...";
 					}
 				}
 			}

Modified: branches/work_Ed/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/api/maemosdk/ui/preferences/SharedFoldersPreferencePage.java
===================================================================
--- branches/work_Ed/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/api/maemosdk/ui/preferences/SharedFoldersPreferencePage.java	2009-10-14 17:43:38 UTC (rev 2303)
+++ branches/work_Ed/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/api/maemosdk/ui/preferences/SharedFoldersPreferencePage.java	2009-10-14 19:24:13 UTC (rev 2304)
@@ -37,8 +37,9 @@
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Link;
 import org.eclipse.swt.widgets.Tree;
+import org.maemo.esbox.internal.maemosdk.ui.IHelpID;
 import org.maemo.esbox.maemosdk.core.MaemoPreferenceConstants;
 import org.maemo.mica.common.core.filesystem.EShareType;
 import org.maemo.mica.common.core.filesystem.ISharedFolder;
@@ -50,6 +51,8 @@
 import org.maemo.mica.internal.api.common.core.filesystem.SharedFolderPreferenceConverter;
 import org.maemo.mica.internal.api.common.core.ui.GridLayoutWrappedTextUtils;
 
+import com.nokia.cpp.internal.api.utils.ui.WorkbenchUtils;
+
 /**
  * This page is included inside a BuildMachineSelectionPreferencePage
  * to configure the shared folder mappings between host and target.
@@ -151,6 +154,7 @@
 		composite = new Composite(parent, SWT.NONE);
 		setControl(composite);
 
+		WorkbenchUtils.setHelpContextId(composite, IHelpID.HID_GLOBAL_PREF_ESBOX_SHAREDFOLDERS);
 		GridLayout layout = new GridLayout(2, false);
 		layout.marginWidth = layout.marginHeight = 0;
 		composite.setLayout(layout);
@@ -159,17 +163,17 @@
 		layoutData.horizontalSpan = 2;
 		composite.setLayoutData(layoutData);
 		
-		// left side is the table
-		Label label = new Label(composite, SWT.WRAP);
+		Link label = new Link(composite, SWT.WRAP);
 		label.setText(
 		"ESbox needs to create projects on the host, in a shared folder visible to the VM.  "+
-		"For C/C++ indexing and C++ hover help, ESbox must be able to see SDK contents from a VM shared folder visible to the host.\n\n"+
+		"For C/C++ indexing and C++ hover help, ESbox must be able to see SDK contents from a VM shared folder visible to the host.\n \n"+
 		"&Configure the shared folders to use:");
 		
 		GridData labelLayout = new GridData(SWT.LEFT, SWT.TOP, true, false);
 		labelLayout.horizontalSpan = 2;
 		GridLayoutWrappedTextUtils.setupLabel(composite, label, labelLayout);
 
+		// left side is the table
 		Composite tableComposite = new Composite(composite, SWT.NONE);
 		GridLayoutFactory.fillDefaults().applyTo(tableComposite);
 		GridDataFactory.fillDefaults().grab(true, true).applyTo(tableComposite);
@@ -317,7 +321,8 @@
 	}
 	
 	protected void validate() {
-		if (treeViewer.getControl().isDisposed())
+		if (treeViewer.getControl().isDisposed() || 
+				getOwner() == null || getOwner().getControl().isDisposed())
 			return;
 		
 		setErrorMessage(null);
@@ -413,6 +418,8 @@
 		// hmm, this is a no-op... we'd really like to edit into the
 		// first field of the share.
 		treeViewer.editElement(share, 0);
+		
+		treeViewer.scheduleStatusUpdate();
 	}
 	
 	protected void doRemove() {

Modified: branches/work_Ed/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/maemosdk/ui/IHelpID.java
===================================================================
--- branches/work_Ed/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/maemosdk/ui/IHelpID.java	2009-10-14 17:43:38 UTC (rev 2303)
+++ branches/work_Ed/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/maemosdk/ui/IHelpID.java	2009-10-14 19:24:13 UTC (rev 2304)
@@ -24,6 +24,11 @@
 	public static final String HID_GLOBAL_PREF_ESBOX_BUILDMACHINES = PREFIX + "global_pref_esbox_buildmachines"; //$NON-NLS-1$
 
 	/**
+	 *  Global preference => ESbox => Build Machines => Shared Folders
+	 */
+	public static final String HID_GLOBAL_PREF_ESBOX_SHAREDFOLDERS = PREFIX + "global_pref_esbox_sharedfolders"; //$NON-NLS-1$
+
+	/**
 	 *  Global preference => ESbox => X Server.
 	 */
 	public static final String HID_GLOBAL_PREF_ESBOX_XSERVER = PREFIX + "global_pref_esbox_xserver"; //$NON-NLS-1$

Modified: branches/work_Ed/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/Scratchbox1SDKInstallerDataContentLabelProvider.java
===================================================================
--- branches/work_Ed/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/Scratchbox1SDKInstallerDataContentLabelProvider.java	2009-10-14 17:43:38 UTC (rev 2303)
+++ branches/work_Ed/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/Scratchbox1SDKInstallerDataContentLabelProvider.java	2009-10-14 19:24:13 UTC (rev 2304)
@@ -50,7 +50,7 @@
 						"scratchbox-toolchain-host-gcc"));
 			}
 			
-			//Fremantle Beta 2
+			//Fremantle
 			urls = fetchScriptsFromUrl( 
 					"http://repository.maemo.org/stable/5.0/",
 					"maemo-scratchbox-install.*\\.sh");

Modified: branches/work_Ed/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/Scratchbox1TargetInstallerDataContentLabelProvider.java
===================================================================
--- branches/work_Ed/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/Scratchbox1TargetInstallerDataContentLabelProvider.java	2009-10-14 17:43:38 UTC (rev 2303)
+++ branches/work_Ed/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/Scratchbox1TargetInstallerDataContentLabelProvider.java	2009-10-14 19:24:13 UTC (rev 2304)
@@ -53,14 +53,14 @@
 				));
 			}
 			
-			// Fremantle Beta 2 release support
+			// Fremantle release support
 			urls = fetchScriptsFromUrl( 
 					"http://repository.maemo.org/stable/5.0/", 
 					"maemo-sdk-install.*\\.sh");
 
 			for (URL url : urls) {
 				contents.add(new Scratchbox1TargetInstallerData(
-						"Maemo 5.0 Fremantle (Beta 2 Release)",
+						"Maemo 5.0 Fremantle",
 						url,
 						sdks.size() > 0 ? sdks.get(0) : null,
 						"FREMANTLE",

Modified: branches/work_Ed/org.maemo.esbox.vm/conf/vm_prefs.xml
===================================================================
--- branches/work_Ed/org.maemo.esbox.vm/conf/vm_prefs.xml	2009-10-14 17:43:38 UTC (rev 2303)
+++ branches/work_Ed/org.maemo.esbox.vm/conf/vm_prefs.xml	2009-10-14 19:24:13 UTC (rev 2304)
@@ -24,8 +24,8 @@
 	<entry key="VM_SSH_TIMEOUT">3</entry>		<!-- VMs are local so should not take long -->
 	<entry key="VM_CIFS_TARGET_PORT">4445</entry>
 	
-	<entry key="VM_SHARED_FOLDERS_WIN32">c:\maemo\shared|/home/maemo/shared|false|true|SMB|shared,c:\maemo\shared|/scratchbox/users/maemo/home/maemo/shared|false|true|SMB|shared</entry>
-	<entry key="VM_SHARED_FOLDERS_UNIX">$(user.home)/maemo/shared|/home/maemo/shared|false|true|SMB|shared,$(user.home)/maemo/shared|/scratchbox/users/maemo/home/maemo/shared|false|true|SMB|shared</entry>
-	<entry key="VM_SHARED_FOLDERS_OSX">$(user.home)/Public|/home/maemo/shared|false|true|SMB|$(user.name)'s Public Folder,$(user.home)/Public|/scratchbox/users/maemo/home/maemo/shared|false|true|SMB|$(user.name)'s Public Folder</entry>
+	<entry key="VM_SHARED_FOLDERS_WIN32">c:\maemo\shared|/home/maemo/shared|false|true|SMB|shared,c:\maemo\shared|/scratchbox/users/maemo/home/maemo/shared|false|true|SMB|shared,/scratchbox|S:|false|false|SMB|scratchbox,/home/maemo|T:|false|false|SMB|maemo</entry>
+	<entry key="VM_SHARED_FOLDERS_UNIX">$(user.home)/maemo/shared|/home/maemo/shared|false|true|SMB|shared,$(user.home)/maemo/shared|/scratchbox/users/maemo/home/maemo/shared|false|true|SMB|shared,/scratchbox|/media/scratchbox|false|false|SMB|scratchbox,/home/maemo|/media/maemo|false|false|SMB|maemo</entry>
+	<entry key="VM_SHARED_FOLDERS_OSX">$(user.home)/Public|/home/maemo/shared|false|true|SMB|$(user.name)'s Public Folder,$(user.home)/Public|/scratchbox/users/maemo/home/maemo/shared|false|true|SMB|$(user.name)'s Public Folder,/scratchbox|/Volumes/scratchbox|false|false|SMB|scratchbox,/home/maemo|/Volumes/maemo|false|false|SMB|maemo</entry>
 	
 </properties>

Modified: branches/work_Ed/org.maemo.esbox.vm/src/org/maemo/esbox/internal/api/vm/ui/preferences/AddressFieldEditor.java
===================================================================
--- branches/work_Ed/org.maemo.esbox.vm/src/org/maemo/esbox/internal/api/vm/ui/preferences/AddressFieldEditor.java	2009-10-14 17:43:38 UTC (rev 2303)
+++ branches/work_Ed/org.maemo.esbox.vm/src/org/maemo/esbox/internal/api/vm/ui/preferences/AddressFieldEditor.java	2009-10-14 19:24:13 UTC (rev 2304)
@@ -227,7 +227,7 @@
 		}
 		
 		if (getPage() != null) {
-			getPage().setMessage(null, IMessageProvider.NONE);
+			getPage().setMessage(null, IMessageProvider.INFORMATION);
 		}
 		clearErrorMessage();
 

Modified: branches/work_Ed/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/internal/vm/vmware/VMwareMachineController.java
===================================================================
--- branches/work_Ed/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/internal/vm/vmware/VMwareMachineController.java	2009-10-14 17:43:38 UTC (rev 2303)
+++ branches/work_Ed/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/internal/vm/vmware/VMwareMachineController.java	2009-10-14 19:24:13 UTC (rev 2304)
@@ -158,7 +158,7 @@
 				"start", vmwareConfiguration.getVmxPath());
 		
 		// if not vmrun, generate directly
-		if (cmdLine == null) {
+		if (cmdLine == null || vmwareConfiguration.getProduct().equals(IVMwareConfiguration.PRODUCT_PLAYER)) {
 			cmdLine = new ArrayList<String>();
 			
 			IPath launchPath = getExecutablePath(vmwareConfiguration);
@@ -198,7 +198,8 @@
 		monitor.beginTask("Starting VMware...", 10);
 
 		IVMwareConfiguration config = (IVMwareConfiguration) machineConfiguration;
-		boolean usingVMrun = VMwareUtils.findVmrunExecutable(config.getInstallPath()) != null;
+		boolean usingVMrun = VMwareUtils.findVmrunExecutable(config.getInstallPath()) != null
+			&& !config.getProduct().equals(IVMwareConfiguration.PRODUCT_PLAYER);
 		
 		monitor.subTask("Checking existing VMware instances...");
 		
@@ -266,8 +267,13 @@
 			status = probeUntilConnect(
 					watchStatus,
 					new SubProgressMonitor(monitor, 8));
-		else
-			status = Status.OK_STATUS;	
+		else {
+			scheduleProbe();
+			status = isMachineRunning() ? Status.OK_STATUS :
+				Activator.createErrorStatus("The machine " + config.getVmxPath() + " failed to start:\n \n"
+						+ launchInfo.streamGrabber.toString(),
+						null);
+		}
 		
 		if (monitor.isCanceled() || status.getSeverity() == IStatus.CANCEL) {
 			launchInfo.cancel();

Modified: branches/work_Ed/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/internal/vm/vmware/VMwareSettingsPreferencePage.java
===================================================================
--- branches/work_Ed/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/internal/vm/vmware/VMwareSettingsPreferencePage.java	2009-10-14 17:43:38 UTC (rev 2303)
+++ branches/work_Ed/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/internal/vm/vmware/VMwareSettingsPreferencePage.java	2009-10-14 19:24:13 UTC (rev 2304)
@@ -83,12 +83,12 @@
 			};
 			feVMwareProductType = new RadioGroupFieldEditor(
 					VMwarePreferenceConstants.VMWARE_PRODUCT,
-					"Product Type:",
+					"Product &type:",
 					3, namesAndValues,
 					getFieldEditorParent());
 			
 			Composite radioBoxControl = feVMwareProductType.getRadioBoxControl(getFieldEditorParent());
-			radioBoxControl.setToolTipText("Set the VMware product type to use.");
+			radioBoxControl.setToolTipText("Set the VMware product type to use.  You can select, for instance, to use VMware Player instead of Workstation, since both are installed together.");
 			addField(feVMwareProductType);
 		}
 		
@@ -105,7 +105,7 @@
 		
 		feVMWAREPath = new DirectoryFieldEditor(
 				VMwarePreferenceConstants.VMWARE_INSTALL_PATH,
-				"Installation directory:", getFieldEditorParent());
+				"Installation &directory:", getFieldEditorParent());
 		addField(feVMWAREPath);
 		text = feVMWAREPath.getTextControl(getFieldEditorParent()); 
 		text.setToolTipText(
@@ -125,7 +125,7 @@
 		
 		feVmxPath = new NonValidatingFileFieldEditor(
 				VMwarePreferenceConstants.VMWARE_VMX_PATH,
-				"VMX path:", getFieldEditorParent());
+				"&VMX path:", getFieldEditorParent());
 		addField(feVmxPath);
 		text = feVmxPath.getTextControl(getFieldEditorParent());
 		text.setToolTipText(

