From 88e19e2fd11e24efc597a78d5fb0cab1093a13ce Mon Sep 17 00:00:00 2001 From: Dmitriy Yefremov Date: Fri, 9 Mar 2018 17:40:26 +0300 Subject: [PATCH] added warning message to the picons dialog --- app/picons/picons.py | 1 - app/ui/lang/ru/LC_MESSAGES/demon-editor.mo | Bin 9216 -> 9547 bytes app/ui/picons_dialog.glade | 26 +++++------------- app/ui/picons_dialog.py | 4 +++ build-deb.sh | 2 +- .../locale/ru/LC_MESSAGES/demon-editor.mo | Bin 9216 -> 9547 bytes po/ru/demon-editor.mo | Bin 9216 -> 9547 bytes po/ru/demon-editor.po | 3 ++ 8 files changed, 15 insertions(+), 21 deletions(-) diff --git a/app/picons/picons.py b/app/picons/picons.py index 4b946bde..342a017f 100644 --- a/app/picons/picons.py +++ b/app/picons/picons.py @@ -172,7 +172,6 @@ class ProviderParser(HTMLParser): def reset(self): super().reset() - self._counter = 0 def parse_providers(open_path): diff --git a/app/ui/lang/ru/LC_MESSAGES/demon-editor.mo b/app/ui/lang/ru/LC_MESSAGES/demon-editor.mo index 21d5368a9c3049983f65c82c2bbe0a3f6f289da3..8b8e9417fea02a5a515546b2c6bf99dfcdacbadb 100644 GIT binary patch delta 2545 zcmYk+e@sPTuCPhy6lhU+RknDhoTPqVe3C_CHtS;kDoyEp+Kc>aNp(f^4V82~7oC9sYUlfKJhmbqbAZbZ zJdPIrizII>R@KJJQ2{Er5X-!RdNkWn88_o$d>fTO0p(?$W0uoc%)naYHxol;^48b{ z(}j!ZUq;QlhdTY!sH;j?>RE|8)i0wqu)}jNYNLldPodW7!L54#Z_?1IeU|jK;{f{5 zK^>~kPz(2?HaLXO<9$>nOL<5252YIQD0ZPveFC4vbKdw6TJ$Hdd&Mil0^*wuH1tet zWG|)xRnm7*hcAI7ZBC&!a^CYhRHc6R%%3@ySp{l5fW>$a^}3xwCDene&;U9LkfKqA zw@@XWLm8gNQq%(5Q1jkEJu}^8Mk0L9!6E_3ci5DUf*I+kG2Z6 zZrwb`m`WPW3{XY$IqJ1=Q5pV#nwVjY_484IR-#_BYR`JqhK`{&+KsB%71a23)c8-h z6h|-{OC0J))yy)aI%Wfo?hMQ5HzUO`XHW}#joa}SYThdTuj&z1V--em4JL6TKE&m? zmfdRO`|&Dvpb}iMk*f|}BQC^4s0GiXN_7);7&90orkR2q6Z2GYVrJ%waV?3>nUTW1 z3~c4w#P>zM`cwM*6Sp%@7q`+wyX|mIWOtd_6!nK= zwZY`c+`1g+nA@M~u-vn5Z|Ze-!2QBKix*RGx_zlO_YxyXcffKl@v=7iYEP{`s7ZaPRu&$c j*lW3bl5W5DG`e=5rTf(+CNtR+*RyPi70MFn3;y{JCL4u! delta 2207 zcmYk+Z)lZO9Ki9jwq5V;YEIXj=4Sin(%m#1ie`{wloOL+8`2-A)Qg-IWgtX4^KQNA zA9KQ;2u6uBnqanai{4a9t3<5O7bfk6q+~;BfzFars_)mG7hUf2e9n39dCu?re&>1a z$<V}kghlLp`L8Yd_0MKkM*{eG;VKY%Xa8#K^KG~*x9@xP*pT*FzI z%SC^$KoeSkR;n@DjCsTlkJ`XCw8W1iNrZNsiJPL`(Y?CfE*S7lv?9CF8~34m{VAIHF|^cYVt))>*iAG*4nI0^ z61_eH4LBQ((||5)IXbR6L&J>MqOacuB$?0|ufL6p>Gz=lPN3sX;X)k8d$61*tO_4O zpNWm=yl(s1ub(G_3C+wgiE@HckQFJg2hzKkRr_Mi(ohz1x$ zhK8@vEjf#3I)OXUK`y)(9rq#D`~DxL!8csyWCs7D1FES1JY0+n4C~RS{tdKr{n3xn zr}<0tzH`wl=tA?Tzm}r&)L}ceVA}WpBO0!F6z|19(TAyqvN&-Ay1-U^5IfLJK0yCS zM$j#|fIjUh-r4y$553-smADOkJKjOQ;W(#4;)kDU5HtLSmNb_%edtn15}_1bNILom zTB+xwJ!ocwu|JA)>EA?Ov+BDh6RJZiv;>`h6=oV~w9&Aneb|8g=mclbfj7{-Oi-p; zEI}8rEczsx>2`FU_i;TQ!ChEPxz^zR=NY1ccE{^ z0km{OXu$8#y}gEuFrWRfQcH0KJ{J3X(5?Lpo%a{KA1CHef2tG~aF?$|Gn(NO=)fJZ z--8A^g1%lO(J^#Eg_V;Ftwk%g6usVrCa@0g!xzy?zK0Yi9Lmt}VLFbtR)!1dPasK! zYU=C+jrbI{q2q?pEgHc_yo60y&;M)-zJN>cD7x@J(8Lm~-e)b1by(j-!-<|nOVo=# zgr6gGh7n}@!^N6xeR6ru_Utps&9k<0p`GIuj)yt?nD(pL@#Ma_8CvGl#qs~orr5FI ko!L(c1`2l2@?U9N_UTkQCk*wZ%92ABC0mNKt+jvs2dmrBQUCw| diff --git a/app/ui/picons_dialog.glade b/app/ui/picons_dialog.glade index 866ece19..ea187745 100644 --- a/app/ui/picons_dialog.glade +++ b/app/ui/picons_dialog.glade @@ -768,22 +768,16 @@ True False + 2 True False - 6 end - - - - - - False @@ -794,25 +788,22 @@ False - 16 - - - True False - Info + Info + center + True + word-char + 2 False - True + False 1 - - - False @@ -820,9 +811,6 @@ 0 - - - False diff --git a/app/ui/picons_dialog.py b/app/ui/picons_dialog.py index 4923fc2a..a30afa37 100644 --- a/app/ui/picons_dialog.py +++ b/app/ui/picons_dialog.py @@ -79,6 +79,10 @@ class PiconsDialog: self._enigma2_picons_path = self._picons_path if profile is Profile.NEUTRINO_MP: self._enigma2_picons_path = options.get(Profile.ENIGMA_2.value).get("picons_dir_path", "") + if not len(self._picon_ids) and self._profile is Profile.ENIGMA_2: + message = get_message("To automatically set the identifiers for picons,\n" + "first load the required services list into the main application window.") + self.show_info_message(message, Gtk.MessageType.WARNING) def show(self): self._dialog.run() diff --git a/build-deb.sh b/build-deb.sh index a342c222..f5b95f72 100755 --- a/build-deb.sh +++ b/build-deb.sh @@ -5,7 +5,7 @@ DEB_PATH="$B_PATH/usr/share/demoneditor" mkdir -p $B_PATH cp -TRv deb $B_PATH -cp -Rv app $DEB_PATH +rsync --exclude=app/ui/lang -arv app $DEB_PATH cp -Rv start.py $DEB_PATH cd dist 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 21d5368a9c3049983f65c82c2bbe0a3f6f289da3..8b8e9417fea02a5a515546b2c6bf99dfcdacbadb 100644 GIT binary patch delta 2545 zcmYk+e@sPTuCPhy6lhU+RknDhoTPqVe3C_CHtS;kDoyEp+Kc>aNp(f^4V82~7oC9sYUlfKJhmbqbAZbZ zJdPIrizII>R@KJJQ2{Er5X-!RdNkWn88_o$d>fTO0p(?$W0uoc%)naYHxol;^48b{ z(}j!ZUq;QlhdTY!sH;j?>RE|8)i0wqu)}jNYNLldPodW7!L54#Z_?1IeU|jK;{f{5 zK^>~kPz(2?HaLXO<9$>nOL<5252YIQD0ZPveFC4vbKdw6TJ$Hdd&Mil0^*wuH1tet zWG|)xRnm7*hcAI7ZBC&!a^CYhRHc6R%%3@ySp{l5fW>$a^}3xwCDene&;U9LkfKqA zw@@XWLm8gNQq%(5Q1jkEJu}^8Mk0L9!6E_3ci5DUf*I+kG2Z6 zZrwb`m`WPW3{XY$IqJ1=Q5pV#nwVjY_484IR-#_BYR`JqhK`{&+KsB%71a23)c8-h z6h|-{OC0J))yy)aI%Wfo?hMQ5HzUO`XHW}#joa}SYThdTuj&z1V--em4JL6TKE&m? zmfdRO`|&Dvpb}iMk*f|}BQC^4s0GiXN_7);7&90orkR2q6Z2GYVrJ%waV?3>nUTW1 z3~c4w#P>zM`cwM*6Sp%@7q`+wyX|mIWOtd_6!nK= zwZY`c+`1g+nA@M~u-vn5Z|Ze-!2QBKix*RGx_zlO_YxyXcffKl@v=7iYEP{`s7ZaPRu&$c j*lW3bl5W5DG`e=5rTf(+CNtR+*RyPi70MFn3;y{JCL4u! delta 2207 zcmYk+Z)lZO9Ki9jwq5V;YEIXj=4Sin(%m#1ie`{wloOL+8`2-A)Qg-IWgtX4^KQNA zA9KQ;2u6uBnqanai{4a9t3<5O7bfk6q+~;BfzFars_)mG7hUf2e9n39dCu?re&>1a z$<V}kghlLp`L8Yd_0MKkM*{eG;VKY%Xa8#K^KG~*x9@xP*pT*FzI z%SC^$KoeSkR;n@DjCsTlkJ`XCw8W1iNrZNsiJPL`(Y?CfE*S7lv?9CF8~34m{VAIHF|^cYVt))>*iAG*4nI0^ z61_eH4LBQ((||5)IXbR6L&J>MqOacuB$?0|ufL6p>Gz=lPN3sX;X)k8d$61*tO_4O zpNWm=yl(s1ub(G_3C+wgiE@HckQFJg2hzKkRr_Mi(ohz1x$ zhK8@vEjf#3I)OXUK`y)(9rq#D`~DxL!8csyWCs7D1FES1JY0+n4C~RS{tdKr{n3xn zr}<0tzH`wl=tA?Tzm}r&)L}ceVA}WpBO0!F6z|19(TAyqvN&-Ay1-U^5IfLJK0yCS zM$j#|fIjUh-r4y$553-smADOkJKjOQ;W(#4;)kDU5HtLSmNb_%edtn15}_1bNILom zTB+xwJ!ocwu|JA)>EA?Ov+BDh6RJZiv;>`h6=oV~w9&Aneb|8g=mclbfj7{-Oi-p; zEI}8rEczsx>2`FU_i;TQ!ChEPxz^zR=NY1ccE{^ z0km{OXu$8#y}gEuFrWRfQcH0KJ{J3X(5?Lpo%a{KA1CHef2tG~aF?$|Gn(NO=)fJZ z--8A^g1%lO(J^#Eg_V;Ftwk%g6usVrCa@0g!xzy?zK0Yi9Lmt}VLFbtR)!1dPasK! zYU=C+jrbI{q2q?pEgHc_yo60y&;M)-zJN>cD7x@J(8Lm~-e)b1by(j-!-<|nOVo=# zgr6gGh7n}@!^N6xeR6ru_Utps&9k<0p`GIuj)yt?nD(pL@#Ma_8CvGl#qs~orr5FI ko!L(c1`2l2@?U9N_UTkQCk*wZ%92ABC0mNKt+jvs2dmrBQUCw| diff --git a/po/ru/demon-editor.mo b/po/ru/demon-editor.mo index 21d5368a9c3049983f65c82c2bbe0a3f6f289da3..8b8e9417fea02a5a515546b2c6bf99dfcdacbadb 100644 GIT binary patch delta 2545 zcmYk+e@sPTuCPhy6lhU+RknDhoTPqVe3C_CHtS;kDoyEp+Kc>aNp(f^4V82~7oC9sYUlfKJhmbqbAZbZ zJdPIrizII>R@KJJQ2{Er5X-!RdNkWn88_o$d>fTO0p(?$W0uoc%)naYHxol;^48b{ z(}j!ZUq;QlhdTY!sH;j?>RE|8)i0wqu)}jNYNLldPodW7!L54#Z_?1IeU|jK;{f{5 zK^>~kPz(2?HaLXO<9$>nOL<5252YIQD0ZPveFC4vbKdw6TJ$Hdd&Mil0^*wuH1tet zWG|)xRnm7*hcAI7ZBC&!a^CYhRHc6R%%3@ySp{l5fW>$a^}3xwCDene&;U9LkfKqA zw@@XWLm8gNQq%(5Q1jkEJu}^8Mk0L9!6E_3ci5DUf*I+kG2Z6 zZrwb`m`WPW3{XY$IqJ1=Q5pV#nwVjY_484IR-#_BYR`JqhK`{&+KsB%71a23)c8-h z6h|-{OC0J))yy)aI%Wfo?hMQ5HzUO`XHW}#joa}SYThdTuj&z1V--em4JL6TKE&m? zmfdRO`|&Dvpb}iMk*f|}BQC^4s0GiXN_7);7&90orkR2q6Z2GYVrJ%waV?3>nUTW1 z3~c4w#P>zM`cwM*6Sp%@7q`+wyX|mIWOtd_6!nK= zwZY`c+`1g+nA@M~u-vn5Z|Ze-!2QBKix*RGx_zlO_YxyXcffKl@v=7iYEP{`s7ZaPRu&$c j*lW3bl5W5DG`e=5rTf(+CNtR+*RyPi70MFn3;y{JCL4u! delta 2207 zcmYk+Z)lZO9Ki9jwq5V;YEIXj=4Sin(%m#1ie`{wloOL+8`2-A)Qg-IWgtX4^KQNA zA9KQ;2u6uBnqanai{4a9t3<5O7bfk6q+~;BfzFars_)mG7hUf2e9n39dCu?re&>1a z$<V}kghlLp`L8Yd_0MKkM*{eG;VKY%Xa8#K^KG~*x9@xP*pT*FzI z%SC^$KoeSkR;n@DjCsTlkJ`XCw8W1iNrZNsiJPL`(Y?CfE*S7lv?9CF8~34m{VAIHF|^cYVt))>*iAG*4nI0^ z61_eH4LBQ((||5)IXbR6L&J>MqOacuB$?0|ufL6p>Gz=lPN3sX;X)k8d$61*tO_4O zpNWm=yl(s1ub(G_3C+wgiE@HckQFJg2hzKkRr_Mi(ohz1x$ zhK8@vEjf#3I)OXUK`y)(9rq#D`~DxL!8csyWCs7D1FES1JY0+n4C~RS{tdKr{n3xn zr}<0tzH`wl=tA?Tzm}r&)L}ceVA}WpBO0!F6z|19(TAyqvN&-Ay1-U^5IfLJK0yCS zM$j#|fIjUh-r4y$553-smADOkJKjOQ;W(#4;)kDU5HtLSmNb_%edtn15}_1bNILom zTB+xwJ!ocwu|JA)>EA?Ov+BDh6RJZiv;>`h6=oV~w9&Aneb|8g=mclbfj7{-Oi-p; zEI}8rEczsx>2`FU_i;TQ!ChEPxz^zR=NY1ccE{^ z0km{OXu$8#y}gEuFrWRfQcH0KJ{J3X(5?Lpo%a{KA1CHef2tG~aF?$|Gn(NO=)fJZ z--8A^g1%lO(J^#Eg_V;Ftwk%g6usVrCa@0g!xzy?zK0Yi9Lmt}VLFbtR)!1dPasK! zYU=C+jrbI{q2q?pEgHc_yo60y&;M)-zJN>cD7x@J(8Lm~-e)b1by(j-!-<|nOVo=# zgr6gGh7n}@!^N6xeR6ru_Utps&9k<0p`GIuj)yt?nD(pL@#Ma_8CvGl#qs~orr5FI ko!L(c1`2l2@?U9N_UTkQCk*wZ%92ABC0mNKt+jvs2dmrBQUCw| diff --git a/po/ru/demon-editor.po b/po/ru/demon-editor.po index 0dd7a6f2..80083d05 100644 --- a/po/ru/demon-editor.po +++ b/po/ru/demon-editor.po @@ -389,6 +389,9 @@ msgstr "Получение пиконов для провайдеров" msgid "Load satellite providers." msgstr "Загрузка провайдеров" +msgid "To automatically set the identifiers for picons,\nfirst load the required services list into the main application window." +msgstr "Для автоматического именования пиконов,\nзагрузите список необходимых сервисов в главное окно программы." + # Satellites editor msgid "Satellites edit tool" msgstr "Редактор спутников"