From 447b9bdf42ab7cdb0dbeef35ea3f703aff269dc8 Mon Sep 17 00:00:00 2001 From: Nova Date: Fri, 6 Dec 2024 23:16:45 +0330 Subject: [PATCH] refactor structure --- .gitignore | 3 +- .../qv2ray/v2/proxy/QvProxyConfigurator.cpp | 4 +- .../v2/ui/widgets/editors/w_JsonEditor.cpp | 2 +- CMakeLists.txt | 194 ++++++++++-------- cmake/linux/linux.cmake | 2 +- cmake/macos/macos.cmake | 2 +- cmake/myproto.cmake | 2 +- cmake/windows/windows.cmake | 2 +- {go => core}/.gitignore | 0 {go => core}/cmd/nekobox_core/core_box.go | 0 {go => core}/cmd/nekobox_core/go.mod | 0 {go => core}/cmd/nekobox_core/go.sum | 4 +- {go => core}/cmd/nekobox_core/grpc_box.go | 0 {go => core}/cmd/nekobox_core/grpc_windows.go | 0 .../nekobox_core/internal/boxapi/go_http.go | 0 .../nekobox_core/internal/boxapi/go_net.go | 0 .../internal/boxapi/v2ray_server.go | 0 .../internal/boxapi/v2ray_stats_service.go | 0 .../cmd/nekobox_core/internal/boxbox/api.go | 0 .../cmd/nekobox_core/internal/boxbox/box.go | 0 .../internal/boxbox/box_outbound.go | 0 .../cmd/nekobox_core/internal/boxbox/debug.go | 0 .../nekobox_core/internal/boxbox/version.go | 0 .../cmd/nekobox_core/internal/boxbox/wtf.go | 0 .../nekobox_core/internal/boxdns/boxdns.go | 0 .../internal/boxdns/dns_manager_windows.go | 0 .../internal/boxdns/monitor_windows.go | 0 .../internal/boxdns/underlying_dns.go | 0 .../winipcfg/interface_change_handler.go | 0 .../internal/boxdns/winipcfg/luid.go | 0 .../internal/boxdns/winipcfg/mksyscall.go | 0 .../internal/boxdns/winipcfg/netsh.go | 0 .../boxdns/winipcfg/route_change_handler.go | 0 .../internal/boxdns/winipcfg/types.go | 0 .../internal/boxdns/winipcfg/types_32.go | 0 .../internal/boxdns/winipcfg/types_64.go | 0 .../internal/boxdns/winipcfg/types_test.go | 0 .../internal/boxdns/winipcfg/types_test_32.go | 0 .../internal/boxdns/winipcfg/types_test_64.go | 0 .../unicast_address_change_handler.go | 0 .../internal/boxdns/winipcfg/winipcfg.go | 0 .../internal/boxdns/winipcfg/winipcfg_test.go | 0 .../boxdns/winipcfg/zwinipcfg_windows.go | 0 .../internal/boxmain/cmd_check.go | 0 .../internal/boxmain/cmd_format.go | 0 .../internal/boxmain/cmd_generate.go | 0 .../internal/boxmain/cmd_generate_tls.go | 0 .../internal/boxmain/cmd_generate_vapid.go | 0 .../boxmain/cmd_generate_wireguard.go | 0 .../internal/boxmain/cmd_geoip.go | 0 .../internal/boxmain/cmd_geoip_export.go | 0 .../internal/boxmain/cmd_geoip_list.go | 0 .../internal/boxmain/cmd_geosite.go | 0 .../internal/boxmain/cmd_geosite_export.go | 0 .../internal/boxmain/cmd_geosite_list.go | 0 .../internal/boxmain/cmd_rule_set_compile.go | 0 .../nekobox_core/internal/boxmain/cmd_run.go | 0 .../internal/boxmain/cmd_tools.go | 0 .../internal/boxmain/cmd_tools_connect.go | 0 .../internal/boxmain/cmd_tools_fetch.go | 0 .../internal/boxmain/cmd_tools_synctime.go | 0 .../internal/boxmain/cmd_version.go | 0 .../nekobox_core/internal/boxmain/color.go | 0 .../nekobox_core/internal/boxmain/debug.go | 0 .../internal/boxmain/debug_linux.go | 0 .../internal/boxmain/debug_stub.go | 0 .../cmd/nekobox_core/internal/boxmain/main.go | 0 .../nekobox_core/internal/distro/all/all.go | 0 .../cmd/nekobox_core/internal/main.go | 0 {go => core}/cmd/nekobox_core/main.go | 0 {go => core}/cmd/nekobox_core/test_utils.go | 0 {go => core}/cmd/updater/.gitignore | 0 {go => core}/cmd/updater/go.mod | 0 {go => core}/cmd/updater/go.sum | 0 {go => core}/cmd/updater/main.go | 0 {go => core}/cmd/updater/msgbox.go | 0 {go => core}/cmd/updater/msgbox_windows.go | 0 {go => core}/cmd/updater/updater.go | 0 {go => core}/grpc_server/auth/auth.go | 0 {go => core}/grpc_server/gen/libcore.pb.go | 0 {go => core}/grpc_server/gen/libcore.proto | 0 .../grpc_server/gen/libcore_grpc.pb.go | 0 {go => core}/grpc_server/gen/update_proto.sh | 0 {go => core}/grpc_server/go.mod | 0 {go => core}/grpc_server/go.sum | 6 +- {go => core}/grpc_server/grpc.go | 0 {go => core}/grpc_server/update.go | 0 {rpc => include/api}/gRPC.h | 0 {db => include/configs}/ConfigBuilder.hpp | 4 +- .../configs/proxy}/AbstractBean.hpp | 2 +- {fmt => include/configs/proxy}/ChainBean.hpp | 2 +- {fmt => include/configs/proxy}/CustomBean.hpp | 2 +- {fmt => include/configs/proxy}/NaiveBean.hpp | 2 +- {fmt => include/configs/proxy}/Preset.hpp | 0 {fmt => include/configs/proxy}/QUICBean.hpp | 2 +- {fmt => include/configs/proxy}/SSHBean.h | 2 +- .../configs/proxy}/ShadowSocksBean.hpp | 4 +- .../configs/proxy}/SocksHttpBean.hpp | 4 +- .../configs/proxy}/TrojanVLESSBean.hpp | 4 +- .../configs/proxy}/V2RayStreamSettings.hpp | 0 {fmt => include/configs/proxy}/VMessBean.hpp | 4 +- .../configs/proxy}/WireguardBean.h | 2 +- {fmt => include/configs/proxy}/includes.h | 0 {sub => include/configs/sub}/GroupUpdater.hpp | 7 +- {db => include/dataStore}/Database.hpp | 2 +- {db => include/dataStore}/Group.hpp | 2 +- {db => include/dataStore}/ProfileFilter.hpp | 0 {db => include/dataStore}/ProxyEntity.hpp | 6 +- {db => include/dataStore}/RouteEntity.h | 2 +- {main => include/global}/Const.hpp | 0 {main => include/global}/GuiUtils.hpp | 0 .../global}/HTTPRequestHelper.hpp | 0 {main => include/global}/NekoGui.hpp | 0 .../global}/NekoGui_ConfigItem.hpp | 0 .../global}/NekoGui_DataStore.hpp | 0 {main => include/global}/NekoGui_Utils.hpp | 0 {db => include/stats}/traffic/TrafficData.hpp | 2 +- .../stats}/traffic/TrafficLooper.hpp | 0 {sys => include/sys}/AutoRun.hpp | 0 {sys => include/sys}/ExternalProcess.hpp | 0 {sys => include/sys}/linux/LinuxCap.h | 0 {sys => include/sys}/macos/MacOS.h | 0 {sys => include/sys}/windows/MiniDump.h | 0 {sys => include/sys}/windows/guihelper.h | 0 {ui/widget => include/ui/group}/GroupItem.h | 3 +- {ui/widget => include/ui/group}/GroupItem.ui | 0 {ui => include/ui/group}/GroupSort.hpp | 0 .../ui/group}/dialog_edit_group.h | 3 +- .../ui/group}/dialog_edit_group.ui | 2 +- .../ui/group}/dialog_manage_groups.h | 3 +- .../ui/group}/dialog_manage_groups.ui | 0 {ui => include/ui}/mainwindow.h | 9 +- {ui => include/ui}/mainwindow.ui | 2 +- {ui => include/ui}/mainwindow_interface.h | 2 +- {ui/widget => include/ui/profile}/ProxyItem.h | 3 +- .../ui/profile}/ProxyItem.ui | 0 .../ui/profile}/dialog_edit_profile.h | 5 +- .../ui/profile}/dialog_edit_profile.ui | 2 +- {ui/edit => include/ui/profile}/edit_chain.h | 1 + {ui/edit => include/ui/profile}/edit_chain.ui | 0 {ui/edit => include/ui/profile}/edit_custom.h | 1 + .../ui/profile}/edit_custom.ui | 0 {ui/edit => include/ui/profile}/edit_naive.h | 1 + {ui/edit => include/ui/profile}/edit_naive.ui | 2 +- {ui/edit => include/ui/profile}/edit_quic.h | 1 + {ui/edit => include/ui/profile}/edit_quic.ui | 2 +- .../ui/profile}/edit_shadowsocks.h | 1 + .../ui/profile}/edit_shadowsocks.ui | 2 +- .../ui/profile}/edit_socks_http.h | 1 + .../ui/profile}/edit_socks_http.ui | 0 {ui/edit => include/ui/profile}/edit_ssh.h | 1 + {ui/edit => include/ui/profile}/edit_ssh.ui | 0 .../ui/profile}/edit_trojan_vless.h | 1 + .../ui/profile}/edit_trojan_vless.ui | 2 +- {ui/edit => include/ui/profile}/edit_vmess.h | 1 + {ui/edit => include/ui/profile}/edit_vmess.ui | 2 +- .../ui/profile}/edit_wireguard.h | 1 + .../ui/profile}/edit_wireguard.ui | 0 .../ui/profile}/profile_editor.h | 4 +- {ui => include/ui/setting}/Icon.hpp | 0 {ui/widget => include/ui/setting}/RouteItem.h | 3 +- .../ui/setting}/RouteItem.ui | 0 {ui => include/ui/setting}/ThemeManager.hpp | 0 .../ui/setting}/dialog_basic_settings.h | 1 + .../ui/setting}/dialog_basic_settings.ui | 2 +- {ui => include/ui/setting}/dialog_hotkey.h | 3 +- {ui => include/ui/setting}/dialog_hotkey.ui | 0 .../ui/setting}/dialog_manage_routes.h | 5 +- .../ui/setting}/dialog_manage_routes.ui | 0 .../ui/setting}/dialog_vpn_settings.h | 1 + .../ui/setting}/dialog_vpn_settings.ui | 0 .../ui/utils}/FloatCheckBox.h | 0 .../ui/utils}/MessageBoxTimer.h | 0 {ui/widget => include/ui/utils}/MyLineEdit.h | 0 .../ui/utils}/MyTableWidget.h | 0 libs/.gitignore | 2 - {libs => script}/build_deps_all.sh | 3 +- {libs => script}/build_go.sh | 6 +- {libs => script}/build_public_res.sh | 2 +- {libs => script}/deploy_linux64.sh | 2 +- {libs => script}/deploy_macos.sh | 2 +- {libs => script}/deploy_windows64.sh | 2 +- {libs => script}/env_deploy.sh | 0 {libs => script}/format_cpp.sh | 0 {libs => script}/pack_debian.sh | 0 {libs => script}/translate.sh | 0 {rpc => src/api}/gRPC.cpp | 4 +- {db => src/configs}/ConfigBuilder.cpp | 12 +- {fmt => src/configs/proxy}/AbstractBean.cpp | 2 +- .../configs/proxy}/Bean2CoreObj_box.cpp | 4 +- {fmt => src/configs/proxy}/Bean2External.cpp | 4 +- {fmt => src/configs/proxy}/Bean2Link.cpp | 4 +- {fmt => src/configs/proxy}/Link2Bean.cpp | 4 +- {sub => src/configs/sub}/GroupUpdater.cpp | 9 +- {db => src/dataStore}/Database.cpp | 4 +- {db => src/dataStore}/ProfileFilter.cpp | 2 +- {db => src/dataStore}/RouteEntity.cpp | 6 +- {main => src/global}/HTTPRequestHelper.cpp | 4 +- {main => src/global}/NekoGui.cpp | 8 +- {main => src/global}/NekoGui_Utils.cpp | 4 +- {main => src}/main.cpp | 6 +- {db => src/stats}/traffic/TrafficLooper.cpp | 6 +- {sys => src/sys}/AutoRun.cpp | 4 +- {sys => src/sys}/ExternalProcess.cpp | 4 +- {sys => src/sys}/linux/LinuxCap.cpp | 2 +- {sys => src/sys}/macos/MacOS.cpp | 2 +- {sys => src/sys}/windows/MiniDump.cpp | 2 +- {sys => src/sys}/windows/guihelper.cpp | 2 +- {ui/widget => src/ui/group}/GroupItem.cpp | 9 +- .../ui/group}/dialog_edit_group.cpp | 7 +- {ui => src/ui/group}/dialog_manage_groups.cpp | 13 +- {ui => src/ui}/mainwindow.cpp | 37 ++-- {ui => src/ui}/mainwindow_grpc.cpp | 13 +- {ui/widget => src/ui/profile}/ProxyItem.cpp | 3 +- .../ui/profile}/dialog_edit_profile.cpp | 29 ++- {ui/edit => src/ui/profile}/edit_chain.cpp | 11 +- {ui/edit => src/ui/profile}/edit_custom.cpp | 11 +- {ui/edit => src/ui/profile}/edit_naive.cpp | 5 +- {ui/edit => src/ui/profile}/edit_quic.cpp | 5 +- .../ui/profile}/edit_shadowsocks.cpp | 7 +- .../ui/profile}/edit_socks_http.cpp | 5 +- {ui/edit => src/ui/profile}/edit_ssh.cpp | 5 +- .../ui/profile}/edit_trojan_vless.cpp | 7 +- {ui/edit => src/ui/profile}/edit_vmess.cpp | 5 +- .../ui/profile}/edit_wireguard.cpp | 5 +- {ui => src/ui/setting}/Icon.cpp | 4 +- {ui/widget => src/ui/setting}/RouteItem.cpp | 9 +- {ui => src/ui/setting}/ThemeManager.cpp | 2 +- .../ui/setting}/dialog_basic_settings.cpp | 15 +- {ui => src/ui/setting}/dialog_hotkey.cpp | 5 +- .../ui/setting}/dialog_manage_routes.cpp | 11 +- .../ui/setting}/dialog_vpn_settings.cpp | 11 +- 232 files changed, 355 insertions(+), 346 deletions(-) rename {go => core}/.gitignore (100%) rename {go => core}/cmd/nekobox_core/core_box.go (100%) rename {go => core}/cmd/nekobox_core/go.mod (100%) rename {go => core}/cmd/nekobox_core/go.sum (99%) rename {go => core}/cmd/nekobox_core/grpc_box.go (100%) rename {go => core}/cmd/nekobox_core/grpc_windows.go (100%) rename {go => core}/cmd/nekobox_core/internal/boxapi/go_http.go (100%) rename {go => core}/cmd/nekobox_core/internal/boxapi/go_net.go (100%) rename {go => core}/cmd/nekobox_core/internal/boxapi/v2ray_server.go (100%) rename {go => core}/cmd/nekobox_core/internal/boxapi/v2ray_stats_service.go (100%) rename {go => core}/cmd/nekobox_core/internal/boxbox/api.go (100%) rename {go => core}/cmd/nekobox_core/internal/boxbox/box.go (100%) rename {go => core}/cmd/nekobox_core/internal/boxbox/box_outbound.go (100%) rename {go => core}/cmd/nekobox_core/internal/boxbox/debug.go (100%) rename {go => core}/cmd/nekobox_core/internal/boxbox/version.go (100%) rename {go => core}/cmd/nekobox_core/internal/boxbox/wtf.go (100%) rename {go => core}/cmd/nekobox_core/internal/boxdns/boxdns.go (100%) rename {go => core}/cmd/nekobox_core/internal/boxdns/dns_manager_windows.go (100%) rename {go => core}/cmd/nekobox_core/internal/boxdns/monitor_windows.go (100%) rename {go => core}/cmd/nekobox_core/internal/boxdns/underlying_dns.go (100%) rename {go => core}/cmd/nekobox_core/internal/boxdns/winipcfg/interface_change_handler.go (100%) rename {go => core}/cmd/nekobox_core/internal/boxdns/winipcfg/luid.go (100%) rename {go => core}/cmd/nekobox_core/internal/boxdns/winipcfg/mksyscall.go (100%) rename {go => core}/cmd/nekobox_core/internal/boxdns/winipcfg/netsh.go (100%) rename {go => core}/cmd/nekobox_core/internal/boxdns/winipcfg/route_change_handler.go (100%) rename {go => core}/cmd/nekobox_core/internal/boxdns/winipcfg/types.go (100%) rename {go => core}/cmd/nekobox_core/internal/boxdns/winipcfg/types_32.go (100%) rename {go => core}/cmd/nekobox_core/internal/boxdns/winipcfg/types_64.go (100%) rename {go => core}/cmd/nekobox_core/internal/boxdns/winipcfg/types_test.go (100%) rename {go => core}/cmd/nekobox_core/internal/boxdns/winipcfg/types_test_32.go (100%) rename {go => core}/cmd/nekobox_core/internal/boxdns/winipcfg/types_test_64.go (100%) rename {go => core}/cmd/nekobox_core/internal/boxdns/winipcfg/unicast_address_change_handler.go (100%) rename {go => core}/cmd/nekobox_core/internal/boxdns/winipcfg/winipcfg.go (100%) rename {go => core}/cmd/nekobox_core/internal/boxdns/winipcfg/winipcfg_test.go (100%) rename {go => core}/cmd/nekobox_core/internal/boxdns/winipcfg/zwinipcfg_windows.go (100%) rename {go => core}/cmd/nekobox_core/internal/boxmain/cmd_check.go (100%) rename {go => core}/cmd/nekobox_core/internal/boxmain/cmd_format.go (100%) rename {go => core}/cmd/nekobox_core/internal/boxmain/cmd_generate.go (100%) rename {go => core}/cmd/nekobox_core/internal/boxmain/cmd_generate_tls.go (100%) rename {go => core}/cmd/nekobox_core/internal/boxmain/cmd_generate_vapid.go (100%) rename {go => core}/cmd/nekobox_core/internal/boxmain/cmd_generate_wireguard.go (100%) rename {go => core}/cmd/nekobox_core/internal/boxmain/cmd_geoip.go (100%) rename {go => core}/cmd/nekobox_core/internal/boxmain/cmd_geoip_export.go (100%) rename {go => core}/cmd/nekobox_core/internal/boxmain/cmd_geoip_list.go (100%) rename {go => core}/cmd/nekobox_core/internal/boxmain/cmd_geosite.go (100%) rename {go => core}/cmd/nekobox_core/internal/boxmain/cmd_geosite_export.go (100%) rename {go => core}/cmd/nekobox_core/internal/boxmain/cmd_geosite_list.go (100%) rename {go => core}/cmd/nekobox_core/internal/boxmain/cmd_rule_set_compile.go (100%) rename {go => core}/cmd/nekobox_core/internal/boxmain/cmd_run.go (100%) rename {go => core}/cmd/nekobox_core/internal/boxmain/cmd_tools.go (100%) rename {go => core}/cmd/nekobox_core/internal/boxmain/cmd_tools_connect.go (100%) rename {go => core}/cmd/nekobox_core/internal/boxmain/cmd_tools_fetch.go (100%) rename {go => core}/cmd/nekobox_core/internal/boxmain/cmd_tools_synctime.go (100%) rename {go => core}/cmd/nekobox_core/internal/boxmain/cmd_version.go (100%) rename {go => core}/cmd/nekobox_core/internal/boxmain/color.go (100%) rename {go => core}/cmd/nekobox_core/internal/boxmain/debug.go (100%) rename {go => core}/cmd/nekobox_core/internal/boxmain/debug_linux.go (100%) rename {go => core}/cmd/nekobox_core/internal/boxmain/debug_stub.go (100%) rename {go => core}/cmd/nekobox_core/internal/boxmain/main.go (100%) rename {go => core}/cmd/nekobox_core/internal/distro/all/all.go (100%) rename {go => core}/cmd/nekobox_core/internal/main.go (100%) rename {go => core}/cmd/nekobox_core/main.go (100%) rename {go => core}/cmd/nekobox_core/test_utils.go (100%) rename {go => core}/cmd/updater/.gitignore (100%) rename {go => core}/cmd/updater/go.mod (100%) rename {go => core}/cmd/updater/go.sum (100%) rename {go => core}/cmd/updater/main.go (100%) rename {go => core}/cmd/updater/msgbox.go (100%) rename {go => core}/cmd/updater/msgbox_windows.go (100%) rename {go => core}/cmd/updater/updater.go (100%) rename {go => core}/grpc_server/auth/auth.go (100%) rename {go => core}/grpc_server/gen/libcore.pb.go (100%) rename {go => core}/grpc_server/gen/libcore.proto (100%) rename {go => core}/grpc_server/gen/libcore_grpc.pb.go (100%) rename {go => core}/grpc_server/gen/update_proto.sh (100%) rename {go => core}/grpc_server/go.mod (100%) rename {go => core}/grpc_server/go.sum (99%) rename {go => core}/grpc_server/grpc.go (100%) rename {go => core}/grpc_server/update.go (100%) rename {rpc => include/api}/gRPC.h (100%) rename {db => include/configs}/ConfigBuilder.hpp (95%) rename {fmt => include/configs/proxy}/AbstractBean.hpp (97%) rename {fmt => include/configs/proxy}/ChainBean.hpp (91%) rename {fmt => include/configs/proxy}/CustomBean.hpp (98%) rename {fmt => include/configs/proxy}/NaiveBean.hpp (97%) rename {fmt => include/configs/proxy}/Preset.hpp (100%) rename {fmt => include/configs/proxy}/QUICBean.hpp (99%) rename {fmt => include/configs/proxy}/SSHBean.h (97%) rename {fmt => include/configs/proxy}/ShadowSocksBean.hpp (94%) rename {fmt => include/configs/proxy}/SocksHttpBean.hpp (94%) rename {fmt => include/configs/proxy}/TrojanVLESSBean.hpp (94%) rename {fmt => include/configs/proxy}/V2RayStreamSettings.hpp (100%) rename {fmt => include/configs/proxy}/VMessBean.hpp (93%) rename {fmt => include/configs/proxy}/WireguardBean.h (98%) rename {fmt => include/configs/proxy}/includes.h (100%) rename {sub => include/configs/sub}/GroupUpdater.hpp (75%) rename {db => include/dataStore}/Database.hpp (98%) rename {db => include/dataStore}/Group.hpp (95%) rename {db => include/dataStore}/ProfileFilter.hpp (100%) rename {db => include/dataStore}/ProxyEntity.hpp (94%) rename {db => include/dataStore}/RouteEntity.h (98%) rename {main => include/global}/Const.hpp (100%) rename {main => include/global}/GuiUtils.hpp (100%) rename {main => include/global}/HTTPRequestHelper.hpp (100%) rename {main => include/global}/NekoGui.hpp (100%) rename {main => include/global}/NekoGui_ConfigItem.hpp (100%) rename {main => include/global}/NekoGui_DataStore.hpp (100%) rename {main => include/global}/NekoGui_Utils.hpp (100%) rename {db => include/stats}/traffic/TrafficData.hpp (96%) rename {db => include/stats}/traffic/TrafficLooper.hpp (100%) rename {sys => include/sys}/AutoRun.hpp (100%) rename {sys => include/sys}/ExternalProcess.hpp (100%) rename {sys => include/sys}/linux/LinuxCap.h (100%) rename {sys => include/sys}/macos/MacOS.h (100%) rename {sys => include/sys}/windows/MiniDump.h (100%) rename {sys => include/sys}/windows/guihelper.h (100%) rename {ui/widget => include/ui/group}/GroupItem.h (90%) rename {ui/widget => include/ui/group}/GroupItem.ui (100%) rename {ui => include/ui/group}/GroupSort.hpp (100%) rename {ui/edit => include/ui/group}/dialog_edit_group.h (89%) rename {ui/edit => include/ui/group}/dialog_edit_group.ui (99%) rename {ui => include/ui/group}/dialog_manage_groups.h (86%) rename {ui => include/ui/group}/dialog_manage_groups.ui (100%) rename {ui => include/ui}/mainwindow.h (96%) rename {ui => include/ui}/mainwindow.ui (99%) rename {ui => include/ui}/mainwindow_interface.h (60%) rename {ui/widget => include/ui/profile}/ProxyItem.h (89%) rename {ui/widget => include/ui/profile}/ProxyItem.ui (100%) rename {ui/edit => include/ui/profile}/dialog_edit_profile.h (91%) rename {ui/edit => include/ui/profile}/dialog_edit_profile.ui (99%) rename {ui/edit => include/ui/profile}/edit_chain.h (96%) rename {ui/edit => include/ui/profile}/edit_chain.ui (100%) rename {ui/edit => include/ui/profile}/edit_custom.h (95%) rename {ui/edit => include/ui/profile}/edit_custom.ui (100%) rename {ui/edit => include/ui/profile}/edit_naive.h (96%) rename {ui/edit => include/ui/profile}/edit_naive.ui (98%) rename {ui/edit => include/ui/profile}/edit_quic.h (96%) rename {ui/edit => include/ui/profile}/edit_quic.ui (99%) rename {ui/edit => include/ui/profile}/edit_shadowsocks.h (94%) rename {ui/edit => include/ui/profile}/edit_shadowsocks.ui (98%) rename {ui/edit => include/ui/profile}/edit_socks_http.h (93%) rename {ui/edit => include/ui/profile}/edit_socks_http.ui (100%) rename {ui/edit => include/ui/profile}/edit_ssh.h (94%) rename {ui/edit => include/ui/profile}/edit_ssh.ui (100%) rename {ui/edit => include/ui/profile}/edit_trojan_vless.h (93%) rename {ui/edit => include/ui/profile}/edit_trojan_vless.ui (96%) rename {ui/edit => include/ui/profile}/edit_vmess.h (94%) rename {ui/edit => include/ui/profile}/edit_vmess.ui (98%) rename {ui/edit => include/ui/profile}/edit_wireguard.h (94%) rename {ui/edit => include/ui/profile}/edit_wireguard.ui (100%) rename {ui/edit => include/ui/profile}/profile_editor.h (86%) rename {ui => include/ui/setting}/Icon.hpp (100%) rename {ui/widget => include/ui/setting}/RouteItem.h (95%) rename {ui/widget => include/ui/setting}/RouteItem.ui (100%) rename {ui => include/ui/setting}/ThemeManager.hpp (100%) rename {ui => include/ui/setting}/dialog_basic_settings.h (94%) rename {ui => include/ui/setting}/dialog_basic_settings.ui (99%) rename {ui => include/ui/setting}/dialog_hotkey.h (81%) rename {ui => include/ui/setting}/dialog_hotkey.ui (100%) rename {ui => include/ui/setting}/dialog_manage_routes.h (89%) rename {ui => include/ui/setting}/dialog_manage_routes.ui (100%) rename {ui => include/ui/setting}/dialog_vpn_settings.h (93%) rename {ui => include/ui/setting}/dialog_vpn_settings.ui (100%) rename {ui/widget => include/ui/utils}/FloatCheckBox.h (100%) rename {ui/widget => include/ui/utils}/MessageBoxTimer.h (100%) rename {ui/widget => include/ui/utils}/MyLineEdit.h (100%) rename {ui/widget => include/ui/utils}/MyTableWidget.h (100%) delete mode 100644 libs/.gitignore rename {libs => script}/build_deps_all.sh (99%) mode change 100755 => 100644 rename {libs => script}/build_go.sh (94%) mode change 100755 => 100644 rename {libs => script}/build_public_res.sh (92%) mode change 100755 => 100644 rename {libs => script}/deploy_linux64.sh (98%) mode change 100755 => 100644 rename {libs => script}/deploy_macos.sh (95%) mode change 100755 => 100644 rename {libs => script}/deploy_windows64.sh (96%) mode change 100755 => 100644 rename {libs => script}/env_deploy.sh (100%) rename {libs => script}/format_cpp.sh (100%) mode change 100755 => 100644 rename {libs => script}/pack_debian.sh (100%) rename {libs => script}/translate.sh (100%) mode change 100755 => 100644 rename {rpc => src/api}/gRPC.cpp (99%) rename {db => src/configs}/ConfigBuilder.cpp (99%) rename {fmt => src/configs/proxy}/AbstractBean.cpp (98%) rename {fmt => src/configs/proxy}/Bean2CoreObj_box.cpp (99%) rename {fmt => src/configs/proxy}/Bean2External.cpp (99%) rename {fmt => src/configs/proxy}/Bean2Link.cpp (99%) rename {fmt => src/configs/proxy}/Link2Bean.cpp (99%) rename {sub => src/configs/sub}/GroupUpdater.cpp (99%) rename {db => src/dataStore}/Database.cpp (99%) rename {db => src/dataStore}/ProfileFilter.cpp (98%) rename {db => src/dataStore}/RouteEntity.cpp (99%) rename {main => src/global}/HTTPRequestHelper.cpp (97%) rename {main => src/global}/NekoGui.cpp (99%) rename {main => src/global}/NekoGui_Utils.cpp (98%) rename {main => src}/main.cpp (98%) rename {db => src/stats}/traffic/TrafficLooper.cpp (96%) rename {sys => src/sys}/AutoRun.cpp (99%) rename {sys => src/sys}/ExternalProcess.cpp (98%) rename {sys => src/sys}/linux/LinuxCap.cpp (96%) rename {sys => src/sys}/macos/MacOS.cpp (88%) rename {sys => src/sys}/windows/MiniDump.cpp (98%) rename {sys => src/sys}/windows/guihelper.cpp (93%) rename {ui/widget => src/ui/group}/GroupItem.cpp (95%) rename {ui/edit => src/ui/group}/dialog_edit_group.cpp (97%) rename {ui => src/ui/group}/dialog_manage_groups.cpp (86%) rename {ui => src/ui}/mainwindow.cpp (98%) rename {ui => src/ui}/mainwindow_grpc.cpp (98%) rename {ui/widget => src/ui/profile}/ProxyItem.cpp (96%) rename {ui/edit => src/ui/profile}/dialog_edit_profile.cpp (97%) rename {ui/edit => src/ui/profile}/edit_chain.cpp (90%) rename {ui/edit => src/ui/profile}/edit_custom.cpp (95%) rename {ui/edit => src/ui/profile}/edit_naive.cpp (94%) rename {ui/edit => src/ui/profile}/edit_quic.cpp (98%) rename {ui/edit => src/ui/profile}/edit_shadowsocks.cpp (88%) rename {ui/edit => src/ui/profile}/edit_socks_http.cpp (92%) rename {ui/edit => src/ui/profile}/edit_ssh.cpp (95%) rename {ui/edit => src/ui/profile}/edit_trojan_vless.cpp (85%) rename {ui/edit => src/ui/profile}/edit_vmess.cpp (89%) rename {ui/edit => src/ui/profile}/edit_wireguard.cpp (94%) rename {ui => src/ui/setting}/Icon.cpp (94%) rename {ui/widget => src/ui/setting}/RouteItem.cpp (98%) rename {ui => src/ui/setting}/ThemeManager.cpp (95%) rename {ui => src/ui/setting}/dialog_basic_settings.cpp (98%) rename {ui => src/ui/setting}/dialog_hotkey.cpp (92%) rename {ui => src/ui/setting}/dialog_manage_routes.cpp (98%) rename {ui => src/ui/setting}/dialog_vpn_settings.cpp (91%) diff --git a/.gitignore b/.gitignore index 94073ae..965f23c 100644 --- a/.gitignore +++ b/.gitignore @@ -84,4 +84,5 @@ CMakeLists.txt.user* /qtsdk .vs -out \ No newline at end of file +out +/libs \ No newline at end of file diff --git a/3rdparty/qv2ray/v2/proxy/QvProxyConfigurator.cpp b/3rdparty/qv2ray/v2/proxy/QvProxyConfigurator.cpp index 4b37f05..b65ab17 100644 --- a/3rdparty/qv2ray/v2/proxy/QvProxyConfigurator.cpp +++ b/3rdparty/qv2ray/v2/proxy/QvProxyConfigurator.cpp @@ -17,8 +17,8 @@ #include #include "3rdparty/qv2ray/wrapper.hpp" -#include "fmt/Preset.hpp" -#include "main/NekoGui.hpp" +#include "include/configs/proxy/Preset.hpp" +#include "include/global/NekoGui.hpp" #define QV_MODULE_NAME "SystemProxy" diff --git a/3rdparty/qv2ray/v2/ui/widgets/editors/w_JsonEditor.cpp b/3rdparty/qv2ray/v2/ui/widgets/editors/w_JsonEditor.cpp index 2eb6bdb..f641e6d 100644 --- a/3rdparty/qv2ray/v2/ui/widgets/editors/w_JsonEditor.cpp +++ b/3rdparty/qv2ray/v2/ui/widgets/editors/w_JsonEditor.cpp @@ -1,6 +1,6 @@ #include "w_JsonEditor.hpp" -#include "main/NekoGui.hpp" +#include "include/global/NekoGui.hpp" JsonEditor::JsonEditor(const QJsonObject& rootObject, QWidget* parent) : QDialog(parent) { setupUi(this); diff --git a/CMakeLists.txt b/CMakeLists.txt index 4dc2581..1538300 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.9) +cmake_minimum_required(VERSION 3.10) project(nekoray VERSION 0.1 LANGUAGES CXX) @@ -6,6 +6,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) +set(CMAKE_POLICY_DEFAULT_CMP0069 NEW) set(CMAKE_INTERPROCEDURAL_OPTIMIZATION ON) find_package(Qt6 REQUIRED COMPONENTS Widgets Network Svg LinguistTools QuickControls2) @@ -74,10 +75,10 @@ list(APPEND NKR_EXTERNAL_TARGETS qhotkey) set(PROJECT_SOURCES ${PLATFORM_SOURCES} - main/main.cpp - main/NekoGui.cpp - main/NekoGui_Utils.cpp - main/HTTPRequestHelper.cpp + src/main.cpp + src/global/NekoGui.cpp + src/global/NekoGui_Utils.cpp + src/global/HTTPRequestHelper.cpp 3rdparty/base64.cpp 3rdparty/qrcodegen.cpp @@ -91,113 +92,126 @@ set(PROJECT_SOURCES 3rdparty/qv2ray/v2/ui/widgets/editors/w_JsonEditor.ui 3rdparty/qv2ray/v2/proxy/QvProxyConfigurator.cpp - rpc/gRPC.cpp + src/api/gRPC.cpp - db/Database.cpp - db/traffic/TrafficLooper.cpp - db/ProfileFilter.cpp - db/ConfigBuilder.cpp + src/dataStore/Database.cpp + src/stats/traffic/TrafficLooper.cpp + src/dataStore/ProfileFilter.cpp + src/configs/ConfigBuilder.cpp - fmt/AbstractBean.cpp - fmt/Bean2CoreObj_box.cpp - fmt/Bean2External.cpp - fmt/Bean2Link.cpp - fmt/Link2Bean.cpp - fmt/ChainBean.hpp # translate + src/configs/proxy/AbstractBean.cpp + src/configs/proxy/Bean2CoreObj_box.cpp + src/configs/proxy/Bean2External.cpp + src/configs/proxy/Bean2Link.cpp + src/configs/proxy/Link2Bean.cpp + include/configs/proxy/ChainBean.hpp # translate - sub/GroupUpdater.cpp + include/configs/sub/GroupUpdater.hpp + src/configs/sub/GroupUpdater.cpp - sys/ExternalProcess.cpp - sys/AutoRun.cpp + src/sys/ExternalProcess.cpp + src/sys/AutoRun.cpp - ui/ThemeManager.cpp - ui/Icon.cpp + include/ui/setting/ThemeManager.hpp + src/ui/setting/ThemeManager.cpp + src/ui/setting/Icon.cpp - ui/mainwindow_grpc.cpp - ui/mainwindow.cpp - ui/mainwindow.h - ui/mainwindow.ui + src/ui/mainwindow_grpc.cpp + src/ui/mainwindow.cpp + include/ui/mainwindow.h + include/ui/mainwindow.ui - ui/edit/dialog_edit_profile.h - ui/edit/dialog_edit_profile.cpp - ui/edit/dialog_edit_profile.ui - ui/edit/dialog_edit_group.h - ui/edit/dialog_edit_group.cpp - ui/edit/dialog_edit_group.ui + include/ui/profile/dialog_edit_profile.h + src/ui/profile/dialog_edit_profile.cpp + include/ui/profile/dialog_edit_profile.ui + include/ui/group/dialog_edit_group.h + src/ui/group/dialog_edit_group.cpp + include/ui/group/dialog_edit_group.ui - ui/edit/edit_chain.h - ui/edit/edit_chain.cpp - ui/edit/edit_chain.ui - ui/edit/edit_socks_http.h - ui/edit/edit_socks_http.cpp - ui/edit/edit_socks_http.ui - ui/edit/edit_shadowsocks.h - ui/edit/edit_shadowsocks.cpp - ui/edit/edit_shadowsocks.ui - ui/edit/edit_vmess.h - ui/edit/edit_vmess.cpp - ui/edit/edit_vmess.ui - ui/edit/edit_trojan_vless.h - ui/edit/edit_trojan_vless.cpp - ui/edit/edit_trojan_vless.ui + include/ui/profile/edit_chain.h + src/ui/profile/edit_chain.cpp + include/ui/profile/edit_chain.ui + include/ui/profile/edit_socks_http.h + src/ui/profile/edit_socks_http.cpp + include/ui/profile/edit_socks_http.ui + include/ui/profile/edit_shadowsocks.h + src/ui/profile/edit_shadowsocks.cpp + include/ui/profile/edit_shadowsocks.ui + include/ui/profile/edit_vmess.h + src/ui/profile/edit_vmess.cpp + include/ui/profile/edit_vmess.ui + include/ui/profile/edit_trojan_vless.h + src/ui/profile/edit_trojan_vless.cpp + include/ui/profile/edit_trojan_vless.ui - ui/edit/edit_naive.h - ui/edit/edit_naive.cpp - ui/edit/edit_naive.ui + include/ui/profile/edit_naive.h + src/ui/profile/edit_naive.cpp + include/ui/profile/edit_naive.ui - ui/edit/edit_quic.h - ui/edit/edit_quic.cpp - ui/edit/edit_quic.ui + include/ui/profile/edit_quic.h + src/ui/profile/edit_quic.cpp + include/ui/profile/edit_quic.ui - ui/edit/edit_custom.h - ui/edit/edit_custom.cpp - ui/edit/edit_custom.ui + include/ui/profile/edit_custom.h + src/ui/profile/edit_custom.cpp + include/ui/profile/edit_custom.ui - ui/edit/edit_wireguard.h - ui/edit/edit_wireguard.cpp - ui/edit/edit_wireguard.ui + include/ui/profile/edit_wireguard.h + src/ui/profile/edit_wireguard.cpp + include/ui/profile/edit_wireguard.ui - ui/dialog_basic_settings.cpp - ui/dialog_basic_settings.h - ui/dialog_basic_settings.ui + src/ui/setting/dialog_basic_settings.cpp + include/ui/setting/dialog_basic_settings.h + include/ui/setting/dialog_basic_settings.ui - ui/dialog_manage_groups.cpp - ui/dialog_manage_groups.h - ui/dialog_manage_groups.ui + src/ui/group/dialog_manage_groups.cpp + include/ui/group/dialog_manage_groups.h + include/ui/group/dialog_manage_groups.ui - ui/dialog_manage_routes.cpp - ui/dialog_manage_routes.h - ui/dialog_manage_routes.ui + src/ui/setting/dialog_manage_routes.cpp + include/ui/setting/dialog_manage_routes.h + include/ui/setting/dialog_manage_routes.ui - ui/dialog_vpn_settings.cpp - ui/dialog_vpn_settings.h - ui/dialog_vpn_settings.ui + src/ui/setting/dialog_vpn_settings.cpp + include/ui/setting/dialog_vpn_settings.h + include/ui/setting/dialog_vpn_settings.ui - ui/dialog_hotkey.cpp - ui/dialog_hotkey.h - ui/dialog_hotkey.ui + src/ui/setting/dialog_hotkey.cpp + include/ui/setting/dialog_hotkey.h + include/ui/setting/dialog_hotkey.ui - ui/widget/ProxyItem.cpp - ui/widget/ProxyItem.h - ui/widget/ProxyItem.ui - ui/widget/GroupItem.cpp - ui/widget/GroupItem.h - ui/widget/GroupItem.ui - ui/widget/RouteItem.cpp - ui/widget/RouteItem.h - ui/widget/RouteItem.ui + src/ui/profile/ProxyItem.cpp + include/ui/profile/ProxyItem.h + include/ui/profile/ProxyItem.ui + src/ui/group/GroupItem.cpp + include/ui/group/GroupItem.h + include/ui/group/GroupItem.ui + src/ui/setting/RouteItem.cpp + include/ui/setting/RouteItem.h + include/ui/setting/RouteItem.ui res/neko.qrc ${QV2RAY_RC} - db/RouteEntity.h - db/RouteEntity.cpp + include/dataStore/RouteEntity.h + src/dataStore/RouteEntity.cpp res/darkstyle.qrc - ui/edit/edit_ssh.cpp - ui/edit/edit_ssh.h - ui/edit/edit_ssh.ui - fmt/SSHBean.h - sys/macos/MacOS.cpp - sys/macos/MacOS.h + src/ui/profile/edit_ssh.cpp + include/ui/profile/edit_ssh.h + include/ui/profile/edit_ssh.ui + include/configs/proxy/SSHBean.h + src/sys/macos/MacOS.cpp + include/sys/macos/MacOS.h + + src/sys/windows/guihelper.cpp + src/sys/windows/MiniDump.cpp + + src/sys/linux/LinuxCap.cpp + + src/sys/macos/MacOS.cpp + + src/sys/AutoRun.cpp + src/sys/ExternalProcess.cpp + include/ui/mainwindow_interface.h ) # Qt exe diff --git a/cmake/linux/linux.cmake b/cmake/linux/linux.cmake index f9458e0..7612151 100644 --- a/cmake/linux/linux.cmake +++ b/cmake/linux/linux.cmake @@ -1,2 +1,2 @@ -set(PLATFORM_SOURCES sys/linux/LinuxCap.cpp) +set(PLATFORM_SOURCES include/sys/linux/LinuxCap.cpp) set(PLATFORM_LIBRARIES dl) diff --git a/cmake/macos/macos.cmake b/cmake/macos/macos.cmake index 419252c..84508b1 100644 --- a/cmake/macos/macos.cmake +++ b/cmake/macos/macos.cmake @@ -1,3 +1,3 @@ find_library(SECURITY_FRAMEWORK Security) -set(PLATFORM_SOURCES sys/macos/MacOS.cpp) +set(PLATFORM_SOURCES include/sys/macos/MacOS.cpp) set(PLATFORM_LIBRARIES ${SECURITY_FRAMEWORK}) \ No newline at end of file diff --git a/cmake/myproto.cmake b/cmake/myproto.cmake index 4f387f1..20de87d 100644 --- a/cmake/myproto.cmake +++ b/cmake/myproto.cmake @@ -1,7 +1,7 @@ find_package(Protobuf CONFIG REQUIRED) set(PROTO_FILES - go/grpc_server/gen/libcore.proto + core/grpc_server/gen/libcore.proto ) add_library(myproto STATIC ${PROTO_FILES}) diff --git a/cmake/windows/windows.cmake b/cmake/windows/windows.cmake index 75bd037..5f2c8f7 100644 --- a/cmake/windows/windows.cmake +++ b/cmake/windows/windows.cmake @@ -1,4 +1,4 @@ -set(PLATFORM_SOURCES 3rdparty/WinCommander.cpp sys/windows/guihelper.cpp sys/windows/MiniDump.cpp) +set(PLATFORM_SOURCES 3rdparty/WinCommander.cpp src/sys/windows/guihelper.cpp src/sys/windows/MiniDump.cpp) set(PLATFORM_LIBRARIES wininet wsock32 ws2_32 user32 rasapi32 iphlpapi) include(cmake/windows/generate_product_version.cmake) diff --git a/go/.gitignore b/core/.gitignore similarity index 100% rename from go/.gitignore rename to core/.gitignore diff --git a/go/cmd/nekobox_core/core_box.go b/core/cmd/nekobox_core/core_box.go similarity index 100% rename from go/cmd/nekobox_core/core_box.go rename to core/cmd/nekobox_core/core_box.go diff --git a/go/cmd/nekobox_core/go.mod b/core/cmd/nekobox_core/go.mod similarity index 100% rename from go/cmd/nekobox_core/go.mod rename to core/cmd/nekobox_core/go.mod diff --git a/go/cmd/nekobox_core/go.sum b/core/cmd/nekobox_core/go.sum similarity index 99% rename from go/cmd/nekobox_core/go.sum rename to core/cmd/nekobox_core/go.sum index 1fd62e4..650cdd6 100644 --- a/go/cmd/nekobox_core/go.sum +++ b/core/cmd/nekobox_core/go.sum @@ -322,7 +322,7 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAinclude/dataStore/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAinclude/dataStore/ePZxsR/4RtNHQocxwk9r4= lukechampine.com/blake3 v1.3.0 h1:sJ3XhFINmHSrYCgl958hscfIa3bw8x4DqMP3u1YvoYE= lukechampine.com/blake3 v1.3.0/go.mod h1:0OFRp7fBtAylGVCO40o87sbupkyIGgbpv1+M1k1LM6k= diff --git a/go/cmd/nekobox_core/grpc_box.go b/core/cmd/nekobox_core/grpc_box.go similarity index 100% rename from go/cmd/nekobox_core/grpc_box.go rename to core/cmd/nekobox_core/grpc_box.go diff --git a/go/cmd/nekobox_core/grpc_windows.go b/core/cmd/nekobox_core/grpc_windows.go similarity index 100% rename from go/cmd/nekobox_core/grpc_windows.go rename to core/cmd/nekobox_core/grpc_windows.go diff --git a/go/cmd/nekobox_core/internal/boxapi/go_http.go b/core/cmd/nekobox_core/internal/boxapi/go_http.go similarity index 100% rename from go/cmd/nekobox_core/internal/boxapi/go_http.go rename to core/cmd/nekobox_core/internal/boxapi/go_http.go diff --git a/go/cmd/nekobox_core/internal/boxapi/go_net.go b/core/cmd/nekobox_core/internal/boxapi/go_net.go similarity index 100% rename from go/cmd/nekobox_core/internal/boxapi/go_net.go rename to core/cmd/nekobox_core/internal/boxapi/go_net.go diff --git a/go/cmd/nekobox_core/internal/boxapi/v2ray_server.go b/core/cmd/nekobox_core/internal/boxapi/v2ray_server.go similarity index 100% rename from go/cmd/nekobox_core/internal/boxapi/v2ray_server.go rename to core/cmd/nekobox_core/internal/boxapi/v2ray_server.go diff --git a/go/cmd/nekobox_core/internal/boxapi/v2ray_stats_service.go b/core/cmd/nekobox_core/internal/boxapi/v2ray_stats_service.go similarity index 100% rename from go/cmd/nekobox_core/internal/boxapi/v2ray_stats_service.go rename to core/cmd/nekobox_core/internal/boxapi/v2ray_stats_service.go diff --git a/go/cmd/nekobox_core/internal/boxbox/api.go b/core/cmd/nekobox_core/internal/boxbox/api.go similarity index 100% rename from go/cmd/nekobox_core/internal/boxbox/api.go rename to core/cmd/nekobox_core/internal/boxbox/api.go diff --git a/go/cmd/nekobox_core/internal/boxbox/box.go b/core/cmd/nekobox_core/internal/boxbox/box.go similarity index 100% rename from go/cmd/nekobox_core/internal/boxbox/box.go rename to core/cmd/nekobox_core/internal/boxbox/box.go diff --git a/go/cmd/nekobox_core/internal/boxbox/box_outbound.go b/core/cmd/nekobox_core/internal/boxbox/box_outbound.go similarity index 100% rename from go/cmd/nekobox_core/internal/boxbox/box_outbound.go rename to core/cmd/nekobox_core/internal/boxbox/box_outbound.go diff --git a/go/cmd/nekobox_core/internal/boxbox/debug.go b/core/cmd/nekobox_core/internal/boxbox/debug.go similarity index 100% rename from go/cmd/nekobox_core/internal/boxbox/debug.go rename to core/cmd/nekobox_core/internal/boxbox/debug.go diff --git a/go/cmd/nekobox_core/internal/boxbox/version.go b/core/cmd/nekobox_core/internal/boxbox/version.go similarity index 100% rename from go/cmd/nekobox_core/internal/boxbox/version.go rename to core/cmd/nekobox_core/internal/boxbox/version.go diff --git a/go/cmd/nekobox_core/internal/boxbox/wtf.go b/core/cmd/nekobox_core/internal/boxbox/wtf.go similarity index 100% rename from go/cmd/nekobox_core/internal/boxbox/wtf.go rename to core/cmd/nekobox_core/internal/boxbox/wtf.go diff --git a/go/cmd/nekobox_core/internal/boxdns/boxdns.go b/core/cmd/nekobox_core/internal/boxdns/boxdns.go similarity index 100% rename from go/cmd/nekobox_core/internal/boxdns/boxdns.go rename to core/cmd/nekobox_core/internal/boxdns/boxdns.go diff --git a/go/cmd/nekobox_core/internal/boxdns/dns_manager_windows.go b/core/cmd/nekobox_core/internal/boxdns/dns_manager_windows.go similarity index 100% rename from go/cmd/nekobox_core/internal/boxdns/dns_manager_windows.go rename to core/cmd/nekobox_core/internal/boxdns/dns_manager_windows.go diff --git a/go/cmd/nekobox_core/internal/boxdns/monitor_windows.go b/core/cmd/nekobox_core/internal/boxdns/monitor_windows.go similarity index 100% rename from go/cmd/nekobox_core/internal/boxdns/monitor_windows.go rename to core/cmd/nekobox_core/internal/boxdns/monitor_windows.go diff --git a/go/cmd/nekobox_core/internal/boxdns/underlying_dns.go b/core/cmd/nekobox_core/internal/boxdns/underlying_dns.go similarity index 100% rename from go/cmd/nekobox_core/internal/boxdns/underlying_dns.go rename to core/cmd/nekobox_core/internal/boxdns/underlying_dns.go diff --git a/go/cmd/nekobox_core/internal/boxdns/winipcfg/interface_change_handler.go b/core/cmd/nekobox_core/internal/boxdns/winipcfg/interface_change_handler.go similarity index 100% rename from go/cmd/nekobox_core/internal/boxdns/winipcfg/interface_change_handler.go rename to core/cmd/nekobox_core/internal/boxdns/winipcfg/interface_change_handler.go diff --git a/go/cmd/nekobox_core/internal/boxdns/winipcfg/luid.go b/core/cmd/nekobox_core/internal/boxdns/winipcfg/luid.go similarity index 100% rename from go/cmd/nekobox_core/internal/boxdns/winipcfg/luid.go rename to core/cmd/nekobox_core/internal/boxdns/winipcfg/luid.go diff --git a/go/cmd/nekobox_core/internal/boxdns/winipcfg/mksyscall.go b/core/cmd/nekobox_core/internal/boxdns/winipcfg/mksyscall.go similarity index 100% rename from go/cmd/nekobox_core/internal/boxdns/winipcfg/mksyscall.go rename to core/cmd/nekobox_core/internal/boxdns/winipcfg/mksyscall.go diff --git a/go/cmd/nekobox_core/internal/boxdns/winipcfg/netsh.go b/core/cmd/nekobox_core/internal/boxdns/winipcfg/netsh.go similarity index 100% rename from go/cmd/nekobox_core/internal/boxdns/winipcfg/netsh.go rename to core/cmd/nekobox_core/internal/boxdns/winipcfg/netsh.go diff --git a/go/cmd/nekobox_core/internal/boxdns/winipcfg/route_change_handler.go b/core/cmd/nekobox_core/internal/boxdns/winipcfg/route_change_handler.go similarity index 100% rename from go/cmd/nekobox_core/internal/boxdns/winipcfg/route_change_handler.go rename to core/cmd/nekobox_core/internal/boxdns/winipcfg/route_change_handler.go diff --git a/go/cmd/nekobox_core/internal/boxdns/winipcfg/types.go b/core/cmd/nekobox_core/internal/boxdns/winipcfg/types.go similarity index 100% rename from go/cmd/nekobox_core/internal/boxdns/winipcfg/types.go rename to core/cmd/nekobox_core/internal/boxdns/winipcfg/types.go diff --git a/go/cmd/nekobox_core/internal/boxdns/winipcfg/types_32.go b/core/cmd/nekobox_core/internal/boxdns/winipcfg/types_32.go similarity index 100% rename from go/cmd/nekobox_core/internal/boxdns/winipcfg/types_32.go rename to core/cmd/nekobox_core/internal/boxdns/winipcfg/types_32.go diff --git a/go/cmd/nekobox_core/internal/boxdns/winipcfg/types_64.go b/core/cmd/nekobox_core/internal/boxdns/winipcfg/types_64.go similarity index 100% rename from go/cmd/nekobox_core/internal/boxdns/winipcfg/types_64.go rename to core/cmd/nekobox_core/internal/boxdns/winipcfg/types_64.go diff --git a/go/cmd/nekobox_core/internal/boxdns/winipcfg/types_test.go b/core/cmd/nekobox_core/internal/boxdns/winipcfg/types_test.go similarity index 100% rename from go/cmd/nekobox_core/internal/boxdns/winipcfg/types_test.go rename to core/cmd/nekobox_core/internal/boxdns/winipcfg/types_test.go diff --git a/go/cmd/nekobox_core/internal/boxdns/winipcfg/types_test_32.go b/core/cmd/nekobox_core/internal/boxdns/winipcfg/types_test_32.go similarity index 100% rename from go/cmd/nekobox_core/internal/boxdns/winipcfg/types_test_32.go rename to core/cmd/nekobox_core/internal/boxdns/winipcfg/types_test_32.go diff --git a/go/cmd/nekobox_core/internal/boxdns/winipcfg/types_test_64.go b/core/cmd/nekobox_core/internal/boxdns/winipcfg/types_test_64.go similarity index 100% rename from go/cmd/nekobox_core/internal/boxdns/winipcfg/types_test_64.go rename to core/cmd/nekobox_core/internal/boxdns/winipcfg/types_test_64.go diff --git a/go/cmd/nekobox_core/internal/boxdns/winipcfg/unicast_address_change_handler.go b/core/cmd/nekobox_core/internal/boxdns/winipcfg/unicast_address_change_handler.go similarity index 100% rename from go/cmd/nekobox_core/internal/boxdns/winipcfg/unicast_address_change_handler.go rename to core/cmd/nekobox_core/internal/boxdns/winipcfg/unicast_address_change_handler.go diff --git a/go/cmd/nekobox_core/internal/boxdns/winipcfg/winipcfg.go b/core/cmd/nekobox_core/internal/boxdns/winipcfg/winipcfg.go similarity index 100% rename from go/cmd/nekobox_core/internal/boxdns/winipcfg/winipcfg.go rename to core/cmd/nekobox_core/internal/boxdns/winipcfg/winipcfg.go diff --git a/go/cmd/nekobox_core/internal/boxdns/winipcfg/winipcfg_test.go b/core/cmd/nekobox_core/internal/boxdns/winipcfg/winipcfg_test.go similarity index 100% rename from go/cmd/nekobox_core/internal/boxdns/winipcfg/winipcfg_test.go rename to core/cmd/nekobox_core/internal/boxdns/winipcfg/winipcfg_test.go diff --git a/go/cmd/nekobox_core/internal/boxdns/winipcfg/zwinipcfg_windows.go b/core/cmd/nekobox_core/internal/boxdns/winipcfg/zwinipcfg_windows.go similarity index 100% rename from go/cmd/nekobox_core/internal/boxdns/winipcfg/zwinipcfg_windows.go rename to core/cmd/nekobox_core/internal/boxdns/winipcfg/zwinipcfg_windows.go diff --git a/go/cmd/nekobox_core/internal/boxmain/cmd_check.go b/core/cmd/nekobox_core/internal/boxmain/cmd_check.go similarity index 100% rename from go/cmd/nekobox_core/internal/boxmain/cmd_check.go rename to core/cmd/nekobox_core/internal/boxmain/cmd_check.go diff --git a/go/cmd/nekobox_core/internal/boxmain/cmd_format.go b/core/cmd/nekobox_core/internal/boxmain/cmd_format.go similarity index 100% rename from go/cmd/nekobox_core/internal/boxmain/cmd_format.go rename to core/cmd/nekobox_core/internal/boxmain/cmd_format.go diff --git a/go/cmd/nekobox_core/internal/boxmain/cmd_generate.go b/core/cmd/nekobox_core/internal/boxmain/cmd_generate.go similarity index 100% rename from go/cmd/nekobox_core/internal/boxmain/cmd_generate.go rename to core/cmd/nekobox_core/internal/boxmain/cmd_generate.go diff --git a/go/cmd/nekobox_core/internal/boxmain/cmd_generate_tls.go b/core/cmd/nekobox_core/internal/boxmain/cmd_generate_tls.go similarity index 100% rename from go/cmd/nekobox_core/internal/boxmain/cmd_generate_tls.go rename to core/cmd/nekobox_core/internal/boxmain/cmd_generate_tls.go diff --git a/go/cmd/nekobox_core/internal/boxmain/cmd_generate_vapid.go b/core/cmd/nekobox_core/internal/boxmain/cmd_generate_vapid.go similarity index 100% rename from go/cmd/nekobox_core/internal/boxmain/cmd_generate_vapid.go rename to core/cmd/nekobox_core/internal/boxmain/cmd_generate_vapid.go diff --git a/go/cmd/nekobox_core/internal/boxmain/cmd_generate_wireguard.go b/core/cmd/nekobox_core/internal/boxmain/cmd_generate_wireguard.go similarity index 100% rename from go/cmd/nekobox_core/internal/boxmain/cmd_generate_wireguard.go rename to core/cmd/nekobox_core/internal/boxmain/cmd_generate_wireguard.go diff --git a/go/cmd/nekobox_core/internal/boxmain/cmd_geoip.go b/core/cmd/nekobox_core/internal/boxmain/cmd_geoip.go similarity index 100% rename from go/cmd/nekobox_core/internal/boxmain/cmd_geoip.go rename to core/cmd/nekobox_core/internal/boxmain/cmd_geoip.go diff --git a/go/cmd/nekobox_core/internal/boxmain/cmd_geoip_export.go b/core/cmd/nekobox_core/internal/boxmain/cmd_geoip_export.go similarity index 100% rename from go/cmd/nekobox_core/internal/boxmain/cmd_geoip_export.go rename to core/cmd/nekobox_core/internal/boxmain/cmd_geoip_export.go diff --git a/go/cmd/nekobox_core/internal/boxmain/cmd_geoip_list.go b/core/cmd/nekobox_core/internal/boxmain/cmd_geoip_list.go similarity index 100% rename from go/cmd/nekobox_core/internal/boxmain/cmd_geoip_list.go rename to core/cmd/nekobox_core/internal/boxmain/cmd_geoip_list.go diff --git a/go/cmd/nekobox_core/internal/boxmain/cmd_geosite.go b/core/cmd/nekobox_core/internal/boxmain/cmd_geosite.go similarity index 100% rename from go/cmd/nekobox_core/internal/boxmain/cmd_geosite.go rename to core/cmd/nekobox_core/internal/boxmain/cmd_geosite.go diff --git a/go/cmd/nekobox_core/internal/boxmain/cmd_geosite_export.go b/core/cmd/nekobox_core/internal/boxmain/cmd_geosite_export.go similarity index 100% rename from go/cmd/nekobox_core/internal/boxmain/cmd_geosite_export.go rename to core/cmd/nekobox_core/internal/boxmain/cmd_geosite_export.go diff --git a/go/cmd/nekobox_core/internal/boxmain/cmd_geosite_list.go b/core/cmd/nekobox_core/internal/boxmain/cmd_geosite_list.go similarity index 100% rename from go/cmd/nekobox_core/internal/boxmain/cmd_geosite_list.go rename to core/cmd/nekobox_core/internal/boxmain/cmd_geosite_list.go diff --git a/go/cmd/nekobox_core/internal/boxmain/cmd_rule_set_compile.go b/core/cmd/nekobox_core/internal/boxmain/cmd_rule_set_compile.go similarity index 100% rename from go/cmd/nekobox_core/internal/boxmain/cmd_rule_set_compile.go rename to core/cmd/nekobox_core/internal/boxmain/cmd_rule_set_compile.go diff --git a/go/cmd/nekobox_core/internal/boxmain/cmd_run.go b/core/cmd/nekobox_core/internal/boxmain/cmd_run.go similarity index 100% rename from go/cmd/nekobox_core/internal/boxmain/cmd_run.go rename to core/cmd/nekobox_core/internal/boxmain/cmd_run.go diff --git a/go/cmd/nekobox_core/internal/boxmain/cmd_tools.go b/core/cmd/nekobox_core/internal/boxmain/cmd_tools.go similarity index 100% rename from go/cmd/nekobox_core/internal/boxmain/cmd_tools.go rename to core/cmd/nekobox_core/internal/boxmain/cmd_tools.go diff --git a/go/cmd/nekobox_core/internal/boxmain/cmd_tools_connect.go b/core/cmd/nekobox_core/internal/boxmain/cmd_tools_connect.go similarity index 100% rename from go/cmd/nekobox_core/internal/boxmain/cmd_tools_connect.go rename to core/cmd/nekobox_core/internal/boxmain/cmd_tools_connect.go diff --git a/go/cmd/nekobox_core/internal/boxmain/cmd_tools_fetch.go b/core/cmd/nekobox_core/internal/boxmain/cmd_tools_fetch.go similarity index 100% rename from go/cmd/nekobox_core/internal/boxmain/cmd_tools_fetch.go rename to core/cmd/nekobox_core/internal/boxmain/cmd_tools_fetch.go diff --git a/go/cmd/nekobox_core/internal/boxmain/cmd_tools_synctime.go b/core/cmd/nekobox_core/internal/boxmain/cmd_tools_synctime.go similarity index 100% rename from go/cmd/nekobox_core/internal/boxmain/cmd_tools_synctime.go rename to core/cmd/nekobox_core/internal/boxmain/cmd_tools_synctime.go diff --git a/go/cmd/nekobox_core/internal/boxmain/cmd_version.go b/core/cmd/nekobox_core/internal/boxmain/cmd_version.go similarity index 100% rename from go/cmd/nekobox_core/internal/boxmain/cmd_version.go rename to core/cmd/nekobox_core/internal/boxmain/cmd_version.go diff --git a/go/cmd/nekobox_core/internal/boxmain/color.go b/core/cmd/nekobox_core/internal/boxmain/color.go similarity index 100% rename from go/cmd/nekobox_core/internal/boxmain/color.go rename to core/cmd/nekobox_core/internal/boxmain/color.go diff --git a/go/cmd/nekobox_core/internal/boxmain/debug.go b/core/cmd/nekobox_core/internal/boxmain/debug.go similarity index 100% rename from go/cmd/nekobox_core/internal/boxmain/debug.go rename to core/cmd/nekobox_core/internal/boxmain/debug.go diff --git a/go/cmd/nekobox_core/internal/boxmain/debug_linux.go b/core/cmd/nekobox_core/internal/boxmain/debug_linux.go similarity index 100% rename from go/cmd/nekobox_core/internal/boxmain/debug_linux.go rename to core/cmd/nekobox_core/internal/boxmain/debug_linux.go diff --git a/go/cmd/nekobox_core/internal/boxmain/debug_stub.go b/core/cmd/nekobox_core/internal/boxmain/debug_stub.go similarity index 100% rename from go/cmd/nekobox_core/internal/boxmain/debug_stub.go rename to core/cmd/nekobox_core/internal/boxmain/debug_stub.go diff --git a/go/cmd/nekobox_core/internal/boxmain/main.go b/core/cmd/nekobox_core/internal/boxmain/main.go similarity index 100% rename from go/cmd/nekobox_core/internal/boxmain/main.go rename to core/cmd/nekobox_core/internal/boxmain/main.go diff --git a/go/cmd/nekobox_core/internal/distro/all/all.go b/core/cmd/nekobox_core/internal/distro/all/all.go similarity index 100% rename from go/cmd/nekobox_core/internal/distro/all/all.go rename to core/cmd/nekobox_core/internal/distro/all/all.go diff --git a/go/cmd/nekobox_core/internal/main.go b/core/cmd/nekobox_core/internal/main.go similarity index 100% rename from go/cmd/nekobox_core/internal/main.go rename to core/cmd/nekobox_core/internal/main.go diff --git a/go/cmd/nekobox_core/main.go b/core/cmd/nekobox_core/main.go similarity index 100% rename from go/cmd/nekobox_core/main.go rename to core/cmd/nekobox_core/main.go diff --git a/go/cmd/nekobox_core/test_utils.go b/core/cmd/nekobox_core/test_utils.go similarity index 100% rename from go/cmd/nekobox_core/test_utils.go rename to core/cmd/nekobox_core/test_utils.go diff --git a/go/cmd/updater/.gitignore b/core/cmd/updater/.gitignore similarity index 100% rename from go/cmd/updater/.gitignore rename to core/cmd/updater/.gitignore diff --git a/go/cmd/updater/go.mod b/core/cmd/updater/go.mod similarity index 100% rename from go/cmd/updater/go.mod rename to core/cmd/updater/go.mod diff --git a/go/cmd/updater/go.sum b/core/cmd/updater/go.sum similarity index 100% rename from go/cmd/updater/go.sum rename to core/cmd/updater/go.sum diff --git a/go/cmd/updater/main.go b/core/cmd/updater/main.go similarity index 100% rename from go/cmd/updater/main.go rename to core/cmd/updater/main.go diff --git a/go/cmd/updater/msgbox.go b/core/cmd/updater/msgbox.go similarity index 100% rename from go/cmd/updater/msgbox.go rename to core/cmd/updater/msgbox.go diff --git a/go/cmd/updater/msgbox_windows.go b/core/cmd/updater/msgbox_windows.go similarity index 100% rename from go/cmd/updater/msgbox_windows.go rename to core/cmd/updater/msgbox_windows.go diff --git a/go/cmd/updater/updater.go b/core/cmd/updater/updater.go similarity index 100% rename from go/cmd/updater/updater.go rename to core/cmd/updater/updater.go diff --git a/go/grpc_server/auth/auth.go b/core/grpc_server/auth/auth.go similarity index 100% rename from go/grpc_server/auth/auth.go rename to core/grpc_server/auth/auth.go diff --git a/go/grpc_server/gen/libcore.pb.go b/core/grpc_server/gen/libcore.pb.go similarity index 100% rename from go/grpc_server/gen/libcore.pb.go rename to core/grpc_server/gen/libcore.pb.go diff --git a/go/grpc_server/gen/libcore.proto b/core/grpc_server/gen/libcore.proto similarity index 100% rename from go/grpc_server/gen/libcore.proto rename to core/grpc_server/gen/libcore.proto diff --git a/go/grpc_server/gen/libcore_grpc.pb.go b/core/grpc_server/gen/libcore_grpc.pb.go similarity index 100% rename from go/grpc_server/gen/libcore_grpc.pb.go rename to core/grpc_server/gen/libcore_grpc.pb.go diff --git a/go/grpc_server/gen/update_proto.sh b/core/grpc_server/gen/update_proto.sh similarity index 100% rename from go/grpc_server/gen/update_proto.sh rename to core/grpc_server/gen/update_proto.sh diff --git a/go/grpc_server/go.mod b/core/grpc_server/go.mod similarity index 100% rename from go/grpc_server/go.mod rename to core/grpc_server/go.mod diff --git a/go/grpc_server/go.sum b/core/grpc_server/go.sum similarity index 99% rename from go/grpc_server/go.sum rename to core/grpc_server/go.sum index 45b2886..de61cc2 100644 --- a/go/grpc_server/go.sum +++ b/core/grpc_server/go.sum @@ -3026,9 +3026,9 @@ gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gotest.tools/v3 v3.5.1/go.mod h1:isy3WKz7GK6uNw/sbHzfKBLvlvXwUyV06n6brMxxopU= -honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAinclude/dataStore/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAinclude/dataStore/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAinclude/dataStore/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.1.3/go.mod h1:NgwopIslSNH47DimFoV78dnkksY2EFtX0ajyb3K/las= lukechampine.com/uint128 v1.1.1/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk= lukechampine.com/uint128 v1.2.0/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk= diff --git a/go/grpc_server/grpc.go b/core/grpc_server/grpc.go similarity index 100% rename from go/grpc_server/grpc.go rename to core/grpc_server/grpc.go diff --git a/go/grpc_server/update.go b/core/grpc_server/update.go similarity index 100% rename from go/grpc_server/update.go rename to core/grpc_server/update.go diff --git a/rpc/gRPC.h b/include/api/gRPC.h similarity index 100% rename from rpc/gRPC.h rename to include/api/gRPC.h diff --git a/db/ConfigBuilder.hpp b/include/configs/ConfigBuilder.hpp similarity index 95% rename from db/ConfigBuilder.hpp rename to include/configs/ConfigBuilder.hpp index 2f04052..9fbbe80 100644 --- a/db/ConfigBuilder.hpp +++ b/include/configs/ConfigBuilder.hpp @@ -1,7 +1,7 @@ #pragma once -#include "ProxyEntity.hpp" -#include "sys/ExternalProcess.hpp" +#include "include/dataStore/ProxyEntity.hpp" +#include "include/sys/ExternalProcess.hpp" namespace NekoGui { class BuildConfigResult { diff --git a/fmt/AbstractBean.hpp b/include/configs/proxy/AbstractBean.hpp similarity index 97% rename from fmt/AbstractBean.hpp rename to include/configs/proxy/AbstractBean.hpp index 5bd2754..4c66cab 100644 --- a/fmt/AbstractBean.hpp +++ b/include/configs/proxy/AbstractBean.hpp @@ -3,7 +3,7 @@ #include #include -#include "main/NekoGui.hpp" +#include "include/global/NekoGui.hpp" namespace NekoGui_fmt { struct CoreObjOutboundBuildResult { diff --git a/fmt/ChainBean.hpp b/include/configs/proxy/ChainBean.hpp similarity index 91% rename from fmt/ChainBean.hpp rename to include/configs/proxy/ChainBean.hpp index 27f14ab..9f79743 100644 --- a/fmt/ChainBean.hpp +++ b/include/configs/proxy/ChainBean.hpp @@ -1,6 +1,6 @@ #pragma once -#include "main/NekoGui.hpp" +#include "include/global/NekoGui.hpp" namespace NekoGui_fmt { class ChainBean : public AbstractBean { diff --git a/fmt/CustomBean.hpp b/include/configs/proxy/CustomBean.hpp similarity index 98% rename from fmt/CustomBean.hpp rename to include/configs/proxy/CustomBean.hpp index 35d9414..6fbf58a 100644 --- a/fmt/CustomBean.hpp +++ b/include/configs/proxy/CustomBean.hpp @@ -1,6 +1,6 @@ #pragma once -#include "fmt/AbstractBean.hpp" +#include "AbstractBean.hpp" namespace NekoGui_fmt { class CustomBean : public AbstractBean { diff --git a/fmt/NaiveBean.hpp b/include/configs/proxy/NaiveBean.hpp similarity index 97% rename from fmt/NaiveBean.hpp rename to include/configs/proxy/NaiveBean.hpp index 85e9b35..ebd0863 100644 --- a/fmt/NaiveBean.hpp +++ b/include/configs/proxy/NaiveBean.hpp @@ -1,6 +1,6 @@ #pragma once -#include "fmt/AbstractBean.hpp" +#include "AbstractBean.hpp" namespace NekoGui_fmt { class NaiveBean : public AbstractBean { diff --git a/fmt/Preset.hpp b/include/configs/proxy/Preset.hpp similarity index 100% rename from fmt/Preset.hpp rename to include/configs/proxy/Preset.hpp diff --git a/fmt/QUICBean.hpp b/include/configs/proxy/QUICBean.hpp similarity index 99% rename from fmt/QUICBean.hpp rename to include/configs/proxy/QUICBean.hpp index 5a5cb42..a0a2c4c 100644 --- a/fmt/QUICBean.hpp +++ b/include/configs/proxy/QUICBean.hpp @@ -1,6 +1,6 @@ #pragma once -#include "fmt/AbstractBean.hpp" +#include "AbstractBean.hpp" namespace NekoGui_fmt { class QUICBean : public AbstractBean { diff --git a/fmt/SSHBean.h b/include/configs/proxy/SSHBean.h similarity index 97% rename from fmt/SSHBean.h rename to include/configs/proxy/SSHBean.h index e76f80a..c663004 100644 --- a/fmt/SSHBean.h +++ b/include/configs/proxy/SSHBean.h @@ -1,6 +1,6 @@ #pragma once -#include "fmt/AbstractBean.hpp" +#include "AbstractBean.hpp" namespace NekoGui_fmt { class SSHBean : public AbstractBean { diff --git a/fmt/ShadowSocksBean.hpp b/include/configs/proxy/ShadowSocksBean.hpp similarity index 94% rename from fmt/ShadowSocksBean.hpp rename to include/configs/proxy/ShadowSocksBean.hpp index 380c607..607c6d8 100644 --- a/fmt/ShadowSocksBean.hpp +++ b/include/configs/proxy/ShadowSocksBean.hpp @@ -1,7 +1,7 @@ #pragma once -#include "fmt/AbstractBean.hpp" -#include "fmt/V2RayStreamSettings.hpp" +#include "AbstractBean.hpp" +#include "V2RayStreamSettings.hpp" #include "Preset.hpp" namespace NekoGui_fmt { diff --git a/fmt/SocksHttpBean.hpp b/include/configs/proxy/SocksHttpBean.hpp similarity index 94% rename from fmt/SocksHttpBean.hpp rename to include/configs/proxy/SocksHttpBean.hpp index 930a5f8..275b53b 100644 --- a/fmt/SocksHttpBean.hpp +++ b/include/configs/proxy/SocksHttpBean.hpp @@ -1,7 +1,7 @@ #pragma once -#include "fmt/AbstractBean.hpp" -#include "fmt/V2RayStreamSettings.hpp" +#include "AbstractBean.hpp" +#include "V2RayStreamSettings.hpp" namespace NekoGui_fmt { class SocksHttpBean : public AbstractBean { diff --git a/fmt/TrojanVLESSBean.hpp b/include/configs/proxy/TrojanVLESSBean.hpp similarity index 94% rename from fmt/TrojanVLESSBean.hpp rename to include/configs/proxy/TrojanVLESSBean.hpp index 0d49216..7af7e6d 100644 --- a/fmt/TrojanVLESSBean.hpp +++ b/include/configs/proxy/TrojanVLESSBean.hpp @@ -1,7 +1,7 @@ #pragma once -#include "fmt/AbstractBean.hpp" -#include "fmt/V2RayStreamSettings.hpp" +#include "AbstractBean.hpp" +#include "V2RayStreamSettings.hpp" #include "Preset.hpp" namespace NekoGui_fmt { diff --git a/fmt/V2RayStreamSettings.hpp b/include/configs/proxy/V2RayStreamSettings.hpp similarity index 100% rename from fmt/V2RayStreamSettings.hpp rename to include/configs/proxy/V2RayStreamSettings.hpp diff --git a/fmt/VMessBean.hpp b/include/configs/proxy/VMessBean.hpp similarity index 93% rename from fmt/VMessBean.hpp rename to include/configs/proxy/VMessBean.hpp index 1f45b84..65a66b7 100644 --- a/fmt/VMessBean.hpp +++ b/include/configs/proxy/VMessBean.hpp @@ -1,7 +1,7 @@ #pragma once -#include "fmt/AbstractBean.hpp" -#include "fmt/V2RayStreamSettings.hpp" +#include "AbstractBean.hpp" +#include "V2RayStreamSettings.hpp" #include "Preset.hpp" namespace NekoGui_fmt { diff --git a/fmt/WireguardBean.h b/include/configs/proxy/WireguardBean.h similarity index 98% rename from fmt/WireguardBean.h rename to include/configs/proxy/WireguardBean.h index f8039e1..a7aed3d 100644 --- a/fmt/WireguardBean.h +++ b/include/configs/proxy/WireguardBean.h @@ -1,6 +1,6 @@ #pragma once -#include "fmt/AbstractBean.hpp" +#include "AbstractBean.hpp" namespace NekoGui_fmt { class WireguardBean : public AbstractBean { diff --git a/fmt/includes.h b/include/configs/proxy/includes.h similarity index 100% rename from fmt/includes.h rename to include/configs/proxy/includes.h diff --git a/sub/GroupUpdater.hpp b/include/configs/sub/GroupUpdater.hpp similarity index 75% rename from sub/GroupUpdater.hpp rename to include/configs/sub/GroupUpdater.hpp index 7e5597f..7ab9389 100644 --- a/sub/GroupUpdater.hpp +++ b/include/configs/sub/GroupUpdater.hpp @@ -1,6 +1,6 @@ #pragma once -#include "db/Database.hpp" +#include "include/dataStore/Database.hpp" namespace NekoGui_sub { class RawUpdater { @@ -9,9 +9,9 @@ namespace NekoGui_sub { void update(const QString &str, bool needParse); - int gid_add_to = -1; // 导入到指定组 -1 为当前选中组 + int gid_add_to = -1; - QList> updated_order; // 新增的配置，按照导入时处理的先后排序 + QList> updated_order; }; class GroupUpdater : public QObject { @@ -30,5 +30,4 @@ namespace NekoGui_sub { extern GroupUpdater *groupUpdater; } // namespace NekoGui_sub -// 更新所有订阅 关闭分组窗口时 更新动作继续执行 void UI_update_all_groups(bool onlyAllowed = false); diff --git a/db/Database.hpp b/include/dataStore/Database.hpp similarity index 98% rename from db/Database.hpp rename to include/dataStore/Database.hpp index 3efe0c6..9d10a6f 100644 --- a/db/Database.hpp +++ b/include/dataStore/Database.hpp @@ -1,6 +1,6 @@ #pragma once -#include "main/NekoGui.hpp" +#include "include/global/NekoGui.hpp" #include "ProxyEntity.hpp" #include "Group.hpp" #include "RouteEntity.h" diff --git a/db/Group.hpp b/include/dataStore/Group.hpp similarity index 95% rename from db/Group.hpp rename to include/dataStore/Group.hpp index c33ab68..d9446a4 100644 --- a/db/Group.hpp +++ b/include/dataStore/Group.hpp @@ -1,6 +1,6 @@ #pragma once -#include "main/NekoGui.hpp" +#include "include/global/NekoGui.hpp" #include "ProxyEntity.hpp" namespace NekoGui { diff --git a/db/ProfileFilter.hpp b/include/dataStore/ProfileFilter.hpp similarity index 100% rename from db/ProfileFilter.hpp rename to include/dataStore/ProfileFilter.hpp diff --git a/db/ProxyEntity.hpp b/include/dataStore/ProxyEntity.hpp similarity index 94% rename from db/ProxyEntity.hpp rename to include/dataStore/ProxyEntity.hpp index e169e51..fbf7063 100644 --- a/db/ProxyEntity.hpp +++ b/include/dataStore/ProxyEntity.hpp @@ -1,8 +1,8 @@ #pragma once -#include "main/NekoGui.hpp" -#include "db/traffic/TrafficData.hpp" -#include "fmt/AbstractBean.hpp" +#include "include/global/NekoGui.hpp" +#include "include/stats/traffic/TrafficData.hpp" +#include "include/configs/proxy/AbstractBean.hpp" namespace NekoGui_fmt { class SocksHttpBean; diff --git a/db/RouteEntity.h b/include/dataStore/RouteEntity.h similarity index 98% rename from db/RouteEntity.h rename to include/dataStore/RouteEntity.h index 00a0cb2..def9416 100644 --- a/db/RouteEntity.h +++ b/include/dataStore/RouteEntity.h @@ -1,6 +1,6 @@ #pragma once -#include "main/NekoGui.hpp" +#include "include/global/NekoGui.hpp" namespace NekoGui { enum inputType {trufalse, select, text}; diff --git a/main/Const.hpp b/include/global/Const.hpp similarity index 100% rename from main/Const.hpp rename to include/global/Const.hpp diff --git a/main/GuiUtils.hpp b/include/global/GuiUtils.hpp similarity index 100% rename from main/GuiUtils.hpp rename to include/global/GuiUtils.hpp diff --git a/main/HTTPRequestHelper.hpp b/include/global/HTTPRequestHelper.hpp similarity index 100% rename from main/HTTPRequestHelper.hpp rename to include/global/HTTPRequestHelper.hpp diff --git a/main/NekoGui.hpp b/include/global/NekoGui.hpp similarity index 100% rename from main/NekoGui.hpp rename to include/global/NekoGui.hpp diff --git a/main/NekoGui_ConfigItem.hpp b/include/global/NekoGui_ConfigItem.hpp similarity index 100% rename from main/NekoGui_ConfigItem.hpp rename to include/global/NekoGui_ConfigItem.hpp diff --git a/main/NekoGui_DataStore.hpp b/include/global/NekoGui_DataStore.hpp similarity index 100% rename from main/NekoGui_DataStore.hpp rename to include/global/NekoGui_DataStore.hpp diff --git a/main/NekoGui_Utils.hpp b/include/global/NekoGui_Utils.hpp similarity index 100% rename from main/NekoGui_Utils.hpp rename to include/global/NekoGui_Utils.hpp diff --git a/db/traffic/TrafficData.hpp b/include/stats/traffic/TrafficData.hpp similarity index 96% rename from db/traffic/TrafficData.hpp rename to include/stats/traffic/TrafficData.hpp index 8e8eb87..8303d2f 100644 --- a/db/traffic/TrafficData.hpp +++ b/include/stats/traffic/TrafficData.hpp @@ -1,6 +1,6 @@ #pragma once -#include "main/NekoGui.hpp" +#include "include/global/NekoGui.hpp" namespace NekoGui_traffic { class TrafficData : public JsonStore { diff --git a/db/traffic/TrafficLooper.hpp b/include/stats/traffic/TrafficLooper.hpp similarity index 100% rename from db/traffic/TrafficLooper.hpp rename to include/stats/traffic/TrafficLooper.hpp diff --git a/sys/AutoRun.hpp b/include/sys/AutoRun.hpp similarity index 100% rename from sys/AutoRun.hpp rename to include/sys/AutoRun.hpp diff --git a/sys/ExternalProcess.hpp b/include/sys/ExternalProcess.hpp similarity index 100% rename from sys/ExternalProcess.hpp rename to include/sys/ExternalProcess.hpp diff --git a/sys/linux/LinuxCap.h b/include/sys/linux/LinuxCap.h similarity index 100% rename from sys/linux/LinuxCap.h rename to include/sys/linux/LinuxCap.h diff --git a/sys/macos/MacOS.h b/include/sys/macos/MacOS.h similarity index 100% rename from sys/macos/MacOS.h rename to include/sys/macos/MacOS.h diff --git a/sys/windows/MiniDump.h b/include/sys/windows/MiniDump.h similarity index 100% rename from sys/windows/MiniDump.h rename to include/sys/windows/MiniDump.h diff --git a/sys/windows/guihelper.h b/include/sys/windows/guihelper.h similarity index 100% rename from sys/windows/guihelper.h rename to include/sys/windows/guihelper.h diff --git a/ui/widget/GroupItem.h b/include/ui/group/GroupItem.h similarity index 90% rename from ui/widget/GroupItem.h rename to include/ui/group/GroupItem.h index 14aa864..d3a2c72 100644 --- a/ui/widget/GroupItem.h +++ b/include/ui/group/GroupItem.h @@ -3,7 +3,8 @@ #include #include -#include "db/Database.hpp" +#include "include/dataStore/Database.hpp" +#include "ui_GroupItem.h" QT_BEGIN_NAMESPACE namespace Ui { diff --git a/ui/widget/GroupItem.ui b/include/ui/group/GroupItem.ui similarity index 100% rename from ui/widget/GroupItem.ui rename to include/ui/group/GroupItem.ui diff --git a/ui/GroupSort.hpp b/include/ui/group/GroupSort.hpp similarity index 100% rename from ui/GroupSort.hpp rename to include/ui/group/GroupSort.hpp diff --git a/ui/edit/dialog_edit_group.h b/include/ui/group/dialog_edit_group.h similarity index 89% rename from ui/edit/dialog_edit_group.h rename to include/ui/group/dialog_edit_group.h index f5c1563..4b892b8 100644 --- a/ui/edit/dialog_edit_group.h +++ b/include/ui/group/dialog_edit_group.h @@ -1,7 +1,8 @@ #pragma once #include -#include "db/Group.hpp" +#include "include/dataStore/Group.hpp" +#include "ui_dialog_edit_group.h" QT_BEGIN_NAMESPACE namespace Ui { diff --git a/ui/edit/dialog_edit_group.ui b/include/ui/group/dialog_edit_group.ui similarity index 99% rename from ui/edit/dialog_edit_group.ui rename to include/ui/group/dialog_edit_group.ui index 901e1d2..4b567ba 100644 --- a/ui/edit/dialog_edit_group.ui +++ b/include/ui/group/dialog_edit_group.ui @@ -182,7 +182,7 @@ MyLineEdit QLineEdit -
ui/widget/MyLineEdit.h
+
include/ui/utils/MyLineEdit.h
 diff --git a/ui/dialog_manage_groups.h b/include/ui/group/dialog_manage_groups.h similarity index 86% rename from ui/dialog_manage_groups.h rename to include/ui/group/dialog_manage_groups.h index 04e4412..9cce93f 100644 --- a/ui/dialog_manage_groups.h +++ b/include/ui/group/dialog_manage_groups.h @@ -5,7 +5,8 @@ #include #include -#include "db/Group.hpp" +#include "include/dataStore/Group.hpp" +#include "ui_dialog_manage_groups.h" QT_BEGIN_NAMESPACE namespace Ui { diff --git a/ui/dialog_manage_groups.ui b/include/ui/group/dialog_manage_groups.ui similarity index 100% rename from ui/dialog_manage_groups.ui rename to include/ui/group/dialog_manage_groups.ui diff --git a/ui/mainwindow.h b/include/ui/mainwindow.h similarity index 96% rename from ui/mainwindow.h rename to include/ui/mainwindow.h index 8537a4a..c159b20 100644 --- a/ui/mainwindow.h +++ b/include/ui/mainwindow.h @@ -2,7 +2,7 @@ #include -#include "main/NekoGui.hpp" +#include "include/global/NekoGui.hpp" #ifndef MW_INTERFACE @@ -17,10 +17,11 @@ #include #include -#include "GroupSort.hpp" +#include "group/GroupSort.hpp" -#include "db/ProxyEntity.hpp" -#include "main/GuiUtils.hpp" +#include "include/dataStore/ProxyEntity.hpp" +#include "include/global/GuiUtils.hpp" +#include "ui_mainwindow.h" #endif diff --git a/ui/mainwindow.ui b/include/ui/mainwindow.ui similarity index 99% rename from ui/mainwindow.ui rename to include/ui/mainwindow.ui index 368ba03..7da0097 100644 --- a/ui/mainwindow.ui +++ b/include/ui/mainwindow.ui @@ -823,7 +823,7 @@ MyTableWidget QTableWidget -
