mirror of
https://github.com/amnezia-vpn/amnezia-client.git
synced 2026-06-22 02:01:08 +07:00
deploy fix
This commit is contained in:
@@ -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;
|
||||||
|
|||||||
@@ -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)));
|
||||||
|
|||||||
@@ -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>
|
||||||
|
|||||||
Binary file not shown.
Reference in New Issue
Block a user