Author: fdesbois Date: 2012-08-09 20:35:24 +0200 (Thu, 09 Aug 2012) New Revision: 382 Url: http://forge.codelutin.com/repositories/revision/sammoa/382 Log: fixes #1394 : add tooltips Modified: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/Routes.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/MainUI.jaxx trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/AddAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/BeginAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/CenterObservationAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/CircleBackAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/EndAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/LeftObservationAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/NextAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/NextTransectAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/RightObservationAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/StartAction.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/StopAction.java trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_en_GB.properties Modified: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/Routes.java =================================================================== --- trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/Routes.java 2012-08-09 17:53:27 UTC (rev 381) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/Routes.java 2012-08-09 18:35:24 UTC (rev 382) @@ -91,6 +91,7 @@ boolean result = Objects.equal(o1.getRouteType(), o2.getRouteType()); result &= Objects.equal(o1.getTransectFlight(), o2.getTransectFlight()); + result &= Objects.equal(o1.getCircleBackCause(), o2.getCircleBackCause()); result &= Objects.equal(o1.isDeleted(), o2.isDeleted()); Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/MainUI.jaxx =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/MainUI.jaxx 2012-08-09 17:53:27 UTC (rev 381) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/MainUI.jaxx 2012-08-09 18:35:24 UTC (rev 382) @@ -23,6 +23,8 @@ #L% --> <JFrame id='mainFrame' onWindowClosing='getHandler().closeSammoa()' + width='800' + height='600' implements='fr.ulr.sammoa.ui.swing.SammoaUI<MainUIHandler>'> <import> Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/AddAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/AddAction.java 2012-08-09 17:53:27 UTC (rev 381) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/AddAction.java 2012-08-09 18:35:24 UTC (rev 382) @@ -27,8 +27,11 @@ import fr.ulr.sammoa.ui.swing.SammoaUIContext; import org.nuiton.util.Resource; +import javax.swing.*; import java.awt.event.ActionEvent; +import static org.nuiton.i18n.I18n._; + /** * Created: 03/07/12 * @@ -38,6 +41,7 @@ public AddAction(SammoaUIContext context) { super(Resource.getIcon("/icons/action-add.png"), context); + putValue(Action.SHORT_DESCRIPTION, _("sammoa.action.add.tip")); } @Override Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/BeginAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/BeginAction.java 2012-08-09 17:53:27 UTC (rev 381) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/BeginAction.java 2012-08-09 18:35:24 UTC (rev 382) @@ -28,8 +28,11 @@ import fr.ulr.sammoa.ui.swing.SammoaUIContext; import org.nuiton.util.Resource; +import javax.swing.*; import java.awt.event.ActionEvent; +import static org.nuiton.i18n.I18n._; + /** * Created: 03/07/12 * @@ -39,6 +42,7 @@ public BeginAction(SammoaUIContext context) { super(Resource.getIcon("/icons/playback_play.png"), context); + putValue(Action.SHORT_DESCRIPTION, _("sammoa.action.begin.tip")); } @Override Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/CenterObservationAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/CenterObservationAction.java 2012-08-09 17:53:27 UTC (rev 381) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/CenterObservationAction.java 2012-08-09 18:35:24 UTC (rev 382) @@ -26,6 +26,8 @@ import fr.ulr.sammoa.persistence.Position; import fr.ulr.sammoa.ui.swing.SammoaUIContext; +import javax.swing.*; + import static org.nuiton.i18n.I18n._; /** @@ -37,5 +39,6 @@ public CenterObservationAction(SammoaUIContext context) { super(_("sammoa.observation.observations.center"), context, Position.NAVIGATOR); + putValue(Action.SHORT_DESCRIPTION, _("sammoa.action.center.tip")); } } Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/CircleBackAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/CircleBackAction.java 2012-08-09 17:53:27 UTC (rev 381) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/CircleBackAction.java 2012-08-09 18:35:24 UTC (rev 382) @@ -34,6 +34,8 @@ import java.awt.event.ActionEvent; import java.util.List; +import static org.nuiton.i18n.I18n._; + /** * Created: 03/07/12 * @@ -47,6 +49,7 @@ public CircleBackAction(SammoaUIContext context) { super(CIRCLE_BACK_ICON, context); + putValue(Action.SHORT_DESCRIPTION, _("sammoa.action.circleBack.tip")); } @Override Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/EndAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/EndAction.java 2012-08-09 17:53:27 UTC (rev 381) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/EndAction.java 2012-08-09 18:35:24 UTC (rev 382) @@ -27,8 +27,11 @@ import fr.ulr.sammoa.ui.swing.SammoaUIContext; import org.nuiton.util.Resource; +import javax.swing.*; import java.awt.event.ActionEvent; +import static org.nuiton.i18n.I18n._; + /** * Created: 03/07/12 * @@ -38,6 +41,7 @@ public EndAction(SammoaUIContext context) { super(Resource.getIcon("/icons/playback_stop.png"), context); + putValue(Action.SHORT_DESCRIPTION, _("sammoa.action.end.tip")); } @Override Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/LeftObservationAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/LeftObservationAction.java 2012-08-09 17:53:27 UTC (rev 381) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/LeftObservationAction.java 2012-08-09 18:35:24 UTC (rev 382) @@ -26,6 +26,8 @@ import fr.ulr.sammoa.persistence.Position; import fr.ulr.sammoa.ui.swing.SammoaUIContext; +import javax.swing.*; + import static org.nuiton.i18n.I18n._; /** @@ -37,5 +39,6 @@ public LeftObservationAction(SammoaUIContext context) { super(_("sammoa.observation.observations.left"), context, Position.FRONT_LEFT); + putValue(Action.SHORT_DESCRIPTION, _("sammoa.action.left.tip")); } } Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/NextAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/NextAction.java 2012-08-09 17:53:27 UTC (rev 381) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/NextAction.java 2012-08-09 18:35:24 UTC (rev 382) @@ -27,8 +27,11 @@ import fr.ulr.sammoa.ui.swing.SammoaUIContext; import org.nuiton.util.Resource; +import javax.swing.*; import java.awt.event.ActionEvent; +import static org.nuiton.i18n.I18n._; + /** * Created: 03/07/12 * @@ -38,6 +41,7 @@ public NextAction(SammoaUIContext context) { super(Resource.getIcon("/icons/playback_next.png"), context); + putValue(Action.SHORT_DESCRIPTION, _("sammoa.action.next.tip")); } @Override Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/NextTransectAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/NextTransectAction.java 2012-08-09 17:53:27 UTC (rev 381) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/NextTransectAction.java 2012-08-09 18:35:24 UTC (rev 382) @@ -27,9 +27,11 @@ import fr.ulr.sammoa.ui.swing.SammoaUIContext; import org.nuiton.util.Resource; -import javax.swing.JComponent; +import javax.swing.*; import java.awt.event.ActionEvent; +import static org.nuiton.i18n.I18n._; + /** * Created: 03/07/12 * @@ -41,6 +43,7 @@ public NextTransectAction(SammoaUIContext context) { super(Resource.getIcon("/icons/action-next-transect.png"), context); + putValue(Action.SHORT_DESCRIPTION, _("sammoa.action.nextTransect.tip")); } @Override Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/RightObservationAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/RightObservationAction.java 2012-08-09 17:53:27 UTC (rev 381) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/RightObservationAction.java 2012-08-09 18:35:24 UTC (rev 382) @@ -26,6 +26,8 @@ import fr.ulr.sammoa.persistence.Position; import fr.ulr.sammoa.ui.swing.SammoaUIContext; +import javax.swing.*; + import static org.nuiton.i18n.I18n._; /** @@ -37,5 +39,6 @@ public RightObservationAction(SammoaUIContext context) { super(_("sammoa.observation.observations.right"), context, Position.FRONT_RIGHT); + putValue(Action.SHORT_DESCRIPTION, _("sammoa.action.right.tip")); } } Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/StartAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/StartAction.java 2012-08-09 17:53:27 UTC (rev 381) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/StartAction.java 2012-08-09 18:35:24 UTC (rev 382) @@ -27,8 +27,11 @@ import fr.ulr.sammoa.ui.swing.SammoaUIContext; import org.nuiton.util.Resource; +import javax.swing.*; import java.awt.event.ActionEvent; +import static org.nuiton.i18n.I18n._; + /** * Created: 05/07/12 * @@ -38,6 +41,7 @@ public StartAction(SammoaUIContext context) { super(Resource.getIcon("/icons/playback_play.png"), context); + putValue(Action.SHORT_DESCRIPTION, _("sammoa.action.start.tip")); } @Override Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/StopAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/StopAction.java 2012-08-09 17:53:27 UTC (rev 381) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/StopAction.java 2012-08-09 18:35:24 UTC (rev 382) @@ -27,8 +27,11 @@ import fr.ulr.sammoa.ui.swing.SammoaUIContext; import org.nuiton.util.Resource; +import javax.swing.*; import java.awt.event.ActionEvent; +import static org.nuiton.i18n.I18n._; + /** * Created: 05/07/12 * @@ -38,6 +41,7 @@ public StopAction(SammoaUIContext context) { super(Resource.getIcon("/icons/playback_stop.png"), context); + putValue(Action.SHORT_DESCRIPTION, _("sammoa.action.stop.tip")); } @Override Modified: trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_en_GB.properties =================================================================== --- trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_en_GB.properties 2012-08-09 17:53:27 UTC (rev 381) +++ trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_en_GB.properties 2012-08-09 18:35:24 UTC (rev 382) @@ -4,16 +4,20 @@ sammoa.about.message=About Sammoa sammoa.action.about=About sammoa.action.about.tip=About +sammoa.action.add.tip=ADD \: create a new LEG route for the current Transect (the observation conditions have changed) +sammoa.action.begin.tip=BEGIN \: begin effort to create a new LEG route for the next selected Transect sammoa.action.break.tip=Break sammoa.action.cancel=Cancel sammoa.action.cancelExport=Cancel +sammoa.action.center.tip=CENTER \: create a new Observation for the navigator's observer sammoa.action.choose.export.directory=Accept -sammoa.action.circleback.tip=Circle Back +sammoa.action.circleBack.tip=CIRCLE-BACK \: create a CIRCLE_BACK route for this observation as cause sammoa.action.close=Close sammoa.action.configuration=Configuration sammoa.action.configuration.tip=Configuration sammoa.action.create=Create sammoa.action.edit=Edit +sammoa.action.end.tip=END \: end effort and create a new TRANSIT route sammoa.action.export=Export sammoa.action.exportEffortsMap=Export Efforts sammoa.action.exportGeoPointsMap=Export GPS Points @@ -22,25 +26,26 @@ sammoa.action.home=Home sammoa.action.home.tip=Home sammoa.action.import=Import +sammoa.action.left.tip=LEFT \: create a new Observation for the observer on the left side sammoa.action.locale.fr=fr sammoa.action.locale.fr.tip=French sammoa.action.locale.uk=en sammoa.action.locale.uk.tip=English sammoa.action.new=New -sammoa.action.next.tip=Next +sammoa.action.next.tip=NEXT \: end previous effort and create a new LEG route for the next selected Transect +sammoa.action.nextTransect.tip=NEXT TRANSECT \: choose this transect to be the next one sammoa.action.onBoard=On Board -sammoa.action.play.tip=Play sammoa.action.quitExportMaps=Quit sammoa.action.reload.actions=Reload actions sammoa.action.reload.gps=Reload GPS sammoa.action.reload.ui=Reload sammoa ui +sammoa.action.right.tip=RIGHT \: create a new Observation for the observer on the right side sammoa.action.save=Save sammoa.action.site=Site sammoa.action.site.tip=Display project site +sammoa.action.start.tip=START \: start the flight and create a new TRANSIT route sammoa.action.startExport=Start -sammoa.action.startFlight.tip=Start the flight -sammoa.action.stop.tip=Stop -sammoa.action.stopFlight.tip=Stop the flight +sammoa.action.stop.tip=STOP \: stop the flight. No other actions on routes and observations could be done after stop. sammoa.action.validation=Validation sammoa.config.category.applications=Application sammoa.config.category.applications.description=Application