MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-35480 Per project/frame modality (Commit and Push dialog)

Browse Source 
Use ide.perProjectModality registry key to enable
This commit is contained in:
Denis Fokin
2016-09-12 17:25:57 +03:00
parent cfb7d9af76
commit 73273f7e58
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/dvcs-impl/src/com/intellij/dvcs/push/ui/VcsPushDialog.java
+3 -1
View File
@@ -25,6 +25,7 @@ import com.intellij.openapi.project.Project;
import com.intellij.openapi.ui.DialogWrapper;
import com.intellij.openapi.ui.OptionAction;
import com.intellij.openapi.ui.ValidationInfo;
import com.intellij.openapi.util.registry.Registry;
import com.intellij.ui.components.labels.ActionLink;
import com.intellij.util.ui.JBUI;
import com.intellij.util.ui.components.BorderLayoutPanel;
@@ -52,7 +53,8 @@ public class VcsPushDialog extends DialogWrapper {
public VcsPushDialog(@NotNull Project project,
@NotNull List<? extends Repository> selectedRepositories,
@Nullable Repository currentRepo) {
super(project);
super(project, true, (Registry.is("ide.perProjectModality")) ? IdeModalityType.PROJECT : IdeModalityType.IDE);
myController = new PushController(project, this, selectedRepositories, currentRepo);
myAdditionalPanels = myController.createAdditionalPanels();
myListPanel = myController.getPushPanelLog();
platform/platform-impl/src/com/intellij/openapi/wm/impl/CommandProcessor.java
+1 -1
View File
@@ -80,7 +80,7 @@ public final class CommandProcessor implements Runnable {
// definitely have some since runnables in command list may (and do) request some PSI activity
final boolean queueNext = myCommandCount > 0;
Application application = ApplicationManager.getApplication();
ModalityState modalityState = Registry.is("ide.perProjectModality") ? ModalityState.defaultModalityState() : ModalityState.NON_MODAL;
ModalityState modalityState = ModalityState.NON_MODAL;
application.getInvokator().invokeLater(command, modalityState, expire == null ? application.getDisposed() : expire).doWhenDone(() -> {
if (queueNext) {
this.run();
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java
+1 -1
View File
@@ -271,7 +271,7 @@ public class CommitChangeListDialog extends DialogWrapper implements CheckinProj
final boolean isAlien,
final String comment,
@Nullable CommitResultHandler customResultHandler) {
super(project, true);
super(project, true, (Registry.is("ide.perProjectModality")) ? IdeModalityType.PROJECT : IdeModalityType.IDE);
myCommitContext = new CommitContext();
myProject = project;
myVcsConfiguration = ObjectUtils.assertNotNull(VcsConfiguration.getInstance(myProject));