Commit Graph

654 Commits

Author SHA1 Message Date
Leroy.H.Y
2a9eb99374 [lang] Changed translation file name.
Former-commit-id: f1e8aa084c
2019-09-09 12:50:37 +08:00
Leroy.H.Y
ac86f3fad3 [ui] Make English as default language 1
Former-commit-id: 22cd14a838
2019-09-06 15:55:54 +08:00
Leroy.H.Y
9e99bb84b2 [dev] Merging fix
Former-commit-id: b756397287
2019-09-05 16:24:30 +08:00
Leroy.H.Y
7115efd464 Merge branch 'dev' into dev-multi-outbound
Former-commit-id: 6c68025a67
2019-09-05 16:18:21 +08:00
Leroy.H.Y
83c781a777 [dev] Merged dev branch which fixed: #34
Former-commit-id: f12593109e
2019-09-05 15:57:13 +08:00
Leroy.H.Y
4be965b6b2 [bug] Temporary fix of Issue: #34
Former-commit-id: af20994365
2019-09-04 20:54:03 +08:00
Leroy.H.Y
8385df3374 [FIX] This commit fixed #35
Former-commit-id: 9dc329506e
2019-09-03 21:34:12 +08:00
Leroy.H.Y
6a2b703841 Bumped to version 1.3.5
Former-commit-id: d4f54a70ec
2019-09-03 13:22:39 +08:00
Leroy.H.Y
4dd6c4efbc Merge branch 'dev' into dev-multi-outbound
Former-commit-id: 93ab2b633a
2019-08-29 11:28:14 +08:00
Hork
b7a6fe52a0 Subscription(partially done)
Former-commit-id: f28cd4dd95
2019-08-28 08:27:24 +08:00
Leroy.H.Y
94b46523f1 [Subscription] Added vmess convertion option for Subscriptions
Former-commit-id: f88d5986cf
2019-08-27 14:26:54 +08:00
Leroy.H.Y
eb53687b63 [pre2.0] Bumped version to pre2.0, Added more UI functions. #19
Signed-off-by: Leroy.H.Y <lhy20010403@hotmail.com>

Former-commit-id: 695e8a5c55
2019-08-26 19:57:20 +08:00
Leroy.H.Y
11c66b45cf [UI] Added ui for routes management.
Former-commit-id: 7a85c3e946
2019-08-23 23:33:24 +08:00
Leroy.H.Y
621bc1efdf [merge] merged branch patch-keep-extra-outbounds #25
Signed-off-by: Leroy.H.Y <lhy20010403@hotmail.com>

Former-commit-id: b0581f037a
2019-08-23 20:52:28 +08:00
Leroy.H.Y
96f10571ea [dev] added ui base for multi-outbound
Former-commit-id: 54efa021ce
2019-08-23 20:45:22 +08:00
Leroy.H.Y
c11c724210 [UI] Several code refactors and formats, removed a too-long translation.
Former-commit-id: f466c2e29d
2019-08-23 09:06:18 +08:00
Leroy.H.Y
cc86debd7d [patch] 2nd patch for avoiding add extra items to imported config file #25
Former-commit-id: b3efdcf7ec
2019-08-22 23:33:19 +08:00
Leroy.H.Y
8393b9f95a [patch] avoid removing extra outbounds
Former-commit-id: 120edb23f2
2019-08-22 22:25:45 +08:00
Leroy.H.Y
a715bd7314 [UI] Several UI fixes and version scheme changes, fixed a connection selection issue.
Former-commit-id: d5e963934f
2019-08-19 19:01:32 +08:00
Leroy.H.Y
4fc1ce1f43 [Added] Added config migration logic.
Former-commit-id: 71b7985748
2019-08-19 17:40:31 +08:00
Leroy.H.Y
5e183fc59e [Fixed] Fixed an auto update bug in Win32 env.
Former-commit-id: c01b80c9d6
2019-08-19 15:34:14 +08:00
Leroy.H.Y
c77a8cad0a [Windows][UI][Fix] Fixed a Visibility Toggling Issue
Former-commit-id: 91e0f72eed
2019-08-18 00:47:49 +08:00
Leroy.H.Y
53465986a7 [UI][MacOS] Added fusion as new UI scheme
Former-commit-id: 64a75a9704
2019-08-18 00:32:45 +08:00
Leroy.H.Y
c04fe25075 Added extra debug message
Signed-off-by: Leroy.H.Y <lhy20010403@hotmail.com>