ui/widget/MyTableWidget.h
+
include/ui/utils/MyTableWidget.h
 diff --git a/ui/mainwindow_interface.h b/include/ui/mainwindow_interface.h similarity index 60% rename from ui/mainwindow_interface.h rename to include/ui/mainwindow_interface.h index 27157de..068b895 100644 --- a/ui/mainwindow_interface.h +++ b/include/ui/mainwindow_interface.h @@ -2,4 +2,4 @@ #define MW_INTERFACE -#include "mainwindow.h" +#include "mainwindow.h" \ No newline at end of file diff --git a/ui/widget/ProxyItem.h b/include/ui/profile/ProxyItem.h similarity index 89% rename from ui/widget/ProxyItem.h rename to include/ui/profile/ProxyItem.h index ac8058f..df18f16 100644 --- a/ui/widget/ProxyItem.h +++ b/include/ui/profile/ProxyItem.h @@ -3,7 +3,8 @@ #include #include -#include "db/ProxyEntity.hpp" +#include "include/dataStore/ProxyEntity.hpp" +#include "ui_ProxyItem.h" QT_BEGIN_NAMESPACE namespace Ui { diff --git a/ui/widget/ProxyItem.ui b/include/ui/profile/ProxyItem.ui similarity index 100% rename from ui/widget/ProxyItem.ui rename to include/ui/profile/ProxyItem.ui diff --git a/ui/edit/dialog_edit_profile.h b/include/ui/profile/dialog_edit_profile.h similarity index 91% rename from ui/edit/dialog_edit_profile.h rename to include/ui/profile/dialog_edit_profile.h index 3e8ae50..27da5d1 100644 --- a/ui/edit/dialog_edit_profile.h +++ b/include/ui/profile/dialog_edit_profile.h @@ -2,10 +2,11 @@ #define DIALOG_EDIT_PROFILE_H #include -#include "db/Database.hpp" +#include "include/dataStore/Database.hpp" #include "profile_editor.h" -#include "ui/widget/FloatCheckBox.h" +#include "include/ui/utils/FloatCheckBox.h" +#include "ui_dialog_edit_profile.h" namespace Ui { class DialogEditProfile; diff --git a/ui/edit/dialog_edit_profile.ui b/include/ui/profile/dialog_edit_profile.ui similarity index 99% rename from ui/edit/dialog_edit_profile.ui rename to include/ui/profile/dialog_edit_profile.ui index 45946a5..ee93ebd 100644 --- a/ui/edit/dialog_edit_profile.ui +++ b/include/ui/profile/dialog_edit_profile.ui @@ -691,7 +691,7 @@ MyLineEdit QLineEdit -
