From dc7f2b718a68afb31865a8394020870689ca4ac5 Mon Sep 17 00:00:00 2001 From: "Denis.Zhdanov" Date: Sat, 8 Jun 2013 17:40:12 +0400 Subject: [PATCH] IDEA-108615 Gradle: Add 'recent tasks' control Corrected UI representation for external tasks panel --- .../resources/i18n/ExternalSystemBundle.properties | 1 - .../service/task/ui/ExternalSystemTasksPanel.java | 12 +++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/platform/external-system-api/resources/i18n/ExternalSystemBundle.properties b/platform/external-system-api/resources/i18n/ExternalSystemBundle.properties index 3f1fa527555a..bd0d7de4e562 100644 --- a/platform/external-system-api/resources/i18n/ExternalSystemBundle.properties +++ b/platform/external-system-api/resources/i18n/ExternalSystemBundle.properties @@ -39,7 +39,6 @@ notification.project.refresh.fail.description={0} ''{1}'' project refresh failed notification.action.show.settings={0} settings # Tasks. -tasks.recent.empty.text=Loading... tasks.recent.title=Recent tasks tasks.all.title=All tasks diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/task/ui/ExternalSystemTasksPanel.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/task/ui/ExternalSystemTasksPanel.java index 68af8adc96a3..fbcc7034f8ed 100644 --- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/task/ui/ExternalSystemTasksPanel.java +++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/task/ui/ExternalSystemTasksPanel.java @@ -87,7 +87,6 @@ public class ExternalSystemTasksPanel extends SimpleToolWindowPanel implements D super.processMouseEvent(e); } }; - myRecentTasksList.setEmptyText(ExternalSystemBundle.message("tasks.recent.empty.text")); myRecentTasksModel.setTasks(settings.getRecentTasks()); myAllTasksModel = new ExternalSystemTasksTreeModel(externalSystemId); @@ -108,23 +107,22 @@ public class ExternalSystemTasksPanel extends SimpleToolWindowPanel implements D setToolbar(toolbar.getComponent()); JPanel content = new JPanel(new GridBagLayout()); + content.setOpaque(true); + content.setBackground(UIUtil.getListBackground()); JComponent recentTasksWithTitle = wrap(myRecentTasksList, ExternalSystemBundle.message("tasks.recent.title")); content.add(recentTasksWithTitle, ExternalSystemUiUtil.getFillLineConstraints(0)); JBScrollPane scrollPane = new JBScrollPane(myAllTasksTree); scrollPane.setBorder(null); JComponent allTasksWithTitle = wrap(scrollPane, ExternalSystemBundle.message("tasks.all.title")); - content.add(allTasksWithTitle, ExternalSystemUiUtil.getFillLineConstraints(0).weighty(1)); + content.add(allTasksWithTitle, ExternalSystemUiUtil.getFillLineConstraints(0).weighty(1).fillCell()); setContent(content); - - setOpaque(true); - setBackground(UIUtil.getListBackground()); } private static JComponent wrap(@NotNull JComponent content, @NotNull String title) { - JPanel result = new JPanel(new BorderLayout()); + JPanel result = new JPanel(new GridBagLayout()); result.setOpaque(false); result.setBorder(IdeBorderFactory.createTitledBorder(title)); - result.add(content, BorderLayout.CENTER); + result.add(content, ExternalSystemUiUtil.getFillLineConstraints(0).weighty(1).fillCell()); return result; }