From e3c3f20da7ca64cd47a963a11c4756de4e23cddf Mon Sep 17 00:00:00 2001
From: DYefremov <dmitry.v.yefremov@gmail.com>
Date: Mon, 12 Nov 2018 13:43:05 +0300
Subject: [PATCH] little refactoring

---
 app/ui/iptv.glade | 45 +++++++++++++--------------------------------
 app/ui/iptv.py    |  9 ++++++---
 2 files changed, 19 insertions(+), 35 deletions(-)

diff --git a/app/ui/iptv.glade b/app/ui/iptv.glade
index 570ad684..d8e0be3f 100644
--- a/app/ui/iptv.glade
+++ b/app/ui/iptv.glade
@@ -46,7 +46,17 @@ Author: Dmitriy Yefremov
     <property name="skip_taskbar_hint">True</property>
     <property name="skip_pager_hint">True</property>
     <property name="gravity">center</property>
-    <signal name="delete-event" handler="on_search_unavailable_close" swapped="no"/>
+    <signal name="response" handler="on_response" swapped="no"/>
+    <child type="action">
+      <object class="GtkButton" id="search_unavailable_cancel_button">
+        <property name="label">gtk-cancel</property>
+        <property name="visible">True</property>
+        <property name="can_focus">True</property>
+        <property name="receives_default">True</property>
+        <property name="use_stock">True</property>
+        <property name="always_show_image">True</property>
+      </object>
+    </child>
     <child type="titlebar">
       <placeholder/>
     </child>
@@ -55,41 +65,12 @@ Author: Dmitriy Yefremov
         <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">1</property>
-        <child internal-child="action_area">
-          <object class="GtkButtonBox">
-            <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="search_unavailable_cancel_button">
-                <property name="label">gtk-cancel</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
-                <signal name="clicked" handler="on_search_unavailable_close" swapped="no"/>
-              </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="position">3</property>
-          </packing>
-        </child>
         <child>
           <object class="GtkFrame" id="search_unavailable_box_frame">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="margin_left">2</property>
-            <property name="margin_right">2</property>
+            <property name="margin_left">5</property>
+            <property name="margin_right">5</property>
             <property name="margin_top">5</property>
             <property name="margin_bottom">5</property>
             <property name="label_xalign">0</property>
diff --git a/app/ui/iptv.py b/app/ui/iptv.py
index 6a9439fd..b0d78a1c 100644
--- a/app/ui/iptv.py
+++ b/app/ui/iptv.py
@@ -197,7 +197,7 @@ class IptvDialog:
 class SearchUnavailableDialog:
 
     def __init__(self, transient, model, fav_bouquet, iptv_rows, profile):
-        handlers = {"on_search_unavailable_close": self.on_close}
+        handlers = {"on_response": self.on_response}
 
         builder = Gtk.Builder()
         builder.set_translation_domain(TEXT_DOMAIN)
@@ -263,12 +263,15 @@ class SearchUnavailableDialog:
 
     def show(self):
         response = self._dialog.run()
-        self._dialog.destroy()
 
         return self._to_delete if response not in (Gtk.ResponseType.CANCEL, Gtk.ResponseType.DELETE_EVENT) else False
 
+    def on_response(self, dialog, response):
+        if response == Gtk.ResponseType.CANCEL:
+            self.on_close()
+
     @run_idle
-    def on_close(self, item=None, event=None):
+    def on_close(self):
         if self._download_task and show_dialog(DialogType.QUESTION, self._dialog) == Gtk.ResponseType.CANCEL:
             return
         self._download_task = False