From b251ce8b6955b70f65ceaae2aee1b59af8d3bb93 Mon Sep 17 00:00:00 2001 From: DYefremov Date: Mon, 16 Dec 2019 10:47:18 +0300 Subject: [PATCH] fixes after merge --- app/ui/main_app_window.py | 9 +++++---- app/ui/transmitter.py | 3 +-- .../share/locale/es/LC_MESSAGES/demon-editor.mo | Bin 15731 -> 0 bytes 3 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 deb/usr/share/locale/es/LC_MESSAGES/demon-editor.mo diff --git a/app/ui/main_app_window.py b/app/ui/main_app_window.py index 41ab9aac..4300ab15 100644 --- a/app/ui/main_app_window.py +++ b/app/ui/main_app_window.py @@ -184,7 +184,7 @@ class Application(Gtk.Application): builder = Gtk.Builder() builder.set_translation_domain("demon-editor") builder.add_from_file(UI_RESOURCES_PATH + "main_window.glade") - builder.connect_signals(handlers) + builder.connect_signals(self._handlers) self._main_window = builder.get_object("main_window") main_window_size = self._settings.get("window_size") # Setting the last size of the window if it was saved @@ -875,7 +875,7 @@ class Application(Gtk.Application): self.show_error_dialog(str(e)) def on_data_open(self, action, param=None): - response = show_dialog(DialogType.CHOOSER, self._main_window, options=self._options.get(self._profile)) + response = show_dialog(DialogType.CHOOSER, self._main_window, settings=self._settings) if response in (Gtk.ResponseType.CANCEL, Gtk.ResponseType.DELETE_EVENT): return self.open_data(response) @@ -2101,9 +2101,10 @@ class Application(Gtk.Application): def update_profile_label(self): if self._profile is Profile.ENIGMA_2: - self._header_bar.set_subtitle("{} Enigma2 v.{}".format(get_message("Profile:"), self.get_format_version())) + ver = self.get_format_version() + self._main_window.set_title("DemonEditor [{} Enigma2 v.{}]".format(get_message("Profile:"), ver)) elif self._profile is Profile.NEUTRINO_MP: - self._header_bar.set_subtitle("{} Neutrino-MP".format(get_message("Profile:"))) + self._main_window.set_title("DemonEditor [{} Neutrino-MP]".format(get_message("Profile:"))) def get_format_version(self): return 5 if self._settings.v5_support else 4 diff --git a/app/ui/transmitter.py b/app/ui/transmitter.py index e286edb6..16cc7a96 100644 --- a/app/ui/transmitter.py +++ b/app/ui/transmitter.py @@ -2,7 +2,6 @@ from urllib.parse import urlparse from gi.repository import GLib from app.connections import HttpRequestType from app.tools.yt import YouTube -from app.ui.iptv import get_yt_icon from .uicommons import Gtk, Gdk, UI_RESOURCES_PATH, TEXT_DOMAIN @@ -71,7 +70,7 @@ class LinksTransmitter: yield True if yt_id: - self._url_entry.set_icon_from_pixbuf(Gtk.EntryIconPosition.SECONDARY, get_yt_icon("youtube", 32)) + self._url_entry.set_icon_from_pixbuf(Gtk.EntryIconPosition.SECONDARY, Gtk.STOCK_INFO) links, title = YouTube.get_yt_link(yt_id) yield True if links: diff --git a/deb/usr/share/locale/es/LC_MESSAGES/demon-editor.mo b/deb/usr/share/locale/es/LC_MESSAGES/demon-editor.mo deleted file mode 100644 index 1be1ad1e03db3a9cf39cfd15ff2cc06e35e35ff4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15731 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