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 release 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/TuttiUIContext.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfig.java Modified: trunk/tutti-ui-swing/src/main/assembly/full/README.txt =================================================================== --- trunk/tutti-ui-swing/src/main/assembly/full/README.txt 2013-06-03 21:29:02 UTC (rev 1077) +++ trunk/tutti-ui-swing/src/main/assembly/full/README.txt 2013-06-04 08:16:09 UTC (rev 1078) @@ -0,0 +1,17 @@ +Pour démarrer Allegro Campagne Saisie +------------------------------------- + +# Sous Linux + +./tutti.sh + +# Sous windows + +tutti.bat + +Consulter l'aide +---------------- + +En attendant que l'aide soit finalisée, vous pouvez consulter ce document : + +help/Aide_Allegro_Campagne.odt \ No newline at end of file Added: trunk/tutti-ui-swing/src/main/help/fr/Aide_Allegro_Campagne.odt =================================================================== (Binary files differ) Property changes on: trunk/tutti-ui-swing/src/main/help/fr/Aide_Allegro_Campagne.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 =================================================================== --- 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 @@ <strong>Documentation à rédiger</strong> +<h2>Documentation temporaire</h2> + +<p>En attendant que la documentation finale soit terminée, vous pouvez consulter ce document :</p> + +<a href="Aide_Allegro_Campagne.odt">Aide_Allegro_Campagne.odt</a> + <h2>Table des matières</h2> <ul> <li><a href="selectCruise.html">Sélection Série / Campagne / Protocole</a></li> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java 2013-06-03 21:29:02 UTC (rev 1077) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java 2013-06-04 08:16:09 UTC (rev 1078) @@ -792,8 +792,8 @@ throw new TuttiTechnicalException(_("tutti.context.helpPage.notFound", helpId)); } - File helpDirectory = getConfig().getHelpDirectoryWithLocale(); - URI resolvedUri = helpDirectory.toURI().resolve(value); + File helpDirectory = getConfig().getHelpResourceWithLocale(value); + URI resolvedUri = helpDirectory.toURI(); TuttiUIUtil.openLink(resolvedUri); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfig.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfig.java 2013-06-03 21:29:02 UTC (rev 1077) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfig.java 2013-06-04 08:16:09 UTC (rev 1078) @@ -310,9 +310,11 @@ TuttiApplicationConfigOption.TUTTI_HELP_DIRECTORY.getKey()); } - public File getHelpDirectoryWithLocale() { - File result = getHelpDirectory(); - return new File(result, getI18nLocale().getLanguage()); + public File getHelpResourceWithLocale(String value) { + File directory = new File(getHelpDirectory(), + getI18nLocale().getLanguage()); + File result = new File(directory, value); + return result; } public void setProgramId(String programId) {