From 094866ff92529a05d6079115be9dedafd9c7b089 Mon Sep 17 00:00:00 2001 From: theDeadMan Date: Mon, 18 Feb 2019 22:25:22 +0000 Subject: [PATCH] various --- 1080i/DialogMusicInfo.xml | 20 +++--- 1080i/DialogVideoInfo.xml | 14 ++--- 1080i/FileManager.xml | 21 +++++-- 1080i/Includes.xml | 2 +- 1080i/SettingsCategory.xml | 4 ++ 1080i/VideoOSD.xml | 122 +++++++++++++++++++++++++----------- 1080i/View_Movies.xml | 61 +++++++++++++++++- 1080i/View_Songs.xml | 3 + changelog.txt | 5 +- language/English/strings.po | 4 ++ 10 files changed, 189 insertions(+), 67 deletions(-) diff --git a/1080i/DialogMusicInfo.xml b/1080i/DialogMusicInfo.xml index fd6fd5c..a2dfcf1 100644 --- a/1080i/DialogMusicInfo.xml +++ b/1080i/DialogMusicInfo.xml @@ -125,27 +125,27 @@ 10-col 6-row false - + 12 0 4-col-gutter itemSubTitle highlight - + 12 - 32 + 30 4-col-gutter itemSubTitle textActive - + - + @@ -360,27 +360,27 @@ 10-col 6-row false - + 12 0 4-col-gutter itemSubTitle highlight - + 12 - 32 + 30 4-col-gutter itemSubTitle textActive - + - + diff --git a/1080i/DialogVideoInfo.xml b/1080i/DialogVideoInfo.xml index c0fa3a8..7160bf2 100644 --- a/1080i/DialogVideoInfo.xml +++ b/1080i/DialogVideoInfo.xml @@ -113,27 +113,27 @@ 10-col 6-row false - + 12 0 4-col-gutter itemSubTitle highlight - + 12 - 32 + 30 4-col-gutter itemSubTitle textActive - + - + @@ -358,7 +358,7 @@ 0 - -18 + -20 12-col horizontal @@ -373,7 +373,7 @@ 3-col 2-row center - regularStrong + itemTitle textActive diff --git a/1080i/FileManager.xml b/1080i/FileManager.xml index 4d6913d..75ee549 100644 --- a/1080i/FileManager.xml +++ b/1080i/FileManager.xml @@ -46,10 +46,19 @@ 0 2-row - 18-col + 9-col-textbox 71 colors/black.png - textboxInactive + overlay + stretch + + + 9-col + 2-row + 9-col + 71 + colors/black.png + overlay stretch @@ -64,8 +73,8 @@ 2-row 8-col-gutter - itemSubTitle - highlight + itemTitle + textActive @@ -148,8 +157,8 @@ 9-col-gutter 2-row - itemSubTitle - highlight + itemTitle + textActive 0 diff --git a/1080i/Includes.xml b/1080i/Includes.xml index 2042d88..1f81378 100644 --- a/1080i/Includes.xml +++ b/1080i/Includes.xml @@ -29,7 +29,7 @@ - !String.Contains(container.folderpath,special://profile/playlists/video) + !String.Contains(container.folderpath,videodb://) + !String.Contains(container.folderpath,plugin://) | container.content(files) | String.IsEmpty(container.content) | container.content(playlists) | container.content(addons) | container.content(videos) | container.content(episodes) + !String.Contains(container.folderpath,special://profile/playlists/video) + !String.Contains(container.folderpath,videodb://) + !String.Contains(container.folderpath,plugin://) | container.content(files) | String.IsEmpty(container.content) | container.content(addons) | container.content(videos) | container.content(episodes) container.content(movies) + [String.Contains(container.folderpath,videodb://) | String.Contains(container.folderpath,special://profile/playlists/video)] !String.Contains(container.folderpath,videodb://) + String.Contains(container.folderpath,plugin://) + [container.content(movies) | container.content(tvshows) | container.content(seasons)] diff --git a/1080i/SettingsCategory.xml b/1080i/SettingsCategory.xml index 8731b91..cc994e6 100644 --- a/1080i/SettingsCategory.xml +++ b/1080i/SettingsCategory.xml @@ -69,8 +69,12 @@ SettingsLevelChange 3 5 + 286 + + + 0 2-row diff --git a/1080i/VideoOSD.xml b/1080i/VideoOSD.xml index 7bd1f4d..e40021c 100644 --- a/1080i/VideoOSD.xml +++ b/1080i/VideoOSD.xml @@ -72,47 +72,93 @@ - - - 0 - 5-row - !Pvr.IsPlayingTv - - 0 - 0 - 8-col - 3-row - buttonTitle - center - textActive - - false - - + - Pvr.IsPlayingTv + 0 + 6-row - 0 - 5-row - 600 - 3-row - buttonTitle - center - textActive - - false - + !Pvr.IsPlayingTv + 0 + 0 + 2-col + itemSubTitle + highlight + + + - 0 - 6-row - 600 - 3-row - buttonTitle - center - textActive - - false - + !Pvr.IsPlayingTv + 0 + 32 + 6-col + itemTitle + textActive + + + + + + !Pvr.IsPlayingTv + 3-col-gutter + 0 + 2-col + itemSubTitle + highlight + + + + + !Pvr.IsPlayingTv + 3-col-gutter + 32 + 6-col + itemTitle + textActive + + + + + + Pvr.IsPlayingTv + 0 + 0 + 2-col + itemSubTitle + highlight + + + + + Pvr.IsPlayingTv + 0 + 32 + 6-col + itemTitle + textActive + + + + + + Pvr.IsPlayingTv + 3-col-gutter + 0 + 2-col + itemSubTitle + highlight + + + + + Pvr.IsPlayingTv + 3-col-gutter + 32 + 6-col + itemTitle + textActive + + + diff --git a/1080i/View_Movies.xml b/1080i/View_Movies.xml index 1d4f5c0..c869dd5 100644 --- a/1080i/View_Movies.xml +++ b/1080i/View_Movies.xml @@ -2,7 +2,7 @@ - $EXP[isMovie] + !string.contains(container.folderpath,playlists) + $EXP[isMovie] control.hasfocus(9103) | control.hasfocus(9102) dimensionsFullscreen @@ -135,6 +135,17 @@ textActive + + !controlgroup(9000).hasfocus + Integer.IsGreaterOrEqual(ListItem.VideoResolution,1080) + 184 + 350 + 204 + 1-row + center + symbolLarge + textActive + + ListItem.IsResumable Progress Bar @@ -195,6 +206,17 @@ false + + !controlgroup(9000).hasfocus + Integer.IsGreaterOrEqual(ListItem.VideoResolution,1080) + 184 + 350 + 204 + 1-row + center + symbolLarge + textActive + + ListItem.IsResumable Progress Bar @@ -217,7 +239,7 @@ - !controlgroup(9000).hasfocus + !$EXP[isTVShow] + $EXP[isMovie] + !controlgroup(9000).hasfocus + !$EXP[isTVShow] + $EXP[isMovie] + !string.contains(container.folderpath,playlists) col-1-begin 760 12-col @@ -226,6 +248,17 @@ menuTitle textActive + + + !controlgroup(9000).hasfocus + !$EXP[isTVShow] + $EXP[isMovie] + string.contains(container.folderpath,playlists) + col-1-begin + 760 + 12-col + 2-row + center + menuTitle + textActive + $EXP[isMovie] @@ -236,7 +269,7 @@ 9000 60 51 - 9103 + 51 9000 60 600 @@ -293,6 +326,17 @@ thumbTitle textActive + + + !controlgroup(9000).hasfocus + Integer.IsGreaterOrEqual(ListItem.VideoResolution,1080) + 178 + 368 + 204 + 1-row + center + symbolLarge + textActive + String.IsEmpty(ListItem.PlayCount) @@ -372,6 +416,17 @@ thumbTitle textActive + + + !controlgroup(9000).hasfocus + Integer.IsGreaterOrEqual(ListItem.VideoResolution,1080) + 178 + 368 + 204 + 1-row + center + symbolLarge + textActive + String.IsEmpty(ListItem.PlayCount) diff --git a/1080i/View_Songs.xml b/1080i/View_Songs.xml index 340d7c7..caa1380 100644 --- a/1080i/View_Songs.xml +++ b/1080i/View_Songs.xml @@ -190,6 +190,9 @@ + + + 0 0 1-col-textbox diff --git a/changelog.txt b/changelog.txt index 82aadc9..a2e5c14 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,7 +1,8 @@ *In pipeline* + +edit in smartplaylisteditor.xml, view not rendering. + - revise controls for new window: MyGames.xml -- Add file info to library info screen (help with scraping) -- Add SD / HD flags to info screen - check album thumbs on fullscreenmusicview - Weather diff --git a/language/English/strings.po b/language/English/strings.po index a3d1add..0dfcdce 100644 --- a/language/English/strings.po +++ b/language/English/strings.po @@ -1003,4 +1003,8 @@ msgstr "" msgctxt "#31244" msgid "REC." +msgstr "" + +msgctxt "#31245" +msgid "Finishes" msgstr "" \ No newline at end of file