diff --git a/client/core/openvpnconfigurator.cpp b/client/core/openvpnconfigurator.cpp index 3d641261..813b4b85 100644 --- a/client/core/openvpnconfigurator.cpp +++ b/client/core/openvpnconfigurator.cpp @@ -41,6 +41,8 @@ QProcessEnvironment OpenVpnConfigurator::prepareEnv() QProcessEnvironment env = QProcessEnvironment::systemEnvironment(); QString pathEnvVar = env.value("PATH"); 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); return env; diff --git a/client/ui/mainwindow.cpp b/client/ui/mainwindow.cpp index 9a17e3af..db995c67 100644 --- a/client/ui/mainwindow.cpp +++ b/client/ui/mainwindow.cpp @@ -51,13 +51,11 @@ MainWindow::MainWindow(QWidget *parent) : // Post initialization if (m_settings->haveAuthData()) { - goToPage(Page::Vpn); + ui->stackedWidget_main->setCurrentWidget(ui->page_amnezia); } 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_connect, SIGNAL(toggled(bool)), this, SLOT(onPushButtonConnectToggled(bool))); connect(ui->pushButton_settings, SIGNAL(clicked(bool)), this, SLOT(onPushButtonSettingsClicked(bool))); diff --git a/client/ui/mainwindow.ui b/client/ui/mainwindow.ui index 361a3be5..d74f6356 100644 --- a/client/ui/mainwindow.ui +++ b/client/ui/mainwindow.ui @@ -267,7 +267,7 @@ QStackedWidget QWidget { - 1 + 2 @@ -833,9 +833,6 @@ QPushButton:hover { 325 - - PointingHandCursor - border-image: url(:/images/background_connected.png); @@ -1114,6 +1111,9 @@ color: #181922; For all connections + + true + @@ -1131,7 +1131,7 @@ color: #181922; For selected sites - true + false diff --git a/deploy/data/windows/openvpn/i386/openssl.exe b/deploy/data/windows/openvpn/i386/openssl.exe new file mode 100644 index 00000000..db9967f4 Binary files /dev/null and b/deploy/data/windows/openvpn/i386/openssl.exe differ