This is an automated email from the git hooks/post-receive script. New commit to branch feature/1176 in repository lima. See http://git.chorem.org/lima.git commit 290c02e22b66868ed6fe724c064e75f57f669256 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Mar 20 17:26:07 2015 +0100 refs #1187 : entry book popups --- .../org/chorem/lima/ui/entrybook/EntryBookForm.css | 2 ++ .../chorem/lima/ui/entrybook/EntryBookForm.jaxx | 20 ++++++++--------- .../lima/ui/entrybook/EntryBookImportForm.css | 2 ++ .../lima/ui/entrybook/EntryBookImportForm.jaxx | 26 +++++++++------------- 4 files changed, 23 insertions(+), 27 deletions(-) diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookForm.css b/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookForm.css index bb177c7..dcacd40 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookForm.css +++ b/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookForm.css @@ -44,8 +44,10 @@ #cancel { text : "lima.cancel"; + actionIcon : cancel; } #ok { text : "lima.ok"; + actionIcon : ok; } \ No newline at end of file diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookForm.jaxx b/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookForm.jaxx index 47e375e..f4777f6 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookForm.jaxx +++ b/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookForm.jaxx @@ -22,6 +22,7 @@ <JDialog id="entryBookFormDialog" modal="true" defaultCloseOperation="{JDialog.DO_NOTHING_ON_CLOSE}" + layout="{new BorderLayout()}" onWindowClosing="performCancel();"> <import> @@ -41,7 +42,7 @@ ]]> </script> - <Table> + <Table constraints="BorderLayout.CENTER"> <row> <cell> <JLabel id="codeLabel"/> @@ -64,15 +65,12 @@ onRemoveUpdate='getEntryBook().setLabel(getLabelTextField().getText())'/> </cell> </row> - <row> - <cell> - <JButton id="cancel" - onActionPerformed="performCancel()"/> - </cell> - <cell> - <JButton id="ok" - onActionPerformed="dispose()"/> - </cell> - </row> </Table> + <JPanel constraints="BorderLayout.SOUTH" + layout='{new GridLayout(1,0)}'> + <JButton id="cancel" + onActionPerformed="performCancel()"/> + <JButton id="ok" + onActionPerformed="dispose()"/> + </JPanel> </JDialog> diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookImportForm.css b/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookImportForm.css index 9ae8889..3d8265b 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookImportForm.css +++ b/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookImportForm.css @@ -38,8 +38,10 @@ #cancel { text : "lima.cancel"; + actionIcon : cancel; } #ok { text : "lima.ok"; + actionIcon : ok; } diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookImportForm.jaxx b/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookImportForm.jaxx index 3e59d97..939e70e 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookImportForm.jaxx +++ b/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookImportForm.jaxx @@ -22,6 +22,7 @@ <JDialog id="entryBookImportForm" modal="true" defaultCloseOperation="{JDialog.DO_NOTHING_ON_CLOSE}" + layout="{new BorderLayout()}" onWindowClosing="performCancel();"> <import> @@ -41,30 +42,23 @@ ]]> </script> - <Table> + <Table constraints="BorderLayout.CENTER"> <row> <cell> <JRadioButton id="entryBooksDefault"/> </cell> - <cell> - <JRadioButton id="entryBooksImport"/> - </cell> </row> <row> <cell> - <Table> - <row> - <cell fill="none"> - <JButton id="cancel" - onActionPerformed="performCancel()"/> - </cell> - <cell fill="none"> - <JButton id="ok" - onActionPerformed="dispose()"/> - </cell> - </row> - </Table> + <JRadioButton id="entryBooksImport"/> </cell> </row> </Table> + <JPanel constraints="BorderLayout.SOUTH" + layout='{new GridLayout(1,0)}'> + <JButton id="cancel" + onActionPerformed="performCancel()"/> + <JButton id="ok" + onActionPerformed="dispose()"/> + </JPanel> </JDialog> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.