From f35889e8e49d880a33e4fdcfd5ecde8c96f449d2 Mon Sep 17 00:00:00 2001 From: DYefremov Date: Sun, 31 Mar 2019 21:10:27 +0300 Subject: [PATCH] minor changes in the gui of the settings dialog --- app/ui/settings_dialog.glade | 325 ++++++++++++++++++----------------- app/ui/settings_dialog.py | 9 +- 2 files changed, 169 insertions(+), 165 deletions(-) diff --git a/app/ui/settings_dialog.glade b/app/ui/settings_dialog.glade index c7df7c47..1348691a 100644 --- a/app/ui/settings_dialog.glade +++ b/app/ui/settings_dialog.glade @@ -59,17 +59,15 @@ Author: Dmitriy Yefremov True False - Options - Profile: Enigma2 2 True - 48 True True True Ok + 10 True @@ -82,11 +80,11 @@ Author: Dmitriy Yefremov - 48 True True True Save + 10 @@ -100,6 +98,90 @@ Author: Dmitriy Yefremov 2 + + + True + False + 10 + 10 + 5 + 5 + vertical + 5 + + + True + False + Options + + + False + True + 0 + + + + + True + False + 10 + 10 + 5 + 5 + + + True + False + Active profile: + + + False + True + 0 + + + + + Enigma2 + True + True + False + center + True + neutrino_radio_button + + + + False + True + 1 + + + + + Neutrino-MP(experimental) + True + True + False + center + True + enigma_radio_button + + + False + True + 4 + + + + + False + True + 1 + + + + True @@ -108,8 +190,8 @@ Author: Dmitriy Yefremov Reset profile end 5 - 5 - 5 + 2 + 10 True @@ -966,74 +1048,6 @@ Author: Dmitriy Yefremov True False vertical - - - True - False - 5 - 5 - 5 - 5 - 0.019999999552965164 - in - - - True - False - 10 - 10 - 5 - 5 - True - - - Enigma2 - True - True - False - center - True - neutrino_radio_button - - - - False - True - 0 - - - - - Neutrino-MP(experimental) - True - True - False - center - True - enigma_radio_button - - - False - True - 4 - - - - - - - True - False - Active profile: - - - - - False - True - 0 - - True @@ -1113,14 +1127,13 @@ Author: Dmitriy Yefremov False True - 1 + 0 True False - 5 vertical @@ -1129,6 +1142,7 @@ Author: Dmitriy Yefremov False 5 5 + 5 5 0 in @@ -1333,99 +1347,96 @@ Author: Dmitriy Yefremov - + True False - 5 - 0.5 - in + start + Double click on the service in the bouquet list: + + + True + False + 1 + + + + + True + False + center + 5 + 5 - + + Zap True - False - center - 5 - 5 - - - Zap - True - False - True - False - Switch(zap) the channel on the receiver(Ctrl + Z). - True - True - click_mode_disabled_button - - - 0 - 0 - - - - - Play - True - False - True - False - Switch to the channel and watch in the program(Ctrl + W). - True - True - click_mode_stream_button - - - 1 - 0 - - - - - Play stream - True - True - False - Starts play IPTV or other stream in the program (Ctrl + P). - True - True - click_mode_play_button - - - 2 - 0 - - - - - Disabled - True - True - False - Disabled - True - True - click_mode_play_button - - - 3 - 0 - - + False + True + False + Switch(zap) the channel on the receiver(Ctrl + Z). + True + True + click_mode_disabled_button + + 0 + 0 + - - + + + Play True - False - Double click on the service in the bouquet list: + False + True + False + Switch to the channel and watch in the program(Ctrl + W). + True + True + click_mode_stream_button + + 1 + 0 + + + + + Play stream + True + True + False + Starts play IPTV or other stream in the program (Ctrl + P). + True + True + click_mode_play_button + + + 2 + 0 + + + + + Disabled + True + True + False + Disabled + True + True + click_mode_play_button + + + 3 + 0 + False True - 1 + 2 @@ -1448,7 +1459,7 @@ Author: Dmitriy Yefremov True True - 2 + 1 diff --git a/app/ui/settings_dialog.py b/app/ui/settings_dialog.py index 36b01384..56fe72ca 100644 --- a/app/ui/settings_dialog.py +++ b/app/ui/settings_dialog.py @@ -1,12 +1,10 @@ from enum import Enum -from gi.repository import Gdk - from app.commons import run_task, run_idle from app.connections import test_telnet, test_ftp, TestException, test_http from app.properties import write_config, Profile, get_default_settings from app.ui.dialogs import get_message -from .uicommons import Gtk, UI_RESOURCES_PATH, TEXT_DOMAIN, NEW_COLOR, EXTRA_COLOR, FavClickMode +from .uicommons import Gtk, Gdk, UI_RESOURCES_PATH, TEXT_DOMAIN, NEW_COLOR, EXTRA_COLOR, FavClickMode from .main_helper import update_entry_data @@ -95,7 +93,6 @@ class SettingsDialog: self._settings_stack.get_child_by_name(Property.HTTP.value).set_visible(is_enigma_profile) self._program_frame.set_sensitive(is_enigma_profile) self._extra_support_grid.set_sensitive(is_enigma_profile) - self.update_subtitle(profile) http_active = self._support_http_api_check_button.get_active() self._click_mode_zap_button.set_sensitive(is_enigma_profile and http_active) self._click_mode_play_button.set_sensitive(is_enigma_profile and http_active) @@ -117,10 +114,6 @@ class SettingsDialog: self.set_settings() self.init_ui_elements(profile) - def update_subtitle(self, profile): - sub = "{} Enigma2" if profile is Profile.ENIGMA_2 else "{} Neutrino-MP" - self._header_bar.set_subtitle(sub.format(get_message("Profile:"))) - def set_profile(self, profile): self._active_profile = profile.value self.set_settings()