From d582b1165bf090d320cec3a2d65ed04a5cc5e32b Mon Sep 17 00:00:00 2001 From: Remy Raes Date: Mon, 10 Jan 2022 00:28:54 +0100 Subject: [feat] Northstar launch button holds 'Install' text when ns is not installed --- src/app/main.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/app/main.js b/src/app/main.js index 1678b86..0c48db1 100644 --- a/src/app/main.js +++ b/src/app/main.js @@ -150,6 +150,9 @@ ipcRenderer.on("version", (event, versions) => { for (let i = 0; i < buttons.length; i++) { buttons[i].disabled = true; } + + // Since Northstar is not installed, we cannot launch it + northstar.innerText = 'Install'; } }); ipcRenderer.send("getversion"); -- cgit v1.2.3 From 1a47d4b47b6a58b4a2b5c5834cf1bcb8c985352c Mon Sep 17 00:00:00 2001 From: Remy Raes Date: Mon, 10 Jan 2022 00:32:55 +0100 Subject: [feat] launch button install Northstar if it's not installed --- src/app/main.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/app/main.js b/src/app/main.js index 0c48db1..1fdaa00 100644 --- a/src/app/main.js +++ b/src/app/main.js @@ -3,6 +3,7 @@ const path = require("path"); const { ipcRenderer } = require("electron"); const lang = require("../lang"); +let shouldInstallNorthstar = false; var settings = { gamepath: "", @@ -43,7 +44,14 @@ function setpath(value = false) { ipcRenderer.send("setpath", value); } -function launch() {ipcRenderer.send("launch")} +function launch() { + if (shouldInstallNorthstar) { + update(); + shouldInstallNorthstar = false; + } else { + ipcRenderer.send("launch"); + } +} function launchVanilla() {ipcRenderer.send("launchVanilla")} function log(msg) { @@ -153,6 +161,7 @@ ipcRenderer.on("version", (event, versions) => { // Since Northstar is not installed, we cannot launch it northstar.innerText = 'Install'; + shouldInstallNorthstar = true; } }); ipcRenderer.send("getversion"); -- cgit v1.2.3 From 06a57cce8195e7091e4fa22e2068afefb8dff19c Mon Sep 17 00:00:00 2001 From: Remy Raes Date: Mon, 10 Jan 2022 00:40:46 +0100 Subject: [feat] 'Play NS button' text is restored after successfull install --- src/app/main.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/app/main.js b/src/app/main.js index 1fdaa00..86722b4 100644 --- a/src/app/main.js +++ b/src/app/main.js @@ -118,7 +118,10 @@ function installmod() { ipcRenderer.send("installmod") } -ipcRenderer.on("ns-updated", () => {setButtons(true)}) +ipcRenderer.on("ns-updated", () => { + setButtons(true); + northstar.innerText = lang('gui.launchnorthstar'); +}) ipcRenderer.on("ns-updating", () => {setButtons(false)}) ipcRenderer.on("newpath", (event, newpath) => { -- cgit v1.2.3 From 7ffe08c2bf76edd66f7d3099fb212831a0567f31 Mon Sep 17 00:00:00 2001 From: Remy Raes Date: Mon, 10 Jan 2022 00:45:32 +0100 Subject: [feat] translating 'install' option --- src/app/main.js | 2 +- src/lang/en.json | 1 + src/lang/fr.json | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/app/main.js b/src/app/main.js index 86722b4..3879ac5 100644 --- a/src/app/main.js +++ b/src/app/main.js @@ -163,7 +163,7 @@ ipcRenderer.on("version", (event, versions) => { } // Since Northstar is not installed, we cannot launch it - northstar.innerText = 'Install'; + northstar.innerText = lang('gui.installnorthstar'); shouldInstallNorthstar = true; } }); ipcRenderer.send("getversion"); diff --git a/src/lang/en.json b/src/lang/en.json index 61a8545..68d46c7 100644 --- a/src/lang/en.json +++ b/src/lang/en.json @@ -61,6 +61,7 @@ "gui.launch": "Launch", "gui.launchvanilla": "Vanilla", "gui.launchnorthstar": "Northstar", + "gui.installnorthstar": "Install", "gui.selectpath": "Please select the path!", "gui.gamepath.must": "The game path must be set to start Viper.", diff --git a/src/lang/fr.json b/src/lang/fr.json index 58302e9..22afa9a 100644 --- a/src/lang/fr.json +++ b/src/lang/fr.json @@ -61,6 +61,7 @@ "gui.launch": "Jouer", "gui.launchvanilla": "Vanilla", "gui.launchnorthstar": "Northstar", + "gui.installnorthstar": "Installer", "gui.selectpath": "Veuillez sélectionner le dossier où se trouve le client Titanfall 2.", "gui.gamepath.must": "Vous devez sélectionner le chemin du dossier du jeu Titanfall 2 pour pouvoir lancer Viper.", -- cgit v1.2.3 From 99737d8461108b20b902faa0d6bcfb4b43d44f29 Mon Sep 17 00:00:00 2001 From: Remy Raes Date: Mon, 10 Jan 2022 16:45:14 +0100 Subject: [fix] updating correct buttons --- src/app/index.html | 2 +- src/app/main.css | 2 +- src/app/main.js | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/app/index.html b/src/app/index.html index 88d5a17..d9db79b 100644 --- a/src/app/index.html +++ b/src/app/index.html @@ -15,7 +15,7 @@
- +
diff --git a/src/app/main.css b/src/app/main.css index 56f17b2..69b10ad 100644 --- a/src/app/main.css +++ b/src/app/main.css @@ -110,7 +110,7 @@ button:active { #setpath {background: #5E81AC} #vanilla, #exit {background: #656E7F} -#update, #installmod {background: var(--blue)} +#updateBtn, #installmod {background: var(--blue)} #togglemod, #toggleall {background: var(--yellow)} #northstar, #removeall, #removemod {background: var(--red)} button:disabled {background: var(--disabled) !important; opacity: 0.5} diff --git a/src/app/main.js b/src/app/main.js index 3879ac5..9c6619d 100644 --- a/src/app/main.js +++ b/src/app/main.js @@ -120,7 +120,8 @@ function installmod() { ipcRenderer.on("ns-updated", () => { setButtons(true); - northstar.innerText = lang('gui.launchnorthstar'); + updateBtn.innerText = lang('gui.update'); + northstar.removeAttribute('disabled'); }) ipcRenderer.on("ns-updating", () => {setButtons(false)}) @@ -163,7 +164,8 @@ ipcRenderer.on("version", (event, versions) => { } // Since Northstar is not installed, we cannot launch it - northstar.innerText = lang('gui.installnorthstar'); + updateBtn.innerText = lang('gui.installnorthstar'); + northstar.setAttribute('disabled', ''); shouldInstallNorthstar = true; } }); ipcRenderer.send("getversion"); -- cgit v1.2.3 From 0ceea0f8699d02054ba86c8171ad834a8cdf4747 Mon Sep 17 00:00:00 2001 From: 0neGal Date: Mon, 10 Jan 2022 16:58:33 +0100 Subject: .disabled instead of .[remove/set]Attribute() Doing .disabled = true is the same as .setAttribute("disabled", ""), same with .disabled = false, being the same as .removeAttribute("disabled") --- src/app/main.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/main.js b/src/app/main.js index 9c6619d..c365cf4 100644 --- a/src/app/main.js +++ b/src/app/main.js @@ -120,8 +120,8 @@ function installmod() { ipcRenderer.on("ns-updated", () => { setButtons(true); - updateBtn.innerText = lang('gui.update'); - northstar.removeAttribute('disabled'); + northstar.disabled = false; + updateBtn.innerText = lang("gui.update"); }) ipcRenderer.on("ns-updating", () => {setButtons(false)}) @@ -164,9 +164,9 @@ ipcRenderer.on("version", (event, versions) => { } // Since Northstar is not installed, we cannot launch it - updateBtn.innerText = lang('gui.installnorthstar'); - northstar.setAttribute('disabled', ''); + northstar.disabled = true; shouldInstallNorthstar = true; + updateBtn.innerText = lang("gui.installnorthstar"); } }); ipcRenderer.send("getversion"); -- cgit v1.2.3