Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMathias Kinzler2011-02-11 04:08:53 -0500
committerMathias Kinzler2011-02-11 04:08:53 -0500
commit84c76d3e264d35cc07b5dc3e6e75f1f9878bd663 (patch)
tree3d3535b14736fc678828245d18ca8b5441fbc1c7
parent226a7f50cdbff206855633bf85ed318375e95df4 (diff)
downloadegit-84c76d3e264d35cc07b5dc3e6e75f1f9878bd663.tar.gz
egit-84c76d3e264d35cc07b5dc3e6e75f1f9878bd663.tar.xz
egit-84c76d3e264d35cc07b5dc3e6e75f1f9878bd663.zip
Simple Configure Push/Fetch: hide "Configure" button
The result dialogs shown when "Dry-running" fetch and push from the "Configure Push to upstream" and "Configure Fetch from upstream" dialogs, respectively, should not show the "Configure..." button, as they have already been started from that dialog. Change-Id: I802af24767925a0cfd41aedb7b4394c2b948853b Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com>
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/SimpleConfigureFetchDialog.java1
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/push/SimpleConfigurePushDialog.java1
2 files changed, 2 insertions, 0 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/SimpleConfigureFetchDialog.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/SimpleConfigureFetchDialog.java
index aac376417..2b04f5e0d 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/SimpleConfigureFetchDialog.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/SimpleConfigureFetchDialog.java
@@ -503,6 +503,7 @@ public class SimpleConfigureFetchDialog extends TitleAreaDialog {
dlg = new FetchResultDialog(getShell(),
repository, op.execute(monitor), op
.getSourceString());
+ dlg.showConfigureButton(false);
dlg.open();
} catch (CoreException e) {
Activator.handleError(e.getMessage(), e,
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/push/SimpleConfigurePushDialog.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/push/SimpleConfigurePushDialog.java
index ace30d04d..4c5630662 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/push/SimpleConfigurePushDialog.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/push/SimpleConfigurePushDialog.java
@@ -580,6 +580,7 @@ public class SimpleConfigurePushDialog extends TitleAreaDialog {
PushResultDialog dlg = new PushResultDialog(
getShell(), repository, result, op
.getDestinationString());
+ dlg.showConfigureButton(false);
dlg.open();
} catch (CoreException e) {
Activator.handleError(e.getMessage(), e,

Back to the top