diff --git a/app/ui/lang/ru/LC_MESSAGES/demon-editor.mo b/app/ui/lang/ru/LC_MESSAGES/demon-editor.mo index 9fc25598..21d5368a 100644 Binary files a/app/ui/lang/ru/LC_MESSAGES/demon-editor.mo and b/app/ui/lang/ru/LC_MESSAGES/demon-editor.mo differ diff --git a/app/ui/picons_dialog.py b/app/ui/picons_dialog.py index 277215ad..62900811 100644 --- a/app/ui/picons_dialog.py +++ b/app/ui/picons_dialog.py @@ -93,12 +93,13 @@ class PiconsDialog: stderr=subprocess.PIPE, universal_newlines=True) GLib.io_add_watch(self._current_process.stderr, GLib.IO_IN, self.write_to_buffer) - self.append_providers(url) - - @run_task - def append_providers(self, url): model = self._providers_tree_view.get_model() model.clear() + self.update_receive_button_state() + self.append_providers(url, model) + + @run_task + def append_providers(self, url, model): self._current_process.wait() providers = parse_providers(self._TMP_DIR + url[url.find("w"):]) if providers: @@ -123,7 +124,14 @@ class PiconsDialog: self._terminate = False self._expander.set_expanded(True) - for prv in self.get_selected_providers(): + providers = self.get_selected_providers() + for prv in providers: + if not prv[2].isdigit(): + self.show_info_message( + get_message("Specify the correct position value for the provider!"), Gtk.MessageType.ERROR) + return + + for prv in providers: if self._terminate: break self.process_provider(Provider(*prv)) @@ -142,7 +150,7 @@ class PiconsDialog: PiconsParser.parse(path, self._picons_path, self._TMP_DIR, prv.on_id, pos, self._picon_ids, self.get_picons_format()) self.resize(self._picons_path) - self.show_info_message("Done", Gtk.MessageType.INFO) + self.show_info_message(get_message("Done!"), Gtk.MessageType.INFO) def write_to_buffer(self, fd, condition): if condition == GLib.IO_IN: diff --git a/app/ui/search.py b/app/ui/search.py index 7e005f1c..24f00bf4 100644 --- a/app/ui/search.py +++ b/app/ui/search.py @@ -1,5 +1,4 @@ """ This is helper module for search features """ -from app.ui.main_helper import get_base_model class SearchProvider: @@ -17,7 +16,7 @@ class SearchProvider: self._current_index = -1 self._paths.clear() for view in self._srv_view, self._fav_view: - model = get_base_model(view.get_model()) + model = view.get_model() selection = view.get_selection() selection.unselect_all() if not text: diff --git a/deb/usr/share/locale/ru/LC_MESSAGES/demon-editor.mo b/deb/usr/share/locale/ru/LC_MESSAGES/demon-editor.mo index 9fc25598..21d5368a 100644 Binary files a/deb/usr/share/locale/ru/LC_MESSAGES/demon-editor.mo and b/deb/usr/share/locale/ru/LC_MESSAGES/demon-editor.mo differ diff --git a/po/ru/demon-editor.mo b/po/ru/demon-editor.mo index 9fc25598..21d5368a 100644 Binary files a/po/ru/demon-editor.mo and b/po/ru/demon-editor.mo differ diff --git a/po/ru/demon-editor.po b/po/ru/demon-editor.po index a4c689fe..0dd7a6f2 100644 --- a/po/ru/demon-editor.po +++ b/po/ru/demon-editor.po @@ -377,6 +377,18 @@ msgstr "Путь для сохранения:" msgid "Path to Enigma2 picons:" msgstr "Путь к пиконам формата Enigma2:" +msgid "Specify the correct position value for the provider!" +msgstr "Укажите правильное значение позиции для провайдера!" + +msgid "Converter between name formats" +msgstr "Конвертер формата имен" + +msgid "Receive picons for providers" +msgstr "Получение пиконов для провайдеров" + +msgid "Load satellite providers." +msgstr "Загрузка провайдеров" + # Satellites editor msgid "Satellites edit tool" msgstr "Редактор спутников"