From f19ab37bc884d386804a30bb8cb6df32c1c315cc Mon Sep 17 00:00:00 2001
From: DYefremov <dmitry.v.yefremov@gmail.com>
Date: Sat, 3 Feb 2018 23:25:15 +0300
Subject: [PATCH] sat position for picons dialog

---
 app/ui/main_app_window.py  |  3 +-
 app/ui/picons_dialog.glade | 70 ++++++++++++++++++++++++++++++++++----
 app/ui/picons_dialog.py    |  9 +++--
 3 files changed, 73 insertions(+), 9 deletions(-)

diff --git a/app/ui/main_app_window.py b/app/ui/main_app_window.py
index 9c1fb114..b3493038 100644
--- a/app/ui/main_app_window.py
+++ b/app/ui/main_app_window.py
@@ -837,7 +837,8 @@ class MainAppWindow:
         locate_in_services(view, self.__services_view, self.__main_window)
 
     def on_picons_loader_show(self, item):
-        dialog = PiconsDialog(self.__main_window, self.__options.get(self.__profile), Profile(self.__profile))
+        pos = {r[16] for r in self.__services_model}
+        dialog = PiconsDialog(self.__main_window, self.__options.get(self.__profile), pos, Profile(self.__profile))
         dialog.show()
         self.update_picons()
 
diff --git a/app/ui/picons_dialog.glade b/app/ui/picons_dialog.glade
index ebb57a6e..199fc7cd 100644
--- a/app/ui/picons_dialog.glade
+++ b/app/ui/picons_dialog.glade
@@ -17,6 +17,12 @@
       <column type="gboolean"/>
     </columns>
   </object>
+  <object class="GtkListStore" id="sat_position_list_store">
+    <columns>
+      <!-- column-name pos -->
+      <column type="gchararray"/>
+    </columns>
+  </object>
   <object class="GtkDialog" id="picons_dialog">
     <property name="width_request">480</property>
     <property name="can_focus">False</property>
@@ -351,6 +357,9 @@
                 <property name="can_focus">False</property>
                 <property name="label" translatable="yes">Satellite url (www.lyngsat.com):</property>
                 <property name="xalign">0.019999999552965164</property>
+                <style>
+                  <class name="primary-toolbar"/>
+                </style>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -374,6 +383,55 @@
                 <property name="position">6</property>
               </packing>
             </child>
+            <child>
+              <object class="GtkBox" id="position_box">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="spacing">2</property>
+                <child>
+                  <object class="GtkLabel" id="label3">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="margin_left">5</property>
+                    <property name="label" translatable="yes">Satellite position: </property>
+                    <property name="xalign">0.019999999552965164</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkComboBox" id="position_combo_box">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="model">sat_position_list_store</property>
+                    <property name="active">0</property>
+                    <property name="id_column">0</property>
+                    <child>
+                      <object class="GtkCellRendererText" id="pos_cellrenderertext"/>
+                      <attributes>
+                        <attribute name="text">0</attribute>
+                      </attributes>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <style>
+                  <class name="primary-toolbar"/>
+                </style>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">8</property>
+              </packing>
+            </child>
             <child>
               <object class="GtkScrolledWindow" id="providers_scrolled_window">
                 <property name="height_request">150</property>
@@ -452,7 +510,7 @@
               <packing>
                 <property name="expand">True</property>
                 <property name="fill">True</property>
-                <property name="position">7</property>
+                <property name="position">10</property>
               </packing>
             </child>
             <child>
@@ -464,7 +522,7 @@
                 <property name="expand">False</property>
                 <property name="fill">True</property>
                 <property name="padding">2</property>
-                <property name="position">10</property>
+                <property name="position">11</property>
               </packing>
             </child>
             <child>
@@ -562,7 +620,7 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">True</property>
-                <property name="position">11</property>
+                <property name="position">12</property>
               </packing>
             </child>
             <child>
@@ -599,7 +657,7 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">True</property>
-                <property name="position">12</property>
+                <property name="position">13</property>
               </packing>
             </child>
             <child>
@@ -665,7 +723,7 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">True</property>
-                <property name="position">13</property>
+                <property name="position">14</property>
               </packing>
             </child>
             <child>
@@ -676,7 +734,7 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">True</property>
-                <property name="position">14</property>
+                <property name="position">15</property>
               </packing>
             </child>
           </object>
diff --git a/app/ui/picons_dialog.py b/app/ui/picons_dialog.py
index 9c6570d6..5955f8ef 100644
--- a/app/ui/picons_dialog.py
+++ b/app/ui/picons_dialog.py
@@ -15,7 +15,7 @@ from .main_helper import update_entry_data
 
 
 class PiconsDialog:
-    def __init__(self, transient, options, profile=Profile.ENIGMA_2):
+    def __init__(self, transient, options, sat_positions, profile=Profile.ENIGMA_2):
         self._TMP_DIR = tempfile.gettempdir() + "/"
         self._BASE_URL = "www.lyngsat.com/packages/"
         self._PATTERN = re.compile("^https://www\.lyngsat\.com/[\w-]+\.html$")
@@ -35,7 +35,8 @@ class PiconsDialog:
 
         builder = Gtk.Builder()
         builder.add_objects_from_file(UI_RESOURCES_PATH + "picons_dialog.glade",
-                                      ("picons_dialog", "receive_image", "providers_list_store"))
+                                      ("picons_dialog", "receive_image", "providers_list_store",
+                                       "sat_position_list_store"))
         builder.connect_signals(handlers)
         self._dialog = builder.get_object("picons_dialog")
         self._dialog.set_transient_for(transient)
@@ -57,6 +58,10 @@ class PiconsDialog:
         self._resize_no_radio_button = builder.get_object("resize_no_radio_button")
         self._resize_220_132_radio_button = builder.get_object("resize_220_132_radio_button")
         self._resize_100_60_radio_button = builder.get_object("resize_100_60_radio_button")
+        self._position_combo_box = builder.get_object("position_combo_box")
+        self._sat_position_list_store = builder.get_object("sat_position_list_store")
+        for pos in sat_positions:
+            self._sat_position_list_store.append((pos,))
         # style
         self._style_provider = Gtk.CssProvider()
         self._style_provider.load_from_path(UI_RESOURCES_PATH + "style.css")