AZEN-SGG/amnezia-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ui fixes

Browse source
This commit is contained in:
pokamest 2020-11-25 23:43:51 +03:00
parent f68415f08e
commit d0a24eb225
8 changed files with 282 additions and 201 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
client/images/AmneziaVPN.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

Before After
Before After

BIN
client/images/Line.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 136 B

BIN
client/images/arrow_left.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 214 B

After

Width:  |  Height:  |  Size: 282 B

Before After
Before After

BIN
client/images/connected_line.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 87 B

BIN
client/images/listitembg.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 318 B

BIN
client/images/underline.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 80 B

4
client/res.qrc
View file

@ -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>

479
client/ui/mainwindow.ui
View file

@ -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">