From tchemit@users.forge.codelutin.com Tue Jun  4 10:16:09 2013
From: tchemit@users.forge.codelutin.com
To: tutti-commits@list.forge.codelutin.com
Subject: [Tutti-commits] r1078 - in trunk/tutti-ui-swing/src/main:
	assembly/full help/fr java/fr/ifremer/tutti/ui/swing
	java/fr/ifremer/tutti/ui/swing/config
Date: Tue, 04 Jun 2013 10:16:09 +0200
Message-ID: <20130604081609.5E5951582D@nuiton.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7553009344603148846=="

--===============7553009344603148846==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Author: tchemit
Date: 2013-06-04 10:16:09 +0200 (Tue, 04 Jun 2013)
New Revision: 1078

Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1078

Log:
fixes #2608: [AIDE] Int?\195?\169grer le fichier d'aide dans la prochaine rel=
ease

Added:
   trunk/tutti-ui-swing/src/main/help/fr/Aide_Allegro_Campagne.odt
Modified:
   trunk/tutti-ui-swing/src/main/assembly/full/README.txt
   trunk/tutti-ui-swing/src/main/help/fr/index.html
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContex=
t.java
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiA=
pplicationConfig.java

Modified: trunk/tutti-ui-swing/src/main/assembly/full/README.txt
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/tutti-ui-swing/src/main/assembly/full/README.txt	2013-06-03 21:29:0=
2 UTC (rev 1077)
+++ trunk/tutti-ui-swing/src/main/assembly/full/README.txt	2013-06-04 08:16:0=
9 UTC (rev 1078)
@@ -0,0 +1,17 @@
+Pour d=C3=A9marrer Allegro Campagne Saisie
+-------------------------------------
+
+# Sous Linux
+
+./tutti.sh
+
+# Sous windows
+
+tutti.bat
+
+Consulter l'aide
+----------------
+
+En attendant que l'aide soit finalis=C3=A9e, vous pouvez consulter ce docume=
nt :
+
+help/Aide_Allegro_Campagne.odt
\ No newline at end of file

Added: trunk/tutti-ui-swing/src/main/help/fr/Aide_Allegro_Campagne.odt
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: trunk/tutti-ui-swing/src/main/help/fr/Aide_Allegro_Campa=
gne.odt
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream
Added: svn:keywords
   + Author Date Id Revision HeadURL

Modified: trunk/tutti-ui-swing/src/main/help/fr/index.html
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/tutti-ui-swing/src/main/help/fr/index.html	2013-06-03 21:29:02 UTC =
(rev 1077)
+++ trunk/tutti-ui-swing/src/main/help/fr/index.html	2013-06-04 08:16:09 UTC =
(rev 1078)
@@ -34,6 +34,12 @@
=20
 <strong>Documentation =C3=A0 r=C3=A9diger</strong>
=20
+<h2>Documentation temporaire</h2>
+
+<p>En attendant que la documentation finale soit termin=C3=A9e, vous pouvez =
consulter ce document :</p>
+
+<a href=3D"Aide_Allegro_Campagne.odt">Aide_Allegro_Campagne.odt</a>
+
 <h2>Table des mati=C3=A8res</h2>
 <ul>
     <li><a href=3D"selectCruise.html">S=C3=A9lection S=C3=A9rie / Campagne /=
 Protocole</a></li>

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiU=
IContext.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIConte=
xt.java	2013-06-03 21:29:02 UTC (rev 1077)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIConte=
xt.java	2013-06-04 08:16:09 UTC (rev 1078)
@@ -792,8 +792,8 @@
             throw new TuttiTechnicalException(_("tutti.context.helpPage.notF=
ound", helpId));
         }
=20
-        File helpDirectory =3D getConfig().getHelpDirectoryWithLocale();
-        URI resolvedUri =3D helpDirectory.toURI().resolve(value);
+        File helpDirectory =3D getConfig().getHelpResourceWithLocale(value);
+        URI resolvedUri =3D helpDirectory.toURI();
         TuttiUIUtil.openLink(resolvedUri);
     }
=20

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config=
/TuttiApplicationConfig.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/Tutti=
ApplicationConfig.java	2013-06-03 21:29:02 UTC (rev 1077)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/Tutti=
ApplicationConfig.java	2013-06-04 08:16:09 UTC (rev 1078)
@@ -310,9 +310,11 @@
                 TuttiApplicationConfigOption.TUTTI_HELP_DIRECTORY.getKey());
     }
=20
-    public File getHelpDirectoryWithLocale() {
-        File result =3D getHelpDirectory();
-        return new File(result, getI18nLocale().getLanguage());
+    public File getHelpResourceWithLocale(String value) {
+        File directory =3D new File(getHelpDirectory(),
+                                  getI18nLocale().getLanguage());
+        File result =3D new File(directory, value);
+        return result;
     }
=20
     public void setProgramId(String programId) {


--===============7553009344603148846==--