diff --git a/community-resources/src/idea_community_about@2x.png b/community-resources/src/idea_community_about@2x.png
new file mode 100644
index 000000000000..55b1ad280e22
Binary files /dev/null and b/community-resources/src/idea_community_about@2x.png differ
diff --git a/community-resources/src/idea_community_logo@2x.png b/community-resources/src/idea_community_logo@2x.png
new file mode 100644
index 000000000000..6924051671f5
Binary files /dev/null and b/community-resources/src/idea_community_logo@2x.png differ
diff --git a/platform/platform-impl/src/com/intellij/openapi/progress/util/ProgressWindow.form b/platform/platform-impl/src/com/intellij/openapi/progress/util/ProgressWindow.form
index f8dd161bfa08..533fd88b7bf4 100644
--- a/platform/platform-impl/src/com/intellij/openapi/progress/util/ProgressWindow.form
+++ b/platform/platform-impl/src/com/intellij/openapi/progress/util/ProgressWindow.form
@@ -18,7 +18,7 @@
-
+
diff --git a/platform/platform-impl/src/com/intellij/openapi/progress/util/ProgressWindow.java b/platform/platform-impl/src/com/intellij/openapi/progress/util/ProgressWindow.java
index 3392c1bfc71c..53221843a101 100644
--- a/platform/platform-impl/src/com/intellij/openapi/progress/util/ProgressWindow.java
+++ b/platform/platform-impl/src/com/intellij/openapi/progress/util/ProgressWindow.java
@@ -411,10 +411,11 @@ public class ProgressWindow extends BlockingProgressIndicator implements Disposa
private JProgressBar myProgressBar;
private boolean myRepaintedFlag = true;
- private TitlePanel myTitlePanel;
- private DialogWrapper myPopup;
- private final Window myParentWindow;
- private Point myLastClicked;
+ private TitlePanel myTitlePanel;
+ private JPanel myInnerPanel;
+ private DialogWrapper myPopup;
+ private final Window myParentWindow;
+ private Point myLastClicked;
public MyDialog(boolean shouldShowBackground, Project project, String cancelText) {
Window parentWindow = WindowManager.getInstance().suggestParentWindow(project);
@@ -437,7 +438,7 @@ public class ProgressWindow extends BlockingProgressIndicator implements Disposa
if (UIUtil.isUnderAquaLookAndFeel()) {
UIUtil.applyStyle(UIUtil.ComponentStyle.SMALL, myText2Label);
}
- myProgressBar.setPreferredSize(new Dimension(UIUtil.isUnderAquaLookAndFeel() ? 350 : 450, -1));
+ myInnerPanel.setPreferredSize(new Dimension(UIUtil.isUnderAquaLookAndFeel() ? 350 : 450, -1));
myCancelButton.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
diff --git a/platform/platform-impl/src/com/intellij/openapi/ui/impl/ShadowBorderPainter.java b/platform/platform-impl/src/com/intellij/openapi/ui/impl/ShadowBorderPainter.java
index 7956349c965f..214db85bf92f 100644
--- a/platform/platform-impl/src/com/intellij/openapi/ui/impl/ShadowBorderPainter.java
+++ b/platform/platform-impl/src/com/intellij/openapi/ui/impl/ShadowBorderPainter.java
@@ -94,6 +94,10 @@ public class ShadowBorderPainter {
right.paintIcon(c, g, width - sideSize, _y);
}
+ g.setColor(new Color(0, 0, 0, 30));
+ g.drawRect(SIDE_SIZE - 1, TOP_SIZE - 1,
+ width - SIDE_SIZE * 2 + 1, height - TOP_SIZE - BOTTOM_SIZE + 1);
+
g.dispose();
return image;
}
diff --git a/platform/platform-resources-en/src/messages/XDebuggerBundle.properties b/platform/platform-resources-en/src/messages/XDebuggerBundle.properties
index 6f3a8d540b3a..944b88a4bd86 100644
--- a/platform/platform-resources-en/src/messages/XDebuggerBundle.properties
+++ b/platform/platform-resources-en/src/messages/XDebuggerBundle.properties
@@ -53,6 +53,7 @@ dialog.title.evaluate.code.fragment=Evaluate Code Fragment
button.text.code.fragment.mode=Code Fragment &Mode
button.text.expression.mode=Expression &Mode
xdebugger.label.text.code.fragment=Code fragment:
+xdebugger.evaluate.result=result
xdebugger.popup.value.tree.set.root.action.tooltip=Set As Root
diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/nodes/EvaluatingExpressionRootNode.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/nodes/EvaluatingExpressionRootNode.java
index 25ccb99edd36..ed35a48195d5 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/nodes/EvaluatingExpressionRootNode.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/nodes/EvaluatingExpressionRootNode.java
@@ -15,6 +15,8 @@
*/
package com.intellij.xdebugger.impl.ui.tree.nodes;
+import com.intellij.util.ui.UIUtil;
+import com.intellij.xdebugger.XDebuggerBundle;
import com.intellij.xdebugger.frame.XCompositeNode;
import com.intellij.xdebugger.frame.XValue;
import com.intellij.xdebugger.frame.XValueChildrenList;
@@ -44,10 +46,10 @@ public class EvaluatingExpressionRootNode extends XValueContainerNode