minor improvements for the timers tab (#110)

This commit is contained in:
DYefremov
2022-07-07 08:39:53 +03:00
parent 073521de75
commit 736655542c
2 changed files with 16 additions and 7 deletions

View File

@@ -1106,7 +1106,9 @@ Author: Dmitriy Yefremov
</child>
<child>
<object class="GtkTreeViewColumn" id="timer_name_column">
<property name="min_width">150</property>
<property name="resizable">True</property>
<property name="fixed_width">150</property>
<property name="min_width">50</property>
<property name="title" translatable="yes">Name</property>
<property name="alignment">0.5</property>
<child>
@@ -1129,7 +1131,9 @@ Author: Dmitriy Yefremov
</child>
<child>
<object class="GtkTreeViewColumn" id="timer_service_column">
<property name="min_width">150</property>
<property name="resizable">True</property>
<property name="fixed_width">150</property>
<property name="min_width">50</property>
<property name="title" translatable="yes">Service</property>
<property name="alignment">0.5</property>
<child>
@@ -1145,7 +1149,9 @@ Author: Dmitriy Yefremov
</child>
<child>
<object class="GtkTreeViewColumn" id="timer_time_column">
<property name="min_width">100</property>
<property name="resizable">True</property>
<property name="fixed_width">150</property>
<property name="min_width">50</property>
<property name="title" translatable="yes">Time</property>
<property name="alignment">0.5</property>
<child>
@@ -1160,6 +1166,8 @@ Author: Dmitriy Yefremov
</child>
<child>
<object class="GtkTreeViewColumn" id="timer_desc_column">
<property name="resizable">True</property>
<property name="min_width">50</property>
<property name="title" translatable="yes">Description</property>
<property name="expand">True</property>
<property name="alignment">0.5</property>

View File

@@ -27,7 +27,7 @@
""" Module for working with timers. """
from datetime import datetime
from datetime import datetime, timedelta
from enum import Enum
from urllib.parse import quote
@@ -210,7 +210,7 @@ class TimerTool(Gtk.Box):
self._timer_service_ref_entry.set_text(self._timer_data.get("e2servicereference", ""))
date = datetime.now()
self.set_begins_date(date)
self.set_ends_date(date)
self.set_ends_date(date + timedelta(hours=1))
self._timer_event_id_entry.set_text("")
self._timer_location_switch.set_active(False)
TimerTool.set_repetition_flags(0, self._days_buttons)
@@ -243,8 +243,9 @@ class TimerTool(Gtk.Box):
def set_time_data(self, start_time, end_time):
""" Sets values for time widgets. """
ev_time_start = datetime.fromtimestamp(start_time) or datetime.now()
ev_time_end = datetime.fromtimestamp(end_time) or datetime.now()
now = datetime.now()
ev_time_start = datetime.fromtimestamp(start_time) or now
ev_time_end = datetime.fromtimestamp(end_time) or now + timedelta(hours=1)
self._timer_begins_entry.set_text(ev_time_start.strftime(TimerTool.TIME_STR))
self._timer_ends_entry.set_text(ev_time_end.strftime(TimerTool.TIME_STR))
self._timer_begins_calendar.select_day(ev_time_start.day)