Add time offset in number of weeks

diff --git a/src/tim/prune/function/AddTimeOffset.java b/src/tim/prune/function/AddTimeOffset.java
index 115bfa5997102edc0db005074c05fa5a97bb4754..9a8015f805e4178e77918c8adb1c67bcbbab3d7d 100644 (file)
--- 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 26d4a8e13be036e292d3b0e69f07f70a05d5439b..9090b8bbbad80530611e439187d1c58444b8bd1d 100644 (file)
--- 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 503de28bfae6d3765788e6467bc6b0a11eabbf29..147e847fc92a5ae5cd99ead8d925b49fe46b017d 100644 (file)
--- 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 eb4e914ffbef96caac014784b9f15d8f8d90fd5b..0b0249817f0fd6cc7d3afef5d5bae92733489eb3 100644 (file)
--- 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 bc0630284ad068d0da361a761c43de87e9703f7a..38254fcc77b6013163449f6adb8ad3f7df2b0701 100644 (file)
--- 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