Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Wolf2019-05-22 15:15:23 -0400
committerThomas Wolf2019-05-23 13:03:21 -0400
commit20ccab057980d707bfe8f8f4498d92f2f95ad559 (patch)
tree5a6c3596f5804087fe6fae92d26ed4fb8170b126
parente6db081a3f0915a1ce84317eee839eb0c742141b (diff)
downloadegit-20ccab057980d707bfe8f8f4498d92f2f95ad559.tar.gz
egit-20ccab057980d707bfe8f8f4498d92f2f95ad559.tar.xz
egit-20ccab057980d707bfe8f8f4498d92f2f95ad559.zip
Preferences: order of git config tabs
Order the tabs from most specific to least specific: repository, then user, then system. Keep the user config selected when the page opens. Bug: 462784 Change-Id: I468c122f04c503f82d77eca8aacab3eadbdce8d6 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/GlobalConfigurationPreferencePage.java27
1 files changed, 16 insertions, 11 deletions
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 221f04151..ac89554d9 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
@@ -117,17 +117,6 @@ public class GlobalConfigurationPreferencePage extends PreferencePage implements
updateApplyButton();
}
};
- Control result = userConfigEditor.createContents();
- Dialog.applyDialogFont(result);
- TabItem userTabItem = new TabItem(tabFolder, SWT.FILL);
- userTabItem.setControl(result);
- userTabItem.setText(UIText.GlobalConfigurationPreferencePage_userSettingTabTitle);
-
- result = sysConfigEditor.createContents();
- Dialog.applyDialogFont(result);
- TabItem sysTabItem = new TabItem(tabFolder, SWT.FILL);
- sysTabItem.setControl(result);
- sysTabItem.setText(UIText.GlobalConfigurationPreferencePage_systemSettingTabTitle);
Composite repoTab = new Composite(tabFolder, SWT.NONE);
GridLayoutFactory.swtDefaults().margins(0, 0).applyTo(repoTab);
@@ -168,6 +157,22 @@ public class GlobalConfigurationPreferencePage extends PreferencePage implements
repoCombo.setEnabled(false);
}
+ Control result = userConfigEditor.createContents();
+ Dialog.applyDialogFont(result);
+ TabItem userTabItem = new TabItem(tabFolder, SWT.FILL);
+ userTabItem.setControl(result);
+ userTabItem.setText(
+ UIText.GlobalConfigurationPreferencePage_userSettingTabTitle);
+
+ result = sysConfigEditor.createContents();
+ Dialog.applyDialogFont(result);
+ TabItem sysTabItem = new TabItem(tabFolder, SWT.FILL);
+ sysTabItem.setControl(result);
+ sysTabItem.setText(
+ UIText.GlobalConfigurationPreferencePage_systemSettingTabTitle);
+
+ tabFolder.setSelection(userTabItem);
+
return composite;
}

Back to the top