[Esbox-commits] r1603 - in tags/2.0.0-M4: org.maemo.esbox.project.cpp/src/org/maemo/esbox/internal/project/cpp org.maemo.esbox.project.cpp/src/org/maemo/esbox/internal/project/cpp/ui/wizards org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/wizards org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/scratchbox/core org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/scratchbox/core/sbrsh
eswartz at garage.maemo.org
eswartz at garage.maemo.org
Sat May 16 00:16:45 EEST 2009
Author: eswartz
Date: 2009-05-16 00:16:45 +0300 (Sat, 16 May 2009)
New Revision: 1603
Added:
tags/2.0.0-M4/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/scratchbox/core/IHelpID.java
Modified:
tags/2.0.0-M4/org.maemo.esbox.project.cpp/src/org/maemo/esbox/internal/project/cpp/IHelpID.java
tags/2.0.0-M4/org.maemo.esbox.project.cpp/src/org/maemo/esbox/internal/project/cpp/ui/wizards/ESboxCCProjectWizard.java
tags/2.0.0-M4/org.maemo.esbox.project.cpp/src/org/maemo/esbox/internal/project/cpp/ui/wizards/ESboxCProjectWizard.java
tags/2.0.0-M4/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/IHelpID.java
tags/2.0.0-M4/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/wizards/ESboxPythonProjectWizard.java
tags/2.0.0-M4/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/scratchbox/core/sbrsh/SBRSHPreferencePage.java
Log:
Hook up more help IDs
Modified: tags/2.0.0-M4/org.maemo.esbox.project.cpp/src/org/maemo/esbox/internal/project/cpp/IHelpID.java
===================================================================
--- tags/2.0.0-M4/org.maemo.esbox.project.cpp/src/org/maemo/esbox/internal/project/cpp/IHelpID.java 2009-05-15 20:44:16 UTC (rev 1602)
+++ tags/2.0.0-M4/org.maemo.esbox.project.cpp/src/org/maemo/esbox/internal/project/cpp/IHelpID.java 2009-05-15 21:16:45 UTC (rev 1603)
@@ -17,4 +17,15 @@
*/
public interface IHelpID {
public static final String PREFIX = Activator.PLUGIN_ID + "."; //$NON-NLS-1$
+
+ /**
+ * Wizard => New => Maemo C Project
+ */
+ public static final String HID_WIZARD_NEW_MAEMO_C_PROJECT = PREFIX + "wizard_new_project_maemo_c"; //$NON-NLS-1$
+
+ /**
+ * Wizard => New => Maemo C++ Project
+ */
+ public static final String HID_WIZARD_NEW_MAEMO_CPP_PROJECT = PREFIX + "wizard_new_project_maemo_cpp"; //$NON-NLS-1$
+
}
Modified: tags/2.0.0-M4/org.maemo.esbox.project.cpp/src/org/maemo/esbox/internal/project/cpp/ui/wizards/ESboxCCProjectWizard.java
===================================================================
--- tags/2.0.0-M4/org.maemo.esbox.project.cpp/src/org/maemo/esbox/internal/project/cpp/ui/wizards/ESboxCCProjectWizard.java 2009-05-15 20:44:16 UTC (rev 1602)
+++ tags/2.0.0-M4/org.maemo.esbox.project.cpp/src/org/maemo/esbox/internal/project/cpp/ui/wizards/ESboxCCProjectWizard.java 2009-05-15 21:16:45 UTC (rev 1603)
@@ -11,7 +11,11 @@
package org.maemo.esbox.internal.project.cpp.ui.wizards;
+import com.nokia.cpp.internal.api.utils.ui.WorkbenchUtils;
+
+import org.eclipse.jface.wizard.IWizardContainer;
import org.maemo.esbox.internal.project.cpp.Activator;
+import org.maemo.esbox.internal.project.cpp.IHelpID;
import org.maemo.mica.cpp.project.core.MicaCppProjectType;
/**
@@ -34,4 +38,18 @@
protected String getProjectTypeIdPattern() {
return MicaCppProjectType.ID_CC;
}
+
+ /* (non-Javadoc)
+ * @see org.maemo.mica.common.project.ui.wizards.CommonNewProjectWizard#setContainer(org.eclipse.jface.wizard.IWizardContainer)
+ */
+ @Override
+ public void setContainer(IWizardContainer wizardContainer) {
+ super.setContainer(wizardContainer);
+ if (wizardContainer != null) {
+ WorkbenchUtils.setHelpContextId(getContainer().getShell(),
+ IHelpID.HID_WIZARD_NEW_MAEMO_CPP_PROJECT);
+
+ }
+ }
}
+
Modified: tags/2.0.0-M4/org.maemo.esbox.project.cpp/src/org/maemo/esbox/internal/project/cpp/ui/wizards/ESboxCProjectWizard.java
===================================================================
--- tags/2.0.0-M4/org.maemo.esbox.project.cpp/src/org/maemo/esbox/internal/project/cpp/ui/wizards/ESboxCProjectWizard.java 2009-05-15 20:44:16 UTC (rev 1602)
+++ tags/2.0.0-M4/org.maemo.esbox.project.cpp/src/org/maemo/esbox/internal/project/cpp/ui/wizards/ESboxCProjectWizard.java 2009-05-15 21:16:45 UTC (rev 1603)
@@ -11,7 +11,11 @@
package org.maemo.esbox.internal.project.cpp.ui.wizards;
+import com.nokia.cpp.internal.api.utils.ui.WorkbenchUtils;
+
+import org.eclipse.jface.wizard.IWizardContainer;
import org.maemo.esbox.internal.project.cpp.Activator;
+import org.maemo.esbox.internal.project.cpp.IHelpID;
import org.maemo.mica.cpp.project.core.MicaCppProjectType;
/**
@@ -29,4 +33,17 @@
protected String getProjectTypeIdPattern() {
return MicaCppProjectType.ID_C;
}
+
+ /* (non-Javadoc)
+ * @see org.maemo.mica.common.project.ui.wizards.CommonNewProjectWizard#setContainer(org.eclipse.jface.wizard.IWizardContainer)
+ */
+ @Override
+ public void setContainer(IWizardContainer wizardContainer) {
+ super.setContainer(wizardContainer);
+ if (wizardContainer != null) {
+ WorkbenchUtils.setHelpContextId(getContainer().getShell(),
+ IHelpID.HID_WIZARD_NEW_MAEMO_C_PROJECT);
+
+ }
+ }
}
Modified: tags/2.0.0-M4/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/IHelpID.java
===================================================================
--- tags/2.0.0-M4/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/IHelpID.java 2009-05-15 20:44:16 UTC (rev 1602)
+++ tags/2.0.0-M4/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/IHelpID.java 2009-05-15 21:16:45 UTC (rev 1603)
@@ -17,14 +17,10 @@
*/
public interface IHelpID {
public static final String PREFIX = UIActivator.PLUGIN_ID + "."; //$NON-NLS-1$
-
+
/**
- * Global preference => ESbox => Build Machines.
+ * Wizard => New => Maemo Python Project
*/
- public static final String HID_GLOBAL_PREF_ESBOX_BUILDMACHINES = PREFIX + "global_pref_esbox_buildmachines"; //$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$
+ public static final String HID_WIZARD_NEW_MAEMO_PYTHON_PROJECT = PREFIX + "wizard_new_project_maemo_python"; //$NON-NLS-1$
+
}
Modified: tags/2.0.0-M4/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/wizards/ESboxPythonProjectWizard.java
===================================================================
--- tags/2.0.0-M4/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/wizards/ESboxPythonProjectWizard.java 2009-05-15 20:44:16 UTC (rev 1602)
+++ tags/2.0.0-M4/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/wizards/ESboxPythonProjectWizard.java 2009-05-15 21:16:45 UTC (rev 1603)
@@ -11,8 +11,12 @@
package org.maemo.esbox.internal.project.python.wizards;
+import com.nokia.cpp.internal.api.utils.ui.WorkbenchUtils;
+
import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.wizard.IWizardContainer;
import org.eclipse.ui.INewWizard;
+import org.maemo.esbox.internal.project.python.IHelpID;
import org.maemo.esbox.internal.project.python.UIActivator;
import org.maemo.mica.common.project.core.BuildMachineHostedTargetFilter;
import org.maemo.mica.common.project.core.IBuildTargetFilter;
@@ -61,4 +65,17 @@
protected ImageDescriptor getWizardPageImageDescriptor() {
return UIActivator.getImageDescriptor("./icons/full/wizban/maemo_wizban.gif");
}
+
+ /* (non-Javadoc)
+ * @see org.maemo.mica.common.project.ui.wizards.CommonNewProjectWizard#setContainer(org.eclipse.jface.wizard.IWizardContainer)
+ */
+ @Override
+ public void setContainer(IWizardContainer wizardContainer) {
+ super.setContainer(wizardContainer);
+ if (wizardContainer != null) {
+ WorkbenchUtils.setHelpContextId(getContainer().getShell(),
+ IHelpID.HID_WIZARD_NEW_MAEMO_PYTHON_PROJECT);
+
+ }
+ }
}
Added: tags/2.0.0-M4/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/scratchbox/core/IHelpID.java
===================================================================
--- tags/2.0.0-M4/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/scratchbox/core/IHelpID.java (rev 0)
+++ tags/2.0.0-M4/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/scratchbox/core/IHelpID.java 2009-05-15 21:16:45 UTC (rev 1603)
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Nokia Corporation
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.maemo.esbox.internal.scratchbox.core;
+
+/**
+ * Help IDs for scratchbox UI
+ * @author eswartz
+ *
+ */
+public interface IHelpID {
+ public static final String PREFIX = Activator.PLUGIN_ID + "."; //$NON-NLS-1$
+
+ /**
+ * Global preference => ESbox => SBRSH
+ */
+ public static final String HID_GLOBAL_PREF_ESBOX_SBRSH = PREFIX + "global_pref_esbox_sbrsh"; //$NON-NLS-1$
+
+
+}
Modified: tags/2.0.0-M4/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/scratchbox/core/sbrsh/SBRSHPreferencePage.java
===================================================================
--- tags/2.0.0-M4/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/scratchbox/core/sbrsh/SBRSHPreferencePage.java 2009-05-15 20:44:16 UTC (rev 1602)
+++ tags/2.0.0-M4/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/scratchbox/core/sbrsh/SBRSHPreferencePage.java 2009-05-15 21:16:45 UTC (rev 1603)
@@ -16,6 +16,8 @@
import org.eclipse.jface.preference.StringFieldEditor;
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.IWorkbenchPreferencePage;
+import org.maemo.esbox.internal.scratchbox.core.IHelpID;
+import org.maemo.mica.common.core.GeneralUtils;
/**
* @author Fabrício S Epaminondas (UFCG)
@@ -32,6 +34,9 @@
}
public void createFieldEditors() {
+
+ GeneralUtils.setHelpID(getControl(), IHelpID.HID_GLOBAL_PREF_ESBOX_SBRSH);
+
addField(
new StringFieldEditor(SBRSHPreferenceConstants.SBRSH_LAUNCH_COMMAND, "Launch command:", getFieldEditorParent()));
addField(
More information about the Esbox-commits
mailing list