diff --git a/app/ui/backup_dialog.glade b/app/ui/backup_dialog.glade index 3102e3a3..abe0654f 100644 --- a/app/ui/backup_dialog.glade +++ b/app/ui/backup_dialog.glade @@ -33,6 +33,12 @@ Author: Dmitriy Yefremov + + True + False + emblem-important-symbolic + 1 + @@ -41,133 +47,89 @@ Author: Dmitriy Yefremov + + True + False + + + Restore bouquets + True + False + False + + + + + + + Restore all + True + False + False + + + + + + + True + False + + + + + gtk-remove + True + False + True + True + + + + + + + True + False + user-trash-symbolic + 1 + + + True + False + edit-select-all-symbolic + 1 + + + True + False + document-revert-symbolic + 1 + 560 320 False + Backups True center-on-parent True document-revert center - - - True - False - Backups - 2 - True - - - True - False - 2 - - - True - True - True - Restore bouquets - - - - True - False - document-revert - - - - - False - True - 0 - - - - - True - True - True - Restore all - - - - True - False - edit-select-all - - - - - False - True - 1 - - - - - True - False - - - False - True - 2 - - - - - True - True - True - Remove - - - - True - False - user-trash - - - - - False - True - 3 - - - - - - - True - True - False - Details - False - - - - True - False - gtk-dialog-info - - - - - - end - 1 - - - + + True False + 1 + 1 + 1 + 1 vertical + 5 True @@ -251,6 +213,106 @@ Author: Dmitriy Yefremov 0 + + + True + False + 15 + 15 + + + True + False + center + 10 + 10 + expand + + + Restore bouquets + True + True + True + center + restore_bouquets_image + True + + + + False + True + 0 + + + + + Restore all + True + True + True + center + restore_all_image + True + + + + False + True + 1 + + + + + Remove + True + True + True + center + remove_image + True + + + + + False + True + 3 + + + + + False + True + 0 + + + + + Details + True + True + False + center + details_image + True + False + + + + + False + True + end + 1 + + + + + False + True + 1 + + False @@ -301,57 +363,4 @@ Author: Dmitriy Yefremov - - True - False - gtk-revert-to-saved - - - True - False - gtk-select-all - - - True - False - - - Restore bouquets - True - False - restore_popup_menu_item_image - False - - - - - - - Restore all - True - False - restore_popup_menu_item_image2 - False - - - - - - - True - False - - - - - gtk-remove - True - False - True - True - - - - - diff --git a/app/ui/default_style.css b/app/ui/default_style.css index 13634b7f..ccb25934 100644 --- a/app/ui/default_style.css +++ b/app/ui/default_style.css @@ -1,78 +1,34 @@ * { - -GtkDialog-action-area-border: 5; + -GtkDialog-action-area-border: 5em; } entry { - min-height: 24px; + min-height: 2em; } button { - min-height: 20px; - padding-top: 1px; - padding-bottom: 1px; -} - -button.image-button { - min-height: 24px; - padding-left: 2px; - padding-right: 2px; -} - -button.text-button.image-button { - min-height: 24px; - padding-left: 2px; - padding-right: 2px; + min-height: 1.5em; + padding: 0.1em; } spinbutton { - min-height: 20px; + min-height: 1.5em; } toolbutton { - padding: 2px; + padding: 0.1em; } spinner { - padding-left: 10px; - padding-right: 10px; -} - -headerbar { - min-height: 34px; - padding-top: 1px; - padding-left: 5px; - padding-right: 5px; - padding-bottom: 1px; -} - -headerbar button { - min-height: 24px; - min-width: 24px; - padding-left: 2px; - padding-right: 2px; -} - -box button { - padding-left: 4px; - padding-right: 4px; + padding-left: 1em; + padding-right: 1em; } infobar { - min-height: 24px; -} - -infobar button { - min-height: 16px; - min-width: 16px; - padding-left: 2px; - padding-right: 2px; -} - -switch { - border-radius: 50px; + min-height: 2em; } switch slider { - min-height: 18px; - min-width: 18px; -} + min-height: 1.5em; + min-width: 1.5em; +} \ No newline at end of file diff --git a/app/ui/dialogs.glade b/app/ui/dialogs.glade index f7a9da7a..1b1f3674 100644 --- a/app/ui/dialogs.glade +++ b/app/ui/dialogs.glade @@ -98,7 +98,6 @@ Author: Dmitriy Yefremov True True True - True @@ -108,7 +107,6 @@ Author: Dmitriy Yefremov True True True - True diff --git a/app/ui/download_dialog.glade b/app/ui/download_dialog.glade index bd551a36..4eeac4ed 100755 --- a/app/ui/download_dialog.glade +++ b/app/ui/download_dialog.glade @@ -33,6 +33,18 @@ Author: Dmitriy Yefremov + + True + False + network-receive-symbolic + 1 + + + True + False + network-transmit-symbolic + 1 + 500 False @@ -601,6 +613,8 @@ Author: Dmitriy Yefremov True Receive center + download_image + True @@ -617,6 +631,8 @@ Author: Dmitriy Yefremov True Send center + send_image + True diff --git a/app/ui/epg_dialog.glade b/app/ui/epg_dialog.glade index f8ca713c..8e33f134 100644 --- a/app/ui/epg_dialog.glade +++ b/app/ui/epg_dialog.glade @@ -33,6 +33,18 @@ Author: Dmitriy Yefremov + + True + False + checkmark + 1 + + + True + False + edit-select-all-symbolic + 1 + @@ -75,10 +87,16 @@ Author: Dmitriy Yefremov copy_image False - + + + True + False + edit-find-replace-symbolic + 1 + True False @@ -100,7 +118,7 @@ Author: Dmitriy Yefremov insert_link_image False - + @@ -130,6 +148,12 @@ Author: Dmitriy Yefremov + + True + False + document-save-as-symbolic + 1 + @@ -559,58 +583,104 @@ Author: Dmitriy Yefremov + + True + False + emblem-synchronizing-symbolic + 1 + 480 320 False + EPG True center-on-parent 480 - 240 + 320 True - gtk-index + True True center - - + + + + + True False - EPG - List configuration - 2 - True + 1 + 1 + 1 + vertical - + True False - 2 + 15 + 15 + 10 + 10 + 10 - - True - True - True - Apply - - - - True - False - gtk-apply - - - - - False - True - 0 - - - - + True False + expand + + + Apply + True + True + True + Apply + apply_image + True + + + + False + True + 0 + + + + + Update + True + True + True + Update + update_image + True + + + + False + True + 1 + + + + + Filter + True + True + True + Filter + filter_image + True + + + + + False + True + 2 + + False @@ -618,20 +688,11 @@ Author: Dmitriy Yefremov 1 - - + + True - True - True - Update - - - - True - False - gtk-refresh - - + False + List configuration False @@ -640,111 +701,106 @@ Author: Dmitriy Yefremov - + True - True - True - Filter - + False + expand - + + Auto True - False - gtk-spell-check + True + True + Auto configuration by service names. + auto_config_image + True + + + False + True + 0 + - - - - False - True - 3 - - - - - - - True - False - 2 - - - True - True - True - Auto configuration by service names. - - + + Save True - False - gtk-find-and-replace + True + True + Save list to xml. + save_to_xml_image + True + + + False + True + 1 + + + + + True + True + True + none + options_popover + + + True + False + 2 + + + True + False + Options + applications-system-symbolic + 1 + + + False + True + 0 + + + + + True + False + Options + + + False + True + 1 + + + + + + + False + True + 2 + False True + end 0 - - - True - True - True - Save list to xml. - - - - True - False - gtk-save-as - - - - - False - True - 1 - - - - - True - True - True - none - options_popover - - - True - False - Options - gtk-properties - - - - - False - True - 3 - - - end - 1 + False + True + 0 - - - - - True - False - vertical True @@ -753,7 +809,7 @@ Author: Dmitriy Yefremov True True - tools-check-spelling + edit-find-replace-symbolic False False @@ -862,13 +918,14 @@ Author: Dmitriy Yefremov 24 True False - 2 + 5 2 True False - gtk-properties + document-properties-symbolic + 1 False @@ -890,6 +947,7 @@ Author: Dmitriy Yefremov + 26 True False center @@ -1143,16 +1201,17 @@ Author: Dmitriy Yefremov - 24 + 26 True False - 2 + 5 2 True False - gtk-properties + document-properties-symbolic + 1 False @@ -1189,7 +1248,9 @@ Author: Dmitriy Yefremov True False + 2 gtk-index + 1 False diff --git a/app/ui/import_dialog.glade b/app/ui/import_dialog.glade index ca770aa1..e316bc1e 100644 --- a/app/ui/import_dialog.glade +++ b/app/ui/import_dialog.glade @@ -26,13 +26,25 @@ THE SOFTWARE. Author: Dmitriy Yefremov --> - + + - + + + True + False + emblem-important-symbolic + + + True + False + document-revert-symbolic-rtl + 1 + @@ -82,6 +94,7 @@ Author: Dmitriy Yefremov False + Import True center-on-parent 480 @@ -90,53 +103,8 @@ Author: Dmitriy Yefremov dialog center - - - True - False - Import - Bouquets and services - 2 - True - - - True - True - True - Import - - - - True - False - gtk-revert-to-saved - - - - - - - True - True - False - Details - False - - - - True - False - gtk-dialog-info - - - - - - end - 1 - - - + + @@ -337,6 +305,60 @@ Author: Dmitriy Yefremov 0 + + + True + False + center + 15 + 15 + 10 + 10 + start + + + Import + True + True + True + Bouquets and services + import_image + True + + + + True + True + 0 + + + + + Details + True + True + False + Details + details_image + True + False + + + + + True + True + 1 + True + + + + + False + True + 1 + + False @@ -382,7 +404,7 @@ Author: Dmitriy Yefremov False True - 1 + 2 diff --git a/app/ui/iptv.glade b/app/ui/iptv.glade index 574f3584..fb35ab75 100644 --- a/app/ui/iptv.glade +++ b/app/ui/iptv.glade @@ -33,6 +33,35 @@ Author: Dmitriy Yefremov + + True + False + edit-undo + + + True + False + + + gtk-select-all + True + False + True + True + + + + + + Remove selection + True + False + remove_selection_image + False + + + + 1 320 @@ -243,7 +272,6 @@ Author: Dmitriy Yefremov True True True - True @@ -252,7 +280,6 @@ Author: Dmitriy Yefremov True True True - True @@ -263,7 +290,6 @@ Author: Dmitriy Yefremov True True True - True @@ -739,7 +765,6 @@ Author: Dmitriy Yefremov True True True - True @@ -749,7 +774,6 @@ Author: Dmitriy Yefremov True True True - True @@ -1221,35 +1245,6 @@ Author: Dmitriy Yefremov close_config_list_button - - True - False - edit-undo - - - True - False - - - gtk-select-all - True - False - True - True - - - - - - Remove selection - True - False - remove_selection_image - False - - - - @@ -1279,9 +1274,21 @@ Author: Dmitriy Yefremov + + True + False + network-receive-symbolic + 1 + + + True + False + document-revert-symbolic-rtl + 480 False + YouTube False True center-on-parent @@ -1290,82 +1297,110 @@ Author: Dmitriy Yefremov True True center - - - True - True - YouTube - Playlist import - 2 - True - - - True - False - True - True - Receive - - - - True - False - gtk-goto-bottom - - - - - - 1 - - - - - False - True - True - Import - - - - True - False - insert-link - - - - - - end - 1 - - - - - False - Desired video quality - yt_quality_liststore - 0 - 0 - - - - 0 - - - - - end - 2 - - - - True False vertical + + + True + False + 15 + 15 + 5 + 5 + + + Receive + True + False + True + True + Receive + center + yt_receive_image + True + + + + + False + True + 0 + + + + + True + False + Playlist import + + + False + True + 2 + + + + + True + False + expand + + + False + Desired video quality + center + yt_quality_liststore + 0 + 0 + + + + 0 + + + + + True + True + 2 + + + + + Import + True + True + Import + center + yt_import_image + True + + + + + True + True + 2 + + + + + False + True + end + 1 + + + + + False + True + 0 + + True @@ -1380,8 +1415,9 @@ Author: Dmitriy Yefremov + False True - 0 + 1 @@ -1478,7 +1514,7 @@ Author: Dmitriy Yefremov - 24 + 26 False 5 10 @@ -1492,7 +1528,8 @@ Author: Dmitriy Yefremov True False - gtk-properties + 5 + document-properties-symbolic False diff --git a/app/ui/iptv.py b/app/ui/iptv.py index d290be52..ad64688f 100644 --- a/app/ui/iptv.py +++ b/app/ui/iptv.py @@ -557,7 +557,8 @@ class YtListImportDialog: builder.set_translation_domain(TEXT_DOMAIN) builder.add_objects_from_string(get_dialogs_string(_UI_PATH).format(use_header=IS_GNOME_SESSION), ("yt_import_dialog_window", "yt_liststore", "yt_quality_liststore", - "yt_popup_menu", "remove_selection_image")) + "yt_popup_menu", "remove_selection_image", "yt_receive_image", + "yt_import_image")) builder.connect_signals(handlers) self._dialog = builder.get_object("yt_import_dialog_window") diff --git a/app/ui/main_app_window.py b/app/ui/main_app_window.py index 4a270419..54942a1a 100644 --- a/app/ui/main_app_window.py +++ b/app/ui/main_app_window.py @@ -16,7 +16,7 @@ from app.eparser.ecommons import CAS, Flag, BouquetService from app.eparser.enigma.bouquets import BqServiceType from app.eparser.iptv import export_to_m3u from app.eparser.neutrino.bouquets import BqType -from app.settings import SettingsType, Settings, SettingsException, PlayStreamsMode, IS_DARWIN +from app.settings import SettingsType, Settings, SettingsException, PlayStreamsMode from app.tools.media import Player, Recorder, HttpPlayer from app.ui.epg_dialog import EpgDialog from app.ui.transmitter import LinksTransmitter @@ -216,8 +216,8 @@ class Application(Gtk.Application): self._app_info_box = builder.get_object("app_info_box") self._app_info_box.bind_property("visible", self._status_bar_box, "visible", 4) self._app_info_box.bind_property("visible", builder.get_object("main_paned"), "visible", 4) - self._app_info_box.bind_property("visible", builder.get_object("toolbar_extra_item"), "visible", 4) - self._app_info_box.bind_property("visible", builder.get_object("toolbar_tools_item"), "visible", 4) + self._app_info_box.bind_property("visible", builder.get_object("toolbar_extra_box"), "visible", 4) + self._app_info_box.bind_property("visible", builder.get_object("toolbar_tools_box"), "visible", 4) self._app_info_box.bind_property("visible", builder.get_object("save_tool_button"), "visible", 4) # Status bar self._profile_combo_box = builder.get_object("profile_combo_box") diff --git a/app/ui/main_window.glade b/app/ui/main_window.glade index 2d0ace7c..2dde666c 100644 --- a/app/ui/main_window.glade +++ b/app/ui/main_window.glade @@ -28,12 +28,121 @@ Author: Dmitriy Yefremov --> - - - + + + + True + False + 5 + bookmark-new-symbolic + 1 + + + True + False + 5 + document-revert-symbolic + 1 + + + True + False + + + True + False + False + New + True + + + + + + True + False + False + Import + + + + + + True + False + + + + + True + False + False + Cut + True + + + + + + + True + False + False + Copy + True + + + + + + + True + False + False + Paste + True + + + + + + + True + False + + + + + True + False + False + Edit + True + + + + + + + True + False + + + + + True + False + False + Remove + True + + + + + @@ -48,61 +157,6 @@ Author: Dmitriy Yefremov - - True - False - gtk-clear - - - True - False - gtk-clear - - - True - False - gtk-copy - - - True - False - gtk-copy - - - True - False - insert-link - - - True - False - gtk-edit - - - True - False - gtk-revert-to-saved - - - True - False - gtk-index - - - True - False - gtk-save-as - - - True - False - gtk-edit - - - True - False - gtk-properties - @@ -131,6 +185,316 @@ Author: Dmitriy Yefremov + + True + False + + + True + False + False + Cut + True + + + + + + + True + False + False + Copy + True + + + + + + + True + False + False + Paste + True + + + + + + + True + False + + + + + True + False + Edit + True + + + + + + + True + False + Extra: + + + True + False + + + True + False + Rename for this bouquet + + + + + + True + False + Set default name + + + + + + + + + + True + False + + + + + True + False + False + Locate in services + + + + + + True + False + + + + + True + False + False + Insert marker + True + + + + + + True + False + + + + + True + False + False + IPTV + + + True + False + + + True + False + Play + True + + + + + + True + False + + + + + True + False + Add IPTV or stream service + + + + + + True + False + Import YouTube playlist + + + + + + True + False + Import m3u + True + + + + + + True + False + Export to m3u + + + + + + True + False + + + + + True + False + EPG configuration + + + + + + True + False + + + + + True + False + List configuration + + + + + + True + False + + + + + True + False + Remove all unavailable + + + + + + + + + + True + False + + + + + True + False + False + Picon + + + True + False + + + True + False + Assign + + + + + + True + False + Remove + + + + + + True + False + + + + + True + False + Copy reference + + + + + + True + False + + + + + True + False + Remove all unused + + + + + + + + + + True + False + + + + + True + False + False + Remove + True + + + + + + + True + False + edit-find-replace-symbolic + 1 + @@ -174,444 +538,57 @@ Author: Dmitriy Yefremov True False - gtk-find + edit-find-symbolic + 1 - + True False - gtk-file + network-transmit-receive-symbolic + 1 - + True False - - - gtk-new - True - False - False - True - True - - - - - - Import - True - False - False - import_bouquet_image - False - - - - - - True - False - - - - - gtk-cut - True - False - False - True - True - - - - - - - gtk-copy - True - False - False - True - True - - - - - - - gtk-paste - True - False - False - True - True - - - - - - - True - False - - - - - gtk-edit - True - False - False - True - True - - - - - - - True - False - - - - - gtk-remove - True - False - False - True - True - - - - + object-rotate-left-symbolic + 1 - + True False - insert-image + changes-prevent-symbolic + 1 - + True False - insert-image + 5 + folder-open-symbolic + 1 - + True False - insert-link - - - True - False - insert-link - - - True - False - insert-text - - - True - False - network-transmit-receive - - - True - False - network-transmit-receive - - - True - False - gtk-new + insert-image-symbolic + 1 100 1 10 - + True False - gtk-remove + document-edit-symbolic + 1 - + True False - gtk-remove - - - True - False - gtk-remove - - - True - False - gtk-save-as - - - True - False - gtk-save-as - - - True - False - gtk-save-as - - - True - False - gtk-select-all - - - True - False - gtk-select-all - - - True - False - gtk-select-all - - - True - False - - - gtk-goto-last - True - False - True - True - - - - - - gtk-goto-first - True - False - True - True - - - - - - True - False - - - - - Create bouquet - True - False - new_image - False - - - True - False - - - For current satellite - True - False - save_as_image_2 - False - - - - - - For current package - True - False - save_as_image - False - - - - - - For current type - True - False - save_as_image_3 - False - - - - - - True - False - - - - - For each satellite - True - False - select_all_image - False - - - - - - For each package - True - False - select_all_image_2 - False - - - - - - For each type - True - False - select_all_image_3 - False - - - - - - - - - - True - False - - - - - gtk-copy - True - False - True - True - - - - - - - gtk-edit - True - False - True - True - - - - - - - gtk-new - False - True - True - - - - - - True - False - - - - - Picon - True - False - insert_image_2 - False - - - True - False - - - Assign - True - False - insert_link_image - False - - - - - - Remove - True - False - clear_image - False - - - - - - True - False - - - - - Copy reference - True - False - copy_image - False - - - - - - True - False - - - - - Remove all unused - True - False - remove_all_image_2 - False - - - - - - - - - - True - False - - - - - gtk-remove - True - False - True - True - - - - + 5 + document-save-symbolic + 1 @@ -668,8 +645,294 @@ Author: Dmitriy Yefremov services_model_filter + + True + False + + + True + False + To the top + True + + + + + + True + False + To the end + True + + + + + + True + False + + + + + True + False + Create bouquet + + + True + False + + + True + False + For current satellite + + + + + + True + False + For current package + + + + + + True + False + For current type + + + + + + True + False + + + + + True + False + For each satellite + + + + + + True + False + For each package + + + + + + True + False + For each type + + + + + + + + + + True + False + + + + + True + False + Copy + True + + + + + + + True + False + Edit + True + + + + + + + False + New + True + + + + + + True + False + + + + + True + False + Picon + + + True + False + + + True + False + Assign + + + + + + True + False + Remove + + + + + + True + False + + + + + True + False + Copy reference + + + + + + True + False + + + + + True + False + Remove all unused + + + + + + + + + + True + False + + + + + True + False + Remove + True + + + + + + + True + False + + + True + False + Add IPTV or stream service + + + + + + True + False + Import YouTube playlist + + + + + + True + False + Import m3u + + + + + + True + False + Export to m3u + + + + + + True + False + + + + + True + False + EPG configuration + + + + + + True + False + + + + + True + False + List configuration + + + + + + True + False + + + + + True + False + Remove all unavailable + + + + - 640 + 720 480 False center @@ -688,315 +951,326 @@ Author: Dmitriy Yefremov False vertical - + True False center center - 5 - 5 + 15 + 15 + 10 + 10 + 10 - + True False - 10 - - - True - False - 2 - - - True - False - Open - app.on_data_open - Open - True - gtk-open - - - False - True - 0 - - - - - True - False - False - Profile - 2 - 2 - 0 - - - - False - True - 1 - - - - - True - False - FTP-transfer - app.on_download - FTP-transfer - True - gtk-connect - - - False - True - 2 - - - - - False - Save - app.on_data_save - Save - True - gtk-save - - - False - True - 3 - - - - - True - False - app.on_backup_tool_show - Backup - True - gtk-revert-to-saved - - - False - True - 4 - - - - + False + Profile + center + 0 + False - False + True + 0 - + + True False - 15 - 15 + center + center + expand - + + FTP True False - 2 - - - True - False - Search - win.search - Search - True - gtk-find - - - False - True - 2 - - - - - True - False - Filter - 5 - win.filter - Filter - True - gtk-spell-check - - - False - True - 3 - - - - - True - False - Parent lock On/Off Ctrl + L - 5 - app.on_locked - Parent lock - True - gtk-dialog-authentication - - - False - True - 5 - - - - - True - False - Hide/Skip On/Off Ctrl + H - app.on_hide - Hide/Skip - True - gtk-jump-to - - - False - True - 6 - - + True + FTP-transfer + center + app.on_download + ftp_image + True + + True + True + 0 + + + + + + True + False + True + Open + center + app.on_data_open + open_image + True + + + True + True + 1 + + + + + + False + True + Save + center + app.on_data_save + save_image + True + + + True + True + 2 + + + + + + True + False + True + Backups + center + app.on_backup_tool_show + backups_image + True + + + True + True + 3 + False - False + True + 1 - + False - 10 - 10 + center + center + expand - + + Search + True + True + True + Search + center + win.search + find_image + True + + + True + True + 0 + + + + + Filter True False - 2 - - - True - False - Satellites editor - app.on_satellite_editor_show - Satellites - True - gtk-edit - - - False - True - 0 - - - - - True - False - Picons downloader - 5 - app.on_picons_manager_show - Picons - True - insert-image - - - False - True - 1 - - - - - True - False - Import m3u file - 5 - app.on_import_m3u - Import m3u - True - insert-link - - - False - True - 2 - - - - - True - False - Export to m3u - app.on_export_to_m3u - Export to m3u - True - gtk-save-as - - - False - True - 3 - - - - - True - False - EPG configuration - app.on_epg_list_configuration - EPG configuration - True - gtk-index - - - False - True - 4 - - - - - True - False - Create bouquet - Create bouquet - True - gtk-new - - - - False - True - 5 - - + True + Filter + center + win.filter + filter_image + True + + True + True + 4 + + + + + Lock + True + False + True + Parent lock + center + app.on_locked + lock_image + True + + + True + True + 5 + + + + + Hide + True + False + True + Hide/Skip + center + app.on_hide + hide_image + True + + + True + True + 5 + False - True + True + 2 + + + + + False + center + center + expand + + + Satellites + True + False + True + Satellites editor + center + app.on_satellite_editor_show + sat_editor_image + True + + + True + True + 0 + + + + + Picons + True + False + True + Picons manager + center + app.on_picons_manager_show + picons_image + True + + + True + True + 1 + + + + + True + False + True + IPTV tools + center + toolbar_iptv_menu + + + True + False + center + 2 + + + True + False + center + center + network-wired-symbolic + 1 + + + False + True + 0 + + + + + True + False + IPTV + + + False + True + 1 + + + + + + + True + True + 5 + + + + + + True + False + True + Create bouquet + start + start + add_bouquet_image + True + + + + False + True + 5 + True + + + + + False + True + 3 False False - 0 + 1 @@ -1212,7 +1486,7 @@ Author: Dmitriy Yefremov True True - gtk-find + edit-find-symbolic False False @@ -1307,7 +1581,7 @@ Author: Dmitriy Yefremov True True - gtk-spell-check + edit-find-replace-symbolic False False @@ -1788,7 +2062,8 @@ Author: Dmitriy Yefremov True False 5 - emblem-readonly + dialog-password-symbolic + 1 False @@ -1856,6 +2131,7 @@ Author: Dmitriy Yefremov True False network-wireless-symbolic + 1 False @@ -1882,6 +2158,7 @@ Author: Dmitriy Yefremov True False system-run + 1 False @@ -2141,7 +2418,8 @@ Author: Dmitriy Yefremov True False - document-properties + document-properties-symbolic + 1 False @@ -2326,7 +2604,8 @@ Author: Dmitriy Yefremov True False - document-properties + document-properties-symbolic + 1 False @@ -2661,356 +2940,4 @@ Author: Dmitriy Yefremov - - True - False - gtk-connect - - - True - False - - - gtk-cut - True - False - False - True - True - - - - - - - gtk-copy - True - False - False - True - True - - - - - - - gtk-paste - True - False - False - True - True - - - - - - - True - False - - - - - gtk-edit - True - False - True - True - - - - - - - Extra: - True - False - extra_edit_image - False - True - - - True - False - - - Rename for this bouquet - True - False - edit_image_1 - False - - - - - - Set default name - True - False - edit_image_2 - False - - - - - - - - - - True - False - - - - - Locate in services - True - False - False - find_image - False - - - - - - True - False - - - - - Insert marker - True - False - False - True - insert_text_image - False - - - - - - True - False - - - - - IPTV - True - False - False - networktransmit_receive_image - False - - - True - False - - - gtk-media-play - True - False - True - True - - - - - - True - False - - - - - Add IPTV or stream service - True - False - network_transmit_receive_image - False - - - - - - Import YouTube playlist - True - False - yt_image - False - - - - - - Import m3u - True - False - True - downloads_image - False - - - - - - Export to m3u - True - False - export_to_m3u_image - False - - - - - - True - False - - - - - EPG configuration - True - False - epg_configuration_image - False - - - - - - True - False - - - - - List configuration - True - False - fav_iptv_list_config_image - False - - - - - - True - False - - - - - Remove all unavailable - True - False - remova_image - False - - - - - - - - - - True - False - - - - - Picon - True - False - False - insert_image - False - - - True - False - - - Assign - True - False - insert_link_image_2 - False - - - - - - Remove - True - False - clear_image_2 - False - - - - - - True - False - - - - - Copy reference - True - False - copy_image_2 - False - - - - - - True - False - - - - - Remove all unused - True - False - remove_all_image - False - - - - - - - - - - True - False - - - - - gtk-remove - True - False - False - True - True - - - - - diff --git a/app/ui/picons_manager.glade b/app/ui/picons_manager.glade index aa946e4d..cb196d63 100644 --- a/app/ui/picons_manager.glade +++ b/app/ui/picons_manager.glade @@ -28,11 +28,33 @@ Author: Dmitriy Yefremov --> - + + True + False + cancel + + + True + False + edit-redo-symbolic + 1 + + + True + False + edit-find-replace-symbolic + 1 + + + True + False + network-server-symbolic + 1 + @@ -67,10 +89,28 @@ Author: Dmitriy Yefremov + + True + False + network-receive-symbolic + 1 + + + True + False + network-receive-symbolic + 1 + + + True + False + user-trash-symbolic + True False edit-undo + 1 True @@ -106,212 +146,23 @@ Author: Dmitriy Yefremov + + True + False + network-transmit-symbolic + 1 + False + Picons manager center-on-parent True True True center - - - True - False - Picons manager - 2 - True - - - True - True - Cancel - True - - - - True - False - gtk-cancel - - - - - - - - True - False - 2 - - - False - True - False - Load providers - center - True - - - - True - False - network-server-symbolic - - - - - False - True - 0 - - - - - False - True - False - Receive picons - center - True - - - - True - False - gtk-goto-bottom - - - - - False - True - 1 - - - - - False - - - False - True - 2 - - - - - True - True - True - Transfer to receiver - True - - - - True - False - gtk-goto-top - - - - - False - True - 4 - - - - - True - True - True - Download from the receiver - - - - True - False - gtk-go-down - - - - - False - True - 5 - - - - - True - True - True - Remove all picons from the receiver - - - - True - False - gtk-delete - - - - - False - True - 6 - - - - - 6 - - - - - True - False - Convert - center - True - - - - True - False - gtk-execute - - - - - end - 3 - - - - - True - True - True - Filter - - - - True - False - Filter - gtk-select-all - - - - - - end - 3 - - - + + @@ -332,7 +183,6 @@ Author: Dmitriy Yefremov 5 5 10 - 5 @@ -350,49 +200,6 @@ Author: Dmitriy Yefremov 5 vertical 5 - - - False - 1 - 1 - - - True - True - edit-find-symbolic - False - False - - - - - False - True - 0 - - - - - False - 1 - 1 - - - True - True - gtk-spell-check - False - False - - - - - - False - True - 1 - - True @@ -405,7 +212,7 @@ Author: Dmitriy Yefremov False True - 2 + 0 @@ -449,6 +256,49 @@ Author: Dmitriy Yefremov True True + 1 + + + + + False + 1 + 1 + + + True + True + edit-find-symbolic + False + False + + + + + False + True + 2 + + + + + False + 1 + 1 + + + True + True + edit-find-replace-symbolic + False + False + + + + + + False + True 3 @@ -1187,6 +1037,188 @@ Author: Dmitriy Yefremov 0 + + + True + False + center + center + 15 + 15 + 10 + 10 + + + True + False + expand + + + Send + True + True + True + Transfer to receiver + send_image + True + + + + False + True + 0 + + + + + Receive + True + True + True + Download from the receiver + receive_image + True + + + + False + True + 1 + + + + + Filter + True + True + True + Filter + filter_image + True + + + + + False + True + 2 + + + + + Remove + True + True + True + Remove all picons from the receiver + remove_image + True + + + + False + True + 3 + + + + + False + True + 0 + + + + + False + expand + + + Cancel + True + True + Cancel + center + cancel_image + True + + + + + False + True + 0 + + + + + Load providers + True + False + True + False + Load providers + center + load_providers + True + + + + False + True + 1 + + + + + Receive picons + True + False + True + False + Receive picons + center + receive_picons_image + True + + + + False + True + 2 + + + + + False + True + 1 + + + + + Convert + True + False + Convert + center + convert_image + True + + + + False + True + 2 + + + + + False + True + 1 + + True @@ -1221,7 +1253,7 @@ Author: Dmitriy Yefremov False True - 1 + 3 @@ -1278,7 +1310,7 @@ Author: Dmitriy Yefremov False True - 2 + 4 diff --git a/app/ui/picons_manager.py b/app/ui/picons_manager.py index 6c7377e9..b88844f1 100644 --- a/app/ui/picons_manager.py +++ b/app/ui/picons_manager.py @@ -93,13 +93,15 @@ class PiconsDialog: self._resize_220_132_radio_button = builder.get_object("resize_220_132_radio_button") self._resize_100_60_radio_button = builder.get_object("resize_100_60_radio_button") self._satellite_label = builder.get_object("satellite_label") - self._header_download_box = builder.get_object("header_download_box") + self._explorer_action_box = builder.get_object("explorer_action_box") self._satellite_label.bind_property("visible", builder.get_object("loading_data_label"), "visible", 4) self._satellite_label.bind_property("visible", builder.get_object("loading_data_spinner"), "visible", 4) - self._cancel_button.bind_property("visible", self._header_download_box, "visible", 4) - self._convert_button.bind_property("visible", self._header_download_box, "visible", 4) - self._load_providers_button.bind_property("visible", self._receive_button, "visible") - self._load_providers_button.bind_property("visible", builder.get_object("download_box_separator"), "visible") + self._cancel_button.bind_property("visible", builder.get_object("receive_button"), "visible", 4) + self._cancel_button.bind_property("visible", self._load_providers_button, "visible", 4) + self._convert_button.bind_property("visible", self._explorer_action_box, "visible", 4) + downloader_action_box = builder.get_object("downloader_action_box") + self._explorer_action_box.bind_property("visible", downloader_action_box, "visible", 4) + self._convert_button.bind_property("visible", downloader_action_box, "visible", 4) self._filter_bar.bind_property("search-mode-enabled", self._filter_bar, "visible") self._explorer_path_button.bind_property("sensitive", builder.get_object("picons_view_sw"), "sensitive") # Init drag-and-drop @@ -438,12 +440,12 @@ class PiconsDialog: def run_func(self, func, update=False): try: GLib.idle_add(self._expander.set_expanded, True) - GLib.idle_add(self._header_download_box.set_sensitive, False) + GLib.idle_add(self._explorer_action_box.set_sensitive, False) func() except OSError as e: self.show_info_message(str(e), Gtk.MessageType.ERROR) finally: - GLib.idle_add(self._header_download_box.set_sensitive, True) + GLib.idle_add(self._explorer_action_box.set_sensitive, True) if update: self.on_picons_folder_changed(self._explorer_path_button) @@ -505,9 +507,8 @@ class PiconsDialog: def on_visible_page(self, stack: Gtk.Stack, param): name = stack.get_visible_child_name() self._convert_button.set_visible(name == "converter") - self._load_providers_button.set_visible(name == "downloader") is_explorer = name == "explorer" - self._filter_button.set_visible(is_explorer) + self._explorer_action_box.set_visible(is_explorer) if is_explorer: self.on_picons_folder_changed(self._explorer_path_button) diff --git a/app/ui/satellites_dialog.glade b/app/ui/satellites_dialog.glade index 24b19e96..0f1129e4 100644 --- a/app/ui/satellites_dialog.glade +++ b/app/ui/satellites_dialog.glade @@ -30,7 +30,7 @@ Author: Dmitriy Yefremov The MIT License (MIT) -Copyright (c) 2018-2019 Dmitriy Yefremov +Copyright (c) 2018-2020 Dmitriy Yefremov Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -414,6 +414,7 @@ Author: Dmitriy Yefremov False + Satellites edit tool True center-on-parent True @@ -422,17 +423,25 @@ Author: Dmitriy Yefremov True center - - + + True False - Satellites edit tool - 1 - True + 1 + 1 + 1 + vertical - + True False + start + center + 15 + 15 + 5 + 10 + expand True @@ -454,9 +463,13 @@ Author: Dmitriy Yefremov - + + Save True - False + True + True + Save + False @@ -464,248 +477,251 @@ Author: Dmitriy Yefremov 1 - - - True - True - True - Save - - - - True - False - gtk-save - - - - - False - True - 3 - - + Update True True True Update - - - True - False - gtk-refresh - - False True - 4 + 2 + + False + True + 0 + - - - - - 480 - 250 - True - True - 1 - 1 - 1 - 1 - in - 320 - 240 - + + 480 + 250 True True - satellites_tree_store - 0 - True - True - - - - - - multiple - - + 1 + 1 + 1 + 1 + in + 320 + 240 - - True - 20 - Satellite - True - - - - 0 - + + True + True + satellites_tree_store + 0 + True + True + + + + + + multiple + - - - - - True - 20 - Freq - True - - - 1 - + + True + 20 + Satellite + True + + + + 0 + + + - - - - - True - 20 - Rate - True - - - 2 - + + True + 20 + Freq + True + + + + 1 + + + - - - - - True - 20 - Pol - True - - - 3 - + + True + 20 + Rate + True + + + + 2 + + + - - - - - True - 20 - FEC - True - - - 4 - + + True + 20 + Pol + True + + + + 3 + + + - - - - - True - 20 - System - True - - - 5 - + + True + 20 + FEC + True + + + + 4 + + + - - - - - True - 20 - Mod - True - - - 6 - + + True + 20 + System + True + + + + 5 + + + - - - - - False - True - Pls mode - True - - - 7 - + + True + 20 + Mod + True + + + + 6 + + + - - - - - False - True - Pls code - True - - - 8 - + + False + True + Pls mode + True + + + + 7 + + + - - - - - False - True - Is ID - True - - - 9 - + + False + True + Pls code + True + + + + 8 + + + - - - - - False - True - Flags - - - 10 - + + False + True + Is ID + True + + + + 9 + + + - - - - - False - True - Pos: - - - 11 - + + False + True + Flags + + + + 10 + + + + + + + False + True + Pos: + + + + 11 + + + + + True + True + 1 + + + + + True + False + + + + + + + + + + + + False + True + 2 + @@ -742,7 +758,6 @@ Author: Dmitriy Yefremov True True True - True @@ -753,7 +768,6 @@ Author: Dmitriy Yefremov True True True - True @@ -925,7 +939,6 @@ Author: Dmitriy Yefremov True True True - True @@ -936,7 +949,6 @@ Author: Dmitriy Yefremov True True True - True @@ -1329,6 +1341,7 @@ Author: Dmitriy Yefremov False + Satellites update True center-on-parent True @@ -1336,189 +1349,6 @@ Author: Dmitriy Yefremov True center - - - True - False - Satellites update - 2 - True - - - True - False - 2 - - - True - False - start - 2 - Source: - False - - - False - True - 1 - - - - - True - False - update_source_store - 0 - - - - 0 - - - - - False - True - 2 - - - - - True - True - True - Update - True - - - - True - False - gtk-refresh - - - - - False - True - 3 - - - - - - - True - False - - - True - True - True - Cancel - True - - - - True - False - gtk-cancel - - - - - False - True - 0 - - - - - True - True - True - Receive - True - - - - True - False - gtk-goto-bottom - - - - - False - True - 2 - - - - - True - False - - - False - True - 3 - - - - - True - True - True - Filter - - - - True - False - Filter - gtk-select-all - - - - - - False - True - 4 - - - - - True - True - True - Find - - - - True - False - Search - gtk-find - - - - - - False - True - 5 - - - - - end - 1 - - - - True @@ -1528,6 +1358,162 @@ Author: Dmitriy Yefremov 1 2 vertical + + + True + False + 15 + 15 + 5 + 5 + 5 + + + True + False + end + Source: + False + + + False + True + 0 + + + + + True + False + center + expand + + + Cancel + True + True + True + Cancel + center + + + + False + True + 0 + + + + + Receive + True + True + True + Receive + + + + False + True + 1 + + + + + Filter + True + True + True + Filter + + + + + False + True + 2 + + + + + Search + True + True + True + Find + + + + + False + True + 3 + + + + + False + True + end + 1 + + + + + True + False + center + expand + + + True + False + center + update_source_store + 0 + + + + 0 + + + + + False + True + 1 + + + + + Update + True + True + True + Update + center + + + + False + True + 2 + + + + + False + True + 2 + + + + + False + True + 0 + + True @@ -1822,7 +1808,7 @@ Author: Dmitriy Yefremov True True - 2 + 4 @@ -1860,7 +1846,7 @@ Author: Dmitriy Yefremov False True - 3 + 5 diff --git a/app/ui/service_details_dialog.glade b/app/ui/service_details_dialog.glade index 6a770ddd..75daabae 100644 --- a/app/ui/service_details_dialog.glade +++ b/app/ui/service_details_dialog.glade @@ -254,7 +254,6 @@ True Cancel True - True @@ -265,7 +264,6 @@ True Save current service True - True @@ -276,7 +274,6 @@ True Create and save as new service True - True @@ -1569,7 +1566,6 @@ True True True - True @@ -1579,7 +1575,6 @@ True True True - True diff --git a/app/ui/style.css b/app/ui/style.css index c90360d4..34d6840d 100644 --- a/app/ui/style.css +++ b/app/ui/style.css @@ -1,10 +1,10 @@ #digit-entry { border-color: Red; + border-width: 0.15em; } #status-bar-button { - padding: 1px; - margin: 1px; + margin: 0.1em; } #textview-large { @@ -14,6 +14,8 @@ .group {} .group :first-child { + padding-left: 0.5em; + padding-right: 0.5em; border-top-right-radius: 0; border-bottom-right-radius: 0; }