diff --git a/client/debug.cpp b/client/debug.cpp index 9c0578b56..466c226f9 100644 --- a/client/debug.cpp +++ b/client/debug.cpp @@ -3,6 +3,7 @@ #include #include #include +#include #include @@ -74,6 +75,14 @@ bool Debug::openLogsFolder() return true; } +bool Debug::openServiceLogsFolder() +{ + QString path = Utils::systemLogPath(); + path = "file:///" + path; + QDesktopServices::openUrl(QUrl::fromLocalFile(path)); + return true; +} + QString Debug::appLogFileNamePath() { return m_file.fileName(); diff --git a/client/debug.h b/client/debug.h index 84ab53416..e0744842d 100644 --- a/client/debug.h +++ b/client/debug.h @@ -12,6 +12,7 @@ class Debug public: static bool init(); static bool openLogsFolder(); + static bool openServiceLogsFolder(); static QString appLogFileNamePath(); private: diff --git a/client/ui/pages_logic/VpnLogic.cpp b/client/ui/pages_logic/VpnLogic.cpp index 045d710de..cc7884fc9 100644 --- a/client/ui/pages_logic/VpnLogic.cpp +++ b/client/ui/pages_logic/VpnLogic.cpp @@ -1,37 +1,3 @@ -//#include -//#include -//#include -//#include -//#include -//#include -//#include -//#include -//#include -//#include -//#include -//#include -//#include -//#include -//#include -//#include -//#include -//#include -//#include - -//#include "configurators/cloak_configurator.h" -//#include "configurators/vpn_configurator.h" -//#include "configurators/openvpn_configurator.h" -//#include "configurators/shadowsocks_configurator.h" -//#include "configurators/ssh_configurator.h" - -//#include "core/servercontroller.h" -//#include "core/server_defs.h" -//#include "core/errorstrings.h" - -//#include "containers/containers_defs.h" -//#include "protocols/shadowsocksvpnprotocol.h" - - #include "VpnLogic.h" #include "core/errorstrings.h" @@ -52,7 +18,6 @@ VpnLogic::VpnLogic(UiLogic *logic, QObject *parent): m_labelSpeedReceivedText{tr("0 Mbps")}, m_labelSpeedSentText{tr("0 Mbps")}, m_labelStateText{}, - m_pushButtonConnectEnabled{false}, m_widgetVpnModeEnabled{false} { connect(uiLogic()->m_vpnConnection, &VpnConnection::bytesChanged, this, &VpnLogic::onBytesChanged); @@ -107,10 +72,10 @@ void VpnLogic::onBytesChanged(quint64 receivedData, quint64 sentData) void VpnLogic::onConnectionStateChanged(VpnProtocol::ConnectionState state) { - qDebug() << "UiLogic::onConnectionStateChanged" << VpnProtocol::textConnectionState(state); + qDebug() << "VpnLogic::onConnectionStateChanged" << VpnProtocol::textConnectionState(state); - bool pushButtonConnectEnabled = false; - bool radioButtonsModeEnabled = false; + bool pbConnectEnabled = false; + bool rbModeEnabled = false; set_labelStateText(VpnProtocol::textConnectionState(state)); uiLogic()->setTrayState(state); @@ -119,41 +84,41 @@ void VpnLogic::onConnectionStateChanged(VpnProtocol::ConnectionState state) case VpnProtocol::Disconnected: onBytesChanged(0,0); set_pushButtonConnectChecked(false); - pushButtonConnectEnabled = true; - radioButtonsModeEnabled = true; + pbConnectEnabled = true; + rbModeEnabled = true; break; case VpnProtocol::Preparing: - pushButtonConnectEnabled = false; - radioButtonsModeEnabled = false; + pbConnectEnabled = false; + rbModeEnabled = false; break; case VpnProtocol::Connecting: - pushButtonConnectEnabled = false; - radioButtonsModeEnabled = false; + pbConnectEnabled = false; + rbModeEnabled = false; break; case VpnProtocol::Connected: - pushButtonConnectEnabled = true; - radioButtonsModeEnabled = false; + pbConnectEnabled = true; + rbModeEnabled = false; break; case VpnProtocol::Disconnecting: - pushButtonConnectEnabled = false; - radioButtonsModeEnabled = false; + pbConnectEnabled = false; + rbModeEnabled = false; break; case VpnProtocol::Reconnecting: - pushButtonConnectEnabled = true; - radioButtonsModeEnabled = false; + pbConnectEnabled = true; + rbModeEnabled = false; break; case VpnProtocol::Error: set_pushButtonConnectEnabled(false); - pushButtonConnectEnabled = true; - radioButtonsModeEnabled = true; + pbConnectEnabled = true; + rbModeEnabled = true; break; case VpnProtocol::Unknown: - pushButtonConnectEnabled = true; - radioButtonsModeEnabled = true; + pbConnectEnabled = true; + rbModeEnabled = true; } - set_pushButtonConnectEnabled(pushButtonConnectEnabled); - set_widgetVpnModeEnabled(radioButtonsModeEnabled); + set_pushButtonConnectEnabled(pbConnectEnabled); + set_widgetVpnModeEnabled(rbModeEnabled); } void VpnLogic::onVpnProtocolError(ErrorCode errorCode) @@ -197,11 +162,12 @@ void VpnLogic::onConnectWorker(int serverIndex, const ServerCredentials &credent { set_labelErrorText(""); set_pushButtonConnectChecked(true); + set_pushButtonConnectEnabled(false); + qApp->processEvents(); ErrorCode errorCode = uiLogic()->m_vpnConnection->connectToVpn( - serverIndex, credentials, container, containerConfig - ); + serverIndex, credentials, container, containerConfig); if (errorCode) { //ui->pushButton_connect->setChecked(false); @@ -210,7 +176,6 @@ void VpnLogic::onConnectWorker(int serverIndex, const ServerCredentials &credent return; } - set_pushButtonConnectEnabled(false); } void VpnLogic::onDisconnect() diff --git a/client/ui/uilogic.cpp b/client/ui/uilogic.cpp index 3e2276c3b..d1525a7fb 100644 --- a/client/ui/uilogic.cpp +++ b/client/ui/uilogic.cpp @@ -294,10 +294,9 @@ void UiLogic::showOnStartup() void UiLogic::keyPressEvent(Qt::Key key) { switch (key) { - case Qt::Key_L: - if (!Debug::openLogsFolder()) { - //QMessageBox::warning(this, APPLICATION_NAME, tr("Cannot open logs folder!")); - } + case Qt::Key_L: Debug::openLogsFolder(); + break; + case Qt::Key_K: Debug::openServiceLogsFolder(); break; #ifdef QT_DEBUG case Qt::Key_Q: diff --git a/ipc/ipcserverprocess.cpp b/ipc/ipcserverprocess.cpp index 88848b90c..f9cdd20f5 100644 --- a/ipc/ipcserverprocess.cpp +++ b/ipc/ipcserverprocess.cpp @@ -19,17 +19,17 @@ IpcServerProcess::IpcServerProcess(QObject *parent) : qDebug() << "IpcServerProcess errorOccurred " << error; }); - connect(m_process.data(), &QProcess::readyReadStandardError, this, [this](){ - qDebug() << "IpcServerProcess StandardError " << m_process->readAllStandardError(); +// connect(m_process.data(), &QProcess::readyReadStandardError, this, [this](){ +// qDebug() << "IpcServerProcess StandardError " << m_process->readAllStandardError(); - }); - connect(m_process.data(), &QProcess::readyReadStandardOutput, this, [this](){ - qDebug() << "IpcServerProcess StandardOutput " << m_process->readAllStandardOutput(); - }); +// }); +// connect(m_process.data(), &QProcess::readyReadStandardOutput, this, [this](){ +// qDebug() << "IpcServerProcess StandardOutput " << m_process->readAllStandardOutput(); +// }); - connect(m_process.data(), &QProcess::readyRead, this, [this](){ - qDebug() << "IpcServerProcess StandardOutput " << m_process->readAll(); - }); +// connect(m_process.data(), &QProcess::readyRead, this, [this](){ +// qDebug() << "IpcServerProcess StandardOutput " << m_process->readAll(); +// }); }