From 18c1fa736b77c96e06af7bc568200bb620cfbbdb Mon Sep 17 00:00:00 2001
From: DYefremov <dmitry.v.yefremov@gmail.com>
Date: Thu, 16 Feb 2023 14:42:20 +0300
Subject: [PATCH] display channel id as tooltip for EPG dialog (#154)

---
 app/ui/epg/dialog.glade |  4 ++++
 app/ui/epg/epg.py       | 33 ++++++++++++++++++++++++++-------
 2 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/app/ui/epg/dialog.glade b/app/ui/epg/dialog.glade
index 79323082..84540400 100644
--- a/app/ui/epg/dialog.glade
+++ b/app/ui/epg/dialog.glade
@@ -226,6 +226,8 @@ Author: Dmitriy Yefremov
       <column type="gchararray"/>
       <!-- column-name picon_id -->
       <column type="gchararray"/>
+      <!-- column-name id -->
+      <column type="PyObject"/>
     </columns>
   </object>
   <object class="GtkTreeModelFilter" id="services_filter_model">
@@ -1009,10 +1011,12 @@ Author: Dmitriy Yefremov
                             <property name="search-column">0</property>
                             <property name="fixed-height-mode">True</property>
                             <property name="enable-grid-lines">both</property>
+                            <property name="tooltip-column">4</property>
                             <signal name="button-press-event" handler="on_popup_menu" object="source_popup_menu" swapped="no"/>
                             <signal name="drag-begin" handler="on_drag_begin" swapped="no"/>
                             <signal name="drag-data-get" handler="on_drag_data_get" swapped="no"/>
                             <signal name="key-press-event" handler="on_key_press" swapped="no"/>
+                            <signal name="query-tooltip" handler="on_source_view_query_tooltip" swapped="no"/>
                             <child internal-child="selection">
                               <object class="GtkTreeSelection"/>
                             </child>
diff --git a/app/ui/epg/epg.py b/app/ui/epg/epg.py
index 47bd05bd..97dfbe97 100644
--- a/app/ui/epg/epg.py
+++ b/app/ui/epg/epg.py
@@ -422,7 +422,8 @@ class EpgDialog:
                     "on_update_on_start_switch": self.on_update_on_start_switch,
                     "on_field_icon_press": self.on_field_icon_press,
                     "on_key_press": self.on_key_press,
-                    "on_bq_cursor_changed": self.on_bq_cursor_changed}
+                    "on_bq_cursor_changed": self.on_bq_cursor_changed,
+                    "on_source_view_query_tooltip": self.on_source_view_query_tooltip}
 
         self._app = app
         self._ex_services = self._app.current_services
@@ -591,7 +592,7 @@ class EpgDialog:
 
         factor = self._app.DEL_FACTOR / 4
         for index, srv in enumerate(filtered):
-            self._services_model.append((srv.service, srv.pos, srv.fav_id, srv.picon_id))
+            self._services_model.append((srv.service, srv.pos, srv.fav_id, srv.picon_id, srv.picon_id))
             if index % factor == 0:
                 yield True
 
@@ -675,7 +676,7 @@ class EpgDialog:
                 data = ":".join(ref_data[3:7])
                 pos, ch_id = srv.num
                 pos = pos or " "
-                self._services_model.append((srv.name, pos, data, "_".join(ref_data)))
+                self._services_model.append((srv.name, pos, data, "_".join(ref_data), ch_id))
 
                 if index % factor == 0:
                     yield True
@@ -704,6 +705,25 @@ class EpgDialog:
             if path:
                 self._filter_entry.set_text(model[path][Column.FAV_SERVICE] or "")
 
+    def on_source_view_query_tooltip(self, view, x, y, keyboard_mode, tooltip):
+        result = view.get_dest_row_at_pos(x, y)
+        if not result:
+            return False
+
+        path, pos = result
+        ch_id = view.get_model()[path][-1]
+        if not ch_id:
+            return False
+
+        if self._refs_source is RefsSource.XML:
+            text = f"ID = {ch_id}"
+        else:
+            text = f"{get_message('Service reference')}: {ch_id.rstrip('.png')}"
+
+        tooltip.set_text(text)
+        view.set_tooltip_row(tooltip, path)
+        return True
+
     @run_idle
     def on_save_to_xml(self, item):
         response = show_dialog(DialogType.CHOOSER, self._dialog, settings=self._settings)
@@ -781,11 +801,11 @@ class EpgDialog:
 
         fav_id = row[Column.FAV_ID]
         fav_id_data = fav_id.split(":")
-        fav_id_data[3:7] = data[-2].split(":")
+        fav_id_data[3:7] = data[-3].split(":")
 
-        if data[-1]:
+        if data[-2]:
             row[Column.FAV_POS] = data[-1]
-            p_data = data[-1].split("_")
+            p_data = data[-2].split("_")
             if p_data:
                 fav_id_data[2] = p_data[2]
 
@@ -862,7 +882,6 @@ class EpgDialog:
     def update_source_info(self, info):
         lines = info.split("\n")
         self._source_info_label.set_text(lines[0] if lines else "")
-        self._source_view.set_tooltip_text(info)
 
     @run_idle
     def update_source_count_info(self):