diff --git a/1080i/DialogMediaSource.xml b/1080i/DialogMediaSource.xml index 0595c07..8d0e409 100644 --- a/1080i/DialogMediaSource.xml +++ b/1080i/DialogMediaSource.xml @@ -23,25 +23,7 @@ highlight stretch - - 0 - 2-row - 16-col - 16-row - colors/black.png - overlay - stretch - - - 12-col - 2-row - 4-col - 16-row - colors/black.png - overlay - stretch - - + 24 0 16-col @@ -52,50 +34,140 @@ + 0 3-row - - - path label - 24 + + 0 0 - 16-col - itemSubTitle - - textActive - - + 4-col + 6-row + vertical + 10 + + + 0 + 0 + 1-col-textbox + 2-row + stretch + colors/black.png + textboxInactive + + + 1-col + 0 + 3-col-textbox + 2-row + stretch + colors/black.png + textboxInactive + + + 0 + 0 + 1-col + 2-row + center + center + symbol + textActive + + + + 1-col-indent + -1 + 3-col-gutter + 2-row + center + buttonTitle + textActive + + + + + + 0 + 0 + 1-col + 2-row + stretch + colors/white.png + highlight + spinFocusIcon + + + 1-col + 0 + 3-col + 2-row + stretch + colors/white.png + + + 0 + 0 + 1-col + 2-row + center + center + symbol + textActive + + - + + + 1-col-indent + -1 + 3-col-gutter + 2-row + center + buttonTitle + black + + - + + + + + Browse + + + - + SendClick(129,11) + + - - 24 - 2-row - 11-col - 5-row - colors/black.png - 77ffffff - stretch + + + + 0 + 3-row + + + Name Button + 4-col + 0 + 12-col + left + + 10 + 8000 + 10 + - 24 + 4-col 2-row - 11-col - 4-row + 12-col-textbox + 6-row 8000 12 - 200 - - 0 - 0 - 12-col - 2-row - stretch - colors/black.png - 0 - overlay - 12 0 @@ -134,42 +206,48 @@ - - - Name label - 24 - 8-row - 11-col - itemSubtitle - - textActive - - - - - Name Button - 24 - 10-row - 11-col - left - - 10 - 8000 - 10 - - + + - 12-col - 3-row - + 0 + 7-row + 0 0 - 4-col - 10-row + 8-col-textbox + 2-row + stretch + colors/black.png + overlay + + + 8-col + 0 + 8-col + 2-row 3 - vertical + horizontal 10 - + + + 0 + 0 + 1-col-textbox + 2-row + stretch + colors/black.png + overlay + + + 1-col + 0 + 3-col-textbox + 2-row + stretch + colors/black.png + overlay + 0 0 @@ -184,7 +262,7 @@ 1-col-indent -1 - 5-col-gutter + 3-col-gutter 2-row center buttonTitle @@ -192,7 +270,7 @@ - + 0 0 @@ -206,7 +284,7 @@ 1-col 0 - 5-col + 3-col 2-row stretch colors/white.png @@ -226,7 +304,7 @@ 1-col-indent -1 - 5-col-gutter + 3-col-gutter 2-row center buttonTitle @@ -236,35 +314,14 @@ - - Browse - - - - - SendClick(129,11) - - - Add Path Button - - - - - SendClick(129,13) - - - Remove Path Button - - - - - SendClick(129,14) - - + Ok Button - SendClick(129,18) - + Cancel Button @@ -274,6 +331,7 @@ + diff --git a/1080i/DialogSeekBar.xml b/1080i/DialogSeekBar.xml index bb1aa40..a20a932 100644 --- a/1080i/DialogSeekBar.xml +++ b/1080i/DialogSeekBar.xml @@ -2,7 +2,7 @@ 901 yes - !Window.IsActive(5901) + !Window.IsActive(DialogSubtitles.xml) + !Window.IsVisible(fullscreeninfo) + [VideoPlayer.IsFullscreen + !Window.IsVisible(visualisation)] + [Player.Seeking | Player.DisplayAfterSeek | Player.Paused | Player.Forwarding | Player.Rewinding] + !window.isactive(videoosd) + !window.isactive(123) + !window.isactive(124) + !Window.IsActive(5901) + !Window.IsActive(DialogSubtitles.xml) + !Window.IsVisible(fullscreeninfo) + [VideoPlayer.IsFullscreen + !Window.IsVisible(visualisation)] + [Player.Seeking | Player.DisplayAfterSeek | Player.Paused | Player.Forwarding | Player.Rewinding] dimensionsFullscreen diff --git a/1080i/FileBrowser.xml b/1080i/FileBrowser.xml index 3de5ba9..2eec92e 100644 --- a/1080i/FileBrowser.xml +++ b/1080i/FileBrowser.xml @@ -94,11 +94,11 @@ 0 - 0 - 1-col - 2-row - scale - $INFO[Listitem.icon] + 3 + 66 + 66 + stretch + $INFO[Listitem.thumb] 1-col-indent @@ -125,12 +125,15 @@ 0 - 0 - 1-col - 2-row - scale - $INFO[Listitem.icon] - spinFocusIcon + 3 + 66 + 66 + stretch + $INFO[Listitem.thumb] + + + + 1-col-indent diff --git a/1080i/Home.xml b/1080i/Home.xml index 03aa9f5..4cb2c4e 100644 --- a/1080i/Home.xml +++ b/1080i/Home.xml @@ -12,7 +12,7 @@ - 24 + 0 row-1-begin 0 @@ -31,7 +31,7 @@ 1-col-textbox 1-col-textbox scale - colors/black.png + colors/black.png 0 textboxInactive @@ -50,19 +50,19 @@ + + + + 0 0 2-col-textbox 2-col-textbox scale - colors/white.png + colors/white.png 0 highlight - - - - 0 diff --git a/1080i/Includes_animations.xml b/1080i/Includes_animations.xml index ebc1432..3fc383c 100644 --- a/1080i/Includes_animations.xml +++ b/1080i/Includes_animations.xml @@ -62,7 +62,7 @@ - + diff --git a/1080i/VideoOSDSettings.xml b/1080i/VideoOSDSettings.xml index 6d62622..082b104 100644 --- a/1080i/VideoOSDSettings.xml +++ b/1080i/VideoOSDSettings.xml @@ -4,15 +4,10 @@ yes - !Window.IsVisible(SliderDialog) - 0 - 0 - fullscreenWidth - fullscreenHeight + dimensionsFullscreen + vignette.png + ffffffff stretch - colors/black.png - ddFFFFFF - fadeInOut !Window.IsVisible(SliderDialog) @@ -27,7 +22,7 @@ 25-row colors/black.png stretch - ffffffff + aaFFFFFF 0 @@ -67,18 +62,23 @@ 12-col 21-row vertical + 3 Default Button + colors/black.png Default RadioButton + colors/black.png Default spincontrolex + colors/black.png Default Slider + colors/black.png diff --git a/1080i/View_Episodes.xml b/1080i/View_Episodes.xml index 481b82f..6a2a112 100644 --- a/1080i/View_Episodes.xml +++ b/1080i/View_Episodes.xml @@ -233,6 +233,19 @@ - + + !isempty(ListItem.playcount) + 23-col + 0 + 1-col + 2-row + center + center + symbol + textActive + - + + @@ -267,6 +280,19 @@ - + + !isempty(ListItem.playcount) + 23-col + 0 + 1-col + 2-row + center + center + symbol + textActive + - + + diff --git a/1080i/View_MusicRecentItems.xml b/1080i/View_MusicRecentItems.xml index 69ad6cd..5f47616 100644 --- a/1080i/View_MusicRecentItems.xml +++ b/1080i/View_MusicRecentItems.xml @@ -6,10 +6,10 @@ row-5-begin - + - +