Skip to content

Commit 0183367

Browse files
fa0311fa0311
authored
Merge pull request #127 from fa0311/develop-v5
fix proxy
2 parents 620b44e + ec5e748 commit 0183367

File tree

7 files changed

+71
-53
lines changed

7 files changed

+71
-53
lines changed

‎DMMGamePlayerFastLauncher/DMMGamePlayerFastLauncher.py‎

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -65,18 +65,11 @@ def loder(master: LanchLauncher):
6565

6666
config_migrate()
6767

68-
if AppConfig.DATA.proxy_http.get() != "":
69-
os.environ["HTTP_PROXY"] = AppConfig.DATA.proxy_http.get()
70-
if AppConfig.DATA.proxy_https.get() != "":
71-
os.environ["HTTPS_PROXY"] = AppConfig.DATA.proxy_https.get()
72-
if AppConfig.DATA.proxy_socks.get() != "":
73-
os.environ["SOCKS_PROXY"] = AppConfig.DATA.proxy_socks.get()
74-
if AppConfig.DATA.dmm_proxy_http.get() != "":
75-
DgpSessionV2.PROXY["http"] = AppConfig.DATA.dmm_proxy_http.get()
76-
if AppConfig.DATA.dmm_proxy_https.get() != "":
77-
DgpSessionV2.PROXY["https"] = AppConfig.DATA.dmm_proxy_https.get()
78-
if AppConfig.DATA.dmm_proxy_socks.get() != "":
79-
DgpSessionV2.PROXY["socks"] = AppConfig.DATA.dmm_proxy_socks.get()
68+
if AppConfig.DATA.proxy_all.get() != "":
69+
os.environ["ALL_PROXY"] = AppConfig.DATA.proxy_all.get()
70+
if AppConfig.DATA.dmm_proxy_all.get() != "":
71+
DgpSessionV2.PROXY["http"] = AppConfig.DATA.dmm_proxy_all.get()
72+
DgpSessionV2.PROXY["https"] = AppConfig.DATA.dmm_proxy_all.get()
8073

8174
ctk.set_default_color_theme(str(AssetsPathConfig.THEMES.joinpath(AppConfig.DATA.theme.get()).with_suffix(".json")))
8275
ctk.set_appearance_mode(AppConfig.DATA.appearance_mode.get())

‎DMMGamePlayerFastLauncher/models/setting_data.py‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,8 @@ class SettingData(VariableBase):
1313
last_version: StringVar = field(default_factory=lambda: StringVar(value="v0.0.0")) # field(default_factory=lambda: StringVar(value=Env.VERSION))
1414
dmm_game_player_program_folder: PathVar = field(default_factory=lambda: PathVar(value=Env.DEFAULT_DMM_GAME_PLAYER_PROGURAM_FOLDER))
1515
dmm_game_player_data_folder: PathVar = field(default_factory=lambda: PathVar(value=Env.DEFAULT_DMM_GAME_PLAYER_DATA_FOLDER))
16-
proxy_http: StringVar = field(default_factory=StringVar)
17-
proxy_https: StringVar = field(default_factory=StringVar)
18-
proxy_socks: StringVar = field(default_factory=StringVar)
19-
dmm_proxy_http: StringVar = field(default_factory=StringVar)
20-
dmm_proxy_https: StringVar = field(default_factory=StringVar)
21-
dmm_proxy_socks: StringVar = field(default_factory=StringVar)
16+
proxy_all: StringVar = field(default_factory=StringVar)
17+
dmm_proxy_all: StringVar = field(default_factory=StringVar)
2218
lang: StringVar = field(default_factory=lambda: StringVar(value=get_default_locale()[0]))
2319
theme: StringVar = field(default_factory=lambda: StringVar(value="blue"))
2420
appearance_mode: StringVar = field(default_factory=lambda: StringVar(value="dark"))

‎DMMGamePlayerFastLauncher/tab/setting.py‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,10 @@ def create(self):
5858
OptionMenuComponent(self, text=i18n.t("app.setting.theme"), values=self.theme, variable=self.data.theme).create()
5959
OptionMenuComponent(self, text=i18n.t("app.setting.appearance"), values=["light", "dark", "system"], variable=self.data.appearance_mode).create()
6060

61-
EntryComponent(self, text=i18n.t("app.setting.proxy_http"), variable=self.data.proxy_http).create()
62-
EntryComponent(self, text=i18n.t("app.setting.proxy_https"), variable=self.data.proxy_https).create()
63-
EntryComponent(self, text=i18n.t("app.setting.proxy_socks"), variable=self.data.proxy_socks).create()
64-
65-
EntryComponent(self, text=i18n.t("app.setting.dmm_proxy_http"), variable=self.data.dmm_proxy_http).create()
66-
EntryComponent(self, text=i18n.t("app.setting.dmm_proxy_https"), variable=self.data.dmm_proxy_https).create()
67-
EntryComponent(self, text=i18n.t("app.setting.dmm_proxy_socks"), variable=self.data.dmm_proxy_socks).create()
61+
text = i18n.t("app.setting.proxy_all")
62+
EntryComponent(self, text=text, tooltip=i18n.t("app.setting.proxy_all_tooltip"), variable=self.data.proxy_all).create()
63+
text = i18n.t("app.setting.dmm_proxy_all")
64+
EntryComponent(self, text=text, tooltip=i18n.t("app.setting.dmm_proxy_all_tooltip"), variable=self.data.dmm_proxy_all).create()
6865

