v1.2.5 (#756)

* 📄 Option to not disable Hardware Acceleration
- Updated languages
- Unsplash UTM links
- Fixed HTTP output media
- More optimized .json cache storage
- Fixed fade transition when type was none
- Fixed not being able to add media after scripture slides drop
- Fixed freeze sometimes when undoing
- Sort by name function

* ✨ Option to play slide based on number input
- Better scripture auto scroll
- Fixed scripture not always opening stored session

* Electron 31 (#739)

* ✔ Updated Electron to v31
- No more support for Windows 7/8, and macOS 10.14 or lower
- Updated packages

* ✔ Fixed error when closing output right after opening
- Fixed preview aspect ratio

* 🔊 Custom audio output
- Fixed media files preview not loading always

* ✔ Electron 31 updates

* ✨ Focus mode to navigate entire project
- Fix for output popup on slow devices
- UI option to toggle hardware acceleration

* 🔒 Lock shows for editing
- Improved context menus

* ✨ Remote "Quick play"
- Play scripture template backgrounds
- Option to remove show template
- Fixed lag when droparea wa hidden
- Bundle all media files button
- Set Max auto font size per output style
- Drawer navigation only allow drop in drop areas
- Small tweaks

* 🧼 Cleaned some TODOs
- Reduzed show load time with many slides
- Fixed project show layout not changing if show has not loaded
- Change volume on online videos
- Online videos clearing when finished again
- Media folder preview

* ✏ Fixed text edit issues
- Fixed some issues with quick text
- Fixed merging issues
- Fixed text pase issues
- Disabled Shift+Enter in text editor
- Adding template with no bullets will remove them
- Auto detect & remove bad JSON setting files
- Version update

package.json

@@ -1,6 +1,6 @@
 {
     "name": "freeshow",
-    "version": "1.2.4",
+    "version": "1.2.5",
     "private": true,
     "main": "build/electron/index.js",
     "description": "Show song lyrics and more for free!",
@@ -133,8 +133,8 @@
         "@types/sqlite3": "^3.1.8",
         "@types/tmp": "^0.2.6",
         "@types/vimeo__player": "^2.16.2",
-        "electron": "^21.2.2",
-        "electron-builder": "24.12.0",
+        "electron": "^31.3.0",
+        "electron-builder": "^24.13.3",
         "playwright": "^1.40.1",
         "rollup": "^4.6.1",
         "rollup-plugin-copy": "^3.5.0",
@@ -158,7 +158,7 @@
         "chord-transposer": "^3.0.9",
         "cross-env": "^7.0.3",
         "electron-store": "^8.0.1",
-        "electron-updater": "^4.6.1",
+        "electron-updater": "^6.3.1",
         "exif": "^0.6.0",
         "express": "^4.17.2",
         "follow-redirects": "^1.15.2",
@@ -169,7 +169,7 @@
         "node-machine-id": "^1.1.12",
         "npm-run-all": "^4.1.5",
         "pdf-poppler": "^0.2.1",
-        "pptx2json": "^0.0.8",
+        "pptx2json": "^0.0.10",
         "protobufjs": "^7.2.3",
         "qrcode-generator": "^1.4.4",
         "sirv-cli": "^1.0.0",

public/lang/en.json

@@ -161,11 +161,14 @@
         "fill": "Fill",
         "cover": "Cover",
         "online": "Online",
-        "recommended": "Recommended"
+        "recommended": "Recommended",
+        "bundle_media_files": "Bundle all media files",
+        "bundle_media_files_tip": "Bundle the media files from all shows into one folder"
     },
     "audio": {
         "settings": "Audio settings",
         "playlist_settings": "Playlist settings",
+        "custom_output": "Custom audio output",
         "mute_when_video_plays": "Mute when video plays",
         "metronome": "Metronome",
         "toggle_metronome": "Toggle metronome",
@@ -222,7 +225,8 @@
         "loading": "Loading...",
         "submit": "Submit",
         "password": "Password",
-        "wrong_password": "Wrong password"
+        "wrong_password": "Wrong password",
+        "quick_play": "Quick play"
     },
     "error": {
         "no_show": "Could not find show",
@@ -458,6 +462,8 @@
         "lyrics": "Lyrics view",
         "text": "Text edit",
         "update": "Update show",
+        "locked": "This show has been locked!",
+        "locked_info": "This show has been locked for editing. Unlock it again in the shows drawer.",
         "slide_template": "Slide template",
         "search_results": "Search Results",
         "source": "Source",
@@ -499,12 +505,14 @@
         "speech": "Speech",
         "startSpeaking": "Start Speaking",
         "stopSpeaking": "Stop Speaking",
+        "focus_mode": "Toggle Focus mode",
         "fullscreen": "Toggle Fullscreen",
         "resetZoom": "Reset Zoom",
         "zoom": "Zoom",
         "zoomIn": "Zoom In",
         "zoomOut": "Zoom Out",
         "reset": "Reset",
+        "remove_template_from_show": "Remove template from show",
         "reset_defaults": "Reset defaults",
         "to_all": "Apply to all",
         "to_following": "Apply to following",
@@ -677,6 +685,7 @@
         "enabledTabs": "Toggle tabs",
         "filterByTags": "Filter by tags",
         "addToProject": "Add to project",
+        "lockForChanges": "Lock for editing",
         "newCategory": "New category",
         "changeIcon": "Change icon",
         "changeGroup": "Change group",
@@ -979,7 +988,8 @@
         "auto_updates": "Auto updates",
         "disable_labels": "Disable labels",
         "group_numbers": "Group numbers",
-        "full_colors": "Full slide group colors",
+        "full_colors": "High contrast group colors",
+        "slide_number_keys": "Play slides with number keys",
         "auto_output": "Activate output screen on startup",
         "hide_cursor_in_output": "Hide cursor in output",
         "clear_media_when_finished": "Clear media when finished",
@@ -1007,6 +1017,8 @@
         "data_location": "Data location",
         "user_data_location": "Save user settings at 'Data location'",
         "popup_before_close": "Always display popup before closing",
+        "disable_hardware_acceleration": "Disable hardware acceleration",
+        "restart_for_change": "You have to restart the program for the change to take effect!",
         "font": "Font",
         "font_family": "Font family",
         "font_size": "Font size",

public/lang/en_GB.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",
@@ -406,6 +410,8 @@
         "now": "now!",
         "no_video_id": "No video ID",
         "no_name": "No name",
+        "reverting_setting": "Reverting this change in {} seconds, enable again to make the change stay!",
+        "reverted": "Setting reverted! Only enable again if you did not have any problems.",
         "media_replaced": "Missing media file replaced with match.",
         "lyrics_undefined": "Could not find any lyrics!",
         "lyrics_copied": "Lyrics copied from ",
@@ -520,6 +526,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",
@@ -547,6 +554,7 @@
         "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",
@@ -565,6 +573,7 @@
         "remove_layers": "Remove layers",
         "start_recording": "Start recording",
         "stop_recording": "Stop recording",
+        "export_recording": "Stop recording and export",
         "index_select_project": "Select project by index",
         "next_project_item": "Next project item",
         "previous_project_item": "Previous project item",
@@ -584,6 +593,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",
@@ -602,7 +613,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",
@@ -626,6 +639,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",
@@ -661,6 +675,7 @@
     },
     "context": {
         "enabledTabs": "Toggle tabs",
+        "filterByTags": "Filter by tags",
         "addToProject": "Add to project",
         "newCategory": "New category",
         "changeIcon": "Change icon",
@@ -905,6 +920,7 @@
         "system_clock": "System clock",
         "video_time": "Video time",
         "video_countdown": "Video countdown",
+        "first_active_timer": "First active timer",
         "other": "Other",
         "message": "Message",
         "color": "Colour",
@@ -975,7 +991,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",
@@ -1062,6 +1083,7 @@
         "verses_on_individual_lines": "Verses on individual lines",
         "version": "Show version",
         "reference": "Show reference",
+        "split_reference": "Split reference",
         "combine_with_text": "Combine with text",
         "reference_at_bottom": "Move to bottom",
         "red_jesus": "Jesus words in red",
@@ -1153,7 +1175,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",

public/lang/en_ZM.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",
@@ -313,7 +317,7 @@
     },
     "category": {
         "all": "All",
-        "unlabeled": "Unlabeled",
+        "unlabeled": "Unlabelled",
         "favourites": "Favourites",
         "song": "Songs",
         "presentation": "Presentations",
@@ -406,6 +410,8 @@
         "now": "now!",
         "no_video_id": "No video ID",
         "no_name": "No name",
+        "reverting_setting": "Reverting this change in {} seconds, enable again to make the change stay!",
+        "reverted": "Setting reverted! Only enable again if you did not have any problems.",
         "media_replaced": "Missing media file replaced with match.",
         "lyrics_undefined": "Could not find any lyrics!",
         "lyrics_copied": "Lyrics copied from ",
@@ -520,6 +526,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",
@@ -547,6 +554,7 @@
         "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",
@@ -565,6 +573,7 @@
         "remove_layers": "Remove layers",
         "start_recording": "Start recording",
         "stop_recording": "Stop recording",
+        "export_recording": "Stop recording and export",
         "index_select_project": "Select project by index",
         "next_project_item": "Next project item",
         "previous_project_item": "Previous project item",
@@ -584,6 +593,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",
@@ -602,7 +613,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",
@@ -626,6 +639,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",
@@ -661,6 +675,7 @@
     },
     "context": {
         "enabledTabs": "Toggle tabs",
+        "filterByTags": "Filter by tags",
         "addToProject": "Add to project",
         "newCategory": "New category",
         "changeIcon": "Change icon",
@@ -905,6 +920,7 @@
         "system_clock": "System clock",
         "video_time": "Video time",
         "video_countdown": "Video countdown",
+        "first_active_timer": "First active timer",
         "other": "Other",
         "message": "Message",
         "color": "Colour",
@@ -975,7 +991,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",
@@ -1062,6 +1083,7 @@
         "verses_on_individual_lines": "Verses on individual lines",
         "version": "Show version",
         "reference": "Show reference",
+        "split_reference": "Split reference",
         "combine_with_text": "Combine with text",
         "reference_at_bottom": "Move to bottom",
         "red_jesus": "Jesus words in red",
@@ -1153,7 +1175,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",

src/electron/cloud/drive.ts

@@ -486,4 +486,5 @@ async function getNewest({ driveFile, localPath }: any) {
     return "same"
 }
 
-// TODO: drive media folder...
+// a custom drive media folder is not planned as discussed here:
+// https://github.com/ChurchApps/FreeShow/issues/402

src/electron/data/defaults.ts

@@ -1,6 +1,6 @@
 import type { SaveListSettings, SaveListSyncedSettings } from "../../types/Save"
 
-export const defaultConfig: any = { loaded: false, maximized: true, bounds: { width: 800, height: 600, x: 0, y: 0 } }
+export const defaultConfig: any = { loaded: false, maximized: true, bounds: { width: 800, height: 600, x: 0, y: 0 }, disableHardwareAcceleration: true }
 
 export const defaultGroups: any = {
     break: { name: "break", default: true, color: "#f5255e" },