changed format for time columns (#110)

app/ui/epg/epg.py

@@ -191,7 +191,8 @@ class EpgTool(Gtk.Box):
         handlers = {"on_epg_press": self.on_epg_press,
                     "on_timer_add": self.on_timer_add,
                     "on_epg_filter_changed": self.on_epg_filter_changed,
-                    "on_epg_filter_toggled": self.on_epg_filter_toggled}
+                    "on_epg_filter_toggled": self.on_epg_filter_toggled,
+                    "on_view_query_tooltip": self.on_view_query_tooltip}
 
         builder = get_builder(f"{UI_RESOURCES_PATH}epg{SEP}tab.glade", handlers)
 
@@ -200,7 +201,6 @@ class EpgTool(Gtk.Box):
         self._filter_model = builder.get_object("epg_filter_model")
         self._filter_model.set_visible_func(self.epg_filter_function)
         self._filter_entry = builder.get_object("epg_filter_entry")
-        builder.get_object("epg_filter_button").bind_property("active", self._filter_entry, "visible")
         self.pack_start(builder.get_object("epg_frame"), True, True, 0)
         # Custom sort function.
         self._view.get_model().set_sort_func(1, self.time_sort_func, 1)
@@ -262,9 +262,10 @@ class EpgTool(Gtk.Box):
 
     @staticmethod
     def get_event(event, show_day=True):
-        t_str = f"{'%A, ' if show_day else ''}%Y-%m-%d, %H:%M"
+        t_str = f"{'%a, ' if show_day else ''}%x, %H:%M"
         title = event.get("e2eventtitle", "") or ""
         desc = event.get("e2eventdescription", "") or ""
+        desc = desc.strip()
 
         start = int(event.get("e2eventstart", "0"))
         start_time = datetime.fromtimestamp(start)
@@ -291,6 +292,22 @@ class EpgTool(Gtk.Box):
 
         return int(event1.get("e2eventstart", "0")) - int(event2.get("e2eventstart", "0"))
 
+    def on_view_query_tooltip(self, view, x, y, keyboard_mode, tooltip):
+        dst = view.get_dest_row_at_pos(x, y)
+        if not dst:
+            return False
+
+        path, pos = dst
+        model = view.get_model()
+        data = model[path][-1]
+        desc = data.get("e2eventdescription", "") or ""
+        ext_desc = data.get("e2eventdescriptionextended", "") or ""
+
+        tooltip.set_text(ext_desc if ext_desc else desc)
+        view.set_tooltip_row(tooltip, path)
+
+        return True
+
 
 class EpgDialog:
 

app/ui/epg/tab.glade

@@ -140,6 +140,7 @@ Author: Dmitriy Yefremov
                 <property name="primary_icon_name">edit-find-replace-symbolic</property>
                 <property name="primary_icon_activatable">False</property>
                 <property name="primary_icon_sensitive">False</property>
+                <property name="visible" bind-source="epg_filter_button" bind-property="active"/>
                 <signal name="search-changed" handler="on_epg_filter_changed" swapped="no"/>
               </object>
               <packing>
@@ -236,8 +237,9 @@ Author: Dmitriy Yefremov
                 <property name="rules_hint">True</property>
                 <property name="rubber_banding">True</property>
                 <property name="enable_grid_lines">both</property>
-                <property name="tooltip_column">2</property>
+                <property name="tooltip_column">3</property>
                 <signal name="button-press-event" handler="on_epg_press" swapped="no"/>
+                <signal name="query-tooltip" handler="on_view_query_tooltip" swapped="no"/>
                 <child internal-child="selection">
                   <object class="GtkTreeSelection" id="epg_selection">
                     <property name="mode">multiple</property>
@@ -264,14 +266,15 @@ Author: Dmitriy Yefremov
                 <child>
                   <object class="GtkTreeViewColumn" id="epg_time_column">
                     <property name="resizable">True</property>
-                    <property name="fixed_width">270</property>
+                    <property name="fixed_width">210</property>
                     <property name="min_width">50</property>
                     <property name="title" translatable="yes">Time</property>
                     <property name="alignment">0.49000000953674316</property>
                     <property name="sort_column_id">1</property>
                     <child>
                       <object class="GtkCellRendererText" id="epg_time_renderer">
-                        <property name="xpad">10</property>
+                        <property name="xpad">5</property>
+                        <property name="xalign">0.49000000953674316</property>
                       </object>
                       <attributes>
                         <attribute name="text">1</attribute>

app/ui/recordings.glade

@@ -325,7 +325,7 @@ Author: Dmitriy Yefremov
                         <child>
                           <object class="GtkTreeViewColumn" id="rec_time_column">
                             <property name="resizable">True</property>
-                            <property name="fixed_width">200</property>
+                            <property name="fixed_width">180</property>
                             <property name="min_width">100</property>
                             <property name="title" translatable="yes">Time</property>
                             <property name="alignment">0.5</property>
@@ -333,6 +333,7 @@ Author: Dmitriy Yefremov
                             <child>
                               <object class="GtkCellRendererText" id="rec_time_renderer">
                                 <property name="xpad">5</property>
+                                <property name="xalign">0.49000000953674316</property>
                               </object>
                               <attributes>
                                 <attribute name="text">2</attribute>

app/ui/recordings.py

@@ -169,7 +169,7 @@ class RecordingsTool(Gtk.Box):
     def get_recordings_row(self, rec):
         service = rec.get("e2servicename")
         title = rec.get("e2title", "")
-        time = datetime.fromtimestamp(int(rec.get("e2time", "0"))).strftime("%A, %Y-%m-%d, %H:%M")
+        time = datetime.fromtimestamp(int(rec.get("e2time", "0"))).strftime("%a, %x, %H:%M")
         length = rec.get("e2length", "0")
         file = rec.get("e2filename", "")
         desc = rec.get("e2description", "")

app/ui/timers.glade

@@ -1206,13 +1206,14 @@ Author: Dmitriy Yefremov
                 <child>
                   <object class="GtkTreeViewColumn" id="timer_time_column">
                     <property name="resizable">True</property>
-                    <property name="fixed_width">270</property>
+                    <property name="fixed_width">210</property>
                     <property name="min_width">50</property>
                     <property name="title" translatable="yes">Time</property>
                     <property name="alignment">0.5</property>
                     <child>
                       <object class="GtkCellRendererText" id="timer_time_renderer">
                         <property name="xpad">5</property>
+                        <property name="xalign">0.49000000953674316</property>
                       </object>
                       <attributes>
                         <attribute name="text">3</attribute>

app/ui/timers.py

@@ -350,7 +350,7 @@ class TimerTool(Gtk.Box):
         service = timer.get("e2servicename", "") or ""
         start_time = datetime.fromtimestamp(int(timer.get("e2timebegin", "0")))
         end_time = datetime.fromtimestamp(int(timer.get("e2timeend", "0")))
-        time = f"{start_time.strftime('%A, %Y-%m-%d, %H:%M')} - {end_time.strftime('%H:%M')}"
+        time = f"{start_time.strftime('%a, %x, %H:%M')} - {end_time.strftime('%H:%M')}"
 
         return disabled, name, service, time, description, timer