mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-23 22:52:11 +02:00
Code Issues Wiki Activity

group make preferences under one "Make" entry.

Browse source
This commit is contained in:
David Inglis 2004-09-08 15:05:09 +00:00
parent 0ad9d83903
commit 75c897cf26
5 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build/org.eclipse.cdt.make.ui/plugin.properties
View file

@ -33,7 +33,7 @@ CommandTargetCreate.name=Create Make Target
CommandTargetCreate.description=Create a new make build target for the selected container.
PreferenceMakeProject.name=New Make Projects
PreferenceMakeTargets.name=Make Targets
PreferenceMake.name=Make
PreferenceMakefileEditor.name=Makefile Editor
PreferenceMakefileSettings.name= Settings

16
build/org.eclipse.cdt.make.ui/plugin.xml
View file

@ -291,20 +291,20 @@
<extension
point="org.eclipse.ui.preferencePages">
<page
name="%PreferenceMakeProject.name"
name="%PreferenceMake.name"
category="org.eclipse.cdt.ui.preferences.CPluginPreferencePage"
class="org.eclipse.cdt.make.internal.ui.preferences.NewMakeProjectPreferencePage"
class="org.eclipse.cdt.make.internal.ui.preferences.MakePreferencePage"
id="org.eclipse.cdt.make.ui.preferences.MakePreferencePage">
</page>
<page
name="%PreferenceMakeTargets.name"
category="org.eclipse.cdt.ui.preferences.CPluginPreferencePage"
class="org.eclipse.cdt.make.internal.ui.preferences.MakeTargetsPreferencePage"
id="org.eclipse.cdt.make.ui.preferences.MakeTargetsPreferencePage">
name="%PreferenceMakeProject.name"
category="org.eclipse.cdt.make.ui.preferences.MakePreferencePage"
class="org.eclipse.cdt.make.internal.ui.preferences.NewMakeProjectPreferencePage"
id="org.eclipse.cdt.make.ui.preferences.MakeProjectPreferencePage">
</page>
<page
name="%PreferenceMakefileEditor.name"
category="org.eclipse.cdt.ui.preferences.CPluginPreferencePage"
category="org.eclipse.cdt.make.ui.preferences.MakePreferencePage"
class="org.eclipse.cdt.make.internal.ui.preferences.MakefileEditorPreferencePage"
id="org.eclipse.cdt.make.ui.preferences.MakeFileEditorPreferencePage">
</page>
@ -312,7 +312,7 @@
name="%PreferenceMakefileSettings.name"
category="org.eclipse.cdt.make.ui.preferences.MakeFileEditorPreferencePage"
class="org.eclipse.cdt.make.internal.ui.preferences.MakefileSettingsPreferencePage"
id="org.eclipse.cdt.make.ui.preferences.MakePreferencePage">
id="org.eclipse.cdt.make.ui.preferences.MakefileSettingPreferencePage">
</page>
</extension>
<extension

4
build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeUIPreferenceInitializer.java
View file

@ -8,7 +8,7 @@
******************************************************************************/
package org.eclipse.cdt.make.internal.ui;
import org.eclipse.cdt.make.internal.ui.preferences.MakeTargetsPreferencePage;
import org.eclipse.cdt.make.internal.ui.preferences.MakePreferencePage;
import org.eclipse.cdt.make.internal.ui.preferences.MakefileEditorPreferenceConstants;
import org.eclipse.cdt.make.internal.ui.preferences.MakefileEditorPreferencePage;
import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
@ -20,7 +20,7 @@ public class MakeUIPreferenceInitializer extends AbstractPreferenceInitializer {
* @see org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer#initializeDefaultPreferences()
*/
public void initializeDefaultPreferences() {
MakeTargetsPreferencePage.initDefaults(MakeUIPlugin.getDefault().getPreferenceStore());
MakePreferencePage.initDefaults(MakeUIPlugin.getDefault().getPreferenceStore());
MakefileEditorPreferenceConstants.initializeDefaultValues(MakeUIPlugin.getDefault().getPreferenceStore());
MakefileEditorPreferencePage.initDefaults(MakeUIPlugin.getDefault().getPreferenceStore());
}

4
build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/preferences/MakeTargetsPreferencePage.java → build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/preferences/MakePreferencePage.java
View file

@ -18,12 +18,12 @@ import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.IWorkbenchPreferencePage;
public class MakeTargetsPreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage {
public class MakePreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage {
private static final String PREF_BUILD_TARGET_IN_BACKGROUND = "MakeTargetPrefs.buildTargetInBackground"; //$NON-NLS-1$
private static final String TARGET_BUILDS_IN_BACKGROUND = "MakeTargetPreferencePage.buildTargetInBackground.label"; //$NON-NLS-1$
public MakeTargetsPreferencePage() {
public MakePreferencePage() {
super(GRID);
setPreferenceStore(MakeUIPlugin.getDefault().getPreferenceStore());
}

4
build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/TargetBuild.java
View file

@ -16,7 +16,7 @@ import java.util.List;
import org.eclipse.cdt.make.core.IMakeTarget;
import org.eclipse.cdt.make.internal.ui.MakeUIPlugin;
import org.eclipse.cdt.make.internal.ui.preferences.MakeTargetsPreferencePage;
import org.eclipse.cdt.make.internal.ui.preferences.MakePreferencePage;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IWorkspaceRunnable;
import org.eclipse.core.runtime.CoreException;
@ -107,7 +107,7 @@ public class TargetBuild {
};
targetJob.schedule();
if (!MakeTargetsPreferencePage.isBuildTargetInBackground()) {
if (!MakePreferencePage.isBuildTargetInBackground()) {
runWithProgressDialog(shell, targetJob);
}
}