Skip to content

Setting to turn on subtitles by default #4450

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 3, 2024
Merged

Setting to turn on subtitles by default #4450

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6ee911c
Add back 'Turn on Subtitles by Default'
kommunarr Dec 13, 2023
897d789
Update variable name
kommunarr Dec 14, 2023
b540e4c
Fix double-selection issue when auto-generated & native tracks exist,…
kommunarr Dec 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/renderer/components/ft-video-player/ft-video-player.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,6 +321,10 @@ export default defineComponent({
return playbackRates
},

defaultSubtitles: function () {
return this.$store.getters.getDefaultSubtitles
},

enableScreenshot: function () {
return this.$store.getters.getEnableScreenshot
},
Expand Down Expand Up @@ -1873,6 +1877,10 @@ export default defineComponent({
type: caption.type
}, true)
}

if (this.defaultSubtitles) {
this.toggleCaptions()
}
},

toggleFullWindow: function () {
Expand Down
6 changes: 3 additions & 3 deletions src/renderer/components/player-settings/player-settings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@ export default defineComponent({
return this.$store.getters.getPlayNextVideo
},

enableSubtitles: function () {
return this.$store.getters.getEnableSubtitles
defaultSubtitles: function () {
return this.$store.getters.getDefaultSubtitles
},

forceLocalBackendForLegacy: function () {
Expand Down Expand Up @@ -295,7 +295,7 @@ export default defineComponent({
'updateAutoplayVideos',
'updateAutoplayPlaylists',
'updatePlayNextVideo',
'updateEnableSubtitles',
'updateDefaultSubtitles',
'updateForceLocalBackendForLegacy',
'updateProxyVideos',
'updateDefaultTheatreMode',
Expand Down
13 changes: 6 additions & 7 deletions src/renderer/components/player-settings/player-settings.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,6 @@
>
<div class="switchColumnGrid">
<div class="switchColumn">
<ft-toggle-switch
v-if="false"
label="Enable Subtitles by Default"
:compact="true"
:default-value="enableSubtitles"
@change="updateEnableSubtitles"
/>
<ft-toggle-switch
:label="$t('Settings.Player Settings.Force Local Backend for Legacy Formats')"
:compact="true"
Expand All @@ -26,6 +19,12 @@
:tooltip="$t('Tooltips.Player Settings.Proxy Videos Through Invidious')"
@change="updateProxyVideos"
/>
<ft-toggle-switch
:label="$t('Settings.Player Settings.Turn on Subtitles by Default')"
:compact="true"
:default-value="defaultSubtitles"
@change="updateDefaultSubtitles"
/>
<ft-toggle-switch
:label="$t('Settings.Player Settings.Enable Theatre Mode by Default')"
:compact="true"
Expand Down
2 changes: 1 addition & 1 deletion src/renderer/store/modules/settings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,12 +179,12 @@ const state = {
defaultProfile: MAIN_PROFILE_ID,
defaultQuality: '720',
defaultSkipInterval: 5,
defaultSubtitles: false,
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

defaultSubtitles makes me feel like default something (e.g. locales) for subtitles, but never linked to "enabled"

Suggested change
defaultSubtitles: false,
enableSubtitlesByDefault: false,

defaultTheatreMode: false,
defaultVideoFormat: 'dash',
disableSmoothScrolling: false,
displayVideoPlayButton: true,
enableSearchSuggestions: true,
enableSubtitles: true,
enterFullscreenOnDisplayRotate: false,
externalLinkHandling: '',
externalPlayer: '',
Expand Down