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

show a window while MW is shutting down

Browse Source
This commit is contained in:
Zlatin Balevsky
2019-10-22 23:26:54 +01:00
parent 7ad677ead2
commit ffde6ac86f
6 changed files with 78 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gui/griffon-app/conf/Config.groovy
View File

@@ -1,7 +1,7 @@
application {
title = 'MuWire'
startupGroups = ['EventList', 'MainFrame']
startupGroups = ['EventList', 'MainFrame', 'ShutdownWindow']
autoShutdown = false
}
@@ -16,6 +16,11 @@ mvcGroups {
view = 'com.muwire.gui.MainFrameView'
controller = 'com.muwire.gui.MainFrameController'
}
'ShutdownWindow' {
model = 'com.muwire.gui.ShutdownWindowModel'
view = 'com.muwire.gui.ShutdownWindowView'
controller = 'com.muwire.gui.ShutdownWindowController'
}
'SearchTab' {
model = 'com.muwire.gui.SearchTabModel'
view = 'com.muwire.gui.SearchTabView'

11
gui/griffon-app/controllers/com/muwire/gui/ShutdownWindowController.groovy Normal file
View File

@@ -0,0 +1,11 @@
package com.muwire.gui
import griffon.core.artifact.GriffonController
import griffon.core.controller.ControllerAction
import griffon.inject.MVCMember
import griffon.metadata.ArtifactProviderFor
import javax.annotation.Nonnull
@ArtifactProviderFor(GriffonController)
class ShutdownWindowController {
}

14
gui/griffon-app/lifecycle/Initialize.groovy
View File

@@ -49,7 +49,7 @@ class Initialize extends AbstractLifecycleHandler {
}
}
if (SystemTray.isSupported()) {
if (SystemTray.isSupported() && (SystemVersion.isMac() || SystemVersion.isWindows())) {
try {
def tray = SystemTray.getSystemTray()
def url = Initialize.class.getResource("/MuWire-32x32.png")
@@ -60,11 +60,17 @@ class Initialize extends AbstractLifecycleHandler {
def exit = new MenuItem("Exit")
exit.addActionListener({
application.getWindowManager().findWindow("main-frame").setVisible(false)
application.getWindowManager().findWindow("shutdown-window").setVisible(true)
Core core = application.getContext().get("core")
if (core != null)
core.shutdown()
if (core != null) {
Thread t = new Thread({
core.shutdown()
application.shutdown()
}as Runnable)
t.start()
}
tray.remove(trayIcon)
System.exit(0)
})
def showMW = {e ->

3
gui/griffon-app/lifecycle/Shutdown.groovy
View File

@@ -20,6 +20,7 @@ class Shutdown extends AbstractLifecycleHandler {
void execute() {
log.info("shutting down")
Core core = application.context.get("core")
core.shutdown()
if (core != null)
core.shutdown()
}
}

9
gui/griffon-app/models/com/muwire/gui/ShutdownWindowModel.groovy Normal file
View File

@@ -0,0 +1,9 @@
package com.muwire.gui
import griffon.core.artifact.GriffonModel
import griffon.transform.Observable
import griffon.metadata.ArtifactProviderFor
@ArtifactProviderFor(GriffonModel)
class ShutdownWindowModel {
}

40
gui/griffon-app/views/com/muwire/gui/ShutdownWindowView.groovy Normal file
View File

@@ -0,0 +1,40 @@
package com.muwire.gui
import griffon.core.GriffonApplication
import griffon.core.artifact.GriffonView
import griffon.inject.MVCMember
import griffon.metadata.ArtifactProviderFor
import javax.swing.Box
import javax.swing.SwingConstants
import javax.annotation.Nonnull
import javax.inject.Inject
@ArtifactProviderFor(GriffonView)
class ShutdownWindowView {
@MVCMember @Nonnull
FactoryBuilderSupport builder
@MVCMember @Nonnull
ShutdownWindowModel model
void initUI() {
builder.with {
app = application(size: [320, 80], id: 'shutdown-window',
locationRelativeTo : null,
title: application.configuration['application.title'],
iconImage: imageIcon('/MuWire-48x48.png').image,
iconImages: [imageIcon('/MuWire-48x48.png').image,
imageIcon('/MuWire-32x32.png').image,
imageIcon('/MuWire-16x16.png').image],
visible: false ) {
panel {
vbox {
label("MuWire is shutting down, please wait...")
Box.createVerticalGlue()
progressBar(indeterminate : true)
}
}
}
}
}
}