Merge pull request #2 from vassbo/dev

v0.0.3

Author: vassbo

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "freeshow",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "private": true,
   "main": "build/electron/index.js",
   "description": "An application for showing song lyrics and more for free!",

package.json

@@ -71,11 +71,13 @@
     "overlays": "Remove overlays",
     "audio": "Remove audio",
     "transistion": "Remove transistion",
-    "to_start": "Remove Go to start"
+    "to_start": "Remove Go to start",
+    "timer": "Remove timer"
   },
   "media": {
     "_loop": "Loop",
     "play": "Play",
+    "pause": "Pause",
     "show": "Show"
   },
   "menu": {
@@ -107,7 +109,8 @@
     "stage_shows": "No stage shows",
     "groups": "No groups",
     "events": "No events",
-    "text": "Type something"
+    "text": "Type something",
+    "timers": "No timers in the shows in this project"
   },
   "remote": {
     "projects": "Projects",
@@ -127,7 +130,8 @@
   "error": {
     "no_show": "Could not find show",
     "no_layouts": "Could not find any layouts",
-    "load": "Cound not load"
+    "load": "Cound not load",
+    "not_found": "Not found"
   },
   "meta": {
     "title": "Title",
@@ -162,7 +166,8 @@
   },
   "inputs": {
     "name": "Name",
-    "video_id": "Video ID/URL"
+    "video_id": "Video ID/URL",
+    "close_ad": "Close ad on output screen"
   },
   "tabs": {
     "shows": "Shows",
@@ -178,9 +183,10 @@
   "category": {
     "all": "All",
     "unlabeled": "Unlabeled",
-    "song": "Song",
+    "song": "Songs",
     "info": "Info",
-    "presentation": "Presentation",
+    "events": "Events",
+    "presentation": "Presentations",
     "pictures": "Pictures",
     "videos": "Videos",
     "offers": "Offers",
@@ -222,6 +228,7 @@
     "private": "New private show",
     "folder": "New folder",
     "slide": "New slide",
+    "overlay": "New overlay",
     "event": "New event"
   },
   "show": {
@@ -463,6 +470,10 @@
     "used": "Used",
     "changed": "Used",
     "extension": "File extension",
-    "size": "Size"
+    "size": "Size",
+    "slides": "Slides",
+    "words": "Words",
+    "template": "Template",
+    "category": "Category"
   }
 }

public/lang/en.json

@@ -71,11 +71,13 @@
     "overlays": "Fjern overlegg",
     "audio": "Fjern lyd",
     "transistion": "Fjern overgang",
-    "to_start": "Fjern Gå til start"
+    "to_start": "Fjern Gå til start",
+    "timer": "Fjern nedtelling"
   },
   "media": {
     "_loop": "Loop",
     "play": "Spill av",
+    "pause": "Sett på pause",
     "show": "Vis"
   },
   "menu": {
@@ -107,7 +109,8 @@
     "stage_shows": "Ingen sceneshow",
     "groups": "Ingen grupper",
     "events": "Ingen arrangement",
-    "text": "Skriv noe"
+    "text": "Skriv noe",
+    "timers": "Ingen nedtellinger i noen show i dette prosjektet"
   },
   "remote": {
     "projects": "Prosjekter",
@@ -127,7 +130,8 @@
   "error": {
     "no_show": "Kunne ikke finne noen show",
     "no_layouts": "Kunne ikke finne noen oppsett",
-    "load": "Kunne ikke laste inn"
+    "load": "Kunne ikke laste inn",
+    "not_found": "Ikke funnet"
   },
   "meta": {
     "title": "Tittel",
@@ -162,7 +166,8 @@
   },
   "inputs": {
     "name": "Navn",
-    "video_id": "Video ID/URL"
+    "video_id": "Video ID/URL",
+    "close_ad": "Lukk annonse på utgangsskjermen"
   },
   "tabs": {
     "shows": "Show",
@@ -178,9 +183,10 @@
   "category": {
     "all": "Alt",
     "unlabeled": "Umerket",
-    "song": "Sang",
+    "song": "Sanger",
     "info": "Info",
-    "presentation": "Presentasjon",
+    "events": "Hendelser",
+    "presentation": "Presentasjoner",
     "pictures": "Bilder",
     "videos": "Videoer",
     "offers": "Offer",
@@ -222,6 +228,7 @@
     "private": "Nytt privat show",
     "folder": "Ny mappe",
     "slide": "Nytt lysbilde",
+    "overlay": "Nytt overlegg",
     "event": "Nytt arrangement"
   },
   "show": {
@@ -463,6 +470,10 @@
     "used": "Brukt",
     "changed": "Brukt",
     "extension": "Filtype",
-    "size": "Størrelse"
+    "size": "Størrelse",
+    "slides": "Lysbilder",
+    "words": "Ord",
+    "template": "Mal",
+    "category": "Kategori"
   }
 }

public/lang/no.json

@@ -33,8 +33,8 @@ export const defaultSettings = {
     paint: {},
   },
   overlayCategories: {
-    offers: { name: "category.offers", icon: "money", default: true },
-    notice: { name: "category.notice", icon: "notice", default: true },
+    offers: { name: "category.offers", icon: "cash", default: true },
+    notice: { name: "category.notice", icon: "info", default: true },
     visuals: { name: "category.visuals", icon: "star", default: true },
   },
   templateCategories: {

src/electron/utils/defaults.ts

@@ -6,8 +6,9 @@ let notification: Notification | null
 
 export default function checkForUpdates() {
   // if produciton
-  autoUpdater.checkForUpdates().catch((err) => {
-    console.error(JSON.stringify(err))
+  autoUpdater.checkForUpdatesAndNotify({
+    title: app.getName(),
+    body: "Update available. Click to download.",
   })
 
   // autoUpdater.logger = console;
@@ -17,6 +18,7 @@ export default function checkForUpdates() {
       title: app.getName(),
       body: "Updates are available. Click to download.",
       silent: true,
+      icon: nativeImage.createFromPath(join(__dirname, "..", "..", "public", "icon.png")),
     })
     notification.show()
     notification.on("click", () => {