From: Frédéric Perrin <fred@fperrin.net>
Date: Sun, 5 Jan 2020 14:40:47 +0000 (+0000)
Subject: Merge branch 'add-1024-week-offset' into fp-integration
X-Git-Tag: v19.2.fp4
X-Git-Url: http://gitweb.fperrin.net/?p=GpsPrune.git;a=commitdiff_plain;h=22d91cbabcff03a472489640b7f46b3dbadc8e74;hp=4af8c81c67e21029fe2d0380e757d1f090d15127

Merge branch 'add-1024-week-offset' into fp-integration
---

diff --git a/src/tim/prune/function/AddTimeOffset.java b/src/tim/prune/function/AddTimeOffset.java
index 2e259bb..199ae50 100644
--- a/src/tim/prune/function/AddTimeOffset.java
+++ b/src/tim/prune/function/AddTimeOffset.java
@@ -33,8 +33,8 @@ public class AddTimeOffset extends GenericFunction
 {
 	private JDialog _dialog = null;
 	private JRadioButton _addRadio = null, _subtractRadio = null;
-	private WholeNumberField _dayField = null, _hourField = null;
-	private WholeNumberField _minuteField = null;
+	private WholeNumberField _1024weekField = null, _dayField = null;
+	private WholeNumberField _hourField = null, _minuteField = null;
 	private JButton _okButton = null;
 
 
@@ -103,8 +103,11 @@ public class AddTimeOffset extends GenericFunction
 		// Make a central panel with the text boxes
 		JPanel descPanel = new JPanel();
 		descPanel.setLayout(new GridLayout(0, 2));
+		descPanel.add(makeRightLabel("dialog.addtimeoffset.1024week"));
+		_1024weekField = new WholeNumberField(3);
+		descPanel.add(_1024weekField);
 		descPanel.add(makeRightLabel("dialog.addtimeoffset.days"));
-		_dayField = new WholeNumberField(3);
+		_dayField = new WholeNumberField(4);
 		descPanel.add(_dayField);
 		descPanel.add(makeRightLabel("dialog.addtimeoffset.hours"));
 		_hourField = new WholeNumberField(3);
@@ -128,9 +131,11 @@ public class AddTimeOffset extends GenericFunction
 				_okButton.setEnabled(getOffsetSecs() != 0L);
 			};
 		};
+		_1024weekField.addKeyListener(keyListener);
 		_dayField.addKeyListener(keyListener);
 		_hourField.addKeyListener(keyListener);
 		_minuteField.addKeyListener(keyListener);
+		_1024weekField.addMouseListener(mouseListener);
 		_dayField.addMouseListener(mouseListener);
 		_hourField.addMouseListener(mouseListener);
 		_minuteField.addMouseListener(mouseListener);
@@ -180,7 +185,8 @@ public class AddTimeOffset extends GenericFunction
 	{
 		long offsetSecs = _minuteField.getValue() * 60L
 		  + _hourField.getValue() * 60L * 60L
-		  + _dayField.getValue() * 60L * 60L * 24L;
+		  + _dayField.getValue() * 60L * 60L * 24L
+		  + _1024weekField.getValue() * 60L * 60L * 24L * 7L * 1024L;
 		if (_subtractRadio.isSelected()) {offsetSecs = -offsetSecs;}
 		return offsetSecs;
 	}
diff --git a/src/tim/prune/lang/prune-texts_en.properties b/src/tim/prune/lang/prune-texts_en.properties
index 82219b2..fd50356 100644
--- a/src/tim/prune/lang/prune-texts_en.properties
+++ b/src/tim/prune/lang/prune-texts_en.properties
@@ -307,6 +307,7 @@ dialog.pointnameedit.lowercase=lower case
 dialog.pointnameedit.titlecase=Title Case
 dialog.addtimeoffset.add=Add time
 dialog.addtimeoffset.subtract=Subtract time
+dialog.addtimeoffset.1024week=1024-week block
 dialog.addtimeoffset.days=Days
 dialog.addtimeoffset.hours=Hours
 dialog.addtimeoffset.minutes=Minutes