X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=tim%2Fprune%2Fgui%2FDetailsDisplay.java;h=7b3a4ff6843f9b34c4c7df048081a54f92ec17e6;hb=4d5796d02a15808311c09448d79e6e7d1de9d636;hp=9cfd7cee703d9039bc4d520ab2888b0de89100ed;hpb=c0387c124840c9407e040600fda88f3c3e8f6aa6;p=GpsPrune.git diff --git a/tim/prune/gui/DetailsDisplay.java b/tim/prune/gui/DetailsDisplay.java index 9cfd7ce..7b3a4ff 100644 --- a/tim/prune/gui/DetailsDisplay.java +++ b/tim/prune/gui/DetailsDisplay.java @@ -3,6 +3,7 @@ package tim.prune.gui; import java.awt.BorderLayout; import java.awt.Component; import java.awt.Dimension; +import java.awt.FlowLayout; import java.awt.Font; import java.awt.Insets; import java.awt.event.ActionEvent; @@ -16,6 +17,7 @@ import javax.swing.JButton; import javax.swing.JComboBox; import javax.swing.JLabel; import javax.swing.JPanel; +import javax.swing.JProgressBar; import javax.swing.border.EtchedBorder; import tim.prune.DataSubscriber; @@ -24,15 +26,19 @@ import tim.prune.GenericFunction; import tim.prune.I18nManager; import tim.prune.UpdateMessageBroker; import tim.prune.config.Config; -import tim.prune.data.Altitude; +import tim.prune.data.AltitudeRange; +import tim.prune.data.AudioClip; import tim.prune.data.Coordinate; import tim.prune.data.DataPoint; -import tim.prune.data.Distance; import tim.prune.data.Field; -import tim.prune.data.IntegerRange; import tim.prune.data.Photo; import tim.prune.data.Selection; +import tim.prune.data.SpeedCalculator; +import tim.prune.data.SpeedValue; import tim.prune.data.TrackInfo; +import tim.prune.data.Unit; +import tim.prune.data.UnitSet; +import tim.prune.data.UnitSetLibrary; /** * Class to hold point details and selection details @@ -44,7 +50,8 @@ public class DetailsDisplay extends GenericDisplay private JLabel _indexLabel = null; private JLabel _latLabel = null, _longLabel = null; private JLabel _altLabel = null; - private JLabel _timeLabel = null, _speedLabel = null; + private JLabel _timeLabel = null; + private JLabel _speedLabel = null, _vSpeedLabel = null; private JLabel _nameLabel = null, _typeLabel = null; // Range details @@ -55,12 +62,25 @@ public class DetailsDisplay extends GenericDisplay private JLabel _aveSpeedLabel = null; // Photo details + private JPanel _photoDetailsPanel = null; private JLabel _photoLabel = null; + private JLabel _photoPathLabel = null; private PhotoThumbnail _photoThumbnail = null; private JLabel _photoTimestampLabel = null; private JLabel _photoConnectedLabel = null; + private JLabel _photoBearingLabel = null; private JPanel _rotationButtons = null; + // Audio details + private JPanel _audioDetailsPanel = null; + private JLabel _audioLabel = null; + private JLabel _audioPathLabel = null; + private JLabel _audioConnectedLabel = null; + private JLabel _audioTimestampLabel = null; + private JLabel _audioLengthLabel = null; + private JProgressBar _audioProgress = null; + private JPanel _playAudioPanel = null; + // Units private JComboBox _coordFormatDropdown = null; private JComboBox _distUnitsDropdown = null; @@ -75,14 +95,16 @@ public class DetailsDisplay extends GenericDisplay private static final String LABEL_POINT_TIMESTAMP = I18nManager.getText("fieldname.timestamp") + ": "; private static final String LABEL_POINT_WAYPOINTNAME = I18nManager.getText("fieldname.waypointname") + ": "; private static final String LABEL_POINT_WAYPOINTTYPE = I18nManager.getText("fieldname.waypointtype") + ": "; + private static final String LABEL_POINT_SPEED = I18nManager.getText("fieldname.speed") + ": "; + private static final String LABEL_POINT_VERTSPEED = I18nManager.getText("fieldname.verticalspeed") + ": "; private static final String LABEL_RANGE_SELECTED = I18nManager.getText("details.range.selected") + ": "; private static final String LABEL_RANGE_DURATION = I18nManager.getText("fieldname.duration") + ": "; private static final String LABEL_RANGE_DISTANCE = I18nManager.getText("fieldname.distance") + ": "; private static final String LABEL_RANGE_ALTITUDE = I18nManager.getText("fieldname.altitude") + ": "; private static final String LABEL_RANGE_CLIMB = I18nManager.getText("details.range.climb") + ": "; private static final String LABEL_RANGE_DESCENT = ", " + I18nManager.getText("details.range.descent") + ": "; - private static String LABEL_POINT_ALTITUDE_UNITS = null; - private static Altitude.Format LABEL_POINT_ALTITUDE_FORMAT = Altitude.Format.NO_FORMAT; + private static final String LABEL_AUDIO_FILE = I18nManager.getText("details.audio.file") + ": "; + private static final String LABEL_FULL_PATH = I18nManager.getText("details.media.fullpath") + ": "; /** @@ -97,18 +119,11 @@ public class DetailsDisplay extends GenericDisplay JPanel mainPanel = new JPanel(); mainPanel.setLayout(new BoxLayout(mainPanel, BoxLayout.Y_AXIS)); mainPanel.setBorder(BorderFactory.createEmptyBorder(3, 3, 3, 3)); + Font biggerFont = new JLabel().getFont(); + biggerFont = biggerFont.deriveFont(Font.BOLD, biggerFont.getSize2D() + 2.0f); // Point details panel - JPanel pointDetailsPanel = new JPanel(); - pointDetailsPanel.setLayout(new BoxLayout(pointDetailsPanel, BoxLayout.Y_AXIS)); - pointDetailsPanel.setBorder(BorderFactory.createCompoundBorder( - BorderFactory.createEtchedBorder(EtchedBorder.LOWERED), BorderFactory.createEmptyBorder(3, 3, 3, 3)) - ); - JLabel pointDetailsLabel = new JLabel(I18nManager.getText("details.pointdetails")); - Font biggerFont = pointDetailsLabel.getFont(); - biggerFont = biggerFont.deriveFont(Font.BOLD, biggerFont.getSize2D() + 2.0f); - pointDetailsLabel.setFont(biggerFont); - pointDetailsPanel.add(pointDetailsLabel); + JPanel pointDetailsPanel = makeDetailsPanel("details.pointdetails", biggerFont); _indexLabel = new JLabel(I18nManager.getText("details.nopointselection")); pointDetailsPanel.add(_indexLabel); _latLabel = new JLabel(""); @@ -118,9 +133,12 @@ public class DetailsDisplay extends GenericDisplay _altLabel = new JLabel(""); pointDetailsPanel.add(_altLabel); _timeLabel = new JLabel(""); + _timeLabel.setMinimumSize(new Dimension(120, 10)); pointDetailsPanel.add(_timeLabel); _speedLabel = new JLabel(""); pointDetailsPanel.add(_speedLabel); + _vSpeedLabel = new JLabel(""); + pointDetailsPanel.add(_vSpeedLabel); _nameLabel = new JLabel(""); pointDetailsPanel.add(_nameLabel); _typeLabel = new JLabel(""); @@ -128,14 +146,7 @@ public class DetailsDisplay extends GenericDisplay pointDetailsPanel.setAlignmentX(Component.LEFT_ALIGNMENT); // range details panel - JPanel rangeDetailsPanel = new JPanel(); - rangeDetailsPanel.setLayout(new BoxLayout(rangeDetailsPanel, BoxLayout.Y_AXIS)); - rangeDetailsPanel.setBorder(BorderFactory.createCompoundBorder( - BorderFactory.createEtchedBorder(EtchedBorder.LOWERED), BorderFactory.createEmptyBorder(3, 3, 3, 3)) - ); - JLabel rangeDetailsLabel = new JLabel(I18nManager.getText("details.rangedetails")); - rangeDetailsLabel.setFont(biggerFont); - rangeDetailsPanel.add(rangeDetailsLabel); + JPanel rangeDetailsPanel = makeDetailsPanel("details.rangedetails", biggerFont); _rangeLabel = new JLabel(I18nManager.getText("details.norangeselection")); rangeDetailsPanel.add(_rangeLabel); _distanceLabel = new JLabel(""); @@ -151,40 +162,74 @@ public class DetailsDisplay extends GenericDisplay rangeDetailsPanel.setAlignmentX(Component.LEFT_ALIGNMENT); // photo details panel - JPanel photoDetailsPanel = new JPanel(); - photoDetailsPanel.setLayout(new BoxLayout(photoDetailsPanel, BoxLayout.Y_AXIS)); - photoDetailsPanel.setBorder(BorderFactory.createCompoundBorder( - BorderFactory.createEtchedBorder(EtchedBorder.LOWERED), BorderFactory.createEmptyBorder(3, 3, 3, 3)) - ); - JLabel photoDetailsLabel = new JLabel(I18nManager.getText("details.photodetails")); - photoDetailsLabel.setFont(biggerFont); - photoDetailsPanel.add(photoDetailsLabel); + _photoDetailsPanel = makeDetailsPanel("details.photodetails", biggerFont); _photoLabel = new JLabel(I18nManager.getText("details.nophoto")); - photoDetailsPanel.add(_photoLabel); + _photoDetailsPanel.add(_photoLabel); + _photoPathLabel = new JLabel(""); + _photoDetailsPanel.add(_photoPathLabel); _photoTimestampLabel = new JLabel(""); - photoDetailsPanel.add(_photoTimestampLabel); + _photoTimestampLabel.setMinimumSize(new Dimension(120, 10)); + _photoDetailsPanel.add(_photoTimestampLabel); _photoConnectedLabel = new JLabel(""); - photoDetailsPanel.add(_photoConnectedLabel); + _photoDetailsPanel.add(_photoConnectedLabel); + _photoBearingLabel = new JLabel(""); + _photoDetailsPanel.add(_photoBearingLabel); _photoThumbnail = new PhotoThumbnail(); _photoThumbnail.setVisible(false); _photoThumbnail.setPreferredSize(new Dimension(100, 100)); - photoDetailsPanel.add(_photoThumbnail); + _photoDetailsPanel.add(_photoThumbnail); // Rotate buttons JButton rotLeft = makeRotateButton(IconManager.ROTATE_LEFT, FunctionLibrary.FUNCTION_ROTATE_PHOTO_LEFT); JButton rotRight = makeRotateButton(IconManager.ROTATE_RIGHT, FunctionLibrary.FUNCTION_ROTATE_PHOTO_RIGHT); + JButton popup = makeRotateButton(IconManager.SHOW_DETAILS, FunctionLibrary.FUNCTION_PHOTO_POPUP); _rotationButtons = new JPanel(); _rotationButtons.add(rotLeft); _rotationButtons.add(rotRight); + _rotationButtons.add(Box.createHorizontalStrut(10)); + _rotationButtons.add(popup); _rotationButtons.setAlignmentX(Component.LEFT_ALIGNMENT); _rotationButtons.setVisible(false); - photoDetailsPanel.add(_rotationButtons); + _photoDetailsPanel.add(_rotationButtons); + _photoDetailsPanel.setVisible(false); + + // audio details panel + _audioDetailsPanel = makeDetailsPanel("details.audiodetails", biggerFont); + _audioLabel = new JLabel(I18nManager.getText("details.noaudio")); + _audioDetailsPanel.add(_audioLabel); + _audioPathLabel = new JLabel(""); + _audioDetailsPanel.add(_audioPathLabel); + _audioTimestampLabel = new JLabel(""); + _audioTimestampLabel.setMinimumSize(new Dimension(120, 10)); + _audioDetailsPanel.add(_audioTimestampLabel); + _audioLengthLabel = new JLabel(""); + _audioDetailsPanel.add(_audioLengthLabel); + _audioConnectedLabel = new JLabel(""); + _audioDetailsPanel.add(_audioConnectedLabel); + _audioProgress = new JProgressBar(0, 100); + _audioProgress.setString(I18nManager.getText("details.audio.playing")); + _audioProgress.setStringPainted(true); + _audioProgress.setVisible(false); + _audioDetailsPanel.add(_audioProgress); + _playAudioPanel = new JPanel(); + _playAudioPanel.setLayout(new FlowLayout(FlowLayout.RIGHT)); + JButton playAudio = makeRotateButton(IconManager.PLAY_AUDIO, FunctionLibrary.FUNCTION_PLAY_AUDIO); + playAudio.addActionListener(new AudioListener(_audioProgress)); + _playAudioPanel.add(playAudio); + JButton stopAudio = makeRotateButton(IconManager.STOP_AUDIO, FunctionLibrary.FUNCTION_STOP_AUDIO); + _playAudioPanel.add(stopAudio); + _playAudioPanel.setAlignmentX(Component.LEFT_ALIGNMENT); + _playAudioPanel.setVisible(false); + _audioDetailsPanel.add(_playAudioPanel); + _audioDetailsPanel.setVisible(false); // add the details panels to the main panel mainPanel.add(pointDetailsPanel); mainPanel.add(Box.createVerticalStrut(5)); mainPanel.add(rangeDetailsPanel); mainPanel.add(Box.createVerticalStrut(5)); - mainPanel.add(photoDetailsPanel); + mainPanel.add(_photoDetailsPanel); + mainPanel.add(Box.createVerticalStrut(5)); + mainPanel.add(_audioDetailsPanel); mainPanel.add(Box.createVerticalStrut(5)); // add the main panel at the top add(mainPanel, BorderLayout.NORTH); @@ -209,13 +254,17 @@ public class DetailsDisplay extends GenericDisplay JLabel unitsLabel = new JLabel(I18nManager.getText("details.distanceunits") + ": "); unitsLabel.setAlignmentX(Component.LEFT_ALIGNMENT); lowerPanel.add(unitsLabel); - String[] distUnits = {I18nManager.getText("units.kilometres"), I18nManager.getText("units.miles")}; - _distUnitsDropdown = new JComboBox(distUnits); - if (!Config.getConfigBoolean(Config.KEY_METRIC_UNITS)) {_distUnitsDropdown.setSelectedIndex(1);} + // Make dropdown for distance units + _distUnitsDropdown = new JComboBox(); + final UnitSet currUnits = Config.getUnitSet(); + for (int i=0; i 0) selection.markInvalid(); int currentPointIndex = selection.getCurrentPointIndex(); _speedLabel.setText(""); - Distance.Units distUnits = _distUnitsDropdown.getSelectedIndex()==0?Distance.Units.KILOMETRES:Distance.Units.MILES; - String distUnitsStr = I18nManager.getText(_distUnitsDropdown.getSelectedIndex()==0?"units.kilometres.short":"units.miles.short"); - String speedUnitsStr = I18nManager.getText(_distUnitsDropdown.getSelectedIndex()==0?"units.kmh":"units.mph"); + UnitSet unitSet = UnitSetLibrary.getUnitSet(_distUnitsDropdown.getSelectedIndex()); + String distUnitsStr = I18nManager.getText(unitSet.getDistanceUnit().getShortnameKey()); + String speedUnitsStr = I18nManager.getText(unitSet.getSpeedUnit().getShortnameKey()); if (_track == null || currentPoint == null) { _indexLabel.setText(I18nManager.getText("details.nopointselection")); @@ -248,6 +298,8 @@ public class DetailsDisplay extends GenericDisplay _timeLabel.setText(""); _nameLabel.setText(""); _typeLabel.setText(""); + _speedLabel.setText(""); + _vSpeedLabel.setText(""); } else { @@ -256,34 +308,42 @@ public class DetailsDisplay extends GenericDisplay + " " + _track.getNumPoints()); _latLabel.setText(makeCoordinateLabel(LABEL_POINT_LATITUDE, currentPoint.getLatitude(), _coordFormatDropdown.getSelectedIndex())); _longLabel.setText(makeCoordinateLabel(LABEL_POINT_LONGITUDE, currentPoint.getLongitude(), _coordFormatDropdown.getSelectedIndex())); + Unit altUnit = Config.getUnitSet().getAltitudeUnit(); _altLabel.setText(currentPoint.hasAltitude()? - (LABEL_POINT_ALTITUDE + currentPoint.getAltitude().getValue() + getAltitudeUnitsLabel(currentPoint.getAltitude().getFormat())) - :""); - if (currentPoint.getTimestamp().isValid()) - { - if (currentPointIndex > 0 && currentPointIndex < (_trackInfo.getTrack().getNumPoints()-1)) - { - DataPoint prevPoint = _trackInfo.getTrack().getPoint(currentPointIndex - 1); - DataPoint nextPoint = _trackInfo.getTrack().getPoint(currentPointIndex + 1); - if (prevPoint.getTimestamp().isValid() && nextPoint.getTimestamp().isValid()) - { - // use total distance and total time between neighbouring points - long diff = nextPoint.getTimestamp().getSecondsSince(prevPoint.getTimestamp()); - if (diff < 1000 && diff > 0) - { - double rads = DataPoint.calculateRadiansBetween(prevPoint, currentPoint) + - DataPoint.calculateRadiansBetween(currentPoint, nextPoint); - double dist = Distance.convertRadiansToDistance(rads, distUnits); - String speed = roundedNumber(3600 * dist / diff) + " " + speedUnitsStr; - _speedLabel.setText(I18nManager.getText("fieldname.speed") + ": " + speed); - } - } - } + (LABEL_POINT_ALTITUDE + currentPoint.getAltitude().getValue(altUnit) + " " + + I18nManager.getText(altUnit.getShortnameKey())) + : ""); + if (currentPoint.hasTimestamp()) { _timeLabel.setText(LABEL_POINT_TIMESTAMP + currentPoint.getTimestamp().getText()); } else { _timeLabel.setText(""); } + + // Speed can come from either timestamps and distances, or speed values in data + SpeedValue speedValue = new SpeedValue(); + SpeedCalculator.calculateSpeed(_track, currentPointIndex, speedValue); + if (speedValue.isValid()) + { + String speed = roundedNumber(speedValue.getValue()) + " " + speedUnitsStr; + _speedLabel.setText(LABEL_POINT_SPEED + speed); + } + else { + _speedLabel.setText(""); + } + + // Now do the vertical speed in the same way + SpeedCalculator.calculateVerticalSpeed(_track, currentPointIndex, speedValue); + if (speedValue.isValid()) + { + String vSpeedUnitsStr = I18nManager.getText(unitSet.getVerticalSpeedUnit().getShortnameKey()); + String speed = roundedNumber(speedValue.getValue()) + " " + vSpeedUnitsStr; + _vSpeedLabel.setText(LABEL_POINT_VERTSPEED + speed); + } + else { + _vSpeedLabel.setText(""); + } + // Waypoint name final String name = currentPoint.getWaypointName(); if (name != null && !name.equals("")) @@ -314,27 +374,28 @@ public class DetailsDisplay extends GenericDisplay _rangeLabel.setText(LABEL_RANGE_SELECTED + (selection.getStart()+1) + " " + I18nManager.getText("details.range.to") + " " + (selection.getEnd()+1)); - _distanceLabel.setText(LABEL_RANGE_DISTANCE + roundedNumber(selection.getDistance(distUnits)) + " " + distUnitsStr); + _distanceLabel.setText(LABEL_RANGE_DISTANCE + roundedNumber(selection.getDistance()) + " " + distUnitsStr); if (selection.getNumSeconds() > 0) { _durationLabel.setText(LABEL_RANGE_DURATION + DisplayUtils.buildDurationString(selection.getNumSeconds())); _aveSpeedLabel.setText(I18nManager.getText("details.range.avespeed") + ": " - + roundedNumber(selection.getDistance(distUnits)/selection.getNumSeconds()*3600.0) + " " + speedUnitsStr); + + roundedNumber(selection.getDistance()/selection.getNumSeconds()*3600.0) + " " + speedUnitsStr); } else { _durationLabel.setText(""); _aveSpeedLabel.setText(""); } - String altUnitsLabel = getAltitudeUnitsLabel(selection.getAltitudeFormat()); - IntegerRange altRange = selection.getAltitudeRange(); - if (altRange.getMinimum() >= 0 && altRange.getMaximum() >= 0) + AltitudeRange altRange = selection.getAltitudeRange(); + Unit altUnit = Config.getUnitSet().getAltitudeUnit(); + String altUnitsLabel = I18nManager.getText(altUnit.getShortnameKey()); + if (altRange.hasRange()) { _altRangeLabel.setText(LABEL_RANGE_ALTITUDE - + altRange.getMinimum() + altUnitsLabel + " " + + altRange.getMinimum(altUnit) + altUnitsLabel + " " + I18nManager.getText("details.altitude.to") + " " - + altRange.getMaximum() + altUnitsLabel); - _updownLabel.setText(LABEL_RANGE_CLIMB + selection.getClimb() + altUnitsLabel - + LABEL_RANGE_DESCENT + selection.getDescent() + altUnitsLabel); + + altRange.getMaximum(altUnit) + altUnitsLabel); + _updownLabel.setText(LABEL_RANGE_CLIMB + altRange.getClimb(altUnit) + altUnitsLabel + + LABEL_RANGE_DESCENT + altRange.getDescent(altUnit) + altUnitsLabel); } else { @@ -343,46 +404,72 @@ public class DetailsDisplay extends GenericDisplay } } // show photo details and thumbnail + _photoDetailsPanel.setVisible(_trackInfo.getPhotoList().getNumPhotos() > 0); Photo currentPhoto = _trackInfo.getPhotoList().getPhoto(_trackInfo.getSelection().getCurrentPhotoIndex()); if ((currentPoint == null || currentPoint.getPhoto() == null) && currentPhoto == null) { // no photo, hide details _photoLabel.setText(I18nManager.getText("details.nophoto")); + _photoPathLabel.setText(""); + _photoPathLabel.setToolTipText(""); _photoTimestampLabel.setText(""); _photoConnectedLabel.setText(""); + _photoBearingLabel.setText(""); _photoThumbnail.setVisible(false); _rotationButtons.setVisible(false); } else { if (currentPhoto == null) {currentPhoto = currentPoint.getPhoto();} - _photoLabel.setText(I18nManager.getText("details.photofile") + ": " + currentPhoto.getFile().getName()); - _photoTimestampLabel.setText(LABEL_POINT_TIMESTAMP + currentPhoto.getTimestamp().getText()); - _photoConnectedLabel.setText(I18nManager.getText("details.photo.connected") + ": " + _photoLabel.setText(I18nManager.getText("details.photofile") + ": " + currentPhoto.getName()); + String fullPath = currentPhoto.getFullPath(); + String shortPath = shortenPath(fullPath); + _photoPathLabel.setText(fullPath == null ? "" : LABEL_FULL_PATH + shortPath); + _photoPathLabel.setToolTipText(currentPhoto.getFullPath()); + _photoTimestampLabel.setText(currentPhoto.hasTimestamp()?(LABEL_POINT_TIMESTAMP + currentPhoto.getTimestamp().getText()):""); + _photoConnectedLabel.setText(I18nManager.getText("details.media.connected") + ": " + (currentPhoto.getCurrentStatus() == Photo.Status.NOT_CONNECTED ? I18nManager.getText("dialog.about.no"):I18nManager.getText("dialog.about.yes"))); + if (currentPhoto.getBearing() >= 0.0 && currentPhoto.getBearing() <= 360.0) + { + _photoBearingLabel.setText(I18nManager.getText("details.photo.bearing") + ": " + + (int) currentPhoto.getBearing() + " \u00B0"); + } + else _photoBearingLabel.setText(""); _photoThumbnail.setVisible(true); _photoThumbnail.setPhoto(currentPhoto); _rotationButtons.setVisible(true); if ((inUpdateType & DataSubscriber.PHOTOS_MODIFIED) > 0) {_photoThumbnail.refresh();} } _photoThumbnail.repaint(); - } - - /** - * Choose the appropriate altitude units label for the specified format - * @param inFormat altitude format - * @return language-sensitive string - */ - private static String getAltitudeUnitsLabel(Altitude.Format inFormat) - { - if (inFormat == LABEL_POINT_ALTITUDE_FORMAT && LABEL_POINT_ALTITUDE_UNITS != null) - return LABEL_POINT_ALTITUDE_UNITS; - LABEL_POINT_ALTITUDE_FORMAT = inFormat; - if (inFormat == Altitude.Format.METRES) - return " " + I18nManager.getText("units.metres.short"); - return " " + I18nManager.getText("units.feet.short"); + // audio details + _audioDetailsPanel.setVisible(_trackInfo.getAudioList().getNumAudios() > 0); + AudioClip currentAudio = _trackInfo.getAudioList().getAudio(_trackInfo.getSelection().getCurrentAudioIndex()); + if (currentAudio == null) + { + _audioLabel.setText(I18nManager.getText("details.noaudio")); + _audioPathLabel.setText(""); + _audioPathLabel.setToolTipText(""); + _audioTimestampLabel.setText(""); + _audioLengthLabel.setText(""); + _audioConnectedLabel.setText(""); + } + else + { + _audioLabel.setText(LABEL_AUDIO_FILE + currentAudio.getName()); + String fullPath = currentAudio.getFullPath(); + String shortPath = shortenPath(fullPath); + _audioPathLabel.setText(fullPath == null ? "" : LABEL_FULL_PATH + shortPath); + _audioPathLabel.setToolTipText(fullPath == null ? "" : fullPath); + _audioTimestampLabel.setText(currentAudio.hasTimestamp()?(LABEL_POINT_TIMESTAMP + currentAudio.getTimestamp().getText()):""); + int audioLength = currentAudio.getLengthInSeconds(); + _audioLengthLabel.setText(audioLength < 0?"":LABEL_RANGE_DURATION + DisplayUtils.buildDurationString(audioLength)); + _audioConnectedLabel.setText(I18nManager.getText("details.media.connected") + ": " + + (currentAudio.getCurrentStatus() == Photo.Status.NOT_CONNECTED ? + I18nManager.getText("dialog.about.no"):I18nManager.getText("dialog.about.yes"))); + } + _playAudioPanel.setVisible(currentAudio != null); } @@ -455,6 +542,25 @@ public class DetailsDisplay extends GenericDisplay return inCoord; } + /** + * Make a details subpanel + * @param inNameKey key to use for top label + * @param inFont font for top label + * @return panel with correct layout, label + */ + private static JPanel makeDetailsPanel(String inNameKey, Font inFont) + { + JPanel detailsPanel = new JPanel(); + detailsPanel.setLayout(new BoxLayout(detailsPanel, BoxLayout.Y_AXIS)); + detailsPanel.setBorder(BorderFactory.createCompoundBorder( + BorderFactory.createEtchedBorder(EtchedBorder.LOWERED), BorderFactory.createEmptyBorder(3, 3, 3, 3)) + ); + JLabel detailsLabel = new JLabel(I18nManager.getText(inNameKey)); + detailsLabel.setFont(inFont); + detailsPanel.add(detailsLabel); + return detailsPanel; + } + /** * Create a little button for rotating the current photo * @param inIcon icon to use (from IconManager) @@ -469,4 +575,22 @@ public class DetailsDisplay extends GenericDisplay button.addActionListener(new FunctionLauncher(inFunction)); return button; } + + /** + * @param inFullPath full file path or URL to be shortened + * @return shortened string from beginning of path + */ + private static String shortenPath(String inFullPath) + { + // Chop off the home path if possible + final String homePath = System.getProperty("user.home").toLowerCase(); + if (inFullPath != null && inFullPath.toLowerCase().startsWith(homePath)) { + inFullPath = inFullPath.substring(homePath.length()+1); + } + if (inFullPath == null || inFullPath.length() < 21) { + return inFullPath; + } + // path is too long + return inFullPath.substring(0, 20) + "..."; + } }