From d0a24eb2256604344ad928a4dbaa7d1f6942c523 Mon Sep 17 00:00:00 2001
From: pokamest <pokamest@gmail.com>
Date: Wed, 25 Nov 2020 23:43:51 +0300
Subject: [PATCH] ui fixes

---
 client/images/AmneziaVPN.png     | Bin 2263 -> 1219 bytes
 client/images/Line.png           | Bin 136 -> 0 bytes
 client/images/arrow_left.png     | Bin 214 -> 282 bytes
 client/images/connected_line.png | Bin 87 -> 0 bytes
 client/images/listitembg.png     | Bin 318 -> 0 bytes
 client/images/underline.png      | Bin 80 -> 0 bytes
 client/res.qrc                   |   4 -
 client/ui/mainwindow.ui          | 479 ++++++++++++++++++-------------
 8 files changed, 282 insertions(+), 201 deletions(-)
 delete mode 100644 client/images/Line.png
 delete mode 100644 client/images/connected_line.png
 delete mode 100644 client/images/listitembg.png
 delete mode 100644 client/images/underline.png

diff --git a/client/images/AmneziaVPN.png b/client/images/AmneziaVPN.png
index 81448fefabf67fb82b3e92c61d9d30a8f4167e9d..84c395c5b1db39a38006673edb3ee4922701b9dd 100644
GIT binary patch
delta 1184
zcmV;R1Yi5t5yJ@~iBL{Q4GJ0x0000DNk~Le0001%0000M2nGNE03xwvI*}nXe*{=b
zL_t(|0qvU0Z%t7Y#y{#&k4B;csb@&k$RlBbG!a9OKY&h*B>V+BG{S%(VPqoy0FMy~
zAxsE@0R!R@kAw&<)oRQ7a`x`s_uRG4+2^XZ+Wkwu+<W&~=k%Przq8gl`xZzf5{X1&
zS~COHSt(j&Y<neojl^VOsi-wKfA&-K4*!^0sLoYn=F*_4wu`<ZF&Ut#7GeUJiE8w~
zHWl2q!$?efs+2;S=1D{xvlX*evn8=j)FE0Y>J9YVi0?#}^5NpheKb$IXoYB==(8L9
zA$p5=cnu4K_u;w09d{6u6MCWrSvB+i_$?Z78g`!xsZt7iBI6dh*h9v4f12i!GQL-|
zU$h6c$q3=Z+!UR3pZ7UwvE;Jotmu6(wpDZ>7x&D?ZWC=3%{PumGu#zjM`pA<ysq``
zbuP;3b?0_Z)EA7myYp<8yQtj|YtUE<`L|x=#%8!U-b^hh=a*;**)<Gn0kIjYOLRpU
zzkn>0bt&6+iEb<7ma%w}f0ju?n7Q~RERBd|liH11w$O}K6=p7)J2cm3r)FU0x`SFq
z9&cmuM&kEgwJq{|6MfGQ#vbg9F@DTRBR0c%VoXKC(pLuK_F!yTj{1o&GL_FtUIR+Z
z9MKL;Oq0#*#0sPNU?`^%;}|^eh6EK;3VFwC4Lh^dYo`k?E`(W(e~tWU#KG)x6xp52
z388^l>h>zJ+<s1U1KEVNx!8kB>^hXgJN%mH5o&ik@8q4v-(L~D?}UDSH&9=OJ(dw!
zMwxAx39Wvz-ARMx=_RT?k+-0}_w)3lvBc3li;>+3AvEP|<a)+3W6@An=3$xZ3f^}s
zG2EA?i@Df~sBgOYf90NnKCw4lyvG}j*(o-gg`7v@WO9Ppdu>9!k;r2A%1O2|ZPn7)
z;a>ZdbK&3Vgl;NtD3-S&RAbO7->|p3SO0l7;(D)9%8XUCyl@8P_(uLnM67m~_8PHc
zy}<XpU|WB|wmHUl8{$j5M{D@mOw-s_mU<(4it2{)@ci3ge_uz_6d8+#>c-#0a>%Up
z7*mfvW1Qu*>h*@Dg!94@z8d!NX{c{#9%dlRuwh@trG;T9o>$ZjQ)H~G7(0%Oc4O+{
zoAZv`I46uHnM)b@r398VEkk%C@=0zjvhriWOt!_?M#FtXIo9#{lh2pnvoD1#j|&iq
zWh|><C$CV9fA%{fdodd83Z@=hhtm4MPUwxj1`Ybby<dW2Q<3=v+sgL!SWkJa?i`q@
zD)m(%nz4!+c9t}2;nULteg6~C*R}q4n6bDnw*%GtD#Ct|4<iE@Us!tC_-jVgmLF(D
zX0swwkD?ii4fic0-deK?;qro&?KX%WB754(V>RkpcC6KGbAs}ddoOs;-sBFd@j&z`
zH}*OAndahCDzo)6WF?R5J1lu&Q{Efw&l33(jY|?NV?_@PWrX{(2h0C-6n^G)v8*yn
ywK#cG`JZrx+&+9tZsxyX5{X12kw_#GW5gfV%;c8ySr8lm0000<MNUMnLSTaY`c3%&

delta 2237
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
LNkvXXu0mjf1g|q9

diff --git a/client/images/Line.png b/client/images/Line.png
deleted file mode 100644
index c5a3a4663b947f06228128f19c5640262d876c60..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 136
zcmeAS@N?(olHy`uVBq!ia0y~yV9Wrr89CU1<mXJ2&p?W^z$3Dlfq`2Xgc%uT&5;19
zC=POWVpw-h<|UBBlJ4m1$iT3%pZiZDE08bi>Eakt!T9!oAtM6=&!G)x_aDn*l$JTm
eZ0UJv4wKO=<{3ZK8QOpf89ZJ6T-G@yGywpCvmtQ+

diff --git a/client/images/arrow_left.png b/client/images/arrow_left.png
index 091b4097784275f40b4e1e91695ae78ef4bf93d1..3a4d149dc2d14bcd12fce876e2df8b3fb2c68ada 100644
GIT binary patch
delta 239
zcmV<L01*Gy0h$6KiBL{Q4GJ0x0000DNk~Le0000Q0000I2nGNE07V(jqmdysf3HbI
zK~#7Fz12Yq!Y~j8&_7W@cOD_$L>C^&^SRKQ*duf$g4l7=fKW+oVe<WpF1qNWll(;R
zBir>pLRJ?D(B98GI1;82jX(!)!Ze}{y4L~D$Q-17TpQGcSjYfkA|Hs2^w2+$3~i3L
zj1Z$Zg&G~1lO;5DWMQL|Xg_G9MSF5ammYbYxY*bB=3#}xa<Gvjs6Hm8mkg|UdiNhq
pyHTycu#N>Qv@@gk(Gc@@?G0Yuil$r{6ea)w002ovPDHLkV1ldoVK)E(

delta 171
zcmbQmbd6E5Gr-TCmrII^fq{Y7)59eQNNa#F2OE&=`L`o?qM~Viwx^3@NCo5Diw8Ly
z9C%zVI_jJ_w}tugO4ST@sSA6nI0QF+l0WnJum{71sXrq<SHJ&~tF_|j+kKu#1;kxr
zL<$3sxK8bhE;(Mi^Qmsa1^yXa@poo)oJmwNYVSNDqo!0m!>ZfISgZdhAEQIOp6kaD
VvxKX%AO|scy85}Sb4p-r0stffKgR$7

diff --git a/client/images/connected_line.png b/client/images/connected_line.png
deleted file mode 100644
index 9ed7fd74da435fda980297d6b16e9418a8a1d0f2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 87
zcmeAS@N?(olHy`uVBq!ia0vp^3xSx4gAGU;+}!gGNXdD+IEGmCCdce9dt2WYXu!oL
lVDRt%|9TU_z9vRi1}6)4R?f4D_kk)IJYD@<);T3K0RV-Y7iIte

diff --git a/client/images/listitembg.png b/client/images/listitembg.png
deleted file mode 100644
index 4107a7ea4198c86310370c2c07b64ebfa21c81cf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 318
zcmeAS@N?(olHy`uVBq!ia0y~yU@Qc(O*q(qWKAl^d7uERr;B4q#hka-HfAz2GO!%1
zPMqMh^xb}o<zDuaqBl&n;WieH*>Y#&+l_B`zO`e}I+weCeeU`1zyB70m16k!+@kOO
zZJUCIRlnc9Vr8iDJHmL#MMlAA&{A)<z1>sA!XR(ipWB~%KKFa~afT1&&$nIIXaB|3
V`JnpEE?~GYc)I$ztaD0e0syG5cNG8t

diff --git a/client/images/underline.png b/client/images/underline.png
deleted file mode 100644
index e38c37b64d37985864554762adec1cc0c6a0b235..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 80
zcmeAS@N?(olHy`uVBq!ia0y~yVAKGz89CU1WbS3-U?3&#>Eak-(VOh!?fv__0hilB
e4GGp}0R{#QPbOm)&emN(B@CXfelF{r5}E)}>k#Gu

diff --git a/client/res.qrc b/client/res.qrc
index 667df8cd..cf0eaa83 100644
--- a/client/res.qrc
+++ b/client/res.qrc
@@ -1,9 +1,7 @@
 <RCC>
     <qresource prefix="/">
         <file>images/close.png</file>
-        <file>images/listitembg.png</file>
         <file>images/settings.png</file>
-        <file>images/underline.png</file>
         <file>images/min.png</file>
         <file>images/favorites_disabled.png</file>
         <file>images/favorites_enabled.png</file>
@@ -12,7 +10,6 @@
         <file>images/controls/check_on.png</file>
         <file>images/controls/radio_off.png</file>
         <file>images/controls/radio_on.png</file>
-        <file>images/connected_line.png</file>
         <file>images/download.png</file>
         <file>images/upload.png</file>
         <file>images/controls/checkbox_hover.png</file>
@@ -33,7 +30,6 @@
         <file>fonts/Lato-Regular.ttf</file>
         <file>fonts/Lato-Thin.ttf</file>
         <file>fonts/Lato-ThinItalic.ttf</file>
-        <file>images/Line.png</file>
         <file>images/AmneziaVPN.png</file>
     </qresource>
 </RCC>
diff --git a/client/ui/mainwindow.ui b/client/ui/mainwindow.ui
index 2cfad309..a8a1576b 100644
--- a/client/ui/mainwindow.ui
+++ b/client/ui/mainwindow.ui
@@ -268,56 +268,12 @@ QStackedWidget QWidget {
 }
 </string>
      </property>
-     <widget class="QWidget" name="page_new_server">
-      <widget class="QPushButton" name="pushButton_amnezia_logo_2">
-       <property name="geometry">
-        <rect>
-         <x>60</x>
-         <y>20</y>
-         <width>121</width>
-         <height>101</height>
-        </rect>
-       </property>
-       <property name="cursor">
-        <cursorShape>PointingHandCursor</cursorShape>
-       </property>
-       <property name="styleSheet">
-        <string notr="true">image: url(:/images/tray/active.png);</string>
-       </property>
-       <property name="text">
-        <string/>
-       </property>
-       <property name="checkable">
-        <bool>true</bool>
-       </property>
-      </widget>
-      <widget class="QPushButton" name="pushButton_amnezia_logo_3">
-       <property name="geometry">
-        <rect>
-         <x>190</x>
-         <y>40</y>
-         <width>131</width>
-         <height>71</height>
-        </rect>
-       </property>
-       <property name="cursor">
-        <cursorShape>PointingHandCursor</cursorShape>
-       </property>
-       <property name="styleSheet">
-        <string notr="true">image: url(:/images/AmneziaVPN.png);</string>
-       </property>
-       <property name="text">
-        <string/>
-       </property>
-       <property name="checkable">
-        <bool>true</bool>
-       </property>
-      </widget>
-      <widget class="QLabel" name="label_2">
+     <widget class="QWidget" name="page_connect_server">
+      <widget class="QLabel" name="label_23">
        <property name="geometry">
         <rect>
          <x>10</x>
-         <y>150</y>
+         <y>40</y>
          <width>361</width>
          <height>71</height>
         </rect>
@@ -327,7 +283,211 @@ QStackedWidget QWidget {
 font-style: normal;
 font-weight: bold;
 font-size: 24px;
-line-height: 25px;</string>
+line-height: 25px;
+color: #100A44;
+</string>
+       </property>
+       <property name="text">
+        <string>Подключиться к уже
+ созданному серверу VPN</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignCenter</set>
+       </property>
+      </widget>
+      <widget class="QLabel" name="label_24">
+       <property name="geometry">
+        <rect>
+         <x>40</x>
+         <y>130</y>
+         <width>171</width>
+         <height>21</height>
+        </rect>
+       </property>
+       <property name="styleSheet">
+        <string notr="true">font-family: Lato;
+font-style: normal;
+font-weight: normal;
+font-size: 16px;
+line-height: 150%;
+
+/* or 24px */
+
+/* text */
+color: #333333;</string>
+       </property>
+       <property name="text">
+        <string>Код для подключения</string>
+       </property>
+      </widget>
+      <widget class="QProgressBar" name="progressBar_new_server_connection_3">
+       <property name="geometry">
+        <rect>
+         <x>40</x>
+         <y>220</y>
+         <width>301</width>
+         <height>41</height>
+        </rect>
+       </property>
+       <property name="styleSheet">
+        <string notr="true">background: #181922;
+border-radius: 4px;</string>
+       </property>
+       <property name="value">
+        <number>24</number>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignCenter</set>
+       </property>
+       <property name="textVisible">
+        <bool>true</bool>
+       </property>
+       <property name="format">
+        <string>Подключение...</string>
+       </property>
+      </widget>
+      <widget class="QLabel" name="label_25">
+       <property name="geometry">
+        <rect>
+         <x>110</x>
+         <y>590</y>
+         <width>150</width>
+         <height>22</height>
+        </rect>
+       </property>
+       <property name="styleSheet">
+        <string notr="true">image: url(:/images/AmneziaVPN.png);</string>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+      </widget>
+      <widget class="QLineEdit" name="lineEdit_new_server_ip_3">
+       <property name="geometry">
+        <rect>
+         <x>40</x>
+         <y>160</y>
+         <width>300</width>
+         <height>40</height>
+        </rect>
+       </property>
+       <property name="styleSheet">
+        <string notr="true">background: #F4F4F4;
+
+/* grey */
+border: 1px solid #A7A7A7;
+box-sizing: border-box;
+color: #333333;</string>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+      </widget>
+      <widget class="QPushButton" name="pushButton_new_server_3">
+       <property name="geometry">
+        <rect>
+         <x>40</x>
+         <y>220</y>
+         <width>301</width>
+         <height>40</height>
+        </rect>
+       </property>
+       <property name="cursor">
+        <cursorShape>PointingHandCursor</cursorShape>
+       </property>
+       <property name="styleSheet">
+        <string notr="true">QPushButton {
+	font-size: 13pt;
+	font: &quot;Open Sans Semibold&quot;;
+	color:rgb(212, 212, 212);
+	
+border-radius: 4px;
+
+font-family: Lato;
+font-style: normal;
+font-weight: normal;
+font-size: 16px;
+line-height: 21px;
+
+background: #100A44;
+border-radius: 4px;
+}
+</string>
+       </property>
+       <property name="text">
+        <string>Подключиться</string>
+       </property>
+      </widget>
+      <widget class="QPushButton" name="pushButton_new_server_4">
+       <property name="geometry">
+        <rect>
+         <x>40</x>
+         <y>320</y>
+         <width>301</width>
+         <height>40</height>
+        </rect>
+       </property>
+       <property name="cursor">
+        <cursorShape>PointingHandCursor</cursorShape>
+       </property>
+       <property name="styleSheet">
+        <string notr="true">QPushButton {
+
+font-family: Lato;
+font-style: normal;
+font-weight: normal;
+font-size: 16px;
+
+color: #100A44;
+	
+font-family: Lato;
+font-style: normal;
+font-weight: normal;
+font-size: 16px;
+line-height: 21px;
+
+border: 1px solid #211C4A;
+border-radius: 4px;
+}
+</string>
+       </property>
+       <property name="text">
+        <string>Настроить собственный сервер</string>
+       </property>
+      </widget>
+     </widget>
+     <widget class="QWidget" name="page_new_server">
+      <property name="styleSheet">
+       <string notr="true">QLabel  {
+font-family: Lato;
+font-style: normal;
+font-weight: normal;
+font-size: 16px;
+color: #211C4A;
+}
+
+QLineEdit {
+padding-left: 10px;
+border: 1px solid #A7A7A7;
+}</string>
+      </property>
+      <widget class="QLabel" name="label_2">
+       <property name="geometry">
+        <rect>
+         <x>10</x>
+         <y>40</y>
+         <width>361</width>
+         <height>71</height>
+        </rect>
+       </property>
+       <property name="styleSheet">
+        <string notr="true">font-family: Lato;
+font-style: normal;
+font-weight: bold;
+font-size: 24px;
+line-height: 25px;
+color: #100A44;
+</string>
        </property>
        <property name="text">
         <string>Подключите ваш сервер,
@@ -341,7 +501,7 @@ line-height: 25px;</string>
        <property name="geometry">
         <rect>
          <x>40</x>
-         <y>290</y>
+         <y>170</y>
          <width>171</width>
          <height>21</height>
         </rect>
@@ -366,7 +526,7 @@ color: #333333;</string>
        <property name="geometry">
         <rect>
          <x>40</x>
-         <y>370</y>
+         <y>255</y>
          <width>261</width>
          <height>21</height>
         </rect>
@@ -391,7 +551,7 @@ color: #333333;</string>
        <property name="geometry">
         <rect>
          <x>40</x>
-         <y>450</y>
+         <y>340</y>
          <width>171</width>
          <height>21</height>
         </rect>
@@ -416,9 +576,9 @@ color: #333333;</string>
        <property name="geometry">
         <rect>
          <x>40</x>
-         <y>320</y>
-         <width>301</width>
-         <height>31</height>
+         <y>200</y>
+         <width>300</width>
+         <height>40</height>
         </rect>
        </property>
        <property name="styleSheet">
@@ -437,9 +597,9 @@ color: #333333;</string>
        <property name="geometry">
         <rect>
          <x>40</x>
-         <y>400</y>
-         <width>301</width>
-         <height>31</height>
+         <y>285</y>
+         <width>300</width>
+         <height>40</height>
         </rect>
        </property>
        <property name="styleSheet">
@@ -458,9 +618,9 @@ color: #333333;</string>
        <property name="geometry">
         <rect>
          <x>40</x>
-         <y>480</y>
-         <width>301</width>
-         <height>31</height>
+         <y>370</y>
+         <width>300</width>
+         <height>40</height>
         </rect>
        </property>
        <property name="styleSheet">
@@ -482,7 +642,7 @@ color: #333333;</string>
        <property name="geometry">
         <rect>
          <x>40</x>
-         <y>550</y>
+         <y>440</y>
          <width>301</width>
          <height>40</height>
         </rect>
@@ -496,7 +656,6 @@ color: #333333;</string>
 	font: &quot;Open Sans Semibold&quot;;
 	color:rgb(212, 212, 212);
 	
-background: #181922;
 border-radius: 4px;
 
 font-family: Lato;
@@ -505,18 +664,20 @@ font-weight: normal;
 font-size: 16px;
 line-height: 21px;
 
+background: #100A44;
+border-radius: 4px;
 }
 </string>
        </property>
        <property name="text">
-        <string>Подключить</string>
+        <string>Подключиться</string>
        </property>
       </widget>
       <widget class="QPushButton" name="pushButton">
        <property name="geometry">
         <rect>
          <x>50</x>
-         <y>230</y>
+         <y>120</y>
          <width>281</width>
          <height>16</height>
         </rect>
@@ -540,11 +701,11 @@ color: #15CDCB;</string>
         <string>Где взять данные для подключения →</string>
        </property>
       </widget>
-      <widget class="QProgressBar" name="progressBar">
+      <widget class="QProgressBar" name="progressBar_new_server_connection">
        <property name="geometry">
         <rect>
          <x>40</x>
-         <y>550</y>
+         <y>440</y>
          <width>301</width>
          <height>41</height>
         </rect>
@@ -566,9 +727,55 @@ border-radius: 4px;</string>
         <string>Подключение...</string>
        </property>
       </widget>
-      <zorder>progressBar</zorder>
-      <zorder>pushButton_amnezia_logo_2</zorder>
-      <zorder>pushButton_amnezia_logo_3</zorder>
+      <widget class="QPushButton" name="pushButton_back_from_new_server">
+       <property name="geometry">
+        <rect>
+         <x>10</x>
+         <y>10</y>
+         <width>26</width>
+         <height>20</height>
+        </rect>
+       </property>
+       <property name="cursor">
+        <cursorShape>PointingHandCursor</cursorShape>
+       </property>
+       <property name="styleSheet">
+        <string notr="true">QPushButton {
+	image: url(:/images/arrow_right.png);
+	image-position: left;
+	text-align: left;
+    /*font: 17pt &quot;Ancient&quot;;*/
+
+	padding: 1px;
+	image: url(:/images/arrow_left.png);
+}
+QPushButton:hover {
+	padding: 0px;
+}
+
+</string>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+      </widget>
+      <widget class="QLabel" name="label_7">
+       <property name="geometry">
+        <rect>
+         <x>110</x>
+         <y>590</y>
+         <width>150</width>
+         <height>22</height>
+        </rect>
+       </property>
+       <property name="styleSheet">
+        <string notr="true">image: url(:/images/AmneziaVPN.png);</string>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+      </widget>
+      <zorder>progressBar_new_server_connection</zorder>
       <zorder>label_2</zorder>
       <zorder>label_4</zorder>
       <zorder>label_5</zorder>
@@ -578,130 +785,8 @@ border-radius: 4px;</string>
       <zorder>lineEdit_new_server_password</zorder>
       <zorder>pushButton_new_server</zorder>
       <zorder>pushButton</zorder>
-     </widget>
-     <widget class="QWidget" name="page_init">
-      <property name="styleSheet">
-       <string notr="true"/>
-      </property>
-      <widget class="QLabel" name="label_17">
-       <property name="geometry">
-        <rect>
-         <x>0</x>
-         <y>200</y>
-         <width>380</width>
-         <height>25</height>
-        </rect>
-       </property>
-       <property name="text">
-        <string>Discovering network...</string>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignCenter</set>
-       </property>
-       <property name="wordWrap">
-        <bool>true</bool>
-       </property>
-      </widget>
-      <widget class="QLabel" name="label_init_animation">
-       <property name="geometry">
-        <rect>
-         <x>119</x>
-         <y>30</y>
-         <width>142</width>
-         <height>122</height>
-        </rect>
-       </property>
-       <property name="text">
-        <string/>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignCenter</set>
-       </property>
-       <property name="wordWrap">
-        <bool>true</bool>
-       </property>
-      </widget>
-      <widget class="QLabel" name="label_init_message_1">
-       <property name="geometry">
-        <rect>
-         <x>0</x>
-         <y>225</y>
-         <width>380</width>
-         <height>25</height>
-        </rect>
-       </property>
-       <property name="text">
-        <string/>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignCenter</set>
-       </property>
-       <property name="wordWrap">
-        <bool>true</bool>
-       </property>
-      </widget>
-      <widget class="QLabel" name="label_init_message_2">
-       <property name="geometry">
-        <rect>
-         <x>0</x>
-         <y>250</y>
-         <width>380</width>
-         <height>25</height>
-        </rect>
-       </property>
-       <property name="text">
-        <string/>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignCenter</set>
-       </property>
-       <property name="wordWrap">
-        <bool>true</bool>
-       </property>
-      </widget>
-      <widget class="QLabel" name="label_init_message_3">
-       <property name="geometry">
-        <rect>
-         <x>0</x>
-         <y>230</y>
-         <width>380</width>
-         <height>41</height>
-        </rect>
-       </property>
-       <property name="text">
-        <string/>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignCenter</set>
-       </property>
-       <property name="wordWrap">
-        <bool>true</bool>
-       </property>
-      </widget>
-      <widget class="QLabel" name="label_version">
-       <property name="geometry">
-        <rect>
-         <x>270</x>
-         <y>670</y>
-         <width>91</width>
-         <height>31</height>
-        </rect>
-       </property>
-       <property name="styleSheet">
-        <string notr="true">/*font: 8pt &quot;JMH Cthulhumbus&quot;;*/
-font-size: 10px;
-
-color: rgb(62, 62, 62);
-</string>
-       </property>
-       <property name="text">
-        <string>Build v. 1.1
- 07 Oct 2020</string>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
-       </property>
-      </widget>
+      <zorder>pushButton_back_from_new_server</zorder>
+      <zorder>label_7</zorder>
      </widget>
      <widget class="QWidget" name="page_amnezia">
       <property name="styleSheet">
@@ -1070,9 +1155,9 @@ color: #181922;
        <property name="geometry">
         <rect>
          <x>10</x>
-         <y>0</y>
-         <width>381</width>
-         <height>25</height>
+         <y>10</y>
+         <width>28</width>
+         <height>20</height>
         </rect>
        </property>
        <property name="cursor">
@@ -1095,7 +1180,7 @@ QPushButton:hover {
 </string>
        </property>
        <property name="text">
-        <string>        Back</string>
+        <string/>
        </property>
       </widget>
       <widget class="QLabel" name="label_20">