aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Keller2011-12-13 06:39:01 (EST)
committerMarkus Keller2011-12-13 06:39:01 (EST)
commit290973eacf4d931dfc97d7ff155768e044f8d3c1 (patch)
tree14edf54f1ddb2707c35e51666343d2b23c67ad0a
parent8672f0d5ddbea6f0f4c1fd9f516daa8c75cc6175 (diff)
downloadegit-290973eacf4d931dfc97d7ff155768e044f8d3c1.zip
egit-290973eacf4d931dfc97d7ff155768e044f8d3c1.tar.gz
egit-290973eacf4d931dfc97d7ff155768e044f8d3c1.tar.bz2
Bug 358868: Fetch Result dialog is modalrefs/changes/02/4802/1
Made Pull and Fetch result dialogs non-modal. Change-Id: Ied1f031df9db298f61f9f96ed92e9a54ebd87517
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/FetchResultDialog.java6
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/pull/MultiPullResultDialog.java3
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/pull/PullResultDialog.java3
3 files changed, 8 insertions, 4 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/FetchResultDialog.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/FetchResultDialog.java
index 440922c..3477952 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/FetchResultDialog.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/FetchResultDialog.java
@@ -49,7 +49,8 @@ public class FetchResultDialog extends TitleAreaDialog {
public FetchResultDialog(final Shell parentShell, final Repository localDb,
final FetchOperationResult result, final String sourceString) {
super(parentShell);
- setShellStyle(getShellStyle() | SWT.RESIZE);
+ setShellStyle(getShellStyle() & ~SWT.APPLICATION_MODAL | SWT.ON_TOP | SWT.RESIZE);
+ setBlockOnOpen(false);
this.localDb = localDb;
this.result = result;
this.sourceString = sourceString;
@@ -88,7 +89,8 @@ public class FetchResultDialog extends TitleAreaDialog {
public FetchResultDialog(final Shell parentShell, final Repository localDb,
final FetchResult result, final String sourceString) {
super(parentShell);
- setShellStyle(getShellStyle() | SWT.RESIZE);
+ setShellStyle(getShellStyle() & ~SWT.APPLICATION_MODAL | SWT.ON_TOP | SWT.RESIZE);
+ setBlockOnOpen(false);
this.localDb = localDb;
this.result = new FetchOperationResult(result.getURI(), result);
this.sourceString = sourceString;
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/pull/MultiPullResultDialog.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/pull/MultiPullResultDialog.java
index 658a0e3..32c34a6 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/pull/MultiPullResultDialog.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/pull/MultiPullResultDialog.java
@@ -152,7 +152,8 @@ public class MultiPullResultDialog extends Dialog {
protected MultiPullResultDialog(Shell parentShell,
Map<Repository, Object> results) {
super(parentShell);
- setShellStyle(getShellStyle() | SWT.SHELL_TRIM);
+ setShellStyle(getShellStyle() & ~SWT.APPLICATION_MODAL | SWT.ON_TOP | SWT.SHELL_TRIM);
+ setBlockOnOpen(false);
this.results.putAll(results);
}
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/pull/PullResultDialog.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/pull/PullResultDialog.java
index 9adae5f..c7efe9b 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/pull/PullResultDialog.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/pull/PullResultDialog.java
@@ -57,7 +57,8 @@ public class PullResultDialog extends Dialog {
*/
public PullResultDialog(Shell shell, Repository repo, PullResult result) {
super(shell);
- setShellStyle(getShellStyle() | SWT.SHELL_TRIM);
+ setShellStyle(getShellStyle() & ~SWT.APPLICATION_MODAL | SWT.ON_TOP | SWT.SHELL_TRIM);
+ setBlockOnOpen(false);
this.repo = repo;
this.result = result;
hasUpdates = hasFetchResults() || hasMergeResults()