Skip to content

Commit

Permalink
v1.1.6 (#500)
Browse files Browse the repository at this point in the history 
* 🖼 Locate audio files in drawer folders
- Locate media working more consistently with cloud

* 🚩 Updated Italian and Slovenian language
- Fixed error parsing data stores
- Fixed output window not finding position
- Cloud syncing on close, not on save

* ✨ Improved text delay
- Fixed initial Shows path in incorrect folder
- No duplicate Chords letters text
- Preload output font
- A few more shortcuts in info

* Ukrainian localization improvements (#472)

* 📕 Lessons.church import added to one show instead of full project
- Added .olf and .olp formats as supported Lessons imports
- Small tweaks

* ✨ Changed next after media
- Fixed chords overflowing on autosize

* ✨ UI improvements
- Projects, layouts, scroll bar
- Added custom default project names

* 📺 Stage chords transpose

* ✔ Fixed media overflow in editor
- Video looping to start when using "Next after media"
- No autosave in output
- Panel width should apply on restart

* ✔ Fixed relative paths not working

* ⏳ Timer overflow for all types
- Trigger stage by link query
- Fixed background taking long to clear

* ✔ Fixed "Sync" button not working always
- Fixed "Escape" closing forced popups
- Fixed OutputShow not resized properly in older browsers
- Updated Norwegian language

* ✔ Fixed some VideoPsalm files not importing
- Fixed undefined store value error
- Small freeze fixes
- Updated Slovak language

* Issue 479 fix (#484)

* Shrink textbox to allow for slide padding

* Updating text size on padding change

* ✔ Option to disable presenter controller keys
- Increased video step size
- Fixed freeze when scripture verse did not have content
- Improved Zefania import
- Updated languages

* Issue 470 fix (#494)

* Setting appropriate caret for mid-line breaks.

* Improved method of determining last line changed

* Paste working in most cases

* Commented out unused code

* Updated comments

* Updated input of determineCaretLine

* Restored paste functionality for mac

* 🔊 Change audio fade duration
- Updated Polish language
- Edit menus are kept open
- Freeze fixes

* ✨ Change scrolling speed
- Set max auto font size
- Fixed multiple media items changing all at once
- Fixed template adding many duplicate items sometimes
- Version update

---------

Co-authored-by: Davyd Holovii <[email protected]>
Co-authored-by: Jeremy Zongker <[email protected]>
  • Loading branch information
@vassbo @MiragePresent @jzongker
3 people authored May 10, 2024
1 parent a068252 commit 4d9a700
Show file tree
Hide file tree
Showing 98 changed files with 1,383 additions and 883 deletions.
3 changes: 2 additions & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "freeshow",
"version": "1.1.5",
"version": "1.1.6",
"private": true,
"main": "build/electron/index.js",
"description": "Show song lyrics and more for free!",
Expand Down Expand Up @@ -146,6 +146,7 @@
"@mapbox/node-pre-gyp": "^1.0.11",
"@sveltejs/svelte-virtual-list": "^3.0.1",
"@vimeo/player": "^2.16.4",
"chord-transposer": "^3.0.9",
"cross-env": "^7.0.3",
"electron-store": "^8.0.1",
"electron-updater": "^4.6.1",
Expand Down
9 changes: 7 additions & 2 deletions public/global.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ body {

/* scroll bar */
::-webkit-scrollbar {
width: 10px;
height: 10px;
width: 8px;
height: 8px;
}

::-webkit-scrollbar-track,
Expand Down Expand Up @@ -101,6 +101,11 @@ h6 {
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
font-weight: 600;
}

h1 {
font-weight: bold;
}

p {
Expand Down
34 changes: 16 additions & 18 deletions public/index.html
View file
Original file line number Diff line number Diff line change
@@ -1,25 +1,23 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width,initial-scale=1" />
<!-- <meta http-equiv="Content-Security-Policy" content="default-src 'none'"> -->
<!-- <meta http-equiv="Content-Security-Policy" content="script-src 'self'"> -->
<!-- <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline';" /> -->
<!-- <meta http-equiv="Content-Security-Policy" content="script-src 'self' http://localhost:35729/livereload.js 'unsafe-inline' 'unsafe-eval';" /> -->
<!-- <meta http-equiv="Content-Security-Policy" content="script-src 'self' http://* https://* 'unsafe-inline' 'unsafe-eval';" /> -->
<meta
http-equiv="Content-Security-Policy"
content="script-src 'self' http://localhost:35729/livereload.js http://www.youtube.com/iframe_api https://* 'unsafe-inline' 'unsafe-eval';"
/>
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width,initial-scale=1" />
<!-- <meta http-equiv="Content-Security-Policy" content="default-src 'none'"> -->
<!-- <meta http-equiv="Content-Security-Policy" content="script-src 'self'"> -->
<!-- <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline';" /> -->
<!-- <meta http-equiv="Content-Security-Policy" content="script-src 'self' http://localhost:35729/livereload.js 'unsafe-inline' 'unsafe-eval';" /> -->
<!-- <meta http-equiv="Content-Security-Policy" content="script-src 'self' http://* https://* 'unsafe-inline' 'unsafe-eval';" /> -->
<meta http-equiv="Content-Security-Policy" content="script-src 'self' http://localhost:35729/livereload.js http://www.youtube.com/iframe_api https://* 'unsafe-inline' 'unsafe-eval';" />

<title>FreeShow</title>
<title>FreeShow</title>

<link rel="stylesheet" href="./global.css" />
<link rel="stylesheet" href="./build/bundle.css" />
<link rel="preload" href="./fonts/CMGSans-Regular.ttf" as="font" />
<link rel="stylesheet" href="./global.css" />
<link rel="stylesheet" href="./build/bundle.css" />

<script defer src="./build/bundle.js"></script>
</head>
<script defer src="./build/bundle.js"></script>
</head>

<body></body>
<body></body>
</html>
11 changes: 10 additions & 1 deletion public/lang/en.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -500,6 +500,10 @@
"toggle_output": "Toggle output screen",
"change_tab": "Change tab",
"change_drawer_tab": "Change drawer tab",
"change_slide": "Change slide",
"change_project_item": "Change project item",
"change_drawer_item": "Change drawer item",
"change_drawer_category": "Change drawer category",
"toggle_drawer": "Toggle drawer",
"actions": "Actions",
"clear_history": "Clear history",
Expand Down Expand Up @@ -538,7 +542,7 @@
"tip_api": "You have to provide your own free Google API key so the program can automatically upload files to your Google Drive.",
"tip_how": "Don't know how to get one?",
"tip_guide": "Click here for a guide.",
"enable": "Automatic sync on startup and save",
"enable": "Automatic sync on startup and close",
"disable_upload": "Disable uploading data",
"media_id": "Media path ID",
"google_drive_api": "Google API service account key",
Expand Down Expand Up @@ -626,6 +630,7 @@
"media_fit": "Media fit",
"size": "Size",
"chords": "Chords",
"transpose": "Transpose",
"auto_size": "Auto size",
"no_wrap": "Text on one line",
"line_spacing": "Line spacing",
Expand Down Expand Up @@ -679,6 +684,7 @@
"padding": "Padding",
"special": "Special",
"scrolling": "Scrolling",
"scrolling_speed": "Scrolling speed",
"top_bottom": "Top to bottom",
"bottom_top": "Bottom to top",
"left_right": "Left to right",
Expand Down Expand Up @@ -857,7 +863,10 @@
"full_colors": "Full slide group colors",
"auto_output": "Activate output screen on startup",
"hide_cursor_in_output": "Hide cursor in output",
"disable_presenter_controller_keys": "Disable presenter controller keys",
"default_project_name": "Default project name",
"audio_fade_duration": "Audio fade duration",
"max_auto_font_size": "Max auto font size",
"resolution": "Resolution",
"cropping": "Cropping",
"frame_rate": "Frame rate",
Expand Down
22 changes: 15 additions & 7 deletions public/lang/en_GB.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -389,9 +389,9 @@
"deleted_cache": "Deleted media thumbnail cache.",
"no_songswords_easyworship": "Missing SongsWords.db file.",
"delete_shows_empty": "No shows to delete.",
"midi_no_project": "Received MIDI to change project, but no project found at index:",
"midi_no_show": "Received MIDI to start slide, but no show active.",
"midi_no_slide": "Received MIDI to start slide, but no slide found at index:",
"midi_no_project": "Received trigger to change project, but no project found at index:",
"midi_no_show": "Received trigger to start slide, but no show active.",
"midi_no_slide": "Received trigger to start slide, but no slide found at index:",
"midi_no_velocity": "Received MIDI signal, but no velocity, defaults to first index."
},
"new": {
Expand Down Expand Up @@ -500,6 +500,10 @@
"toggle_output": "Toggle output screen",
"change_tab": "Change tab",
"change_drawer_tab": "Change drawer tab",
"change_slide": "Change slide",
"change_project_item": "Change project item",
"change_drawer_item": "Change drawer item",
"change_drawer_category": "Change drawer category",
"toggle_drawer": "Toggle drawer",
"actions": "Actions",
"clear_history": "Clear history",
Expand Down Expand Up @@ -538,7 +542,7 @@
"tip_api": "You have to provide your own free Google API key so the program can automatically upload files to your Google Drive.",
"tip_how": "Don't know how to get one?",
"tip_guide": "Click here for a guide.",
"enable": "Automatic sync on startup and save",
"enable": "Automatic sync on startup and close",
"disable_upload": "Disable uploading data",
"media_id": "Media path ID",
"google_drive_api": "Google API service account key",
Expand All @@ -548,8 +552,10 @@
"media_folder": "Cloud media folder",
"reconnect": "Reconnect",
"sync": "Sync",
"choose_method_tip": "There is existing data in the cloud. Please choose from where you want to keep the data. And override the other location.",
"local": "Local"
"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",
"sync_complete": "Sync completed"
},
"export": {
"export": "Export",
Expand Down Expand Up @@ -624,6 +630,7 @@
"media_fit": "Media fit",
"size": "Size",
"chords": "Chords",
"transpose": "Transpose",
"auto_size": "Auto size",
"no_wrap": "Text on one line",
"line_spacing": "Line spacing",
Expand Down Expand Up @@ -849,6 +856,7 @@
"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",
"full_colors": "Full slide group colours",
Expand Down Expand Up @@ -1032,4 +1040,4 @@
"template": "Template",
"category": "Category"
}
}
}
22 changes: 15 additions & 7 deletions public/lang/en_ZM.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -389,9 +389,9 @@
"deleted_cache": "Deleted media thumbnail cache.",
"no_songswords_easyworship": "Missing SongsWords.db file.",
"delete_shows_empty": "No shows to delete.",
"midi_no_project": "Received MIDI to change project, but no project found at index:",
"midi_no_show": "Received MIDI to start slide, but no show active.",
"midi_no_slide": "Received MIDI to start slide, but no slide found at index:",
"midi_no_project": "Received trigger to change project, but no project found at index:",
"midi_no_show": "Received trigger to start slide, but no show active.",
"midi_no_slide": "Received trigger to start slide, but no slide found at index:",
"midi_no_velocity": "Received MIDI signal, but no velocity, defaults to first index."
},
"new": {
Expand Down Expand Up @@ -500,6 +500,10 @@
"toggle_output": "Toggle output screen",
"change_tab": "Change tab",
"change_drawer_tab": "Change drawer tab",
"change_slide": "Change slide",
"change_project_item": "Change project item",
"change_drawer_item": "Change drawer item",
"change_drawer_category": "Change drawer category",
"toggle_drawer": "Toggle drawer",
"actions": "Actions",
"clear_history": "Clear history",
Expand Down Expand Up @@ -538,7 +542,7 @@
"tip_api": "You have to provide your own free Google API key so the program can automatically upload files to your Google Drive.",
"tip_how": "Don't know how to get one?",
"tip_guide": "Click here for a guide.",
"enable": "Automatic sync on startup and save",
"enable": "Automatic sync on startup and close",
"disable_upload": "Disable uploading data",
"media_id": "Media path ID",
"google_drive_api": "Google API service account key",
Expand All @@ -548,8 +552,10 @@
"media_folder": "Cloud media folder",
"reconnect": "Reconnect",
"sync": "Sync",
"choose_method_tip": "There is existing data in the cloud. Please choose from where you want to keep the data. And override the other location.",
"local": "Local"
"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",
"sync_complete": "Sync completed"
},
"export": {
"export": "Export",
Expand Down Expand Up @@ -624,6 +630,7 @@
"media_fit": "Media fit",
"size": "Size",
"chords": "Chords",
"transpose": "Transpose",
"auto_size": "Auto size",
"no_wrap": "Text on one line",
"line_spacing": "Line spacing",
Expand Down Expand Up @@ -849,6 +856,7 @@
"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",
"full_colors": "Full slide group colours",
Expand Down Expand Up @@ -1032,4 +1040,4 @@
"template": "Template",
"category": "Category"
}
}
}
Loading

0 comments on commit 4d9a700

Please sign in to comment.