[Esbox-commits] r2036 - in branches/work_Ed: org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/api/maemosdk/ui/preferences org.maemo.esbox.vm/src/org/maemo/esbox/vm/ui

[eswartz at garage.maemo.org]

Author: eswartz
Date: 2009-08-27 23:36:23 +0300 (Thu, 27 Aug 2009)
New Revision: 2036

Modified:
   branches/work_Ed/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/api/maemosdk/ui/preferences/MaemoSDKPreferenceIds.java
   branches/work_Ed/org.maemo.esbox.vm/src/org/maemo/esbox/vm/ui/SelectVirtualMachineDialog.java
Log:
-- Directly show Build Machines page instead of the "you need a build machine" dialog
-- Respond to cancellation when unzipping

Modified: branches/work_Ed/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/api/maemosdk/ui/preferences/MaemoSDKPreferenceIds.java
===================================================================
--- branches/work_Ed/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/api/maemosdk/ui/preferences/MaemoSDKPreferenceIds.java	2009-08-27 20:32:08 UTC (rev 2035)
+++ branches/work_Ed/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/api/maemosdk/ui/preferences/MaemoSDKPreferenceIds.java	2009-08-27 20:36:23 UTC (rev 2036)
@@ -20,5 +20,6 @@
 public interface MaemoSDKPreferenceIds {
 
 	public final String BUILD_MACHINE_PREFS_ID = UIActivator.PLUGIN_ID + ".preferencePage.buildMachines";
+	public static final String ESBOX_PREFERENCE_CATEGORY_ID = "org.maemo.esbox.ui.preferenceCategory.esbox";
 
 }

Modified: branches/work_Ed/org.maemo.esbox.vm/src/org/maemo/esbox/vm/ui/SelectVirtualMachineDialog.java
===================================================================
--- branches/work_Ed/org.maemo.esbox.vm/src/org/maemo/esbox/vm/ui/SelectVirtualMachineDialog.java	2009-08-27 20:32:08 UTC (rev 2035)
+++ branches/work_Ed/org.maemo.esbox.vm/src/org/maemo/esbox/vm/ui/SelectVirtualMachineDialog.java	2009-08-27 20:36:23 UTC (rev 2036)
@@ -19,6 +19,7 @@
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.*;
 import org.eclipse.ui.dialogs.PreferencesUtil;
+import org.maemo.esbox.internal.api.maemosdk.ui.preferences.MaemoSDKPreferenceIds;
 import org.maemo.esbox.internal.vm.Activator;
 import org.maemo.mica.common.core.ProductUtils;
 
@@ -29,9 +30,6 @@
  */
 public class SelectVirtualMachineDialog extends MessageDialogWithToggle {
 
-	public static final String BUILD_MACHINE_PREFS_ID = "org.maemo.esbox.maemosdk.ui.preferencePage.buildMachines";
-	protected static final String ESBOX_PREFERENCE_CATEGORY_ID = "org.maemo.esbox.ui.preferenceCategory.esbox";
-	
 	private static final String BUG_ME_NOT = "SelectBuildMachineDialog.BugMeNot";
 
 	/**
@@ -73,10 +71,10 @@
 				SelectVirtualMachineDialog.this.close();
 				PreferenceDialog dialog = PreferencesUtil.createPreferenceDialogOn(
 						getShell(), 
-						BUILD_MACHINE_PREFS_ID,
+						MaemoSDKPreferenceIds.BUILD_MACHINE_PREFS_ID,
 						new String[] { 
-								ESBOX_PREFERENCE_CATEGORY_ID,
-								BUILD_MACHINE_PREFS_ID, 
+								MaemoSDKPreferenceIds.ESBOX_PREFERENCE_CATEGORY_ID,
+								MaemoSDKPreferenceIds.BUILD_MACHINE_PREFS_ID, 
 							},
 						null);
 				dialog.open();