From bb636184e90ce101f9c6d75cc47018e15e2a515d Mon Sep 17 00:00:00 2001 From: Denis Fokin Date: Thu, 22 Sep 2016 12:45:39 +0300 Subject: [PATCH] Revert: Per project modality state --- platform/lang-impl/src/com/intellij/find/impl/FindDialog.java | 2 +- .../src/com/intellij/diagnostic/JetBrainsAccountDialog.kt | 2 -- .../src/com/intellij/ide/ui/laf/intellijlaf_mac.properties | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/find/impl/FindDialog.java b/platform/lang-impl/src/com/intellij/find/impl/FindDialog.java index dc47a845b47a..08855f9d2954 100644 --- a/platform/lang-impl/src/com/intellij/find/impl/FindDialog.java +++ b/platform/lang-impl/src/com/intellij/find/impl/FindDialog.java @@ -148,7 +148,7 @@ public class FindDialog extends DialogWrapper { private volatile ProgressIndicatorBase myResultsPreviewSearchProgress; public FindDialog(@NotNull Project project, @NotNull FindModel model, @NotNull Consumer myOkHandler){ - super(project, true, IdeModalityType.PROJECT); + super(project, true); myProject = project; myModel = model; diff --git a/platform/platform-impl/src/com/intellij/diagnostic/JetBrainsAccountDialog.kt b/platform/platform-impl/src/com/intellij/diagnostic/JetBrainsAccountDialog.kt index aa1d4ee9694e..99dbed90dab6 100644 --- a/platform/platform-impl/src/com/intellij/diagnostic/JetBrainsAccountDialog.kt +++ b/platform/platform-impl/src/com/intellij/diagnostic/JetBrainsAccountDialog.kt @@ -27,7 +27,6 @@ import com.intellij.ui.components.dialog import com.intellij.ui.layout.* import com.intellij.util.io.encodeUrlQueryParameter import java.awt.Component -import java.awt.Font import javax.swing.JPasswordField import javax.swing.JTextField @@ -36,7 +35,6 @@ fun showJetBrainsAccountDialog(parent: Component, project: Project? = null): Dia val credentials = ErrorReportConfigurable.getCredentials() val userField = JTextField(credentials?.userName) val passwordField = JPasswordField(credentials?.password?.toString()) - passwordField.font = Font("Menlo", passwordField.font.style, passwordField.font.size) // if no user name - never stored and so, defaults to remember. if user name set, but no password, so, previously was stored without password val rememberCheckBox = CheckBox(CommonBundle.message("checkbox.remember.password"), selected = credentials?.userName == null || !credentials?.password.isNullOrEmpty()) diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/intellijlaf_mac.properties b/platform/platform-impl/src/com/intellij/ide/ui/laf/intellijlaf_mac.properties index c7e13a2d816e..1635a024a0a5 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/laf/intellijlaf_mac.properties +++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/intellijlaf_mac.properties @@ -23,7 +23,6 @@ TextFieldUI=com.intellij.ide.ui.laf.intellij.MacIntelliJTextFieldUI TextField.border=com.intellij.ide.ui.laf.intellij.MacIntelliJTextBorder PasswordFieldUI=com.intellij.ide.ui.laf.intellij.MacIntelliJPasswordFieldUI PasswordField.border=com.intellij.ide.ui.laf.intellij.MacIntelliJTextBorder -PasswordField.font=com.intellij.ide.ui.laf.intellij.MacIntelliJTextBorder SpinnerUI=com.intellij.ide.ui.laf.intellij.MacIntelliJSpinnerUI Spinner.border=com.intellij.ide.ui.laf.intellij.MacIntelliJSpinnerBorder