Redesign of OSD settings

Hitcher · Feb 2, 2025 · b589073 · b589073
1 parent 9f7fbab
commit b589073
Show file tree

Hide file tree

Showing 9 changed files with 121 additions and 199 deletions.
diff --git a/language/resource.language.en_gb/strings.po b/language/resource.language.en_gb/strings.po
@@ -217,7 +217,7 @@ msgid "Turn Off Shuffle All"
 msgstr ""
 
 msgctxt "#31047"
-msgid "Visualisation Presets"
+msgid "Visualisation presets"
 msgstr ""
 
 msgctxt "#31048"
@@ -625,7 +625,7 @@ msgid "hours"
 msgstr ""
 
 msgctxt "#31149"
-msgid "Hide OSD controls"
+msgid "Lyrics settings"
 msgstr ""
 
 msgctxt "#31150"
@@ -940,7 +940,9 @@ msgctxt "#31227"
 msgid "Air time"
 msgstr ""
 
-#empty string with id 31228
+msgctxt "#31228"
+msgid "Visualisation settings"
+msgstr ""
 
 msgctxt "#31229"
 msgid "Cancel Next Up"
@@ -965,13 +967,12 @@ msgid "Browse Addons"
 msgstr ""
 
 msgctxt "#31235"
-msgid "Your Rating"
+msgid "Your rating"
 msgstr ""
 
-#Must match #31235 without the space
-
+#: Must match #31235 but with an underscore instead of the space
 msgctxt "#31236"
-msgid "Your_Rating"
+msgid "Your_rating"
 msgstr ""
 
 msgctxt "#31237"

diff --git a/xml/Custom_1114_Video_OSD_Options.xml → xml/Custom_1114_OSD_Options.xml b/xml/Custom_1114_Video_OSD_Options.xml → xml/Custom_1114_OSD_Options.xml
@@ -102,74 +102,86 @@
 							<label2>[B]$VAR[StreamSubtitleLabel]$VAR[StreamOriginal]$VAR[StreamForced]$VAR[StreamVisualImpaired]$VAR[StreamHearingImpaired][/B]</label2>
 							<onclick>SetProperty(VideoOSDSelect,1,home)</onclick>
 							<onclick>DialogSelectSubtitle</onclick>
+							<visible>Window.IsVisible(fullscreenvideo)</visible>
 						</item>
 						<!-- Audio stream selection button -->
 						<item id="102">
 							<label>31220</label>
 							<label2>[B]$VAR[StreamAudioLanguage]$VAR[AudioCodec, | ]$VAR[AudioChannels, | ][/B]</label2>
 							<onclick>SetProperty(VideoOSDSelect,1,home)</onclick>
 							<onclick>DialogSelectAudio</onclick>
+							<visible>Window.IsVisible(fullscreenvideo)</visible>
 						</item>
 						<!-- Video stream selection button -->
 						<item id="103">
 							<label>31225</label>
 							<label2>[B]$VAR[VideoCodec]$INFO[Player.Process(VideoWidth), | ]x$INFO[Player.Process(VideoHeight)]$INFO[Player.Process(VideoScanType)][/B]</label2>
 							<onclick>SetProperty(VideoOSDSelect,1,home)</onclick>
 							<onclick>DialogSelectVideo</onclick>
+							<visible>Window.IsVisible(fullscreenvideo)</visible>
 						</item>
 						<!-- Bookmarks button -->
 						<item id="104">
 							<label>298</label>
 							<onclick>ActivateWindow(videobookmarks)</onclick>
+							<visible>Window.IsVisible(fullscreenvideo)</visible>
 						</item>
 						<!-- Subtitle settings button -->
 						<item id="105">
 							<label>24133</label>
 							<onclick>SetProperty(VideoOSDSelect,1,home)</onclick>
 							<onclick>ActivateWindow(osdsubtitlesettings)</onclick>
+							<visible>Window.IsVisible(fullscreenvideo)</visible>
 						</item>
 						<!-- Audio settings button -->
 						<item id="106">
 							<label>13396</label>
 							<onclick>SetProperty(VideoOSDSelect,1,home)</onclick>
 							<onclick>ActivateWindow(osdaudiosettings)</onclick>