Former-commit-id: d7931433ff
2019-08-17 23:57:06 +08:00
Leroy.H.Y
5db9f5d78d [Added][Changed][UI] Added SOCKS, connection renaming, connect selected, and a new tiny log module. Redesigned MainWindow UI
Former-commit-id: 5dfc667a9c
2019-08-17 00:23:18 +08:00
Leroy.H.Y
8efae6b7ed [Fixed] Fixed a focus issue in Windows and bump version to v1.3.0
Former-commit-id: 5558b48e5e
2019-08-11 22:47:13 +08:00
Leroy.H.Y
847d01fcbf [Added] Added Shadowsocks Support <Linux>
Former-commit-id: 4ecb0f73bb
2019-08-11 21:53:13 +08:00
Leroy.H.Y
59fcc8f493 [Added] Added UI for ShadowSocks <See: #19>
Signed-off-by: Leroy.H.Y <lhy20010403@hotmail.com>

Former-commit-id: 531c2625f0
2019-08-11 11:06:00 +08:00
Leroy.H.Y
0117e652be [Change] Code refactors
Former-commit-id: 637cba341e
2019-08-09 22:32:34 +08:00
Leroy.H.Y
0bb91ddf6f [Added] Added a better font for Windows env
Signed-off-by: Leroy.H.Y <lhy20010403@hotmail.com>

Former-commit-id: 950744b725
2019-07-24 23:32:07 +08:00
Leroy.H.Y
510777d6d7 [Added][Improved][Fixed] Multiple updates.
A: Auto Check Updates and ignore an update
I: No need of re-starting irrelevant connection
I: GPLv3 Notes improved on startup
I: UX when selecting transport config
F: Discard button recognized as Accept in ImportConfig
F: Log box messed up when cursor is not at the end
I: Auto select v2ray Assets path according to core exe

Signed-off-by: Leroy.H.Y <lhy20010403@hotmail.com>

Former-commit-id: abf7a01d7a
2019-07-24 21:24:59 +08:00
Leroy.H.Y
1658383c30 Merge branch 'master' into dev
Conflicts:
	src/QvGUIConfigObjects.h
	src/w_PrefrencesWindow.ui

Signed-off-by: Leroy.H.Y <lhy20010403@hotmail.com>

Former-commit-id: 1e82b99d6d
2019-07-23 22:44:49 +08:00
Leroy.H.Y
959edca66c [Fix-Git-Merge]
Former-commit-id: a0bad5d8ea
2019-07-23 22:35:57 +08:00
Leroy.H.Y
b9e6502e14 [Fix] Fixed build error
Former-commit-id: ec7ddd5b52
2019-07-23 14:43:26 +08:00
Leroy.H.Y
ea527064c9 [Added] Added auto-connection function and About box
Former-commit-id: c75b3d3530
2019-07-23 11:12:23 +08:00
Leroy.H.Y
cfb565fc8f [Part] Partly add AutoStart functionability
Former-commit-id: e928803f70
2019-07-23 08:49:28 +08:00
Leroy.H.Y
832d31c126 [Fix] Fixed a typo of generated config path.
Former-commit-id: 42306d62fb
2019-07-15 20:27:26 +08:00
Leroy.H.Y
4c2b1fe5c5 Merge branch 'v2.0-TODO' into dev
Merge version 2.0 pre-developement branch


Former-commit-id: 10c0bd90d7
2019-07-11 15:08:19 +08:00
Leroy.H.Y
3e873c6ffe [Fix RC1] RC1
Former-commit-id: 2190fc8c30
2019-07-11 09:49:35 +08:00
Leroy.H.Y
6dff943b7a [Fix] Some fixes in Issue #21
Former-commit-id: a3f92dbdca
2019-07-10 21:28:17 +08:00
Leroy.H.Y
a12d69e37c [TODO] Add Subscription
Former-commit-id: 4c2bb54216
2019-07-10 21:08:20 +08:00
Leroy.H.Y
32ac806559 [MacOS Release] Added MacOS Logo and fixed config path.
Former-commit-id: 79ed0a1267
2019-07-09 06:17:31 -07:00
Leroy.H.Y
ead0892497 [MacOS Windows Fix Release] Fixed arg with Q_UNUSED
Former-commit-id: 373841c454
2019-07-09 20:14:02 +08:00
Leroy.H.Y
2fb44b3b33 [Linux Release] v0.9.9a
Former-commit-id: 7cc07dd680
2019-07-09 20:07:14 +08:00
Leroy.H.Y
c51eef6dcc [Paritally Added] Added manually generation of configs. BUGFUL WARNING
Former-commit-id: b81426fedc
2019-07-09 00:55:28 +08:00
Leroy.H.Y
0a9bd55a57 [Fix] Make ConnectionEditWindow ui file cleaner
Former-commit-id: 556ed4b8c9
2019-07-08 19:16:05 +08:00
Leroy.H.Y
ca5a6fddd0 [Tweaks] UI becomes more user-friendly.
Former-commit-id: d2208875f6
2019-07-08 16:33:41 +08:00
Leroy.H.Y
eb07ef7de1 [Added] Now you can start imported connections.
- Prefrences can only be edited manually in this build.


