Skip to content

Commit

Permalink
v1.1.7 (#555)
Browse files Browse the repository at this point in the history
* 📄 Added x64 mac arch due to new arm64 Github Actions machines

* 📄 Added x64 mac arch to zip

* 🚩 Updated Italian language

* 📦 Added NDI macOS arm64 support

* Ndi Improvements (#519)

* Separated NDI sender and receiver

* Moved capture transmit functions into separate class

* Updated NDI frame timing to work when videos are not 60fps

* Have basic frame rate limiter working with some issues.

* Updating timer on ndi connect/disconnect

* Stop transmitting when capture is removed

* Lowered thumbnail quality and limited rate on multiple displays

* Removed logging

* 🔁 Fixed inconsistent cloud sync
- Updated Hungarian language

* 🔁 Updated cloud sync
- You can now interact directly with the YouTube output video

* ✨ Tweaked changing to the editor
- No more notifying update if prerelease
- Tweaked next slide timer
- Fixed deleting output leaving a disabled output

* Issue 543 fix (#544)

* Fixed pasting line breaks

* Handled Mac line breaks

* ✔ Fixed Lessons videos not always downloading
- Fixed Genius lyrics search
- Trying to fix cloud sync not always working
- Quick action buttons
- Adding multiple videos will unmute them by default
- Multiple videos in one show will have the same reference

* ✨ Videos not looping will not be added as "ghost backgrounds"
- Syncing starting on startup
- Small tweaks

* Simplify editbox (#545)

* Moving code that doesn't update state to EditboxHelper

* Moved plain logic to EditboxPlain

* Moved non-lines to EditboxOther

* Added EditboxChords

* Created EditboxLines

* Created /editbox folder

* 🔊 Audio playlists
- Controller Paint draw
- Audio loop saved
- Set local audio file volume
- Better output audio controls
- Play one audio file at a time by default
- Fixed audio favorites name

* 🧩 New Functions drawer tab
- Overlapping windows due to scaling should be properly sized
- Fixed PowerPoint linebreaks on multiple textboxes
- Slide action updates
- Fixed undefined drive shows
- Fixed some drive issues
- Fixed some freeze issues
- Small tweaks

* ✨ Updated new actions
- Fixed broken shows causing freeze
- Increase dev memory limit to 4GB
- Fixed some freeze issues

* ✨ Updated actions
- Run action on startup
- Fixed freeze when setting style with deleted template
- Auto add start slide timer action when adding timer
- Updates to MIDI
- Conditional context menu loading
- Fixed bugs causing freeze

* ✨ Lots of improvements
- Added Korean language
- Updated Norwegian language
- Readded Editbox overflow
- Fixed template not adding new items
- Properly adding/removing unused template items
- Fixed media files with special chars in name not playing
- Auto save on close without popup
- Action to play random silde
- MIDI velocity select will start from 1
- Fixed MIDI sending signal to all 16 channels
- Improved VideoPsalm import
- Selected category on import will be used
- Sort show names by any number
- Searching will scroll to top of list
- Scripture verse numbers will not get changed by template
- Stage labels
- Minor tweaks

---------

Co-authored-by: Jeremy Zongker <[email protected]>
  • Loading branch information
vassbo and jzongker authored Jun 7, 2024
1 parent ce0141d commit 031f4ab
Show file tree
Hide file tree
Showing 150 changed files with 6,028 additions and 2,976 deletions.
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"editor.formatOnSave": true
}
24 changes: 18 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "freeshow",
"version": "1.1.6",
"version": "1.1.7",
"private": true,
"main": "build/electron/index.js",
"description": "Show song lyrics and more for free!",
Expand All @@ -9,7 +9,7 @@
"license": "GPL-3.0",
"scripts": {
"prestart": "cross-env NODE_ENV=development node scripts/preBuild.js",
"start": "cross-env NODE_ENV=development npm-run-all -p -r build:frontend:dev start:electron",
"start": "cross-env NODE_OPTIONS=--max-old-space-size=4096 NODE_ENV=development npm-run-all -p -r build:frontend:dev start:electron",
"prebuild": "cross-env NODE_ENV=production node scripts/preBuild.js",
"build": "cross-env NODE_ENV=production npm-run-all -s build:frontend:prod build:electron:prod",
"postbuild": "cross-env NODE_ENV=production node scripts/postBuild.js",
Expand Down Expand Up @@ -56,8 +56,20 @@
"mac": {
"icon": "build/public/icon.png",
"target": [
"dmg",
"zip"
{
"target": "dmg",
"arch": [
"x64",
"arm64"
]
},
{
"target": "zip",
"arch": [
"x64",
"arm64"
]
}
],
"category": "public.app-category.utilities",
"hardenedRuntime": true,
Expand Down Expand Up @@ -154,8 +166,8 @@
"express": "^4.17.2",
"follow-redirects": "^1.15.2",
"font-list": "^1.4.5",
"genius-lyrics": "^4.4.3",
"grandiose": "vassbo/grandiose#d85d4ab",
"genius-lyrics": "4.4.6",
"grandiose": "vassbo/grandiose#fa2ac4b",
"jzz": "^1.5.9",
"node-machine-id": "^1.1.12",
"npm-run-all": "^4.1.5",
Expand Down
61 changes: 48 additions & 13 deletions public/lang/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,10 @@
"media": {
"_loop": "Loop",
"play": "Play",
"play_multiple": "Play multiple",
"toggle_shuffle": "Toggle shuffle",
"next": "Next",
"previous": "Previous",
"play_no_filters": "Play without filters",
"favourite": "Favorite",
"pause": "Pause",
Expand Down Expand Up @@ -280,6 +284,8 @@
"effects": "Effects",
"scripture": "Scripture",
"calendar": "Calendar",
"functions": "Functions",
"actions": "Actions",
"player": "Player",
"live": "Live",
"timers": "Timers",
Expand Down Expand Up @@ -334,7 +340,6 @@
"change_name": "Change name on",
"choose_screen": "Choose screen",
"change_output_values": "Change output values",
"choose_style": "Choose style",
"set_time": "Set time",
"animate": "Animate",
"next_timer": "Next slide timer",
Expand All @@ -346,7 +351,7 @@
"edit_event": "Edit event",
"about": "About",
"history": "History",
"midi": "MIDI",
"action": "Action",
"connect": "Connect",
"cloud_update": "Syncing with cloud",
"cloud_method": "Data location",
Expand All @@ -356,7 +361,7 @@
"manage_colors": "Manage colors",
"choose_camera": "Choose camera",
"initialize": "Welcome to FreeShow",
"unsaved": "You have not saved yet! Are you sure you want to quit?",
"unsaved": "Are you sure you want to quit?",
"cancel": "Cancel",
"continue": "Continue",
"reset_all": "Reset everything",
Expand Down Expand Up @@ -403,6 +408,7 @@
"variable": "New variable",
"trigger": "New trigger",
"audio_stream": "New audio stream",
"playlist": "New playlist",
"category": "New category",
"private": "New private show",
"folder": "New folder",
Expand All @@ -411,6 +417,7 @@
"template": "New template",
"scripture": "New scripture",
"collection": "New collection",
"action": "New action",
"event": "New event"
},
"show": {
Expand All @@ -433,7 +440,6 @@
"remove_group": "Remove group",
"choose_group": "Choose group",
"goto_group": "Go to group",
"change_output_style": "Change output style",
"active_outputs": "Active outputs",
"all_outputs": "All outputs",
"specific_outputs": "Specific outputs",
Expand Down Expand Up @@ -475,6 +481,8 @@
"home": "Home",
"mute": "Mute",
"unmute": "Unmute",
"increase_volume": "Increase volume",
"decrease_volume": "Decrease volume",
"toggle_time_marker": "Toggle time markers",
"add_time_marker": "Add time marker",
"bind_to": "Specific outputs",
Expand Down Expand Up @@ -505,12 +513,13 @@
"change_drawer_item": "Change drawer item",
"change_drawer_category": "Change drawer category",
"toggle_drawer": "Toggle drawer",
"actions": "Actions",
"slide_actions": "Slide actions",
"clear_history": "Clear history",
"set_key": "Set key",
"custom_key": "Set custom value",
"play_on_midi": "Play on MIDI in",
"send_midi": "Send MIDI out",
"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",
"delete_shows_not_indexed": "Delete shows in 'Shows' folder that are not indexed",
"delete_thumbnail_cache": "Delete thumbnail cache",
"open_log_file": "Open log file",
Expand All @@ -520,11 +529,33 @@
"next_after_media": "Next on media finished",
"remove_media": "Remove media",
"remove_layers": "Remove layers",
"start_recording": "Start recording",
"stop_recording": "Stop recording",
"activate_on_startup": "Activate on startup",
"index_select_project": "Select project by index",
"index_select_project_show": "Select project item by index",
"next_project_item": "Next project item",
"previous_project_item": "Previous project item",
"index_select_project_item": "Select project item by index",
"name_select_show": "Select show by name",
"random_slide": "Play random slide",
"index_select_slide": "Select slide by index",
"start_recording": "Start recording",
"stop_recording": "Stop recording"
"name_select_slide": "Select slide by name",
"toggle_output_lock": "Toggle output lock",
"toggle_output_windows": "Toggle output windows",
"id_select_group": "Select group by ID",
"id_change_stage_layout": "Change stage layout by ID",
"index_select_overlay": "Select overlay by index",
"name_select_overlay": "Select overlay by name",
"change_volume": "Change volume",
"start_audio_stream": "Start audio stream",
"start_playlist": "Start playlist",
"start_slide_timers": "Start timers on active slide",
"id_select_output_style": "Select output style by ID",
"change_output_style": "Change output style",
"change_transition": "Change transition",
"change_variable": "Change variable",
"start_trigger": "Start trigger",
"run_action": "Run action"
},
"animate": {
"change": "Change",
Expand All @@ -551,7 +582,7 @@
"main_folder": "Set main folder manually",
"media_folder": "Cloud media folder",
"reconnect": "Reconnect",
"sync": "Sync",
"sync": "Sync now",
"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.",
"local": "Local",
"syncing": "Syncing to cloud",
Expand Down Expand Up @@ -763,6 +794,8 @@
"seconds": "Seconds"
},
"midi": {
"midi": "MIDI",
"activate": "Activate by MIDI signal",
"name": "Name",
"input": "Input",
"output": "Output",
Expand Down Expand Up @@ -814,15 +847,16 @@
"font-size": "Font Size",
"zeros": "Zeros",
"overrun": "Overrun Color",
"auto_stretch": "Auto stretch content"
"source_output": "Source output",
"auto_stretch": "Auto stretch content",
"labels": "Show labels"
},
"settings": {
"general": "General",
"theme": "Theme",
"groups": "Groups",
"styles": "Styles",
"display_settings": "Outputs",
"actions": "Actions",
"display": "Display",
"connection": "Connection",
"cloud": "Cloud",
Expand Down Expand Up @@ -879,6 +913,7 @@
"show_location": "Show location",
"data_location": "Data location",
"user_data_location": "Save user settings at 'Data location'",
"popup_before_close": "Always display popup before closing",
"font": "Font",
"font_family": "Font family",
"font_size": "Font size",
Expand Down
22 changes: 15 additions & 7 deletions public/lang/hu.json
Original file line number Diff line number Diff line change
Expand Up @@ -389,9 +389,9 @@
"deleted_cache": "Médiabélyegkép gyorsítótár törölve.",
"no_songswords_easyworship": "Hiányzik a SongsWords.db fájl.",
"delete_shows_empty": "Nincsenek törlendő műsorok.",
"midi_no_project": "MIDI-t kaptunk a projekt módosítására, de nem található projekt az indexen:",
"midi_no_show": "MIDI-t kaptunk a dia indítására, de nincs aktív műsor.",
"midi_no_slide": "MIDI-t kaptunk a dia indítására, de nem található dia az indexen:",
"midi_no_project": "Eseményindítót kaptunk a projekt módosítására, de nem található projekt az indexen:",
"midi_no_show": "Eseményindítót kaptunk a dia indítására, de nincs aktív műsor.",
"midi_no_slide": "Eseményindítót kaptunk a dia indítására, de nem található dia az indexen:",
"midi_no_velocity": "MIDI jelet kaptunk, de nincs sebesség, az alapértelmezett az első index lett."
},
"new": {
Expand Down Expand Up @@ -500,6 +500,10 @@
"toggle_output": "Kimeneti képernyő átváltása",
"change_tab": "Fül módosítása",
"change_drawer_tab": "Rajzoló fül módosítása",
"change_slide": "Dia módosítása",
"change_project_item": "Projektelem módosítása",
"change_drawer_item": "Rajzoló elem módosítása",
"change_drawer_category": "Rajzoló kategória módosítása",
"toggle_drawer": "Rajzoló átváltása",
"actions": "Műveletek",
"clear_history": "Előzmények törlése",
Expand Down Expand Up @@ -538,7 +542,7 @@
"tip_api": "Saját ingyenes Google API-kulcsot kell megadnni, hogy a program automatikusan feltölthesse a fájlokat a Google Drive-ba.",
"tip_how": "Hogyan szerezhetek ilyet?",
"tip_guide": "Útmutató itt.",
"enable": "Automatikus szinkronizálás indításkor és mentéskor",
"enable": "Automatikus szinkronizálás indításkor és bezáráskor",
"disable_upload": "Feltöltés letiltása",
"media_id": "Média útvonalazonosító",
"google_drive_api": "Google API szolgáltatási fiók kulcsa",
Expand All @@ -548,8 +552,10 @@
"media_folder": "Felhő médiamappa",
"reconnect": "Újracsatlakozás",
"sync": "Szinkronizálás",
"choose_method_tip": "Meglévő adatok vannak a felhőben. Válassza ki, hogy melyik helyen szeretné megtartani az adatokat, illetve felülírni a másik helyet.",
"local": "Helyi"
"choose_method_tip": "Vannak meglévő adatok a felhőben. Kérjük, válassza a helyi adatok feltöltését vagy a felhőből való letöltést. A másik hely felülírásra kerül.",
"local": "Helyi",
"syncing": "Szinkronizálás a felhőbe",
"sync_complete": "Szinkronizálás kész"
},
"export": {
"export": "Exportálás",
Expand Down Expand Up @@ -624,6 +630,7 @@
"media_fit": "Média méretezése",
"size": "Méret",
"chords": "Akkordok",
"transpose": "Transzponálás",
"auto_size": "Automatikus méret",
"no_wrap": "Egysoros szöveg",
"line_spacing": "Sorköz",
Expand Down Expand Up @@ -849,6 +856,7 @@
"window": "Ablak",
"active_style": "Stílus alkalmazása",
"alert_updates": "Értesítés új frissítésről",
"auto_updates": "Automatikus frissítés",
"disable_labels": "Címkék letiltása",
"group_numbers": "Csoportszámok",
"full_colors": "Teljes diacsoport színek",
Expand Down Expand Up @@ -1032,4 +1040,4 @@
"template": "Sablon",
"category": "Kategória"
}
}
}
22 changes: 15 additions & 7 deletions public/lang/it.json
Original file line number Diff line number Diff line change
Expand Up @@ -389,9 +389,9 @@
"deleted_cache": "Cache delle miniature multimediali eliminata.",
"no_songswords_easyworship": "File SongsWords.db mancante.",
"delete_shows_empty": "Nessuna scena da eliminare.",
"midi_no_project": "MIDI ricevuto per cambiare progetto, ma nessun progetto trovato nell'indice:",
"midi_no_show": "MIDI ricevuto per avviare la diapositiva, ma nessuna scena è attiva.",
"midi_no_slide": "MIDI ricevuto per avviare la diapositiva, ma nessuna diapositiva trovata nell'indice:",
"midi_no_project": "Trigger ricevuto per modificare il progetto, ma nessun progetto trovato nell'indice:",
"midi_no_show": "Trigger ricevuto per avviare la diapositiva, ma nessuno spettacolo attivo.",
"midi_no_slide": "Trigger ricevuto per avviare la diapositiva, ma nessuna diapositiva trovata nell'indice:",
"midi_no_velocity": "Segnale MIDI ricevuto, ma nessuna velocità, per impostazione predefinita è il primo indice."
},
"new": {
Expand Down Expand Up @@ -500,6 +500,10 @@
"toggle_output": "Attiva/disattiva la schermata di output",
"change_tab": "Cambia scheda",
"change_drawer_tab": "Cambia scheda cassetto",
"change_slide": "Cambia dispositiva",
"change_project_item": "Modifica elemento del progetto",
"change_drawer_item": "Cambia elemento nel cassetto",
"change_drawer_category": "Cambia categoria del cassetto",
"toggle_drawer": "Attiva cassetto",
"actions": "Azioni",
"clear_history": "Pulisci cronologia",
Expand Down Expand Up @@ -538,7 +542,7 @@
"tip_api": "Devi fornire la tua chiave API Google gratuita in modo che il programma possa caricare automaticamente i file sul tuo Google Drive.",
"tip_how": "Non sai come ottenerne una?",
"tip_guide": "Clicca qui per una guida.",
"enable": "Sincronizzazione automatica all'avvio e salvataggio",
"enable": "Sincronizzazione automatica all'avvio e alla chiusura",
"disable_upload": "Disabilita l'upload",
"media_id": "ID percorso multimediale",
"google_drive_api": "Chiave dell'account di servizio dell'API di Google",
Expand All @@ -548,8 +552,10 @@
"media_folder": "Cartella multimediale cloud",
"reconnect": "Riconnetti",
"sync": "Sincronizza",
"choose_method_tip": "Ci sono dati esistenti nel cloud. Si prega di scegliere da dove si desidera conservare i dati. E ignora l'altra posizione.",
"local": "Locale"
"choose_method_tip": "Ci sono dati esistenti nel cloud. Scegli di caricare da locale o scaricare da cloud. L'altra posizione verrà sovrascritta.",
"local": "Locale",
"syncing": "Sincronizzazione sul cloud",
"sync_complete": "Sincronizzazione completata"
},
"export": {
"export": "Esporta",
Expand Down Expand Up @@ -624,6 +630,7 @@
"media_fit": "Adatta media",
"size": "Dimensione",
"chords": "Accordi",
"transpose": "Trasporre",
"auto_size": "Dimensione automatica",
"no_wrap": "Testo su una riga",
"line_spacing": "Interlinea",
Expand Down Expand Up @@ -849,6 +856,7 @@
"window": "Finestra",
"active_style": "Usa stile",
"alert_updates": "Avvisa quando è disponibile un nuovo aggiornamento",
"auto_updates": "Aggiornamenti automatici",
"disable_labels": "Disattiva etichette",
"group_numbers": "Numeri di gruppo",
"full_colors": "Colori completi del gruppo di diapositive",
Expand Down Expand Up @@ -1032,4 +1040,4 @@
"template": "Modello",
"category": "Categoria"
}
}
}
Loading

0 comments on commit 031f4ab

Please sign in to comment.