From cbe58c4c1fe511a0bf2781cff07f11af8fe382d0 Mon Sep 17 00:00:00 2001 From: "Kirill.Safonov" Date: Thu, 18 Aug 2011 22:48:55 +0400 Subject: [PATCH] IDE errors dialog - fix initial size --- .../intellij/diagnostic/IdeErrorsDialog.java | 4 ++-- .../errordialog/CommentsTabForm.java | 3 +++ .../errordialog/DetailsTabForm.java | 3 +++ .../errordialog/IdeErrorsDialog.form | 21 ++----------------- 4 files changed, 10 insertions(+), 21 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/diagnostic/IdeErrorsDialog.java b/platform/platform-impl/src/com/intellij/diagnostic/IdeErrorsDialog.java index b586360a9952..d323324e6b4c 100644 --- a/platform/platform-impl/src/com/intellij/diagnostic/IdeErrorsDialog.java +++ b/platform/platform-impl/src/com/intellij/diagnostic/IdeErrorsDialog.java @@ -59,9 +59,10 @@ import java.util.List; public class IdeErrorsDialog extends DialogWrapper implements MessagePoolListener, TypeSafeDataProvider { private static final Logger LOG = Logger.getInstance(IdeErrorsDialog.class.getName()); - private static final boolean INTERNAL_MODE = ApplicationManagerEx.getApplicationEx().isInternal(); + public static final boolean INTERNAL_MODE = ApplicationManagerEx.getApplicationEx().isInternal(); @NonNls private static final String ACTIVE_TAB_OPTION = IdeErrorsDialog.class.getName() + "activeTab"; public static DataKey CURRENT_TRACE_KEY = DataKey.create("current_stack_trace_key"); + public static final int COMPONENTS_WIDTH = 670; private JPanel myContentPane; private JPanel myBackButtonPanel; @@ -544,7 +545,6 @@ public class IdeErrorsDialog extends DialogWrapper implements MessagePoolListene // take first line msg = msg.substring(0, i); } - msg = StringUtil.first(msg, 200, true); myCommentsTabForm.setErrorText(msg); } else { diff --git a/platform/platform-impl/src/com/intellij/diagnostic/errordialog/CommentsTabForm.java b/platform/platform-impl/src/com/intellij/diagnostic/errordialog/CommentsTabForm.java index 328623a99961..721ef10fcf4b 100644 --- a/platform/platform-impl/src/com/intellij/diagnostic/errordialog/CommentsTabForm.java +++ b/platform/platform-impl/src/com/intellij/diagnostic/errordialog/CommentsTabForm.java @@ -1,11 +1,13 @@ package com.intellij.diagnostic.errordialog; import com.intellij.diagnostic.DiagnosticBundle; +import com.intellij.diagnostic.IdeErrorsDialog; import com.intellij.openapi.ui.LabeledComponent; import com.intellij.ui.IdeBorderFactory; import com.intellij.util.ui.UIUtil; import javax.swing.*; +import java.awt.*; /** * @author ksafonov @@ -17,6 +19,7 @@ public class CommentsTabForm { public CommentsTabForm() { myCommentsArea.setTitle(DiagnosticBundle.message("error.dialog.comment.prompt")); + myErrorComponent.getComponent().setPreferredSize(new Dimension(IdeErrorsDialog.COMPONENTS_WIDTH, -1)); myErrorComponent.getComponent().setEditable(false); myErrorComponent.getComponent().setBackground(UIUtil.getTextFieldBackground()); myErrorComponent.getComponent().setBorder(IdeBorderFactory.createBorder()); diff --git a/platform/platform-impl/src/com/intellij/diagnostic/errordialog/DetailsTabForm.java b/platform/platform-impl/src/com/intellij/diagnostic/errordialog/DetailsTabForm.java index fcaedf7c4c08..feb3b62d53ac 100644 --- a/platform/platform-impl/src/com/intellij/diagnostic/errordialog/DetailsTabForm.java +++ b/platform/platform-impl/src/com/intellij/diagnostic/errordialog/DetailsTabForm.java @@ -1,11 +1,13 @@ package com.intellij.diagnostic.errordialog; import com.intellij.diagnostic.DiagnosticBundle; +import com.intellij.diagnostic.IdeErrorsDialog; import com.intellij.ui.IdeBorderFactory; import com.intellij.util.ui.UIUtil; import org.jetbrains.annotations.Nullable; import javax.swing.*; +import java.awt.*; /** * @author ksafonov @@ -20,6 +22,7 @@ public class DetailsTabForm { public DetailsTabForm(@Nullable Action analyzeAction) { myCommentsArea.setTitle(DiagnosticBundle.message("error.dialog.comment.prompt")); myDetailsPane.setBackground(UIUtil.getTextFieldBackground()); + myDetailsPane.setPreferredSize(new Dimension(IdeErrorsDialog.COMPONENTS_WIDTH, IdeErrorsDialog.INTERNAL_MODE ? 500 : 205)); myDetailsHolder.setBorder(IdeBorderFactory.createBorder()); if (analyzeAction != null) { myAnalyzeStacktraceButton.setAction(analyzeAction); diff --git a/platform/platform-impl/src/com/intellij/diagnostic/errordialog/IdeErrorsDialog.form b/platform/platform-impl/src/com/intellij/diagnostic/errordialog/IdeErrorsDialog.form index 5bac72743971..f67b8c4a8c24 100644 --- a/platform/platform-impl/src/com/intellij/diagnostic/errordialog/IdeErrorsDialog.form +++ b/platform/platform-impl/src/com/intellij/diagnostic/errordialog/IdeErrorsDialog.form @@ -84,28 +84,11 @@ - - + - - - - - - - - - - - - - - - - - +