diff options
Diffstat (limited to 'org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal')
4 files changed, 16 insertions, 7 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/ConfigurationEditorComponent.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/ConfigurationEditorComponent.java index b55ed88433..13db1bb413 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/ConfigurationEditorComponent.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/ConfigurationEditorComponent.java @@ -111,6 +111,8 @@ public class ConfigurationEditorComponent { private boolean editable; + private int margin; + /** * @param parent * the parent @@ -118,13 +120,16 @@ public class ConfigurationEditorComponent { * to be used instead of the user configuration * @param useDialogFont * if <code>true</code>, the current dialog font is used + * @param margin + * horizontal margin to be used */ public ConfigurationEditorComponent(Composite parent, StoredConfig config, - boolean useDialogFont) { + boolean useDialogFont, int margin) { editableConfig = config; this.shellProvider = new SameShellProvider(parent); this.parent = parent; this.useDialogFont = useDialogFont; + this.margin = margin; } void setConfig(FileBasedConfig config) throws IOException { @@ -169,7 +174,8 @@ public class ConfigurationEditorComponent { */ public Control createContents() { final Composite main = new Composite(parent, SWT.NONE); - main.setLayout(new GridLayout(2, false)); + GridLayoutFactory.fillDefaults().numColumns(2).margins(margin, 0) + .applyTo(main); GridDataFactory.fillDefaults().grab(true, true).applyTo(main); if (editableConfig instanceof FileBasedConfig) { diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/GlobalConfigurationPreferencePage.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/GlobalConfigurationPreferencePage.java index 8e47b7c728..fb37471abf 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/GlobalConfigurationPreferencePage.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/GlobalConfigurationPreferencePage.java @@ -91,7 +91,8 @@ public class GlobalConfigurationPreferencePage extends PreferencePage implements SWTUtils.MARGINS_NONE); TabFolder tabFolder = new TabFolder(composite, SWT.NONE); tabFolder.setLayoutData(SWTUtils.createHVFillGridData()); - userConfigEditor = new ConfigurationEditorComponent(tabFolder, userConfig, true) { + userConfigEditor = new ConfigurationEditorComponent(tabFolder, + userConfig, true, 5) { @Override protected void setErrorMessage(String message) { GlobalConfigurationPreferencePage.this.setErrorMessage(message); @@ -103,7 +104,8 @@ public class GlobalConfigurationPreferencePage extends PreferencePage implements updateApplyButton(); } }; - sysConfigEditor = new ConfigurationEditorComponent(tabFolder, sysConfig, true) { + sysConfigEditor = new ConfigurationEditorComponent(tabFolder, sysConfig, + true, 5) { @Override protected void setErrorMessage(String message) { GlobalConfigurationPreferencePage.this.setErrorMessage(message); @@ -310,7 +312,7 @@ public class GlobalConfigurationPreferencePage extends PreferencePage implements repositoryConfig = repository.getConfig(); } ConfigurationEditorComponent editorComponent = new ConfigurationEditorComponent( - repoConfigComposite, repositoryConfig, true) { + repoConfigComposite, repositoryConfig, true, 5) { @Override protected void setErrorMessage(String message) { GlobalConfigurationPreferencePage.this.setErrorMessage(message); diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositoryPropertyPage.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositoryPropertyPage.java index f2c8fc7d7f..63960db890 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositoryPropertyPage.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositoryPropertyPage.java @@ -59,7 +59,8 @@ public class RepositoryPropertyPage extends PropertyPage { } }); } - editor = new ConfigurationEditorComponent(displayArea, config, true) { + editor = new ConfigurationEditorComponent(displayArea, config, true, + 0) { @Override protected void setErrorMessage(String message) { RepositoryPropertyPage.this.setErrorMessage(message); diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositoryPropertySource.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositoryPropertySource.java index 9956cd2716..05bab87abc 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositoryPropertySource.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositoryPropertySource.java @@ -532,7 +532,7 @@ public class RepositoryPropertySource implements IPropertySource { Composite main = (Composite) super.createDialogArea(parent); GridDataFactory.fillDefaults().align(SWT.FILL, SWT.FILL).grab(true, true).applyTo(main); - editor = new ConfigurationEditorComponent(main, myConfig, true) { + editor = new ConfigurationEditorComponent(main, myConfig, true, 5) { @Override protected void setErrorMessage(String message) { EditDialog.this.setErrorMessage(message); |