diff --git a/images/src/org/intellij/images/editor/actions/SetBackgroundImageDialog.form b/images/src/org/intellij/images/editor/actions/SetBackgroundImageDialog.form
index c28e8b2462cd..86eca76de1ef 100644
--- a/images/src/org/intellij/images/editor/actions/SetBackgroundImageDialog.form
+++ b/images/src/org/intellij/images/editor/actions/SetBackgroundImageDialog.form
@@ -3,7 +3,7 @@
-
+
@@ -21,7 +21,7 @@
-
+
diff --git a/images/src/org/intellij/images/editor/actions/SetBackgroundImageDialog.java b/images/src/org/intellij/images/editor/actions/SetBackgroundImageDialog.java
index 071861b4ddc6..b6aad38b3335 100644
--- a/images/src/org/intellij/images/editor/actions/SetBackgroundImageDialog.java
+++ b/images/src/org/intellij/images/editor/actions/SetBackgroundImageDialog.java
@@ -98,12 +98,14 @@ public class SetBackgroundImageDialog extends DialogWrapper {
}
targetChanged(null);
init();
+ myEditorPreview.getPanel().setPreferredSize(new Dimension(0, 0));
+ pack();
}
@NotNull
@Override
protected Action[] createActions() {
- return ArrayUtil.append(super.createActions(), new AbstractAction("Clear") {
+ return ArrayUtil.append(super.createActions(), new AbstractAction("Clear and Close") {
@Override
public void actionPerformed(ActionEvent e) {
doClearAction();
diff --git a/platform/platform-impl/src/com/intellij/ide/ui/AppearanceConfigurable.java b/platform/platform-impl/src/com/intellij/ide/ui/AppearanceConfigurable.java
index 5f90bf25b340..4ae8ef9ffd11 100644
--- a/platform/platform-impl/src/com/intellij/ide/ui/AppearanceConfigurable.java
+++ b/platform/platform-impl/src/com/intellij/ide/ui/AppearanceConfigurable.java
@@ -17,6 +17,8 @@ package com.intellij.ide.ui;
import com.intellij.ide.IdeBundle;
import com.intellij.ide.actions.QuickChangeLookAndFeel;
+import com.intellij.openapi.actionSystem.ActionPlaces;
+import com.intellij.openapi.actionSystem.ex.ActionUtil;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.components.ServiceKt;
import com.intellij.openapi.diagnostic.Logger;
@@ -27,6 +29,7 @@ import com.intellij.openapi.editor.colors.ex.DefaultColorSchemesManager;
import com.intellij.openapi.editor.colors.impl.EditorColorsManagerImpl;
import com.intellij.openapi.options.BaseConfigurable;
import com.intellij.openapi.options.SearchableConfigurable;
+import com.intellij.openapi.project.ProjectManager;
import com.intellij.openapi.ui.ComboBox;
import com.intellij.openapi.util.Comparing;
import com.intellij.openapi.util.registry.Registry;
@@ -135,6 +138,10 @@ public class AppearanceConfigurable extends BaseConfigurable implements Searchab
myComponent.myTransparencyPanel.setVisible(WindowManagerEx.getInstanceEx().isAlphaModeSupported());
+ myComponent.myBackgroundImageButton.setEnabled(ProjectManager.getInstance().getOpenProjects().length > 0);
+ myComponent.myBackgroundImageButton.addActionListener(ActionUtil.createActionListener(
+ "Images.SetBackgroundImage", myComponent.myPanel, ActionPlaces.UNKNOWN));
+
return myComponent.myPanel;
}
@@ -494,6 +501,7 @@ public class AppearanceConfigurable extends BaseConfigurable implements Searchab
private ColorBlindnessPanel myColorBlindnessPanel;
private JComboBox myAntialiasingInIDE;
private JComboBox myAntialiasingInEditor;
+ private JButton myBackgroundImageButton;
public MyComponent() {
myOverrideLAFFonts.addActionListener(__ -> updateCombo());
diff --git a/platform/platform-impl/src/com/intellij/ide/ui/AppearancePanel.form b/platform/platform-impl/src/com/intellij/ide/ui/AppearancePanel.form
index f09a3291c2e4..16cdd0174508 100644
--- a/platform/platform-impl/src/com/intellij/ide/ui/AppearancePanel.form
+++ b/platform/platform-impl/src/com/intellij/ide/ui/AppearancePanel.form
@@ -16,7 +16,7 @@
-
+
@@ -168,7 +168,7 @@
-
+
@@ -206,6 +206,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+