mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-08-16 12:45:41 +02:00
Enablement of provider tab controls on preference page fixed
This commit is contained in:
parent
7fc11c53c4
commit
e101cace9e
1 changed files with 23 additions and 22 deletions
|
@ -254,30 +254,31 @@ public class LanguageSettingsProviderTab extends AbstractCPropertyTab {
|
||||||
// Status line
|
// Status line
|
||||||
fStatusLine = new StatusMessageLine(usercomp, SWT.LEFT, 2);
|
fStatusLine = new StatusMessageLine(usercomp, SWT.LEFT, 2);
|
||||||
|
|
||||||
// "I want to try new scanner discovery" temporary checkbox
|
|
||||||
enableProvidersCheckBox = setupCheck(usercomp, Messages.CDTMainWizardPage_TrySD90, 2, GridData.FILL_HORIZONTAL);
|
|
||||||
enableProvidersCheckBox.addSelectionListener(new SelectionAdapter() {
|
|
||||||
@Override
|
|
||||||
public void widgetSelected(SelectionEvent e) {
|
|
||||||
boolean enabled = enableProvidersCheckBox.getSelection();
|
|
||||||
if (masterPropertyPage!=null)
|
|
||||||
masterPropertyPage.setLanguageSettingsProvidersEnabled(enabled);
|
|
||||||
enableControls(enabled);
|
|
||||||
updateStatusLine();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
if (masterPropertyPage!=null)
|
|
||||||
enableProvidersCheckBox.setSelection(masterPropertyPage.isLanguageSettingsProvidersEnabled());
|
|
||||||
else
|
|
||||||
enableProvidersCheckBox.setSelection(ScannerDiscoveryLegacySupport.isLanguageSettingsProvidersFunctionalityEnabled(page.getProject()));
|
|
||||||
// display but disable the checkbox for file/folder resource
|
|
||||||
enableProvidersCheckBox.setEnabled(page.isForProject() /*|| page.isForPrefs()*/);
|
|
||||||
enableControls(enableProvidersCheckBox.getSelection());
|
|
||||||
|
|
||||||
if (page.isForPrefs()) {
|
if (page.isForPrefs()) {
|
||||||
initButtons(BUTTON_LABELS_PREF);
|
initButtons(BUTTON_LABELS_PREF);
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
|
// "I want to try new scanner discovery" temporary checkbox
|
||||||
|
enableProvidersCheckBox = setupCheck(usercomp, Messages.CDTMainWizardPage_TrySD90, 2, GridData.FILL_HORIZONTAL);
|
||||||
|
enableProvidersCheckBox.addSelectionListener(new SelectionAdapter() {
|
||||||
|
@Override
|
||||||
|
public void widgetSelected(SelectionEvent e) {
|
||||||
|
boolean enabled = enableProvidersCheckBox.getSelection();
|
||||||
|
if (masterPropertyPage!=null)
|
||||||
|
masterPropertyPage.setLanguageSettingsProvidersEnabled(enabled);
|
||||||
|
enableControls(enabled);
|
||||||
|
updateStatusLine();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
if (masterPropertyPage!=null)
|
||||||
|
enableProvidersCheckBox.setSelection(masterPropertyPage.isLanguageSettingsProvidersEnabled());
|
||||||
|
else
|
||||||
|
enableProvidersCheckBox.setSelection(ScannerDiscoveryLegacySupport.isLanguageSettingsProvidersFunctionalityEnabled(page.getProject()));
|
||||||
|
// display but disable the checkbox for file/folder resource
|
||||||
|
enableProvidersCheckBox.setEnabled(page.isForProject());
|
||||||
|
enableControls(enableProvidersCheckBox.getSelection());
|
||||||
|
|
||||||
initButtons(BUTTON_LABELS_PROJECT);
|
initButtons(BUTTON_LABELS_PROJECT);
|
||||||
}
|
}
|
||||||
updateData(getResDesc());
|
updateData(getResDesc());
|
||||||
|
@ -840,7 +841,7 @@ public class LanguageSettingsProviderTab extends AbstractCPropertyTab {
|
||||||
setAllVisible(true, null);
|
setAllVisible(true, null);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (masterPropertyPage!=null) {
|
if (enableProvidersCheckBox!=null && masterPropertyPage!=null) {
|
||||||
boolean enabled = masterPropertyPage.isLanguageSettingsProvidersEnabled();
|
boolean enabled = masterPropertyPage.isLanguageSettingsProvidersEnabled();
|
||||||
enableProvidersCheckBox.setSelection(enabled);
|
enableProvidersCheckBox.setSelection(enabled);
|
||||||
enableControls(enabled);
|
enableControls(enabled);
|
||||||
|
|
Loading…
Add table
Reference in a new issue