diff options
Diffstat (limited to 'org.eclipse.egit.ui/src')
-rw-r--r-- | org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/GitDecoratorPreferencePage.java | 32 |
1 files changed, 15 insertions, 17 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/GitDecoratorPreferencePage.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/GitDecoratorPreferencePage.java index ccab4cf2f9..e1630b7a5a 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/GitDecoratorPreferencePage.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/GitDecoratorPreferencePage.java @@ -188,13 +188,6 @@ public class GitDecoratorPreferencePage extends PreferencePage implements UIText.DecoratorPreferencesPage_bindingChangeSetShortMessage); } - /** - * Constructs a decorator preference page - */ - public GitDecoratorPreferencePage() { - setDescription(UIText.DecoratorPreferencesPage_description); - } - private static String removeBraces(String string) { return string.replaceAll("[}{]", ""); //$NON-NLS-1$ //$NON-NLS-2$ } @@ -208,17 +201,12 @@ public class GitDecoratorPreferencePage extends PreferencePage implements Composite composite = SWTUtils.createHVFillComposite(parent, SWTUtils.MARGINS_NONE); - SWTUtils.createPreferenceLink( - (IWorkbenchPreferenceContainer) getContainer(), composite, - "org.eclipse.ui.preferencePages.Decorators", //$NON-NLS-1$ - UIText.DecoratorPreferencesPage_labelDecorationsLink); + SWTUtils.createLabel(composite, UIText.DecoratorPreferencesPage_description); - SWTUtils.createPreferenceLink( - (IWorkbenchPreferenceContainer) getContainer(), composite, - "org.eclipse.ui.preferencePages.ColorsAndFonts", //$NON-NLS-1$ - UIText.DecoratorPreferencesPage_colorsAndFontsLink); + Composite folderComposite = SWTUtils.createHFillComposite(composite, + SWTUtils.MARGINS_NONE); - TabFolder tabFolder = new TabFolder(composite, SWT.NONE); + TabFolder tabFolder = new TabFolder(folderComposite, SWT.NONE); tabFolder.setLayoutData(SWTUtils.createHVFillGridData()); tabFolder.addSelectionListener(new SelectionAdapter() { @@ -271,7 +259,7 @@ public class GitDecoratorPreferencePage extends PreferencePage implements Dialog.applyDialogFont(parent); - return composite; + return tabFolder; } /** @@ -309,6 +297,16 @@ public class GitDecoratorPreferencePage extends PreferencePage implements recomputeAncestorDecorations .setToolTipText(UIText.DecoratorPreferencesPage_recomputeAncestorDecorationsTooltip); + SWTUtils.createPreferenceLink( + (IWorkbenchPreferenceContainer) getContainer(), composite, + "org.eclipse.ui.preferencePages.Decorators", //$NON-NLS-1$ + UIText.DecoratorPreferencesPage_labelDecorationsLink); + + SWTUtils.createPreferenceLink( + (IWorkbenchPreferenceContainer) getContainer(), composite, + "org.eclipse.ui.preferencePages.ColorsAndFonts", //$NON-NLS-1$ + UIText.DecoratorPreferencesPage_colorsAndFontsLink); + recomputeAncestorDecorations.addSelectionListener(this); final TabItem tabItem = new TabItem(parent, SWT.NONE); |