Skip to content

Commit

Permalink
1.3.4 (#1207)
Browse files Browse the repository at this point in the history
* ✨ Minor tweaks

* ✓ Fixed typo

* Automate update of snap version (#1199)

This just makes my life easier when updating the snap

* 📖 Auto detect Bible format
- Added support for more special characters to .pro import
- Updated Hungarian language

* ✨ Lower third templates
- Fixed an issue with Zefania Bible import
- Slide template visible with icon
- Fixed freezes when undoing certain actions
- Context menu quick fade transition
- Fixed global group not added to end

* ✏️ Better item snapping
- Add multiple of certain actions
- Updated translations

* ✨ Enhancements
- Active output style background image state visible
- Metadata item transition working
- Metadata default style same as template
- "Clear style background if active" also hides background if another background is active
- Audio clears instantly if paused
- Hold CTRL to add empty slide
- Adding a new slide should always place editor at correct index
- Updated Spanish language
- Version update

---------

Co-authored-by: Erich Eickmeyer <[email protected]>
  • Loading branch information
vassbo and eeickmeyer authored Jan 21, 2025
1 parent d1945fb commit 7090a72
Show file tree
Hide file tree
Showing 55 changed files with 601 additions and 283 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
name: Bug report
about: Help up improve the stability of FreeShow
about: Help us improve the stability of FreeShow
title: ""
labels: bug
assignees: ''
Expand Down
2 changes: 2 additions & 0 deletions makesnap
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
#!/bin/bash
set -e

version=$(grep "\"version\"" package.json | cut -d ":" -f 2 | cut -d "\"" -f 2)
sed -i "s/version:.*/version: ${version}/" snap/snapcraft.yaml
npm install
npm run build
npm run pack
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "freeshow",
"version": "1.3.4-beta.2",
"version": "1.3.4",
"private": true,
"main": "build/electron/index.js",
"description": "Show song lyrics and more for free!",
Expand Down
Binary file removed public/import-logos/beblia.webp
Binary file not shown.
Binary file removed public/import-logos/bible_json.webp
Binary file not shown.
2 changes: 2 additions & 0 deletions public/lang/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,7 @@
"no_layouts": "Could not find any layouts",
"load": "Could not load",
"bible": "Could not find local scripture",
"import": "Could not import",
"bible_api": "Could not load scripture from API.Bible, do you have an internet connection?",
"not_found": "Not found",
"display": "Could not show output window on current display",
Expand Down Expand Up @@ -1231,6 +1232,7 @@
"scripture": {
"bibles": "Bibles from API.Bible",
"local": "Import local file",
"supported_formats": "Supported formats:",
"max_verses": "Max verses per slide",
"verse_numbers": "Verse numbers",
"verses_on_individual_lines": "Verses on individual lines",
Expand Down
29 changes: 26 additions & 3 deletions public/lang/en_GB.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"right": "Right",
"bottom": "Bottom",
"left": "Left",
"centered": "Centered",
"centered": "Centred",
"edge_blending_tip": "Blend together multiple outputs/projectors for a more seamless transition",
"cropping_tip": "Fine adjust the window content position by cropping the sides"
},
Expand Down Expand Up @@ -104,6 +104,7 @@
"web": "Web search",
"search_web": "Search for song on the web",
"search_results": "Search results",
"block": "Block",
"more_options": "More options",
"auto_groups": "Auto assign groups",
"format_new_show": "Format text",
Expand Down Expand Up @@ -148,6 +149,7 @@
"overlays": "Clear overlays",
"audio": "Clear audio",
"nextTimer": "Clear next slide timer",
"timer": "Clear timer",
"drawing": "Clear drawing"
},
"remove": {
Expand Down Expand Up @@ -400,6 +402,7 @@
"trigger": "Trigger",
"audio_stream": "Audio stream",
"transition": "Transition",
"media_fit": "Change media fit",
"delete_show": "Delete show",
"delete_show_confirmation": "Are you sure you want to delete",
"delete_duplicated_shows": "Delete duplicated shows",
Expand All @@ -413,6 +416,7 @@
"animate": "Animate",
"translate": "Localisation ",
"next_timer": "Next slide timer",
"display_duration": "Display duration",
"import": "Import",
"songbeamer_import": "Songbeamer Import",
"export": "Export",
Expand All @@ -422,6 +426,7 @@
"edit_event": "Edit event",
"about": "About",
"history": "History",
"manage_emitters": "Manage emitters",
"action": "Action",
"category_action": "Category action",
"user_data_overwrite": "Found existing data",
Expand Down Expand Up @@ -578,6 +583,7 @@
"unmute": "Unmute",
"increase_volume": "Increase volume",
"decrease_volume": "Decrease volume",
"manage_subtitles": "Manage subtitles",
"toggle_time_marker": "Toggle time markers",
"add_time_marker": "Add time marker",
"bind_to": "Specific outputs",
Expand Down Expand Up @@ -681,8 +687,10 @@
"start_trigger": "Start trigger",
"run_action": "Run action",
"toggle_action": "Toggle action",
"emit_data": "Emit data",
"send_rest_command": "Send HTTP-Request",
"custom_activation": "Custom activation",
"any": "Any",
"activate_on_startup": "Activate on startup",
"activate_save": "Activate on save",
"activate_slide_clicked": "Activate on slide click",
Expand Down Expand Up @@ -750,6 +758,8 @@
"all_shows": "All shows",
"all_projects": "All projects",
"project": "Project",
"option_type": "What would you like to export?",
"option_format": "What format would you like?",
"include_media": "Include media files",
"preview": "Preview",
"title": "Title",
Expand Down Expand Up @@ -950,6 +960,7 @@
"to_event": "Time until event",
"counter": "Countdown",
"time": "Time",
"hours": "Hours",
"minutes": "Minutes",
"seconds": "Seconds",
"from": "From",
Expand All @@ -969,7 +980,9 @@
"type": "Type",
"digital": "Digital",
"analog": "Analogue",
"seconds": "Seconds"
"seconds": "Seconds",
"custom": "Custom",
"show_time": "Display time"
},
"captions": {
"info": "Please click the URL to open in your browser if you haven't already, or open it on any other device! Make sure to give access to your microphone, and use Google Chrome for the best performance.",
Expand Down Expand Up @@ -1002,6 +1015,14 @@
"tip_action": "To activate specific slides, right click any slide and choose the midi in action.",
"tip_index_by_velocity": "Index is determined by the received velocity, starting at 0."
},
"emitters": {
"emitter": "Emitter",
"tip": "Create emit templates to easily send specific messages.",
"signal": "Signal",
"message_template": "Message template",
"message_templates": "Message templates",
"inputs": "Inputs"
},
"draw": {
"focus": "Focus",
"pointer": "Pointer",
Expand Down Expand Up @@ -1090,13 +1111,15 @@
"lines": "Lines",
"override_with_template": "Override slide with template",
"override_scripture_with_template": "Override scripture with template",
"overrided_value": "A template might override this value",
"active_layers": "Active layers",
"window": "Window",
"active_style": "Use style",
"alert_updates": "Alert when a new update is available",
"auto_updates": "Auto updates",
"disable_labels": "Disable labels",
"group_numbers": "Group numbers",
"transparent_slides": "Transparent slide preview",
"full_colors": "High contrast group colours",
"slide_number_keys": "Play slides with number keys",
"auto_shortcut_first_letter": "Auto shortcut to first letter in text",
Expand Down Expand Up @@ -1207,7 +1230,7 @@
},
"scripture": {
"bibles": "Bibles from API.Bible",
"custom": "Or import your own",
"local": "Import local file",
"max_verses": "Max verses per slide",
"verse_numbers": "Verse numbers",
"verses_on_individual_lines": "Verses on individual lines",
Expand Down
29 changes: 26 additions & 3 deletions public/lang/en_ZM.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"right": "Right",
"bottom": "Bottom",
"left": "Left",
"centered": "Centered",
"centered": "Centred",
"edge_blending_tip": "Blend together multiple outputs/projectors for a more seamless transition",
"cropping_tip": "Fine adjust the window content position by cropping the sides"
},
Expand Down Expand Up @@ -104,6 +104,7 @@
"web": "Web search",
"search_web": "Search for song on the web",
"search_results": "Search results",
"block": "Block",
"more_options": "More options",
"auto_groups": "Auto assign groups",
"format_new_show": "Format text",
Expand Down Expand Up @@ -148,6 +149,7 @@
"overlays": "Clear overlays",
"audio": "Clear audio",
"nextTimer": "Clear next slide timer",
"timer": "Clear timer",
"drawing": "Clear drawing"
},
"remove": {
Expand Down Expand Up @@ -400,6 +402,7 @@
"trigger": "Trigger",
"audio_stream": "Audio stream",
"transition": "Transition",
"media_fit": "Change media fit",
"delete_show": "Delete show",
"delete_show_confirmation": "Are you sure you want to delete",
"delete_duplicated_shows": "Delete duplicated shows",
Expand All @@ -413,6 +416,7 @@
"animate": "Animate",
"translate": "Localisation",
"next_timer": "Next slide timer",
"display_duration": "Display duration",
"import": "Import",
"songbeamer_import": "Songbeamer Import",
"export": "Export",
Expand All @@ -422,6 +426,7 @@
"edit_event": "Edit event",
"about": "About",
"history": "History",
"manage_emitters": "Manage emitters",
"action": "Action",
"category_action": "Category action",
"user_data_overwrite": "Found existing data",
Expand Down Expand Up @@ -578,6 +583,7 @@
"unmute": "Unmute",
"increase_volume": "Increase volume",
"decrease_volume": "Decrease volume",
"manage_subtitles": "Manage subtitles",
"toggle_time_marker": "Toggle time markers",
"add_time_marker": "Add time marker",
"bind_to": "Specific outputs",
Expand Down Expand Up @@ -681,8 +687,10 @@
"start_trigger": "Start trigger",
"run_action": "Run action",
"toggle_action": "Toggle action",
"emit_data": "Emit data",
"send_rest_command": "Send HTTP-Request",
"custom_activation": "Custom activation",
"any": "Any",
"activate_on_startup": "Activate on startup",
"activate_save": "Activate on save",
"activate_slide_clicked": "Activate on slide click",
Expand Down Expand Up @@ -750,6 +758,8 @@
"all_shows": "All shows",
"all_projects": "All projects",
"project": "Project",
"option_type": "What would you like to export?",
"option_format": "What format would you like?",
"include_media": "Include media files",
"preview": "Preview",
"title": "Title",
Expand Down Expand Up @@ -950,6 +960,7 @@
"to_event": "Time until event",
"counter": "Countdown",
"time": "Time",
"hours": "Hours",
"minutes": "Minutes",
"seconds": "Seconds",
"from": "From",
Expand All @@ -969,7 +980,9 @@
"type": "Type",
"digital": "Digital",
"analog": "Analogue",
"seconds": "Seconds"
"seconds": "Seconds",
"custom": "Custom",
"show_time": "Display time"
},
"captions": {
"info": "Please click the URL to open in your browser if you haven't already, or open it on any other device! Make sure to give access to your microphone, and use Google Chrome for the best performance.",
Expand Down Expand Up @@ -1002,6 +1015,14 @@
"tip_action": "To activate specific slides, right click any slide and choose the midi in action.",
"tip_index_by_velocity": "Index is determined by the received velocity, starting at 0."
},
"emitters": {
"emitter": "Emitter",
"tip": "Create emit templates to easily send specific messages.",
"signal": "Signal",
"message_template": "Message template",
"message_templates": "Message templates",
"inputs": "Inputs"
},
"draw": {
"focus": "Focus",
"pointer": "Pointer",
Expand Down Expand Up @@ -1090,13 +1111,15 @@
"lines": "Lines",
"override_with_template": "Override slide with template",
"override_scripture_with_template": "Override scripture with template",
"overrided_value": "A template might override this value",
"active_layers": "Active layers",
"window": "Window",
"active_style": "Use style",
"alert_updates": "Alert when a new update is available",
"auto_updates": "Auto updates",
"disable_labels": "Disable labels",
"group_numbers": "Group numbers",
"transparent_slides": "Transparent slide preview",
"full_colors": "High contrast group colours",
"slide_number_keys": "Play slides with number keys",
"auto_shortcut_first_letter": "Auto shortcut to first letter in text",
Expand Down Expand Up @@ -1207,7 +1230,7 @@
},
"scripture": {
"bibles": "Bibles from API.Bible",
"custom": "Or import your own",
"local": "Import local file",
"max_verses": "Max verses per slide",
"verse_numbers": "Verse numbers",
"verses_on_individual_lines": "Verses on individual lines",
Expand Down
Loading

0 comments on commit 7090a72

Please sign in to comment.