idk/muwire
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move downloads to their own pane

Browse Source
This commit is contained in:
Zlatin Balevsky
2019-07-10 20:54:45 +01:00
parent 46aee19f80
commit 18a1c7091a
2 changed files with 52 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gui/griffon-app/models/com/muwire/gui/MainFrameModel.groovy
View File

@@ -92,6 +92,7 @@ class MainFrameModel {
@Observable boolean unsubscribeButtonEnabled @Observable boolean unsubscribeButtonEnabled
@Observable boolean searchesPaneButtonEnabled @Observable boolean searchesPaneButtonEnabled
@Observable boolean downloadsPaneButtonEnabled
@Observable boolean uploadsPaneButtonEnabled @Observable boolean uploadsPaneButtonEnabled
@Observable boolean monitorPaneButtonEnabled @Observable boolean monitorPaneButtonEnabled
@Observable boolean trustPaneButtonEnabled @Observable boolean trustPaneButtonEnabled
@@ -207,6 +208,7 @@ class MainFrameModel {
resumeButtonText = "Retry" resumeButtonText = "Retry"
searchesPaneButtonEnabled = false searchesPaneButtonEnabled = false
downloadsPaneButtonEnabled = true
uploadsPaneButtonEnabled = true uploadsPaneButtonEnabled = true
monitorPaneButtonEnabled = true monitorPaneButtonEnabled = true
trustPaneButtonEnabled = true trustPaneButtonEnabled = true

79
gui/griffon-app/views/com/muwire/gui/MainFrameView.groovy
View File

@@ -90,6 +90,7 @@ class MainFrameView {
panel (constraints: BorderLayout.WEST) { panel (constraints: BorderLayout.WEST) {
gridLayout(rows:1, cols: 2) gridLayout(rows:1, cols: 2)
button(text: "Searches", enabled : bind{model.searchesPaneButtonEnabled},actionPerformed : showSearchWindow) button(text: "Searches", enabled : bind{model.searchesPaneButtonEnabled},actionPerformed : showSearchWindow)
button(text: "Downloads", enabled : bind{model.downloadsPaneButtonEnabled}, actionPerformed : showDownloadsWindow)
button(text: "Uploads", enabled : bind{model.uploadsPaneButtonEnabled}, actionPerformed : showUploadsWindow) button(text: "Uploads", enabled : bind{model.uploadsPaneButtonEnabled}, actionPerformed : showUploadsWindow)
if (settings.showMonitor) if (settings.showMonitor)
button(text: "Monitor", enabled: bind{model.monitorPaneButtonEnabled},actionPerformed : showMonitorWindow) button(text: "Monitor", enabled: bind{model.monitorPaneButtonEnabled},actionPerformed : showMonitorWindow)
@@ -117,37 +118,43 @@ class MainFrameView {
cardLayout() cardLayout()
panel (constraints : "search window") { panel (constraints : "search window") {
borderLayout() borderLayout()
splitPane( orientation : JSplitPane.VERTICAL_SPLIT, dividerLocation : 500, tabbedPane(id : "result-tabs", constraints: BorderLayout.CENTER)
continuousLayout : true, constraints : BorderLayout.CENTER) { panel(constraints : BorderLayout.SOUTH) {
panel (constraints : JSplitPane.TOP) { button(text : "Download", enabled : bind {model.downloadActionEnabled}, downloadAction)
borderLayout() button(text : "Trust", enabled: bind {model.trustButtonsEnabled }, trustAction)
tabbedPane(id : "result-tabs", constraints: BorderLayout.CENTER) button(text : "Distrust", enabled : bind {model.trustButtonsEnabled}, distrustAction)
panel(constraints : BorderLayout.SOUTH) { }
button(text : "Download", enabled : bind {model.downloadActionEnabled}, downloadAction) }
button(text : "Trust", enabled: bind {model.trustButtonsEnabled }, trustAction) panel (constraints: "downloads window") {
button(text : "Distrust", enabled : bind {model.trustButtonsEnabled}, distrustAction) gridLayout(rows : 2, cols: 1)
} panel {
} borderLayout()
panel (constraints : JSplitPane.BOTTOM) { scrollPane (constraints : BorderLayout.CENTER) {
borderLayout() downloadsTable = table(id : "downloads-table", autoCreateRowSorter : true) {
scrollPane (constraints : BorderLayout.CENTER) { tableModel(list: model.downloads) {
downloadsTable = table(id : "downloads-table", autoCreateRowSorter : true) { closureColumn(header: "Name", preferredWidth: 300, type: String, read : {row -> row.downloader.file.getName()})
tableModel(list: model.downloads) { closureColumn(header: "Status", preferredWidth: 50, type: String, read : {row -> row.downloader.getCurrentState().toString()})
closureColumn(header: "Name", preferredWidth: 300, type: String, read : {row -> row.downloader.file.getName()}) closureColumn(header: "Progress", preferredWidth: 70, type: Downloader, read: { row -> row.downloader })
closureColumn(header: "Status", preferredWidth: 50, type: String, read : {row -> row.downloader.getCurrentState().toString()}) closureColumn(header: "Sources", preferredWidth : 10, type: Integer, read : {row -> row.downloader.activeWorkers()})
closureColumn(header: "Progress", preferredWidth: 70, type: Downloader, read: { row -> row.downloader }) closureColumn(header: "Speed", preferredWidth: 50, type:String, read :{row ->
closureColumn(header: "Sources", preferredWidth : 10, type: Integer, read : {row -> row.downloader.activeWorkers()}) DataHelper.formatSize2Decimal(row.downloader.speed(), false) + "B/sec"
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) panel (constraints : BorderLayout.SOUTH) {
button(text: "Cancel", enabled : bind {model.cancelButtonEnabled }, cancelAction ) button(text: "Pause", enabled : bind {model.pauseButtonEnabled}, pauseAction)
button(text: bind { model.resumeButtonText }, enabled : bind {model.retryButtonEnabled}, resumeAction) 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...")
} }
} }
} }
@@ -691,6 +698,17 @@ class MainFrameView {
def cardsPanel = builder.getVariable("cards-panel") def cardsPanel = builder.getVariable("cards-panel")
cardsPanel.getLayout().show(cardsPanel, "search window") cardsPanel.getLayout().show(cardsPanel, "search window")
model.searchesPaneButtonEnabled = false model.searchesPaneButtonEnabled = false
model.downloadsPaneButtonEnabled = true
model.uploadsPaneButtonEnabled = true
model.monitorPaneButtonEnabled = true
model.trustPaneButtonEnabled = true
}
def showDownloadsWindow = {
def cardsPanel = builder.getVariable("cards-panel")
cardsPanel.getLayout().show(cardsPanel, "downloads window")
model.searchesPaneButtonEnabled = true
model.downloadsPaneButtonEnabled = false
model.uploadsPaneButtonEnabled = true model.uploadsPaneButtonEnabled = true
model.monitorPaneButtonEnabled = true model.monitorPaneButtonEnabled = true
model.trustPaneButtonEnabled = true model.trustPaneButtonEnabled = true
@@ -700,6 +718,7 @@ class MainFrameView {
def cardsPanel = builder.getVariable("cards-panel") def cardsPanel = builder.getVariable("cards-panel")
cardsPanel.getLayout().show(cardsPanel, "uploads window") cardsPanel.getLayout().show(cardsPanel, "uploads window")
model.searchesPaneButtonEnabled = true model.searchesPaneButtonEnabled = true
model.downloadsPaneButtonEnabled = true
model.uploadsPaneButtonEnabled = false model.uploadsPaneButtonEnabled = false
model.monitorPaneButtonEnabled = true model.monitorPaneButtonEnabled = true
model.trustPaneButtonEnabled = true model.trustPaneButtonEnabled = true
@@ -709,6 +728,7 @@ class MainFrameView {
def cardsPanel = builder.getVariable("cards-panel") def cardsPanel = builder.getVariable("cards-panel")
cardsPanel.getLayout().show(cardsPanel,"monitor window") cardsPanel.getLayout().show(cardsPanel,"monitor window")
model.searchesPaneButtonEnabled = true model.searchesPaneButtonEnabled = true
model.downloadsPaneButtonEnabled = true
model.uploadsPaneButtonEnabled = true model.uploadsPaneButtonEnabled = true
model.monitorPaneButtonEnabled = false model.monitorPaneButtonEnabled = false
model.trustPaneButtonEnabled = true model.trustPaneButtonEnabled = true
@@ -718,6 +738,7 @@ class MainFrameView {
def cardsPanel = builder.getVariable("cards-panel") def cardsPanel = builder.getVariable("cards-panel")
cardsPanel.getLayout().show(cardsPanel,"trust window") cardsPanel.getLayout().show(cardsPanel,"trust window")
model.searchesPaneButtonEnabled = true model.searchesPaneButtonEnabled = true
model.downloadsPaneButtonEnabled = true
model.uploadsPaneButtonEnabled = true model.uploadsPaneButtonEnabled = true
model.monitorPaneButtonEnabled = true model.monitorPaneButtonEnabled = true
model.trustPaneButtonEnabled = false model.trustPaneButtonEnabled = false