[hamster-applet] don't touch end time anymore as it can't step outside the 24 hour window anyway. fixes bug 602746
- From: Toms Baugis <tbaugis src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [hamster-applet] don't touch end time anymore as it can't step outside the 24 hour window anyway. fixes bug 602746
- Date: Sat, 26 Dec 2009 12:39:46 +0000 (UTC)
commit 3f1df2c50f5063a64a6228a14be9a330f84f7520
Author: Toms Bauģis <toms baugis gmail com>
Date: Sat Dec 26 12:39:39 2009 +0000
don't touch end time anymore as it can't step outside the 24 hour window anyway. fixes bug 602746
hamster/edit_activity.py | 15 +++------------
1 files changed, 3 insertions(+), 12 deletions(-)
---
diff --git a/hamster/edit_activity.py b/hamster/edit_activity.py
index 7b9a685..fa4265e 100644
--- a/hamster/edit_activity.py
+++ b/hamster/edit_activity.py
@@ -216,7 +216,6 @@ class CustomFactController:
if not start_time:
return
- self.end_time.set_time(start_time + dt.timedelta(minutes = 30))
self.end_time.set_start_time(start_time)
self.validate_fields()
self.end_time.grab_focus()
@@ -232,19 +231,11 @@ class CustomFactController:
start_time = self._get_datetime("start")
end_time = self._get_datetime("end")
- if self.get_widget("in_progress").get_active():
- end_time = dt.datetime.now()
if start_time and end_time:
- # if we are too far, just roll back for one day
- if ((end_time - start_time).days > 0):
- end_time -= dt.timedelta(days=1)
- self.update_time(start_time, end_time)
-
- # if end time is not in proper distance, do the brutal +30 minutes reset
- if (end_time < start_time or (end_time - start_time).days > 0):
- end_time = start_time + dt.timedelta(minutes = 30)
- self.update_time(start_time, end_time)
+ # make sure we are within 24 hours of start time
+ end_time -= dt.timedelta(days=(end_time - start_time).days)
+
self.draw_preview(start_time.date(), [start_time, end_time])
else:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]