okseby/orchard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

re-did version string in about using vue, fixed window not launching on yarn start under win10

Browse source
This commit is contained in:
booploops 2022-02-11 01:37:42 -08:00
parent f20e59d52e
commit 5f1326be80
5 changed files with 6 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/i18n/en_US.jsonc
View file

@ -146,7 +146,7 @@
"term.recordLabels": "Record Labels", "term.recordLabels": "Record Labels",
"term.videoExtras": "Video Extras", "term.videoExtras": "Video Extras",
"term.top": "Top", "term.top": "Top",
"term.version": "Version",
// Home // Home
"home.title": "Home", "home.title": "Home",
"home.recentlyPlayed": "Recently Played", "home.recentlyPlayed": "Recently Played",

3
src/main/base/browserwindow.ts
View file

@ -602,8 +602,7 @@ export class BrowserWindow {
}) })
ipcMain.on('get-version', (_event) => { ipcMain.on('get-version', (_event) => {
app.getVersion() _event.returnValue = app.getVersion()
BrowserWindow.win.webContents.send('version', app.getVersion());
}); });
/* ********************************************************************************************* /* *********************************************************************************************

4
src/main/index.ts
View file

@ -47,11 +47,11 @@ app.on('ready', () => {
const win = await bw.createWindow() const win = await bw.createWindow()
console.log('[Cider][Widevine] Status:', components.status()); console.log('[Cider][Widevine] Status:', components.status());
win.show();
win.on("ready-to-show", () => { win.on("ready-to-show", () => {
Cider.bwCreated(); Cider.bwCreated();
CiderPlug.callPlugins('onReady', win); CiderPlug.callPlugins('onReady', win);
win.show();
}); });
}); });

7
src/renderer/index.js
View file

@ -54,6 +54,7 @@ const app = new Vue({
el: "#app", el: "#app",
store: store, store: store,
data: { data: {
version: ipcRenderer.sendSync("get-version"),
appMode: "player", appMode: "player",
ipcRenderer: ipcRenderer, ipcRenderer: ipcRenderer,
cfg: ipcRenderer.sendSync("getStore"), cfg: ipcRenderer.sendSync("getStore"),
@ -3652,12 +3653,6 @@ const app = new Vue({
if (sellang.startsWith("en") && this.mk.storefrontId != "en-us") sellang = "en-gb" if (sellang.startsWith("en") && this.mk.storefrontId != "en-us") sellang = "en-gb"
return await sellang return await sellang
} }
},
getVersion() {
ipcRenderer.send('get-version')
ipcRenderer.on('version', (event, version) => {
document.getElementById('version').innerHTML = `Version ${version}`
})
} }
} }
}) })

2
src/renderer/views/pages/about.ejs
View file

@ -3,7 +3,7 @@
<div class="row"> <div class="row">
<div class="col"> <div class="col">
<img src="assets/banner.png" alt="Cider Logo" style="display:block;margin:0 auto;width: 500px;"> <img src="assets/banner.png" alt="Cider Logo" style="display:block;margin:0 auto;width: 500px;">
<p style="text-align: center" id="version">Version Unkown</p> <p style="text-align: center" id="version">{{ $root.getLz("term.version") }} {{ $root.version }}</p>
<p style="text-align: center"> {{$root.getLz('about.thanks')}} </p> <p style="text-align: center"> {{$root.getLz('about.thanks')}} </p>
<p style="text-align: center">"{{$root.getLz('term.appleMusic')}}" - {{$root.getLz('term.copyright')}} © 2022 <a href="https://www.apple.com/" class="dt-footer__link" <p style="text-align: center">"{{$root.getLz('term.appleMusic')}}" - {{$root.getLz('term.copyright')}} © 2022 <a href="https://www.apple.com/" class="dt-footer__link"