ui/widget/MyLineEdit.h
+
include/ui/utils/MyLineEdit.h
 diff --git a/ui/edit/edit_chain.h b/include/ui/profile/edit_chain.h similarity index 96% rename from ui/edit/edit_chain.h rename to include/ui/profile/edit_chain.h index 61348d4..d4ada80 100644 --- a/ui/edit/edit_chain.h +++ b/include/ui/profile/edit_chain.h @@ -2,6 +2,7 @@ #include #include "profile_editor.h" +#include "ui_edit_chain.h" QT_BEGIN_NAMESPACE namespace Ui { diff --git a/ui/edit/edit_chain.ui b/include/ui/profile/edit_chain.ui similarity index 100% rename from ui/edit/edit_chain.ui rename to include/ui/profile/edit_chain.ui diff --git a/ui/edit/edit_custom.h b/include/ui/profile/edit_custom.h similarity index 95% rename from ui/edit/edit_custom.h rename to include/ui/profile/edit_custom.h index 9de5373..deacd86 100644 --- a/ui/edit/edit_custom.h +++ b/include/ui/profile/edit_custom.h @@ -2,6 +2,7 @@ #include #include "profile_editor.h" +#include "ui_edit_custom.h" QT_BEGIN_NAMESPACE namespace Ui { diff --git a/ui/edit/edit_custom.ui b/include/ui/profile/edit_custom.ui similarity index 100% rename from ui/edit/edit_custom.ui rename to include/ui/profile/edit_custom.ui diff --git a/ui/edit/edit_naive.h b/include/ui/profile/edit_naive.h similarity index 96% rename from ui/edit/edit_naive.h rename to include/ui/profile/edit_naive.h index f1334cf..289c613 100644 --- a/ui/edit/edit_naive.h +++ b/include/ui/profile/edit_naive.h @@ -2,6 +2,7 @@ #include #include "profile_editor.h" +#include "ui_edit_naive.h" QT_BEGIN_NAMESPACE namespace Ui { diff --git a/ui/edit/edit_naive.ui b/include/ui/profile/edit_naive.ui similarity index 98% rename from ui/edit/edit_naive.ui rename to include/ui/profile/edit_naive.ui index 9063699..256c178 100644 --- a/ui/edit/edit_naive.ui +++ b/include/ui/profile/edit_naive.ui @@ -123,7 +123,7 @@ MyLineEdit QLineEdit -
