Adding the support for recorded and paused time

bundles/net.tourbook.cloud/src/net/tourbook/cloud/dropbox/messages_it.properties

@@ -1,5 +1,22 @@
 
+Dialog_DropboxBrowser_Button_ParentFolder_Tooltip = Vai alla cartella principale
+Dialog_DropboxBrowser_Button_SelectFolder         = &Seleziona cartella
+Dialog_DropboxBrowser_Text_AbsolutePath_Tooltip   = Percorso assoluto della cartella corrente
+
+Dialog_DropboxFolderChooser_Area_Text  = Selezionare la cartella di Dropbox che verr\u00E0 utilizzata da MyTourbook per importare nuovi percorsi
+Dialog_DropboxFolderChooser_Area_Title = Selezionare una cartella di Dropbox
+
 Image__Dropbox_File         = dropbox-file.png
 Image__Dropbox_Folder       = dropbox-folder.png
 Image__Dropbox_Logo         = dropbox-logo.png
 Image__Dropbox_Parentfolder = dropbox-parentfolder.png
+
+Pref_CloudConnectivity_Dropbox_AccessToken_NotRetrieved    = Il token di accesso a Dropbox non pu\u00F2 essere recuperato.\n\
+                                                             \n\
+                                                             Risposta di Dropbox:\n\
+                                                             \n\
+                                                             {0}
+Pref_CloudConnectivity_Dropbox_AccessToken_Retrieval_Title = Recupero del token di accesso
+Pref_CloudConnectivity_Dropbox_AccessToken_Retrieved       = Il token di accesso a Dropbox \u00E8 stato recuperato
+Pref_CloudConnectivity_Dropbox_AccessToken_Tooltip         = Questo \u00E8 il token necessario per accedere al vostro account di Dropbox
+Pref_CloudConnectivity_Dropbox_Button_Authorize            = Autorizza

bundles/net.tourbook.common/src/net/tourbook/common/UI.java

