diff --git a/ant/build.xml b/ant/build.xml index 6f8f021..282c225 100644 --- a/ant/build.xml +++ b/ant/build.xml @@ -244,8 +244,7 @@ - - + diff --git a/data/config/AdecWatt.xml b/data/config/AdecWatt.xml index cca7822..5bd7e93 100644 --- a/data/config/AdecWatt.xml +++ b/data/config/AdecWatt.xml @@ -1,15 +1,13 @@ -This file is automaticaly generated by AdecWatt application at 7:40 AM on Apr 18, 2019. +This file is automaticaly generated by AdecWatt application at 5:25 PM on May 26, 2019. true - 4 - data/log/ true @@ -17,18 +15,15 @@ true false /home/felix/perso/adecWatt56/data/export/CendresLampionsChapelleBleue.lpz - North - true 0 - 1 true 3128 @@ -42,9 +37,8 @@ false true -[x=600,y=665] +[x=1 490,y=312] North - Day false [x=0,y=31] @@ -53,33 +47,24 @@ false 2 North - true - - true true data/images/adecWatt.png - false North - - + false false -20190418 - - +20190526 false true 3 - - false [x=0,y=31] false diff --git a/data/images/2019-festival-adec56.png b/data/images/2019-festival-adec56.png new file mode 100644 index 0000000..22ba290 Binary files /dev/null and b/data/images/2019-festival-adec56.png differ diff --git a/src/java/adecWatt/view/JAdecWatt.java b/src/java/adecWatt/view/JAdecWatt.java index 6c0f356..e6bc62d 100644 --- a/src/java/adecWatt/view/JAdecWatt.java +++ b/src/java/adecWatt/view/JAdecWatt.java @@ -115,8 +115,8 @@ import adecWatt.model.xml.XmlUnit; EasterEgg easterEgg = new EasterEgg ("images/adecWatt-anim.gif"); easterEgg.addPeriode ("1220", "1231", "images/adecWatt-anim-noel.gif"); easterEgg.addPeriode ("0101", "0115", "images/adecWatt-anim-noel.gif"); - easterEgg.addPeriode ("0517", "0527", "images/2017-festival-adec56.png"); - easterEgg.addPeriode ("0505", "0516", "images/2017-festival-adec56.gif"); + easterEgg.addPeriode ("0513", "0609", "images/2019-festival-adec56.png"); + //easterEgg.addPeriode ("0505", "0516", "images/2017-festival-adec56.gif"); background.setIcon (Util.loadImageIcon (Config.dataDirname, easterEgg.getValue ())); } catch (Exception e) { }