6966
PaddingComponent(self, height=5).create()
7067
CTkLabel(self, text=i18n.t("app.setting.window_scaling")).pack(anchor=ctk.W)

‎assets/i18n/app.en_US.yml‎

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -144,13 +144,21 @@ en_US:
144144
theme: Theme
145145
appearance: Appearance
146146

147-
proxy_http: HTTP Proxy
148-
proxy_https: HTTPS Proxy
149-
proxy_socks: SOCKS Proxy
150-
151-
dmm_proxy_http: DMM HTTP Proxy
152-
dmm_proxy_https: DMM HTTPS Proxy
153-
dmm_proxy_socks: DMM SOCKS Proxy
147+
proxy_all: Proxy
148+
proxy_all_tooltip: |-
149+
Set up the game's proxy.
150+
Example: http://127.0.0.1:80
151+
https://127.0.0.1:443
152+
socks5://127.0.0.1:1080
153+
socks5://user:pass@127.0.0.1:1080
154+
155+
dmm_proxy_all: DMM Proxy
156+
dmm_proxy_all_tooltip: |-
157+
Set up DMM's proxy.
158+
Example: http://127.0.0.1:80
159+
https://127.0.0.1:443
160+
socks5://127.0.0.1:1080
161+
socks5://user:pass@127.0.0.1:1080
154162
155163
window_scaling: Window Scaling
156164
debug_window: Show Debug Window

‎assets/i18n/app.ja_JP.yml‎

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -141,13 +141,21 @@ ja_JP:
141141
theme: テーマ
142142
appearance: 外観
143143

144-
proxy_http: HTTPプロキシ
145-
proxy_https: HTTPSプロキシ
146-
proxy_socks: SOCKSプロキシ
147-
148-
dmm_proxy_http: DMM HTTPプロキシ
149-
dmm_proxy_https: DMM HTTPSプロキシ
150-
dmm_proxy_socks: DMM SOCKSプロキシ
144+
proxy_all: プロキシ
145+
proxy_all_tooltip: |-
146+
ゲームのプロキシを設定します。
147+
例: http://127.0.0.1:80
148+
https://127.0.0.1:443
149+
socks5://127.0.0.1:1080
150+
socks5://user:pass@127.0.0.1:1080
151+
152+
dmm_proxy_all: DMM プロキシ
153+
dmm_proxy_all_tooltip: |-
154+
DMMのプロキシを設定します。
155+
例: http://127.0.0.1:80
156+
https://127.0.0.1:443
157+
socks5://127.0.0.1:1080
158+
socks5://user:pass@127.0.0.1:1080
151159
152160
window_scaling: ウィンドウの拡大率
153161
debug_window: デバッグウィンドウを表示する

‎assets/i18n/app.zh_CN.yml‎

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -143,13 +143,21 @@ zh_CN:
143143
theme: 主题
144144
appearance: 外观
145145

146-
proxy_http: HTTP 代理
147-
proxy_https: HTTPS 代理
148-
proxy_socks: SOCKS 代理
149-
150-
dmm_proxy_http: DMM HTTP 代理
151-
dmm_proxy_https: DMM HTTPS 代理
152-
dmm_proxy_socks: DMM SOCKS 代理
146+
proxy_all: 代理
147+
proxy_all_tooltip: |-
148+
设置游戏的代理。
149+
例子：http://127.0.0.1:80
150+
https://127.0.0.1:443
151+
socks5://127.0.0.1:1080
152+
socks5://user:pass@127.0.0.1:1080
153+
154+
dmm_proxy_all: DMM 代理
155+
dmm_proxy_all_tooltip: |-
156+
设置 DMM 的代理。
157+
例子：http://127.0.0.1:80
158+
https://127.0.0.1:443
159+
socks5://127.0.0.1:1080
160+
socks5://user:pass@127.0.0.1:1080
153161
154162
window_scaling: 窐口缩放比例
155163
debug_window: 显示调试窗口

‎assets/i18n/app.zh_TW.yml‎

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -142,13 +142,21 @@ zh_TW:
142142
theme: 主題
143143
appearance: 外貌
144144

145-
proxy_http: HTTP 代理
146-
proxy_https: HTTPS 代理
147-
proxy_socks: SOCKS 代理
148-
149-
dmm_proxy_http: DMM HTTP 代理
150-
dmm_proxy_https: DMM HTTPS 代理
151-
dmm_proxy_socks: DMM SOCKS 代理
145+
proxy_all: 代理
146+
proxy_all_tooltip: |-
147+
設定遊戲的代理。
148+
例子：http://127.0.0.1:80
149+
https://127.0.0.1:443
150+
socks5://127.0.0.1:1080
151+
socks5://user:pass@127.0.0.1:1080
152+
153+
dmm_proxy_all: DMM 代理
154+
dmm_proxy_all_tooltip: |-
155+
設定 DMM 的代理。
156+
例子：http://127.0.0.1:80
157+
https://127.0.0.1:443
158+
socks5://127.0.0.1:1080
159+
socks5://user:pass@127.0.0.1:1080
152160
153161
window_scaling: 窐口縮放比例
154162
debug_window: 顯示除錯窗口

0 commit comments

Comments
 (0)