goldcollection
/
muwire
mirror of https://github.com/zlatinb/muwire
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use explicit event to shutdown the application. This fixes closing on Linux

pull/24/head
Zlatin Balevsky 2019-10-23 05:45:50 +01:00
parent d4eaa0df8d
commit fb1804e849
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,6 +44,8 @@ import java.awt.datatransfer.DataFlavor
import java.awt.datatransfer.StringSelection import java.awt.datatransfer.StringSelection
import java.awt.event.MouseAdapter import java.awt.event.MouseAdapter
import java.awt.event.MouseEvent import java.awt.event.MouseEvent
import java.awt.event.WindowAdapter
import java.awt.event.WindowEvent
import java.nio.charset.StandardCharsets import java.nio.charset.StandardCharsets
import javax.annotation.Nonnull import javax.annotation.Nonnull
@ -67,13 +69,11 @@ class MainFrameView {
UISettings settings UISettings settings
void initUI() { void initUI() {
int closeOperation = application.getContext().get("tray-icon") ? JFrame.HIDE_ON_CLOSE : JFrame.EXIT_ON_CLOSE
settings = application.context.get("ui-settings") settings = application.context.get("ui-settings")
builder.with { builder.with {
application(size : [1024,768], id: 'main-frame', application(size : [1024,768], id: 'main-frame',
locationRelativeTo : null, locationRelativeTo : null,
defaultCloseOperation : closeOperation, defaultCloseOperation : JFrame.HIDE_ON_CLOSE,
title: application.configuration['application.title'] + " " + title: application.configuration['application.title'] + " " +
metadata["application.version"] + " revision " + metadata["build.revision"], metadata["application.version"] + " revision " + metadata["build.revision"],
iconImage: imageIcon('/MuWire-48x48.png').image, iconImage: imageIcon('/MuWire-48x48.png').image,
@ -439,6 +439,14 @@ class MainFrameView {
} }
}) })
if (!application.getContext().get("tray-icon")) {
mainFrame.addWindowListener(new WindowAdapter(WindowEvent e){
public void windowClosing() {
application.shutdown()
}
})
}
def downloadsTable = builder.getVariable("downloads-table") def downloadsTable = builder.getVariable("downloads-table")
def selectionModel = downloadsTable.getSelectionModel() def selectionModel = downloadsTable.getSelectionModel()
selectionModel.setSelectionMode(ListSelectionModel.SINGLE_SELECTION) selectionModel.setSelectionMode(ListSelectionModel.SINGLE_SELECTION)