+							<visible>Window.IsVisible(fullscreenvideo)</visible>
 						</item>
 						<!-- Video settings button -->
 						<item id="107">
 							<label>31137</label>
 							<onclick>SetProperty(VideoOSDSelect,1,home)</onclick>
 							<onclick>ActivateWindow(osdvideosettings)</onclick>
+							<visible>Window.IsVisible(fullscreenvideo)</visible>
 						</item>
 						<!-- Colour management settings button -->
 						<item id="108">
 							<label>36560</label>
 							<onclick>ActivateWindow(osdcmssettings)</onclick>
 							<visible>System.HasCMS</visible>
+							<visible>Window.IsVisible(fullscreenvideo)</visible>
 						</item>
 						<!-- Resolution button -->
 						<item id="109">
 							<label>169</label>
 							<onclick>PlayerResolutionSelect</onclick>
 							<visible>Player.HasResolutions</visible>
+							<visible>Window.IsVisible(fullscreenvideo)</visible>
 						</item>
 						<!-- 3D button -->
 						<item id="110">
 							<label>31153</label>
 							<onclick>Close</onclick>
 							<onclick>StereoMode</onclick>
 							<visible>VideoPlayer.IsStereoscopic</visible>
+							<visible>Window.IsVisible(fullscreenvideo)</visible>
 						</item>
 						<!-- Menu button -->
 						<item id="111">
 							<label>31136</label>
 							<onclick>PlayerControl(ShowVideoMenu)</onclick>
 							<visible>VideoPlayer.HasMenu</visible>
+							<visible>Window.IsVisible(fullscreenvideo)</visible>
 						</item>
 						<!-- Next item button -->
 						<item id="112">
 							<label>$VAR[NextVideo]</label>
 							<onclick>PlayerControl(Next)</onclick>
 							<visible>Window.IsVisible(VideoFullScreen.xml) + system.getbool(videoplayer.autoplaynextitem)</visible>
+							<visible>Window.IsVisible(fullscreenvideo)</visible>
 						</item>
 						<!-- Play speed button -->
 						<item id="113">
@@ -178,6 +190,71 @@
 							<onclick>Dialog.Close(all)</onclick>
 							<onclick>ActivateWindow(1111)</onclick>
 							<visible>Player.TempoEnabled</visible>
+							<visible>Window.IsVisible(fullscreenvideo)</visible>
+						</item>
+						<!-- Lyrics -->
+						<item id="114">
+							<label>24013</label>
+							<label2>[B]$INFO[Skin.String(LyricScript_Path)][/B]</label2>
+							<onclick>Skin.SetAddon(LyricScript_Path,xbmc.python.lyrics)</onclick>
+							<visible>Window.IsVisible(visualisation)</visible>
+						</item>
+						<!-- Lyrics -->
+						<item id="115">
+							<label>31149</label>
+							<onclick>Addon.OpenSettings($INFO[Skin.String(LyricScript_Path)])</onclick>
+							<visible>!String.IsEmpty(Skin.String(LyricScript_Path))</visible>
+							<visible>Window.IsVisible(visualisation)</visible>
+						</item>
+						<!-- Playlist -->
+						<item id="116">
+							<label>559</label>
+							<onclick>Dialog.Close(all)</onclick>
+							<onclick>ActivateWindow(MusicPlaylist)</onclick>
+							<visible>Window.IsVisible(visualisation)</visible>
+						</item>
+						<!-- Repeat -->
+						<item id="117">
+							<label>486</label>
+							<label2>[B]$INFO[Playlist.Repeat][/B]</label2>
+							<onclick>PlayerControl(Repeat)</onclick>
+							<visible>Window.IsVisible(visualisation)</visible>
+						</item>
+						<!-- Random -->
+						<item id="118">
+							<label>590</label>
+							<label2>[B]$INFO[Playlist.Random][/B]</label2>
+							<onclick>PlayerControl(Random)</onclick>
+							<visible>Window.IsVisible(visualisation)</visible>
+						</item>
+						<!-- Rating -->
+						<item id="119">
+							<label>31235</label>
+							<label2>[B]$INFO[MusicPlayer.UserRating,,/10][/B]</label2>
+							<onclick>SetProperty(SetUserRating,music,home)</onclick>
+							<onclick>setrating</onclick>
+							<visible>Window.IsVisible(visualisation)</visible>
+						</item>
+						<!-- Visualisation -->
+						<item id="120">
+							<label>250</label>
+							<label2>[B]$INFO[Visualisation.Name][/B]</label2>
+							<onclick>Close</onclick>
+							<onclick>SendClick(500)</onclick>
+							<visible>Window.IsVisible(visualisation)</visible>
+						</item>
+						<!-- Visualisation settings -->
+						<item id="121">
+					<label>31228</label>
+							<onclick>Addon.Default.OpenSettings(xbmc.player.musicviz)</onclick>
+							<visible>Window.IsVisible(visualisation)</visible>
+						</item>
+						<!-- Visualisation presets -->
+						<item id="122">
+					<label>31047</label>
+							<onclick>ActivateWindow(visualisationpresetlist)</onclick>
+							<visible>Visualisation.HasPresets</visible>
+							<visible>Window.IsVisible(visualisation)</visible>
 						</item>
 					</content>
 				</control>

