From 145a3bba6242e1c2add18e1a8226035f33eda0fe Mon Sep 17 00:00:00 2001 From: Philipp Te Date: Fri, 6 Mar 2015 22:39:55 +0100 Subject: [CONFLUENCE] - second conversion with XML tool ("scaling" values with 0.75) --- addons/skin.confluence/720p/DialogAlbumInfo.xml | 8 +-- addons/skin.confluence/720p/DialogBusy.xml | 6 +-- .../skin.confluence/720p/DialogContentSettings.xml | 2 +- .../720p/DialogExtendedProgressBar.xml | 6 +-- addons/skin.confluence/720p/DialogFavourites.xml | 4 +- addons/skin.confluence/720p/DialogKaiToast.xml | 6 +-- .../720p/DialogKaraokeSongSelector.xml | 4 +- .../skin.confluence/720p/DialogPVRGroupManager.xml | 8 +-- addons/skin.confluence/720p/DialogSeekBar.xml | 4 +- addons/skin.confluence/720p/DialogSlider.xml | 4 +- addons/skin.confluence/720p/DialogSubtitles.xml | 4 +- addons/skin.confluence/720p/DialogTextViewer.xml | 8 +-- addons/skin.confluence/720p/DialogVideoInfo.xml | 8 +-- addons/skin.confluence/720p/DialogVolumeBar.xml | 4 +- addons/skin.confluence/720p/FileBrowser.xml | 12 ++--- addons/skin.confluence/720p/FileManager.xml | 20 ++++---- addons/skin.confluence/720p/Home.xml | 28 +++++------ .../720p/IncludesBackgroundBuilding.xml | 4 +- .../720p/IncludesHomeRecentlyAdded.xml | 4 +- addons/skin.confluence/720p/LoginScreen.xml | 6 +-- addons/skin.confluence/720p/MusicKaraokeLyrics.xml | 2 +- addons/skin.confluence/720p/MusicOSD.xml | 14 +++--- addons/skin.confluence/720p/MusicVisualisation.xml | 6 +-- .../skin.confluence/720p/MyMusicPlaylistEditor.xml | 8 +-- addons/skin.confluence/720p/MyPVRChannels.xml | 8 +-- addons/skin.confluence/720p/MyPVRGuide.xml | 12 ++--- addons/skin.confluence/720p/MyPVRRecordings.xml | 10 ++-- addons/skin.confluence/720p/MyPVRSearch.xml | 12 ++--- addons/skin.confluence/720p/MyPVRTimers.xml | 12 ++--- addons/skin.confluence/720p/MyWeather.xml | 14 +++--- addons/skin.confluence/720p/PlayerControls.xml | 10 ++-- addons/skin.confluence/720p/Settings.xml | 12 ++--- addons/skin.confluence/720p/SettingsCategory.xml | 8 +-- addons/skin.confluence/720p/SettingsProfile.xml | 14 +++--- addons/skin.confluence/720p/SettingsSystemInfo.xml | 12 ++--- addons/skin.confluence/720p/SkinSettings.xml | 10 ++-- addons/skin.confluence/720p/VideoFullScreen.xml | 8 +-- addons/skin.confluence/720p/VideoOSD.xml | 22 ++++---- addons/skin.confluence/720p/VideoOSDSettings.xml | 2 +- addons/skin.confluence/720p/ViewsMusicLibrary.xml | 14 +++--- addons/skin.confluence/720p/ViewsPictures.xml | 8 +-- addons/skin.confluence/720p/ViewsVideoLibrary.xml | 30 +++++------ addons/skin.confluence/720p/includes.xml | 58 +++++++++++----------- .../720p/script-NextAired-TVGuide.xml | 32 ++++++------ .../720p/script-cu-lrclyrics-main.xml | 6 +-- .../720p/script-globalsearch-main.xml | 22 ++++---- 46 files changed, 258 insertions(+), 258 deletions(-) diff --git a/addons/skin.confluence/720p/DialogAlbumInfo.xml b/addons/skin.confluence/720p/DialogAlbumInfo.xml index 4f00cacf46..574d6fe963 100644 --- a/addons/skin.confluence/720p/DialogAlbumInfo.xml +++ b/addons/skin.confluence/720p/DialogAlbumInfo.xml @@ -5,8 +5,8 @@ !Window.IsVisible(FileBrowser) - WindowOpen - WindowClose + WindowOpen + WindowClose 180 0 @@ -32,8 +32,8 @@ system.getbool(input.enablemouse) - WindowOpen - WindowClose + WindowOpen + WindowClose Album header label 210 diff --git a/addons/skin.confluence/720p/DialogBusy.xml b/addons/skin.confluence/720p/DialogBusy.xml index 54c9c7768c..e0419ed781 100644 --- a/addons/skin.confluence/720p/DialogBusy.xml +++ b/addons/skin.confluence/720p/DialogBusy.xml @@ -1,7 +1,7 @@ - WindowOpen - WindowClose + WindowOpen + WindowClose 1 0 @@ -27,7 +27,7 @@ 32 busy.png keep - conditional + conditional Busy label diff --git a/addons/skin.confluence/720p/DialogContentSettings.xml b/addons/skin.confluence/720p/DialogContentSettings.xml index dd6f0eb49c..c19ad7ec11 100644 --- a/addons/skin.confluence/720p/DialogContentSettings.xml +++ b/addons/skin.confluence/720p/DialogContentSettings.xml @@ -9,7 +9,7 @@ dialogeffect - Conditional + Conditional background image 0 diff --git a/addons/skin.confluence/720p/DialogExtendedProgressBar.xml b/addons/skin.confluence/720p/DialogExtendedProgressBar.xml index b24ad8cbe3..5f466fad00 100644 --- a/addons/skin.confluence/720p/DialogExtendedProgressBar.xml +++ b/addons/skin.confluence/720p/DialogExtendedProgressBar.xml @@ -1,13 +1,13 @@ - WindowOpen - WindowClose + WindowOpen + WindowClose 720 0 - conditional + conditional 0 -10 diff --git a/addons/skin.confluence/720p/DialogFavourites.xml b/addons/skin.confluence/720p/DialogFavourites.xml index 124421c7eb..9e1187ed79 100644 --- a/addons/skin.confluence/720p/DialogFavourites.xml +++ b/addons/skin.confluence/720p/DialogFavourites.xml @@ -8,8 +8,8 @@ - WindowOpen - WindowClose + WindowOpen + WindowClose 400r 0 diff --git a/addons/skin.confluence/720p/DialogKaiToast.xml b/addons/skin.confluence/720p/DialogKaiToast.xml index 27b6b56e75..cf36d656e3 100644 --- a/addons/skin.confluence/720p/DialogKaiToast.xml +++ b/addons/skin.confluence/720p/DialogKaiToast.xml @@ -1,14 +1,14 @@ - WindowOpen - WindowClose + WindowOpen + WindowClose 860 640 - conditional + conditional 0 0 diff --git a/addons/skin.confluence/720p/DialogKaraokeSongSelector.xml b/addons/skin.confluence/720p/DialogKaraokeSongSelector.xml index 5d45652aba..b2f2847d4d 100644 --- a/addons/skin.confluence/720p/DialogKaraokeSongSelector.xml +++ b/addons/skin.confluence/720p/DialogKaraokeSongSelector.xml @@ -1,7 +1,7 @@ - WindowOpen - WindowClose + WindowOpen + WindowClose 100 diff --git a/addons/skin.confluence/720p/DialogPVRGroupManager.xml b/addons/skin.confluence/720p/DialogPVRGroupManager.xml index 8f4601f6c5..54f0cb586d 100644 --- a/addons/skin.confluence/720p/DialogPVRGroupManager.xml +++ b/addons/skin.confluence/720p/DialogPVRGroupManager.xml @@ -4,8 +4,8 @@ !Window.IsVisible(FileBrowser) - WindowOpen - WindowClose + WindowOpen + WindowClose 50 0 @@ -48,8 +48,8 @@ system.getbool(input.enablemouse) - WindowOpen - WindowClose + WindowOpen + WindowClose header label 90 diff --git a/addons/skin.confluence/720p/DialogSeekBar.xml b/addons/skin.confluence/720p/DialogSeekBar.xml index 357de03782..500f0ec78d 100644 --- a/addons/skin.confluence/720p/DialogSeekBar.xml +++ b/addons/skin.confluence/720p/DialogSeekBar.xml @@ -2,8 +2,8 @@ 1 Player.Seeking | Player.DisplayAfterSeek | Player.Paused | Player.Forwarding | Player.Rewinding - WindowOpen - WindowClose + WindowOpen + WindowClose player.chaptercount + Window.IsVisible(FullScreenVideo) diff --git a/addons/skin.confluence/720p/DialogSlider.xml b/addons/skin.confluence/720p/DialogSlider.xml index 98a3a892d1..32d7236799 100644 --- a/addons/skin.confluence/720p/DialogSlider.xml +++ b/addons/skin.confluence/720p/DialogSlider.xml @@ -1,8 +1,8 @@ 11 - WindowOpen - WindowClose + WindowOpen + WindowClose 1 405 diff --git a/addons/skin.confluence/720p/DialogSubtitles.xml b/addons/skin.confluence/720p/DialogSubtitles.xml index 95185a827c..f27deac1d7 100644 --- a/addons/skin.confluence/720p/DialogSubtitles.xml +++ b/addons/skin.confluence/720p/DialogSubtitles.xml @@ -7,9 +7,9 @@ - WindowClose + WindowClose - + Fake button for mouse control diff --git a/addons/skin.confluence/720p/DialogTextViewer.xml b/addons/skin.confluence/720p/DialogTextViewer.xml index 6b3b8f8c66..3c21026fd6 100644 --- a/addons/skin.confluence/720p/DialogTextViewer.xml +++ b/addons/skin.confluence/720p/DialogTextViewer.xml @@ -3,8 +3,8 @@ 61 - WindowOpen - WindowClose + WindowOpen + WindowClose 180 0 @@ -30,8 +30,8 @@ system.getbool(input.enablemouse) - WindowOpen - WindowClose + WindowOpen + WindowClose header label 210 diff --git a/addons/skin.confluence/720p/DialogVideoInfo.xml b/addons/skin.confluence/720p/DialogVideoInfo.xml index 3110711850..8b9bb63dd9 100644 --- a/addons/skin.confluence/720p/DialogVideoInfo.xml +++ b/addons/skin.confluence/720p/DialogVideoInfo.xml @@ -6,8 +6,8 @@ !Window.IsVisible(FileBrowser) - WindowOpen - WindowClose + WindowOpen + WindowClose 180 0 @@ -33,8 +33,8 @@ system.getbool(input.enablemouse) - WindowOpen - WindowClose + WindowOpen + WindowClose header label 210 diff --git a/addons/skin.confluence/720p/DialogVolumeBar.xml b/addons/skin.confluence/720p/DialogVolumeBar.xml index 50da26e80a..58bba5da17 100644 --- a/addons/skin.confluence/720p/DialogVolumeBar.xml +++ b/addons/skin.confluence/720p/DialogVolumeBar.xml @@ -1,8 +1,8 @@ 1 - WindowOpen - WindowClose + WindowOpen + WindowClose 820 diff --git a/addons/skin.confluence/720p/FileBrowser.xml b/addons/skin.confluence/720p/FileBrowser.xml index ef75cdf21d..38fd2f473a 100644 --- a/addons/skin.confluence/720p/FileBrowser.xml +++ b/addons/skin.confluence/720p/FileBrowser.xml @@ -10,10 +10,10 @@ 360 - WindowOpen - WindowOpen - WindowClose - WindowClose + WindowOpen + WindowOpen + WindowClose + WindowClose 0 0 @@ -56,8 +56,8 @@ system.getbool(input.enablemouse) - WindowOpen - WindowClose + WindowOpen + WindowClose header label 40 diff --git a/addons/skin.confluence/720p/FileManager.xml b/addons/skin.confluence/720p/FileManager.xml index ebd0c89827..e2c5b28d7b 100644 --- a/addons/skin.confluence/720p/FileManager.xml +++ b/addons/skin.confluence/720p/FileManager.xml @@ -10,8 +10,8 @@ 1280 100 floor.png - WindowOpen - WindowClose + WindowOpen + WindowClose Section header image @@ -39,12 +39,12 @@ 30 40 - - + + - - + + 0 @@ -213,12 +213,12 @@ 650 40 - - + + - - + + 0 diff --git a/addons/skin.confluence/720p/Home.xml b/addons/skin.confluence/720p/Home.xml index 6bc0752a17..e7d884dc0a 100644 --- a/addons/skin.confluence/720p/Home.xml +++ b/addons/skin.confluence/720p/Home.xml @@ -12,8 +12,8 @@ 1280 90 floor.png - WindowOpen - WindowClose + WindowOpen + WindowClose LOGO @@ -92,7 +92,7 @@ Container(9000).HasFocus(12) + [PVR.IsRecording | PVR.HasNonRecordingTimer] VisibleFadeEffect Window_OpenClose_Animation - conditional + conditional conditional PVR.HasNonRecordingTimer @@ -457,14 +457,14 @@ Controls for currently playing media 545r 370 - conditional + conditional - - + + - - + + Background End image @@ -673,7 +673,7 @@ 9000 PlayerControl(Play) Player.PauseEnabled - Conditional + Conditional 160 @@ -724,12 +724,12 @@ 400 - - + + - - + + 0 @@ -1217,7 +1217,7 @@ black Window_OpenClose_Animation - conditional + conditional diff --git a/addons/skin.confluence/720p/IncludesBackgroundBuilding.xml b/addons/skin.confluence/720p/IncludesBackgroundBuilding.xml index 67d9db4f61..df4b3032d2 100644 --- a/addons/skin.confluence/720p/IncludesBackgroundBuilding.xml +++ b/addons/skin.confluence/720p/IncludesBackgroundBuilding.xml @@ -77,8 +77,8 @@ 1280 100 floor.png - WindowOpen - WindowClose + WindowOpen + WindowClose Window_OpenClose_Animation diff --git a/addons/skin.confluence/720p/IncludesHomeRecentlyAdded.xml b/addons/skin.confluence/720p/IncludesHomeRecentlyAdded.xml index b6d58d66c0..0a99a17aed 100644 --- a/addons/skin.confluence/720p/IncludesHomeRecentlyAdded.xml +++ b/addons/skin.confluence/720p/IncludesHomeRecentlyAdded.xml @@ -7,8 +7,8 @@ 603 !Window.IsVisible(Favourites) VisibleFadeEffect - WindowOpen - WindowClose + WindowOpen + WindowClose 190 50 diff --git a/addons/skin.confluence/720p/LoginScreen.xml b/addons/skin.confluence/720p/LoginScreen.xml index b3f1a28732..5b6f895003 100644 --- a/addons/skin.confluence/720p/LoginScreen.xml +++ b/addons/skin.confluence/720p/LoginScreen.xml @@ -17,8 +17,8 @@ 1280 100 floor.png - WindowOpen - WindowClose + WindowOpen + WindowClose LOGO @@ -226,7 +226,7 @@ black Window_OpenClose_Animation - conditional + conditional diff --git a/addons/skin.confluence/720p/MusicKaraokeLyrics.xml b/addons/skin.confluence/720p/MusicKaraokeLyrics.xml index c6efe3a376..0a63ce81c7 100644 --- a/addons/skin.confluence/720p/MusicKaraokeLyrics.xml +++ b/addons/skin.confluence/720p/MusicKaraokeLyrics.xml @@ -19,7 +19,7 @@ MusicPlayer.Offset(number).Exists + !IntegerGreaterThan(Player.TimeRemaining,20) - Visible + Visible 420 0 diff --git a/addons/skin.confluence/720p/MusicOSD.xml b/addons/skin.confluence/720p/MusicOSD.xml index 88d1b8dfaa..636e37420a 100644 --- a/addons/skin.confluence/720p/MusicOSD.xml +++ b/addons/skin.confluence/720p/MusicOSD.xml @@ -25,7 +25,7 @@ 1000 100 100 - VisibleChange + VisibleChange ![Window.IsVisible(AddonSettings) | Window.IsVisible(SelectDialog) | Window.IsVisible(VisualisationPresetList) | Window.IsVisible(PVROSDChannels) | Window.IsVisible(PVROSDGuide)] @@ -40,7 +40,7 @@ seekslider2.png osd_slider_nibNF.png osd_slider_nib.png - VisibleChange + VisibleChange ![Window.IsVisible(AddonSettings) | Window.IsVisible(SelectDialog) | Window.IsVisible(VisualisationPresetList) | Window.IsVisible(PVROSDChannels) | Window.IsVisible(PVROSDGuide)] @@ -50,7 +50,7 @@ 1000 horizontal 0 - VisibleChange + VisibleChange ![Window.IsVisible(AddonSettings) | Window.IsVisible(SelectDialog) | Window.IsVisible(VisualisationPresetList) | Window.IsVisible(PVROSDChannels) | Window.IsVisible(PVROSDGuide)] 55 @@ -89,7 +89,7 @@ - OSDRewindFO.png OSDRewindNF.png - Conditional + Conditional PlayerControl(Rewind) Player.SeekEnabled @@ -104,7 +104,7 @@ Player.Paused | Player.Forwarding | Player.Rewinding OSDPlayFO.png OSDPlayNF.png - Conditional + Conditional PlayerControl(Play) Player.PauseEnabled @@ -124,7 +124,7 @@ - OSDForwardFO.png OSDForwardNF.png - Conditional + Conditional PlayerControl(Forward) Player.SeekEnabled @@ -308,7 +308,7 @@ OSDRecordOffNF.png PlayerControl(record) Player.CanRecord - Conditional + Conditional diff --git a/addons/skin.confluence/720p/MusicVisualisation.xml b/addons/skin.confluence/720p/MusicVisualisation.xml index 872b6e6140..c925d8bbc4 100644 --- a/addons/skin.confluence/720p/MusicVisualisation.xml +++ b/addons/skin.confluence/720p/MusicVisualisation.xml @@ -24,7 +24,7 @@ - VisibleChange + VisibleChange [Player.ShowInfo | Window.IsActive(MusicOSD)] + ![Window.IsVisible(AddonSettings) | Window.IsVisible(SelectDialog) | Window.IsVisible(VisualisationPresetList) | Window.IsVisible(PVROSDChannels) | Window.IsVisible(PVROSDGuide)] 0 @@ -181,7 +181,7 @@ grey true MusicPlayer.HasNext + !Window.IsVisible(MusicOSD) - VisibleChange + VisibleChange @@ -222,7 +222,7 @@ 0 50 Player.ShowCodec + ![Window.IsVisible(script-cu-lrclyrics-main.xml) | Window.IsVisible(VisualisationSettings) | Window.IsVisible(VisualisationPresetList) | Window.IsVisible(PVROSDChannels) | Window.IsVisible(PVROSDGuide)] - VisibleChange + VisibleChange media info background image 0 diff --git a/addons/skin.confluence/720p/MyMusicPlaylistEditor.xml b/addons/skin.confluence/720p/MyMusicPlaylistEditor.xml index 9a93d95ad5..08c330ef8a 100644 --- a/addons/skin.confluence/720p/MyMusicPlaylistEditor.xml +++ b/addons/skin.confluence/720p/MyMusicPlaylistEditor.xml @@ -119,8 +119,8 @@ - WindowOpen - WindowClose + WindowOpen + WindowClose 0 0 @@ -257,8 +257,8 @@ - WindowOpen - WindowClose + WindowOpen + WindowClose 800 0 diff --git a/addons/skin.confluence/720p/MyPVRChannels.xml b/addons/skin.confluence/720p/MyPVRChannels.xml index 4693832f49..64ffdafadd 100644 --- a/addons/skin.confluence/720p/MyPVRChannels.xml +++ b/addons/skin.confluence/720p/MyPVRChannels.xml @@ -11,8 +11,8 @@ 1280 100 floor.png - WindowOpen - WindowClose + WindowOpen + WindowClose Window_OpenClose_Animation @@ -421,8 +421,8 @@ 1280 720 black-back.png - Visible - Hidden + Visible + Hidden Window.IsActive(FileBrowser) | Window.IsActive(PVRGuideInfo) | Window.IsActive(PVRRecordingInfo) | Window.IsActive(PVRTimerSetting) | Window.IsActive(PVRGroupManager) | Window.IsActive(PVRGuideSearch) PVRSideBlade diff --git a/addons/skin.confluence/720p/MyPVRGuide.xml b/addons/skin.confluence/720p/MyPVRGuide.xml index 58b1090a1a..a8ae1825cc 100644 --- a/addons/skin.confluence/720p/MyPVRGuide.xml +++ b/addons/skin.confluence/720p/MyPVRGuide.xml @@ -11,8 +11,8 @@ 1280 100 floor.png - WindowOpen - WindowClose + WindowOpen + WindowClose Window_OpenClose_Animation @@ -22,8 +22,8 @@ 1280 100 floor.png - WindowOpen - WindowClose + WindowOpen + WindowClose Window_OpenClose_Animation @@ -64,8 +64,8 @@ 1280 720 black-back.png - Visible - Hidden + Visible + Hidden Window.IsActive(FileBrowser) | Window.IsActive(PVRGuideInfo) | Window.IsActive(PVRRecordingInfo) | Window.IsActive(PVRTimerSetting) | Window.IsActive(PVRGroupManager) | Window.IsActive(PVRGuideSearch) PVRSideBlade diff --git a/addons/skin.confluence/720p/MyPVRRecordings.xml b/addons/skin.confluence/720p/MyPVRRecordings.xml index 00342b0644..00a36cfcd8 100644 --- a/addons/skin.confluence/720p/MyPVRRecordings.xml +++ b/addons/skin.confluence/720p/MyPVRRecordings.xml @@ -11,8 +11,8 @@ 1280 100 floor.png - WindowOpen - WindowClose + WindowOpen + WindowClose Window_OpenClose_Animation @@ -294,7 +294,7 @@ 10 548 290 - 12> + 12 PVR.backenddiskspaceprogr!IntegerGreaterThan(PVR.backenddiskspaceprogr,100) @@ -307,8 +307,8 @@ 1280 720 black-back.png - Visible - Hidden + Visible + Hidden Window.IsActive(FileBrowser) | Window.IsActive(PVRGuideInfo) | Window.IsActive(PVRRecordingInfo) | Window.IsActive(PVRTimerSetting) | Window.IsActive(PVRGroupManager) | Window.IsActive(PVRGuideSearch) PVRSideBlade diff --git a/addons/skin.confluence/720p/MyPVRSearch.xml b/addons/skin.confluence/720p/MyPVRSearch.xml index bfe88dc23a..a387fd6781 100644 --- a/addons/skin.confluence/720p/MyPVRSearch.xml +++ b/addons/skin.confluence/720p/MyPVRSearch.xml @@ -11,8 +11,8 @@ 1280 100 floor.png - WindowOpen - WindowClose + WindowOpen + WindowClose Window_OpenClose_Animation @@ -22,8 +22,8 @@ 1280 100 floor.png - WindowOpen - WindowClose + WindowOpen + WindowClose Window_OpenClose_Animation @@ -431,8 +431,8 @@ 1280 720 black-back.png - Visible - Hidden + Visible + Hidden Window.IsActive(FileBrowser) | Window.IsActive(PVRGuideInfo) | Window.IsActive(PVRRecordingInfo) | Window.IsActive(PVRTimerSetting) | Window.IsActive(PVRGroupManager) | Window.IsActive(PVRGuideSearch) PVRSideBlade diff --git a/addons/skin.confluence/720p/MyPVRTimers.xml b/addons/skin.confluence/720p/MyPVRTimers.xml index 79a6e352ff..2eefbfc1fd 100644 --- a/addons/skin.confluence/720p/MyPVRTimers.xml +++ b/addons/skin.confluence/720p/MyPVRTimers.xml @@ -11,8 +11,8 @@ 1280 100 floor.png - WindowOpen - WindowClose + WindowOpen + WindowClose Window_OpenClose_Animation @@ -22,8 +22,8 @@ 1280 100 floor.png - WindowOpen - WindowClose + WindowOpen + WindowClose Window_OpenClose_Animation @@ -344,8 +344,8 @@ 1280 720 black-back.png - Visible - Hidden + Visible + Hidden Window.IsActive(FileBrowser) | Window.IsActive(PVRGuideInfo) | Window.IsActive(PVRRecordingInfo) | Window.IsActive(PVRTimerSetting) | Window.IsActive(PVRGroupManager) | Window.IsActive(PVRGuideSearch) PVRSideBlade diff --git a/addons/skin.confluence/720p/MyWeather.xml b/addons/skin.confluence/720p/MyWeather.xml index d4fc5c6c55..141659de01 100644 --- a/addons/skin.confluence/720p/MyWeather.xml +++ b/addons/skin.confluence/720p/MyWeather.xml @@ -16,7 +16,7 @@ 1000 VisibleFadeEffect Skin.HasSetting(ShowWeatherFanart) + !IsEmpty(Skin.String(WeatherFanartDir)) - WindowClose + WindowClose Section header image @@ -47,17 +47,17 @@ 100 floor.png VisibleFadeEffect - WindowOpen - WindowClose + WindowOpen + WindowClose - - + + - - + + VisibleFadeEffect diff --git a/addons/skin.confluence/720p/PlayerControls.xml b/addons/skin.confluence/720p/PlayerControls.xml index 32357f495f..1b4ddf194b 100644 --- a/addons/skin.confluence/720p/PlayerControls.xml +++ b/addons/skin.confluence/720p/PlayerControls.xml @@ -129,7 +129,7 @@ 200 PlayerControl(record) Player.CanRecord - Conditional + Conditional !VideoPlayer.Content(LiveTV) @@ -274,7 +274,7 @@ PlayerControl(Rewind) VideoPlayer.Content(LiveTV) Player.SeekEnabled - Conditional + Conditional 40 @@ -311,7 +311,7 @@ VideoPlayer.Content(LiveTV) false Player.PauseEnabled - Conditional + Conditional 120 @@ -328,7 +328,7 @@ PlayerControl(Forward) VideoPlayer.Content(LiveTV) Player.SeekEnabled - Conditional + Conditional 200 @@ -374,7 +374,7 @@ 200 PlayerControl(record) Player.CanRecord - Conditional + Conditional VideoPlayer.Content(LiveTV) diff --git a/addons/skin.confluence/720p/Settings.xml b/addons/skin.confluence/720p/Settings.xml index b376141632..e2332758f5 100644 --- a/addons/skin.confluence/720p/Settings.xml +++ b/addons/skin.confluence/720p/Settings.xml @@ -10,19 +10,19 @@ 1280 100 floor.png - WindowOpen - WindowClose + WindowOpen + WindowClose 90 30 - - + + - - + + 5 diff --git a/addons/skin.confluence/720p/SettingsCategory.xml b/addons/skin.confluence/720p/SettingsCategory.xml index c284e8a893..7120e4bbe3 100644 --- a/addons/skin.confluence/720p/SettingsCategory.xml +++ b/addons/skin.confluence/720p/SettingsCategory.xml @@ -16,12 +16,12 @@ 90 30 - - + + - - + + 5 diff --git a/addons/skin.confluence/720p/SettingsProfile.xml b/addons/skin.confluence/720p/SettingsProfile.xml index 17e3a7a831..85c163e5a7 100644 --- a/addons/skin.confluence/720p/SettingsProfile.xml +++ b/addons/skin.confluence/720p/SettingsProfile.xml @@ -10,19 +10,19 @@ 1280 100 floor.png - WindowOpen - WindowClose + WindowOpen + WindowClose 90 30 - - + + - - + + 5 @@ -102,7 +102,7 @@ 260 55 MenuItemFO.png - Conditional + Conditional 10 diff --git a/addons/skin.confluence/720p/SettingsSystemInfo.xml b/addons/skin.confluence/720p/SettingsSystemInfo.xml index 732aa5e676..3e4ed90fb0 100644 --- a/addons/skin.confluence/720p/SettingsSystemInfo.xml +++ b/addons/skin.confluence/720p/SettingsSystemInfo.xml @@ -10,19 +10,19 @@ 1280 100 floor.png - WindowOpen - WindowClose + WindowOpen + WindowClose 90 30 - - + + - - + + 5 diff --git a/addons/skin.confluence/720p/SkinSettings.xml b/addons/skin.confluence/720p/SkinSettings.xml index 049e3ad417..f4a15cbc10 100644 --- a/addons/skin.confluence/720p/SkinSettings.xml +++ b/addons/skin.confluence/720p/SkinSettings.xml @@ -42,12 +42,12 @@ 90 30 - - + + - - + + 5 @@ -138,7 +138,7 @@ 260 81 MenuItemFO.png - Conditional + Conditional 10 diff --git a/addons/skin.confluence/720p/VideoFullScreen.xml b/addons/skin.confluence/720p/VideoFullScreen.xml index 3200269948..5bab352126 100644 --- a/addons/skin.confluence/720p/VideoFullScreen.xml +++ b/addons/skin.confluence/720p/VideoFullScreen.xml @@ -5,7 +5,7 @@ [Player.ShowInfo | Window.IsActive(VideoOSD)] + ![Window.IsVisible(OSDVideoSettings) | Window.IsVisible(OSDAudioSettings) | Window.IsVisible(VideoBookmarks) | Window.IsVisible(PVROSDChannels) | Window.IsVisible(PVROSDGuide) | Window.IsVisible(SliderDialog)] - VisibleChange + VisibleChange 0 -150 @@ -274,7 +274,7 @@ grey true !Window.IsVisible(VideoOSD) + !VideoPlayer.Content(LiveTV) - VisibleChange + VisibleChange 0 @@ -288,7 +288,7 @@ grey true !Window.IsVisible(VideoOSD) + VideoPlayer.Content(LiveTV) - VisibleChange + VisibleChange @@ -362,7 +362,7 @@ 0 20 - VisibleChange + VisibleChange media info background image 0 diff --git a/addons/skin.confluence/720p/VideoOSD.xml b/addons/skin.confluence/720p/VideoOSD.xml index 54aef3e801..c8d7b58c22 100644 --- a/addons/skin.confluence/720p/VideoOSD.xml +++ b/addons/skin.confluence/720p/VideoOSD.xml @@ -25,7 +25,7 @@ 1000 100 100 - VisibleChange + VisibleChange ![Window.IsVisible(SliderDialog) | Window.IsVisible(OSDVideoSettings) | Window.IsVisible(OSDAudioSettings) | Window.IsVisible(VideoBookmarks)] @@ -40,7 +40,7 @@ seekslider2.png osd_slider_nibNF.png osd_slider_nib.png - VisibleChange + VisibleChange ![Window.IsVisible(SliderDialog) | Window.IsVisible(OSDVideoSettings) | Window.IsVisible(OSDAudioSettings) | Window.IsVisible(VideoBookmarks) | VideoPlayer.Content(LiveTV)] @@ -48,7 +48,7 @@ 60r horizontal 0 - VisibleChange + VisibleChange ![Window.IsVisible(SliderDialog) | Window.IsVisible(OSDVideoSettings) | Window.IsVisible(OSDAudioSettings) | Window.IsVisible(VideoBookmarks) | Window.IsVisible(PVROSDChannels) | Window.IsVisible(PVROSDGuide)] 1000 @@ -89,7 +89,7 @@ OSDRewindFO.png OSDRewindNF.png Player.SeekEnabled - Conditional + Conditional PlayerControl(Rewind) @@ -105,7 +105,7 @@ OSDPlayNF.png PlayerControl(Play) Player.PauseEnabled - Conditional + Conditional 55 @@ -124,7 +124,7 @@ OSDForwardFO.png OSDForwardNF.png Player.SeekEnabled - Conditional + Conditional PlayerControl(Forward) @@ -181,7 +181,7 @@ VideoPlayer.IsStereoscopic - Conditional + Conditional 55 55 @@ -246,7 +246,7 @@ 1000 PlayerControl(ShowVideoMenu) VideoPlayer.HasMenu - Conditional + Conditional !VideoPlayer.Content(LiveTV) @@ -262,7 +262,7 @@ OSDRecordOnNF.png PlayerControl(Record) Player.CanRecord - Conditional + Conditional VideoPlayer.Content(LiveTV) @@ -281,7 +281,7 @@ ![Window.IsVisible(SliderDialog) | Window.IsVisible(OSDVideoSettings) | Window.IsVisible(OSDAudioSettings) | Window.IsVisible(VideoBookmarks)] - VisibleChange + VisibleChange Conditional Conditional Conditional @@ -403,7 +403,7 @@ videoplayer.isstereoscopic + ![Window.IsVisible(SliderDialog) | Window.IsVisible(OSDVideoSettings) | Window.IsVisible(OSDAudioSettings) | Window.IsVisible(VideoBookmarks) | Window.IsVisible(PVROSDChannels) | Window.IsVisible(PVROSDGuide)] + [Control.HasFocus(255) | ControlGroup(500).HasFocus | Control.HasFocus(520)] - VisibleChange + VisibleChange Conditional 200 45 diff --git a/addons/skin.confluence/720p/VideoOSDSettings.xml b/addons/skin.confluence/720p/VideoOSDSettings.xml index e2081bb39f..4b58f14b07 100644 --- a/addons/skin.confluence/720p/VideoOSDSettings.xml +++ b/addons/skin.confluence/720p/VideoOSDSettings.xml @@ -9,7 +9,7 @@ dialogeffect - Conditional + Conditional background image 0 diff --git a/addons/skin.confluence/720p/ViewsMusicLibrary.xml b/addons/skin.confluence/720p/ViewsMusicLibrary.xml index e378b6acd2..03f81df73b 100644 --- a/addons/skin.confluence/720p/ViewsMusicLibrary.xml +++ b/addons/skin.confluence/720p/ViewsMusicLibrary.xml @@ -252,7 +252,7 @@ center center - conditional + conditional @@ -322,8 +322,8 @@ 8 200 $INFO[ListItem.Icon] - focus - unfocus + focus + unfocus 180 @@ -333,12 +333,12 @@ keep $INFO[ListItem.Overlay] - - + + - - + + diff --git a/addons/skin.confluence/720p/ViewsPictures.xml b/addons/skin.confluence/720p/ViewsPictures.xml index 552aaf6069..22e66e49f7 100644 --- a/addons/skin.confluence/720p/ViewsPictures.xml +++ b/addons/skin.confluence/720p/ViewsPictures.xml @@ -53,8 +53,8 @@ 8 200 ThumbBG.png - focus - unfocus + focus + unfocus 25 @@ -63,8 +63,8 @@ 140 keep $INFO[ListItem.Icon] - focus - unfocus + focus + unfocus diff --git a/addons/skin.confluence/720p/ViewsVideoLibrary.xml b/addons/skin.confluence/720p/ViewsVideoLibrary.xml index 9750289ddf..3b173be113 100644 --- a/addons/skin.confluence/720p/ViewsVideoLibrary.xml +++ b/addons/skin.confluence/720p/ViewsVideoLibrary.xml @@ -50,8 +50,8 @@ ThumbBorder.png 8 $VAR[PosterThumb] - focus - unfocus + focus + unfocus 6 @@ -60,8 +60,8 @@ 180 stretch GlassOverlay.png - focus - unfocus + focus + unfocus 185 @@ -71,12 +71,12 @@ keep $INFO[ListItem.Overlay] - - + + - - + + @@ -300,7 +300,7 @@ center center - conditional + conditional @@ -370,8 +370,8 @@ 8 200 $VAR[PosterThumb] - focus - unfocus + focus + unfocus 2 @@ -392,12 +392,12 @@ keep $INFO[ListItem.Overlay] - - + + - - + + diff --git a/addons/skin.confluence/720p/includes.xml b/addons/skin.confluence/720p/includes.xml index 3db3d44943..46d50a40b2 100644 --- a/addons/skin.confluence/720p/includes.xml +++ b/addons/skin.confluence/720p/includes.xml @@ -75,8 +75,8 @@ 1280 720 black-back.png - Visible - Hidden + Visible + Hidden Window.IsActive(MovieInformation) | Window.IsActive(MusicInformation) | Window.IsActive(SongInformation) | Window.IsActive(FileBrowser) | Window.IsActive(TextViewer) | Window.IsActive(AddonSettings) | Window.IsActive(ContentSettings) | Window.IsActive(SelectDialog) | Window.IsActive(FileStackingDialog) | Window.IsActive(MediaSource) | Window.IsActive(PictureInfo) | Window.IsActive(PlayerControls) | Window.IsActive(VirtualKeyboard) | Window.IsActive(NumericInput) | Window.IsActive(ProfileSettings) | Window.IsActive(LockSettings) | Window.IsActive(SmartPlaylistEditor) | Window.IsActive(SmartPlaylistRule) | Window.IsActive(script-RSS_Editor-rssEditor.xml) | Window.IsActive(script-RSS_Editor-setEditor.xml) | Window.IsActive(AddonInformation) | Window.IsActive(Peripherals) | Window.IsActive(PeripheralSettings) | Window.IsActive(script-cu-lrclyrics-main.xml) | Window.IsActive(MediaFilter) @@ -137,8 +137,8 @@ 9002 0 Horizontal - Visible - Hidden + Visible + Hidden 40 @@ -152,10 +152,10 @@ false - Conditional - WindowClose - WindowClose - WindowOpen + Conditional + WindowClose + WindowClose + WindowOpen Fake button for mouse control 0 @@ -198,8 +198,8 @@ 120r 55r - WindowOpen - WindowClose + WindowOpen + WindowClose system.getbool(input.enablemouse) Back push button @@ -257,8 +257,8 @@ Player.HasMedia + !SubString(Window(videolibrary).Property(TvTunesIsAlive),TRUE) VisibleFadeEffect - WindowOpen - WindowClose + WindowOpen + WindowClose push button 30 @@ -697,7 +697,7 @@ 50 PlayerControl(Play) Player.PauseEnabled - Conditional + Conditional 180 @@ -713,7 +713,7 @@ 611 PlayerControl(record) Player.CanRecord - Conditional + Conditional @@ -936,8 +936,8 @@ Container.Scrolling + [StringCompare(Container.SortMethod,$LOCALIZE[551]) | StringCompare(Container.SortMethod,$LOCALIZE[561]) | StringCompare(Container.SortMethod,$LOCALIZE[558]) | StringCompare(Container.SortMethod,$LOCALIZE[557]) | StringCompare(Container.SortMethod,$LOCALIZE[556])] - Visible - Hidden + Visible + Hidden 300r 720 @@ -973,18 +973,18 @@ white black - conditional + conditional Window_OpenClose_Animation - - + + - - + + 0 @@ -1253,20 +1253,20 @@ - Visible - Hidden + Visible + Hidden - WindowOpen - WindowClose + WindowOpen + WindowClose - WindowOpen - WindowClose + WindowOpen + WindowClose - Visible - Hidden + Visible + Hidden 50 diff --git a/addons/skin.confluence/720p/script-NextAired-TVGuide.xml b/addons/skin.confluence/720p/script-NextAired-TVGuide.xml index 98ae1315fc..9b96d728ca 100644 --- a/addons/skin.confluence/720p/script-NextAired-TVGuide.xml +++ b/addons/skin.confluence/720p/script-NextAired-TVGuide.xml @@ -21,8 +21,8 @@ $INFO[Container(200).ListItem.Property(Fanart)] Control.HasFocus(200) 600 - Visible - Hidden + Visible + Hidden 0 @@ -33,8 +33,8 @@ $INFO[Container(201).ListItem.Property(Fanart)] Control.HasFocus(201) 600 - Visible - Hidden + Visible + Hidden 0 @@ -45,8 +45,8 @@ $INFO[Container(202).ListItem.Property(Fanart)] Control.HasFocus(202) 600 - Visible - Hidden + Visible + Hidden 0 @@ -57,8 +57,8 @@ $INFO[Container(203).ListItem.Property(Fanart)] Control.HasFocus(203) 600 - Visible - Hidden + Visible + Hidden 0 @@ -69,8 +69,8 @@ $INFO[Container(204).ListItem.Property(Fanart)] Control.HasFocus(204) 600 - Visible - Hidden + Visible + Hidden 0 @@ -81,8 +81,8 @@ $INFO[Container(205).ListItem.Property(Fanart)] Control.HasFocus(205) 600 - Visible - Hidden + Visible + Hidden 0 @@ -93,8 +93,8 @@ $INFO[Container(206).ListItem.Property(Fanart)] Control.HasFocus(206) 600 - Visible - Hidden + Visible + Hidden @@ -104,8 +104,8 @@ 100 floor.png stretch - WindowOpen - WindowClose + WindowOpen + WindowClose Section header image diff --git a/addons/skin.confluence/720p/script-cu-lrclyrics-main.xml b/addons/skin.confluence/720p/script-cu-lrclyrics-main.xml index c095f28b11..ee3d6c94b6 100644 --- a/addons/skin.confluence/720p/script-cu-lrclyrics-main.xml +++ b/addons/skin.confluence/720p/script-cu-lrclyrics-main.xml @@ -8,9 +8,9 @@ - WindowOpen - WindowOpen - WindowClose + WindowOpen + WindowOpen + WindowClose media info background image 0 diff --git a/addons/skin.confluence/720p/script-globalsearch-main.xml b/addons/skin.confluence/720p/script-globalsearch-main.xml index 40449993d1..42c2412b32 100644 --- a/addons/skin.confluence/720p/script-globalsearch-main.xml +++ b/addons/skin.confluence/720p/script-globalsearch-main.xml @@ -111,19 +111,19 @@ 1280 720 black-back.png - WindowOpen - WindowClose + WindowOpen + WindowClose 90 30 - - + + - - + + 5 @@ -214,7 +214,7 @@ 260 61 MenuItemFO.png - Conditional + Conditional 10 @@ -378,12 +378,12 @@ - - + + - - + + 380 90 -- cgit v1.2.3