From 3059fc9d88a0232fa3340552928cb58add1c5df1 Mon Sep 17 00:00:00 2001
From: QwQ <59914293+Qv2ray-dev@users.noreply.github.com>
Date: Wed, 15 Jul 2020 13:57:00 +0800
Subject: [PATCH] add: so many widgets!
---
3rdparty/QNodeEditor | 2 +-
libs/QJsonStruct | 2 +-
makespec/BUILDVERSION | 2 +-
src/ui/widgets/node/InboundOutboundWidget.cpp | 19 ++
src/ui/widgets/node/InboundOutboundWidget.hpp | 15 +
src/ui/widgets/node/InboundOutboundWidget.ui | 21 ++
.../widgets/node/OutboundBalancerWidget.cpp | 16 +
.../widgets/node/OutboundBalancerWidget.hpp | 16 +
src/ui/widgets/node/OutboundBalancerWidget.ui | 21 ++
src/ui/widgets/node/RuleWidget.cpp | 16 +
src/ui/widgets/node/RuleWidget.hpp | 16 +
src/ui/widgets/node/RuleWidget.ui | 275 ++++++++++++++++++
12 files changed, 418 insertions(+), 3 deletions(-)
create mode 100644 src/ui/widgets/node/InboundOutboundWidget.cpp
create mode 100644 src/ui/widgets/node/InboundOutboundWidget.hpp
create mode 100644 src/ui/widgets/node/InboundOutboundWidget.ui
create mode 100644 src/ui/widgets/node/OutboundBalancerWidget.cpp
create mode 100644 src/ui/widgets/node/OutboundBalancerWidget.hpp
create mode 100644 src/ui/widgets/node/OutboundBalancerWidget.ui
create mode 100644 src/ui/widgets/node/RuleWidget.cpp
create mode 100644 src/ui/widgets/node/RuleWidget.hpp
create mode 100644 src/ui/widgets/node/RuleWidget.ui
diff --git a/3rdparty/QNodeEditor b/3rdparty/QNodeEditor
index 427b6fe1..3d380c24 160000
--- a/3rdparty/QNodeEditor
+++ b/3rdparty/QNodeEditor
@@ -1 +1 @@
-Subproject commit 427b6fe13049aae62855b893b524f17278e8c06f
+Subproject commit 3d380c24459e7363ad54494d0f0f4b1af1a19ee2
diff --git a/libs/QJsonStruct b/libs/QJsonStruct
index 786d6736..fb646d49 160000
--- a/libs/QJsonStruct
+++ b/libs/QJsonStruct
@@ -1 +1 @@
-Subproject commit 786d67364d171883e6e43091f91705a0c2c2f415
+Subproject commit fb646d49bf15a34e6095b5c012f8d3956fde7930
diff --git a/makespec/BUILDVERSION b/makespec/BUILDVERSION
index ac99f6ce..33f6a209 100644
--- a/makespec/BUILDVERSION
+++ b/makespec/BUILDVERSION
@@ -1 +1 @@
-5798
+5791
diff --git a/src/ui/widgets/node/InboundOutboundWidget.cpp b/src/ui/widgets/node/InboundOutboundWidget.cpp
new file mode 100644
index 00000000..3814bd95
--- /dev/null
+++ b/src/ui/widgets/node/InboundOutboundWidget.cpp
@@ -0,0 +1,19 @@
+#include "InboundOutboundWidget.hpp"
+
+InboundOutboundWidget::InboundOutboundWidget(QWidget *parent) :
+ QWidget(parent)
+{
+ setupUi(this);
+}
+
+void InboundOutboundWidget::changeEvent(QEvent *e)
+{
+ QWidget::changeEvent(e);
+ switch (e->type()) {
+ case QEvent::LanguageChange:
+ retranslateUi(this);
+ break;
+ default:
+ break;
+ }
+}
diff --git a/src/ui/widgets/node/InboundOutboundWidget.hpp b/src/ui/widgets/node/InboundOutboundWidget.hpp
new file mode 100644
index 00000000..581c5617
--- /dev/null
+++ b/src/ui/widgets/node/InboundOutboundWidget.hpp
@@ -0,0 +1,15 @@
+#pragma once
+
+#include "ui_InboundOutboundWidget.h"
+
+class InboundOutboundWidget : public QWidget, private Ui::InboundOutboundWidget
+{
+ Q_OBJECT
+
+public:
+ explicit InboundOutboundWidget(QWidget *parent = nullptr);
+
+protected:
+ void changeEvent(QEvent *e);
+};
+
diff --git a/src/ui/widgets/node/InboundOutboundWidget.ui b/src/ui/widgets/node/InboundOutboundWidget.ui
new file mode 100644
index 00000000..2cf4c38a
--- /dev/null
+++ b/src/ui/widgets/node/InboundOutboundWidget.ui
@@ -0,0 +1,21 @@
+
+
+
+
+ InboundOutboundWidget
+
+
+
+ 0
+ 0
+ 400
+ 300
+
+
+
+ Form
+
+
+
+
+
diff --git a/src/ui/widgets/node/OutboundBalancerWidget.cpp b/src/ui/widgets/node/OutboundBalancerWidget.cpp
new file mode 100644
index 00000000..c3600ae2
--- /dev/null
+++ b/src/ui/widgets/node/OutboundBalancerWidget.cpp
@@ -0,0 +1,16 @@
+#include "OutboundBalancerWidget.hpp"
+
+OutboundBalancerWidget::OutboundBalancerWidget(QWidget *parent) : QWidget(parent)
+{
+ setupUi(this);
+}
+
+void OutboundBalancerWidget::changeEvent(QEvent *e)
+{
+ QWidget::changeEvent(e);
+ switch (e->type())
+ {
+ case QEvent::LanguageChange: retranslateUi(this); break;
+ default: break;
+ }
+}
diff --git a/src/ui/widgets/node/OutboundBalancerWidget.hpp b/src/ui/widgets/node/OutboundBalancerWidget.hpp
new file mode 100644
index 00000000..3aa72987
--- /dev/null
+++ b/src/ui/widgets/node/OutboundBalancerWidget.hpp
@@ -0,0 +1,16 @@
+#pragma once
+
+#include "ui_OutboundBalancerWidget.h"
+
+class OutboundBalancerWidget
+ : public QWidget
+ , private Ui::OutboundBalancerWidget
+{
+ Q_OBJECT
+
+ public:
+ explicit OutboundBalancerWidget(QWidget *parent = nullptr);
+
+ protected:
+ void changeEvent(QEvent *e);
+};
diff --git a/src/ui/widgets/node/OutboundBalancerWidget.ui b/src/ui/widgets/node/OutboundBalancerWidget.ui
new file mode 100644
index 00000000..51608047
--- /dev/null
+++ b/src/ui/widgets/node/OutboundBalancerWidget.ui
@@ -0,0 +1,21 @@
+
+
+
+
+ OutboundBalancerWidget
+
+
+
+ 0
+ 0
+ 400
+ 300
+
+
+
+ Form
+
+
+
+
+
diff --git a/src/ui/widgets/node/RuleWidget.cpp b/src/ui/widgets/node/RuleWidget.cpp
new file mode 100644
index 00000000..ba1114c1
--- /dev/null
+++ b/src/ui/widgets/node/RuleWidget.cpp
@@ -0,0 +1,16 @@
+#include "RuleWidget.hpp"
+
+QvNodeRuleWidget::QvNodeRuleWidget(QWidget *parent) : QWidget(parent)
+{
+ setupUi(this);
+}
+
+void QvNodeRuleWidget::changeEvent(QEvent *e)
+{
+ QWidget::changeEvent(e);
+ switch (e->type())
+ {
+ case QEvent::LanguageChange: retranslateUi(this); break;
+ default: break;
+ }
+}
diff --git a/src/ui/widgets/node/RuleWidget.hpp b/src/ui/widgets/node/RuleWidget.hpp
new file mode 100644
index 00000000..79af15a6
--- /dev/null
+++ b/src/ui/widgets/node/RuleWidget.hpp
@@ -0,0 +1,16 @@
+#pragma once
+
+#include "ui_RuleWidget.h"
+
+class QvNodeRuleWidget
+ : public QWidget
+ , private Ui::RuleWidget
+{
+ Q_OBJECT
+
+ public:
+ explicit QvNodeRuleWidget(QWidget *parent = nullptr);
+
+ protected:
+ void changeEvent(QEvent *e);
+};
diff --git a/src/ui/widgets/node/RuleWidget.ui b/src/ui/widgets/node/RuleWidget.ui
new file mode 100644
index 00000000..ba2d03db
--- /dev/null
+++ b/src/ui/widgets/node/RuleWidget.ui
@@ -0,0 +1,275 @@
+
+
+ RuleWidget
+
+
+
+ 0
+ 0
+ 296
+ 704
+
+
+
+ Form
+
+
+ -
+
+
-
+
+
+ true
+
+
+ Rule Status
+
+
+
+ -
+
+
+ false
+
+
+ Enabled
+
+
+
+ -
+
+
+ Rule Tag
+
+
+
+ -
+
+
-
+
+
+ false
+
+
+
+ -
+
+
+ false
+
+
+ Rename
+
+
+
+
+
+
+
+ -
+
+
+ false
+
+
+ Route Editor
+
+
+ false
+
+
+
-
+
+
+ Network
+
+
+
+ -
+
+
-
+
+
+ TCP
+
+
+
+ -
+
+
+ UDP
+
+
+
+ -
+
+
+ Both
+
+
+
+
+
+ -
+
+
+ Protocol
+
+
+
+ -
+
+
-
+
+
+ HTTP
+
+
+
+ -
+
+
+ TLS
+
+
+
+ -
+
+
+ BitTorrent
+
+
+
+
+
+ -
+
+
+ Port
+
+
+
+ -
+
+
+ e.g. 80, 443, 8000-8080
+
+
+
+ -
+
+
+ Balancers
+
+
+
+ -
+
+
+ Use Balancers
+
+
+
+ -
+
+
+
-
+
+
+ true
+
+
+
+ -
+
+
+ -
+
+
+ ...
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 40
+
+
+
+
+ -
+
+
+ ...
+
+
+
+
+
+
+
+
+
+ -
+
+
+ false
+
+
+ Route Detail Settings
+
+
+
-
+
+
+ Users List
+
+
+
+ -
+
+
+ Source IP Matches
+
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ Target Domain List
+
+
+
+ -
+
+
+ Target IP List
+
+
+
+ -
+
+
+ -
+
+
+
+
+
+
+
+
+
+