Complete passing data for version numbers and styling in about window

joethephish · joethephish · commit 6159b3b81522 · 2017-06-05T11:26:53.000+01:00
diff --git a/app/main-process/aboutWindow.js b/app/main-process/aboutWindow.js
@@ -7,10 +7,9 @@ const inkjsPackage = require('inkjs/package.json');
 
 
 const electronWindowOptions = {
-    width: 450,
-    height: 250,
-    minWidth: 450,
-    minHeight: 250,
+    width: 340,
+    height: 270,
+    resizable: false,
     title: "About Inky"
 };
 
diff --git a/app/renderer/about/about.html b/app/renderer/about/about.html
@@ -2,21 +2,54 @@
 <html>
 
 <head>
-  <title>About Inky</title>
+    <title>About Inky</title>
 </head>
 
+<style>
+body {
+    text-align: center;
+    background: #FDFDFD;
+}
+
+img {
+    width: 100px;
+    height: 100px;
+    margin-top: 20px;
+    -webkit-user-select: none;
+}
+
+h1, p {
+    font-family: Helvetica, sans-serif;
+}
+
+h1 {
+    font-size: 12pt;
+    -webkit-user-select: none;
+    cursor: default;
+}
+
+p {
+    font-size: 9pt;
+    padding: 0;
+    margin: 4px;
+}
+
+</style>
+
 <body>
 
-  <h1>Inky</h1>
+    <img src="icon256.png" draggable="false" />
+
+    <h1>Inky</h1>
 
-  <p id="version-inky"></p>
-  <p id="version-ink"></p>
-  <p id="version-inkjs"></p>
+    <p id="version-inky"></p>
+    <p id="version-ink"></p>
+    <p id="version-inkjs"></p>
 
 </body>
 
-  <script>
-    require('./controller.js');
-  </script>
+    <script>
+        require('./controller.js');
+    </script>
   
 </html>
diff --git a/app/renderer/about/controller.js b/app/renderer/about/controller.js
@@ -3,6 +3,7 @@ const ipc = electron.ipcRenderer;
 const $ = window.jQuery = require('../jquery-2.2.3.min.js');
 
 ipc.on("set-about-data", (event, data) => {
-    console.log("Receiving");
-    $("body").text(JSON.stringify(data));
+    $("#version-inky").text("Inky version: "+data.inkyVersion);
+    $("#version-ink").text("ink version: "+data.inkVersion);
+    $("#version-inkjs").text("inkjs version: "+data.inkjsVersion);
 });
diff --git a/app/renderer/about/icon256.png b/app/renderer/about/icon256.png
diff --git a/resources/makeIcns.command b/resources/makeIcns.command
@@ -13,4 +13,5 @@ sips -z 512 512   Icon1024.png --out Icon.iconset/icon_256x256@2x.png
 sips -z 512 512   Icon1024.png --out Icon.iconset/icon_512x512.png
 cp Icon1024.png Icon.iconset/icon_512x512@2x.png
 iconutil -c icns Icon.iconset
+cp Icon.iconset/icon_256x256.png ../app/renderer/about/icon256.png
 rm -R Icon.iconset
