Skip to content

Commit 035bfdd

Browse files
vassbojzongkergladsonsamyurividal
authored
1.5.6-beta.2 (#2656)
* Fixed pro5 import issue * Fixed clear audio not stopping playlist * Fixed dropdown closing too quick - Restoring old settings won't mess up the data path * Group name replaced when changing background if same name as previous * Fixed incorrect scripture selection order sometimes * Groups number tip * Added support for B1 plans containing lesson items. * Fixed custom icons white default color #2605 * Fixed template text sometimes removed if different item order #2607 * Fixed non text items duplicated on text edit changes * Trying to prevent crash #2612 * Template image is prioritized #2613 - Template popup ordered by scripture * Updated languages * Media reading improvements - Recursive audio folder search - Fixes #2615 * Toggle text edit shortcut #2644 * Quick create audio folder from media folder #2178 - Media updates * Added Traditional Chinese * Fixed playlist highlight create - Fixed project folder buttons scroll - Fixed spaces in text edit not working well * Fixed stage display next scripture text not working #2636 * Stage sizes auto update when window size changes #2604 - Smaller stage labels on small screens * Auto detect new media/project files * Skip too large string type files when importing * Timer easly warning color #2581 * Fixed API scripture next/previous verse not working #2627 * Add verse select (#2630) * Add verse select * Move play button on mobile * macOS go back workaround #2614 * Style template only used as preview if all outputs styles has a custom template #2608 * Replace certain scripture HTML tags #2553 * B1.Church songs import fix * Tweaks * fix: search all lines for customType markers in scripture auto-sizing (#2648) * fix: search all lines for customType markers in scripture auto-sizing The customTypeRatio calculation was only searching the first line (lines[0]) for verse numbers marked with customType: 'disableTemplate'. In templates where verse numbers appear in other lines (e.g., line 1), this caused the ratio to default to 1.0 instead of the correct value (e.g., 0.6 for 60px verse numbers). This resulted in inconsistent auto-sizing where some verses would be calculated with extremely small font sizes because the algorithm treated the verse number as if it should be the same size as the verse text. Fixed by iterating through all lines to find customType markers in both: - deriveCustomTypeRatio() function - calculateAutosize() function Now correctly calculates the verse number to text ratio regardless of which line contains the verse numbers. * Fixed formatting --------- Co-authored-by: Kristoffer <kristoffervassbo@gmail.com> * Fix scripture template override applying wrong styles to verses 2+ (#2653) * Fix scripture template override applying wrong styles to verses 2+ When using 'Overwrite Scripture with Template' in output styles, verses beyond the first were getting matched to the wrong template text object (falling back to text[0] which is the verse number template instead of verse text template). Now intelligently matches verse text objects to {scripture_text} placeholder and verse numbers to {scripture_number} placeholder based on customType flag. * Fixed formatting - Fixed type --------- Co-authored-by: Kristoffer <kristoffervassbo@gmail.com> * Trying to remove extra fullscreen menu #2651 * Fixing errors * Updates * ChurchApps Cloud Sync (#2655) * ChurchApps Cloud Sync * Progress - Fixed async rename/delete not awaited * Updates * Changed hostname - Fixed too many open files backup issue * Attach file as blob. Fetch from S3 instead of API * Fixed latest zip deleted * Backup downloads supress errors * Fixed id issue * Updated my teams api url * Tweaks * Updates * Fix * Finalizing --------- Co-authored-by: Jeremy Zongker <jeremy@zongker.net> * Cloud updates - Version update - Audit fixes * Fixes --------- Co-authored-by: Jeremy Zongker <jeremy@zongker.net> Co-authored-by: Gladson Sam <115465353+gladsonsam@users.noreply.github.com> Co-authored-by: Yuri Vidal <yurividal@users.noreply.github.com>
1 parent e01f137 commit 035bfdd

File tree

111 files changed

+5189
-1229
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

111 files changed

+5189
-1229
lines changed

package-lock.json

Lines changed: 102 additions & 32 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "freeshow",
3-
"version": "1.5.6-beta.1",
3+
"version": "1.5.6-beta.2",
44
"private": true,
55
"main": "build/electron/index.js",
66
"description": "Show song lyrics and more for free!",

public/lang/en.json

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,8 @@
8585
"trigger": "Triggers are commonly used to send a HTTP request to change the preset of cameras.",
8686
"global_options": "These options are applied globally.",
8787
"consider_templates": "You made the same changes to multiple slides. Consider using a template.",
88-
"style_template_active": "A style in the output is set to override the show template."
88+
"style_template_active": "A style in the output is set to override the show template.",
89+
"group_numbers": "Numbers are auto assigned, so you don't need to add numbers to group names."
8990
},
9091
"setup": {
9192
"good_luck": "We hope you find this software useful. Good luck with the presentation! :)",
@@ -220,6 +221,8 @@
220221
"settings": "Audio settings",
221222
"playlists": "Playlists",
222223
"playlist_settings": "Playlist settings",
224+
"open_audio_folder": "Open related audio folder",
225+
"create_audio_folder": "Create audio folder",
223226
"custom_output": "Custom audio output",
224227
"mute_when_video_plays": "Mute when video plays",
225228
"allow_gaining": "Allow gaining",
@@ -485,6 +488,7 @@
485488
"slide_midi": "Slide MIDI input",
486489
"user_data_overwrite": "Found existing data",
487490
"connect": "Connect",
491+
"cloud_sync": "Cloud sync",
488492
"cloud_update": "Syncing with cloud",
489493
"cloud_method": "Data location",
490494
"shortcuts": "Shortcuts",
@@ -648,6 +652,7 @@
648652
"reset": "Reset",
649653
"create_template": "Create template",
650654
"project_template_tip": "Create a new project from this template",
655+
"import_project_file": "Found a new project file. Would you like to import it?",
651656
"pdf_single_page": "Render as one document",
652657
"convert_to_images": "Convert to images",
653658
"converting": "Converting...",
@@ -849,22 +854,15 @@
849854
"seconds": "seconds"
850855
},
851856
"cloud": {
852-
"info": "Sync files with Google Drive for backups, or if you work on multiple computers.",
853-
"tip_api": "You have to provide your own free Google API key so the program can automatically upload files to your Google Drive.",
854-
"tip_how": "Don't know how to get one?",
855-
"tip_guide": "Click here for a guide.",
857+
"info": "Sync files to the cloud for backups or to access between multiple computers.",
856858
"enable": "Automatic sync on startup and close",
857-
"disable_upload": "Disable uploading data",
858-
"media_id": "Media path ID",
859-
"google_drive_api": "Google API service account key",
860-
"select_key": "Import keys file",
861-
"update_key": "Update keys file",
862-
"enable_custom_folder_id": "Use custom folder ID",
863-
"main_folder": "Set main folder manually",
859+
"read_only": "Read-only",
864860
"media_folder": "Cloud media folder",
865861
"reconnect": "Reconnect",
866862
"sync": "Sync now",
867-
"choose_method_tip": "There is existing data in the cloud. Please choose to either upload from local or download from cloud. The other location will be overwritten.",
863+
"choose_method_tip": "There is existing data in the cloud. What would you like to do?",
864+
"merge_tip": "Keep the latest changes from both local and cloud data.",
865+
"readonly_tip": "Merge cloud data with local data, but never upload local changes.",
868866
"local": "Local",
869867
"syncing": "Syncing to cloud",
870868
"sync_complete": "Sync completed"
@@ -1131,10 +1129,10 @@
11311129
"seconds": "Seconds",
11321130
"from": "From",
11331131
"to": "To",
1132+
"warn_early": "Early warning",
1133+
"warn_offset": "Seconds before end",
11341134
"overflow": "Overflow when reached end",
1135-
"overflow_color": "Overflow color",
1136-
"overflow_blink": "Blink when overflowing",
1137-
"overflow_blink_offset": "Start blinking early",
1135+
"flash": "Flash",
11381136
"preview": "Preview",
11391137
"clock": "Clock",
11401138
"event": "Event",

0 commit comments

Comments
 (0)