1.3.3-beta.2

package.json

@@ -1,6 +1,6 @@
 {
     "name": "freeshow",
-    "version": "1.3.3-beta.1",
+    "version": "1.3.3-beta.2",
     "private": true,
     "main": "build/electron/index.js",
     "description": "Show song lyrics and more for free!",
@@ -182,11 +182,12 @@
         "express": "^4.17.2",
         "follow-redirects": "^1.15.2",
         "genius-lyrics": "^4.4.7",
-        "grandiose": "vassbo/grandiose#9857c8e",
+        "grandiose": "vassbo/grandiose#53e7f98",
         "jzz": "^1.8.7",
         "mp4box": "^0.5.2",
         "node-machine-id": "^1.1.12",
         "npm-run-all": "^4.1.5",
+        "osc-js": "^2.4.1",
         "pdf2img-electron": "^1.2.3",
         "pptx2json": "^0.0.10",
         "protobufjs": "^7.2.3",

public/global.css

@@ -1,3 +1,4 @@
+/* custom CMG Sans */
 @font-face {
     font-family: "CMGSans";
     src: url("./fonts/CMGSans-Regular.ttf");
@@ -39,20 +40,26 @@
 
     --hover: rgb(255 255 255 / 0.05);
     --focus: rgb(255 255 255 / 0.1);
-    /* --active: rgb(230 52 156 / .8); */
 
-    /* --font-family: sans-serif; */
     /* https://css-tricks.com/snippets/css/system-font-stack/ */
-    /* --font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; */
     --font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
     --font-size: 1em;
 
     --border-radius: 0;
 
-    /* --navigation-width: 18vw; */
     --navigation-width: 290px;
 }
 
+* {
+    margin: 0;
+    padding: 0;
+    box-sizing: border-box;
+    user-select: none;
+
+    outline-offset: -4px;
+    outline-color: var(--secondary);
+}
+
 html,
 body {
     position: relative;
@@ -63,9 +70,6 @@ body {
 body {
     display: flex;
     flex-direction: column;
-    /* background-color: #292c36;
-  background-color: var(--primary); */
-    color: #f0f0ff;
     color: var(--text);
     box-sizing: border-box;
     transition: background-color 0.5s;
@@ -122,76 +126,3 @@ p {
     overflow: hidden;
     white-space: nowrap;
 }
-
-* {
-    margin: 0;
-    padding: 0;
-    box-sizing: border-box;
-    user-select: none;
-
-    outline-offset: -4px;
-    outline-color: var(--secondary);
-}
-
-/* button {
-  font-family: sans-serif;
-	font-family: system-ui;
-} */
-
-/* body {
-	color: #333;
-	margin: 0;
-	padding: 8px;
-	box-sizing: border-box;
-	font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
-}
-
-a {
-	color: rgb(0,100,200);
-	text-decoration: none;
-}
-
-a:hover {
-	text-decoration: underline;
-}
-
-a:visited {
-	color: rgb(0,80,160);
-}
-
-label {
-	display: block;
-}
-
-input, button, select, textarea {
-	font-family: inherit;
-	font-size: inherit;
-	-webkit-padding: 0.4em 0;
-	padding: 0.4em;
-	margin: 0 0 0.5em 0;
-	box-sizing: border-box;
-	border: 1px solid #ccc;
-	border-radius: 2px;
-}
-
-input:disabled {
-	color: #ccc;
-}
-
-button {
-	color: #333;
-	background-color: #f4f4f4;
-	outline: none;
-}
-
-button:disabled {
-	color: #999;
-}
-
-button:not(:disabled):active {
-	background-color: #ddd;
-}
-
-button:focus {
-	border-color: #666;
-} */

public/lang/en.json

@@ -38,7 +38,9 @@
         "top": "Top",
         "right": "Right",
         "bottom": "Bottom",
-        "left": "Left"
+        "left": "Left",
+        "centered": "Centered",
+        "edge_blending_tip": "Blend together multiple outputs/projectors for a more seamless transition"
     },
     "about": {
         "check_updates": "Look for updates",
@@ -316,7 +318,7 @@
         "primary-darkest": "Primary darkest",
         "text": "Text",
         "textInvert": "Inverted text",
-        "secondary-text": "Secondary text",
+        "secondary-text": "Selections",
         "secondary": "Secondary",
         "secondary-opacity": "Secondary opacity",
         "hover": "Hover",
@@ -413,7 +415,7 @@
         "import": "Import",
         "songbeamer_import": "Songbeamer Import",
         "export": "Export",
-        "importing": "Importing",
+        "importing": "Importing...",
         "import_scripture": "Import scripture",
         "player": "Player",
         "edit_event": "Edit event",
@@ -429,6 +431,7 @@
         "manage_icons": "Manage icons",
         "manage_colors": "Manage colors",
         "choose_camera": "Choose camera",
+        "manage_tags": "Manage tags",
         "initialize": "Welcome to FreeShow",
         "unsaved": "Are you sure you want to quit?",
         "cancel": "Cancel",
@@ -465,6 +468,7 @@
         "deleted_cache": "Deleted media thumbnail cache.",
         "no_songswords_easyworship": "Missing SongsWords.db file.",
         "delete_shows_empty": "No shows to delete.",
+        "output_capture_enabled": "Output screen capture enabled, this may cause performance issues. Only use if needed!",
         "midi_no_project": "Received trigger to change project, but no project found at index:",
         "midi_no_show": "Received trigger to start slide, but no show active.",
         "midi_no_slide": "Received trigger to start slide, but no slide found at index:",
@@ -735,7 +739,7 @@
     "export": {
         "export": "Export",
         "export_as": "Export {} as",
-        "exporting": "Exporting",
+        "exporting": "Exporting...",
         "exported": "Exported!",
         "oneFile": "One file",
         "selected_shows": "Selected shows",
@@ -823,6 +827,7 @@
         "size": "Size",
         "max_lines": "Max lines",
         "invert_items": "Invert items",
+        "list": "List",
         "chords": "Chords",
         "transpose": "Transpose",
         "auto_size": "Auto size",
@@ -846,6 +851,7 @@
         "outline": "Outline",
         "shadow": "Shadow",
         "shadow_inset": "Shadow inset",
+        "offset": "Offset",
         "offsetX": "Offset X",
         "offsetY": "Offset Y",
         "blur": "Blur",
@@ -892,7 +898,6 @@
     },
     "items": {
         "text": "Textbox",
-        "list": "List",
         "media": "Media",
         "image": "Image",
         "camera": "Camera",
@@ -1065,6 +1070,7 @@
         "manual_input_hint": "Can't find the display? Click here to manually change the position.",
         "manual_drag_hint": "You can also hold ctrl/cmd over an active output window to manually drag it around.",
         "allow_main_screen": "Allow custom output position & size",
+        "edge_blending": "Edge blending",
         "identify_screens": "Identify screens",
         "new_output": "New output",
         "normal": "Normal",
@@ -1157,6 +1163,7 @@
     "sort": {
         "sort_by": "Sort by",
         "name": "Name",
+        "name_des": "Name Descending",
         "date": "Date",
         "size": "Size",
         "type": "Type",