ui/widget/MyLineEdit.h
+
include/ui/utils/MyLineEdit.h
 diff --git a/ui/edit/edit_quic.h b/include/ui/profile/edit_quic.h similarity index 96% rename from ui/edit/edit_quic.h rename to include/ui/profile/edit_quic.h index 43996f9..2902d4f 100644 --- a/ui/edit/edit_quic.h +++ b/include/ui/profile/edit_quic.h @@ -4,6 +4,7 @@ #include #include #include "profile_editor.h" +#include "ui_edit_quic.h" QT_BEGIN_NAMESPACE namespace Ui { diff --git a/ui/edit/edit_quic.ui b/include/ui/profile/edit_quic.ui similarity index 99% rename from ui/edit/edit_quic.ui rename to include/ui/profile/edit_quic.ui index c62e9fe..b975d7d 100644 --- a/ui/edit/edit_quic.ui +++ b/include/ui/profile/edit_quic.ui @@ -386,7 +386,7 @@ MyLineEdit QLineEdit -
ui/widget/MyLineEdit.h
+
include/ui/utils/MyLineEdit.h
 diff --git a/ui/edit/edit_shadowsocks.h b/include/ui/profile/edit_shadowsocks.h similarity index 94% rename from ui/edit/edit_shadowsocks.h rename to include/ui/profile/edit_shadowsocks.h index d1131b9..d7738c8 100644 --- a/ui/edit/edit_shadowsocks.h +++ b/include/ui/profile/edit_shadowsocks.h @@ -3,6 +3,7 @@ #include #include "profile_editor.h" +#include "ui_edit_shadowsocks.h" namespace Ui { class EditShadowSocks; diff --git a/ui/edit/edit_shadowsocks.ui b/include/ui/profile/edit_shadowsocks.ui similarity index 98% rename from ui/edit/edit_shadowsocks.ui rename to include/ui/profile/edit_shadowsocks.ui index 0500712..9014eb3 100644 --- a/ui/edit/edit_shadowsocks.ui +++ b/include/ui/profile/edit_shadowsocks.ui @@ -112,7 +112,7 @@ MyLineEdit QLineEdit -
