%%gui.welcome%%

Viper version: x.x.x

Northstar version: x.x.x

diff --git a/src/app/main.css b/src/app/main.css index 854c47a..f3cd7c5 100644 --- a/src/app/main.css +++ b/src/app/main.css @@ -61,3 +61,9 @@ button:active { #setpath {background: #5E81AC} #northstar {background: #C7777F} #vanilla, #exit {background: #656E7F} + +.versions { + height: 15px; + font-size: 12px; + color: #afafaf; +} \ No newline at end of file diff --git a/src/index.js b/src/index.js index fead15b..3520914 100644 --- a/src/index.js +++ b/src/index.js @@ -11,7 +11,7 @@ const cli = require("./cli"); function start() { win = new BrowserWindow({ width: 600, - height: 115, + height: 130, show: false, title: "Viper", resizable: false, -- cgit v1.2.3 From 474f2ae54000463a0a2dfc84ad678a7620cc3d44 Mon Sep 17 00:00:00 2001 From: 0neGal Date: Wed, 29 Dec 2021 22:59:47 +0100 Subject: proper responsiveness for all languages This should more or less ensure everything remains responsive even if the language is one with very long strings. --- src/app/index.html | 2 +- src/app/lang.js | 16 +++++++++------- src/app/main.css | 5 +++++ src/app/main.js | 5 +++++ src/index.js | 12 +++++++++--- 5 files changed, 29 insertions(+), 11 deletions(-) (limited to 'src/app') diff --git a/src/app/index.html b/src/app/index.html index 1c34360..426b4c5 100644 --- a/src/app/index.html +++ b/src/app/index.html @@ -22,7 +22,7 @@

- + diff --git a/src/app/lang.js b/src/app/lang.js index 8cf3d4b..5cc9708 100644 --- a/src/app/lang.js +++ b/src/app/lang.js @@ -1,10 +1,12 @@ -html = document.body.innerHTML.split("%%"); +function setlang() { + html = document.body.innerHTML.split("%%"); -for (let i = 0; i < html.length; i++) { - if (html[i][0] != " " && - html[i][html[i].length - 1] != " ") { - html[i] = lang(html[i]) + for (let i = 0; i < html.length; i++) { + if (html[i][0] != " " && + html[i][html[i].length - 1] != " ") { + html[i] = lang(html[i]) + } } -} -document.body.innerHTML = html.join(""); + document.body.innerHTML = html.join(""); +} diff --git a/src/app/main.css b/src/app/main.css index 854c47a..c9c62fb 100644 --- a/src/app/main.css +++ b/src/app/main.css @@ -34,10 +34,14 @@ body, button, input { } .buttons { + text-align: right; margin-left: auto; margin-right: 7px; } +.text {max-width: 38vw} +.buttons {max-width: 55vw} + button, .text { border: none; outline: none; @@ -47,6 +51,7 @@ button, .text { } button { + margin-bottom: 10px; color: var(--btnforeground); -webkit-app-region: no-drag; } diff --git a/src/app/main.js b/src/app/main.js index 579f785..0118b0c 100644 --- a/src/app/main.js +++ b/src/app/main.js @@ -34,3 +34,8 @@ function launchVanilla() {ipcRenderer.send("launchVanilla")} ipcRenderer.on("newpath", (event, newpath) => { settings.gamepath = newpath; }) + +setlang(); +setInterval(() => { + ipcRenderer.send("setsize", document.querySelector(".lines").offsetHeight + 25); +}, 150) diff --git a/src/index.js b/src/index.js index fead15b..74f776c 100644 --- a/src/index.js +++ b/src/index.js @@ -9,9 +9,10 @@ const utils = require("./utils"); const cli = require("./cli"); function start() { + let width = 115; win = new BrowserWindow({ width: 600, - height: 115, + height: width, show: false, title: "Viper", resizable: false, @@ -26,10 +27,15 @@ function start() { win.removeMenu(); win.loadFile(__dirname + "/app/index.html"); - win.webContents.once("dom-ready", () => {win.show()}); - ipcMain.on("setpath", (event) => {utils.setpath(win)}) ipcMain.on("exit", (event) => {process.exit(0)}) + ipcMain.on("setpath", (event) => {utils.setpath(win)}) + ipcMain.on("setsize", (event, height) => { + win.setSize(width, height); + if (! win.isVisible()) { + win.show(); + } + }) } ipcMain.on("launch", (event) => {utils.launch()}) -- cgit v1.2.3 From ebe304c7894ffb19b1f6d5db3fb77961101412ff Mon Sep 17 00:00:00 2001 From: 0neGal Date: Wed, 29 Dec 2021 23:06:32 +0100 Subject: make sure doesn't get deprecated --- src/app/main.css | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/app') diff --git a/src/app/main.css b/src/app/main.css index c9c62fb..f49cc98 100644 --- a/src/app/main.css +++ b/src/app/main.css @@ -28,6 +28,8 @@ body, button, input { font-family: "Roboto Mono", monospace; } +nobr {white-space: nowrap} + .line { display: flex; margin-top: 15px; -- cgit v1.2.3 From c4f2a15a05ed8821009f88be8a93d71ed1da3d81 Mon Sep 17 00:00:00 2001 From: 0neGal Date: Wed, 29 Dec 2021 23:45:03 +0100 Subject: fix incorrect padding --- src/app/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/app') diff --git a/src/app/main.js b/src/app/main.js index 0118b0c..9bafaa5 100644 --- a/src/app/main.js +++ b/src/app/main.js @@ -37,5 +37,5 @@ ipcRenderer.on("newpath", (event, newpath) => { setlang(); setInterval(() => { - ipcRenderer.send("setsize", document.querySelector(".lines").offsetHeight + 25); + ipcRenderer.send("setsize", document.querySelector(".lines").offsetHeight + 20); }, 150) -- cgit v1.2.3 From d402e6236b6d0523a1dfce0c9203f1cbeb907e4f Mon Sep 17 00:00:00 2001 From: Alystrasz Date: Thu, 30 Dec 2021 00:03:53 +0100 Subject: [feat] adding div ids to version indicators --- src/app/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/app') diff --git a/src/app/index.html b/src/app/index.html index a73422f..c486f28 100644 --- a/src/app/index.html +++ b/src/app/index.html @@ -9,8 +9,8 @@

%%gui.welcome%%

Viper version: x.x.x

Northstar version: x.x.x

Viper version: x.x.x

Northstar version: x.x.x

-- cgit v1.2.3 From 93482ac6169a62854e360fde92abf7640389361b Mon Sep 17 00:00:00 2001 From: Alystrasz Date: Thu, 30 Dec 2021 00:04:55 +0100 Subject: [feat] displaying installed northstar version --- src/app/main.js | 5 +++++ src/index.js | 10 ++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) (limited to 'src/app') diff --git a/src/app/main.js b/src/app/main.js index 579f785..684cb5a 100644 --- a/src/app/main.js +++ b/src/app/main.js @@ -34,3 +34,8 @@ function launchVanilla() {ipcRenderer.send("launchVanilla")} ipcRenderer.on("newpath", (event, newpath) => { settings.gamepath = newpath; }) + +ipcRenderer.on('versionInfo', (_, payload) => { + document.getElementById('nsVersion').innerText = `Northstar version: ${payload.ns}` +}); +ipcRenderer.send('getVersionInfo'); diff --git a/src/index.js b/src/index.js index 3520914..c20e8e0 100644 --- a/src/index.js +++ b/src/index.js @@ -1,6 +1,6 @@ const fs = require("fs"); const path = require("path"); -const { app, dialog, ipcMain, BrowserWindow } = require("electron"); +const { app, dialog, ipcMain, BrowserWindow, ipcRenderer } = require("electron"); const Emitter = require("events"); const events = new Emitter(); @@ -37,7 +37,13 @@ ipcMain.on("setlang", (event, lang) => {utils.setlang(lang)}) ipcMain.on("launchVanilla", (event) => {utils.launch("vanilla")}) ipcMain.on("update", (event) => {utils.update()}) -ipcMain.on("setpathcli", (event) => {utils.setpath()}) +ipcMain.on("setpathcli", (event) => {utils.setpath()}); + +ipcMain.on('getVersionInfo', () => { + win.webContents.send('versionInfo', { + ns: utils.getInstalledVersion() + }); +}); process.chdir(app.getPath("appData")); -- cgit v1.2.3 From 9df37da13c5eeba92ceeed7a5e9ffbaed976a615 Mon Sep 17 00:00:00 2001 From: Alystrasz Date: Thu, 30 Dec 2021 00:12:05 +0100 Subject: [feat] displaying viper version --- src/app/main.js | 3 ++- src/index.js | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'src/app') diff --git a/src/app/main.js b/src/app/main.js index 684cb5a..a059671 100644 --- a/src/app/main.js +++ b/src/app/main.js @@ -36,6 +36,7 @@ ipcRenderer.on("newpath", (event, newpath) => { }) ipcRenderer.on('versionInfo', (_, payload) => { - document.getElementById('nsVersion').innerText = `Northstar version: ${payload.ns}` + document.getElementById('vpVersion').innerText = `Viper version: ${payload.vp}`; + document.getElementById('nsVersion').innerText = `Northstar version: ${payload.ns}`; }); ipcRenderer.send('getVersionInfo'); diff --git a/src/index.js b/src/index.js index c20e8e0..56b0df4 100644 --- a/src/index.js +++ b/src/index.js @@ -41,7 +41,8 @@ ipcMain.on("setpathcli", (event) => {utils.setpath()}); ipcMain.on('getVersionInfo', () => { win.webContents.send('versionInfo', { - ns: utils.getInstalledVersion() + ns: utils.getInstalledVersion(), + vp: 'v' + require('../package.json').version }); }); -- cgit v1.2.3 From 74cb566e5ea97f62121fbd7b2cc170b94d36f0bb Mon Sep 17 00:00:00 2001 From: Alystrasz Date: Thu, 30 Dec 2021 00:24:57 +0100 Subject: [fix] displaying welcome message on one line --- src/app/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/app') diff --git a/src/app/index.html b/src/app/index.html index 3eadd96..6e31f0c 100644 --- a/src/app/index.html +++ b/src/app/index.html @@ -7,7 +7,7 @@

%%gui.welcome%%

Viper version: x.x.x

Northstar version: x.x.x

-- cgit v1.2.3