From 952aeb4d22b34540c2c965b61dc1571273e97236 Mon Sep 17 00:00:00 2001 From: DYefremov Date: Tue, 10 Apr 2018 11:15:50 +0300 Subject: [PATCH] little refactoring for bq selection --- app/ui/dialogs.glade | 2 +- app/ui/lang/ru/LC_MESSAGES/demon-editor.mo | Bin 10577 -> 10726 bytes app/ui/main_app_window.py | 22 +++++++++++++----- .../locale/ru/LC_MESSAGES/demon-editor.mo | Bin 10577 -> 10726 bytes po/ru/demon-editor.mo | Bin 10577 -> 10726 bytes po/ru/demon-editor.po | 3 +++ 6 files changed, 20 insertions(+), 7 deletions(-) diff --git a/app/ui/dialogs.glade b/app/ui/dialogs.glade index 5164c5f1..839b60ad 100644 --- a/app/ui/dialogs.glade +++ b/app/ui/dialogs.glade @@ -11,9 +11,9 @@ DemonEditor 0.3.1 Pre-alpha 2018 Dmitriy Yefremov -dmitry.v.yefremov@gmail.com Enigma2 channel and satellites list editor for GNU/Linux + https://github.com/DYefremov/DemonEditor Это приложение распространяется без каких-либо гарантий. Подробнее в <a href="http://opensource.org/licenses/mit-license.php">The MIT License (MIT)</a>. Dmitriy Yefremov diff --git a/app/ui/lang/ru/LC_MESSAGES/demon-editor.mo b/app/ui/lang/ru/LC_MESSAGES/demon-editor.mo index b290ee134c07723cfa71981d24f8bdbd6b5e095e..5475f0979f9c79e17b850212dca9b8ec087b7dda 100644 GIT binary patch delta 3305 zcmXxldrZ}39LMn|K~V967Z5GrXOgHOD&mC%)JjyuJEbX_bVMWxOpl0>9=wE_7ldWa za%o!2kWKPPGenuQi_Y23vDKVzvKC#O<<$Da)!2G}&UtwBdtT4;<9D9R_jw-hFZ^wh z=T5)SLxxgEJVi8w8uJZibmxOIzo#*MZ~=y30S?AO+pfZ1w0B|{)}g+781=mq*bTjy zjV&0CA$*DVJSKul91o(9u}vEG#&qjUjG(<3`=JX5U^!}_z1S5GA$^+7z;ll=KTuHzH?c3?!AbZ4HL(%QW+2W)t#Bo3pd#CLV}II}7=<+$iJw}( zL{0oVq)T%PHK9M$W_G*C5a zqKB==Py>EuZ9rx23-oAD&r?y#S}_K%S=+50sDYwc)=(US%2Xa|D^{cWsYDIr!C|-) zwb!StUW})G9yNj6k?g-x`zsH$vJTYBBj{Z#=!=?I3~HbR)O+cul+Qp7und#Xh1pnx z%H&V@H2#CE!3-olnrI?woTPr_Uk}FeK!;;IYQQYp&Oxnc5o*9Cr~ymxNpz#O;vnkw z97Uat7Svg|idtzKYC(4~8Xuq*67Hc_br^*jI2QGV5vUHvq0Yc8R0i^p#h7B-u0&1n zAZma^sE&`==k=%oPou{97B#`|QSW(fQ_;%rqE_$-m8w3BrswgPhQm=4T#g#381?=- zOu_w_h%Gn-+fipFj8&+gkywG_kRO=_q(6_jL`5sQj*M;EP-o(A)XE~5eiw{H{k%UG zVIn$MgB%;vh?>A945S)0&;umfrYoH)lQF2R8;U&{-%O!$fCss#72QUC;W3WH2(E-W znt)o_Y}9Rd9rfNW9F8BL-oI>rejkMK<0zD7;xmi1rMRt#nqG6R*N6}G(xpP_vUb-n$let*O{*pAA0s`9Ua zrqlaWoR8X@T1>^GsE%%+-g}I?J|RvpwUMX^jJGaEWn?p|pO0}lp2maNi?e$@3mhDv24YQU?gGxHF~Vi)cnb2Vu=1@mnCUDO#l zi&}{1XDS-tKBi*_a=y$&PL8hS0@NXL@uBy2+xGjY0b7u-nCsSusEI|9HcdDMmAPrC z=ehQIA&%Dlub`rtoJ7u;o6iB-orxDuD6CVUa~{!Qdn^E*z( zUZm$aoQn&v7RTc+sJ}mE5O?De4@M%BH-DlIWnYdmeVE~>4(Fj#w-LkeII?@@bL57Z zYxo4JXp2;8i6SDDm`iLR+yuK6ER1i8iE+05CUzmTXCcIPVjrQRNvOOS#7wkmHJfaG z6lM~YL^onG(VbXIOegAyGD5dyH{n^rhssuBb)d#?Hq@SWmUnFBHLJ3tYpK<%Xxo&5 z&XPf;)HcFVSzAx!6S@T|6Nqx{zsgiXhtDBYw2#?@&c!Suk085&eS8_YzGfb=hDalH z)m9QNLPZBoMZM<`1%z(JGD3$?=O}B zbrV(*oan$`IWQ%}d_sqA55b?4KpDX24nk)wR^!(Y@x-gdE@B~}@-|T&s0Dv%sH&Tx zq7(lX(NzswUcduHD)ACAo7hRLB|3}#g03J6i5XV2kxFNoLuFfM1NReqi7X<5NF-FY z5Q_peW1hvuL<$i`aDmJl#Aad|G1EJ$XL@Kt;rar1aapNTTIO~NN=nK$6|QoMOC9%` z;th_gtkhjt;U403MP~NSY4V-*UG%m3clfvYxBJfdT6~TE8b^hVA8L`_Km delta 3161 zcmZYAXKa;K7{Ku(lvP?OP(fzP-UwLsDj-vaG78u#XqmDUsg~tsgMf@s1P5Y}1PPEx z8W$Rd=?5^%2#J~~rU;s-L=zO`0}=oK%fT<6@Z8@yr|&)EIp@9nJnq8S#1FMnb_U9J zq9L(AC4^Jhz8W8tPH7?3z|L3^2Vi|19NSYdo%S@Wj0@4PE=Iq%8mrcpQ7+d30gbSWR7QjqWfPooHxmkH^}y^YH;(fElPS^q)Uvy3^h0 zhW23{Jcw@OBs$*N1QjR#8vVkL=m6Kyv#-GHW*{9|TWA{FIp_k1qZ5oq2c8i73(*N@ zp%W$01+GV*D?vA!*hj@3970odI{x8X%%Oc5U0@wn;Y3Z*=i6XM9D=Q|2%F#@^p2cB zC%A&ecn$d%rn5W8TY_vT5!O**j<6fO6o=8Bm0<-u6aW4t&ZJ$A**J{taUH^JbOB2+ znQC;RgGds?aWs<`(4+ev&BQI-!u+8Uv$~@a^b1F^Eta7J{ekW*g;&G3pe6cTF1E&T z==00s-w&WEK836`oI@A-Q|!Nqz6~i1R*U&Vb1T>#eQ-oHA02ou7T_*yhkv1|&*pd7 z9gV^EI0sGbZfuVG(FLBtY`l)X6}9ggNM4DZtJ+4_QOli~aFLY~MleMi%d+8ySg?KN)*sVipzdQ`m?8z@f-a;sY34d5LN*odN9cpe zm0?HPvykHryU>9@z^Ql|U2q$&u+I-dy24n@#bO+YpWx$o8@u9Y(&h%%;3?dR&3*qT z@{V{Lmm$xF9q53^(A1SqB-G>-%Ly-MiVa+&4^TDEHQ)VMNA_45(@}R zQ(_2F$p&Q!^M_Z7VZ<_GIN_yRMOfAmGn2ItM&V|H^D?g+w~hCHC@v zSF$|8XE(z6Eb|C|sN7KUKbMhMotREkB`o9b66QqLMrAS4o9Jw#bW~c;l+q&^z3wmV InsqewU)cW%c>n+a diff --git a/app/ui/main_app_window.py b/app/ui/main_app_window.py index cd2b08c1..077d8142 100644 --- a/app/ui/main_app_window.py +++ b/app/ui/main_app_window.py @@ -246,10 +246,8 @@ class MainAppWindow: def on_paste(self, view): selection = view.get_selection() dest_index = 0 - bq_selected = self.get_selected_bouquet() - + bq_selected = self.check_bouquet_selection() if not bq_selected: - show_dialog(DialogType.ERROR, self._main_window, "Error. No bouquet is selected!") return fav_bouquet = self._bouquets[bq_selected] @@ -440,10 +438,8 @@ class MainAppWindow: def receive_selection(self, *, view, drop_info, data): """ Update fav view after data received """ - bq_selected = self.get_selected_bouquet() - + bq_selected = self.check_bouquet_selection() if not bq_selected: - show_dialog(DialogType.ERROR, self._main_window, "Error. No bouquet is selected!") return model = get_base_model(view.get_model()) @@ -686,6 +682,20 @@ class MainAppWindow: service.hide, service.service_type, service.pos, service.fav_id, self._picons.get(service.picon_id, None))) + def check_bouquet_selection(self): + """ checks and returns bouquet if selected """ + bq_selected = self.get_selected_bouquet() + + if not bq_selected: + show_dialog(DialogType.ERROR, self._main_window, "Error. No bouquet is selected!") + return + + if Profile(self._profile) is Profile.NEUTRINO_MP and bq_selected.endswith(BqType.WEBTV.value): + show_dialog(DialogType.ERROR, self._main_window, "Operation not allowed in this context!") + return + + return bq_selected + def get_selected_bouquet(self): """ returns 'name:type' of last selected bouquet or False """ if self._current_bq_name is None: 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 b290ee134c07723cfa71981d24f8bdbd6b5e095e..5475f0979f9c79e17b850212dca9b8ec087b7dda 100644 GIT binary patch delta 3305 zcmXxldrZ}39LMn|K~V967Z5GrXOgHOD&mC%)JjyuJEbX_bVMWxOpl0>9=wE_7ldWa za%o!2kWKPPGenuQi_Y23vDKVzvKC#O<<$Da)!2G}&UtwBdtT4;<9D9R_jw-hFZ^wh z=T5)SLxxgEJVi8w8uJZibmxOIzo#*MZ~=y30S?AO+pfZ1w0B|{)}g+781=mq*bTjy zjV&0CA$*DVJSKul91o(9u}vEG#&qjUjG(<3`=JX5U^!}_z1S5GA$^+7z;ll=KTuHzH?c3?!AbZ4HL(%QW+2W)t#Bo3pd#CLV}II}7=<+$iJw}( zL{0oVq)T%PHK9M$W_G*C5a zqKB==Py>EuZ9rx23-oAD&r?y#S}_K%S=+50sDYwc)=(US%2Xa|D^{cWsYDIr!C|-) zwb!StUW})G9yNj6k?g-x`zsH$vJTYBBj{Z#=!=?I3~HbR)O+cul+Qp7und#Xh1pnx z%H&V@H2#CE!3-olnrI?woTPr_Uk}FeK!;;IYQQYp&Oxnc5o*9Cr~ymxNpz#O;vnkw z97Uat7Svg|idtzKYC(4~8Xuq*67Hc_br^*jI2QGV5vUHvq0Yc8R0i^p#h7B-u0&1n zAZma^sE&`==k=%oPou{97B#`|QSW(fQ_;%rqE_$-m8w3BrswgPhQm=4T#g#381?=- zOu_w_h%Gn-+fipFj8&+gkywG_kRO=_q(6_jL`5sQj*M;EP-o(A)XE~5eiw{H{k%UG zVIn$MgB%;vh?>A945S)0&;umfrYoH)lQF2R8;U&{-%O!$fCss#72QUC;W3WH2(E-W znt)o_Y}9Rd9rfNW9F8BL-oI>rejkMK<0zD7;xmi1rMRt#nqG6R*N6}G(xpP_vUb-n$let*O{*pAA0s`9Ua zrqlaWoR8X@T1>^GsE%%+-g}I?J|RvpwUMX^jJGaEWn?p|pO0}lp2maNi?e$@3mhDv24YQU?gGxHF~Vi)cnb2Vu=1@mnCUDO#l zi&}{1XDS-tKBi*_a=y$&PL8hS0@NXL@uBy2+xGjY0b7u-nCsSusEI|9HcdDMmAPrC z=ehQIA&%Dlub`rtoJ7u;o6iB-orxDuD6CVUa~{!Qdn^E*z( zUZm$aoQn&v7RTc+sJ}mE5O?De4@M%BH-DlIWnYdmeVE~>4(Fj#w-LkeII?@@bL57Z zYxo4JXp2;8i6SDDm`iLR+yuK6ER1i8iE+05CUzmTXCcIPVjrQRNvOOS#7wkmHJfaG z6lM~YL^onG(VbXIOegAyGD5dyH{n^rhssuBb)d#?Hq@SWmUnFBHLJ3tYpK<%Xxo&5 z&XPf;)HcFVSzAx!6S@T|6Nqx{zsgiXhtDBYw2#?@&c!Suk085&eS8_YzGfb=hDalH z)m9QNLPZBoMZM<`1%z(JGD3$?=O}B zbrV(*oan$`IWQ%}d_sqA55b?4KpDX24nk)wR^!(Y@x-gdE@B~}@-|T&s0Dv%sH&Tx zq7(lX(NzswUcduHD)ACAo7hRLB|3}#g03J6i5XV2kxFNoLuFfM1NReqi7X<5NF-FY z5Q_peW1hvuL<$i`aDmJl#Aad|G1EJ$XL@Kt;rar1aapNTTIO~NN=nK$6|QoMOC9%` z;th_gtkhjt;U403MP~NSY4V-*UG%m3clfvYxBJfdT6~TE8b^hVA8L`_Km delta 3161 zcmZYAXKa;K7{Ku(lvP?OP(fzP-UwLsDj-vaG78u#XqmDUsg~tsgMf@s1P5Y}1PPEx z8W$Rd=?5^%2#J~~rU;s-L=zO`0}=oK%fT<6@Z8@yr|&)EIp@9nJnq8S#1FMnb_U9J zq9L(AC4^Jhz8W8tPH7?3z|L3^2Vi|19NSYdo%S@Wj0@4PE=Iq%8mrcpQ7+d30gbSWR7QjqWfPooHxmkH^}y^YH;(fElPS^q)Uvy3^h0 zhW23{Jcw@OBs$*N1QjR#8vVkL=m6Kyv#-GHW*{9|TWA{FIp_k1qZ5oq2c8i73(*N@ zp%W$01+GV*D?vA!*hj@3970odI{x8X%%Oc5U0@wn;Y3Z*=i6XM9D=Q|2%F#@^p2cB zC%A&ecn$d%rn5W8TY_vT5!O**j<6fO6o=8Bm0<-u6aW4t&ZJ$A**J{taUH^JbOB2+ znQC;RgGds?aWs<`(4+ev&BQI-!u+8Uv$~@a^b1F^Eta7J{ekW*g;&G3pe6cTF1E&T z==00s-w&WEK836`oI@A-Q|!Nqz6~i1R*U&Vb1T>#eQ-oHA02ou7T_*yhkv1|&*pd7 z9gV^EI0sGbZfuVG(FLBtY`l)X6}9ggNM4DZtJ+4_QOli~aFLY~MleMi%d+8ySg?KN)*sVipzdQ`m?8z@f-a;sY34d5LN*odN9cpe zm0?HPvykHryU>9@z^Ql|U2q$&u+I-dy24n@#bO+YpWx$o8@u9Y(&h%%;3?dR&3*qT z@{V{Lmm$xF9q53^(A1SqB-G>-%Ly-MiVa+&4^TDEHQ)VMNA_45(@}R zQ(_2F$p&Q!^M_Z7VZ<_GIN_yRMOfAmGn2ItM&V|H^D?g+w~hCHC@v zSF$|8XE(z6Eb|C|sN7KUKbMhMotREkB`o9b66QqLMrAS4o9Jw#bW~c;l+q&^z3wmV InsqewU)cW%c>n+a diff --git a/po/ru/demon-editor.mo b/po/ru/demon-editor.mo index b290ee134c07723cfa71981d24f8bdbd6b5e095e..5475f0979f9c79e17b850212dca9b8ec087b7dda 100644 GIT binary patch delta 3305 zcmXxldrZ}39LMn|K~V967Z5GrXOgHOD&mC%)JjyuJEbX_bVMWxOpl0>9=wE_7ldWa za%o!2kWKPPGenuQi_Y23vDKVzvKC#O<<$Da)!2G}&UtwBdtT4;<9D9R_jw-hFZ^wh z=T5)SLxxgEJVi8w8uJZibmxOIzo#*MZ~=y30S?AO+pfZ1w0B|{)}g+781=mq*bTjy zjV&0CA$*DVJSKul91o(9u}vEG#&qjUjG(<3`=JX5U^!}_z1S5GA$^+7z;ll=KTuHzH?c3?!AbZ4HL(%QW+2W)t#Bo3pd#CLV}II}7=<+$iJw}( zL{0oVq)T%PHK9M$W_G*C5a zqKB==Py>EuZ9rx23-oAD&r?y#S}_K%S=+50sDYwc)=(US%2Xa|D^{cWsYDIr!C|-) zwb!StUW})G9yNj6k?g-x`zsH$vJTYBBj{Z#=!=?I3~HbR)O+cul+Qp7und#Xh1pnx z%H&V@H2#CE!3-olnrI?woTPr_Uk}FeK!;;IYQQYp&Oxnc5o*9Cr~ymxNpz#O;vnkw z97Uat7Svg|idtzKYC(4~8Xuq*67Hc_br^*jI2QGV5vUHvq0Yc8R0i^p#h7B-u0&1n zAZma^sE&`==k=%oPou{97B#`|QSW(fQ_;%rqE_$-m8w3BrswgPhQm=4T#g#381?=- zOu_w_h%Gn-+fipFj8&+gkywG_kRO=_q(6_jL`5sQj*M;EP-o(A)XE~5eiw{H{k%UG zVIn$MgB%;vh?>A945S)0&;umfrYoH)lQF2R8;U&{-%O!$fCss#72QUC;W3WH2(E-W znt)o_Y}9Rd9rfNW9F8BL-oI>rejkMK<0zD7;xmi1rMRt#nqG6R*N6}G(xpP_vUb-n$let*O{*pAA0s`9Ua zrqlaWoR8X@T1>^GsE%%+-g}I?J|RvpwUMX^jJGaEWn?p|pO0}lp2maNi?e$@3mhDv24YQU?gGxHF~Vi)cnb2Vu=1@mnCUDO#l zi&}{1XDS-tKBi*_a=y$&PL8hS0@NXL@uBy2+xGjY0b7u-nCsSusEI|9HcdDMmAPrC z=ehQIA&%Dlub`rtoJ7u;o6iB-orxDuD6CVUa~{!Qdn^E*z( zUZm$aoQn&v7RTc+sJ}mE5O?De4@M%BH-DlIWnYdmeVE~>4(Fj#w-LkeII?@@bL57Z zYxo4JXp2;8i6SDDm`iLR+yuK6ER1i8iE+05CUzmTXCcIPVjrQRNvOOS#7wkmHJfaG z6lM~YL^onG(VbXIOegAyGD5dyH{n^rhssuBb)d#?Hq@SWmUnFBHLJ3tYpK<%Xxo&5 z&XPf;)HcFVSzAx!6S@T|6Nqx{zsgiXhtDBYw2#?@&c!Suk085&eS8_YzGfb=hDalH z)m9QNLPZBoMZM<`1%z(JGD3$?=O}B zbrV(*oan$`IWQ%}d_sqA55b?4KpDX24nk)wR^!(Y@x-gdE@B~}@-|T&s0Dv%sH&Tx zq7(lX(NzswUcduHD)ACAo7hRLB|3}#g03J6i5XV2kxFNoLuFfM1NReqi7X<5NF-FY z5Q_peW1hvuL<$i`aDmJl#Aad|G1EJ$XL@Kt;rar1aapNTTIO~NN=nK$6|QoMOC9%` z;th_gtkhjt;U403MP~NSY4V-*UG%m3clfvYxBJfdT6~TE8b^hVA8L`_Km delta 3161 zcmZYAXKa;K7{Ku(lvP?OP(fzP-UwLsDj-vaG78u#XqmDUsg~tsgMf@s1P5Y}1PPEx z8W$Rd=?5^%2#J~~rU;s-L=zO`0}=oK%fT<6@Z8@yr|&)EIp@9nJnq8S#1FMnb_U9J zq9L(AC4^Jhz8W8tPH7?3z|L3^2Vi|19NSYdo%S@Wj0@4PE=Iq%8mrcpQ7+d30gbSWR7QjqWfPooHxmkH^}y^YH;(fElPS^q)Uvy3^h0 zhW23{Jcw@OBs$*N1QjR#8vVkL=m6Kyv#-GHW*{9|TWA{FIp_k1qZ5oq2c8i73(*N@ zp%W$01+GV*D?vA!*hj@3970odI{x8X%%Oc5U0@wn;Y3Z*=i6XM9D=Q|2%F#@^p2cB zC%A&ecn$d%rn5W8TY_vT5!O**j<6fO6o=8Bm0<-u6aW4t&ZJ$A**J{taUH^JbOB2+ znQC;RgGds?aWs<`(4+ev&BQI-!u+8Uv$~@a^b1F^Eta7J{ekW*g;&G3pe6cTF1E&T z==00s-w&WEK836`oI@A-Q|!Nqz6~i1R*U&Vb1T>#eQ-oHA02ou7T_*yhkv1|&*pd7 z9gV^EI0sGbZfuVG(FLBtY`l)X6}9ggNM4DZtJ+4_QOli~aFLY~MleMi%d+8ySg?KN)*sVipzdQ`m?8z@f-a;sY34d5LN*odN9cpe zm0?HPvykHryU>9@z^Ql|U2q$&u+I-dy24n@#bO+YpWx$o8@u9Y(&h%%;3?dR&3*qT z@{V{Lmm$xF9q53^(A1SqB-G>-%Ly-MiVa+&4^TDEHQ)VMNA_45(@}R zQ(_2F$p&Q!^M_Z7VZ<_GIN_yRMOfAmGn2ItM&V|H^D?g+w~hCHC@v zSF$|8XE(z6Eb|C|sN7KUKbMhMotREkB`o9b66QqLMrAS4o9Jw#bW~c;l+q&^z3wmV InsqewU)cW%c>n+a diff --git a/po/ru/demon-editor.po b/po/ru/demon-editor.po index 389e39a0..4995e18a 100644 --- a/po/ru/demon-editor.po +++ b/po/ru/demon-editor.po @@ -465,6 +465,9 @@ msgstr "Не выбран файл satellites.xml!" msgid "Error. Verify the data!" msgstr "Ошибка. Проверьте данные!" +msgid "Operation not allowed in this context!" +msgstr "Недопустимая операция в данном контексте!" +