diff options
author | 0neGal <mail@0negal.com> | 2021-12-31 15:40:32 +0100 |
---|---|---|
committer | 0neGal <mail@0negal.com> | 2021-12-31 15:40:32 +0100 |
commit | 4f798d07731668f0e850b7d348de74bf6f422de0 (patch) | |
tree | 8e530838e0bf8826f48dd570d17ca917c22e622e /src/app | |
parent | c8fec42e085ef255a01f62c5010e2d41bb7eb05f (diff) | |
parent | 10c786da5be323c0b2e7042e79bcee8849e25ef4 (diff) | |
download | Viper-4f798d07731668f0e850b7d348de74bf6f422de0.tar.gz Viper-4f798d07731668f0e850b7d348de74bf6f422de0.zip |
Merge branch 'Alystrasz-feat/version-indicator'
Diffstat (limited to 'src/app')
-rw-r--r-- | src/app/index.html | 8 | ||||
-rw-r--r-- | src/app/main.css | 9 | ||||
-rw-r--r-- | src/app/main.js | 7 |
3 files changed, 22 insertions, 2 deletions
diff --git a/src/app/index.html b/src/app/index.html index dc65d67..f5d92e0 100644 --- a/src/app/index.html +++ b/src/app/index.html @@ -6,7 +6,13 @@ <body> <div class="lines"> <div class="line"> - <div class="text" id="welcome">%%gui.welcome%%</div> + <div class="text"> + <div class="text" id="welcome">%%gui.welcome%%</div> + <div class="versions"> + <div id="vpversion"></div> + <div id="nsversion"></div> + </div> + </div> <div class="buttons"> <button id="exit" onclick="exit()">%%gui.exit%%</button> <button id="update" onclick="update()">%%gui.update%%</button> diff --git a/src/app/main.css b/src/app/main.css index 377e1f8..c2ca627 100644 --- a/src/app/main.css +++ b/src/app/main.css @@ -2,6 +2,7 @@ --disabled: #656E7F; --background: #4C515B; --foreground: #DDE2EB; + --subforeground: #AFAFAF; --btnforeground: var(--foreground); } @@ -31,6 +32,12 @@ body, button, input { nobr {white-space: nowrap} +.versions { + height: 15px; + font-size: 12px; + color: var(--subforeground); +} + .line { display: flex; margin-top: 15px; @@ -55,6 +62,8 @@ button, .text { transition: 0.2s ease-in-out; } +#welcome {padding: 0px} + button { margin-bottom: 10px; color: var(--btnforeground); diff --git a/src/app/main.js b/src/app/main.js index 809b5c8..a33ef72 100644 --- a/src/app/main.js +++ b/src/app/main.js @@ -53,7 +53,12 @@ ipcRenderer.on("newpath", (event, newpath) => { ipcRenderer.on("log", (event, msg) => {log(msg)}) +ipcRenderer.on("version", (event, versions) => { + vpversion.innerText = lang("gui.versions.viper") + ": " + versions.vp; + nsversion.innerText = lang("gui.versions.northstar") + ": " + versions.ns; +}); ipcRenderer.send("getversion"); + setlang(); setInterval(() => { ipcRenderer.send("setsize", document.querySelector(".lines").offsetHeight + 20); -}, 150) +}, 150); |