diff --git a/app/eparser/__constants.py b/app/eparser/__constants.py index c716150b..5b953524 100644 --- a/app/eparser/__constants.py +++ b/app/eparser/__constants.py @@ -13,10 +13,10 @@ POLARIZATION = {"0": "H", "1": "V", "2": "L", "3": "R"} PLS_MODE = {"0": "Root", "1": "Gold", "2": "Combo"} -FEC = {"0": "None", "1": "Auto", "2": "1/2", - "3": "2/3", "4": "3/4", "5": "5/6", - "6": "7/8", "7": "3/5", "8": "4/5", - "9": "8/9", "10": "9/10"} +FEC = {"0": "Auto", "1": "1/2", "2": "2/3", + "3": "3/4", "4": "5/6", "5": "7/8", + "6": "8/9", "7": "3/5", "8": "4/5", + "9": "9/10", "15": None} SYSTEM = {"0": "DVB-S", "1": "DVB-S2"} diff --git a/app/eparser/satxml.py b/app/eparser/satxml.py index 586ee0d9..38e42e32 100644 --- a/app/eparser/satxml.py +++ b/app/eparser/satxml.py @@ -24,8 +24,8 @@ __COMMENT = (" File was created in DemonEditor\n\n" "transponder parameters:\n" "polarization: 0 - Horizontal, 1 - Vertical, 2 - Left Circular, 3 - Right Circular\n" - "fec_inner: 0 - Auto, 1 - 1/2, 2 - 2/3, 3 - 3/4, 4 - 5/6, 5 - 6/7, 6 - 7/8, 7 - 8/9, " - "8 - 3/5, 9 - 4/5, 10 - 9/10\n" + "fec_inner: 0 - Auto, 1 - 1/2, 2 - 2/3, 3 - 3/4, 4 - 5/6, 5 - 7/8, 6 - 8/9, 7 - 3/5,\n" + "8 - 4/5, 9 - 9/10, 15 - None\n" "modulation: 0 - Auto, 1 - QPSK, 2 - 8PSK, 3 - 16APSK, 5 - 32APSK\n" "rolloff: 0 - 0.35, 1 - 0.25, 2 - 0.20, 3 - Auto\n" "pilot: 0 - Off, 1 - On, 2 - Auto\n" @@ -33,9 +33,7 @@ __COMMENT = (" File was created in DemonEditor\n\n" "system: 0 = DVB-S, 1 = DVB-S2\n" "is_id: 0 - 255\n" "pls_mode: 0 - Root, 1 - Gold, 2 - Combo\n" - "pls_code: 0 - 262142\n\n" - - "Info taken from satellites.xml generated by http://satellites-xml.eu\n") + "pls_code: 0 - 262142\n\n") def get_satellites(path): diff --git a/app/ui/main_app_window.py b/app/ui/main_app_window.py index 73d1050d..71be976e 100644 --- a/app/ui/main_app_window.py +++ b/app/ui/main_app_window.py @@ -162,6 +162,7 @@ class MainAppWindow: bq_selected = self.is_bouquet_selected() if not bq_selected: + show_dialog("error_dialog", self.__main_window, "Error. No bouquet is selected!") return fav_bouquet = self.__bouquets[bq_selected] @@ -565,7 +566,7 @@ class MainAppWindow: is_service = model_name == self._SERVICE_LIST_NAME for elem in self._FAV_ELEMENTS: if elem in ("paste_tool_button", "paste_menu_item", "fav_paste_popup_item"): - self.__tool_elements[elem].set_sensitive(not_empty and not is_service and self.__rows_buffer) + self.__tool_elements[elem].set_sensitive(not is_service and self.__rows_buffer) else: self.__tool_elements[elem].set_sensitive(not_empty and not is_service) for elem in self._SERVICE_ELEMENTS: diff --git a/app/ui/satellites_dialog.glade b/app/ui/satellites_dialog.glade index cf74644a..16f42bd4 100644 --- a/app/ui/satellites_dialog.glade +++ b/app/ui/satellites_dialog.glade @@ -1261,6 +1261,7 @@ False 0 - 262142 digits + 1 @@ -1277,6 +1278,7 @@ False 0 - 255 digits + 2 diff --git a/app/ui/satellites_dialog.py b/app/ui/satellites_dialog.py index ee8fcabb..20db69e9 100644 --- a/app/ui/satellites_dialog.py +++ b/app/ui/satellites_dialog.py @@ -197,8 +197,7 @@ class SatellitesDialog: parent_itr = model.iter_parent(itr) if parent_itr: itr = parent_itr - - freq = int(tr.frequency) + freq = int(tr.frequency if tr.frequency else 0) tr_itr = model.iter_children(itr) # Inserting according to frequency value. while tr_itr: @@ -375,7 +374,7 @@ class SatelliteDialog: pos = satellite.position pos = float("{}.{}".format(pos[:-1], pos[-1:])) self._sat_position.set_value(fabs(pos)) - self._side.set_active(0 if pos >= 0 else 1) + self._side.set_active(0 if pos >= 0 else 1) # E or W def run(self): if self._dialog.run() == Gtk.ResponseType.CANCEL: