aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilipp Thun2011-02-07 04:00:35 (EST)
committerMathias Kinzler2011-02-15 11:05:00 (EST)
commit85763e3b7bd2f99c49abffda85026ac6a0bcefef (patch)
tree33fa95bf80d0acafc0a90e5ac98ea708bcce9f43
parent79e459f8c73653a0f191c8af4f3f65479a0fdeef (diff)
downloadegit-85763e3b7bd2f99c49abffda85026ac6a0bcefef.zip
egit-85763e3b7bd2f99c49abffda85026ac6a0bcefef.tar.gz
egit-85763e3b7bd2f99c49abffda85026ac6a0bcefef.tar.bz2
Wrap 'show initial configuration dialog' check box into grouprefs/changes/42/2442/2
With this change the 'show initial configuration dialog' check box that is available on the Git preferences page is wrapped into a group element to create a uniform UI. Change-Id: I903d6bdf2ca7cec0d77ab88b09ea61dec050f52e Signed-off-by: Philipp Thun <philipp.thun@sap.com>
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIText.java3
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/GitPreferenceRoot.java10
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties1
3 files changed, 13 insertions, 1 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIText.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIText.java
index 17fbf14..cbc9705 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIText.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIText.java
@@ -430,6 +430,9 @@ public class UIText extends NLS {
public static String GitPreferenceRoot_HistoryGroupHeader;
/** */
+ public static String GitPreferenceRoot_InitialConfiguration;
+
+ /** */
public static String GitPreferenceRoot_MergeGroupHeader;
/** */
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/GitPreferenceRoot.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/GitPreferenceRoot.java
index cf12a11..8fb45f7 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/GitPreferenceRoot.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/GitPreferenceRoot.java
@@ -62,9 +62,17 @@ public class GitPreferenceRoot extends FieldEditorPreferencePage implements
@Override
protected void createFieldEditors() {
Composite main = getFieldEditorParent();
+
+ Group initialGroup = new Group(main, SWT.SHADOW_ETCHED_IN);
+ initialGroup.setText(UIText.GitPreferenceRoot_InitialConfiguration);
+ GridDataFactory.fillDefaults().grab(true, false).span(GROUP_SPAN, 1)
+ .applyTo(initialGroup);
addField(new BooleanFieldEditor(
UIPreferences.SHOW_INITIAL_CONFIG_DIALOG,
- UIText.GitPreferenceRoot_ShowInitialConfigDialogCheckbox, main));
+ UIText.GitPreferenceRoot_ShowInitialConfigDialogCheckbox,
+ initialGroup));
+ updateMargins(initialGroup);
+
Group cloningGroup = new Group(main, SWT.SHADOW_ETCHED_IN);
cloningGroup.setText(UIText.GitPreferenceRoot_CloningRepoGroupHeader);
GridDataFactory.fillDefaults().grab(true, false).span(GROUP_SPAN, 1)
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties
index 886a37d..92964cd 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties
@@ -147,6 +147,7 @@ GitPreferenceRoot_DefaultRepoFolderTooltip=This folder will be suggested as pare
GitPreferenceRoot_HideConfirmationGroup=Hide confirmation dialogs
GitPreferenceRoot_HideRebaseConfirmationField=R&ebase
GitPreferenceRoot_HistoryGroupHeader=History View
+GitPreferenceRoot_InitialConfiguration=Initial Configuration
GitPreferenceRoot_MergeGroupHeader=Merge
GitPreferenceRoot_MergeMode_0_Label=Ask the user when the tool is started
GitPreferenceRoot_MergeMode_1_Label=Workspace (pre-merged by Git)