Upgrading to Griffon 1.2.0

This commit is contained in:
Jonathan Bernard
2013-09-22 15:22:44 -05:00
parent 5b2ecf7b65
commit bc51d17932
27 changed files with 504 additions and 128 deletions

View File

@ -16,8 +16,8 @@ mousePressed = { evt -> mousePressRelativeToDialog = evt?.point }
mouseDragged = { evt ->
GUIUtil.componentDragged(dialog, evt, mousePressRelativeToDialog,
new Rectangle(Toolkit.defaultToolkit.screenSize),
model.mainMVC.view.frame.bounds)
new Rectangle(Toolkit.defaultToolkit.screenSize),
model.mainMVC.view.frame.bounds)
offsetFromMainFrame = GUIUtil.calculateOffset(
model.mainMVC.view.frame, dialog)

View File

@ -4,6 +4,7 @@ import java.awt.Color
import java.awt.Point
import java.awt.Toolkit
import java.awt.Rectangle
import java.beans.PropertyChangeListener
import java.text.SimpleDateFormat
import javax.swing.JDialog
import java.util.Calendar
@ -22,8 +23,8 @@ mousePressed = { evt -> mousePressRelativeToDialog = evt?.point }
mouseDragged = { evt ->
GUIUtil.componentDragged(dialog, evt, mousePressRelativeToDialog,
new Rectangle(Toolkit.defaultToolkit.screenSize),
model.mainMVC.view.frame.bounds)
new Rectangle(Toolkit.defaultToolkit.screenSize),
model.mainMVC.view.frame.bounds)
offsetFromMainFrame = GUIUtil.calculateOffset(
model.mainMVC.view.frame, dialog)
@ -59,9 +60,10 @@ dialog = dialog(new JDialog(model.mainMVC.view.frame),
dayDisplay = widget(constraints: 'grow, gp 200',
new TimelineDayDisplay(model.mainMVC.model.timeline),
timeline: bind(source: model.mainMVC.model,
sourceProperty: 'timeline'),
stateChanged: bind(source: model.mainMVC.model,
sourceProperty: 'currentMarker'))
sourceProperty: 'timeline'))
model.mainMVC.model.addPropertyChangeListener('currentMarker', {
dayDisplay.stateChanged(null) } as PropertyChangeListener)
panel(
border: lineBorder(color: Color.BLACK, thickness: 1),

View File

@ -187,7 +187,7 @@ aboutDialog = dialog(new JDialog(frame),
locationRelativeTo: null,
pack: true,
undecorated: true,
title: "About TimeStamper v" + app.applicationProperties.'app.version'
title: "About TimeStamper v" + app.metadata.'app.version'
) {
panel(layout: new MigLayout('fill'),
border: lineBorder(color: Color.BLACK, thickness: 1)) {
@ -195,7 +195,7 @@ aboutDialog = dialog(new JDialog(frame),
label(font: new Font(Font.SANS_SERIF, Font.PLAIN, 18),
text: "TimeStamper", constraints: 'growx, wrap',
horizontalAlignment: SwingConstants.CENTER)
label(text: "version " + app.applicationProperties.'app.version'
label(text: "version " + app.metadata.'app.version'
+ " by Jonathan Bernard", constraints: 'growx, wrap',
horizontalAlignment: SwingConstants.CENTER)
textField(text: 'http://www.jdb-labs.com/timestamper',