Skip to content

Commit 19ad579

Browse files
Z-SiqiZ-Siqi
committed
Bug fixes
* Fixed tray language cannot switch. * Downgrade electron version to 34.0.0 #258
1 parent 6904ad6 commit 19ad579

File tree

2 files changed

+126
-24
lines changed

2 files changed

+126
-24
lines changed

‎app/build.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ if (-not (Test-Path $outputDir)) {
8787
Write-Host 'Starting electron-packager...'
8888
& npx electron-packager `
8989
"`"$mainDir`"" "Clash for Windows" `
90-
--platform=win32 --arch=x64 --electron-version=36.2.1 `
90+
--platform=win32 --arch=x64 --electron-version=34.0.0 `
9191
--icon="`"$logoFile`"" --out="`"$outputDir`""
9292
if ($LASTEXITCODE -ne 0) {
9393
Write-Error 'electron-packager 执行失败'

‎app/main/dist/electron/main.js‎

Lines changed: 125 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1288,13 +1288,13 @@ function language(v, en, cn) {
12881288
}
12891289
}
12901290
});
1291-
var O = host.Menu.buildFromTemplate([{
1292-
label: language(state.language, "Dashboard", "仪表盘"),
1291+
var O_CN = host.Menu.buildFromTemplate([{
1292+
label: "仪表盘",
12931293
click: Launch
12941294
}, {
12951295
type: "separator"
12961296
}, {
1297-
label: language(state.language, "TUN Mode", "TUN 模式"),
1297+
label: "TUN 模式",
12981298
type: "checkbox",
12991299
id: "tun",
13001300
enabled: !1,
@@ -1303,7 +1303,7 @@ function language(v, en, cn) {
13031303
g.webContents.send("tun-changed", t)
13041304
}
13051305
}, {
1306-
label: language(state.language, "Mixin", "混合配置"),
1306+
label: "混合配置",
13071307
type: "checkbox",
13081308
id: "mixin",
13091309
enabled: !1,
@@ -1314,19 +1314,19 @@ function language(v, en, cn) {
13141314
}, {
13151315
type: "separator"
13161316
}, {
1317-
label: language(state.language, "Proxy Mode", "代理模式"),
1317+
label: "代理模式",
13181318
id: "mode",
13191319
enabled: !1
13201320
}, {
1321-
label: language(state.language, "Global", "全局"),
1321+
label: "全局",
13221322
type: "radio",
13231323
id: "mode-global",
13241324
enabled: !1,
13251325
click: function() {
13261326
return g.webContents.send("mode-changed", "global")
13271327
}
13281328
}, {
1329-
label: language(state.language, "Rule", "规则"),
1329+
label: "规则",
13301330
type: "radio",
13311331
id: "mode-rule",
13321332
enabled: state.isReady,
@@ -1335,15 +1335,15 @@ function language(v, en, cn) {
13351335
return g.webContents.send("mode-changed", "rule")
13361336
}
13371337
}, {
1338-
label: language(state.language, "Direct", "直连"),
1338+
label: "直连",
13391339
type: "radio",
13401340
id: "mode-direct",
13411341
enabled: !1,
13421342
click: function() {
13431343
return g.webContents.send("mode-changed", "direct")
13441344
}
13451345
}, {
1346-
label: language(state.language, "Script", "脚本"),
1346+
label: "脚本",
13471347
type: "radio",
13481348
id: "mode-script",
13491349
enabled: !1,
@@ -1353,55 +1353,157 @@ function language(v, en, cn) {
13531353
}, {
13541354
type: "separator"
13551355
}, {
1356-
label: language(state.language, "More", "更多"),
1356+
label: "更多",
13571357
submenu: [{
1358-
label: language(state.language, "Toggle DevTools", "切换Dev工具"),
1358+
label: "切换Dev工具",
13591359
click: function() {
13601360
g.webContents.toggleDevTools()
13611361
}
13621362
}, {
1363-
label: language(state.language, "Move Dashboard To Nearest Monitor", "将仪表板移至最近的显示器"),
1363+
label: "将仪表板移至最近的显示器",
13641364
click: function() {
13651365
g.setBounds(B(g.getBounds())), Launch()
13661366
}
13671367
}, {
1368-
label: language(state.language, "Restart", "重启"),
1368+
label: "重启",
13691369
click: function() {
13701370
if (g.isMaximized) {
13711371
g.unmaximize();
13721372
}
13731373
host.app.relaunch(), host.app.exit(0)
13741374
}
13751375
}, {
1376-
label: language(state.language, "Force Quit", "强制退出"),
1376+
label: "强制退出",
13771377
click: function() {
13781378
host.app.isQuiting = !0, host.app.quit()
13791379
}
13801380
}]
13811381
}, {
13821382
type: "separator"
13831383
}, {
1384-
label: language(state.language, "Quit", "退出"),
1384+
label: "退出",
13851385
click: function() {
13861386
if (g.isMaximized) {
13871387
g.unmaximize();
13881388
}
13891389
return g.webContents.send("app-exit")
13901390
}
1391+
}]);
1392+
1393+
var O_EN = host.Menu.buildFromTemplate([{
1394+
label: "Dashboard",
1395+
click: Launch
1396+
}, {
1397+
type: "separator"
1398+
}, {
1399+
label: "TUN Mode",
1400+
type: "checkbox",
1401+
id: "tun",
1402+
enabled: !1,
1403+
click: function (e) {
1404+
var t = e.checked;
1405+
g.webContents.send("tun-changed", t)
1406+
}
1407+
}, {
1408+
label: "Mixin",
1409+
type: "checkbox",
1410+
id: "mixin",
1411+
enabled: !1,
1412+
click: function (e) {
1413+
var t = e.checked;
1414+
g.webContents.send("mixin-changed", t)
1415+
}
1416+
}, {
1417+
type: "separator"
1418+
}, {
1419+
label: "Proxy Mode",
1420+
id: "mode",
1421+
enabled: !1
1422+
}, {
1423+
label: "Global",
1424+
type: "radio",
1425+
id: "mode-global",
1426+
enabled: !1,
1427+
click: function () {
1428+
return g.webContents.send("mode-changed", "global")
1429+
}
1430+
}, {
1431+
label: "Rule",
1432+
type: "radio",
1433+
id: "mode-rule",
1434+
enabled: state.isReady,
1435+
checked: "rule" === state.menuMode,
1436+
click: function () {
1437+
return g.webContents.send("mode-changed", "rule")
1438+
}
1439+
}, {
1440+
label: "Direct",
1441+
type: "radio",
1442+
id: "mode-direct",
1443+
enabled: !1,
1444+
click: function () {
1445+
return g.webContents.send("mode-changed", "direct")
1446+
}
1447+
}, {
1448+
label: "Script",
1449+
type: "radio",
1450+
id: "mode-script",
1451+
enabled: !1,
1452+
click: function () {
1453+
return g.webContents.send("mode-changed", "script")
1454+
}
1455+
}, {
1456+
type: "separator"
1457+
}, {
1458+
label: "More",
1459+
submenu: [{
1460+
label: "Toggle DevTools",
1461+
click: function () {
1462+
g.webContents.toggleDevTools()
1463+
}
1464+
}, {
1465+
label: "Move Dashboard To Nearest Monitor",
1466+
click: function () {
1467+
g.setBounds(B(g.getBounds())), Launch()
1468+
}
1469+
}, {
1470+
label: "Restart",
1471+
click: function () {
1472+
if (g.isMaximized) {
1473+
g.unmaximize();
1474+
}
1475+
host.app.relaunch(), host.app.exit(0)
1476+
}
1477+
}, {
1478+
label: "Force Quit",
1479+
click: function () {
1480+
host.app.isQuiting = !0, host.app.quit()
1481+
}
1482+
}]
1483+
}, {
1484+
type: "separator"
1485+
}, {
1486+
label: "Quit",
1487+
click: function () {
1488+
if (g.isMaximized) {
1489+
g.unmaximize();
1490+
}
1491+
return g.webContents.send("app-exit")
1492+
}
13911493
}]);
13921494

13931495
function D() {
1394-
j() && toolBar && toolBar.setContextMenu(O)
1496+
j() && toolBar && toolBar.setContextMenu(language(state.language, O_EN, O_CN))
13951497
}
13961498
D(), host.ipcMain.on("clash-core-status-change", (function(e, t) {
13971499
if (state.isReady = !0, j()) {
1398-
var n = O.getMenuItemById("system-proxy");
1500+
var n = language(state.language, O_EN, O_CN).getMenuItemById("system-proxy");
13991501
n && (n.enabled = 1 !== t);
1400-
var r = O.getMenuItemById("mixin");
1502+
var r = language(state.language, O_EN, O_CN).getMenuItemById("mixin");
14011503
r && (r.enabled = 1 !== t);
1402-
var o = O.getMenuItemById("tun");
1504+
var o = language(state.language, O_EN, O_CN).getMenuItemById("tun");
14031505
o && (o.enabled = 1 !== t), ["global", "rule", "direct", "script"].forEach((function(e) {
1404-
var n = O.getMenuItemById("mode-".concat(e));
1506+
var n = language(state.language, O_EN, O_CN).getMenuItemById("mode-".concat(e));
14051507
n && (n.enabled = 1 !== t)
14061508
})), D()
14071509
}
@@ -1418,7 +1520,7 @@ function language(v, en, cn) {
14181520
})), host.ipcMain.on("mode-changed", (function(e, t) {
14191521
if (state.menuMode = t, j()) {
14201522
var n = "mode-".concat(t),
1421-
r = O.getMenuItemById(n);
1523+
r = language(state.language, O_EN, O_CN).getMenuItemById(n);
14221524
r && (r.checked = !0), D()
14231525
}
14241526
})), host.ipcMain.handle("cfw-language", (function (e, t) {
@@ -1427,12 +1529,12 @@ function language(v, en, cn) {
14271529
state.systemProxyChecked = t
14281530
})), host.ipcMain.on("mixin-changed", (function(e, t) {
14291531
if (state.mixinChecked = t, j()) {
1430-
var n = O.getMenuItemById("mixin");
1532+
var n = language(state.language, O_EN, O_CN).getMenuItemById("mixin");
14311533
n && (n.checked = t), D()
14321534
}
14331535
})), host.ipcMain.on("tun-changed", (function(e, t) {
14341536
if (state.tunModeChecked = t, j()) {
1435-
var n = O.getMenuItemById("tun");
1537+
var n = language(state.language, O_EN, O_CN).getMenuItemById("tun");
14361538
n && (n.checked = t), D()
14371539
}
14381540
})), host.ipcMain.on("enhanced-tray-click", Launch), host.ipcMain.on("speed-update", (function(e, t, n) {

0 commit comments

Comments
 (0)