Skip to content

Commit

Permalink
feat: remove rule
Browse files Browse the repository at this point in the history
  • Loading branch information
Mythologyli committed Nov 8, 2023
1 parent c0c57c6 commit 99fe1bc
Show file tree
Hide file tree
Showing 12 changed files with 26 additions and 159 deletions.
4 changes: 0 additions & 4 deletions .github/ISSUE_TEMPLATE/bug-report.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,6 @@ assignees: Mythologyli
+ [ZJU Connect 多合一客户端](https://www.cc98.org/topic/5704061)
+ [使用 ZJU Connect 代替 EasyConnect 提升你的 RVPN 体验](https://www.cc98.org/topic/5521873)
+ [端口转发、定时保活、自动选线、密码保存](https://www.cc98.org/topic/5570875)
+ 如果你的问题与配合 ZJU Rule 有关,请确保你已阅读过:
+ [使用 Clash+ZJU Rule](https://www.cc98.org/topic/5257184)
+ [Clash+ZJU Rule 的常见问题与解决方案](https://www.cc98.org/topic/5677200)
+ [ZJU Rule Github](https://github.com/Mythologyli/ZJU-Rule) 说明及 [Issues](https://github.com/Mythologyli/ZJU-Rule/issues?q=is%3Aissue)
+ 你已搜索过现有的 [Issues](https://github.com/Mythologyli/ZJU-Connect-for-Windows/issues?q=is%3Aissue) 并且未发现重复
+ 如果你的问题与 EasyConnect 有关且你**不在**使用 ZJU RVPN,请前往 [zju-connect](https://github.com/Mythologyli/zju-connect) 报告
+ 如果你确信你的问题与 [zju-web-login](https://github.com/Mythologyli/zju-web-login)[zju-connect](https://github.com/Mythologyli/zju-connect) 有关,欢迎直接前往相应的项目报告
Expand Down
4 changes: 0 additions & 4 deletions .github/ISSUE_TEMPLATE/feature-request.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@ assignees: Mythologyli
+ [ZJU Connect 多合一客户端](https://www.cc98.org/topic/5704061)
+ [使用 ZJU Connect 代替 EasyConnect 提升你的 RVPN 体验](https://www.cc98.org/topic/5521873)
+ [端口转发、定时保活、自动选线、密码保存](https://www.cc98.org/topic/5570875)
+ 如果你的建议与配合 ZJU Rule 有关,请确保你已阅读过:
+ [使用 Clash+ZJU Rule](https://www.cc98.org/topic/5257184)
+ [Clash+ZJU Rule 的常见问题与解决方案](https://www.cc98.org/topic/5677200)
+ [ZJU Rule Github](https://github.com/Mythologyli/ZJU-Rule) 说明及 [Issues](https://github.com/Mythologyli/ZJU-Rule/issues?q=is%3Aissue)
+ 你已搜索过现有的 [Issues](https://github.com/Mythologyli/ZJU-Connect-for-Windows/issues?q=is%3Aissue) 并且未发现重复
+ 如果你的建议与 EasyConnect 有关且你**不在**使用 ZJU RVPN,请前往 [zju-connect](https://github.com/Mythologyli/zju-connect) 报告
+ 如果你确信你的建议与 [zju-web-login](https://github.com/Mythologyli/zju-web-login)[zju-connect](https://github.com/Mythologyli/zju-connect) 有关,欢迎直接前往相应的项目提交功能请求
Expand Down
15 changes: 3 additions & 12 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,27 +23,17 @@ add_executable(ZJUConnectForWindows WIN32
l2tpmode.cpp
webloginmode.cpp
zjuconnectmode.cpp
mainwindow.h
QrCodeGenerator/qrcodegenerator.cpp
QrCodeGenerator/qrcodegenerator.h
QrCodeGenerator/qrcodegen/qrcodegen.h
QrCodeGenerator/qrcodegen/qrcodegen.cpp
zjuconnectcontroller/zjuconnectcontroller.cpp
zjuconnectcontroller/zjuconnectcontroller.h
zjurulewindow/zjurulewindow.cpp
zjurulewindow/zjurulewindow.h
portforwardingwindow/portforwardingwindow.cpp
portforwardingwindow/portforwardingwindow.h
settingwindow/settingwindow.cpp
settingwindow/settingwindow.h
networkdetector/networkdetector.cpp
networkdetector/networkdetector.h
utils/utils.cpp
utils/utils.h
resource.qrc
${CMAKE_CURRENT_SOURCE_DIR}/resource/icon.rc
)

add_subdirectory(QrCodeGenerator)

set(QAPPLICATION_CLASS QApplication CACHE STRING "Inheritance class for SingleApplication")

add_subdirectory(singleapplication)
Expand All @@ -55,6 +45,7 @@ target_link_libraries(ZJUConnectForWindows
Qt::Network
Qt::Svg
SingleApplication::SingleApplication
QrCodeGenerator
wininet
rasapi32
)
22 changes: 22 additions & 0 deletions QrCodeGenerator/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
cmake_minimum_required(VERSION 3.0)
project(QrCodeGenerator)

set(CMAKE_CXX_STANDARD 17)

find_package(Qt6 COMPONENTS
Core
Gui
Svg
REQUIRED
)

add_library(QrCodeGenerator STATIC
QrCodeGenerator.cpp
qrcodegen/qrcodegen.cpp
)

target_link_libraries(QrCodeGenerator
Qt6::Core
Qt6::Gui
Qt6::Svg
)
9 changes: 0 additions & 9 deletions mainwindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -363,15 +363,6 @@ MainWindow::MainWindow(QWidget *parent) :
}
});

// 高级-ZJU Rule
connect(ui->zjuRuleAction, &QAction::triggered,
[&]()
{
zjuRuleWindow = new ZjuRuleWindow(this);
zjuRuleWindow->setSocks5Port(QString::number(settings->value("ZJUConnect/Socks5Port", 1080).toInt()));
zjuRuleWindow->show();
});

// 帮助-清除系统代理
connect(ui->disableProxyAction, &QAction::triggered,
[&]()
Expand Down
2 changes: 0 additions & 2 deletions mainwindow.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
#include <QNetworkReply>
#include <QSettings>

#include "zjurulewindow/zjurulewindow.h"
#include "portforwardingwindow/portforwardingwindow.h"
#include "zjuconnectcontroller/zjuconnectcontroller.h"
#include "networkdetector/networkdetector.h"
Expand Down Expand Up @@ -77,7 +76,6 @@ public slots:

QObject *diagnosisContext;

ZjuRuleWindow *zjuRuleWindow;
SettingWindow *settingWindow;

QString mode;
Expand Down
6 changes: 0 additions & 6 deletions mainwindow.ui
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,6 @@ Windows Version: Windows 11
</widget>
<addaction name="createL2tpAction"/>
<addaction name="routeMenu"/>
<addaction name="zjuRuleAction"/>
</widget>
<addaction name="fileMenu"/>
<addaction name="advanceMenu"/>
Expand All @@ -296,11 +295,6 @@ Windows Version: Windows 11
<string>退出</string>
</property>
</action>
<action name="zjuRuleAction">
<property name="text">
<string>ZJU Rule</string>
</property>
</action>
<action name="settingAction">
<property name="text">
<string>设置</string>
Expand Down
3 changes: 0 additions & 3 deletions settingwindow/settingwindow.ui
Original file line number Diff line number Diff line change
Expand Up @@ -524,9 +524,6 @@
</item>
<item row="5" column="1">
<widget class="QCheckBox" name="proxyAllCheckBox">
<property name="toolTip">
<string>配合 ZJU Rule 使用时建议勾选</string>
</property>
<property name="text">
<string>代理全部流量</string>
</property>
Expand Down
2 changes: 1 addition & 1 deletion zjuconnectmode.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ void MainWindow::setModeToZjuConnect()
QMessageBox messageBox(this);
messageBox.setWindowTitle("警告");
messageBox.setText(
"当前已存在系统代理配置\n如您正在使用代理工具,推荐使用高级-ZJU Rule\n是否覆盖当前系统代理配置?"
"当前已存在系统代理配置\n是否覆盖当前系统代理配置?"
);

messageBox.addButton(QMessageBox::Yes)->setText("");
Expand Down
32 changes: 0 additions & 32 deletions zjurulewindow/zjurulewindow.cpp

This file was deleted.

27 changes: 0 additions & 27 deletions zjurulewindow/zjurulewindow.h

This file was deleted.

59 changes: 0 additions & 59 deletions zjurulewindow/zjurulewindow.ui

This file was deleted.

0 comments on commit 99fe1bc

Please sign in to comment.