Former-commit-id: 9b02ff9da8
2019-07-07 18:36:25 +08:00
Leroy.H.Y
641f9b3810 [Fixed] Fixed an invalid cast.
Former-commit-id: c6c0f7b9ed
2019-07-07 14:02:44 +08:00
Leroy.H.Y
70bab21bef [Fixed] Fixed Linux and Windows with Qt < 5.11 Build.
Former-commit-id: 4d5900a614
2019-07-07 13:54:07 +08:00
Leroy.H.Y
9702d802b5 [Added] Import config from file.
Former-commit-id: 220f202c61
2019-07-07 12:18:56 +08:00
Leroy.H.Y
1793dc7918 [ADDED] Added VMess protocol Decode. #13
Former-commit-id: e16466ffe9
2019-07-06 22:54:05 +08:00
Leroy.H.Y
846dde288c [Fix] Use provided config as ConfigFile in Utils::
Former-commit-id: b0eb5a61eb
2019-07-06 15:03:40 +08:00
Leroy.H.Y
d6cb711469 [CHANGED] Some minimum changes...
Former-commit-id: 0e9b90fb11
2019-07-06 11:49:35 +08:00
Leroy.H.Y
6f9df68e11 [Remove] Removed Python depends. Added struct for vmess:// protocol.
FYI: https://github.com/lhy0403/Qv2ray/issues/12#issuecomment-507897806
FYI: https://github.com/lhy0403/Qv2ray/issues/15
FYI: #15

Signed-off-by: Leroy.H.Y <lhy20010403@hotmail.com>

Former-commit-id: 361ff763e6
2019-07-05 23:47:31 +08:00
Leroy.H.Y
1c194f7481 [Changed] Changed UI Classpath
Former-commit-id: ecad514425
2019-07-05 21:20:40 +08:00
Leroy.H.Y
05ae99eec4 [RENAMED] Renamed from Hv2ray to Qv2ray
Former-commit-id: 08e6e26201
2019-07-05 20:43:33 +08:00
Leroy.H.Y
2c8df19c73 [Added] Added more v2ray config structs and added x2struct JSON lib.
Former-commit-id: dfcbd64329
2019-07-03 23:10:24 +08:00
Leroy.H.Y
95cdd089b3 [Downgrade] Downgraded to std C++11
Former-commit-id: 09eed2704d
2019-07-03 09:58:06 +08:00
Leroy.H.Y
d3e3f14ae2 [Added][Fixed] Added JSON parse libraries, and fixed namespace structure.
Signed-off-by: Leroy.H.Y <lhy20010403@hotmail.com>

Former-commit-id: 7aaff60ff4
2019-07-03 00:18:39 +08:00
Leroy.H.Y
a0fb909d10 [Fix] Continue refactoring the project.
Signed-off-by: Leroy.H.Y <lhy20010403@hotmail.com>

Former-commit-id: 471beb1cce
2019-07-01 23:59:17 +08:00
Leroy.H.Y
a890859c55 [Format] Formatted UI file names.
Signed-off-by: Leroy.H.Y <lhy20010403@hotmail.com>

Former-commit-id: adae62393f
2019-06-25 19:12:45 +08:00
Leroy.H.Y
7072a20125 [Fix][MacOS] Fixed Visibility toggling over-used on MacOS
Former-commit-id: b67aad1c15
2019-06-24 00:17:55 -07:00
Leroy.H.Y
c8120e5a5f [Fix] Fixed Linux build.
Former-commit-id: 09481eead7
2019-06-23 20:36:09 +08:00
Leroy.H.Y
787773635e [Added] Added UI Translations
Signed-off-by: Leroy.H.Y <lhy20010403@hotmail.com>

Former-commit-id: 688071dd00
2019-06-23 19:19:20 +08:00
Leroy.H.Y
fa08f03fec [Add] Finished UI-Implementation
Former-commit-id: 4f0cbce1bd
2019-06-22 21:53:36 +08:00
Leroy.H.Y
20ca9cef23 [ReDesign] Re-design config window UI
Signed-off-by: Leroy.H.Y <lhy20010403@hotmail.com>

Former-commit-id: 0d2e1c62b3
2019-06-22 11:24:05 +08:00
Leroy.H.Y
25fe97267d [Added] Added more translates and new MainWindow UI
Signed-off-by: Leroy.H.Y <lhy20010403@hotmail.com>

Former-commit-id: b60abe61ca
2019-06-21 22:19:45 +08:00
Leroy.H.Y
7a67566e4d [Added] Added Windows build support(WIP)
Signed-off-by: Leroy.H.Y <lhy20010403@hotmail.com>

