mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-08-02 22:05:44 +02:00
- extern strings
- fixed tab folder visiblity problem
This commit is contained in:
parent
46c06a4a71
commit
c96aeb760e
4 changed files with 45 additions and 32 deletions
|
@ -16,6 +16,7 @@ import java.util.Iterator;
|
||||||
import org.eclipse.cdt.core.CCorePlugin;
|
import org.eclipse.cdt.core.CCorePlugin;
|
||||||
import org.eclipse.cdt.core.ICDescriptor;
|
import org.eclipse.cdt.core.ICDescriptor;
|
||||||
import org.eclipse.cdt.core.ICExtensionReference;
|
import org.eclipse.cdt.core.ICExtensionReference;
|
||||||
|
import org.eclipse.cdt.ui.CUIPlugin;
|
||||||
import org.eclipse.cdt.utils.ui.controls.ControlFactory;
|
import org.eclipse.cdt.utils.ui.controls.ControlFactory;
|
||||||
import org.eclipse.core.runtime.CoreException;
|
import org.eclipse.core.runtime.CoreException;
|
||||||
import org.eclipse.core.runtime.IExtension;
|
import org.eclipse.core.runtime.IExtension;
|
||||||
|
@ -34,16 +35,19 @@ import org.eclipse.swt.widgets.Label;
|
||||||
|
|
||||||
public class BinaryParserBlock extends AbstractCOptionPage {
|
public class BinaryParserBlock extends AbstractCOptionPage {
|
||||||
|
|
||||||
private static String[][] radios;
|
private static final String PREFIX = "BinaryParserBlock"; // $NON-NLS-1$
|
||||||
|
private static final String LABEL = PREFIX + ".label"; // $NON-NLS-1$
|
||||||
|
private static final String DESC = PREFIX + ".desc"; // $NON-NLS-1$
|
||||||
|
|
||||||
|
private static String[][] radios;
|
||||||
protected Combo comboBox;
|
protected Combo comboBox;
|
||||||
private HashMap idMap = new HashMap();
|
private HashMap idMap = new HashMap();
|
||||||
private String initial;
|
private String initial;
|
||||||
private Preferences fPrefs;
|
private Preferences fPrefs;
|
||||||
|
|
||||||
public BinaryParserBlock(Preferences prefs) {
|
public BinaryParserBlock(Preferences prefs) {
|
||||||
super("Binary Parser");
|
super(CUIPlugin.getResourceString(LABEL));
|
||||||
setDescription("Set required binary parser for this project");
|
setDescription(CUIPlugin.getResourceString(DESC));
|
||||||
fPrefs = prefs;
|
fPrefs = prefs;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -14,6 +14,7 @@ import org.eclipse.cdt.core.CCorePlugin;
|
||||||
import org.eclipse.cdt.core.index.IndexModel;
|
import org.eclipse.cdt.core.index.IndexModel;
|
||||||
import org.eclipse.cdt.internal.core.search.indexing.IndexManager;
|
import org.eclipse.cdt.internal.core.search.indexing.IndexManager;
|
||||||
import org.eclipse.cdt.internal.core.sourcedependency.DependencyManager;
|
import org.eclipse.cdt.internal.core.sourcedependency.DependencyManager;
|
||||||
|
import org.eclipse.cdt.ui.CUIPlugin;
|
||||||
import org.eclipse.core.resources.IProject;
|
import org.eclipse.core.resources.IProject;
|
||||||
import org.eclipse.core.runtime.CoreException;
|
import org.eclipse.core.runtime.CoreException;
|
||||||
import org.eclipse.core.runtime.IProgressMonitor;
|
import org.eclipse.core.runtime.IProgressMonitor;
|
||||||
|
@ -23,13 +24,17 @@ import org.eclipse.swt.widgets.Button;
|
||||||
import org.eclipse.swt.widgets.Composite;
|
import org.eclipse.swt.widgets.Composite;
|
||||||
|
|
||||||
public class IndexerBlock extends AbstractCOptionPage {
|
public class IndexerBlock extends AbstractCOptionPage {
|
||||||
|
private static final String PREFIX = "IndexerBlock"; // $NON-NLS-1$
|
||||||
|
private static final String LABEL = PREFIX + ".label"; // $NON-NLS-1$
|
||||||
|
private static final String DESC = PREFIX + ".desc"; // $NON-NLS-1$
|
||||||
|
|
||||||
private Button indexerSwitch;
|
private Button indexerSwitch;
|
||||||
private Button indexerSwitch2;
|
private Button indexerSwitch2;
|
||||||
private Button dTreeSwitch;
|
private Button dTreeSwitch;
|
||||||
|
|
||||||
public IndexerBlock() {
|
public IndexerBlock() {
|
||||||
super("Indexer");
|
super(CUIPlugin.getResourceString(LABEL));
|
||||||
setDescription("Project Indexer option");
|
setDescription(CUIPlugin.getResourceString(DESC));
|
||||||
}
|
}
|
||||||
|
|
||||||
public void createControl(Composite parent) {
|
public void createControl(Composite parent) {
|
||||||
|
|
|
@ -44,7 +44,7 @@ public class ReferenceBlock extends AbstractCOptionPage {
|
||||||
|
|
||||||
private CheckboxTableViewer referenceProjectsViewer;
|
private CheckboxTableViewer referenceProjectsViewer;
|
||||||
|
|
||||||
private static final int PROJECT_LIST_MULTIPLIER = 30;
|
private static final int PROJECT_LIST_MULTIPLIER = 10;
|
||||||
|
|
||||||
public ReferenceBlock() {
|
public ReferenceBlock() {
|
||||||
super(CUIPlugin.getResourceString(LABEL));
|
super(CUIPlugin.getResourceString(LABEL));
|
||||||
|
|
|
@ -100,9 +100,11 @@ public abstract class TabFolderOptionBlock {
|
||||||
|
|
||||||
fFolder.addSelectionListener(new SelectionAdapter() {
|
fFolder.addSelectionListener(new SelectionAdapter() {
|
||||||
public void widgetSelected(SelectionEvent e) {
|
public void widgetSelected(SelectionEvent e) {
|
||||||
|
if (!initializingTabs) {
|
||||||
setCurrentPage((ICOptionPage) ((TabItem) e.item).getData());
|
setCurrentPage((ICOptionPage) ((TabItem) e.item).getData());
|
||||||
fParent.updateContainer();
|
fParent.updateContainer();
|
||||||
}
|
}
|
||||||
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -143,10 +145,8 @@ public abstract class TabFolderOptionBlock {
|
||||||
public void setVisible(boolean visible) {
|
public void setVisible(boolean visible) {
|
||||||
if (initializingTabs)
|
if (initializingTabs)
|
||||||
return;
|
return;
|
||||||
Iterator iter = pages.iterator();
|
if (fCurrentPage != null) {
|
||||||
while (iter.hasNext()) {
|
fCurrentPage.setVisible(visible);
|
||||||
ICOptionPage tab = (ICOptionPage) iter.next();
|
|
||||||
tab.setVisible(visible);
|
|
||||||
}
|
}
|
||||||
update();
|
update();
|
||||||
}
|
}
|
||||||
|
@ -200,7 +200,11 @@ public abstract class TabFolderOptionBlock {
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setCurrentPage(ICOptionPage page) {
|
public void setCurrentPage(ICOptionPage page) {
|
||||||
|
//Make the new page visible
|
||||||
|
ICOptionPage oldPage = fCurrentPage;
|
||||||
fCurrentPage = page;
|
fCurrentPage = page;
|
||||||
|
fCurrentPage.setVisible(true);
|
||||||
|
if (oldPage != null)
|
||||||
|
oldPage.setVisible(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue