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

deploy fix

Browse source
This commit is contained in:
pokamest 2021-01-08 00:34:15 +03:00
parent bfdbe27a8d
commit 82241701a9
4 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/core/openvpnconfigurator.cpp
View file

@ -41,6 +41,8 @@ QProcessEnvironment OpenVpnConfigurator::prepareEnv()
QProcessEnvironment env = QProcessEnvironment::systemEnvironment(); QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
QString pathEnvVar = env.value("PATH"); QString pathEnvVar = env.value("PATH");
pathEnvVar.prepend(QDir::toNativeSeparators(QApplication::applicationDirPath()) + "\\easyrsa\\bin;"); pathEnvVar.prepend(QDir::toNativeSeparators(QApplication::applicationDirPath()) + "\\easyrsa\\bin;");
pathEnvVar.prepend(QDir::toNativeSeparators(QApplication::applicationDirPath()) + "\\openvpn\\i386;");
pathEnvVar.prepend(QDir::toNativeSeparators(QApplication::applicationDirPath()) + "\\openvpn\\x64;");
env.insert("PATH", pathEnvVar); env.insert("PATH", pathEnvVar);
return env; return env;

6
client/ui/mainwindow.cpp
View file

@ -51,13 +51,11 @@ MainWindow::MainWindow(QWidget *parent) :
// Post initialization // Post initialization
if (m_settings->haveAuthData()) { if (m_settings->haveAuthData()) {
goToPage(Page::Vpn); ui->stackedWidget_main->setCurrentWidget(ui->page_amnezia);
} else { } else {
goToPage(Page::Initialization); ui->stackedWidget_main->setCurrentWidget(ui->page_new_server);
} }
//goToPage(Page::Initialization);
connect(ui->pushButton_blocked_list, SIGNAL(clicked(bool)), this, SLOT(onPushButtonBlockedListClicked(bool))); connect(ui->pushButton_blocked_list, SIGNAL(clicked(bool)), this, SLOT(onPushButtonBlockedListClicked(bool)));
connect(ui->pushButton_connect, SIGNAL(toggled(bool)), this, SLOT(onPushButtonConnectToggled(bool))); connect(ui->pushButton_connect, SIGNAL(toggled(bool)), this, SLOT(onPushButtonConnectToggled(bool)));
connect(ui->pushButton_settings, SIGNAL(clicked(bool)), this, SLOT(onPushButtonSettingsClicked(bool))); connect(ui->pushButton_settings, SIGNAL(clicked(bool)), this, SLOT(onPushButtonSettingsClicked(bool)));

10
client/ui/mainwindow.ui
View file

@ -267,7 +267,7 @@ QStackedWidget QWidget {
</string> </string>
</property> </property>
<property name="currentIndex"> <property name="currentIndex">
<number>1</number> <number>2</number>
</property> </property>
<widget class="QWidget" name="page_connect_server"> <widget class="QWidget" name="page_connect_server">
<widget class="QLabel" name="label_23"> <widget class="QLabel" name="label_23">
@ -833,9 +833,6 @@ QPushButton:hover {
<height>325</height> <height>325</height>
</rect> </rect>
</property> </property>
<property name="cursor">
<cursorShape>PointingHandCursor</cursorShape>
</property>
<property name="styleSheet"> <property name="styleSheet">
<string notr="true">border-image: url(:/images/background_connected.png);</string> <string notr="true">border-image: url(:/images/background_connected.png);</string>
</property> </property>
@ -1114,6 +1111,9 @@ color: #181922;
<property name="text"> <property name="text">
<string>For all connections</string> <string>For all connections</string>
</property> </property>
<property name="checked">
<bool>true</bool>
</property>
</widget> </widget>
<widget class="QRadioButton" name="radioButton_2"> <widget class="QRadioButton" name="radioButton_2">
<property name="enabled"> <property name="enabled">
@ -1131,7 +1131,7 @@ color: #181922;
<string>For selected sites</string> <string>For selected sites</string>
</property> </property>
<property name="checked"> <property name="checked">
<bool>true</bool> <bool>false</bool>
</property> </property>
</widget> </widget>
</widget> </widget>

BIN
deploy/data/windows/openvpn/i386/openssl.exe Normal file
View file

Binary file not shown.