From 320183554c99fe1b0ec9810a4a78503536b497a8 Mon Sep 17 00:00:00 2001
From: Dmitriy Yefremov <dmitriy.v.yefremov@gmail.com>
Date: Thu, 1 Mar 2018 20:39:00 +0300
Subject: [PATCH] status bar changes

---
 app/ui/main_app_window.py                     |   5 +-
 app/ui/main_window.glade                      |  60 ++++++++++++++----
 .../locale/ru/LC_MESSAGES/demon-editor.mo     | Bin 6214 -> 6261 bytes
 po/ru/demon-editor.mo                         | Bin 6214 -> 6261 bytes
 po/ru/demon-editor.po                         |   3 +
 5 files changed, 55 insertions(+), 13 deletions(-)

diff --git a/app/ui/main_app_window.py b/app/ui/main_app_window.py
index 168030c5..91978d96 100644
--- a/app/ui/main_app_window.py
+++ b/app/ui/main_app_window.py
@@ -134,7 +134,8 @@ class MainAppWindow:
         self.__bouquets_model = builder.get_object("bouquets_tree_store")
         self.__status_bar = builder.get_object("status_bar")
         self.__profile_label = builder.get_object("profile_label")
-        self.__status_bar.push(0, "Current IP: " + self.__options.get(self.__profile).get("host"))
+        self.__ip_label = builder.get_object("ip_label")
+        self.__ip_label.set_text(self.__options.get(self.__profile).get("host"))
         self.__profile_label.set_text("Enigma2 v.4" if Profile(self.__profile) is Profile.ENIGMA_2 else "Neutrino-MP")
         # dynamically active elements depending on the selected view
         self.__tool_elements = {k: builder.get_object(k) for k in self.__DYNAMIC_ELEMENTS}
@@ -672,7 +673,7 @@ class MainAppWindow:
         response = show_settings_dialog(self.__main_window, self.__options)
         if response != Gtk.ResponseType.CANCEL:
             profile = self.__options.get("profile")
-            self.__status_bar.push(0, "Current IP: " + self.__options.get(profile).get("host"))
+            self.__ip_label.set_text(self.__options.get(profile).get("host"))
             if profile != self.__profile:
                 self.__profile_label.set_text("Enigma 2 v.4" if Profile(profile) is Profile.ENIGMA_2 else "Neutrino-MP")
                 self.__profile = profile
diff --git a/app/ui/main_window.glade b/app/ui/main_window.glade
index aa35c238..29017921 100644
--- a/app/ui/main_window.glade
+++ b/app/ui/main_window.glade
@@ -2172,7 +2172,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkSeparator" id="separator4">
+          <object class="GtkSeparator" id="bottom_separator">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="margin_bottom">2</property>
@@ -2180,25 +2180,59 @@
           <packing>
             <property name="expand">False</property>
             <property name="fill">True</property>
-            <property name="padding">2</property>
             <property name="position">5</property>
           </packing>
         </child>
         <child>
-          <object class="GtkStatusbar" id="status_bar">
+          <object class="GtkBox" id="status_bar_box">
+            <property name="height_request">24</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="margin_start">10</property>
-            <property name="margin_end">10</property>
-            <property name="spacing">2</property>
             <property name="homogeneous">True</property>
             <child>
-              <object class="GtkBox" id="box1">
+              <object class="GtkBox" id="ip_status_box">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="spacing">2</property>
                 <child>
-                  <object class="GtkLabel" id="label1">
+                  <object class="GtkLabel" id="label2">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">Current IP:</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="ip_label">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">127.0.0.1</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="padding">5</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkBox" id="prifile_box">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="spacing">2</property>
+                <child>
+                  <object class="GtkLabel" id="label3">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="label" translatable="yes">Profile:</property>
@@ -2225,7 +2259,7 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="position">2</property>
+                <property name="position">1</property>
               </packing>
             </child>
             <child>
@@ -2238,14 +2272,18 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">True</property>
-                <property name="position">3</property>
+                <property name="pack_type">end</property>
+                <property name="position">2</property>
               </packing>
             </child>
+            <style>
+              <class name="primary-toolbar"/>
+            </style>
           </object>
           <packing>
             <property name="expand">False</property>
             <property name="fill">True</property>
