From 958320e573730699c38adfa849a07f1d7fe0944b Mon Sep 17 00:00:00 2001 From: DYefremov Date: Tue, 23 Sep 2025 13:13:10 +0300 Subject: [PATCH] separated data upload for the services tab --- app/ui/main.glade | 222 ++++++++++++++++++++++++++++++++-------------- app/ui/main.py | 4 +- 2 files changed, 158 insertions(+), 68 deletions(-) diff --git a/app/ui/main.glade b/app/ui/main.glade index 1db6d1bf..bd30d5ac 100644 --- a/app/ui/main.glade +++ b/app/ui/main.glade @@ -4770,97 +4770,185 @@ Author: Dmitriy Yefremov False stack - + + False + + + 100 + True + False + 5 + vertical + True + expand + + + True + True + True + app.on_send + All + + + True + True + 0 + + + + + True + True + True + app.upload_bouquets + Bouquets + + + True + True + 1 + + + + + + True False - True - expand + 2 - + True - True - True - Open - app.on_data_open + False + expand - + True - False - document-open-symbolic + True + True + Open + app.on_data_open + + + True + False + document-open-symbolic + + + + True + True + 0 + + + + + False + True + Save + app.on_data_save + + + True + False + document-save-symbolic + + + + + True + True + 1 + - True + False True - 0 + 4 - + True False - True - Download from the receiver - app.on_receive - True + expand - - 32 + True False - network-receive-symbolic - 1 + True + Download from the receiver + app.on_receive + True + + + 32 + True + False + network-receive-symbolic + 1 + + + + True + True + 0 + + + + + True + False + True + Transfer to receiver + app.on_send + True + + + True + False + network-transmit-symbolic + 1 + + + + + True + True + 1 + + + + + False + False + False + True + Transfer to receiver + send_popover + + + True + False + network-transmit-symbolic + 1 + + + + + True + True + 2 + - True + False True - 1 - - - - - True - False - True - Transfer to receiver - app.on_send - True - - - True - False - network-transmit-symbolic - 1 - - - - - True - True - 2 - - - - - False - True - Save - app.on_data_save - - - True - False - document-save-symbolic - - - - - True - True - 3 + 5 diff --git a/app/ui/main.py b/app/ui/main.py index 4004a790..fe13e7e7 100644 --- a/app/ui/main.py +++ b/app/ui/main.py @@ -40,7 +40,7 @@ from urllib.parse import urlparse, unquote from gi.repository import GLib, Gio, GObject from app.commons import run_idle, log, run_task, run_with_delay, init_logger, DefaultDict -from app.connections import (HttpAPI, download_data, DownloadType, upload_data, STC_XML_FILE) +from app.connections import (HttpAPI, download_data, DownloadType, upload_data) from app.eparser import get_blacklist, write_blacklist, write_bouquet from app.eparser import get_services, get_bouquets, write_bouquets, write_services, Bouquets, Bouquet, Service from app.eparser.ecommons import CAS, Flag, BouquetService, TrType @@ -398,6 +398,7 @@ class Application(Gtk.Application): self._bq_name_label = builder.get_object("bq_name_label") self._iptv_model = builder.get_object("iptv_list_store") self._iptv_menu_button = builder.get_object("iptv_menu_button") + self._send_button = builder.get_object("send_button") # Setting custom sort function for position column. self._services_view.get_model().set_sort_func(Column.SRV_POS, self.position_sort_func, Column.SRV_POS) # App info @@ -1174,6 +1175,7 @@ class Application(Gtk.Application): def on_visible_page(self, stack, param): self._page = Page(stack.get_visible_child_name()) + self._send_button.set_visible(self._page is not Page.SERVICES) self._fav_paned.set_visible(self._page in self._fav_pages) self.is_data_save_enabled = self._page in self.DATA_SAVE_PAGES self.is_data_open_enabled = self._page in self.DATA_OPEN_PAGES