fix: fixed several issues

This commit is contained in:
Qv2ray Bot 2020-01-20 21:42:06 +08:00
parent 4996b18a30
commit e3da759ab9
5 changed files with 26 additions and 9 deletions

View File

@ -1 +1 @@
2987 2992

View File

@ -15,6 +15,7 @@ namespace Qv2ray
return conf; return conf;
} }
QMap<QString, CONFIGROOT> GetRegularConnections(QStringList connectionNames) QMap<QString, CONFIGROOT> GetRegularConnections(QStringList connectionNames)
{ {
QMap<QString, CONFIGROOT> list; QMap<QString, CONFIGROOT> list;

View File

@ -108,10 +108,18 @@ namespace Qv2ray
QJsonArray accounts; QJsonArray accounts;
foreach (auto account, _accounts) { foreach (auto account, _accounts) {
if (account.user.isEmpty() && account.pass.isEmpty()) {
continue;
}
accounts.append(GetRootObject(account)); accounts.append(GetRootObject(account));
} }
JADD(timeout, accounts, allowTransparent, userLevel) if (!accounts.isEmpty()) {
JADD(accounts)
}
JADD(timeout, allowTransparent, userLevel)
RROOT RROOT
} }
@ -145,13 +153,21 @@ namespace Qv2ray
QJsonArray accounts; QJsonArray accounts;
foreach (auto acc, _accounts) { foreach (auto acc, _accounts) {
if (acc.user.isEmpty() && acc.pass.isEmpty()) {
continue;
}
accounts.append(GetRootObject(acc)); accounts.append(GetRootObject(acc));
} }
if (!accounts.isEmpty()) {
JADD(accounts)
}
if (udp) { if (udp) {
JADD(auth, accounts, udp, ip, userLevel) JADD(auth, udp, ip, userLevel)
} else { } else {
JADD(auth, accounts, userLevel) JADD(auth, userLevel)
} }
RROOT RROOT

View File

@ -496,7 +496,7 @@ void RouteEditor::on_addRouteBtn_clicked()
rule.QV2RAY_RULE_USE_BALANCER = false; rule.QV2RAY_RULE_USE_BALANCER = false;
// Default balancer tag, it's a random string. // Default balancer tag, it's a random string.
auto bTag = GenerateRandomString(); auto bTag = GenerateRandomString();
rule.QV2RAY_RULE_TAG = GenerateRandomString(5); rule.QV2RAY_RULE_TAG = rules.isEmpty() ? tr("Default rule") : (tr("rule") + "-" + GenerateRandomString(5));
rule.balancerTag = bTag; rule.balancerTag = bTag;
balancers[bTag] = QStringList(); balancers[bTag] = QStringList();
AddNewRule(rule); AddNewRule(rule);
@ -629,6 +629,7 @@ void RouteEditor::on_delBtn_clicked()
{ {
if (nodeScene->selectedNodes().empty()) { if (nodeScene->selectedNodes().empty()) {
QvMessageBoxWarn(this, tr("Remove Items"), tr("Please select a node from the graph to continue.")); QvMessageBoxWarn(this, tr("Remove Items"), tr("Please select a node from the graph to continue."));
return;
} }
auto firstNode = nodeScene->selectedNodes()[0]; auto firstNode = nodeScene->selectedNodes()[0];
@ -668,10 +669,12 @@ void RouteEditor::on_delBtn_clicked()
// //
// Remove item from the rule order list widget. // Remove item from the rule order list widget.
ruleListWidget->takeItem(ruleListWidget->row(ruleListWidget->findItems(currentRuleTag, Qt::MatchExactly).first())); ruleListWidget->takeItem(ruleListWidget->row(ruleListWidget->findItems(currentRuleTag, Qt::MatchExactly).first()));
CHECKEMPTYRULES
currentRuleTag = rules.firstKey(); currentRuleTag = rules.firstKey();
ShowCurrentRuleDetail(); ShowCurrentRuleDetail();
} else { } else {
LOG(MODULE_UI, "Unknown node selected.") LOG(MODULE_UI, "Unknown node selected.")
QvMessageBoxWarn(this, tr("Error"), tr("Qv2ray entered an unknown state."));
} }
} }
void RouteEditor::on_editBtn_clicked() void RouteEditor::on_editBtn_clicked()

View File

@ -1,5 +1,4 @@
#ifndef W_QVOUTBOUNDEDITOR_H #pragma once
#define W_QVOUTBOUNDEDITOR_H
#include <list> #include <list>
#include <QDialog> #include <QDialog>
@ -141,5 +140,3 @@ class RouteEditor : public QDialog, private Ui::RouteEditor
void AddNewOutbound(OUTBOUND out); void AddNewOutbound(OUTBOUND out);
void AddNewRule(RuleObject rule); void AddNewRule(RuleObject rule);
}; };
#endif // W_QVOUTBOUNDEDITOR_H