Skip to content

Commit df5c41a

Browse files
vassbojzongkerschplayToaster996frederickjh
authored
1.6.4-beta.2 (#3517)
* Don't fail license check if offline * Fixed Flipped Checkbox Logic (#3474) * Added Conditions button for Output window item #3461 * Fixed output stacking #3469 * Prebuilt Aero Peak Helper #3476 * Applied code changes sent in by Amazing Life Foundation. * Fix import of pro6 files (#3487) * Updated the bug report template. Mainly to ask users to check for duplicate bugs and test on the latest stable and beta versions before filling, but also added directions to encourage the users to help figure out if a certain OS or in what version of FreeShow the issue started. (#3507) * Fix undo/redo media leak and layout corruption in SLIDES history (#3497) * Fix stage output window lag/freeze and reduce capture overhead (#3498) * Removed unused Mirror item * Fix web stage 'Keep Style' rendering not matching the app (#3499) * Fix audio playlist stopping after one song (#3500) * Fixed StageShow item size not stretching to large resolutions * Fixed server not auto starting after toggled back on * Fixing errors * Fixed many files loading at once * Fixed errors * Fixing errors * Smarter auto groups #3511 * Remove unused List item * Fixed Focus mode navigation through duplicated shows #3467 * Fixed template Styles overwrites not working correctly with auto size #3480 * Remove list item remains * Tweaked Sentry logging init * Added script to rebuild OPUS propely in case of Not found! * Toggle to disable PCO auto sync on startup #3490 * Merge improvements #3492 * Internal pasting keeps formatting #3493 * Missing Visual C++ Redistributable Info * Event item from/to time of day * Fixed line align updating * Enhancements * Fixed text selection sometimes deselected when it should not * Fixed text selection sometimes deselected when it should not * Fixed Spotify time jumping * Enhancements * Interaction updates * Tips * Tweak * Updated Polish language * Added syncManager test - Cloud fixes * Fixed output stacking sometimes * Fixed Planning Center shows replaced when also syncing to cloud #2777 * Content provider run timer * Reduced expand arrows - Moved some buttons to context menus - Fixed NDI inputs groups option not showing * Fixed cloud test casing * Edit mode tabs * Unique tab name * Unique tab name * Fixed slide zoom in * Fixed new cloud devices not marking uploads as new * Added three machine sync test * Fixed startup sync * Changed fallback char from | to ? * Tweak * Split multiple items in two #3477 * Fixed scripture show verses not splitted in two properly * Text edit highlighted #3468 * Fixed scroll height * Highlight dynamic values * Version update --------- Co-authored-by: Jeremy Zongker <jeremy@zongker.net> Co-authored-by: David Myers <david.d.myers@gmail.com> Co-authored-by: Jonas <32509408+Toaster996@users.noreply.github.com> Co-authored-by: Frederick Henderson <frederickjh@users.noreply.github.com> Co-authored-by: Victor <vicholz@gmail.com>
1 parent 16746bc commit df5c41a

151 files changed

Lines changed: 4702 additions & 3207 deletions

File tree

Some content is hidden

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

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,17 @@ labels: bug
66
assignees: ''
77

88
---
9+
<!-- Before filling a bug report please be able to answer the following three questions with a YES (Please delete the No after each question). Failure to do so may result in your bug being closed as a duplicate. This waste the developers time.
10+
11+
This will help to reduce the number of duplicate bug reports and reports for bugs that have already been fixed in newer versions. Please respect our developers time and take the time to check for similar issues and test or the latest stable and beta versions. The lastest versions stable and beta can always be found on the GitHub releases page. https://github.com/ChurchApps/FreeShow/releases -->
12+
13+
<!-- Please search for keywords related to your issue to see if it has already been reported. Do not forget to check the closed issues as it may already have been resolved in a newer release. When searching issues it defaults to showing open issues but at the top will also show you the number of closed issues related to your search. Clicking on "Closed" will switch you to the list of matching closed issues. -->
14+
15+
**Have you searched the FreeShow issues on GitHub (open and closed) for similar or the same issue and not found any matching or similar issues? Yes/No**
16+
17+
**Have you tested and been able to reproduce the bug on the latest stable version? Yes/No** <!-- [e.g. 1.6.3, 1.6.4] -->
18+
19+
**Have you tested and been able to reproduce the bug on the latest beta version? Yes/No** <!-- [e.g. 1.6.3-beta.1, 1.6.4-beta.3] -->
920

1021
**Describe the bug**
1122
<!-- A clear and concise description of what the bug is. -->
@@ -17,6 +28,7 @@ assignees: ''
1728
<!-- If applicable, add screenshots to help explain your problem. -->
1829

1930
**Version (Optional)**
31+
<!-- If you know that the issues is related to a specific OS please include it here. If you are able to determine in what version of FreeShow the issue started, please include that here and mention it in the description. -->
2032
- OS: <!-- [Windows/MacOS/Linux] -->
2133
- FreeShow Version: <!-- [e.g. 1.0.0] -->
2234

package-lock.json

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

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "freeshow",
3-
"version": "1.6.4-beta.1",
3+
"version": "1.6.4-beta.2",
44
"private": true,
55
"main": "build/electron/index.js",
66
"description": "Show song lyrics and more for free!",
@@ -16,6 +16,7 @@
1616
},
1717
"scripts": {
1818
"postinstall": "electron-builder install-app-deps",
19+
"rebuild-opus": "electron-rebuild -f -w @discordjs/opus",
1920
"---DEVELOPMENT---": "",
2021
"start": "node scripts/start.js",
2122
"start:old": "npx cross-env NODE_ENV=development npm-run-all -p -r build:frontend:dev start:electron",
4 KB
Binary file not shown.

public/lang/en.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1422,6 +1422,7 @@
14221422
"content_provider": "Content provider",
14231423
"connect_to": "Connect to $1",
14241424
"disconnect_from": "Disconnect from $1",
1425+
"auto_sync_startup": "Auto sync on startup",
14251426
"sync_categories_tip": "Select which categories to upload as songs",
14261427
"reset_all": "Reset everything",
14271428
"reset_theme": "Reset theme",

public/lang/no.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"titlebar": {
3333
"file": "Fil",
3434
"edit": "Rediger",
35-
"view": "Visning",
35+
"view": "Vis",
3636
"help": "Hjelp"
3737
},
3838
"screen": {

public/lang/pl.json

Lines changed: 45 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
"show": "Pokaż",
2121
"project": "Projekt",
2222
"template": "Szablon",
23+
"action": "Akcja",
2324
"theme": "Motyw",
2425
"clipboard": "Schowek",
2526
"text": "Plik tekstowy"
@@ -84,7 +85,6 @@
8485
},
8586
"tips": {
8687
"show_add_project": "Wciśnij Enter, aby dodać do projektu",
87-
"trigger": "Wyzwalacze są często używane do przesyłu zapytań HTTP aby zmienić presety kamer",
8888
"global_options": "Opcje te są stosowane globalnie.",
8989
"consider_templates": "Wprowadziłeś te same zmiany w wielu slajdach. Rozważ użycie szablonu.",
9090
"category_template": "Ten pokaz należy do kategorii, dla której ustawiono szablon, który nadpisze wszelkie wprowadzone zmiany.",
@@ -424,6 +424,7 @@
424424
"live": "Na żywo",
425425
"timers": "Timery",
426426
"variables": "Zmienne",
427+
"interactions": "Interakcje",
427428
"triggers": "Wyzwalacze",
428429
"templates": "Szablony",
429430
"web": "Internet",
@@ -478,6 +479,7 @@
478479
"edit_list": "Edytuj listę",
479480
"timer": "Timer",
480481
"variable": "Zmienna",
482+
"interaction_input": "Dane wejściowe",
481483
"trigger": "Wyzwalacz",
482484
"audio_stream": "Strumień audio",
483485
"now_playing": "Teraz odtwarzany plik",
@@ -514,6 +516,7 @@
514516
"player": "Odtwarzacz",
515517
"edit_event": "Edytuj wydarzenie",
516518
"about": "Informacje",
519+
"update_manager": "Menedżer aktualizacji",
517520
"history": "Historia",
518521
"action_history": "Historia akcji",
519522
"manage_emitters": "Zarządzanie emiterami",
@@ -544,6 +547,7 @@
544547
"timecode": "Timecode",
545548
"drawer_search_options": "Opcje wyszukiwania",
546549
"template_info": "Informacje o szablonie",
550+
"cleaning_utility": "Narzędzie czyszczące",
547551
"initialize": "Witaj",
548552
"unsaved": "Czy na pewno chcesz wyjść?",
549553
"cancel": "Anuluj",
@@ -582,8 +586,7 @@
582586
"lyrics_undefined": "Nie znaleziono słów do pieśni!",
583587
"lyrics_copied": "Tekst skopiowany z",
584588
"one_output": "Musisz mieć co najmniej jedno aktywne wyjście!",
585-
"empty_cache": "Pamięć podręczna jest pusta.",
586-
"deleted_cache": "Usunięto pamięć podręczną miniatur multimediów.",
589+
"canva_exporting": "Eksportowanie prezentacji z Canva. Może to chwilę potrwać...",
587590
"no_songswords_easyworship": "Brakuje pliku SongsWords.db",
588591
"delete_shows_empty": "Brak pokazów do usunięcia.",
589592
"reached_end": "Dotarłeś do końca!",
@@ -620,7 +623,8 @@
620623
"action": "Nowa akcja",
621624
"event": "Nowe wydarzenie",
622625
"event_action": "Nowe zaplanowane wydarzenie",
623-
"effect": "Nowy efekt"
626+
"effect": "Nowy efekt",
627+
"interaction": "Nowa interakcja"
624628
},
625629
"show": {
626630
"name": "Nazwa",
@@ -679,6 +683,7 @@
679683
"done": "Gotowe",
680684
"disable": "Dezaktywuj",
681685
"enable": "Aktywuj",
686+
"enable_specific": "Włącz $1",
682687
"undo": "Cofnij",
683688
"redo": "Przywróć",
684689
"cut": "Wytnij",
@@ -788,15 +793,13 @@
788793
"archive_title": "Archiwum",
789794
"delete_shows_not_indexed": "Usuń z folderu pokazy, które nie są zaindeksowane",
790795
"delete_empty_shows": "Usuń puste pokazy",
791-
"delete_thumbnail_cache": "Usuń pamięć podręczną miniaturek",
792796
"export_usage_log": "Eksport logów użytkowania",
793797
"reset_usage_log": "Resetowanie logów użytkowania",
794798
"open_log_file": "Otwórz plik z logami",
795799
"open_error_log": "Otwórz dziennik błędów",
796800
"open_cache_folder": "Otwórz folder pamięci podręcznej",
797801
"open_app_data_folder": "Otwórz folder danych aplikacji",
798802
"open_user_data_folder": "Otwórz folder danych użytkownika",
799-
"refresh_all_shows": "Załaduj ponownie pliki \".show\"",
800803
"start_timer": "Rozpocznij odliczanie",
801804
"pause_timers": "Zatrzymaj aktywne timery",
802805
"stop_timers": "Zatrzymaj aktywny timer",
@@ -925,7 +928,8 @@
925928
"replace_tip": "Najpierw zamień dane lokalne na dane w chmurze, a potem połącz je normalnie.",
926929
"local": "Lokalny",
927930
"syncing": "Synchronizacja z chmurą",
928-
"sync_complete": "Synchronizacja zakończona"
931+
"sync_complete": "Synchronizacja zakończona",
932+
"restore_weekly_backup": "Przywróć stan synchronizacji sprzed tygodnia"
929933
},
930934
"export": {
931935
"export": "Eksportuj",
@@ -938,6 +942,7 @@
938942
"all_shows": "Wszystkie pokazy",
939943
"all_projects": "Wszystkie projekty",
940944
"project": "Projekt",
945+
"data_link": "Skopiuj adres URL danych",
941946
"option_type": "Co chciałbyś wyeksportować?",
942947
"option_format": "W jakim formacie?",
943948
"include_media": "Dołącz pliki multimedialne",
@@ -1025,6 +1030,7 @@
10251030
"break_long_lines_tip": "Zawiń linię, jeśli jest dłuższa niż ustawiona liczba słów",
10261031
"style_overrides_tip": "Automatycznie zmieniaj styl pasujących słów.",
10271032
"style_override_pattern": "Słowa lub /regex/",
1033+
"show_as_faded": "Pokaż jako wyblakłe",
10281034
"skip_virtual_breaks": "Pomiń wirtualne przerwy",
10291035
"media_fit": "Dopasuj do mediów",
10301036
"cropping": "Przycinanie",
@@ -1365,6 +1371,7 @@
13651371
"output_resolution_ratio": "Użyj współczynnika proporcji rozdzielczości wyjściowej",
13661372
"font_size_ratio": "Współczynnik rozmiaru fontu",
13671373
"cropping": "Kadrowanie",
1374+
"cropped": "Przycięte",
13681375
"frame_rate": "Klatkaż",
13691376
"device": "Urządzenie",
13701377
"display_mode": "Tryb wyświetlania",
@@ -1398,7 +1405,6 @@
13981405
"port": "Port",
13991406
"connections": "Połączenia",
14001407
"max_connections": "Maksymalna liczba połączeń",
1401-
"allowed_connections": "Dozwolone połączenia",
14021408
"use_hostname": "Użyj nazwy hosta zamiast adresu IP",
14031409
"connect": "Połącz się, wpisując w przeglądarkę",
14041410
"connect_qr": "Albo zeskanuj kod QR",
@@ -1423,9 +1429,6 @@
14231429
"auto_backup": "Automatyczne tworzenie kopii zapasowych",
14241430
"preview_frame_rate": "Klatkaż podglądu",
14251431
"auto": "Automatyczny",
1426-
"optimized": "Zoptymalizowany",
1427-
"reduced": "Zmniejszony",
1428-
"full": "Pełny",
14291432
"section_trigger_action": "Wyzwalanie akcji podczas przechodzenia do sekcji prezentacji",
14301433
"rss": "RSS"
14311434
},
@@ -1505,6 +1508,7 @@
15051508
"verses_on_individual_lines": "Wersety na poszczególnych liniach",
15061509
"divide_long_verses": "Dziel długie wersety",
15071510
"split_long_verses_suffix": "Pokaż sufiks litery",
1511+
"smart_split": "Inteligentny podział",
15081512
"tolerance": "Tolerancja",
15091513
"version": "Pokaż wersję",
15101514
"reference": "Pokaż odniesienie",
@@ -1661,6 +1665,36 @@
16611665
"pulse_speed": "Prędkość impulsu",
16621666
"hollow": "Pusty w środku"
16631667
},
1668+
"interaction": {
1669+
"add_input": "Dodaj dane wejściowe",
1670+
"add_option": "Dodaj opcję",
1671+
"multi_choice": "Wielokrotnego wyboru",
1672+
"heading": "Nagłówek",
1673+
"option": "Opcja",
1674+
"question": "Pytanie",
1675+
"answer": "Odpowiedź",
1676+
"mark_as_correct": "Oznacz jako poprawne",
1677+
"mark_as_incorrect": "Oznacz jako błędne",
1678+
"reveal_answer": "Pokaż odpowiedź",
1679+
"allow_multiple": "Zezwól na wiele odpowiedzi",
1680+
"optional": "Opcjonalnie",
1681+
"min": "Min",
1682+
"max": "Max",
1683+
"input": "Pole liczbowe",
1684+
"buttons": "Przyciski",
1685+
"checkboxes": "Wielokrotnego wyboru",
1686+
"radio_buttons": "Pojedynczego wyboru",
1687+
"dropdown": "Rozwijana lista",
1688+
"slider": "Suwak",
1689+
"range": "Zakres",
1690+
"kick": "Wyrzuć",
1691+
"generate_slide": "Wygeneruj slajd",
1692+
"require_name": "Poproś o imię",
1693+
"all_at_once": "Wszystkie dane wejściowe jednocześnie",
1694+
"max_time": "Maksymalny czas na jedno wprowadzenie danych",
1695+
"score_system": "System punktacji",
1696+
"points": "Punkty"
1697+
},
16641698
"info": {
16651699
"created": "Utworzony",
16661700
"modified": "Edytowany",
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
using System;
2+
using System.Runtime.InteropServices;
3+
4+
namespace AeroPeekHelper {
5+
class Program {
6+
[DllImport("dwmapi.dll", PreserveSig = true)]
7+
public static extern int DwmSetWindowAttribute(IntPtr hwnd, int attr, ref int val, int size);
8+
9+
static void Main(string[] args) {
10+
if (args.Length < 2) {
11+
Console.WriteLine("Usage: AeroPeekHelper.exe <hwnd> <enabled_0_or_1>");
12+
return;
13+
}
14+
15+
long hwndVal;
16+
if (!long.TryParse(args[0], out hwndVal)) {
17+
Console.WriteLine("Invalid HWND");
18+
return;
19+
}
20+
IntPtr hwnd = new IntPtr(hwndVal);
21+
22+
int enabled;
23+
if (!int.TryParse(args[1], out enabled)) {
24+
Console.WriteLine("Invalid state");
25+
return;
26+
}
27+
28+
int val = enabled;
29+
// DWMWA_EXCLUDED_FROM_PEEK has value 11 or 12 depending on the OS version.
30+
// Setting both ensures compatibility across Windows versions.
31+
DwmSetWindowAttribute(hwnd, 11, ref val, sizeof(int));
32+
DwmSetWindowAttribute(hwnd, 12, ref val, sizeof(int));
33+
}
34+
}
35+
}
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
@echo off
2+
C:\Windows\Microsoft.NET\Framework64\v4.0.30319\csc.exe /target:exe /out:..\..\public\assets\bin\aero-peek-helper.exe AeroPeekHelper.cs

scripts/postBuild.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ async function copyPublicFolderAndMinify(folderPath, destinationPath) {
5454
// if (/\.html$/.exec(curPath)) return minifyHTML(curPath, newPath)
5555
// if (/\.css$/.exec(curPath)) return minifyCSS(curPath, newPath)
5656

57-
if (/\.png|\.ico|\.icns|\.html|\.css|\.ttf|\.woff|\.woff2|\.json|\.svg$/.exec(curPath)) {
57+
if (/\.png|\.ico|\.icns|\.html|\.css|\.ttf|\.woff|\.woff2|\.json|\.svg|\.exe$/.exec(curPath)) {
5858
const fileContent = readFileSync(curPath)
5959
writeFileSync(newPath, fileContent)
6060
}

0 commit comments

Comments
 (0)