ui/widget/MyLineEdit.h
+
include/ui/utils/MyLineEdit.h
 diff --git a/ui/edit/edit_socks_http.h b/include/ui/profile/edit_socks_http.h similarity index 93% rename from ui/edit/edit_socks_http.h rename to include/ui/profile/edit_socks_http.h index ccc3801..19589a0 100644 --- a/ui/edit/edit_socks_http.h +++ b/include/ui/profile/edit_socks_http.h @@ -2,6 +2,7 @@ #include #include "profile_editor.h" +#include "ui_edit_socks_http.h" namespace Ui { class EditSocksHttp; diff --git a/ui/edit/edit_socks_http.ui b/include/ui/profile/edit_socks_http.ui similarity index 100% rename from ui/edit/edit_socks_http.ui rename to include/ui/profile/edit_socks_http.ui diff --git a/ui/edit/edit_ssh.h b/include/ui/profile/edit_ssh.h similarity index 94% rename from ui/edit/edit_ssh.h rename to include/ui/profile/edit_ssh.h index 779f76e..7339143 100644 --- a/ui/edit/edit_ssh.h +++ b/include/ui/profile/edit_ssh.h @@ -2,6 +2,7 @@ #include #include "profile_editor.h" +#include "ui_edit_ssh.h" QT_BEGIN_NAMESPACE namespace Ui { diff --git a/ui/edit/edit_ssh.ui b/include/ui/profile/edit_ssh.ui similarity index 100% rename from ui/edit/edit_ssh.ui rename to include/ui/profile/edit_ssh.ui diff --git a/ui/edit/edit_trojan_vless.h b/include/ui/profile/edit_trojan_vless.h similarity index 93% rename from ui/edit/edit_trojan_vless.h rename to include/ui/profile/edit_trojan_vless.h index d19b283..f45cca7 100644 --- a/ui/edit/edit_trojan_vless.h +++ b/include/ui/profile/edit_trojan_vless.h @@ -2,6 +2,7 @@ #include #include "profile_editor.h" +#include "ui_edit_trojan_vless.h" QT_BEGIN_NAMESPACE namespace Ui { diff --git a/ui/edit/edit_trojan_vless.ui b/include/ui/profile/edit_trojan_vless.ui similarity index 96% rename from ui/edit/edit_trojan_vless.ui rename to include/ui/profile/edit_trojan_vless.ui index ae622b5..5f05bf7 100644 --- a/ui/edit/edit_trojan_vless.ui +++ b/include/ui/profile/edit_trojan_vless.ui @@ -46,7 +46,7 @@ MyLineEdit QLineEdit -