@@ -522,6 +522,8 @@ public class UI {
    /**
     * When <code>true</code> then data in the UI are scrambled. This is used to create anynonymous
     * screenshots.
+    * <p>
+    * Commandline parameter: <code>-DscrambleData</code>
     */
    public static boolean IS_SCRAMBLE_DATA = System.getProperty("scrambleData") != null; //$NON-NLS-1$
 

bundles/net.tourbook.common/src/net/tourbook/common/color/ColorValue.java

@@ -1,58 +1,59 @@
 /*******************************************************************************
- * Copyright (C) 2005, 2014  Wolfgang Schramm and Contributors
- * 
+ * Copyright (C) 2005, 2020  Wolfgang Schramm and Contributors
+ *
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License as published by the Free Software
  * Foundation version 2 of the License.
- * 
+ *
  * This program is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License along with
  * this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA
  *******************************************************************************/
 package net.tourbook.common.color;
 
+import net.tourbook.common.UI;
 import net.tourbook.common.util.StatusUtil;
 
 public class ColorValue implements Cloneable {
 
-	public float	value;
+   public float value;
 
-	public int		red;
-	public int		green;
-	public int		blue;
+   public int   red;
+   public int   green;
+   public int   blue;
 
-	public ColorValue(final float value, final int red, final int green, final int blue) {
+   public ColorValue(final float value, final int red, final int green, final int blue) {
 
-		this.value = value;
+      this.value = value;
 
-		this.red = red;
-		this.green = green;
-		this.blue = blue;
-	}
+      this.red = red;
+      this.green = green;
+      this.blue = blue;
+   }
 
-	@Override
-	protected ColorValue clone() throws CloneNotSupportedException {
+   @Override
+   protected ColorValue clone() throws CloneNotSupportedException {
 
-		ColorValue clonedObject = null;
+      ColorValue clonedObject = null;
 
-		try {
+      try {
 
-			clonedObject = (ColorValue) super.clone();
+         clonedObject = (ColorValue) super.clone();
 
-		} catch (final CloneNotSupportedException e) {
-			StatusUtil.log(e);
-		}
+      } catch (final CloneNotSupportedException e) {
+         StatusUtil.log(e);
+      }
 
-		return clonedObject;
-	}
+      return clonedObject;
+   }
 
-	@Override
-	public String toString() {
-		return "ColorValue(" + value + ", " + red + ", " + green + ", " + blue + ")"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
-	}
+   @Override
+   public String toString() {
+      return "ColorValue(" + value + ", " + red + ", " + green + ", " + blue + UI.SYMBOL_BRACKET_RIGHT; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+   }
 
 }

bundles/net.tourbook.common/src/net/tourbook/common/formatter/FormatManager.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (C) 2005, 2019 Wolfgang Schramm and Contributors
+ * Copyright (C) 2005, 2020 Wolfgang Schramm and Contributors
  *
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License as published by the Free Software
@@ -45,14 +45,20 @@ public class FormatManager {
    private static IValueFormatter        _pulseFormatter;
    private static IValueFormatter        _speedFormatter;
 
-   private static IValueFormatter        _drivingTimeFormatter;
+   private static IValueFormatter        _elapsedTimeFormatter;
+   private static IValueFormatter        _recordedTimeFormatter;
    private static IValueFormatter        _pausedTimeFormatter;
-   private static IValueFormatter        _recordingTimeFormatter;
+   private static IValueFormatter        _movingTimeFormatter;
+   private static IValueFormatter        _breakTimeFormatter;
 
    public static String formatAltitude(final float value) {
       return _altitudeFormatter.printDouble(value);
    }
 
+   public static String formatBreakTime(final long value) {
+      return _breakTimeFormatter.printLong(value);
+   }
+
    public static String formatCadence(final double value) {
       return _cadenceFormatter.printDouble(value);
    }
@@ -61,8 +67,12 @@ public static String formatDistance(final double value) {
       return _distanceFormatter.printDouble(value);
    }
 
-   public static String formatDrivingTime(final long value) {
-      return _drivingTimeFormatter.printLong(value);
+   public static String formatElapsedTime(final long value) {
+      return _elapsedTimeFormatter.printLong(value);
+   }
+
+   public static String formatMovingTime(final long value) {
+      return _movingTimeFormatter.printLong(value);
    }
 
    public static String formatNumber_0(final double value) {
@@ -90,8 +100,8 @@ public static String formatPulse(final double value) {
       return _pulseFormatter.printDouble(value);
    }
 
-   public static String formatRecordingTime(final long value) {
-      return _recordingTimeFormatter.printLong(value);
+   public static String formatRecordedTime(final long value) {
+      return _recordedTimeFormatter.printLong(value);
    }
 
    public static String formatSpeed(final double value) {
@@ -195,9 +205,11 @@ public static void updateDisplayFormats() {
       final String pulse = _prefStore.getString(ICommonPreferences.DISPLAY_FORMAT_PULSE);
       final String speed = _prefStore.getString(ICommonPreferences.DISPLAY_FORMAT_SPEED);
 
-      final String drivingTime = _prefStore.getString(ICommonPreferences.DISPLAY_FORMAT_DRIVING_TIME);
+      final String elapsedTime = _prefStore.getString(ICommonPreferences.DISPLAY_FORMAT_ELAPSED_TIME);
+      final String recordedTime = _prefStore.getString(ICommonPreferences.DISPLAY_FORMAT_RECORDED_TIME);
       final String pausedTime = _prefStore.getString(ICommonPreferences.DISPLAY_FORMAT_PAUSED_TIME);
-      final String recordingTime = _prefStore.getString(ICommonPreferences.DISPLAY_FORMAT_RECORDING_TIME);
+      final String movingTime = _prefStore.getString(ICommonPreferences.DISPLAY_FORMAT_MOVING_TIME);
+      final String breakTime = _prefStore.getString(ICommonPreferences.DISPLAY_FORMAT_BREAK_TIME);
 
       _altitudeFormatter = getNumberFormatter(altitude);
       _cadenceFormatter = getNumberFormatter(cadence);
@@ -206,8 +218,10 @@ public static void updateDisplayFormats() {
       _pulseFormatter = getNumberFormatter(pulse);
       _speedFormatter = getNumberFormatter(speed);
 
-      _drivingTimeFormatter = getTimeFormatter(drivingTime);
+      _elapsedTimeFormatter = getTimeFormatter(elapsedTime);
+      _recordedTimeFormatter = getTimeFormatter(recordedTime);
       _pausedTimeFormatter = getTimeFormatter(pausedTime);
-      _recordingTimeFormatter = getTimeFormatter(recordingTime);
+      _movingTimeFormatter = getTimeFormatter(movingTime);
+      _breakTimeFormatter = getTimeFormatter(breakTime);
    }
 }

bundles/net.tourbook.common/src/net/tourbook/common/messages_it.properties

@@ -2,15 +2,19 @@
 Action_App_CustomizeColumnsAndProfiles = Personalizza Profili/Colonne...
 Action_App_SizeAllColumnsToFit         = Dimensione &adattata per tutte le colonne
 
-Action_ColumnManager_ColumnActions_Info      = \u00BB Colonna:   {0} \u00AB
-Action_ColumnManager_Column_Info             = \u00BB Colonne \u00AB
-Action_ColumnManager_HideCurrentColumn       = Nascondi colonna
-Action_ColumnManager_Profile_Info            = \u00BB Profili \u00AB
-Action_ColumnManager_ShowAllColumns          = Mostra tutte le colonne...
-Action_ColumnManager_ShowDefaultColumns      = Mostra colonne predefinite...
-Action_ColumnManager_ValueFormatter_Category = Cambia formato categoria   \u00B7   {0}
-Action_ColumnManager_ValueFormatter_Detail   = Cambia formato percorso   \u00B7   {0}
-Action_ColumnManager_ValueFormatter_Tour     = Cambia formato   \u00B7   {0}
+Action_ColumnManager_ColumnActions_Info          = \u00BB Colonna:   {0} \u00AB
+Action_ColumnManager_Column_Info                 = \u00BB Colonne \u00AB
+Action_ColumnManager_FreezeCurrentColumn         = Blocca colonna
+Action_ColumnManager_FreezeCurrentColumn_Tooltip = Tutte le colonne a sinistra sono bloccate,\n\
+                                                   le altre colonne si possono scorrere orizzontalmente
+Action_ColumnManager_HideCurrentColumn           = Nascondi colonna
+Action_ColumnManager_Profile_Info                = \u00BB Profili \u00AB
+Action_ColumnManager_ShowAllColumns              = Mostra tutte le colonne...
+Action_ColumnManager_ShowDefaultColumns          = Mostra colonne predefinite...
+Action_ColumnManager_UnFreezeAllColumns          = Sblocca tutte le colonne
+Action_ColumnManager_ValueFormatter_Category     = Cambia formato categoria   \u00B7   {0}
+Action_ColumnManager_ValueFormatter_Detail       = Cambia formato percorso   \u00B7   {0}
+Action_ColumnManager_ValueFormatter_Tour         = Cambia formato   \u00B7   {0}
 
 Advanced_Menu_AnimationSymbol = \u00BB
 
@@ -55,7 +59,8 @@ ColumnModifyDialog_Button_move_down                  = Muovi in gi\u00F9
 ColumnModifyDialog_Button_move_up                    = Muovi in su
 ColumnModifyDialog_Button_select_all                 = Selezion&a tutto
 
-ColumnModifyDialog_Checkbox_ShowFormatAnnotations = Mostra una nota \u1DA0 di intestazione di colonna quando la formattazione della colonna \u00E8 disponibile
+ColumnModifyDialog_Checkbox_ShowFormatAnnotations  = Mostra una nota \u1DA0 nell'intestazione di colonna quando gli elementi della colonna possono essere formattati
+ColumnModifyDialog_Checkbox_ShowSortingAnnotations = Mostra una nota  \u02E2 nell'intestazione di colonna quando gli elementi della colonna possono essere riordinati
 
 ColumnModifyDialog_Column_Category       = Categoria
 ColumnModifyDialog_Column_FormatCategory = Formato categoria \u1DA0
@@ -77,6 +82,9 @@ ColumnModifyDialog_column_column = Colonna
 ColumnModifyDialog_column_unit   = Unit\u00E0
 ColumnModifyDialog_column_width  = Larghezza
 
+Column_Annotation_Formatting = \u1DA0
+Column_Annotation_Sorting    = \u02E2
+
 Column_Profile_Dialog_ShowAllColumns_Message     = "Visualizza tutte le colonne" sostituir\u00E0 tutte le colonne del profilo corrente "{0}" con tutte le colonne disponibili.\n\
                                                    \n\
                                                    Sostituire le colonne?

bundles/net.tourbook.common/src/net/tourbook/common/preferences/CommonPreferenceInitializer.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (C) 2005, 2016 Wolfgang Schramm and Contributors
+ * Copyright (C) 2005, 2020 Wolfgang Schramm and Contributors
  *
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License as published by the Free Software
@@ -32,66 +32,68 @@
  */
 public class CommonPreferenceInitializer extends AbstractPreferenceInitializer {
 
-	@Override
-	public void initializeDefaultPreferences() {
-
-		final IPreferenceStore store = CommonActivator.getPrefStore();
-
-		/*
-		 * graph color preferences
-		 */
-		for (final ColorDefinition colorDefinition : GraphColorManager.getInstance().getGraphColorDefinitions()) {
-
-			PreferenceConverter.setDefault(
-					store,
-					colorDefinition.getGraphPrefName(GraphColorManager.PREF_COLOR_BRIGHT),
-					colorDefinition.getGradientBright_Default());
-
-			PreferenceConverter.setDefault(
-					store,
-					colorDefinition.getGraphPrefName(GraphColorManager.PREF_COLOR_DARK),
-					colorDefinition.getGradientDark_Default());
-
-			PreferenceConverter.setDefault(
-					store,
-					colorDefinition.getGraphPrefName(GraphColorManager.PREF_COLOR_LINE),
-					colorDefinition.getLineColor_Default());
-		}
-
-		/*
-		 * Display formats
-		 */
-		store.setDefault(ICommonPreferences.DISPLAY_FORMAT_IS_LIVE_UPDATE, true);
-
-		store.setDefault(ICommonPreferences.DISPLAY_FORMAT_ALTITUDE, ValueFormat.NUMBER_1_0.name());
-		store.setDefault(ICommonPreferences.DISPLAY_FORMAT_CADENCE, ValueFormat.NUMBER_1_0.name());
-		store.setDefault(ICommonPreferences.DISPLAY_FORMAT_DISTANCE, ValueFormat.NUMBER_1_0.name());
-		store.setDefault(ICommonPreferences.DISPLAY_FORMAT_POWER, ValueFormat.NUMBER_1_0.name());
-		store.setDefault(ICommonPreferences.DISPLAY_FORMAT_PULSE, ValueFormat.NUMBER_1_0.name());
-		store.setDefault(ICommonPreferences.DISPLAY_FORMAT_SPEED, ValueFormat.NUMBER_1_0.name());
-
-		store.setDefault(ICommonPreferences.DISPLAY_FORMAT_DRIVING_TIME, ValueFormat.TIME_HH_MM.name());
-		store.setDefault(ICommonPreferences.DISPLAY_FORMAT_PAUSED_TIME, ValueFormat.TIME_HH_MM.name());
-		store.setDefault(ICommonPreferences.DISPLAY_FORMAT_RECORDING_TIME, ValueFormat.TIME_HH_MM.name());
-
-		/*
-		 * Time zone
-		 */
-		final ZoneId defaultZoneId = ZoneId.systemDefault();
-		final String defaultId = defaultZoneId.getId();
-
-		store.setDefault(ICommonPreferences.TIME_ZONE_SELECTED_CUSTOM_ZONE, 1);
-		store.setDefault(ICommonPreferences.TIME_ZONE_IS_LIVE_UPDATE, true);
-		store.setDefault(ICommonPreferences.TIME_ZONE_IS_USE_SYSTEM_TIME_ZONE, true);
-		store.setDefault(ICommonPreferences.TIME_ZONE_LOCAL_ID, defaultId);
-		store.setDefault(ICommonPreferences.TIME_ZONE_LOCAL_ID_1, defaultId);
-		store.setDefault(ICommonPreferences.TIME_ZONE_LOCAL_ID_2, defaultId);
-		store.setDefault(ICommonPreferences.TIME_ZONE_LOCAL_ID_3, defaultId);
-
-		/*
-		 * calendar week
-		 */
-		store.setDefault(ICommonPreferences.CALENDAR_WEEK_FIRST_DAY_OF_WEEK, DayOfWeek.MONDAY.getValue());
-		store.setDefault(ICommonPreferences.CALENDAR_WEEK_MIN_DAYS_IN_FIRST_WEEK, 4);
-	}
+   @Override
+   public void initializeDefaultPreferences() {
+
+      final IPreferenceStore store = CommonActivator.getPrefStore();
+
+      /*
+       * graph color preferences
+       */
+      for (final ColorDefinition colorDefinition : GraphColorManager.getInstance().getGraphColorDefinitions()) {
+
+         PreferenceConverter.setDefault(
+               store,
+               colorDefinition.getGraphPrefName(GraphColorManager.PREF_COLOR_BRIGHT),
+               colorDefinition.getGradientBright_Default());
+
+         PreferenceConverter.setDefault(
+               store,
+               colorDefinition.getGraphPrefName(GraphColorManager.PREF_COLOR_DARK),
+               colorDefinition.getGradientDark_Default());
+
+         PreferenceConverter.setDefault(
+               store,
+               colorDefinition.getGraphPrefName(GraphColorManager.PREF_COLOR_LINE),
+               colorDefinition.getLineColor_Default());
+      }
+
+      /*
+       * Display formats
+       */
+      store.setDefault(ICommonPreferences.DISPLAY_FORMAT_IS_LIVE_UPDATE, true);
+
+      store.setDefault(ICommonPreferences.DISPLAY_FORMAT_ALTITUDE, ValueFormat.NUMBER_1_0.name());
+      store.setDefault(ICommonPreferences.DISPLAY_FORMAT_CADENCE, ValueFormat.NUMBER_1_0.name());
+      store.setDefault(ICommonPreferences.DISPLAY_FORMAT_DISTANCE, ValueFormat.NUMBER_1_0.name());
+      store.setDefault(ICommonPreferences.DISPLAY_FORMAT_POWER, ValueFormat.NUMBER_1_0.name());
+      store.setDefault(ICommonPreferences.DISPLAY_FORMAT_PULSE, ValueFormat.NUMBER_1_0.name());
+      store.setDefault(ICommonPreferences.DISPLAY_FORMAT_SPEED, ValueFormat.NUMBER_1_0.name());
+
+      store.setDefault(ICommonPreferences.DISPLAY_FORMAT_ELAPSED_TIME, ValueFormat.TIME_HH_MM.name());
+      store.setDefault(ICommonPreferences.DISPLAY_FORMAT_RECORDED_TIME, ValueFormat.TIME_HH_MM.name());
+      store.setDefault(ICommonPreferences.DISPLAY_FORMAT_PAUSED_TIME, ValueFormat.TIME_HH_MM.name());
+      store.setDefault(ICommonPreferences.DISPLAY_FORMAT_MOVING_TIME, ValueFormat.TIME_HH_MM.name());
+      store.setDefault(ICommonPreferences.DISPLAY_FORMAT_BREAK_TIME, ValueFormat.TIME_HH_MM.name());
+
+      /*
+       * Time zone
+       */
+      final ZoneId defaultZoneId = ZoneId.systemDefault();
+      final String defaultId = defaultZoneId.getId();
+
+      store.setDefault(ICommonPreferences.TIME_ZONE_SELECTED_CUSTOM_ZONE, 1);
+      store.setDefault(ICommonPreferences.TIME_ZONE_IS_LIVE_UPDATE, true);
+      store.setDefault(ICommonPreferences.TIME_ZONE_IS_USE_SYSTEM_TIME_ZONE, true);
+      store.setDefault(ICommonPreferences.TIME_ZONE_LOCAL_ID, defaultId);
+      store.setDefault(ICommonPreferences.TIME_ZONE_LOCAL_ID_1, defaultId);
+      store.setDefault(ICommonPreferences.TIME_ZONE_LOCAL_ID_2, defaultId);
+      store.setDefault(ICommonPreferences.TIME_ZONE_LOCAL_ID_3, defaultId);
+
+      /*
+       * calendar week
+       */
+      store.setDefault(ICommonPreferences.CALENDAR_WEEK_FIRST_DAY_OF_WEEK, DayOfWeek.MONDAY.getValue());
+      store.setDefault(ICommonPreferences.CALENDAR_WEEK_MIN_DAYS_IN_FIRST_WEEK, 4);
+   }
 }