From c3e880890ea7440af5bcb7bf5cd06f09bf4ab9ec Mon Sep 17 00:00:00 2001 From: DYefremov Date: Wed, 7 Mar 2018 22:43:42 +0300 Subject: [PATCH] little picons dialog changes --- app/ui/lang/ru/LC_MESSAGES/demon-editor.mo | Bin 8745 -> 9216 bytes app/ui/picons_dialog.py | 20 ++++++++++++------ app/ui/search.py | 3 +-- .../locale/ru/LC_MESSAGES/demon-editor.mo | Bin 8745 -> 9216 bytes po/ru/demon-editor.mo | Bin 8745 -> 9216 bytes po/ru/demon-editor.po | 12 +++++++++++ 6 files changed, 27 insertions(+), 8 deletions(-) diff --git a/app/ui/lang/ru/LC_MESSAGES/demon-editor.mo b/app/ui/lang/ru/LC_MESSAGES/demon-editor.mo index 9fc255985c41764b5be7bf505d65c3fc4816c083..21d5368a9c3049983f65c82c2bbe0a3f6f289da3 100644 GIT binary patch delta 3141 zcmZA1dr*{B7{~F$RRdGJAeNvnUPwhLQPZ@P$i(teO6CnOhzqU)OUsI(=7Kd@nc@sM z&e)WrRN7dX$d?dSbq1bW8^ui!U;W@_(crW*tFcxp3+Wn3CY0r3LW?&L_ z!{vAn7UCc*Lx%F38Y(?`P=|a>J(oV%fc@|b)DKT%44!kmh;(4Cpa#5-jBRc?&trRp z+s9*Xp7+K{I21L3Jd9<0vxy2Hvz3cFtU;};&bdE;Dcm1KP2elkK;NKN`~#}}uc(FG z!22+Yhx$GRwV*MmOl3LdU^L^KxvF3;D#eSCMVLGsfNLD99rvOJ2;fls4zQg+Mhy_bm+H7X>Un?EfCEwEWTGZE8PzVwPem(UfO`FwBa1PcoaftdJoj~|0ZyXY z*_eS>@BvKbgr(wi)R`zm_4@{D;lleQod$nl5%)c5 zZD9qnShEK;p+l$v8jz;uOVpN}My<3HccL0;;x(vtAL1yz|Hr8CF_*b$1^=KLq>}#; zI38(emZ47lYpB#6aBM`K=62NY&N^O0O*ESP%S2Q^X_$xeFkSEe$5b@qGdLRmL>;D~ zq(vQPq9!;Wr(zLmCGVsDNIFnka2|Eq<9KIB;t169`Do!r)Z6hE@-Zj4#52D6nF?c? z-%u%yVwpO0amXS}B5ES(jv%Ux2V0nfnza-{ZOVR;xt_7-0wkc?GaSJ zzu+U-If(p|B{PO!>9xo~t#C1_;TGq92Wp@u)a%vZco8+Bcq=^7VW^BvL_N<&Enq1= zh^44ZzJnyk9QISuVLE}KnPCR^oyelh5b~@JvT!BlqS`g1wx|QM@DgU@DE?>XVF^ya zW2lM$fm&EBv)5Tm$29b3Q&C55REla)hwv!Ur|Cep-(0{5REZ*4%0r%dSJKn8u~_Xqc^oG>^+fF9)O85&F8s^hDMi%g6B*8v zrMQmJ8?cBdBuwr4xc8DvD_mZm%WJK2`8K#*rB-QviOVYVcuVqq<$sPM6`|G6cW>lu?+p N-IyBqY4DuLe*sh%oj(8o delta 2747 zcmYk;duWzb9KiA8yUppG+nm!ab8}NuOY>INR?}u%W-T?-vYFS)GyeMbv(e|VC+!yOio4L~-okEp04L!`Xjff( zgwP#xFdd69Cxm1urovws!6hHdu>fn)FD$?eTpC@8cCZ#5Xd^O4*c|V_h(5m!d*Q2C zj(e~K&!7`d&kiA*@k0+P9Wz2#R2vLejPm@?anAyaep8V!b)^y3(!ohMz`h}bb#m3ly8ad z!~wK-qZ$1e3-K@}iSQE_S9l(s@kMk(|DpqQXL(dZ3HHVj=m1qX94DiDy#~$L2RIPF zK{Is;onST%$H_z6eRIjbd)SW~4mb#Hk3v^cjt)2;9dJ5cjde($p%F<^*o=L!1zkWZ z_Qk#E#M{vCe}#_o9h!+>a>>76yuc0jHZ$+?iu2JF4~^{#bV5_n0cM~b&yM$(paa&U z18qhp){H*)3c9dX^ex+m3>n&!@q<%n$3Mphe#McrvzWzDtiUo{h@OF`v7I|?hRPvVn z_9LIASc49<2z_l^&@Ffec{ChAGuV!vtrN%`!Vl;K{!qpbefYL18W){~u4sL1zk%1# z{tSI>&Y>$gk7njSbbx%)ScS!CCg4eIhe{RDo!BL@3Mo@l}|!D zYQVX;3Af<4cn>Zkzj_eOL-Q&*VcBHym&Wy0;(V z82l1VRTuKFW$0c`L_2K23T#5w5Z*@)dN__Q>@@mZH}=zZA=-Z>`W8(oA^%oZal?sh zM`ySfP1Psy{?T~<436UdUuX)4F)I(*IApG2I(AG9N78OW<`DLv{T_~=pF+3fT#`x^ zmHg5WZpRro9e3b3Jd4h_g#B>^qtL@O6Nlh3w4;~M%p61y-5KOBoa4f7g`9z85$_@_ zb1vigrxW5a!Y?|wr!<3jgjhwC60Xt-vhXmUu(5i5y$g5Q&lGjaoVE)REVn0m` zzm$r_{Yns~+p}P~o4AQ+Aj*kbh{c4(?XZyHj>7Lz*g$vyZzS#~u9O+E;_rtghp4mS z`sZ1pOd;+i{1Hhfe5HIVZYC_Ahtb4s#1LWtQAK$2eci4U|6SM^8&BX^;z43I;aOQo zR1yn_ M97?42m(?cz2mKG`J^%m! 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 9fc255985c41764b5be7bf505d65c3fc4816c083..21d5368a9c3049983f65c82c2bbe0a3f6f289da3 100644 GIT binary patch delta 3141 zcmZA1dr*{B7{~F$RRdGJAeNvnUPwhLQPZ@P$i(teO6CnOhzqU)OUsI(=7Kd@nc@sM z&e)WrRN7dX$d?dSbq1bW8^ui!U;W@_(crW*tFcxp3+Wn3CY0r3LW?&L_ z!{vAn7UCc*Lx%F38Y(?`P=|a>J(oV%fc@|b)DKT%44!kmh;(4Cpa#5-jBRc?&trRp z+s9*Xp7+K{I21L3Jd9<0vxy2Hvz3cFtU;};&bdE;Dcm1KP2elkK;NKN`~#}}uc(FG z!22+Yhx$GRwV*MmOl3LdU^L^KxvF3;D#eSCMVLGsfNLD99rvOJ2;fls4zQg+Mhy_bm+H7X>Un?EfCEwEWTGZE8PzVwPem(UfO`FwBa1PcoaftdJoj~|0ZyXY z*_eS>@BvKbgr(wi)R`zm_4@{D;lleQod$nl5%)c5 zZD9qnShEK;p+l$v8jz;uOVpN}My<3HccL0;;x(vtAL1yz|Hr8CF_*b$1^=KLq>}#; zI38(emZ47lYpB#6aBM`K=62NY&N^O0O*ESP%S2Q^X_$xeFkSEe$5b@qGdLRmL>;D~ zq(vQPq9!;Wr(zLmCGVsDNIFnka2|Eq<9KIB;t169`Do!r)Z6hE@-Zj4#52D6nF?c? z-%u%yVwpO0amXS}B5ES(jv%Ux2V0nfnza-{ZOVR;xt_7-0wkc?GaSJ zzu+U-If(p|B{PO!>9xo~t#C1_;TGq92Wp@u)a%vZco8+Bcq=^7VW^BvL_N<&Enq1= zh^44ZzJnyk9QISuVLE}KnPCR^oyelh5b~@JvT!BlqS`g1wx|QM@DgU@DE?>XVF^ya zW2lM$fm&EBv)5Tm$29b3Q&C55REla)hwv!Ur|Cep-(0{5REZ*4%0r%dSJKn8u~_Xqc^oG>^+fF9)O85&F8s^hDMi%g6B*8v zrMQmJ8?cBdBuwr4xc8DvD_mZm%WJK2`8K#*rB-QviOVYVcuVqq<$sPM6`|G6cW>lu?+p N-IyBqY4DuLe*sh%oj(8o delta 2747 zcmYk;duWzb9KiA8yUppG+nm!ab8}NuOY>INR?}u%W-T?-vYFS)GyeMbv(e|VC+!yOio4L~-okEp04L!`Xjff( zgwP#xFdd69Cxm1urovws!6hHdu>fn)FD$?eTpC@8cCZ#5Xd^O4*c|V_h(5m!d*Q2C zj(e~K&!7`d&kiA*@k0+P9Wz2#R2vLejPm@?anAyaep8V!b)^y3(!ohMz`h}bb#m3ly8ad z!~wK-qZ$1e3-K@}iSQE_S9l(s@kMk(|DpqQXL(dZ3HHVj=m1qX94DiDy#~$L2RIPF zK{Is;onST%$H_z6eRIjbd)SW~4mb#Hk3v^cjt)2;9dJ5cjde($p%F<^*o=L!1zkWZ z_Qk#E#M{vCe}#_o9h!+>a>>76yuc0jHZ$+?iu2JF4~^{#bV5_n0cM~b&yM$(paa&U z18qhp){H*)3c9dX^ex+m3>n&!@q<%n$3Mphe#McrvzWzDtiUo{h@OF`v7I|?hRPvVn z_9LIASc49<2z_l^&@Ffec{ChAGuV!vtrN%`!Vl;K{!qpbefYL18W){~u4sL1zk%1# z{tSI>&Y>$gk7njSbbx%)ScS!CCg4eIhe{RDo!BL@3Mo@l}|!D zYQVX;3Af<4cn>Zkzj_eOL-Q&*VcBHym&Wy0;(V z82l1VRTuKFW$0c`L_2K23T#5w5Z*@)dN__Q>@@mZH}=zZA=-Z>`W8(oA^%oZal?sh zM`ySfP1Psy{?T~<436UdUuX)4F)I(*IApG2I(AG9N78OW<`DLv{T_~=pF+3fT#`x^ zmHg5WZpRro9e3b3Jd4h_g#B>^qtL@O6Nlh3w4;~M%p61y-5KOBoa4f7g`9z85$_@_ zb1vigrxW5a!Y?|wr!<3jgjhwC60Xt-vhXmUu(5i5y$g5Q&lGjaoVE)REVn0m` zzm$r_{Yns~+p}P~o4AQ+Aj*kbh{c4(?XZyHj>7Lz*g$vyZzS#~u9O+E;_rtghp4mS z`sZ1pOd;+i{1Hhfe5HIVZYC_Ahtb4s#1LWtQAK$2eci4U|6SM^8&BX^;z43I;aOQo zR1yn_ M97?42m(?cz2mKG`J^%m! diff --git a/po/ru/demon-editor.mo b/po/ru/demon-editor.mo index 9fc255985c41764b5be7bf505d65c3fc4816c083..21d5368a9c3049983f65c82c2bbe0a3f6f289da3 100644 GIT binary patch delta 3141 zcmZA1dr*{B7{~F$RRdGJAeNvnUPwhLQPZ@P$i(teO6CnOhzqU)OUsI(=7Kd@nc@sM z&e)WrRN7dX$d?dSbq1bW8^ui!U;W@_(crW*tFcxp3+Wn3CY0r3LW?&L_ z!{vAn7UCc*Lx%F38Y(?`P=|a>J(oV%fc@|b)DKT%44!kmh;(4Cpa#5-jBRc?&trRp z+s9*Xp7+K{I21L3Jd9<0vxy2Hvz3cFtU;};&bdE;Dcm1KP2elkK;NKN`~#}}uc(FG z!22+Yhx$GRwV*MmOl3LdU^L^KxvF3;D#eSCMVLGsfNLD99rvOJ2;fls4zQg+Mhy_bm+H7X>Un?EfCEwEWTGZE8PzVwPem(UfO`FwBa1PcoaftdJoj~|0ZyXY z*_eS>@BvKbgr(wi)R`zm_4@{D;lleQod$nl5%)c5 zZD9qnShEK;p+l$v8jz;uOVpN}My<3HccL0;;x(vtAL1yz|Hr8CF_*b$1^=KLq>}#; zI38(emZ47lYpB#6aBM`K=62NY&N^O0O*ESP%S2Q^X_$xeFkSEe$5b@qGdLRmL>;D~ zq(vQPq9!;Wr(zLmCGVsDNIFnka2|Eq<9KIB;t169`Do!r)Z6hE@-Zj4#52D6nF?c? z-%u%yVwpO0amXS}B5ES(jv%Ux2V0nfnza-{ZOVR;xt_7-0wkc?GaSJ zzu+U-If(p|B{PO!>9xo~t#C1_;TGq92Wp@u)a%vZco8+Bcq=^7VW^BvL_N<&Enq1= zh^44ZzJnyk9QISuVLE}KnPCR^oyelh5b~@JvT!BlqS`g1wx|QM@DgU@DE?>XVF^ya zW2lM$fm&EBv)5Tm$29b3Q&C55REla)hwv!Ur|Cep-(0{5REZ*4%0r%dSJKn8u~_Xqc^oG>^+fF9)O85&F8s^hDMi%g6B*8v zrMQmJ8?cBdBuwr4xc8DvD_mZm%WJK2`8K#*rB-QviOVYVcuVqq<$sPM6`|G6cW>lu?+p N-IyBqY4DuLe*sh%oj(8o delta 2747 zcmYk;duWzb9KiA8yUppG+nm!ab8}NuOY>INR?}u%W-T?-vYFS)GyeMbv(e|VC+!yOio4L~-okEp04L!`Xjff( zgwP#xFdd69Cxm1urovws!6hHdu>fn)FD$?eTpC@8cCZ#5Xd^O4*c|V_h(5m!d*Q2C zj(e~K&!7`d&kiA*@k0+P9Wz2#R2vLejPm@?anAyaep8V!b)^y3(!ohMz`h}bb#m3ly8ad z!~wK-qZ$1e3-K@}iSQE_S9l(s@kMk(|DpqQXL(dZ3HHVj=m1qX94DiDy#~$L2RIPF zK{Is;onST%$H_z6eRIjbd)SW~4mb#Hk3v^cjt)2;9dJ5cjde($p%F<^*o=L!1zkWZ z_Qk#E#M{vCe}#_o9h!+>a>>76yuc0jHZ$+?iu2JF4~^{#bV5_n0cM~b&yM$(paa&U z18qhp){H*)3c9dX^ex+m3>n&!@q<%n$3Mphe#McrvzWzDtiUo{h@OF`v7I|?hRPvVn z_9LIASc49<2z_l^&@Ffec{ChAGuV!vtrN%`!Vl;K{!qpbefYL18W){~u4sL1zk%1# z{tSI>&Y>$gk7njSbbx%)ScS!CCg4eIhe{RDo!BL@3Mo@l}|!D zYQVX;3Af<4cn>Zkzj_eOL-Q&*VcBHym&Wy0;(V z82l1VRTuKFW$0c`L_2K23T#5w5Z*@)dN__Q>@@mZH}=zZA=-Z>`W8(oA^%oZal?sh zM`ySfP1Psy{?T~<436UdUuX)4F)I(*IApG2I(AG9N78OW<`DLv{T_~=pF+3fT#`x^ zmHg5WZpRro9e3b3Jd4h_g#B>^qtL@O6Nlh3w4;~M%p61y-5KOBoa4f7g`9z85$_@_ zb1vigrxW5a!Y?|wr!<3jgjhwC60Xt-vhXmUu(5i5y$g5Q&lGjaoVE)REVn0m` zzm$r_{Yns~+p}P~o4AQ+Aj*kbh{c4(?XZyHj>7Lz*g$vyZzS#~u9O+E;_rtghp4mS z`sZ1pOd;+i{1Hhfe5HIVZYC_Ahtb4s#1LWtQAK$2eci4U|6SM^8&BX^;z43I;aOQo zR1yn_ M97?42m(?cz2mKG`J^%m! 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 "Редактор спутников"