diff --git a/xml/DialogMusicInfo.xml b/xml/DialogMusicInfo.xml
@@ -334,7 +334,7 @@
 						<onclick>SetProperty(SetUserRating,music,home)</onclick>
 						<onclick>SendClick(7)</onclick>
 						<font>Med24</font>
-						<label>[CAPITALIZE]$LOCALIZE[31235][/CAPITALIZE][CR][COLOR=00ffffff]$LOCALIZE[31236][/COLOR]</label>
+						<label>[CAPITALIZE]$LOCALIZE[31235][CR][COLOR=00ffffff]$LOCALIZE[31236][/COLOR][/CAPITALIZE]</label>
 						<textoffsetx>56</textoffsetx>
 						<textcolor>ffdadada</textcolor>
 						<focusedcolor>ff222222</focusedcolor>

diff --git a/xml/Includes_Dialog_Default_Video_Information.xml b/xml/Includes_Dialog_Default_Video_Information.xml
@@ -389,7 +389,7 @@
 					<onclick>SetProperty(UserRatingIcon,$INFO[ListItem.Icon],home)</onclick>
 					<onclick>SendClick(7)</onclick>
 					<font>Med24</font>
-					<label>[CAPITALIZE]$LOCALIZE[31235][/CAPITALIZE][CR][COLOR=00ffffff]$LOCALIZE[31236][/COLOR]</label>
+					<label>[CAPITALIZE]$LOCALIZE[31235][CR][COLOR=00ffffff]$LOCALIZE[31236][/COLOR][/CAPITALIZE]</label>
 					<textoffsetx>56</textoffsetx>
 					<textcolor>ffdadada</textcolor>
 					<focusedcolor>ff222222</focusedcolor>

diff --git a/xml/Includes_Dialog_Video_Information.xml b/xml/Includes_Dialog_Video_Information.xml
@@ -428,7 +428,7 @@
 					<onclick>SetProperty(UserRatingIcon,$INFO[ListItem.Icon],home)</onclick>
 					<onclick>SendClick(7)</onclick>
 					<font>Med24</font>
-					<label>[CAPITALIZE]$LOCALIZE[31235][/CAPITALIZE][CR][COLOR=00ffffff]$LOCALIZE[31236][/COLOR]</label>
+					<label>[CAPITALIZE]$LOCALIZE[31235][CR][COLOR=00ffffff]$LOCALIZE[31236][/COLOR][/CAPITALIZE]</label>
 					<textoffsetx>56</textoffsetx>
 					<textcolor>ffdadada</textcolor>
 					<focusedcolor>ff222222</focusedcolor>