Former-commit-id: 485e7a68e6
2019-06-21 17:58:22 +08:00
Leroy.H.Y
1a535698d5
Merge branch 'master' into AppVeyor
# Conflicts:
#	Hv2ray.pro
#	src/confedit.cpp
#	src/confedit.ui
#	src/db.cpp
#	src/db.h
#	src/mainwindow.cpp

Signed-off-by: Leroy.H.Y <lhy20010403@hotmail.com>
2019-06-19 09:55:25 +08:00
Leroy.H.Y
0216b60590
Merge branch 'ui-implementation' into AppVeyor 2019-06-19 09:48:41 +08:00
Leroy.H.Y
1877095bdf
Update confedit.cpp 2019-06-19 09:37:10 +08:00
Leroy.H.Y
78118565d0
Update mainwindow.cpp 2019-06-19 09:35:09 +08:00
Leroy.Haoyu.Liu
b57651784d
[Change] New Connection config UI and removed SQLite 2019-06-19 00:20:08 +08:00
Leroy.H.Y
04b4cb0ce7
ReWrite CI Config, and start new UI. (#6)
* [Change] A little file renaming

* [Fixed] Fixed import_vmess ui error

Signed-off-by: Leroy.Haoyu.Liu <lhy20010403@hotmail.com>

* Fix LGTM Python3-dev package missing bug. (#7)

* Update .lgtm.yml

* Update .lgtm.yml

* Update .lgtm.yml

* Update .lgtm.yml

* Update Hv2ray.pro

* Update .lgtm.yml

* Update Hv2ray.pro
2019-06-18 16:47:27 +08:00
Leroy.Haoyu.Liu
8e1a830a06
[Fixed] Fixed import_vmess ui error
Signed-off-by: Leroy.Haoyu.Liu <lhy20010403@hotmail.com>
2019-06-18 14:57:41 +08:00
Leroy.Haoyu.Liu
15ec35e1e1
[Change] A little file renaming 2019-06-18 14:47:28 +08:00
Leroy.H.Y
820e989216
Update hvconf.cpp 2019-06-18 14:43:35 +08:00
Hork
4b5b384a37 Prevent manual chaging in modified inbounds. 2019-05-10 22:51:17 +08:00
Hork
63f77f84b3 Fix python env. 2019-05-10 14:53:12 +08:00
Hork
b7c2974ea9 Remove 'inbound' and 'inboundDetour'. 2019-05-10 14:21:11 +08:00
Hork
97cbe106ea Fix. 2019-05-10 13:17:27 +08:00
Hork
0f24b32b7e Override inbounds. 2019-05-10 13:09:31 +08:00
Hork
c74c4d8de2
Fix of restart button. 2019-05-10 10:23:30 +08:00
Leroy.Haoyu.Liu
85d6ebd7ca
Another tiny change 2019-05-10 10:12:59 +08:00
Leroy.Haoyu.Liu
048d0fa181
[Tl;Dr] Lots of ui, code format and Ux changes. 2019-05-10 09:52:50 +08:00
Hork
b195db26c6 Fix 2019-05-09 14:07:35 +08:00
Hork
36f275fbb8 Autorestart after modify preferences. 2019-05-09 13:47:12 +08:00
Hork
79cdedf3e0 Preferences almost done. 2019-05-09 13:37:13 +08:00
Hork
a62c27ebc8 Fixs and preferences. 2019-05-08 22:56:20 +08:00
Hork
aa44d9fedd Enable sudo on v2ray for tproxy. 2019-05-06 20:10:47 +08:00
Hork
59e4c57dcf Autorestart after switching conf. 2019-05-05 16:49:15 +08:00
Hork
77c540a61b Allow suid. 2019-04-27 08:07:18 +08:00
Hork
257d473efd Bug fix. 2019-04-24 18:26:02 +08:00
Hork
4ba7faf39a Fix bug. 2019-04-21 17:00:38 +08:00
Hork
6730be0c73 Change working directory. 2019-04-21 16:50:55 +08:00
Hork
2f2bb5b230 Auto scroll. 2019-04-21 14:07:28 +08:00
Hork
4dcb17a298 Add exit, rename and autostart. 2019-04-19 20:10:15 +08:00
Hork
ab7047a1f8 Disable multi instances and add mainwindow icon. 2019-04-18 08:02:45 +08:00
Hork
ee2c126a6a Add v2ctl check. 2019-04-17 23:30:23 +08:00
Hork
fbdae71a2c Implement system tray context menu. 2019-04-17 23:28:32 +08:00
Hork
1f9d763958 Bug fix and add systemtray. 2019-04-17 21:16:07 +08:00
Hork
5e28486386 Fix some bugs. 2019-04-17 08:49:12 +08:00
Hork
4e91b727ee Change folder sructure. 2019-04-17 07:57:09 +08:00