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

Some minor fixes for the Environment and Macros UI

Browse source
This commit is contained in:
Mikhail Sennikovsky 2005-05-30 14:03:35 +00:00
parent 30c47b2964
commit cca981f045
5 changed files with 54 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/EnvironmentBlock.java
View file

@ -1009,8 +1009,8 @@ public class EnvironmentBlock extends AbstractCOptionPage {
*/
public void setVisible(boolean visible){
fVisible = visible;
if(visible)
updateValues();
// if(visible)
// updateValues();
super.setVisible(visible);
}

8
build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/EnvironmentSetBlock.java
View file

@ -18,6 +18,7 @@ import org.eclipse.cdt.managedbuilder.internal.envvar.IContextInfo;
import org.eclipse.cdt.managedbuilder.ui.properties.BuildPropertyPage;
import org.eclipse.cdt.ui.dialogs.AbstractCOptionPage;
import org.eclipse.cdt.ui.dialogs.ICOptionContainer;
import org.eclipse.cdt.ui.dialogs.ICOptionPage;
import org.eclipse.cdt.ui.dialogs.TabFolderOptionBlock;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
@ -164,6 +165,11 @@ public class EnvironmentSetBlock extends AbstractCOptionPage {
}
}
public void setCurrentPage(ICOptionPage page) {
((EnvironmentBlock)page).updateValues();
super.setCurrentPage(page);
}
}
@ -209,6 +215,8 @@ public class EnvironmentSetBlock extends AbstractCOptionPage {
public void setVisible(boolean visible){
if(visible)
updateValues();
if(fEnvTabs != null)
fEnvTabs.setVisible(visible);
super.setVisible(visible);
}

9
build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/MacrosBlock.java
View file

@ -891,6 +891,8 @@ public class MacrosBlock extends AbstractCOptionPage {
* updates both user- and sytem- macros tables.
*/
public void updateValues(){
if(fCurrentContextInfo == null)
return;
try{
MacroResolver.checkIntegrity(fCurrentContextInfo,new MacroUIMacroSubstitutor(fCurrentContextInfo,null," "));//$NON-NLS-1$ //$NON-NLS-2$
updateState(null);
@ -898,7 +900,8 @@ public class MacrosBlock extends AbstractCOptionPage {
updateState(e);
}
updateUserMacros();
updateSystemMacros(); }
updateSystemMacros();
}
private void updateState(BuildMacroException e){
ICOptionContainer container = getContainer();
@ -1094,8 +1097,8 @@ public class MacrosBlock extends AbstractCOptionPage {
*/
public void setVisible(boolean visible){
fVisible = visible;
if(visible)
updateValues();
// if(visible)
// updateValues();
super.setVisible(visible);
}

50
build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/MacrosSetBlock.java
View file

@ -18,6 +18,7 @@ import org.eclipse.cdt.managedbuilder.macros.IBuildMacroProvider;
import org.eclipse.cdt.managedbuilder.ui.properties.BuildPropertyPage;
import org.eclipse.cdt.ui.dialogs.AbstractCOptionPage;
import org.eclipse.cdt.ui.dialogs.ICOptionContainer;
import org.eclipse.cdt.ui.dialogs.ICOptionPage;
import org.eclipse.cdt.ui.dialogs.TabFolderOptionBlock;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
@ -53,8 +54,8 @@ import org.eclipse.swt.widgets.Group;
private static final String TAB_WORKSPACE = TAB + ".workspace"; //$NON-NLS-1$
private static final String TAB_ECLIPSE = TAB + ".eclipse"; //$NON-NLS-1$
private MacrosTabFolder fEnvTabs;
private MacrosBlock fEnvBlock;
private MacrosTabFolder fMacroTabs;
private MacrosBlock fMacroBlock;
private ICOptionContainer fParentContainer;
@ -167,6 +168,11 @@ import org.eclipse.swt.widgets.Group;
*/
}
public void setCurrentPage(ICOptionPage page) {
((MacrosBlock)page).updateValues();
super.setCurrentPage(page);
}
}
@ -177,13 +183,13 @@ import org.eclipse.swt.widgets.Group;
// fOptionBlock = optionBlock;
if(fParentContainer instanceof BuildPropertyPage)
fEnvTabs = new MacrosTabFolder();
fMacroTabs = new MacrosTabFolder();
else {
fEnvBlock = new MacrosBlock(fParentContainer,
fMacroBlock = new MacrosBlock(fParentContainer,
ManagedBuilderUIMessages.getResourceString(TAB_WORKSPACE),
true,
false);
fEnvBlock.displayParentMacros(true);
fMacroBlock.displayParentMacros(true);
}
}
@ -213,6 +219,8 @@ import org.eclipse.swt.widgets.Group;
public void setVisible(boolean visible){
if(visible)
updateValues();
if(fMacroTabs != null)
fMacroTabs.setVisible(visible);
super.setVisible(visible);
}
@ -221,7 +229,7 @@ import org.eclipse.swt.widgets.Group;
*/
public void createControl(Composite parent) {
Control ctrl = null;
if(fEnvTabs != null){
if(fMacroTabs != null){
Group group = new Group(parent, SWT.NONE);
group.setFont(parent.getFont());
group.setText(ManagedBuilderUIMessages.getResourceString(MACROS_GROUP_LABEL));
@ -230,14 +238,14 @@ import org.eclipse.swt.widgets.Group;
gl.marginHeight = 0;
gl.marginWidth = 0;
group.setLayout(gl);
Control tabs = fEnvTabs.createContents(group);
Control tabs = fMacroTabs.createContents(group);
GridData gd = new GridData(GridData.FILL_BOTH);
tabs.setLayoutData(gd);
ctrl = group;
}
else if(fEnvBlock != null){
fEnvBlock.createControl(parent);
ctrl = fEnvBlock.getControl();
else if(fMacroBlock != null){
fMacroBlock.createControl(parent);
ctrl = fMacroBlock.getControl();
ctrl.setLayoutData(new GridData(GridData.FILL_BOTH));
}
@ -279,19 +287,19 @@ import org.eclipse.swt.widgets.Group;
* returns the selected environment block
*/
protected MacrosBlock getSelectedBlock(){
if(fEnvTabs != null)
return (MacrosBlock)fEnvTabs.getCurrentPage();
return fEnvBlock;
if(fMacroTabs != null)
return (MacrosBlock)fMacroTabs.getCurrentPage();
return fMacroBlock;
}
/*
* returns all available environment blocks
*/
protected MacrosBlock[] getAllBlocks(){
if(fEnvTabs != null)
return fEnvTabs.getTabs();
else if(fEnvBlock != null)
return new MacrosBlock[]{fEnvBlock};
if(fMacroTabs != null)
return fMacroTabs.getTabs();
else if(fMacroBlock != null)
return new MacrosBlock[]{fMacroBlock};
return new MacrosBlock[0];
}
@ -299,10 +307,10 @@ import org.eclipse.swt.widgets.Group;
* updates the context of each EnvironmentBlock
*/
protected void updateContexts(){
if(fEnvTabs != null)
fEnvTabs.updateContexts();
else if(fEnvBlock != null)
fEnvBlock.setContext(IBuildMacroProvider.CONTEXT_WORKSPACE,ResourcesPlugin.getWorkspace());
if(fMacroTabs != null)
fMacroTabs.updateContexts();
else if(fMacroBlock != null)
fMacroBlock.setContext(IBuildMacroProvider.CONTEXT_WORKSPACE,ResourcesPlugin.getWorkspace());
}
/*

9
build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildPreferencePage.java
View file

@ -245,4 +245,13 @@ public class BuildPreferencePage extends PreferencePage
rebuildJob.schedule();
}
/**
* @see DialogPage#setVisible(boolean)
*/
public void setVisible(boolean visible) {
super.setVisible(visible);
fOptionBlock.setVisible(visible);
}
}