Revert Enable Theater Mode by Default removal

Theatre mode is not mutually exclusive with the viewing mode and thus should not be included here. This also saves us the work of having to update the default viewing mode to theatre mode on first load for 1-2 releases that we would have otherwise needed.
FreeTubeApp · Oct 20, 2024 · fcb1cfb · fcb1cfb
1 parent 0347336
commit fcb1cfb
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 8 deletions.
diff --git a/src/renderer/components/player-settings/player-settings.js b/src/renderer/components/player-settings/player-settings.js
@@ -62,7 +62,6 @@ export default defineComponent({
       screenshotDefaultPattern: '%Y%M%D-%H%N%S',
       viewingModeValues: [
         'default',
-        'theatre',
         'fullscreen',
         'fullwindow',
         'pip',
@@ -136,6 +135,10 @@ export default defineComponent({
       return this.$store.getters.getDefaultViewingMode
     },
 
+    defaultTheatreMode: function () {
+      return this.$store.getters.getDefaultTheatreMode
+    },
+
     externalPlayer: function () {
       return this.$store.getters.getExternalPlayer
     },
@@ -197,8 +200,7 @@ export default defineComponent({
     viewingModeNames: function () {
       const viewingModeNames = [
         this.$t('Settings.General Settings.Thumbnail Preference.Default'),
-        this.$t('Video.Player.Theatre Mode'),
-        this.$t('Settings.Player Settings.Default Viewing Mode.Fullscreen'),
+        this.$t('Settings.Player Settings.Default Viewing Mode.Full Screen'),
         this.$t('Video.Player.Full Window'),
         this.$t('Settings.Player Settings.Default Viewing Mode.Picture in Picture'),
       ]
@@ -329,6 +331,7 @@ export default defineComponent({
       'updateDefaultInterval',
       'updateDefaultVolume',
       'updateDefaultPlayback',
+      'updateDefaultTheatreMode',
       'updateDefaultVideoFormat',
       'updateDefaultQuality',
       'updateVideoVolumeMouseScroll',

diff --git a/src/renderer/components/player-settings/player-settings.vue b/src/renderer/components/player-settings/player-settings.vue
@@ -18,6 +18,12 @@
           :default-value="enableSubtitlesByDefault"
           @change="updateEnableSubtitlesByDefault"
         />
+        <ft-toggle-switch
+          :label="$t('Settings.Player Settings.Enable Theatre Mode by Default')"
+          :compact="true"
+          :default-value="defaultTheatreMode"
+          @change="updateDefaultTheatreMode"
+        />
         <ft-toggle-switch
           :label="$t('Settings.Player Settings.Scroll Volume Over Video Player')"
           :compact="true"

diff --git a/src/renderer/store/modules/settings.js b/src/renderer/store/modules/settings.js
@@ -178,6 +178,7 @@ const state = {
   defaultProfile: MAIN_PROFILE_ID,
   defaultQuality: '720',
   defaultSkipInterval: 5,
+  defaultTheatreMode: false,
   defaultViewingMode: 'default',
   defaultVideoFormat: 'dash',
   disableSmoothScrolling: false,

diff --git a/src/renderer/views/Watch/Watch.js b/src/renderer/views/Watch/Watch.js
@@ -164,6 +164,9 @@ export default defineComponent({
     defaultInterval: function () {
       return this.$store.getters.getDefaultInterval
     },
+    defaultTheatreMode: function () {
+      return this.$store.getters.getDefaultTheatreMode
+    },
     defaultViewingMode: function () {
       return this.$store.getters.getDefaultViewingMode
     },
@@ -329,10 +332,9 @@ export default defineComponent({
     },
 
     setViewingModeOnFirstLoad: function () {
+      this.useTheatreMode = this.defaultTheatreMode && this.theatrePossible
+
       switch (this.defaultViewingMode) {
-        case 'theatre':
-          this.useTheatreMode = this.theatrePossible
-          return
         case 'fullscreen':
           this.startNextVideoInFullscreen = true
           return

diff --git a/static/locales/en-US.yaml b/static/locales/en-US.yaml
@@ -398,13 +398,14 @@ Settings:
   Player Settings:
     Player Settings: Player
     Play Next Video: Play Next Video
-    Turn on Subtitles by Default: Turn on Subtitles by Default
+    Turn on Subtitles by Default: Enable Subtitles by Default
     Autoplay Videos: Autoplay Videos
     Proxy Videos Through Invidious: Proxy Videos Through Invidious
     Autoplay Playlists: Autoplay Playlists
+    Enable Theatre Mode by Default: Enable Theater Mode by Default
     Default Viewing Mode: 
       Default Viewing Mode: Default Viewing Mode
-      Fullscreen: Fullscreen
+      Full Screen: Full Screen
       Picture in Picture: Picture in Picture
       External Player: External Player ({externalPlayerName})
     Scroll Volume Over Video Player: Scroll Volume Over Video Player