ui/widget/MyLineEdit.h
+
include/ui/utils/MyLineEdit.h
 diff --git a/ui/edit/edit_vmess.h b/include/ui/profile/edit_vmess.h similarity index 94% rename from ui/edit/edit_vmess.h rename to include/ui/profile/edit_vmess.h index 38efa6c..58dd333 100644 --- a/ui/edit/edit_vmess.h +++ b/include/ui/profile/edit_vmess.h @@ -2,6 +2,7 @@ #include #include "profile_editor.h" +#include "ui_edit_vmess.h" QT_BEGIN_NAMESPACE namespace Ui { diff --git a/ui/edit/edit_vmess.ui b/include/ui/profile/edit_vmess.ui similarity index 98% rename from ui/edit/edit_vmess.ui rename to include/ui/profile/edit_vmess.ui index b29dbee..b9b873b 100644 --- a/ui/edit/edit_vmess.ui +++ b/include/ui/profile/edit_vmess.ui @@ -110,7 +110,7 @@ MyLineEdit QLineEdit -
ui/widget/MyLineEdit.h
+
include/ui/utils/MyLineEdit.h
 diff --git a/ui/edit/edit_wireguard.h b/include/ui/profile/edit_wireguard.h similarity index 94% rename from ui/edit/edit_wireguard.h rename to include/ui/profile/edit_wireguard.h index 3b6d3d4..008cd06 100644 --- a/ui/edit/edit_wireguard.h +++ b/include/ui/profile/edit_wireguard.h @@ -2,6 +2,7 @@ #include #include "profile_editor.h" +#include "ui_edit_wireguard.h" QT_BEGIN_NAMESPACE namespace Ui { diff --git a/ui/edit/edit_wireguard.ui b/include/ui/profile/edit_wireguard.ui similarity index 100% rename from ui/edit/edit_wireguard.ui rename to include/ui/profile/edit_wireguard.ui diff --git a/ui/edit/profile_editor.h b/include/ui/profile/profile_editor.h similarity index 86% rename from ui/edit/profile_editor.h rename to include/ui/profile/profile_editor.h index cf43847..2fee83c 100644 --- a/ui/edit/profile_editor.h +++ b/include/ui/profile/profile_editor.h @@ -2,8 +2,8 @@ #include -#include "db/ProxyEntity.hpp" -#include "main/GuiUtils.hpp" +#include "include/dataStore/ProxyEntity.hpp" +#include "include/global/GuiUtils.hpp" class ProfileEditor { public: diff --git a/ui/Icon.hpp b/include/ui/setting/Icon.hpp similarity index 100% rename from ui/Icon.hpp rename to include/ui/setting/Icon.hpp diff --git a/ui/widget/RouteItem.h b/include/ui/setting/RouteItem.h similarity index 95% rename from ui/widget/RouteItem.h rename to include/ui/setting/RouteItem.h index 255dd55..9ea774e 100644 --- a/ui/widget/RouteItem.h +++ b/include/ui/setting/RouteItem.h @@ -6,8 +6,9 @@ #include #include -#include "db/RouteEntity.h" +#include "include/dataStore/RouteEntity.h" #include "3rdparty/qv2ray/v2/ui/QvAutoCompleteTextEdit.hpp" +#include "ui_RouteItem.h" QT_BEGIN_NAMESPACE namespace Ui { diff --git a/ui/widget/RouteItem.ui b/include/ui/setting/RouteItem.ui similarity index 100% rename from ui/widget/RouteItem.ui rename to include/ui/setting/RouteItem.ui diff --git a/ui/ThemeManager.hpp b/include/ui/setting/ThemeManager.hpp similarity index 100% rename from ui/ThemeManager.hpp rename to include/ui/setting/ThemeManager.hpp diff --git a/ui/dialog_basic_settings.h b/include/ui/setting/dialog_basic_settings.h similarity index 94% rename from ui/dialog_basic_settings.h rename to include/ui/setting/dialog_basic_settings.h index c022d7b..623cceb 100644 --- a/ui/dialog_basic_settings.h +++ b/include/ui/setting/dialog_basic_settings.h @@ -3,6 +3,7 @@ #include #include +#include "ui_dialog_basic_settings.h" namespace Ui { class DialogBasicSettings; diff --git a/ui/dialog_basic_settings.ui b/include/ui/setting/dialog_basic_settings.ui similarity index 99% rename from ui/dialog_basic_settings.ui rename to include/ui/setting/dialog_basic_settings.ui index 95e6f9b..1984fba 100644 --- a/ui/dialog_basic_settings.ui +++ b/include/ui/setting/dialog_basic_settings.ui @@ -859,7 +859,7 @@ MyLineEdit QLineEdit -
