Author: tchemit Date: 2013-05-30 22:24:51 +0200 (Thu, 30 May 2013) New Revision: 1058 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1058 Log: fixes #2509: [TECH] le nom du logiciel sera ALLEGRO CAMPAGNE Added: trunk/tutti-ui-swing/src/main/resources/icons/allegro_32.png trunk/tutti-ui-swing/src/main/resources/icons/allegro_about.png Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ShowAboutAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionUIHandler.java trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUI.css 2013-05-30 19:50:25 UTC (rev 1057) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUI.css 2013-05-30 20:24:51 UTC (rev 1058) @@ -31,6 +31,7 @@ #mainFrame { title: "tutti.main.title.applicationName"; defaultCloseOperation: {JFrame.DO_NOTHING_ON_CLOSE}; + iconImage:{SwingUtil.createImageIcon("allegro_32.png").getImage()}; } #menuFile { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java 2013-05-30 19:50:25 UTC (rev 1057) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java 2013-05-30 20:24:51 UTC (rev 1058) @@ -491,7 +491,9 @@ String title = getSelectedCruiseTitle(); - ui.setTitle("Tutti - v " + getConfig().getVersion() + " [ " + title + " ]"); + ui.setTitle(_("tutti.main.title.application", + getConfig().getVersion(), + title)); } protected String getSelectedCruiseTitle() { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ShowAboutAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ShowAboutAction.java 2013-05-30 19:50:25 UTC (rev 1057) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ShowAboutAction.java 2013-05-30 20:24:51 UTC (rev 1058) @@ -37,7 +37,6 @@ import jaxx.runtime.swing.AboutPanel; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.util.config.ApplicationConfig; import org.nuiton.util.updater.ApplicationInfo; import org.nuiton.util.updater.ApplicationUpdater; @@ -107,10 +106,7 @@ about = null; - ApplicationConfig applicationConfig = - getContext().getConfig().getApplicationConfig(); - - String iconPath = applicationConfig.getOption("application.icon.path"); + String iconPath = "/icons/allegro_about.png"; String name = "tutti"; String licensePath = "META-INF/" + name + "-LICENSE.txt"; String thirdPartyPath = "META-INF/" + name + "-THIRD-PARTY.txt"; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionUIHandler.java 2013-05-30 19:50:25 UTC (rev 1057) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionUIHandler.java 2013-05-30 20:24:51 UTC (rev 1058) @@ -86,6 +86,9 @@ } protected void showAction(AbstractTuttiAction action) { + ui.setTitle(_("tutti.main.title.action", + getConfig().getVersion(), + action.getActionDescription())); ui.getGlobalActionLabel().setText( _("tutti.message.action.running", action.getActionDescription())); Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-05-30 19:50:25 UTC (rev 1057) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-05-30 20:24:51 UTC (rev 1058) @@ -1129,7 +1129,9 @@ tutti.main.menu.help= tutti.main.menu.help.mnemonic= tutti.main.menu.help.tip= -tutti.main.title.applicationName= +tutti.main.title.action=Allegro Campagne - v %s [%s] +tutti.main.title.application=Allegro Campagne - v %s [%s] +tutti.main.title.applicationName=Tutti tutti.main.title.noSelectedCruise= tutti.main.title.noSelectedProgram= tutti.main.title.noSelectedProtocol= Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-05-30 19:50:25 UTC (rev 1057) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-05-30 20:24:51 UTC (rev 1058) @@ -1090,6 +1090,8 @@ tutti.main.menu.help=Aide tutti.main.menu.help.mnemonic=A tutti.main.menu.help.tip=Aide +tutti.main.title.action=Allegro Campagne - v %s [%s] +tutti.main.title.application=Allegro Campagne - v %s [%s] tutti.main.title.applicationName=Tutti tutti.main.title.noSelectedCruise=Pas de campagne sélectionné tutti.main.title.noSelectedProgram=Pas de série de campagne sélectionné Added: trunk/tutti-ui-swing/src/main/resources/icons/allegro_32.png =================================================================== (Binary files differ) Property changes on: trunk/tutti-ui-swing/src/main/resources/icons/allegro_32.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/tutti-ui-swing/src/main/resources/icons/allegro_about.png =================================================================== (Binary files differ) Property changes on: trunk/tutti-ui-swing/src/main/resources/icons/allegro_about.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: svn:keywords + Author Date Id Revision HeadURL