adaptation to the new format

app/ui/service_details_dialog.glade

@@ -1,7 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.1 -->
+<!-- Generated with glade 3.22.2
+
+The MIT License (MIT)
+
+Copyright (c) 2018-2021 Dmitriy Yefremov
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+Author: Dmitriy Yefremov
+
+-->
 <interface>
   <requires lib="gtk+" version="3.16"/>
+  <!-- interface-license-type mit -->
+  <!-- interface-name DemonEditor -->
+  <!-- interface-description Enigma2 channel and satellite list editor for GNU/Linux. -->
+  <!-- interface-copyright 2018-2021 Dmitriy Yefremov -->
+  <!-- interface-authors Dmitriy Yefremov -->
   <object class="GtkListStore" id="fec_list_store">
     <columns>
       <!-- column-name fec -->
@@ -171,7 +202,6 @@
     </data>
   </object>
   <object class="GtkAdjustment" id="sat_pos_adjustment">
-    <property name="lower">-180</property>
     <property name="upper">180</property>
     <property name="step_increment">0.10000000000000001</property>
     <property name="page_increment">10</property>
@@ -1106,21 +1136,6 @@
                         <property name="top_attach">0</property>
                       </packing>
                     </child>
-                    <child>
-                      <object class="GtkSpinButton" id="sat_pos_button">
-                        <property name="visible">True</property>
-                        <property name="sensitive">False</property>
-                        <property name="can_focus">True</property>
-                        <property name="input_purpose">number</property>
-                        <property name="adjustment">sat_pos_adjustment</property>
-                        <property name="digits">1</property>
-                        <property name="numeric">True</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">1</property>
-                      </packing>
-                    </child>
                     <child>
                       <object class="GtkLabel" id="tid_label">
                         <property name="visible">True</property>
@@ -1175,6 +1190,50 @@
                         <property name="top_attach">1</property>
                       </packing>
                     </child>
+                    <child>
+                      <object class="GtkBox" id="sat_pos_box">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="spacing">1</property>
+                        <child>
+                          <object class="GtkSpinButton" id="sat_pos_button">
+                            <property name="visible">True</property>
+                            <property name="sensitive">False</property>
+                            <property name="can_focus">True</property>
+                            <property name="input_purpose">number</property>
+                            <property name="adjustment">sat_pos_adjustment</property>
+                            <property name="digits">1</property>
+                            <property name="numeric">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkComboBoxText" id="pos_side_box">
+                            <property name="visible">True</property>
+                            <property name="sensitive">False</property>
+                            <property name="can_focus">False</property>
+                            <property name="active">0</property>
+                            <items>
+                              <item id="E">E</item>
+                              <item id="W">W</item>
+                            </items>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">1</property>
+                      </packing>
+                    </child>
                   </object>
                   <packing>
                     <property name="expand">False</property>

app/ui/service_details_dialog.py

@@ -1,7 +1,7 @@
 import os
 import re
 
-from app.commons import run_idle
+from app.commons import run_idle, log
 from app.eparser import Service
 from app.eparser.ecommons import (MODULATION, Inversion, ROLL_OFF, Pilot, Flag, Pids, POLARIZATION, get_key_by_value,
                                   get_value_by_name, FEC_DEFAULT, PLS_MODE, SERVICE_TYPE, T_MODULATION, C_MODULATION,
@@ -120,6 +120,7 @@ class ServiceDetailsDialog:
         self._pids_grid = builder.get_object("pids_grid")
         # Transponder elements
         self._sat_pos_button = builder.get_object("sat_pos_button")
+        self._pos_side_box = builder.get_object("pos_side_box")
         self._pol_combo_box = builder.get_object("pol_combo_box")
         self._fec_combo_box = builder.get_object("fec_combo_box")
         self._rate_lp_combo_box = builder.get_object("rate_lp_combo_box")
@@ -137,7 +138,7 @@ class ServiceDetailsDialog:
         self._TRANSPONDER_ELEMENTS = (self._sat_pos_button, self._pol_combo_box, self._invertion_combo_box,
                                       self._sys_combo_box, self._freq_entry, self._transponder_id_entry,
                                       self._network_id_entry, self._namespace_entry, self._fec_combo_box,
-                                      self._rate_entry, self._rate_lp_combo_box)
+                                      self._rate_entry, self._rate_lp_combo_box, self._pos_side_box)
 
         if self._action is Action.EDIT:
             self.update_data_elements()
@@ -336,7 +337,8 @@ class ServiceDetailsDialog:
 
     def set_sat_positions(self, sat_pos):
         """ Sat positions initialisation """
