157599 - [Cheat Sheet Authoring] Hide the two cheatsheet wizard options
diff --git a/ui/org.eclipse.pde.ui/icons/etool16/new_cheatsheet_wiz.gif b/ui/org.eclipse.pde.ui/icons/etool16/new_cheatsheet_wiz.gif
new file mode 100644
index 0000000..d910b2b
--- /dev/null
+++ b/ui/org.eclipse.pde.ui/icons/etool16/new_cheatsheet_wiz.gif
Binary files differ
diff --git a/ui/org.eclipse.pde.ui/icons/etool16/new_cheatsheet_wizard.gif b/ui/org.eclipse.pde.ui/icons/obj16/cheatsheet_obj.gif
similarity index 100%
rename from ui/org.eclipse.pde.ui/icons/etool16/new_cheatsheet_wizard.gif
rename to ui/org.eclipse.pde.ui/icons/obj16/cheatsheet_obj.gif
Binary files differ
diff --git a/ui/org.eclipse.pde.ui/icons/wizban/new_cheatsheet_wiz.png b/ui/org.eclipse.pde.ui/icons/wizban/new_cheatsheet_wiz.png
new file mode 100644
index 0000000..e9af471
--- /dev/null
+++ b/ui/org.eclipse.pde.ui/icons/wizban/new_cheatsheet_wiz.png
Binary files differ
diff --git a/ui/org.eclipse.pde.ui/plugin.xml b/ui/org.eclipse.pde.ui/plugin.xml
index 8debdb5..8d96109 100644
--- a/ui/org.eclipse.pde.ui/plugin.xml
+++ b/ui/org.eclipse.pde.ui/plugin.xml
@@ -193,7 +193,7 @@
<wizard
category="org.eclipse.pde.userAssistance"
class="org.eclipse.pde.internal.ui.wizards.cheatsheet.NewCheatSheetFileWizard"
- icon="$nl$/icons/etool16/new_cheatsheet_wizard.gif"
+ icon="$nl$/icons/etool16/new_cheatsheet_wiz.gif"
id="org.eclipse.pde.ui.NewCheatSheetWizard"
name="%new.cheat.sheet">
<description>
@@ -705,7 +705,7 @@
<editor
class="org.eclipse.pde.internal.ui.editor.cheatsheet.simple.SimpleCSEditor"
contributorClass="org.eclipse.pde.internal.ui.editor.cheatsheet.simple.SimpleCSEditorContributor"
- icon="$nl$/icons/etool16/new_cheatsheet_wizard.gif"
+ icon="$nl$/icons/obj16/cheatsheet_obj.gif"
id="org.eclipse.pde.ui.simpleCheatSheetEditor"
name="%cheat.sheat.editor.name">
<contentTypeBinding
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/PDEPluginImages.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/PDEPluginImages.java
index e2f1488..d68b9f4 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/PDEPluginImages.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/PDEPluginImages.java
@@ -239,6 +239,7 @@
public static final ImageDescriptor DESC_FEATURE_EXPORT_WIZ = create(PATH_WIZBAN, "exp_deployfeat_wiz.png"); //$NON-NLS-1$
public static final ImageDescriptor DESC_MIGRATE_30_WIZ = create(PATH_WIZBAN, "migrate_30_wiz.png"); //$NON-NLS-1$
public static final ImageDescriptor DESC_PRODUCT_WIZ = create(PATH_WIZBAN, "product_wiz.png"); //$NON-NLS-1$
+ public static final ImageDescriptor DESC_CHEATSHEET_WIZ = create(PATH_WIZBAN, "new_cheatsheet_wiz.png"); //$NON-NLS-1$
public static final ImageDescriptor DESC_PRODUCT_EXPORT_WIZ = create(PATH_WIZBAN, "exp_product.png"); //$NON-NLS-1$
public static final ImageDescriptor DESC_JAR_TO_PLUGIN_WIZ = create(PATH_WIZBAN, "jarToPlugin_wiz.png"); //$NON-NLS-1$
public static final ImageDescriptor DESC_EXTSTR_WIZ = create(PATH_WIZBAN, "extstr_wiz.png"); //$NON-NLS-1$
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/pderesources.properties b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/pderesources.properties
index bd932e4..a471fc8 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/pderesources.properties
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/pderesources.properties
@@ -987,10 +987,10 @@
FeatureDetailsSection_requiredURL_title=URL Required.
SiteEditor_PortabilitySection_title = Feature Environments
-SimpleCheatSheetCreationOperation_0=Cheat Sheet Introduction
+SimpleCheatSheetCreationOperation_0=Body
SimpleCheatSheetCreationOperation_1=Item
-SimpleCheatSheetCreationOperation_2=Item Body
-SimpleCheatSheetCreationOperation_3=Cheat Sheet Title
+SimpleCheatSheetCreationOperation_2=Body
+SimpleCheatSheetCreationOperation_3=Title
SiteEditor_PortabilitySection_desc = Specify the environments in which this feature can be installed.\n\
Leave blank if the feature does not contain platform-specific code.
SiteEditor_PortabilitySection_os = Operating Systems:
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/cheatsheet/CheatSheetFileWizardPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/cheatsheet/CheatSheetFileWizardPage.java
index 3354314..0fa2865 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/cheatsheet/CheatSheetFileWizardPage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/cheatsheet/CheatSheetFileWizardPage.java
@@ -13,19 +13,10 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.pde.internal.ui.PDEPlugin;
import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
/**
@@ -34,11 +25,14 @@
*/
public class CheatSheetFileWizardPage extends WizardNewFileCreationPage {
- private Button fSimpleCheatSheetButton;
+ // TODO: MP: DEFER: Re-enable when composite cheat sheet editor is finished
+ //private Button fSimpleCheatSheetButton;
- private Button fCompositeCheatSheetButton;
+ // TODO: MP: DEFER: Re-enable when composite cheat sheet editor is finished
+ //private Button fCompositeCheatSheetButton;
- private Group fGroup;
+ // TODO: MP: DEFER: Re-enable when composite cheat sheet editor is finished
+ //private Group fGroup;
private static final String F_FILE_EXTENSION = ".xml"; //$NON-NLS-1$
@@ -64,11 +58,12 @@
* @return
*/
public int getCheatSheetType() {
- if (fSimpleCheatSheetButton.getSelection()) {
- return F_SIMPLE_CHEAT_SHEET;
- } else if (fCompositeCheatSheetButton.getSelection()) {
- return F_COMPOSITE_CHEAT_SHEET;
- }
+ // TODO: MP: DEFER: Re-enable when composite cheat sheet editor is finished
+// if (fSimpleCheatSheetButton.getSelection()) {
+// return F_SIMPLE_CHEAT_SHEET;
+// } else if (fCompositeCheatSheetButton.getSelection()) {
+// return F_COMPOSITE_CHEAT_SHEET;
+// }
// Neither selected. Unknown type
return -1;
}
@@ -78,52 +73,53 @@
*/
protected void createAdvancedControls(Composite parent) {
+ // TODO: MP: DEFER: Re-enable when composite cheat sheet editor is finished
// Cheat Sheet Group
- fGroup = new Group(parent, SWT.NONE);
- fGroup.setText(PDEUIMessages.CheatSheetFileWizardPage_4);
- fGroup.setLayout(new GridLayout(1, false));
- fGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
- // Simple Cheat Sheet Button
- fSimpleCheatSheetButton = new Button(fGroup, SWT.RADIO);
- fSimpleCheatSheetButton.setText(PDEUIMessages.CheatSheetFileWizardPage_5);
- fSimpleCheatSheetButton.setSelection(true);
- fSimpleCheatSheetButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- getWizard().getContainer().updateButtons();
- }
- });
-
- // Simple Cheat Sheet Description Label
- final Label simpleCSText = new Label(fGroup, SWT.WRAP);
- simpleCSText.setText(PDEUIMessages.CheatSheetFileWizardPage_6);
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.widthHint = 300;
- simpleCSText.setLayoutData(gd);
-
- // Spacer
- new Label(fGroup, SWT.NULL);
-
- // Composite Cheat Sheet Button
- fCompositeCheatSheetButton = new Button(fGroup, SWT.RADIO);
- fCompositeCheatSheetButton.setSelection(false);
- fCompositeCheatSheetButton
- .setText(PDEUIMessages.CheatSheetFileWizardPage_7);
- fCompositeCheatSheetButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- getWizard().getContainer().updateButtons();
- }
- });
- // TODO: MP: Temporarily disabled
- fCompositeCheatSheetButton.setEnabled(false);
-
-
- // Composite Cheat Sheet Description Label
- final Label compositeCSText = new Label(fGroup, SWT.WRAP);
- compositeCSText.setText(PDEUIMessages.CheatSheetFileWizardPage_8);
- gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.widthHint = 300;
- compositeCSText.setLayoutData(gd);
+// fGroup = new Group(parent, SWT.NONE);
+// fGroup.setText(PDEUIMessages.CheatSheetFileWizardPage_4);
+// fGroup.setLayout(new GridLayout(1, false));
+// fGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+//
+// // Simple Cheat Sheet Button
+// fSimpleCheatSheetButton = new Button(fGroup, SWT.RADIO);
+// fSimpleCheatSheetButton.setText(PDEUIMessages.CheatSheetFileWizardPage_5);
+// fSimpleCheatSheetButton.setSelection(true);
+// fSimpleCheatSheetButton.addSelectionListener(new SelectionAdapter() {
+// public void widgetSelected(SelectionEvent e) {
+// getWizard().getContainer().updateButtons();
+// }
+// });
+//
+// // Simple Cheat Sheet Description Label
+// final Label simpleCSText = new Label(fGroup, SWT.WRAP);
+// simpleCSText.setText(PDEUIMessages.CheatSheetFileWizardPage_6);
+// GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+// gd.widthHint = 300;
+// simpleCSText.setLayoutData(gd);
+//
+// // Spacer
+// new Label(fGroup, SWT.NULL);
+//
+// // Composite Cheat Sheet Button
+// fCompositeCheatSheetButton = new Button(fGroup, SWT.RADIO);
+// fCompositeCheatSheetButton.setSelection(false);
+// fCompositeCheatSheetButton
+// .setText(PDEUIMessages.CheatSheetFileWizardPage_7);
+// fCompositeCheatSheetButton.addSelectionListener(new SelectionAdapter() {
+// public void widgetSelected(SelectionEvent e) {
+// getWizard().getContainer().updateButtons();
+// }
+// });
+// // TODO: MP: Temporarily disabled
+// fCompositeCheatSheetButton.setEnabled(false);
+//
+//
+// // Composite Cheat Sheet Description Label
+// final Label compositeCSText = new Label(fGroup, SWT.WRAP);
+// compositeCSText.setText(PDEUIMessages.CheatSheetFileWizardPage_8);
+// gd = new GridData(GridData.FILL_HORIZONTAL);
+// gd.widthHint = 300;
+// compositeCSText.setLayoutData(gd);
}
/**
@@ -184,7 +180,8 @@
*/
public void createControl(Composite parent) {
super.createControl(parent);
- Dialog.applyDialogFont(fGroup);
+ // TODO: MP: DEFER: Re-enable when composite cheat sheet editor is finished
+ //Dialog.applyDialogFont(fGroup);
}
/* (non-Javadoc)
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/cheatsheet/NewCheatSheetFileWizard.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/cheatsheet/NewCheatSheetFileWizard.java
index afe9f23..e36b8a9 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/cheatsheet/NewCheatSheetFileWizard.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/cheatsheet/NewCheatSheetFileWizard.java
@@ -59,8 +59,7 @@
* @see org.eclipse.ui.wizards.newresource.BasicNewFileResourceWizard#initializeDefaultPageImageDescriptor()
*/
protected void initializeDefaultPageImageDescriptor() {
- // TODO: MP: Update with proper image
- setDefaultPageImageDescriptor(PDEPluginImages.DESC_PRODUCT_WIZ);
+ setDefaultPageImageDescriptor(PDEPluginImages.DESC_CHEATSHEET_WIZ);
}
/* (non-Javadoc)
@@ -84,18 +83,20 @@
* @return
*/
private IRunnableWithProgress getOperation() {
+ // TODO: MP: DEFER: Re-enable when composite cheat sheet editor is finished
+
IFile file = fMainPage.createNewFile();
- int option = fMainPage.getCheatSheetType();
- if (option == CheatSheetFileWizardPage.F_SIMPLE_CHEAT_SHEET) {
+// int option = fMainPage.getCheatSheetType();
+// if (option == CheatSheetFileWizardPage.F_SIMPLE_CHEAT_SHEET) {
return new SimpleCheatSheetCreationOperation(file);
- } else if (option == CheatSheetFileWizardPage.F_COMPOSITE_CHEAT_SHEET) {
+// } else if (option == CheatSheetFileWizardPage.F_COMPOSITE_CHEAT_SHEET) {
// TODO: MP: Do specific operation for composite cheat sheet
- return null;
- }
+// return null;
+// }
// This should never happen
// TODO: MP: Externalize: low priority - need to bind
- PDEPlugin.logErrorMessage("Unknown cheat sheet type encountered"); //$NON-NLS-1$
- return null;
+// PDEPlugin.logErrorMessage("Unknown cheat sheet type encountered"); //$NON-NLS-1$
+// return null;
//return new BaseCheatSheetCreationOperation(file);
}
}
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/cheatsheet/SimpleCheatSheetCreationOperation.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/cheatsheet/SimpleCheatSheetCreationOperation.java
index 5b065c8..39f6224 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/cheatsheet/SimpleCheatSheetCreationOperation.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/cheatsheet/SimpleCheatSheetCreationOperation.java
@@ -48,7 +48,7 @@
protected void createContent() {
SimpleCSWorkspaceModel model = new SimpleCSWorkspaceModel(fFile, false);
initializeCS(model.getSimpleCS());
- // TODO: MP: Figure out how to prevent overwrite of file with same name
+ // TODO: MP: HIGH: Figure out how to prevent overwrite of file with same name
// check if exists ? Do in wizard somehow ?
model.save();
model.dispose();
