This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository lima. See http://git.chorem.org/lima.git commit 1779c355ce595d7096aeecfc5c70fb65a651023c Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Oct 30 11:22:08 2014 +0100 refs #875 #1043 : import wait --- .../java/org/chorem/lima/ui/importexport/ImportExport.java | 1 - .../chorem/lima/ui/importexport/ImportExportWaitView.css | 13 +++++++++++++ .../chorem/lima/ui/importexport/ImportExportWaitView.jaxx | 10 +++++++--- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java b/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java index 94eaab3..d3fd756 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java @@ -121,7 +121,6 @@ public class ImportExport { //create the wait dialog panel waitView = new ImportExportWaitView(); - waitView.waitDialog.setSize(400, 200); waitView.setLocationRelativeTo(view); BusyPainter busyPainter = waitView.getBusylabel().getBusyPainter(); busyPainter.setHighlightColor(new Color(44, 61, 146).darker()); diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExportWaitView.css b/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExportWaitView.css new file mode 100644 index 0000000..58f31ab --- /dev/null +++ b/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExportWaitView.css @@ -0,0 +1,13 @@ +#waitDialog { + modal : true; + title : "lima.wait"; + preferredSize : {new Dimension(400, 200)}; +} + +#busylabel { + busy : true; +} + +#waitLabel { + text : "lima.importExport.wait"; +} \ No newline at end of file diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExportWaitView.jaxx b/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExportWaitView.jaxx index a976c0b..16c7a6d 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExportWaitView.jaxx +++ b/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExportWaitView.jaxx @@ -20,14 +20,18 @@ #L% --> -<JDialog modal="true" id="waitDialog" title="lima.wait"> +<JDialog id="waitDialog" > + <import> + java.awt.Dimension + </import> + <Table> <row> <cell> - <org.jdesktop.swingx.JXBusyLabel id='busylabel' busy='true'/> + <org.jdesktop.swingx.JXBusyLabel id='busylabel'/> </cell> <cell> - <JLabel text='lima.importExport.wait'/> + <JLabel id="waitLabel"/> </cell> </row> </Table> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.