-        self._sat_pos_button.set_value(float(sat_pos))
+        self._sat_pos_button.set_value(float(sat_pos[:-1]))
+        self._pos_side_box.set_active_id(sat_pos[-1:])
 
     def on_system_changed(self, box):
         if not self._tr_edit_switch.get_active():
@@ -387,7 +389,7 @@ class ServiceDetailsDialog:
     def on_edit(self):
         """ Edit current service.  """
         fav_id, data_id = self.get_srv_data()
-        # transponder
+        # Transponder
         transponder = self._old_service.transponder
         if self._tr_edit_switch.get_active():
             try:
@@ -398,12 +400,12 @@ class ServiceDetailsDialog:
                 elif self._tr_type is TrType.Cable:
                     transponder = self.get_cable_transponder_data()
             except Exception as e:
-                print(e)
+                log("Edit service error: {}".format(e))
                 show_dialog(DialogType.ERROR, transient=self._dialog, text="Error getting transponder parameters!")
             else:
                 if self._transponder_services_iters:
                     self.update_transponder_services(transponder)
-        # service
+        # Service
         service = self.get_service(fav_id, data_id, transponder)
         old_fav_id = self._old_service.fav_id
         if old_fav_id != fav_id:
@@ -556,7 +558,7 @@ class ServiceDetailsDialog:
             freq = self._freq_entry.get_text()
             rate = self._rate_entry.get_text()
             pol = self._pol_combo_box.get_active_id()
-            pos = str(round(self._sat_pos_button.get_value(), 1))
+            pos = "{}{}".format(round(self._sat_pos_button.get_value(), 1), self._pos_side_box.get_active_id())
             return freq, rate, pol, fec, system, pos
         elif self._tr_type is TrType.Terrestrial:
             o_srv = self._old_service
@@ -567,11 +569,13 @@ class ServiceDetailsDialog:
 
     def get_satellite_transponder_data(self):
         sys = self._sys_combo_box.get_active_id()
-        freq = self._freq_entry.get_text()
-        rate = self._rate_entry.get_text()
+        freq = "{}000".format(self._freq_entry.get_text())
+        rate = "{}000".format(self._rate_entry.get_text())
         pol = self.get_value_from_combobox_id(self._pol_combo_box, POLARIZATION)
         fec = self.get_value_from_combobox_id(self._fec_combo_box, FEC_DEFAULT)
-        sat_pos = str(round(self._sat_pos_button.get_value(), 1)).replace(".", "")
+        sat_pos = self._sat_pos_button.get_value() * (-1 if self._pos_side_box.get_active_id() == "W" else 1)
+        sat_pos = str(round(sat_pos, 1)).replace(".", "")
+
         inv = get_value_by_name(Inversion, self._invertion_combo_box.get_active_id())
         srv_sys = "0"  # !!!
 
@@ -600,7 +604,7 @@ class ServiceDetailsDialog:
         # frequency, bandwidth, code rate HP, code rate LP, modulation, transmission mode, guard interval, hierarchy,
         # inversion, system, plp_id
         # Bandwidth -> Pol, Rate HP -> FEC, TransmissionMode -> Roll off, GuardInterval -> Pilot, Hierarchy -> Pls Mode
-        tr_data[1] = self._freq_entry.get_text()
+        tr_data[1] = "{}000".format(self._freq_entry.get_text())
         tr_data[2] = self.get_value_from_combobox_id(self._pol_combo_box, BANDWIDTH)
         tr_data[3] = self.get_value_from_combobox_id(self._fec_combo_box, T_FEC)
         tr_data[4] = self.get_value_from_combobox_id(self._rate_lp_combo_box, T_FEC)
@@ -615,8 +619,8 @@ class ServiceDetailsDialog:
     def get_cable_transponder_data(self):
         tr_data = re.split("\s|:", self._old_service.transponder)
         # frequency, symbol_rate, modulation, inversion, fec_inner, system;
-        tr_data[1] = self._freq_entry.get_text()
-        tr_data[2] = self._rate_entry.get_text()
+        tr_data[1] = "{}000".format(self._freq_entry.get_text())
+        tr_data[2] = "{}000".format(self._rate_entry.get_text())
         tr_data[3] = get_value_by_name(Inversion, self._invertion_combo_box.get_active_id())
         tr_data[4] = self.get_value_from_combobox_id(self._mod_combo_box, C_MODULATION)
         tr_data[5] = self.get_value_from_combobox_id(self._fec_combo_box, FEC_DEFAULT)