branch develop updated (6f1f910 -> 1792fa7)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository lima. See http://git.chorem.org/lima.git from 6f1f910 fixes #1163 launch first start lima befaore loading main ui new 1792fa7 refs #1163 update progression bar status and label The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 1792fa7f980cec7104f116d90b3e7b1ccb74cf00 Author: dcosse <japbiw74> Date: Fri Feb 13 17:34:05 2015 +0100 refs #1163 update progression bar status and label Summary of changes: lima-swing/src/main/java/org/chorem/lima/LimaMain.java | 15 +++++++-------- .../src/main/resources/i18n/lima-swing_fr_FR.properties | 1 + 2 files changed, 8 insertions(+), 8 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
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 1792fa7f980cec7104f116d90b3e7b1ccb74cf00 Author: dcosse <japbiw74> Date: Fri Feb 13 17:34:05 2015 +0100 refs #1163 update progression bar status and label --- lima-swing/src/main/java/org/chorem/lima/LimaMain.java | 15 +++++++-------- .../src/main/resources/i18n/lima-swing_fr_FR.properties | 1 + 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lima-swing/src/main/java/org/chorem/lima/LimaMain.java b/lima-swing/src/main/java/org/chorem/lima/LimaMain.java index b52cb34..9b62ff2 100644 --- a/lima-swing/src/main/java/org/chorem/lima/LimaMain.java +++ b/lima-swing/src/main/java/org/chorem/lima/LimaMain.java @@ -152,21 +152,20 @@ public class LimaMain { splash.updateProgression(0.5, t("lima.launch.accounting")); } + splash.updateProgression(0.7, t("lima.launch.webServer")); + + //start http server + getHttpServerService().start(); + + splash.updateProgression(1, t("lima.launch.finished")); + // do init ui MainViewHandler uiHandler = context.getContextValue(MainViewHandler.class); final MainView ui = uiHandler.initUI(context); ui.setLocationRelativeTo(null); - // defaut display home view (not closeable, but might be !) uiHandler.showHomeView(context); - splash.updateProgression(0.7, t("lima.launch.accounting")); - - //start http server - getHttpServerService().start(); - - splash.updateProgression(0.1, t("lima.launch.finished")); - // show ui SwingUtilities.invokeLater(new Runnable() { @Override diff --git a/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties b/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties index 6ede2c9..e93b43b 100644 --- a/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties +++ b/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties @@ -492,3 +492,4 @@ lima.vatStatement.remove.title=supprimer de ligne ? lima.vatStatement.shortened=Plan TVA abrégé lima.vatStatements=Plan TVA lima.wait=Traitement en cours +lima.launch.webServer=Lancement du service distant \ No newline at end of file -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm