diff --git a/app/ui/satellites.glade b/app/ui/satellites.glade index fb137880..b4bb80ce 100644 --- a/app/ui/satellites.glade +++ b/app/ui/satellites.glade @@ -1397,6 +1397,9 @@ Author: Dmitriy Yefremov True True + + + True @@ -1787,113 +1790,172 @@ Author: Dmitriy Yefremov True False - 0 + 0.49000000953674316 in - + True - True + False 5 5 5 5 - in + vertical + 5 - + True True - update_sat_list_model_sort - 0 - True - - - - - multiple - - + in - - Satellite - True - True - 0.5 - True - 0 - - - 0.0099999997764825821 + + True + True + update_sat_list_model_sort + 0 + True + + + + + multiple - - 0 - - - - - - Position - True - 0.5 - True - 1 - - 0.49000000953674316 + + Satellite + True + True + 0.5 + True + 0 + + + 0.0099999997764825821 + end + + + 0 + + - - 1 - - - - - - Type - True - 0.5 - True - 2 - - 0.49000000953674316 + + Position + True + 0.5 + True + 1 + + + 0.49000000953674316 + + + 1 + + - - 2 - - - - - - False - Url - - - 3 - - - - - - - Selected - True - True - 4 - - - + + Type + True + 0.5 + True + 2 + + + 0.49000000953674316 + + + 2 + + + + + + + False + Url + + + + 3 + + + + + + + Selected + True + True + 4 + + + + + + 4 + + - - 4 - + + True + True + 1 + + + + True + False + 10 + 10 + 5 + + + True + False + document-properties-symbolic + + + False + True + 0 + + + + + True + False + 0 + + + False + True + 1 + + + + + False + True + 2 + + + + + + + True + False + Satellites @@ -1903,190 +1965,318 @@ Author: Dmitriy Yefremov - - False - 0 - in + + True + vertical + True - + True - True - 5 - 5 - 5 - 5 - vertical - True + False + 0.49000000953674316 + in - + True - True - in + False + 5 + 5 + 5 + 5 + vertical + 5 - + True True - update_transponder_store - 0 - True - - - + in - - Transponder - True - 0.5 - - - 0.0099999997764825821 - - - 0 - + + True + True + update_transponder_store + 0 + True + + - - - - - False - link - - - 1 - - - - - - - Selected - - - + + Transponder + True + 0.5 + + + 0.0099999997764825821 + + + 0 + + + + + + + False + link + + + + 1 + + + + + + + Selected + + + + + + 2 + + - - 2 - + + True + True + 0 + + + + + True + False + 10 + 10 + 5 + + + True + False + document-properties-symbolic + + + False + True + 0 + + + + + True + False + 0 + + + False + True + 1 + + + + + False + True + 2 + - - True - True - - - + + True - True - in - - - True - True - update_service_store - 1 - - - - - - Service - True - 0.5 - - - 2 - - - 0 - - - - - 0.0099999997764825821 - - - 1 - - - - - - - Package - True - 0.5 - - - end - - - 2 - - - - - - - Type - True - 0.5 - - - 0.49000000953674316 - - - 3 - - - - - - - SID - True - 0.5 - - - 0.49000000953674316 - - - 4 - - - - - - - False - CAS - True - 0.5 - - - 0.49000000953674316 - - - - - - + False + Transponders - - True - True - + + True + True + - - + + + True + False + 0.49000000953674316 + in + + + True + False + 5 + 5 + 5 + 5 + vertical + 5 + + + True + True + in + + + True + True + update_service_store + 1 + + + + + + Service + True + 0.5 + + + 2 + + + 0 + + + + + 0.0099999997764825821 + + + 1 + + + + + + + Package + True + 0.5 + + + end + + + 2 + + + + + + + Type + True + 0.5 + + + 0.49000000953674316 + + + 3 + + + + + + + SID + True + 0.5 + + + 0.49000000953674316 + + + 4 + + + + + + + False + CAS + True + 0.5 + + + 0.49000000953674316 + + + + + + + + + True + True + 0 + + + + + True + False + 10 + 10 + 5 + + + True + False + document-properties-symbolic + + + False + True + 0 + + + + + True + False + 0 + + + False + True + 1 + + + + + False + True + 1 + + + + + + + + + + True + False + Services + + + + + True + True + diff --git a/app/ui/satellites.py b/app/ui/satellites.py index e6648ca0..fddb6727 100644 --- a/app/ui/satellites.py +++ b/app/ui/satellites.py @@ -442,7 +442,7 @@ class UpdateDialog: if title: self._window.set_title(title) - self._transponder_frame = builder.get_object("sat_update_tr_frame") + self._transponder_paned = builder.get_object("sat_update_tr_paned") self._sat_view = builder.get_object("sat_update_tree_view") self._transponder_view = builder.get_object("sat_update_tr_view") self._service_view = builder.get_object("sat_update_srv_view") @@ -451,6 +451,9 @@ class UpdateDialog: self._receive_button = builder.get_object("receive_data_button") self._sat_update_info_bar = builder.get_object("sat_update_info_bar") self._info_bar_message_label = builder.get_object("info_bar_message_label") + self._satellites_count_label = builder.get_object("satellites_count_label") + self._transponders_count_label = builder.get_object("transponders_count_label") + self._services_count_label = builder.get_object("services_count_label") self._receive_button.bind_property("visible", builder.get_object("cancel_data_button"), "visible", 4) update_button = builder.get_object("sat_update_button") self._sat_view.bind_property("sensitive", update_button, "sensitive") @@ -502,9 +505,7 @@ class UpdateDialog: show_dialog(DialogType.ERROR, self._window, "The task is already running!") return - get_base_model(self._sat_view.get_model()).clear() - self._transponder_view.get_model().clear() - self._service_view.get_model().clear() + self.clear_data() self.is_download = True self._sat_view.set_sensitive(False) @@ -514,6 +515,14 @@ class UpdateDialog: self.get_sat_list(src, self.append_satellites) + def clear_data(self): + get_base_model(self._sat_view.get_model()).clear() + self._transponder_view.get_model().clear() + self._service_view.get_model().clear() + self._satellites_count_label.set_text("0") + self._transponders_count_label.set_text("0") + self._services_count_label.set_text("0") + @run_task def get_sat_list(self, src, callback): sat_src = SatelliteSource.FLYSAT @@ -534,6 +543,7 @@ class UpdateDialog: model.append(sat) self._sat_view.set_sensitive(True) + self._satellites_count_label.set_text(str(len(model))) @run_idle def on_receive_data(self, item): @@ -729,7 +739,7 @@ class ServicesUpdateDialog(UpdateDialog): self._transponder_view.connect("button-press-event", lambda w, e: on_popup_menu(tr_popup_menu, e)) self._transponder_view.connect("select_all", lambda w: self.update_transponder_selection(True)) - self._transponder_frame.set_visible(True) + self._transponder_paned.set_visible(True) self._source_box.remove(0) self._source_box.connect("changed", self.on_update_satellites_list) self._source_box.set_active(0) @@ -896,6 +906,7 @@ class ServicesUpdateDialog(UpdateDialog): model.clear() list(map(model.append, [(t.text, t.url, t.url in self._selected_transponders) for t in trs_list])) self._sat_view.set_sensitive(True) + self._transponders_count_label.set_text(str(len(model))) @run_task def on_activate_transponder(self, view, path, column): @@ -915,6 +926,7 @@ class ServicesUpdateDialog(UpdateDialog): model.append((None, s.service, s.package, s.service_type, str(s.ssid), None)) self._transponder_view.set_sensitive(True) + self._services_count_label.set_text(str(len(model))) def update_transponder_selection(self, select): m = self._transponder_view.get_model()