aboutsummaryrefslogtreecommitdiff
path: root/src/app
diff options
context:
space:
mode:
author0neGal <mail@0negal.com>2021-12-31 15:34:56 +0100
committer0neGal <mail@0negal.com>2021-12-31 15:34:56 +0100
commit3c948969bbd203d3e4ab4bd05ce25b4c6277094d (patch)
tree99878dddd355f262f005e17759bbf048a08d2ed3 /src/app
parentc8fec42e085ef255a01f62c5010e2d41bb7eb05f (diff)
parentaddc349189f582a1d8a833ba554f7b8df9205dd4 (diff)
downloadViper-3c948969bbd203d3e4ab4bd05ce25b4c6277094d.tar.gz
Viper-3c948969bbd203d3e4ab4bd05ce25b4c6277094d.zip
Merge branch 'feat/version-indicator' of https://github.com/Alystrasz/viper into Alystrasz-feat/version-indicator
Diffstat (limited to 'src/app')
-rw-r--r--src/app/index.html8
-rw-r--r--src/app/main.css9
-rw-r--r--src/app/main.js7
3 files changed, 21 insertions, 3 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..dfa5633 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;
@@ -72,4 +79,4 @@ button:active {
#setpath {background: #5E81AC}
#northstar {background: #C7777F}
#vanilla, #exit {background: #656E7F}
-button:disabled {background: var(--disabled) !important; opacity: 0.5}
+button:disabled {background: var(--disabled) !important; opacity: 0.5} \ No newline at end of file
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);