github/Qv2ray
5
0
Fork 0
mirror of https://github.com/Qv2ray/Qv2ray.git synced 2025-05-20 19:00:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix.

Browse Source
This commit is contained in:
Hork 2019-05-10 13:17:27 +08:00
parent 0f24b32b7e
commit 97cbe106ea
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/mainwindow.cpp
View File

@ -16,6 +16,7 @@
#include "confedit.h" #include "confedit.h"
#include "importconf.h" #include "importconf.h"
#include "vinteract.h" #include "vinteract.h"
#include "utils.h"
MainWindow::MainWindow(QWidget *parent) : MainWindow::MainWindow(QWidget *parent) :
QMainWindow(parent), QMainWindow(parent),
@ -138,6 +139,7 @@ void MainWindow::geneConf(int idIntable)
tmpConf.query(idIntable); tmpConf.query(idIntable);
if (tmpConf.isCustom == 1) { if (tmpConf.isCustom == 1) {
QString src = "conf/" + QString::number(idIntable) + ".conf"; QString src = "conf/" + QString::number(idIntable) + ".conf";
overrideInbounds(src);
if (QFile::exists("config.json")) { if (QFile::exists("config.json")) {
QFile::remove("config.json"); QFile::remove("config.json");
} }
@ -155,7 +157,6 @@ void MainWindow::on_startButton_clicked()
{ {
ui->logText->clear(); ui->logText->clear();
bool startFlag = this->v2Inst->start(this); bool startFlag = this->v2Inst->start(this);
trayMenu->actions()[2]->setEnabled(!startFlag); trayMenu->actions()[2]->setEnabled(!startFlag);
trayMenu->actions()[3]->setEnabled(startFlag); trayMenu->actions()[3]->setEnabled(startFlag);
trayMenu->actions()[4]->setEnabled(startFlag); trayMenu->actions()[4]->setEnabled(startFlag);
@ -165,7 +166,6 @@ void MainWindow::on_stopButton_clicked()
{ {
this->v2Inst->stop(); this->v2Inst->stop();
ui->logText->clear(); ui->logText->clear();
trayMenu->actions()[2]->setEnabled(true); trayMenu->actions()[2]->setEnabled(true);
trayMenu->actions()[3]->setEnabled(false); trayMenu->actions()[3]->setEnabled(false);
trayMenu->actions()[4]->setEnabled(false); trayMenu->actions()[4]->setEnabled(false);
@ -206,17 +206,14 @@ void MainWindow::createTrayAction()
QAction *actionStart = new QAction(this); QAction *actionStart = new QAction(this);
QAction *actionRestart = new QAction(this); QAction *actionRestart = new QAction(this);
QAction *actionStop = new QAction(this); QAction *actionStop = new QAction(this);
actionShow->setText("Hide"); actionShow->setText("Hide");
actionQuit->setText("Quit Hv2ray"); actionQuit->setText("Quit Hv2ray");
actionStart->setText("Start v2ray"); actionStart->setText("Start v2ray");
actionStop->setText("Stop v2ray"); actionStop->setText("Stop v2ray");
actionRestart->setText("Restart v2ray"); actionRestart->setText("Restart v2ray");
actionStart->setEnabled(true); actionStart->setEnabled(true);
actionStop->setEnabled(false); actionStop->setEnabled(false);
actionRestart->setEnabled(false); actionRestart->setEnabled(false);
trayMenu->addAction(actionShow); trayMenu->addAction(actionShow);
trayMenu->addSeparator(); trayMenu->addSeparator();
trayMenu->addAction(actionStart); trayMenu->addAction(actionStart);
@ -224,13 +221,11 @@ void MainWindow::createTrayAction()
trayMenu->addAction(actionRestart); trayMenu->addAction(actionRestart);
trayMenu->addSeparator(); trayMenu->addSeparator();
trayMenu->addAction(actionQuit); trayMenu->addAction(actionQuit);
connect(actionShow, SIGNAL(triggered()), this, SLOT(toggleMainWindowVisibility())); connect(actionShow, SIGNAL(triggered()), this, SLOT(toggleMainWindowVisibility()));
connect(actionStart, SIGNAL(triggered()), this, SLOT(on_startButton_clicked())); connect(actionStart, SIGNAL(triggered()), this, SLOT(on_startButton_clicked()));
connect(actionStop, SIGNAL(triggered()), this, SLOT(on_stopButton_clicked())); connect(actionStop, SIGNAL(triggered()), this, SLOT(on_stopButton_clicked()));
connect(actionRestart, SIGNAL(triggered()), this, SLOT(on_restartButton_clicked())); connect(actionRestart, SIGNAL(triggered()), this, SLOT(on_restartButton_clicked()));
connect(actionQuit, SIGNAL(triggered()), this, SLOT(quit())); connect(actionQuit, SIGNAL(triggered()), this, SLOT(quit()));
hTray->setContextMenu(trayMenu); hTray->setContextMenu(trayMenu);
hTray->show(); hTray->show();
} }
@ -250,7 +245,7 @@ void MainWindow::on_activatedTray(QSystemTrayIcon::ActivationReason reason)
case QSystemTrayIcon::MiddleClick: case QSystemTrayIcon::MiddleClick:
// TODO: Check if an alert message box is present. // TODO: Check if an alert message box is present.
// If so, do nothing but please wait for the message box to be closed. // If so, do nothing but please wait for the message box to be closed.
if(this->v2Inst->v2Process->state() == QProcess::ProcessState::Running){ if(this->v2Inst->v2Process->state() == QProcess::ProcessState::Running) {
on_stopButton_clicked(); on_stopButton_clicked();
} else { } else {
on_startButton_clicked(); on_startButton_clicked();

1
src/vmess.cpp
View File

@ -45,7 +45,6 @@ void vmess::on_buttonBox_accepted()
if(QFile::exists(QCoreApplication::applicationDirPath() + "/config.json.tmp")) { if(QFile::exists(QCoreApplication::applicationDirPath() + "/config.json.tmp")) {
importConf *im = new importConf(this->parentWidget()); importConf *im = new importConf(this->parentWidget());
if (validationCheck(QCoreApplication::applicationDirPath() + "/config.json.tmp")) { if (validationCheck(QCoreApplication::applicationDirPath() + "/config.json.tmp")) {
overrideInbounds(QCoreApplication::applicationDirPath() + "/config.json.tmp");
im->savefromFile("config.json.tmp", alias); im->savefromFile("config.json.tmp", alias);
} }
QFile::remove("config.json.tmp"); QFile::remove("config.json.tmp");