From 921bef3a1f60f82216a63bfc96553176f042470e Mon Sep 17 00:00:00 2001 From: activityworkshop Date: Sun, 21 Mar 2021 20:28:46 +0100 Subject: [PATCH] Add time offset in number of weeks --- src/tim/prune/function/AddTimeOffset.java | 13 +++++++++---- src/tim/prune/lang/prune-texts_de.properties | 1 + src/tim/prune/lang/prune-texts_de_CH.properties | 3 ++- src/tim/prune/lang/prune-texts_en.properties | 1 + src/tim/prune/lang/prune-texts_fr.properties | 1 + 5 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/tim/prune/function/AddTimeOffset.java b/src/tim/prune/function/AddTimeOffset.java index 115bfa5..9a8015f 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 _weekField = 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.weeks")); + _weekField = new WholeNumberField(4); + descPanel.add(_weekField); 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,6 +131,7 @@ public class AddTimeOffset extends GenericFunction _okButton.setEnabled(getOffsetSecs() != 0L); } }; + _weekField.addKeyListener(keyListener); _dayField.addKeyListener(keyListener); _hourField.addKeyListener(keyListener); _minuteField.addKeyListener(keyListener); @@ -180,7 +184,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 + + _weekField.getValue() * 7L * 60L * 60L * 24L; if (_subtractRadio.isSelected()) {offsetSecs = -offsetSecs;} return offsetSecs; } diff --git a/src/tim/prune/lang/prune-texts_de.properties b/src/tim/prune/lang/prune-texts_de.properties index 26d4a8e..9090b8b 100644 --- a/src/tim/prune/lang/prune-texts_de.properties +++ b/src/tim/prune/lang/prune-texts_de.properties @@ -301,6 +301,7 @@ dialog.pointnameedit.lowercase=klein geschrieben dialog.pointnameedit.titlecase=Gemischt geschrieben dialog.addtimeoffset.add=Zeit addieren dialog.addtimeoffset.subtract=Zeit subtrahieren +dialog.addtimeoffset.weeks=Wochen dialog.addtimeoffset.days=Tage dialog.addtimeoffset.hours=Stunde dialog.addtimeoffset.minutes=Minute diff --git a/src/tim/prune/lang/prune-texts_de_CH.properties b/src/tim/prune/lang/prune-texts_de_CH.properties index 503de28..147e847 100644 --- a/src/tim/prune/lang/prune-texts_de_CH.properties +++ b/src/tim/prune/lang/prune-texts_de_CH.properties @@ -296,7 +296,8 @@ dialog.pointnameedit.lowercase=chli gschriebe dialog.pointnameedit.titlecase=Gmischt Gschriebe dialog.addtimeoffset.add=Ziit zutue dialog.addtimeoffset.subtract=Ziit davo neh -dialog.addtimeoffset.days=Tage +dialog.addtimeoffset.weeks=Wuche +dialog.addtimeoffset.days=T\u00e4g dialog.addtimeoffset.hours=Schtunde dialog.addtimeoffset.minutes=Minute dialog.addtimeoffset.notimestamps=Ziitverschiebig n\u00f6d m\u00f6glech wil dr Beriich kei Ziitinfo h\u00e4t diff --git a/src/tim/prune/lang/prune-texts_en.properties b/src/tim/prune/lang/prune-texts_en.properties index eb4e914..0b02498 100644 --- a/src/tim/prune/lang/prune-texts_en.properties +++ b/src/tim/prune/lang/prune-texts_en.properties @@ -304,6 +304,7 @@ dialog.pointnameedit.lowercase=lower case dialog.pointnameedit.titlecase=Title Case dialog.addtimeoffset.add=Add time dialog.addtimeoffset.subtract=Subtract time +dialog.addtimeoffset.weeks=Weeks dialog.addtimeoffset.days=Days dialog.addtimeoffset.hours=Hours dialog.addtimeoffset.minutes=Minutes diff --git a/src/tim/prune/lang/prune-texts_fr.properties b/src/tim/prune/lang/prune-texts_fr.properties index bc06302..38254fc 100644 --- a/src/tim/prune/lang/prune-texts_fr.properties +++ b/src/tim/prune/lang/prune-texts_fr.properties @@ -293,6 +293,7 @@ dialog.pointnameedit.lowercase=casse minuscules dialog.pointnameedit.titlecase=Casse Phrase dialog.addtimeoffset.add=Retarder l'heure dialog.addtimeoffset.subtract=Avancer l'heure +dialog.addtimeoffset.weeks=Semaines dialog.addtimeoffset.days=Jours dialog.addtimeoffset.hours=Heures dialog.addtimeoffset.minutes=Minutes -- 2.43.0