From f7b43304d4765e8e3a59b1b47952b07f2d1dff3d Mon Sep 17 00:00:00 2001 From: Zlatin Balevsky Date: Thu, 11 Jul 2019 03:57:49 +0100 Subject: [PATCH] use split pane in downloads tab as well --- .../views/com/muwire/gui/MainFrameView.groovy | 54 ++++++++++--------- 1 file changed, 28 insertions(+), 26 deletions(-) diff --git a/gui/griffon-app/views/com/muwire/gui/MainFrameView.groovy b/gui/griffon-app/views/com/muwire/gui/MainFrameView.groovy index c39497b1..26783f17 100644 --- a/gui/griffon-app/views/com/muwire/gui/MainFrameView.groovy +++ b/gui/griffon-app/views/com/muwire/gui/MainFrameView.groovy @@ -121,35 +121,37 @@ class MainFrameView { tabbedPane(id : "result-tabs", constraints: BorderLayout.CENTER) } panel (constraints: "downloads window") { - gridLayout(rows : 2, cols: 1) - panel { - borderLayout() - scrollPane (constraints : BorderLayout.CENTER) { - downloadsTable = table(id : "downloads-table", autoCreateRowSorter : true) { - tableModel(list: model.downloads) { - closureColumn(header: "Name", preferredWidth: 300, type: String, read : {row -> row.downloader.file.getName()}) - closureColumn(header: "Status", preferredWidth: 50, type: String, read : {row -> row.downloader.getCurrentState().toString()}) - closureColumn(header: "Progress", preferredWidth: 70, type: Downloader, read: { row -> row.downloader }) - closureColumn(header: "Sources", preferredWidth : 10, type: Integer, read : {row -> row.downloader.activeWorkers()}) - closureColumn(header: "Speed", preferredWidth: 50, type:String, read :{row -> - DataHelper.formatSize2Decimal(row.downloader.speed(), false) + "B/sec" - }) + gridLayout(rows : 1, cols : 1) + splitPane(orientation: JSplitPane.VERTICAL_SPLIT, continuousLayout : true, dividerLocation: 300 ) { + panel { + borderLayout() + scrollPane (constraints : BorderLayout.CENTER) { + downloadsTable = table(id : "downloads-table", autoCreateRowSorter : true) { + tableModel(list: model.downloads) { + closureColumn(header: "Name", preferredWidth: 300, type: String, read : {row -> row.downloader.file.getName()}) + closureColumn(header: "Status", preferredWidth: 50, type: String, read : {row -> row.downloader.getCurrentState().toString()}) + closureColumn(header: "Progress", preferredWidth: 70, type: Downloader, read: { row -> row.downloader }) + closureColumn(header: "Sources", preferredWidth : 10, type: Integer, read : {row -> row.downloader.activeWorkers()}) + closureColumn(header: "Speed", preferredWidth: 50, type:String, read :{row -> + DataHelper.formatSize2Decimal(row.downloader.speed(), false) + "B/sec" + }) + } } } + panel (constraints : BorderLayout.SOUTH) { + button(text: "Pause", enabled : bind {model.pauseButtonEnabled}, pauseAction) + button(text: "Cancel", enabled : bind {model.cancelButtonEnabled }, cancelAction ) + button(text: bind { model.resumeButtonText }, enabled : bind {model.retryButtonEnabled}, resumeAction) + } } - panel (constraints : BorderLayout.SOUTH) { - button(text: "Pause", enabled : bind {model.pauseButtonEnabled}, pauseAction) - button(text: "Cancel", enabled : bind {model.cancelButtonEnabled }, cancelAction ) - button(text: bind { model.resumeButtonText }, enabled : bind {model.retryButtonEnabled}, resumeAction) - } - } - panel { - borderLayout() - panel(constraints : BorderLayout.NORTH) { - label(text : "Download Details") - } - panel(constraints : BorderLayout.CENTER) { - label(text : "Details go here...") + panel { + borderLayout() + panel(constraints : BorderLayout.NORTH) { + label(text : "Download Details") + } + scrollPane(constraints : BorderLayout.CENTER) { + label(text : "Details go here...") + } } } }