diff --git a/src/background.ts b/src/background.ts index 3f3028c3..bf046d36 100644 --- a/src/background.ts +++ b/src/background.ts @@ -14,7 +14,7 @@ import Application from './main/Application' import ApplicationMenu from "./main/ApplicationMenu"; export type PackageJson = typeof import('../package.json'); -import { author, homepage } from '../package.json' +import { author, contributors, homepage } from '../package.json' import TheDeskInfo from '../info.json' export type TheDeskInfoObject = typeof TheDeskInfo; @@ -22,6 +22,7 @@ ipcMain.on('thedesk-info', (event: Event) => { event.returnValue = Object.assign({ productName: app.getName(), author: author, + contributors: contributors, homePage: homepage, versions: Object.assign(pick(process.versions, ["chrome", "electron", "node"]), { internal: app.getVersion() }), }, TheDeskInfo) diff --git a/src/main/Window.ts b/src/main/Window.ts index 385e95a3..1a280c02 100644 --- a/src/main/Window.ts +++ b/src/main/Window.ts @@ -51,8 +51,8 @@ export default class Window { windowName: 'about', loadPath: 'about.html', windowOptions: { - width: 296, - height: 432, + width: 312, + height: 496, resizable: false, minimizable: false, maximizable: false, diff --git a/src/views/About.vue b/src/views/About.vue index cf994b50..45ec6cbf 100644 --- a/src/views/About.vue +++ b/src/views/About.vue @@ -22,6 +22,21 @@ {{ author.name }}

+

+ + Thanks +
+ +
and all users + ❤️ +
+

@@ -40,6 +55,7 @@ interface Maintainer { interface TheDeskInfo { productName: string author: Maintainer + contributors: [Maintainer] homePage: string copyrightYear: string codeName: string @@ -50,15 +66,23 @@ interface TheDeskInfo { export default class About extends Vue { public productName: string public author: Maintainer + public contributors: [Maintainer] public homePage: string public copyrightYear: string public versions: Versions + public get ctrHtml(): string { + return this.contributors.map(contributer => { + return `${contributer.name}` + }).join(", ") + } + constructor() { super() const thedeskInfo: TheDeskInfo = ipcRenderer.sendSync('thedesk-info') this.productName = thedeskInfo.productName this.author = thedeskInfo.author + this.contributors = thedeskInfo.contributors this.homePage = thedeskInfo.homePage this.copyrightYear = thedeskInfo.copyrightYear this.versions = { @@ -110,7 +134,7 @@ dl.version { text-align: left; -webkit-app-region: no-drag; user-select: text; - padding: 0.5em; + padding: 0.5em 1em; dt, dd { margin-left: 0;