-            <property name="position">7</property>
+            <property name="position">6</property>
           </packing>
         </child>
       </object>
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 f7131e5e2f6a6cfe8439fddb7a99078b6338a772..b3a5cab9e37117a563d6880884d56f6e6f261689 100644
GIT binary patch
delta 2167
zcmZYAZ)nw37{KwzZQ7=DH@8ZgwdUsBn%ml%*0fEpc5}{UF6*Y#mKjMc=--<WMcp9i
zzB6$3LZpboGBSHHDnbY<tlkt9q=;e>Vi5E~aIUDJ@Ar1}O^5sZKIi=YopYXZe%n{w
z)7^zLwH2=g<ssraqN6<GCG4NWfwHkOB7;N7r5H_);e6V=(OaKH@0&n=@iK=E_zG6w
zajd~pI1hir+K572q;eG}s;UTV;4mB8&<DGaTcS6$`_uJxxPbG6*oUL&K=xrZ?nj@0
z2Oa49sr@NlPx~{RP5*J4%3MzTg3jP~^nriS5zphI=j)LXM?2clKr)ARG@KkkGnGeY
zI-1&h()Dq?g7Z%({l^5A8}J3B&v*mPz#+7wBj}4hLNoO_I>6&thiB0j{(*Mv%|2g&
zw&$W5tU-RUFtwYp;K)0u_<|l>jH}R@=h0L?j925+=zxlN4emt;au9uf3Z1}F^!{VW
znBo*V@N?*r{gvADtI59uXrdQi+={ll&<=Xh7jHs-v6X`z?m}nuIJ#*k&?TBo=if%(
zcNm*-DxE)p4&-NK3^83z{vFXQ-fAlAa3Qv$16hk@m`m3O@e$fPu@S$-EAcGa;WXO8
z-{@XhKpM^HQl!tw;$Ga0-gmk{WeJt@=mT|3qYal~J8r>i@mb`Z@hZAk-a_yH0v*7Q
z$#dv)Gk8BXanS)3umcYuUBx%(dkQD0IFcD$gVm(Nln!G9K8meaL_eDk@kaa>8*v7g
z<03}02y<v^$IvAlM>F#xx)+M*-q?q1&O#ib;)o6-zc|Xl8^6OWo<wI}&-!@24NYY)
zF2yXG!9B?$I^g%v=e|ex&`;>*{57@DV~yYcpH%F)k~EODSd7kOIg*sfVGriflogZj
zqAC3voxlZLh2>1oB^yAJ6Wh@1<LH2&LErm2Hq(C`v4TIK9bZHTlp%l4xCw1{;!T)E
zGw>9;w$GzWwjb^2W9-6X=#pJPpRZ+Sd%Xo$;tF(M#A8$(*>lLf@g^?APp}2gpfjyt
zbgpF&n({uZ#~nBe{U5T0u=EjrLHF69>?U>+Zb}j!D+o#<2LG#+j(2cm@}=3ishrgi
z;a{;^iPglVavPN$sWF0^i4BAU-bgeNtVn6*W7tn*3HQPSgym+}|3NCw#&S22CtMCw
zJwTXZmw_b2Hp1dQC@a+>?nO78sdb<95^g-#{&r$JVQDAKvU|*8=IuW^33sMt6XDwJ
zvO&oarrzR`xUtp}>j>A-;u2Wa6E2TSxRtQDA^lw42gAgr;-~Frn)e^YodipGxr|<}
zMchKYoAA%Af0!(drQ`n(cX8?-V$I~r$`8tiMpjRqtn8dqHZ(HXkZG9Qo~fByl4+^>
E7pzU8KmY&$

delta 2144
zcmZYATWnNC7{KwNmeSJFrG-*Zpo_FvES92Jx`lGTRVcO~vQ`DrsEHC1FhMjSYxJQ?
zh#DJi4?qI(Mq(u40Rs;ZB6WjLCh|~%T!JJLyhI5S0%`pJcZVk@{myUZTxRBcGiQ6N
zsjn$>v9fSypsXjx615M6@BvOK;y`IB4k3Xl<WgvlcHl7DUFfar(EDCP{=yaxi!p<R
z*oWo#BUa*h9LeSI2bB^|6mS@fW#|Ky$fZyn+sSyn4l6j{fGyaDPGAd`;WqU7?dSwQ
ziS2zjj`l%xoKrZI@k1XKXZ{oVz!h|+f5r0y=#0yU<_DS(tw#r%8l8@2D21ii7TfLd
zdIt{S{K{xI)-Zl}nF?cs_tBZ{K;P&yw4=R9s>0{!1drng%%UA$KnMO6eg3!D{u9mM
zKWIO9V|xe<Cq5iAc2Gs-AsmOkc?wPCQmn$&=!D+HQMehM$Vce&yU`aofZqQ#GFCW=
zPW&voWS3(5Z*&4hW#r$EOBu}*mFNJ~XvdAnUufpwfD6z!>OwbbH@b9h$MZdCf1lz+
z+#S!KKqvA&GIr=kCv>fh{F}<#oT$c9MsXq&u>kAQ>kari&cP&piNi6A4%m+la2eez
zx6q6hlTNx0wfHekL+?9<6YyMyN<Ed^_$VfMoiVr!=_9;~HTV|VaW6XX7tv$rb6I==
zZ=wTta?=#tfOH-9qWye@P9Tf3G4l%*Q#qD=jK>r{f@$<~c@HP!eoSH(8}K@g#wuoI
zN*mFoYeh5Ch3<hgx+h*iH|aa*gtj4nnXrSSHy*&bco=>28}a-dG=+t%LoHUIscVj=
z(FwncK6en^J4et>`CV+EMh8BNbQ$_F;rIVL72o6@l8jJAex~6hG-c`NRy3u1(2mYv
z3V%kIten>*DWM*{-il7R9qo4`x+yc!LpYl8!w*!P(PcCfH)DGMr_!z<uV!E#y0$CO
zC3^!Ms0SNy7rJC;(EhH*>;K}Dv<I`poybgdV#_hZwXliGB>WKT@LTjv&!KBsKzdAh
z2|kDoI0)AhD+tRB!Y^mF4a!SIH}O2-WS$@_i}U1;3tfM*7uFK)V&85l;YMjDOz-{D
zO69rOcp8@ziwNIj3E>1;!Q2w~CCnt|5blK+35(0Rjz|)gPS^h#Di0H;a2DYkx(sIK
zS;FF%;qQTE6=AmAY)!=Dgv(=U=M!rPi(ifF?Gjn|GIPbux-l*7uK#1XYW}bQ{JbnK
zg&WiFbS^QSu(;VQ^9YxRZ4$Z&OAF!eiTmRz;(l>o_?i0uVHv^7=872%>3ltRbfdWG
q{F(K$vee}H-?4);D~Yz=MaAD79Vo6X>Rp={*4vXPKiZk7EBOy!sh^qv

diff --git a/po/ru/demon-editor.mo b/po/ru/demon-editor.mo
index f7131e5e2f6a6cfe8439fddb7a99078b6338a772..b3a5cab9e37117a563d6880884d56f6e6f261689 100644
GIT binary patch
delta 2167
zcmZYAZ)nw37{KwzZQ7=DH@8ZgwdUsBn%ml%*0fEpc5}{UF6*Y#mKjMc=--<WMcp9i
zzB6$3LZpboGBSHHDnbY<tlkt9q=;e>Vi5E~aIUDJ@Ar1}O^5sZKIi=YopYXZe%n{w
z)7^zLwH2=g<ssraqN6<GCG4NWfwHkOB7;N7r5H_);e6V=(OaKH@0&n=@iK=E_zG6w
zajd~pI1hir+K572q;eG}s;UTV;4mB8&<DGaTcS6$`_uJxxPbG6*oUL&K=xrZ?nj@0
z2Oa49sr@NlPx~{RP5*J4%3MzTg3jP~^nriS5zphI=j)LXM?2clKr)ARG@KkkGnGeY
zI-1&h()Dq?g7Z%({l^5A8}J3B&v*mPz#+7wBj}4hLNoO_I>6&thiB0j{(*Mv%|2g&
zw&$W5tU-RUFtwYp;K)0u_<|l>jH}R@=h0L?j925+=zxlN4emt;au9uf3Z1}F^!{VW
znBo*V@N?*r{gvADtI59uXrdQi+={ll&<=Xh7jHs-v6X`z?m}nuIJ#*k&?TBo=if%(
zcNm*-DxE)p4&-NK3^83z{vFXQ-fAlAa3Qv$16hk@m`m3O@e$fPu@S$-EAcGa;WXO8
z-{@XhKpM^HQl!tw;$Ga0-gmk{WeJt@=mT|3qYal~J8r>i@mb`Z@hZAk-a_yH0v*7Q
z$#dv)Gk8BXanS)3umcYuUBx%(dkQD0IFcD$gVm(Nln!G9K8meaL_eDk@kaa>8*v7g
z<03}02y<v^$IvAlM>F#xx)+M*-q?q1&O#ib;)o6-zc|Xl8^6OWo<wI}&-!@24NYY)
zF2yXG!9B?$I^g%v=e|ex&`;>*{57@DV~yYcpH%F)k~EODSd7kOIg*sfVGriflogZj
zqAC3voxlZLh2>1oB^yAJ6Wh@1<LH2&LErm2Hq(C`v4TIK9bZHTlp%l4xCw1{;!T)E
zGw>9;w$GzWwjb^2W9-6X=#pJPpRZ+Sd%Xo$;tF(M#A8$(*>lLf@g^?APp}2gpfjyt
zbgpF&n({uZ#~nBe{U5T0u=EjrLHF69>?U>+Zb}j!D+o#<2LG#+j(2cm@}=3ishrgi
z;a{;^iPglVavPN$sWF0^i4BAU-bgeNtVn6*W7tn*3HQPSgym+}|3NCw#&S22CtMCw
zJwTXZmw_b2Hp1dQC@a+>?nO78sdb<95^g-#{&r$JVQDAKvU|*8=IuW^33sMt6XDwJ
zvO&oarrzR`xUtp}>j>A-;u2Wa6E2TSxRtQDA^lw42gAgr;-~Frn)e^YodipGxr|<}
zMchKYoAA%Af0!(drQ`n(cX8?-V$I~r$`8tiMpjRqtn8dqHZ(HXkZG9Qo~fByl4+^>
E7pzU8KmY&$

delta 2144
zcmZYATWnNC7{KwNmeSJFrG-*Zpo_FvES92Jx`lGTRVcO~vQ`DrsEHC1FhMjSYxJQ?
zh#DJi4?qI(Mq(u40Rs;ZB6WjLCh|~%T!JJLyhI5S0%`pJcZVk@{myUZTxRBcGiQ6N
zsjn$>v9fSypsXjx615M6@BvOK;y`IB4k3Xl<WgvlcHl7DUFfar(EDCP{=yaxi!p<R
z*oWo#BUa*h9LeSI2bB^|6mS@fW#|Ky$fZyn+sSyn4l6j{fGyaDPGAd`;WqU7?dSwQ
ziS2zjj`l%xoKrZI@k1XKXZ{oVz!h|+f5r0y=#0yU<_DS(tw#r%8l8@2D21ii7TfLd
zdIt{S{K{xI)-Zl}nF?cs_tBZ{K;P&yw4=R9s>0{!1drng%%UA$KnMO6eg3!D{u9mM
zKWIO9V|xe<Cq5iAc2Gs-AsmOkc?wPCQmn$&=!D+HQMehM$Vce&yU`aofZqQ#GFCW=
zPW&voWS3(5Z*&4hW#r$EOBu}*mFNJ~XvdAnUufpwfD6z!>OwbbH@b9h$MZdCf1lz+
z+#S!KKqvA&GIr=kCv>fh{F}<#oT$c9MsXq&u>kAQ>kari&cP&piNi6A4%m+la2eez
zx6q6hlTNx0wfHekL+?9<6YyMyN<Ed^_$VfMoiVr!=_9;~HTV|VaW6XX7tv$rb6I==
zZ=wTta?=#tfOH-9qWye@P9Tf3G4l%*Q#qD=jK>r{f@$<~c@HP!eoSH(8}K@g#wuoI
zN*mFoYeh5Ch3<hgx+h*iH|aa*gtj4nnXrSSHy*&bco=>28}a-dG=+t%LoHUIscVj=
z(FwncK6en^J4et>`CV+EMh8BNbQ$_F;rIVL72o6@l8jJAex~6hG-c`NRy3u1(2mYv
z3V%kIten>*DWM*{-il7R9qo4`x+yc!LpYl8!w*!P(PcCfH)DGMr_!z<uV!E#y0$CO
zC3^!Ms0SNy7rJC;(EhH*>;K}Dv<I`poybgdV#_hZwXliGB>WKT@LTjv&!KBsKzdAh
z2|kDoI0)AhD+tRB!Y^mF4a!SIH}O2-WS$@_i}U1;3tfM*7uFK)V&85l;YMjDOz-{D
zO69rOcp8@ziwNIj3E>1;!Q2w~CCnt|5blK+35(0Rjz|)gPS^h#Di0H;a2DYkx(sIK
zS;FF%;qQTE6=AmAY)!=Dgv(=U=M!rPi(ifF?Gjn|GIPbux-l*7uK#1XYW}bQ{JbnK
zg&WiFbS^QSu(;VQ^9YxRZ4$Z&OAF!eiTmRz;(l>o_?i0uVHv^7=872%>3ltRbfdWG
q{F(K$vee}H-?4);D~Yz=MaAD79Vo6X>Rp={*4vXPKiZk7EBOy!sh^qv

diff --git a/po/ru/demon-editor.po b/po/ru/demon-editor.po
index c30b4d8d..40ed0862 100644
--- a/po/ru/demon-editor.po
+++ b/po/ru/demon-editor.po
@@ -40,6 +40,9 @@ msgstr "Поз."
 msgid "Num"
 msgstr "№"
 
+msgid "Current IP:"
+msgstr "Текущий IP:"
+
 #: main_window.glade:261
 msgid "Assign"
 msgstr "Привязать"