v1.2.3 (#724)

* 🎵 Chord selection popup - Delete chord with middle mouse button - Fixed chords align - Clicking to remove slide action will remove the correct one - Fixed template action issues - Style background will always show behind normal background - Fixed issue when trying to set start show action * 🏷 Tags - Fix editbox style test size - Option to set custom main folder ID on cloud setup - Updated Norwegian * ✔ Disabling tests temporarily - Fixed media info not working - Custom start/end works for looping videos - Don't send audio data if no change - Fixed media files preview not loading always - Stopping capture rendering if overloaded * Remove rounded corners on mac outputs * Removed hardware accelleration * 📦 Custom app installer name * 🎵 Audio improvements - Audio disable playlist loop - Updated audio settings - Drag move audio in playlists - Drop audio to playlist from computer - Audio crossfade will wait a little over half the duration before starting the new one - Fixed audio crossfade - Roman chord keys - Fixed chords in output when line breaks - Stage item first active timer * Added python installation instructions to building instructions (#712) * 📖 Fixed building instructions to include python installation * 📖 Added links to the updated building instructions * ✔ Many fixes - Fixed preview output bug where closed output would remain visible - Fixed error when closing output right after opening - Chord improvements - Edit chords in text editor - Fixed stage background opacity - Fixed scripture verse drop selection - Shortcuts from output windows - Resize output window to screen will save new position * ✔ Fixed being unable to use text editor in some cases - Action to start specific timer - Fixed project export size - Fixed some issues with audio - Fixed freeze issues - Updated languages * ✔ Auto group names adds number 1 - Fixed audio slider resetting when paused - Audio fixes * 📄 Removing Playwright status as it did not work properly * ✨ Merge slides * ✨ Merge textboxes * ✔ Improvements * Unsplash images (#721) * Initial support for Unsplash images (#713) * 🌄 Added initial support for Unsplash images * 🌄 Fixed description causing load failure * 🌄 Fixed Unsplash icon * 🖼 Photo API thumbnails - Photo API credits * 🔑 Basic key encryption --------- Co-authored-by: Adriel Sand <[email protected]> * ✔ Fixed stage textbox transform - Fixed caret resetting sometimes when using delete key * NDI Inputs (#723) * 📽 Initial setup * ✔ Transparent window - Select DeckLink device * 📽 Blackmagic send might work - Work on NDI receiver * 📺 Working NDI receiver * 📽 Basic Blackmagic receiver * ✔ Removed logs * 🖼 Output frame pixel mode converter - Stop sender when turned off - Start sender when app opens & value changed - Fixed input channel * 🖼 Fixed inputs - Remember data on toggle off * ✔ Fixed input formatting - Updated YUV output format - Change pixel format dropdown * Temporarily disabling BMD to merge NDI. * ✔ Version update --------- Co-authored-by: Jeremy Zongker <[email protected]> Co-authored-by: Adriel Sand <[email protected]>
ChurchApps · Aug 7, 2024 · c7fd4a5 · c7fd4a5
1 parent bfe8678
commit c7fd4a5
Show file tree

Hide file tree

Showing 153 changed files with 3,387 additions and 829 deletions.
diff --git a/.github/workflows/playwright.yml b/.github/workflows/playwright.yml
@@ -1,9 +1,10 @@
 name: Playwright Tests
 on:
-    push:
-        branches: [dev]
-    pull_request:
-        branches: [dev]
+    # turning off temporarily as it does not work properly!
+    # push:
+    #     branches: [dev]
+    # pull_request:
+    #     branches: [dev]
     workflow_dispatch:
 
 jobs:

diff --git a/README.md b/README.md
@@ -2,7 +2,6 @@
 
 [![Downloads](https://img.shields.io/github/downloads/ChurchApps/freeshow/total)](https://github.com/ChurchApps/freeshow/releases)
 [![Licence](https://img.shields.io/badge/licence-GPL-blue.svg)](https://github.com/ChurchApps/freeshow/blob/main/LICENSE)
-[![Playwright Tests](https://github.com/ChurchApps/FreeShow/actions/workflows/playwright.yml/badge.svg?branch=dev)](https://github.com/ChurchApps/FreeShow/actions/workflows/playwright.yml)
 
 # FreeShow
 
@@ -55,8 +54,9 @@ You are welcome to contribute to the code!
 
 1. Clone the code in this repo
 2. Install [Node.js](https://nodejs.org/en/download/)
-3. In the terminal, run: `npm install`
-4. To start the app, run: `npm start`
+3. Install [Python 3.11](https://www.python.org/downloads/release/python-3119/) or install [Python 3.12](https://www.python.org/downloads/) with the `setuptools` package
+4. In the terminal, run: `npm install`
+5. To start the app, run: `npm start`
 
 ## Join us on Slack
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "freeshow",
-    "version": "1.2.2",
+    "version": "1.2.3",
     "private": true,
     "main": "build/electron/index.js",
     "description": "Show song lyrics and more for free!",
@@ -52,6 +52,7 @@
         "forceCodeSigning": true,
         "appId": "app.freeshow",
         "productName": "FreeShow",
+        "artifactName": "FreeShow-${version}-${arch}.${ext}",
         "files": [
             "build/electron/**/*",
             "build/types/**/*",
@@ -166,6 +167,7 @@
         "genius-lyrics": "4.4.6",
         "grandiose": "vassbo/grandiose#fa2ac4b",
         "jzz": "^1.5.9",
+        "macadam": "hopejr/macadam#7232888",
         "node-machine-id": "^1.1.12",
         "npm-run-all": "^4.1.5",
         "pdf-poppler": "^0.2.1",

diff --git a/public/lang/en.json b/public/lang/en.json
@@ -165,6 +165,7 @@
     },
     "audio": {
         "settings": "Audio settings",
+        "playlist_settings": "Playlist settings",
         "mute_when_video_plays": "Mute when video plays",
         "metronome": "Metronome",
         "toggle_metronome": "Toggle metronome",
@@ -252,7 +253,10 @@
         "display_metadata": "Display metadata",
         "meta_template": "Metadata template",
         "text_divider": "Text separator",
-        "message_template": "Message template"
+        "message_template": "Message template",
+        "tags": "Tags",
+        "new_tag": "New tag",
+        "clear_tag_filter": "Clear tag filter"
     },
     "show_at": {
         "never": "No slides",
@@ -359,6 +363,7 @@
         "change_name": "Change name on",
         "choose_screen": "Choose screen",
         "change_output_values": "Change output values",
+        "choose_chord": "Choose chord",
         "set_time": "Set time",
         "animate": "Animate",
         "next_timer": "Next slide timer",
@@ -519,6 +524,7 @@
         "format": "Format",
         "find_replace": "Find and replace text",
         "cut_in_half": "Split in two",
+        "merge": "Merge",
         "find": "Find",
         "replace": "Replace",
         "case_sensitive": "Case sensitive",
@@ -541,8 +547,15 @@
         "slide_actions": "Slide actions",
         "item_actions": "Item actions",
         "clear_history": "Clear history",
+        "chord_info": "Please click any letter to add a chord.",
+        "chord_key": "Key",
+        "chord_type": "Type",
+        "chord_tension": "Tension",
+        "chord_bass": "Bass",
+        "roman_keys": "Roman keys",
         "set_key": "Set key",
         "custom_key": "Set custom value",
+        "select_chord": "Select this chord",
         "play_on_midi": "Activate on MIDI signal",
         "play_on_midi_tip": "Activate this specific slide when receiving chosen MIDI signal",
         "send_midi": "Send MIDI signal",
@@ -577,6 +590,8 @@
         "start_playlist": "Start playlist",
         "playlist_next": "Next track in playlist",
         "start_metronome": "Start metronome",
+        "name_start_timer": "Start timer by name",
+        "id_start_timer": "Start timer by ID",
         "start_slide_timers": "Start timers on active slide",
         "id_select_output_style": "Select output style by ID",
         "change_output_style": "Change output style",
@@ -595,7 +610,9 @@
         "activate_timer_ending": "Activate when timer is ending",
         "activate_scripture_start": "Activate when scripture is started",
         "activate_slide_cleared": "Activate when slide is cleared",
-        "activate_show_created": "Activate when show is created"
+        "activate_background_cleared": "Activate when background is cleared",
+        "activate_show_created": "Activate when show is created",
+        "activate_audio_playlist_ended": "Activate when audio playlist has ended"
     },
     "animate": {
         "change": "Change",
@@ -619,6 +636,7 @@
         "google_drive_api": "Google API service account key",
         "select_key": "Import keys file",
         "update_key": "Update keys file",
+        "enable_custom_folder_id": "Use custom folder ID",
         "main_folder": "Set main folder manually",
         "media_folder": "Cloud media folder",
         "reconnect": "Reconnect",
@@ -654,6 +672,7 @@
     },
     "context": {
         "enabledTabs": "Toggle tabs",
+        "filterByTags": "Filter by tags",
         "addToProject": "Add to project",
         "newCategory": "New category",
         "changeIcon": "Change icon",
@@ -898,6 +917,7 @@
         "system_clock": "System clock",
         "video_time": "Video time",
         "video_countdown": "Video countdown",
+        "first_active_timer": "First active timer",
         "other": "Other",
         "message": "Message",
         "color": "Color",
@@ -968,7 +988,12 @@
         "resolution": "Resolution",
         "cropping": "Cropping",
         "frame_rate": "Frame rate",
+        "device": "Device",
+        "display_mode": "Display mode",
+        "pixel_format": "Pixel format",
+        "alpha_key": "Alpha key",
         "transparent": "Transparent",
+        "invisible_window": "Invisible window",
         "video_extensions": "Video extensions",
         "image_extensions": "Image extensions",
         "add": "Add",
@@ -1146,7 +1171,11 @@
         "slides": "Slides",
         "words": "Words",
         "template": "Template",
-        "category": "Category"
+        "category": "Category",
+        "photoUrl": "Photo URL",
+        "likes": "Likes",
+        "artist": "Artist",
+        "artistUrl": "Artist page"
     },
     "songbeamer_import": {
         "options": "Options",

diff --git a/public/lang/en_GB.json b/public/lang/en_GB.json
@@ -359,6 +359,7 @@
         "change_name": "Change name on",
         "choose_screen": "Choose screen",
         "change_output_values": "Change output values",
+        "choose_chord": "Choose chord",
         "set_time": "Set time",
         "animate": "Animate",
         "next_timer": "Next slide timer",
@@ -530,6 +531,7 @@
         "svg_clipboard": "Import SVG from clipboard",
         "fullscreen_preview": "Toggle fullscreen preview",
         "toggle_output": "Toggle output screen",
+        "toggle_panels": "Toggle panels",
         "change_tab": "Change tab",
         "change_drawer_tab": "Change drawer tab",
         "change_slide": "Change slide",
@@ -540,8 +542,14 @@
         "slide_actions": "Slide actions",
         "item_actions": "Item actions",
         "clear_history": "Clear history",
+        "chord_info": "Please click any letter to add a chord.",
+        "chord_key": "Key",
+        "chord_type": "Type",
+        "chord_tension": "Tension",
+        "chord_bass": "Bass",
         "set_key": "Set key",
         "custom_key": "Set custom value",
+        "select_chord": "Select this chord",
         "play_on_midi": "Activate on MIDI signal",
         "play_on_midi_tip": "Activate this specific slide when receiving chosen MIDI signal",
         "send_midi": "Send MIDI signal",
@@ -593,6 +601,7 @@
         "activate_video_ending": "Activate when video is ending",
         "activate_timer_ending": "Activate when timer is ending",
         "activate_scripture_start": "Activate when scripture is started",
+        "activate_slide_cleared": "Activate when slide is cleared",
         "activate_show_created": "Activate when show is created"
     },
     "animate": {
@@ -694,6 +703,7 @@
         "_title_underline": "Underline",
         "_title_strikethrough": "Strikethrough",
         "color": "Colour",
+        "accent_color": "Accent colour",
         "background_color": "Background colour",
         "background_opacity": "Background opacity",
         "background_image": "Background image",
@@ -766,7 +776,8 @@
         "start_days_from_today": "Start at days from today",
         "just_one_day": "Just one day",
         "enable_start_date": "Enable start date",
-        "disable_navigation": "Disable navigation controls"
+        "disable_navigation": "Disable navigation controls",
+        "progress_bar": "Progress bar"
     },
     "items": {
         "text": "Textbox",
@@ -783,6 +794,7 @@
         "timer": "Timer",
         "variable": "Variable",
         "web": "Website",
+        "slide_tracker": "Progress",
         "visualizer": "Visualiser",
         "captions": "Captions",
         "icon": "Icon"
@@ -888,6 +900,7 @@
         "next_slide_notes": "Next slide notes",
         "output": "Output",
         "current_output": "Current output",
+        "slide_tracker": "Progress",
         "time": "Time",
         "system_clock": "System clock",
         "video_time": "Video time",
@@ -958,6 +971,7 @@
         "audio_fade_duration": "Audio fade duration",
         "audio_crossfade": "Audio crossfade",
         "max_auto_font_size": "Max auto font size",
+        "clear_style_background_on_text": "Clear style background when slide is active",
         "resolution": "Resolution",
         "cropping": "Cropping",
         "frame_rate": "Frame rate",

diff --git a/public/lang/en_ZM.json b/public/lang/en_ZM.json
@@ -359,6 +359,7 @@
         "change_name": "Change name on",
         "choose_screen": "Choose screen",
         "change_output_values": "Change output values",
+        "choose_chord": "Choose chord",
         "set_time": "Set time",
         "animate": "Animate",
         "next_timer": "Next slide timer",
@@ -530,6 +531,7 @@
         "svg_clipboard": "Import SVG from clipboard",
         "fullscreen_preview": "Toggle fullscreen preview",
         "toggle_output": "Toggle output screen",
+        "toggle_panels": "Toggle panels",
         "change_tab": "Change tab",
         "change_drawer_tab": "Change drawer tab",
         "change_slide": "Change slide",
@@ -540,8 +542,14 @@
         "slide_actions": "Slide actions",
         "item_actions": "Item actions",
         "clear_history": "Clear history",
+        "chord_info": "Please click any letter to add a chord.",
+        "chord_key": "Key",
+        "chord_type": "Type",
+        "chord_tension": "Tension",
+        "chord_bass": "Bass",
         "set_key": "Set key",
         "custom_key": "Set custom value",
+        "select_chord": "Select this chord",
         "play_on_midi": "Activate on MIDI signal",
         "play_on_midi_tip": "Activate this specific slide when receiving chosen MIDI signal",
         "send_midi": "Send MIDI signal",
@@ -593,6 +601,7 @@
         "activate_video_ending": "Activate when video is ending",
         "activate_timer_ending": "Activate when timer is ending",
         "activate_scripture_start": "Activate when scripture is started",
+        "activate_slide_cleared": "Activate when slide is cleared",
         "activate_show_created": "Activate when show is created"
     },
     "animate": {
@@ -694,6 +703,7 @@
         "_title_underline": "Underline",
         "_title_strikethrough": "Strikethrough",
         "color": "Colour",
+        "accent_color": "Accent colour",
         "background_color": "Background colour",
         "background_opacity": "Background opacity",
         "background_image": "Background image",
@@ -766,7 +776,8 @@
         "start_days_from_today": "Start at days from today",
         "just_one_day": "Just one day",
         "enable_start_date": "Enable start date",
-        "disable_navigation": "Disable navigation controls"
+        "disable_navigation": "Disable navigation controls",
+        "progress_bar": "Progress bar"
     },
     "items": {
         "text": "Textbox",
@@ -783,6 +794,7 @@
         "timer": "Timer",
         "variable": "Variable",
         "web": "Website",
+        "slide_tracker": "Progress",
         "visualizer": "Visualiser",
         "captions": "Captions",
         "icon": "Icon"
@@ -888,6 +900,7 @@
         "next_slide_notes": "Next slide notes",
         "output": "Output",
         "current_output": "Current output",
+        "slide_tracker": "Progress",
         "time": "Time",
         "system_clock": "System clock",
         "video_time": "Video time",
@@ -958,6 +971,7 @@
         "audio_fade_duration": "Audio fade duration",
         "audio_crossfade": "Audio crossfade",
         "max_auto_font_size": "Max auto font size",
+        "clear_style_background_on_text": "Clear style background when slide is active",
         "resolution": "Resolution",
         "cropping": "Cropping",
         "frame_rate": "Frame rate",