ui/widget/MyLineEdit.h
+
include/ui/utils/MyLineEdit.h
 diff --git a/ui/dialog_hotkey.h b/include/ui/setting/dialog_hotkey.h similarity index 81% rename from ui/dialog_hotkey.h rename to include/ui/setting/dialog_hotkey.h index 6e42508..57f2769 100644 --- a/ui/dialog_hotkey.h +++ b/include/ui/setting/dialog_hotkey.h @@ -1,7 +1,8 @@ #pragma once #include -#include "main/NekoGui.hpp" +#include "include/global/NekoGui.hpp" +#include "ui_dialog_hotkey.h" QT_BEGIN_NAMESPACE namespace Ui { diff --git a/ui/dialog_hotkey.ui b/include/ui/setting/dialog_hotkey.ui similarity index 100% rename from ui/dialog_hotkey.ui rename to include/ui/setting/dialog_hotkey.ui diff --git a/ui/dialog_manage_routes.h b/include/ui/setting/dialog_manage_routes.h similarity index 89% rename from ui/dialog_manage_routes.h rename to include/ui/setting/dialog_manage_routes.h index 357292b..c537410 100644 --- a/ui/dialog_manage_routes.h +++ b/include/ui/setting/dialog_manage_routes.h @@ -4,8 +4,9 @@ #include #include "3rdparty/qv2ray/v2/ui/QvAutoCompleteTextEdit.hpp" -#include "main/NekoGui.hpp" -#include "widget/RouteItem.h" +#include "include/global/NekoGui.hpp" +#include "include/ui/setting/RouteItem.h" +#include "ui_dialog_manage_routes.h" QT_BEGIN_NAMESPACE namespace Ui { diff --git a/ui/dialog_manage_routes.ui b/include/ui/setting/dialog_manage_routes.ui similarity index 100% rename from ui/dialog_manage_routes.ui rename to include/ui/setting/dialog_manage_routes.ui diff --git a/ui/dialog_vpn_settings.h b/include/ui/setting/dialog_vpn_settings.h similarity index 93% rename from ui/dialog_vpn_settings.h rename to include/ui/setting/dialog_vpn_settings.h index 0b5b87d..fba877e 100644 --- a/ui/dialog_vpn_settings.h +++ b/include/ui/setting/dialog_vpn_settings.h @@ -2,6 +2,7 @@ #define NEKORAY_DIALOG_VPN_SETTINGS_H #include +#include "ui_dialog_vpn_settings.h" QT_BEGIN_NAMESPACE namespace Ui { diff --git a/ui/dialog_vpn_settings.ui b/include/ui/setting/dialog_vpn_settings.ui similarity index 100% rename from ui/dialog_vpn_settings.ui rename to include/ui/setting/dialog_vpn_settings.ui diff --git a/ui/widget/FloatCheckBox.h b/include/ui/utils/FloatCheckBox.h similarity index 100% rename from ui/widget/FloatCheckBox.h rename to include/ui/utils/FloatCheckBox.h diff --git a/ui/widget/MessageBoxTimer.h b/include/ui/utils/MessageBoxTimer.h similarity index 100% rename from ui/widget/MessageBoxTimer.h rename to include/ui/utils/MessageBoxTimer.h diff --git a/ui/widget/MyLineEdit.h b/include/ui/utils/MyLineEdit.h similarity index 100% rename from ui/widget/MyLineEdit.h rename to include/ui/utils/MyLineEdit.h diff --git a/ui/widget/MyTableWidget.h b/include/ui/utils/MyTableWidget.h similarity index 100% rename from ui/widget/MyTableWidget.h rename to include/ui/utils/MyTableWidget.h diff --git a/libs/.gitignore b/libs/.gitignore deleted file mode 100644 index ecbf89d..0000000 --- a/libs/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/deps* -downloaded \ No newline at end of file diff --git a/libs/build_deps_all.sh b/script/build_deps_all.sh old mode 100755 new mode 100644 similarity index 99% rename from libs/build_deps_all.sh rename to script/build_deps_all.sh index b30901f..1aa1e48 --- a/libs/build_deps_all.sh +++ b/script/build_deps_all.sh @@ -1,9 +1,9 @@ #!/bin/bash set -e +mkdir -p libs cd libs -# 参数 if [ -z $cmake ]; then cmake="cmake" fi @@ -11,7 +11,6 @@ if [ -z $deps ]; then deps="deps" fi -# libs/deps/... mkdir -p $deps cd $deps INSTALL_PREFIX=$PWD/built diff --git a/libs/build_go.sh b/script/build_go.sh old mode 100755 new mode 100644 similarity index 94% rename from libs/build_go.sh rename to script/build_go.sh index dc74c8e..a92906e --- a/libs/build_go.sh +++ b/script/build_go.sh @@ -1,7 +1,7 @@ #!/bin/bash set -e -source libs/env_deploy.sh +source script/env_deploy.sh [ "$GOOS" == "windows" ] && [ "$GOARCH" == "amd64" ] && DEST=$DEPLOYMENT/windows64 || true [ "$GOOS" == "windows" ] && [ "$GOARCH" == "arm64" ] && DEST=$DEPLOYMENT/windows-arm64 || true [ "$GOOS" == "windows7" ] && [ "$GOARCH" == "amd64" ] && DEST=$DEPLOYMENT/windows7 || true @@ -24,12 +24,12 @@ mkdir -p $DEST export CGO_ENABLED=0 #### Go: updater #### -pushd go/cmd/updater +pushd core/cmd/updater [ "$GOOS" == "darwin" ] || go build -o $DEST -trimpath -ldflags "-w -s" popd #### Go: nekobox_core #### -pushd go/cmd/nekobox_core +pushd core/cmd/nekobox_core if [ -z $OLD ]; then go build -v -o $DEST -trimpath -ldflags "-w -s -X $neko_common.Version_neko=$version_standalone" -tags "with_clash_api,with_gvisor,with_quic,with_wireguard,with_utls,with_ech,with_dhcp" else diff --git a/libs/build_public_res.sh b/script/build_public_res.sh old mode 100755 new mode 100644 similarity index 92% rename from libs/build_public_res.sh rename to script/build_public_res.sh index 492977e..ef2bc86 --- a/libs/build_public_res.sh +++ b/script/build_public_res.sh @@ -1,7 +1,7 @@ #!/bin/bash set -e -source libs/env_deploy.sh +source script/env_deploy.sh DEST=$DEPLOYMENT/public_res rm -rf $DEST mkdir -p $DEST diff --git a/libs/deploy_linux64.sh b/script/deploy_linux64.sh old mode 100755 new mode 100644 similarity index 98% rename from libs/deploy_linux64.sh rename to script/deploy_linux64.sh index bcc39d8..1e38d5b --- a/libs/deploy_linux64.sh +++ b/script/deploy_linux64.sh @@ -7,7 +7,7 @@ else ARCH="amd64" fi -source libs/env_deploy.sh +source script/env_deploy.sh DEST=$DEPLOYMENT/linux64 rm -rf $DEST mkdir -p $DEST diff --git a/libs/deploy_macos.sh b/script/deploy_macos.sh old mode 100755 new mode 100644 similarity index 95% rename from libs/deploy_macos.sh rename to script/deploy_macos.sh index 2ccbe8a..cbb6f37 --- a/libs/deploy_macos.sh +++ b/script/deploy_macos.sh @@ -7,7 +7,7 @@ else ARCH="amd64" fi -source libs/env_deploy.sh +source script/env_deploy.sh DEST=$DEPLOYMENT/macos-$ARCH rm -rf $DEST mkdir -p $DEST diff --git a/libs/deploy_windows64.sh b/script/deploy_windows64.sh old mode 100755 new mode 100644 similarity index 96% rename from libs/deploy_windows64.sh rename to script/deploy_windows64.sh index ff3882a..5af2972 --- a/libs/deploy_windows64.sh +++ b/script/deploy_windows64.sh @@ -1,7 +1,7 @@ #!/bin/bash set -e -source libs/env_deploy.sh +source script/env_deploy.sh DEST=$DEPLOYMENT/windows64 rm -rf $DEST mkdir -p $DEST diff --git a/libs/env_deploy.sh b/script/env_deploy.sh similarity index 100% rename from libs/env_deploy.sh rename to script/env_deploy.sh diff --git a/libs/format_cpp.sh b/script/format_cpp.sh old mode 100755 new mode 100644 similarity index 100% rename from libs/format_cpp.sh rename to script/format_cpp.sh diff --git a/libs/pack_debian.sh b/script/pack_debian.sh similarity index 100% rename from libs/pack_debian.sh rename to script/pack_debian.sh diff --git a/libs/translate.sh b/script/translate.sh old mode 100755 new mode 100644 similarity index 100% rename from libs/translate.sh rename to script/translate.sh diff --git a/rpc/gRPC.cpp b/src/api/gRPC.cpp similarity index 99% rename from rpc/gRPC.cpp rename to src/api/gRPC.cpp index 6297de2..ec4df0a 100644 --- a/rpc/gRPC.cpp +++ b/src/api/gRPC.cpp @@ -1,9 +1,9 @@ -#include "gRPC.h" +#include "include/api/gRPC.h" #include #include -#include "main/NekoGui.hpp" +#include "include/global/NekoGui.hpp" #include #include diff --git a/db/ConfigBuilder.cpp b/src/configs/ConfigBuilder.cpp similarity index 99% rename from db/ConfigBuilder.cpp rename to src/configs/ConfigBuilder.cpp index ee9cc23..f864991 100644 --- a/db/ConfigBuilder.cpp +++ b/src/configs/ConfigBuilder.cpp @@ -1,8 +1,8 @@ -#include "db/ConfigBuilder.hpp" -#include "db/Database.hpp" -#include "fmt/includes.h" -#include "fmt/Preset.hpp" -#include "rpc/gRPC.h" +#include "include/configs/configBuilder.hpp" +#include "include/dataStore/Database.hpp" +#include "include/configs/proxy/includes.h" +#include "include/configs/proxy/Preset.hpp" +#include "include/api/gRPC.h" #include #include @@ -810,4 +810,4 @@ namespace NekoGui { status->result->coreConfig.insert("route", routeObj); if (!experimentalObj.isEmpty()) status->result->coreConfig.insert("experimental", experimentalObj); } -} // namespace NekoGui \ No newline at end of file +} // namespace NekoGui diff --git a/fmt/AbstractBean.cpp b/src/configs/proxy/AbstractBean.cpp similarity index 98% rename from fmt/AbstractBean.cpp rename to src/configs/proxy/AbstractBean.cpp index a43baa2..82281ce 100644 --- a/fmt/AbstractBean.cpp +++ b/src/configs/proxy/AbstractBean.cpp @@ -1,4 +1,4 @@ -#include "includes.h" +#include "include/configs/proxy/includes.h" #include #include diff --git a/fmt/Bean2CoreObj_box.cpp b/src/configs/proxy/Bean2CoreObj_box.cpp similarity index 99% rename from fmt/Bean2CoreObj_box.cpp rename to src/configs/proxy/Bean2CoreObj_box.cpp index fc3e09b..8233b48 100644 --- a/fmt/Bean2CoreObj_box.cpp +++ b/src/configs/proxy/Bean2CoreObj_box.cpp @@ -1,5 +1,5 @@ -#include "db/ProxyEntity.hpp" -#include "fmt/includes.h" +#include "include/dataStore/ProxyEntity.hpp" +#include "include/configs/proxy/includes.h" namespace NekoGui_fmt { void V2rayStreamSettings::BuildStreamSettingsSingBox(QJsonObject *outbound) { diff --git a/fmt/Bean2External.cpp b/src/configs/proxy/Bean2External.cpp similarity index 99% rename from fmt/Bean2External.cpp rename to src/configs/proxy/Bean2External.cpp index cdf73fc..edd2fa8 100644 --- a/fmt/Bean2External.cpp +++ b/src/configs/proxy/Bean2External.cpp @@ -1,5 +1,5 @@ -#include "db/ProxyEntity.hpp" -#include "fmt/includes.h" +#include "include/dataStore/ProxyEntity.hpp" +#include "include/configs/proxy/includes.h" #include #include diff --git a/fmt/Bean2Link.cpp b/src/configs/proxy/Bean2Link.cpp similarity index 99% rename from fmt/Bean2Link.cpp rename to src/configs/proxy/Bean2Link.cpp index cd269e9..73b8f4b 100644 --- a/fmt/Bean2Link.cpp +++ b/src/configs/proxy/Bean2Link.cpp @@ -1,5 +1,5 @@ -#include "db/ProxyEntity.hpp" -#include "fmt/includes.h" +#include "include/dataStore/ProxyEntity.hpp" +#include "include/configs/proxy/includes.h" #include diff --git a/fmt/Link2Bean.cpp b/src/configs/proxy/Link2Bean.cpp similarity index 99% rename from fmt/Link2Bean.cpp rename to src/configs/proxy/Link2Bean.cpp index 754574b..64eedbe 100644 --- a/fmt/Link2Bean.cpp +++ b/src/configs/proxy/Link2Bean.cpp @@ -1,5 +1,5 @@ -#include "db/ProxyEntity.hpp" -#include "fmt/includes.h" +#include "include/dataStore/ProxyEntity.hpp" +#include "include/configs/proxy/includes.h" #include diff --git a/sub/GroupUpdater.cpp b/src/configs/sub/GroupUpdater.cpp similarity index 99% rename from sub/GroupUpdater.cpp rename to src/configs/sub/GroupUpdater.cpp index 9ace406..26e6e57 100644 --- a/sub/GroupUpdater.cpp +++ b/src/configs/sub/GroupUpdater.cpp @@ -1,9 +1,8 @@ -#include "db/ProfileFilter.hpp" -#include "fmt/includes.h" -#include "fmt/Preset.hpp" -#include "main/HTTPRequestHelper.hpp" +#include "include/dataStore/ProfileFilter.hpp" +#include "include/configs/proxy/includes.h" +#include "include/global/HTTPRequestHelper.hpp" -#include "GroupUpdater.hpp" +#include "include/configs/sub/GroupUpdater.hpp" #include #include diff --git a/db/Database.cpp b/src/dataStore/Database.cpp similarity index 99% rename from db/Database.cpp rename to src/dataStore/Database.cpp index 3dc40d3..8c8edbe 100644 --- a/db/Database.cpp +++ b/src/dataStore/Database.cpp @@ -1,6 +1,6 @@ -#include "Database.hpp" +#include "include/dataStore/Database.hpp" -#include "fmt/includes.h" +#include "include/configs/proxy/includes.h" #include #include diff --git a/db/ProfileFilter.cpp b/src/dataStore/ProfileFilter.cpp similarity index 98% rename from db/ProfileFilter.cpp rename to src/dataStore/ProfileFilter.cpp index ea062d3..5186c9b 100644 --- a/db/ProfileFilter.cpp +++ b/src/dataStore/ProfileFilter.cpp @@ -1,4 +1,4 @@ -#include "ProfileFilter.hpp" +#include "include/dataStore/ProfileFilter.hpp" namespace NekoGui { diff --git a/db/RouteEntity.cpp b/src/dataStore/RouteEntity.cpp similarity index 99% rename from db/RouteEntity.cpp rename to src/dataStore/RouteEntity.cpp index 0c19e2d..9075f76 100644 --- a/db/RouteEntity.cpp +++ b/src/dataStore/RouteEntity.cpp @@ -1,8 +1,8 @@ #include #include -#include "RouteEntity.h" -#include "db/Database.hpp" -#include "fmt/Preset.hpp" +#include "include/dataStore/RouteEntity.h" +#include "include/dataStore/Database.hpp" +#include "include/configs/proxy/Preset.hpp" #include namespace NekoGui { diff --git a/main/HTTPRequestHelper.cpp b/src/global/HTTPRequestHelper.cpp similarity index 97% rename from main/HTTPRequestHelper.cpp rename to src/global/HTTPRequestHelper.cpp index ac4901a..954d7d0 100644 --- a/main/HTTPRequestHelper.cpp +++ b/src/global/HTTPRequestHelper.cpp @@ -1,4 +1,4 @@ -#include "HTTPRequestHelper.hpp" +#include "include/global/HTTPRequestHelper.hpp" #include #include @@ -10,7 +10,7 @@ #include #include "cpr/cpr.h" -#include "main/NekoGui.hpp" +#include "include/global/NekoGui.hpp" namespace NekoGui_network { diff --git a/main/NekoGui.cpp b/src/global/NekoGui.cpp similarity index 99% rename from main/NekoGui.cpp rename to src/global/NekoGui.cpp index a7f2bfd..9242827 100644 --- a/main/NekoGui.cpp +++ b/src/global/NekoGui.cpp @@ -1,5 +1,5 @@ -#include "NekoGui.hpp" -#include "fmt/Preset.hpp" +#include "include/global/NekoGui.hpp" +#include "include/configs/proxy/Preset.hpp" #include #include @@ -11,10 +11,10 @@ #include #ifdef Q_OS_WIN -#include "sys/windows/guihelper.h" +#include "include/sys/windows/guihelper.h" #else #ifdef Q_OS_LINUX -#include +#include #endif #include #endif diff --git a/main/NekoGui_Utils.cpp b/src/global/NekoGui_Utils.cpp similarity index 98% rename from main/NekoGui_Utils.cpp rename to src/global/NekoGui_Utils.cpp index fd30b53..a78d968 100644 --- a/main/NekoGui_Utils.cpp +++ b/src/global/NekoGui_Utils.cpp @@ -1,4 +1,4 @@ -#include "NekoGui_Utils.hpp" +#include "include/global/NekoGui_Utils.hpp" #include "3rdparty/base64.h" #include "3rdparty/QThreadCreateThread.hpp" @@ -19,7 +19,7 @@ #include #ifdef Q_OS_WIN -#include "sys/windows/guihelper.h" +#include "include/sys/windows/guihelper.h" #endif QStringList SplitLines(const QString &_string) { diff --git a/main/main.cpp b/src/main.cpp similarity index 98% rename from main/main.cpp rename to src/main.cpp index 11f56d0..6afe1ee 100644 --- a/main/main.cpp +++ b/src/main.cpp @@ -11,12 +11,12 @@ #include <3rdparty/WinCommander.hpp> #include "3rdparty/RunGuard.hpp" -#include "main/NekoGui.hpp" +#include "include/global/NekoGui.hpp" -#include "ui/mainwindow_interface.h" +#include "include/ui/mainwindow_interface.h" #ifdef Q_OS_WIN -#include "sys/windows/MiniDump.h" +#include "include/sys/windows/MiniDump.h" #pragma comment (lib, "cpr.lib") #pragma comment (lib, "libcurl.lib") #pragma comment (lib, "Ws2_32.lib") diff --git a/db/traffic/TrafficLooper.cpp b/src/stats/traffic/TrafficLooper.cpp similarity index 96% rename from db/traffic/TrafficLooper.cpp rename to src/stats/traffic/TrafficLooper.cpp index 5bc5e89..0461318 100644 --- a/db/traffic/TrafficLooper.cpp +++ b/src/stats/traffic/TrafficLooper.cpp @@ -1,7 +1,7 @@ -#include "TrafficLooper.hpp" +#include "include/stats/traffic/TrafficLooper.hpp" -#include "rpc/gRPC.h" -#include "ui/mainwindow_interface.h" +#include "include/api/gRPC.h" +#include "include/ui/mainwindow_interface.h" #include #include diff --git a/sys/AutoRun.cpp b/src/sys/AutoRun.cpp similarity index 99% rename from sys/AutoRun.cpp rename to src/sys/AutoRun.cpp index dae2d4c..7061270 100644 --- a/sys/AutoRun.cpp +++ b/src/sys/AutoRun.cpp @@ -1,10 +1,10 @@ -#include "AutoRun.hpp" +#include "include/sys/AutoRun.hpp" #include #include #include "3rdparty/fix_old_qt.h" -#include "main/NekoGui.hpp" +#include "include/global/NekoGui.hpp" // macOS headers (possibly OBJ-c) #if defined(Q_OS_MACOS) diff --git a/sys/ExternalProcess.cpp b/src/sys/ExternalProcess.cpp similarity index 98% rename from sys/ExternalProcess.cpp rename to src/sys/ExternalProcess.cpp index d05065f..42a07c0 100644 --- a/sys/ExternalProcess.cpp +++ b/src/sys/ExternalProcess.cpp @@ -1,5 +1,5 @@ -#include "ExternalProcess.hpp" -#include "main/NekoGui.hpp" +#include "include/sys/ExternalProcess.hpp" +#include "include/global/NekoGui.hpp" #include #include diff --git a/sys/linux/LinuxCap.cpp b/src/sys/linux/LinuxCap.cpp similarity index 96% rename from sys/linux/LinuxCap.cpp rename to src/sys/linux/LinuxCap.cpp index 59fb2cb..15b58fa 100644 --- a/sys/linux/LinuxCap.cpp +++ b/src/sys/linux/LinuxCap.cpp @@ -1,4 +1,4 @@ -#include "LinuxCap.h" +#include "include/sys/linux/LinuxCap.h" #include #include diff --git a/sys/macos/MacOS.cpp b/src/sys/macos/MacOS.cpp similarity index 88% rename from sys/macos/MacOS.cpp rename to src/sys/macos/MacOS.cpp index 418f9bd..2523469 100644 --- a/sys/macos/MacOS.cpp +++ b/src/sys/macos/MacOS.cpp @@ -1,7 +1,7 @@ #include #include #include -#include
