diff --git a/app/ui/main.py b/app/ui/main.py index 2b60de45..bc9b4018 100644 --- a/app/ui/main.py +++ b/app/ui/main.py @@ -1955,19 +1955,7 @@ class Application(Gtk.Application): try: profile = self._s_type opts = self._settings - use_http = profile is SettingsType.ENIGMA_2 - - if profile is SettingsType.ENIGMA_2: - host, port, user, password = opts.host, opts.http_port, opts.user, opts.password - try: - test_http(host, port, user, password, - use_ssl=opts.http_use_ssl, - skip_message=True, - s_type=self._s_type) - except (TestException, HttpApiException) as e: - log(e) - use_http = False - + use_http = profile is SettingsType.ENIGMA_2 and opts.use_http upload_data(settings=opts, download_type=download_type, remove_unused=True, use_http=use_http) except Exception as e: msg = "Uploading data error: {}" diff --git a/app/ui/settings_dialog.glade b/app/ui/settings_dialog.glade index bccd77ad..20c2712a 100644 --- a/app/ui/settings_dialog.glade +++ b/app/ui/settings_dialog.glade @@ -2396,7 +2396,6 @@ Author: Dmitriy Yefremov True False - Allows you to name bouquet files using their names. 0.019999999552965164 in @@ -2413,33 +2412,59 @@ Author: Dmitriy Yefremov True False + Allows you to name bouquet files using their names. start True Enable alternate bouquet file naming 0 - 0 + 3 True True + Allows you to name bouquet files using their names. end + + 1 + 3 + + + + + True + True + end + True + 1 0 - + True False start - Enable experimental features + Use HTTP to reload data in the receiver + + + 0 + 0 + + + + + True + False + start + Remove unused bouquets 0 @@ -2447,22 +2472,49 @@ Author: Dmitriy Yefremov - + True True end - center - + True 1 1 + + + True + False + Enables upload as an archive if a large number of picon is selected. + start + Enable picon compression + + + 0 + 2 + + + + + True + True + Enables upload as an archive if a large number of picon is selected. + + + 1 + 2 + + - - + + + True + False + FTP-transfer + @@ -2483,6 +2535,47 @@ Author: Dmitriy Yefremov 1 + + + True + False + 5 + 5 + + + True + False + start + Enable experimental features + + + False + True + 0 + + + + + True + True + end + center + + + + False + True + end + 1 + + + + + False + True + 2 + + True @@ -2535,7 +2628,7 @@ Author: Dmitriy Yefremov False True - 0 + 1 @@ -2647,7 +2740,7 @@ Author: Dmitriy Yefremov False True - 1 + 2 @@ -2687,7 +2780,7 @@ Author: Dmitriy Yefremov False True - 2 + 3 diff --git a/app/ui/settings_dialog.py b/app/ui/settings_dialog.py index e1b7357c..5581dc34 100644 --- a/app/ui/settings_dialog.py +++ b/app/ui/settings_dialog.py @@ -129,8 +129,6 @@ class SettingsDialog: # Settings type. self._enigma_radio_button = builder.get_object("enigma_radio_button") self._neutrino_radio_button = builder.get_object("neutrino_radio_button") - self._support_ver5_switch = builder.get_object("support_ver5_switch") - self._force_bq_name_switch = builder.get_object("force_bq_name_switch") # Streaming. self._apply_presets_button = builder.get_object("apply_presets_button") self._transcoding_switch = builder.get_object("transcoding_switch") @@ -167,6 +165,11 @@ class SettingsDialog: self._new_color_button = builder.get_object("new_color_button") self._extra_color_button = builder.get_object("extra_color_button") # Extra. + self._use_http_switch = builder.get_object("use_http_switch") + self._remove_unused_bq_switch = builder.get_object("remove_unused_bq_switch") + self._compress_picons_switch = builder.get_object("compress_picons_switch") + self._force_bq_name_switch = builder.get_object("force_bq_name_switch") + self._support_ver5_switch = builder.get_object("support_ver5_switch") self._support_http_api_switch = builder.get_object("support_http_api_switch") self._enable_yt_dl_switch = builder.get_object("enable_yt_dl_switch") self._enable_update_yt_dl_switch = builder.get_object("enable_update_yt_dl_switch") @@ -328,6 +331,9 @@ class SettingsDialog: if self._s_type is SettingsType.ENIGMA_2: self._enable_exp_switch.set_active(self._settings.is_enable_experimental) self._support_ver5_switch.set_active(self._settings.v5_support) + self._use_http_switch.set_active(self._settings.use_http) + self._remove_unused_bq_switch.set_active(self._settings.remove_unused_bouquets) + self._compress_picons_switch.set_active(self._settings.compress_picons) self._force_bq_name_switch.set_active(self._settings.force_bq_names) self._enable_yt_dl_switch.set_active(self._settings.enable_yt_dl) self._enable_update_yt_dl_switch.set_active(self._settings.enable_yt_dl_update) @@ -406,6 +412,9 @@ class SettingsDialog: self._ext_settings.new_color = self._new_color_button.get_rgba().to_string() self._ext_settings.extra_color = self._extra_color_button.get_rgba().to_string() self._ext_settings.v5_support = self._support_ver5_switch.get_active() + self._ext_settings.use_http = self._use_http_switch.get_active() + self._ext_settings.remove_unused_bouquets = self._remove_unused_bq_switch.get_active() + self._ext_settings.compress_picons = self._compress_picons_switch.get_active() self._ext_settings.force_bq_names = self._force_bq_name_switch.get_active() self._ext_settings.enable_yt_dl = self._enable_yt_dl_switch.get_active() self._ext_settings.enable_yt_dl_update = self._enable_update_yt_dl_switch.get_active()