From 3678a9d29d3d8bc0894b6762df92a1eecb9484a2 Mon Sep 17 00:00:00 2001 From: DYefremov Date: Fri, 10 May 2019 14:42:32 +0300 Subject: [PATCH] satellite dialogs refactoring --- app/ui/satellites_dialog.glade | 114 +++++++++++++-------------------- app/ui/satellites_dialog.py | 22 ++++--- 2 files changed, 55 insertions(+), 81 deletions(-) diff --git a/app/ui/satellites_dialog.glade b/app/ui/satellites_dialog.glade index 942774d4..bd2a6658 100644 --- a/app/ui/satellites_dialog.glade +++ b/app/ui/satellites_dialog.glade @@ -425,6 +425,7 @@ Author: Dmitriy Yefremov True False + Satellites edit tool 1 True @@ -506,13 +507,6 @@ Author: Dmitriy Yefremov - - - True - False - Satellites edit tool - - @@ -723,7 +717,8 @@ Author: Dmitriy Yefremov - 1 + {use_header} + Satellite False True center-on-parent @@ -732,41 +727,29 @@ Author: Dmitriy Yefremov True True center - - + + + gtk-cancel True - False - Satellite - 2 - - - gtk-cancel - True - True - True - True - True - - - - - gtk-ok - 90 - True - True - True - True - True - - - end - 1 - - + True + True + True + True + + + + + gtk-ok + 90 + True + True + True + True + True - + False vertical 2 @@ -792,7 +775,7 @@ Author: Dmitriy Yefremov 0.019999999552965164 in - + True False 5 @@ -914,7 +897,8 @@ Author: Dmitriy Yefremov - 1 + {use_header} + Transponder 320 False False @@ -926,37 +910,25 @@ Author: Dmitriy Yefremov True True center - - + + + gtk-cancel True - False - Transponder - 2 - - - gtk-cancel - True - True - True - True - True - - - - - gtk-ok - 90 - True - True - True - True - True - - - end - 1 - - + True + True + True + True + + + + + gtk-ok + 90 + True + True + True + True + True diff --git a/app/ui/satellites_dialog.py b/app/ui/satellites_dialog.py index 917a6442..9ff01f9f 100644 --- a/app/ui/satellites_dialog.py +++ b/app/ui/satellites_dialog.py @@ -8,10 +8,12 @@ from app.eparser import get_satellites, write_satellites, Satellite, Transponder from app.eparser.ecommons import PLS_MODE, get_key_by_value from app.tools.satellites import SatellitesParser, SatelliteSource from .search import SearchProvider -from .uicommons import Gtk, Gdk, UI_RESOURCES_PATH, TEXT_DOMAIN, MOVE_KEYS, KeyboardKey -from .dialogs import show_dialog, DialogType, WaitDialog +from .uicommons import Gtk, Gdk, UI_RESOURCES_PATH, TEXT_DOMAIN, MOVE_KEYS, KeyboardKey, IS_GNOME_SESSION +from .dialogs import show_dialog, DialogType, WaitDialog, get_dialogs_string from .main_helper import move_items, scroll_to, append_text_to_tview, get_base_model, on_popup_menu +_UI_PATH = UI_RESOURCES_PATH + "satellites_dialog.glade" + def show_satellites_dialog(transient, options): SatellitesDialog(transient, options).show() @@ -42,9 +44,9 @@ class SatellitesDialog: builder = Gtk.Builder() builder.set_translation_domain(TEXT_DOMAIN) - builder.add_objects_from_file(UI_RESOURCES_PATH + "satellites_dialog.glade", - ("satellites_editor_window", "satellites_tree_store", "popup_menu", - "left_header_menu", "popup_menu_add_image", "popup_menu_add_image_2")) + builder.add_objects_from_string(get_dialogs_string(_UI_PATH), + ("satellites_editor_window", "satellites_tree_store", "popup_menu", + "left_header_menu", "popup_menu_add_image", "popup_menu_add_image_2")) builder.connect_signals(handlers) self._window = builder.get_object("satellites_editor_window") @@ -316,9 +318,9 @@ class TransponderDialog: builder = Gtk.Builder() builder.set_translation_domain(TEXT_DOMAIN) - builder.add_objects_from_file(UI_RESOURCES_PATH + "satellites_dialog.glade", - ("transponder_dialog", "pol_store", "fec_store", "mod_store", "system_store", - "pls_mode_store")) + builder.add_objects_from_string(get_dialogs_string(_UI_PATH).format(use_header=IS_GNOME_SESSION), + ("transponder_dialog", "pol_store", "fec_store", "mod_store", "system_store", + "pls_mode_store")) builder.connect_signals(handlers) self._dialog = builder.get_object("transponder_dialog") @@ -400,8 +402,8 @@ class SatelliteDialog: def __init__(self, transient, satellite: Satellite = None): builder = Gtk.Builder() builder.set_translation_domain(TEXT_DOMAIN) - builder.add_objects_from_file(UI_RESOURCES_PATH + "satellites_dialog.glade", - ("satellite_dialog", "side_store", "pos_adjustment")) + builder.add_objects_from_string(get_dialogs_string(_UI_PATH).format(use_header=IS_GNOME_SESSION), + ("satellite_dialog", "side_store", "pos_adjustment")) self._dialog = builder.get_object("satellite_dialog") self._dialog.set_transient_for(transient)