+#include int Mac_Run_Command(QString command) { auto cmd = QString("osascript -e 'tell application \"Terminal\" to activate' -e 'tell application \"Terminal\" to do script \"%1\"' with administrator privileges").arg(command); diff --git a/sys/windows/MiniDump.cpp b/src/sys/windows/MiniDump.cpp similarity index 98% rename from sys/windows/MiniDump.cpp rename to src/sys/windows/MiniDump.cpp index 6a8fa47..ff13ad9 100644 --- a/sys/windows/MiniDump.cpp +++ b/src/sys/windows/MiniDump.cpp @@ -1,4 +1,4 @@ -#include "MiniDump.h" +#include "include/sys/windows/MiniDump.h" #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN diff --git a/sys/windows/guihelper.cpp b/src/sys/windows/guihelper.cpp similarity index 93% rename from sys/windows/guihelper.cpp rename to src/sys/windows/guihelper.cpp index f29ebc1..72b52ea 100644 --- a/sys/windows/guihelper.cpp +++ b/src/sys/windows/guihelper.cpp @@ -1,5 +1,5 @@ -#include "guihelper.h" +#include "include/sys/windows/guihelper.h" #include diff --git a/ui/widget/GroupItem.cpp b/src/ui/group/GroupItem.cpp similarity index 95% rename from ui/widget/GroupItem.cpp rename to src/ui/group/GroupItem.cpp index d3ff39d..90ea898 100644 --- a/ui/widget/GroupItem.cpp +++ b/src/ui/group/GroupItem.cpp @@ -1,9 +1,8 @@ -#include "GroupItem.h" -#include "ui_GroupItem.h" +#include "include/ui/group/GroupItem.h" -#include "ui/edit/dialog_edit_group.h" -#include "main/GuiUtils.hpp" -#include "sub/GroupUpdater.hpp" +#include "include/ui/group/dialog_edit_group.h" +#include "include/global/GuiUtils.hpp" +#include "include/configs/sub/GroupUpdater.hpp" #include diff --git a/ui/edit/dialog_edit_group.cpp b/src/ui/group/dialog_edit_group.cpp similarity index 97% rename from ui/edit/dialog_edit_group.cpp rename to src/ui/group/dialog_edit_group.cpp index 39abdd8..f66c60d 100644 --- a/ui/edit/dialog_edit_group.cpp +++ b/src/ui/group/dialog_edit_group.cpp @@ -1,8 +1,7 @@ -#include "dialog_edit_group.h" -#include "ui_dialog_edit_group.h" +#include "include/ui/group/dialog_edit_group.h" -#include "db/Database.hpp" -#include "ui/mainwindow_interface.h" +#include "include/dataStore/Database.hpp" +#include "include/ui/mainwindow_interface.h" #include #include diff --git a/ui/dialog_manage_groups.cpp b/src/ui/group/dialog_manage_groups.cpp similarity index 86% rename from ui/dialog_manage_groups.cpp rename to src/ui/group/dialog_manage_groups.cpp index 0cf3c8b..dec75d4 100644 --- a/ui/dialog_manage_groups.cpp +++ b/src/ui/group/dialog_manage_groups.cpp @@ -1,11 +1,10 @@ -#include "dialog_manage_groups.h" -#include "ui_dialog_manage_groups.h" +#include "include/ui/group/dialog_manage_groups.h" -#include "db/Database.hpp" -#include "sub/GroupUpdater.hpp" -#include "main/GuiUtils.hpp" -#include "ui/widget/GroupItem.h" -#include "ui/edit/dialog_edit_group.h" +#include "include/dataStore/Database.hpp" +#include "include/configs/sub/GroupUpdater.hpp" +#include "include/global/GuiUtils.hpp" +#include "include/ui/group/GroupItem.h" +#include "include/ui/group/dialog_edit_group.h" #include #include diff --git a/ui/mainwindow.cpp b/src/ui/mainwindow.cpp similarity index 98% rename from ui/mainwindow.cpp rename to src/ui/mainwindow.cpp index 1590f7f..764db57 100644 --- a/ui/mainwindow.cpp +++ b/src/ui/mainwindow.cpp @@ -1,32 +1,31 @@ -#include "./ui_mainwindow.h" -#include "mainwindow.h" +#include "include/ui/mainwindow.h" -#include "db/ProfileFilter.hpp" -#include "db/ConfigBuilder.hpp" -#include "sub/GroupUpdater.hpp" -#include "sys/ExternalProcess.hpp" -#include "sys/AutoRun.hpp" +#include "include/dataStore/ProfileFilter.hpp" +#include "include/configs/configBuilder.hpp" +#include "include/configs/sub/GroupUpdater.hpp" +#include "include/sys/ExternalProcess.hpp" +#include "include/sys/AutoRun.hpp" -#include "ui/ThemeManager.hpp" -#include "ui/Icon.hpp" -#include "ui/edit/dialog_edit_profile.h" -#include "ui/dialog_basic_settings.h" -#include "ui/dialog_manage_groups.h" -#include "ui/dialog_manage_routes.h" -#include "ui/dialog_vpn_settings.h" -#include "ui/dialog_hotkey.h" +#include "include/ui/setting/ThemeManager.hpp" +#include "include/ui/setting/Icon.hpp" +#include "include/ui/profile/dialog_edit_profile.h" +#include "include/ui/setting/dialog_basic_settings.h" +#include "include/ui/group/dialog_manage_groups.h" +#include "include/ui/setting/dialog_manage_routes.h" +#include "include/ui/setting/dialog_vpn_settings.h" +#include "include/ui/setting/dialog_hotkey.h" #include "3rdparty/qrcodegen.hpp" #include "3rdparty/VT100Parser.hpp" #include "3rdparty/qv2ray/v2/ui/LogHighlighter.hpp" #include "3rdparty/ZxingQtReader.hpp" -#include "ui/edit/dialog_edit_group.h" +#include "include/ui/group/dialog_edit_group.h" #ifdef Q_OS_WIN #include "3rdparty/WinCommander.hpp" #else #ifdef Q_OS_LINUX -#include "sys/linux/LinuxCap.h" +#include "include/sys/linux/LinuxCap.h" #endif #include #endif @@ -44,9 +43,9 @@ #include #include #include -#include
+#include -#include "sys/macos/MacOS.h" +#include "include/sys/macos/MacOS.h" void UI_InitMainWindow() { mainwindow = new MainWindow; diff --git a/ui/mainwindow_grpc.cpp b/src/ui/mainwindow_grpc.cpp similarity index 98% rename from ui/mainwindow_grpc.cpp rename to src/ui/mainwindow_grpc.cpp index fd0ff8e..a166edd 100644 --- a/ui/mainwindow_grpc.cpp +++ b/src/ui/mainwindow_grpc.cpp @@ -1,11 +1,10 @@ -#include "./ui_mainwindow.h" -#include "mainwindow.h" +#include "include/ui/mainwindow.h" -#include "db/Database.hpp" -#include "db/ConfigBuilder.hpp" -#include "db/traffic/TrafficLooper.hpp" -#include "rpc/gRPC.h" -#include "ui/widget/MessageBoxTimer.h" +#include "include/dataStore/Database.hpp" +#include "include/configs/configBuilder.hpp" +#include "include/stats/traffic/TrafficLooper.hpp" +#include "include/api/gRPC.h" +#include "include/ui/utils//MessageBoxTimer.h" #include "3rdparty/qv2ray/v2/proxy/QvProxyConfigurator.hpp" #include diff --git a/ui/widget/ProxyItem.cpp b/src/ui/profile/ProxyItem.cpp similarity index 96% rename from ui/widget/ProxyItem.cpp rename to src/ui/profile/ProxyItem.cpp index f8c1587..8af6825 100644 --- a/ui/widget/ProxyItem.cpp +++ b/src/ui/profile/ProxyItem.cpp @@ -1,5 +1,4 @@ -#include "ProxyItem.h" -#include "ui_ProxyItem.h" +#include "include/ui/profile/ProxyItem.h" #include diff --git a/ui/edit/dialog_edit_profile.cpp b/src/ui/profile/dialog_edit_profile.cpp similarity index 97% rename from ui/edit/dialog_edit_profile.cpp rename to src/ui/profile/dialog_edit_profile.cpp index 9efc31e..89f86cd 100644 --- a/ui/edit/dialog_edit_profile.cpp +++ b/src/ui/profile/dialog_edit_profile.cpp @@ -1,22 +1,21 @@ -#include "dialog_edit_profile.h" -#include "ui_dialog_edit_profile.h" +#include "include/ui/profile/dialog_edit_profile.h" -#include "ui/edit/edit_socks_http.h" -#include "ui/edit/edit_shadowsocks.h" -#include "ui/edit/edit_chain.h" -#include "ui/edit/edit_vmess.h" -#include "ui/edit/edit_trojan_vless.h" -#include "ui/edit/edit_naive.h" -#include "ui/edit/edit_quic.h" -#include "ui/edit/edit_wireguard.h" -#include "ui/edit/edit_ssh.h" -#include "ui/edit/edit_custom.h" +#include "include/ui/profile/edit_socks_http.h" +#include "include/ui/profile/edit_shadowsocks.h" +#include "include/ui/profile/edit_chain.h" +#include "include/ui/profile/edit_vmess.h" +#include "include/ui/profile/edit_trojan_vless.h" +#include "include/ui/profile/edit_naive.h" +#include "include/ui/profile/edit_quic.h" +#include "include/ui/profile/edit_wireguard.h" +#include "include/ui/profile/edit_ssh.h" +#include "include/ui/profile/edit_custom.h" -#include "fmt/includes.h" -#include "fmt/Preset.hpp" +#include "include/configs/proxy/includes.h" +#include "include/configs/proxy/Preset.hpp" #include "3rdparty/qv2ray/v2/ui/widgets/editors/w_JsonEditor.hpp" -#include "main/GuiUtils.hpp" +#include "include/global/GuiUtils.hpp" #include diff --git a/ui/edit/edit_chain.cpp b/src/ui/profile/edit_chain.cpp similarity index 90% rename from ui/edit/edit_chain.cpp rename to src/ui/profile/edit_chain.cpp index a84d365..70d33bb 100644 --- a/ui/edit/edit_chain.cpp +++ b/src/ui/profile/edit_chain.cpp @@ -1,11 +1,10 @@ -#include "edit_chain.h" -#include "ui_edit_chain.h" +#include "include/ui/profile/edit_chain.h" -#include "ui/mainwindow_interface.h" -#include "ui/widget/ProxyItem.h" +#include "include/ui/mainwindow_interface.h" +#include "include/ui/profile/ProxyItem.h" -#include "db/Database.hpp" -#include "fmt/ChainBean.hpp" +#include "include/dataStore/Database.hpp" +#include "include/configs/proxy/ChainBean.hpp" EditChain::EditChain(QWidget *parent) : QWidget(parent), ui(new Ui::EditChain) { ui->setupUi(this); diff --git a/ui/edit/edit_custom.cpp b/src/ui/profile/edit_custom.cpp similarity index 95% rename from ui/edit/edit_custom.cpp rename to src/ui/profile/edit_custom.cpp index d8a669d..c810e67 100644 --- a/ui/edit/edit_custom.cpp +++ b/src/ui/profile/edit_custom.cpp @@ -1,11 +1,10 @@ -#include "edit_custom.h" -#include "ui_edit_custom.h" +#include "include/ui/profile/edit_custom.h" #include "3rdparty/qv2ray/v2/ui/widgets/editors/w_JsonEditor.hpp" -#include "fmt/CustomBean.hpp" -#include "fmt/Preset.hpp" -#include "db/ConfigBuilder.hpp" -#include "db/Database.hpp" +#include "include/configs/proxy/CustomBean.hpp" +#include "include/configs/proxy/Preset.hpp" +#include "include/configs/configBuilder.hpp" +#include "include/dataStore/Database.hpp" #include #include diff --git a/ui/edit/edit_naive.cpp b/src/ui/profile/edit_naive.cpp similarity index 94% rename from ui/edit/edit_naive.cpp rename to src/ui/profile/edit_naive.cpp index 7539251..1ab1210 100644 --- a/ui/edit/edit_naive.cpp +++ b/src/ui/profile/edit_naive.cpp @@ -1,7 +1,6 @@ -#include "edit_naive.h" -#include "ui_edit_naive.h" +#include "include/ui/profile/edit_naive.h" -#include "fmt/NaiveBean.hpp" +#include "include/configs/proxy/NaiveBean.hpp" #include diff --git a/ui/edit/edit_quic.cpp b/src/ui/profile/edit_quic.cpp similarity index 98% rename from ui/edit/edit_quic.cpp rename to src/ui/profile/edit_quic.cpp index 9cdd8e8..de094a6 100644 --- a/ui/edit/edit_quic.cpp +++ b/src/ui/profile/edit_quic.cpp @@ -1,7 +1,6 @@ -#include "edit_quic.h" -#include "ui_edit_quic.h" +#include "include/ui/profile/edit_quic.h" -#include "fmt/QUICBean.hpp" +#include "include/configs/proxy/QUICBean.hpp" #include #include diff --git a/ui/edit/edit_shadowsocks.cpp b/src/ui/profile/edit_shadowsocks.cpp similarity index 88% rename from ui/edit/edit_shadowsocks.cpp rename to src/ui/profile/edit_shadowsocks.cpp index e016e34..07d8e98 100644 --- a/ui/edit/edit_shadowsocks.cpp +++ b/src/ui/profile/edit_shadowsocks.cpp @@ -1,8 +1,7 @@ -#include "edit_shadowsocks.h" -#include "ui_edit_shadowsocks.h" +#include "include/ui/profile/edit_shadowsocks.h" -#include "fmt/ShadowSocksBean.hpp" -#include "fmt/Preset.hpp" +#include "include/configs/proxy/ShadowSocksBean.hpp" +#include "include/configs/proxy/Preset.hpp" EditShadowSocks::EditShadowSocks(QWidget *parent) : QWidget(parent), ui(new Ui::EditShadowSocks) { diff --git a/ui/edit/edit_socks_http.cpp b/src/ui/profile/edit_socks_http.cpp similarity index 92% rename from ui/edit/edit_socks_http.cpp rename to src/ui/profile/edit_socks_http.cpp index 1598c6e..4b303cd 100644 --- a/ui/edit/edit_socks_http.cpp +++ b/src/ui/profile/edit_socks_http.cpp @@ -1,7 +1,6 @@ -#include "edit_socks_http.h" -#include "ui_edit_socks_http.h" +#include "include/ui/profile/edit_socks_http.h" -#include "fmt/SocksHttpBean.hpp" +#include "include/configs/proxy/SocksHttpBean.hpp" EditSocksHttp::EditSocksHttp(QWidget *parent) : QWidget(parent), ui(new Ui::EditSocksHttp) { diff --git a/ui/edit/edit_ssh.cpp b/src/ui/profile/edit_ssh.cpp similarity index 95% rename from ui/edit/edit_ssh.cpp rename to src/ui/profile/edit_ssh.cpp index f919e84..fdfa30d 100644 --- a/ui/edit/edit_ssh.cpp +++ b/src/ui/profile/edit_ssh.cpp @@ -1,8 +1,7 @@ -#include "edit_ssh.h" -#include "ui_edit_ssh.h" +#include "include/ui/profile/edit_ssh.h" #include -#include "fmt/SSHBean.h" +#include "include/configs/proxy/SSHBean.h" EditSSH::EditSSH(QWidget *parent) : QWidget(parent), ui(new Ui::EditSSH) { ui->setupUi(this); diff --git a/ui/edit/edit_trojan_vless.cpp b/src/ui/profile/edit_trojan_vless.cpp similarity index 85% rename from ui/edit/edit_trojan_vless.cpp rename to src/ui/profile/edit_trojan_vless.cpp index 0a7c2eb..29db679 100644 --- a/ui/edit/edit_trojan_vless.cpp +++ b/src/ui/profile/edit_trojan_vless.cpp @@ -1,8 +1,7 @@ -#include "edit_trojan_vless.h" -#include "ui_edit_trojan_vless.h" +#include "include/ui/profile/edit_trojan_vless.h" -#include "fmt/TrojanVLESSBean.hpp" -#include "fmt/Preset.hpp" +#include "include/configs/proxy/TrojanVLESSBean.hpp" +#include "include/configs/proxy/Preset.hpp" EditTrojanVLESS::EditTrojanVLESS(QWidget *parent) : QWidget(parent), ui(new Ui::EditTrojanVLESS) { ui->setupUi(this); diff --git a/ui/edit/edit_vmess.cpp b/src/ui/profile/edit_vmess.cpp similarity index 89% rename from ui/edit/edit_vmess.cpp rename to src/ui/profile/edit_vmess.cpp index 0fb05a7..7d9067a 100644 --- a/ui/edit/edit_vmess.cpp +++ b/src/ui/profile/edit_vmess.cpp @@ -1,7 +1,6 @@ -#include "edit_vmess.h" -#include "ui_edit_vmess.h" +#include "include/ui/profile/edit_vmess.h" -#include "fmt/VMessBean.hpp" +#include "include/configs/proxy/VMessBean.hpp" #include diff --git a/ui/edit/edit_wireguard.cpp b/src/ui/profile/edit_wireguard.cpp similarity index 94% rename from ui/edit/edit_wireguard.cpp rename to src/ui/profile/edit_wireguard.cpp index 43ff64b..6a012c2 100644 --- a/ui/edit/edit_wireguard.cpp +++ b/src/ui/profile/edit_wireguard.cpp @@ -1,7 +1,6 @@ -#include "edit_wireguard.h" -#include "ui_edit_wireguard.h" +#include "include/ui/profile/edit_wireguard.h" -#include "fmt/WireguardBean.h" +#include "include/configs/proxy/WireguardBean.h" EditWireguard::EditWireguard(QWidget *parent) : QWidget(parent), ui(new Ui::EditWireguard) { ui->setupUi(this); diff --git a/ui/Icon.cpp b/src/ui/setting/Icon.cpp similarity index 94% rename from ui/Icon.cpp rename to src/ui/setting/Icon.cpp index f14291a..bc72e63 100644 --- a/ui/Icon.cpp +++ b/src/ui/setting/Icon.cpp @@ -1,6 +1,6 @@ -#include "Icon.hpp" +#include "include/ui/setting/Icon.hpp" -#include "main/NekoGui.hpp" +#include "include/global/NekoGui.hpp" #include diff --git a/ui/widget/RouteItem.cpp b/src/ui/setting/RouteItem.cpp similarity index 98% rename from ui/widget/RouteItem.cpp rename to src/ui/setting/RouteItem.cpp index 7d4e638..111d06d 100644 --- a/ui/widget/RouteItem.cpp +++ b/src/ui/setting/RouteItem.cpp @@ -1,8 +1,7 @@ -#include "RouteItem.h" -#include "ui_RouteItem.h" -#include "db/RouteEntity.h" -#include "db/Database.hpp" -#include "rpc/gRPC.h" +#include "include/ui/setting/RouteItem.h" +#include "include/dataStore/RouteEntity.h" +#include "include/dataStore/Database.hpp" +#include "include/api/gRPC.h" void adjustComboBoxWidth(const QComboBox *comboBox) { int maxWidth = 0; diff --git a/ui/ThemeManager.cpp b/src/ui/setting/ThemeManager.cpp similarity index 95% rename from ui/ThemeManager.cpp rename to src/ui/setting/ThemeManager.cpp index b640155..a291494 100644 --- a/ui/ThemeManager.cpp +++ b/src/ui/setting/ThemeManager.cpp @@ -3,7 +3,7 @@ #include #include -#include "ThemeManager.hpp" +#include "include/ui/setting/ThemeManager.hpp" #include "iostream" ThemeManager *themeManager = new ThemeManager; diff --git a/ui/dialog_basic_settings.cpp b/src/ui/setting/dialog_basic_settings.cpp similarity index 98% rename from ui/dialog_basic_settings.cpp rename to src/ui/setting/dialog_basic_settings.cpp index 44d02ba..c9b54b4 100644 --- a/ui/dialog_basic_settings.cpp +++ b/src/ui/setting/dialog_basic_settings.cpp @@ -1,13 +1,12 @@ -#include "dialog_basic_settings.h" -#include "ui_dialog_basic_settings.h" +#include "include/ui/setting/dialog_basic_settings.h" #include "3rdparty/qv2ray/v2/ui/widgets/editors/w_JsonEditor.hpp" -#include "fmt/Preset.hpp" -#include "ui/ThemeManager.hpp" -#include "ui/Icon.hpp" -#include "main/GuiUtils.hpp" -#include "main/NekoGui.hpp" -#include "main/HTTPRequestHelper.hpp" +#include "include/configs/proxy/Preset.hpp" +#include "include/ui/setting/ThemeManager.hpp" +#include "include/ui/setting/Icon.hpp" +#include "include/global/GuiUtils.hpp" +#include "include/global/NekoGui.hpp" +#include "include/global/HTTPRequestHelper.hpp" #include #include diff --git a/ui/dialog_hotkey.cpp b/src/ui/setting/dialog_hotkey.cpp similarity index 92% rename from ui/dialog_hotkey.cpp rename to src/ui/setting/dialog_hotkey.cpp index 8514b71..5247270 100644 --- a/ui/dialog_hotkey.cpp +++ b/src/ui/setting/dialog_hotkey.cpp @@ -1,7 +1,6 @@ -#include "dialog_hotkey.h" -#include "ui_dialog_hotkey.h" +#include "include/ui/setting/dialog_hotkey.h" -#include "ui/mainwindow_interface.h" +#include "include/ui/mainwindow_interface.h" DialogHotkey::DialogHotkey(QWidget *parent) : QDialog(parent), ui(new Ui::DialogHotkey) { ui->setupUi(this); diff --git a/ui/dialog_manage_routes.cpp b/src/ui/setting/dialog_manage_routes.cpp similarity index 98% rename from ui/dialog_manage_routes.cpp rename to src/ui/setting/dialog_manage_routes.cpp index b486deb..216a688 100644 --- a/ui/dialog_manage_routes.cpp +++ b/src/ui/setting/dialog_manage_routes.cpp @@ -1,15 +1,14 @@ -#include "dialog_manage_routes.h" -#include "ui_dialog_manage_routes.h" -#include "db/Database.hpp" +#include "include/ui/setting/dialog_manage_routes.h" +#include "include/dataStore/Database.hpp" #include "3rdparty/qv2ray/v2/ui/widgets/editors/w_JsonEditor.hpp" -#include "main/GuiUtils.hpp" -#include "fmt/Preset.hpp" +#include "include/global/GuiUtils.hpp" +#include "include/configs/proxy/Preset.hpp" #include #include #include -#include +#include void DialogManageRoutes::reloadProfileItems() { if (chainList.empty()) { diff --git a/ui/dialog_vpn_settings.cpp b/src/ui/setting/dialog_vpn_settings.cpp similarity index 91% rename from ui/dialog_vpn_settings.cpp rename to src/ui/setting/dialog_vpn_settings.cpp index bc2992f..ad913fb 100644 --- a/ui/dialog_vpn_settings.cpp +++ b/src/ui/setting/dialog_vpn_settings.cpp @@ -1,10 +1,9 @@ -#include "dialog_vpn_settings.h" -#include "ui_dialog_vpn_settings.h" +#include "include/ui/setting/dialog_vpn_settings.h" -#include "fmt/Preset.hpp" -#include "main/GuiUtils.hpp" -#include "main/NekoGui.hpp" -#include "ui/mainwindow_interface.h" +#include "include/configs/proxy/Preset.hpp" +#include "include/global/GuiUtils.hpp" +#include "include/global/NekoGui.hpp" +#include "include/ui/mainwindow_interface.h" #include #define ADJUST_SIZE runOnUiThread([=] { adjustSize(); adjustPosition(mainwindow); }, this);