From 0a7eb06515687c831da513808f4b173751849490 Mon Sep 17 00:00:00 2001 From: theDeadMan Date: Sat, 27 Aug 2022 15:00:17 +0100 Subject: [PATCH] various --- 1080i/DialogConfirm.xml | 19 +- 1080i/DialogKeyboard.xml | 236 ++++++++++++------------- 1080i/DialogMusicInfo.xml | 71 +++----- 1080i/DialogSettings.xml | 116 ++---------- 1080i/DialogVideoInfo.xml | 4 +- 1080i/VideoOSD.xml | 21 +-- 1080i/custom_musicPlayerFullscreen.xml | 13 ++ 7 files changed, 189 insertions(+), 291 deletions(-) diff --git a/1080i/DialogConfirm.xml b/1080i/DialogConfirm.xml index 2337f6c..60ae354 100644 --- a/1080i/DialogConfirm.xml +++ b/1080i/DialogConfirm.xml @@ -49,30 +49,33 @@ 0 228 8-col - 6-row + 8-row 0 - horizontal + vertical No center 0 - UIControls/button.png - UIControls/button.png + 8-col + UIControls/button.png + UIControls/button.png Yes center 0 - UIControls/button.png - UIControls/button.png + 8-col + UIControls/button.png + UIControls/button.png Custom center 0 - UIControls/button.png - UIControls/button.png + 8-col + UIControls/button.png + UIControls/button.png diff --git a/1080i/DialogKeyboard.xml b/1080i/DialogKeyboard.xml index 1870bf3..246db0e 100644 --- a/1080i/DialogKeyboard.xml +++ b/1080i/DialogKeyboard.xml @@ -88,8 +88,8 @@ 500 312 302 - colors/white.png - colors/white.png + masks/square.png + masks/square.png textActive textActive center @@ -106,8 +106,8 @@ 100 312 302 - colors/white.png - colors/white.png + masks/square.png + masks/square.png textActive textActive center @@ -123,8 +123,8 @@ 101 312 120 - colors/white.png - colors/white.png + masks/square.png + masks/square.png textActive textActive center @@ -138,8 +138,8 @@ 102 312 121 - colors/white.png - colors/white.png + masks/square.png + masks/square.png textActive textActive center @@ -153,8 +153,8 @@ 103 312 122 - colors/white.png - colors/white.png + masks/square.png + masks/square.png textActive textActive center @@ -168,8 +168,8 @@ 104 312 123 - colors/white.png - colors/white.png + masks/square.png + masks/square.png textActive textActive center @@ -183,8 +183,8 @@ 105 312 124 - colors/white.png - colors/white.png + masks/square.png + masks/square.png textActive textActive center @@ -198,8 +198,8 @@ 106 312 125 - colors/white.png - colors/white.png + masks/square.png + masks/square.png textActive textActive center @@ -213,8 +213,8 @@ 107 312 126 - colors/white.png - colors/white.png + masks/square.png + masks/square.png textActive textActive center @@ -228,8 +228,8 @@ 108 312 127 - colors/white.png - colors/white.png + masks/square.png + masks/square.png textActive textActive center @@ -243,8 +243,8 @@ 109 312 128 - colors/white.png - colors/white.png + masks/square.png + masks/square.png textActive textActive center @@ -258,8 +258,8 @@ 110 312 129 - colors/white.png - colors/white.png + masks/square.png + masks/square.png textActive textActive center @@ -273,8 +273,8 @@ 111 312 130 - colors/white.png - colors/white.png + masks/square.png + masks/square.png textActive textActive center @@ -288,8 +288,8 @@ 300 312 131 - colors/white.png - colors/white.png + masks/square.png + masks/square.png textActive textActive center @@ -309,8 +309,8 @@ 120 300 303 - colors/white.png - colors/white.png + masks/square.png + masks/square.png @@ -333,8 +333,8 @@ 121 100 140 - colors/white.png - colors/white.png + masks/square.png + masks/square.png 0 textActive textActive @@ -349,8 +349,8 @@ 122 101 141 - colors/white.png - colors/white.png + masks/square.png + masks/square.png 0 textActive textActive @@ -365,8 +365,8 @@ 123 102 142 - colors/white.png - colors/white.png + masks/square.png + masks/square.png 0 textActive textActive @@ -381,8 +381,8 @@ 124 103 143 - colors/white.png - colors/white.png + masks/square.png + masks/square.png 0 textActive textActive @@ -397,8 +397,8 @@ 125 104 144 - colors/white.png - colors/white.png + masks/square.png + masks/square.png 0 textActive textActive @@ -413,8 +413,8 @@ 126 105 145 - colors/white.png - colors/white.png + masks/square.png + masks/square.png 0 textActive textActive @@ -429,8 +429,8 @@ 127 106 146 - colors/white.png - colors/white.png + masks/square.png + masks/square.png 0 textActive textActive @@ -445,8 +445,8 @@ 128 107 147 - colors/white.png - colors/white.png + masks/square.png + masks/square.png 0 textActive textActive @@ -461,8 +461,8 @@ 129 108 148 - colors/white.png - colors/white.png + masks/square.png + masks/square.png 0 textActive textActive @@ -477,8 +477,8 @@ 130 109 149 - colors/white.png - colors/white.png + masks/square.png + masks/square.png 0 textActive textActive @@ -493,8 +493,8 @@ 131 110 150 - colors/white.png - colors/white.png + masks/square.png + masks/square.png 0 textActive textActive @@ -509,8 +509,8 @@ 302 111 151 - colors/white.png - colors/white.png + masks/square.png + masks/square.png 0 textActive textActive @@ -531,8 +531,8 @@ 140 302 304 - colors/white.png - colors/white.png + masks/square.png + masks/square.png @@ -556,8 +556,8 @@ 141 120 160 - colors/white.png - colors/white.png + masks/square.png + masks/square.png 0 textActive textActive @@ -572,8 +572,8 @@ 142 121 161 - colors/white.png - colors/white.png + masks/square.png + masks/square.png 0 textActive textActive @@ -588,8 +588,8 @@ 143 122 162 - colors/white.png - colors/white.png + masks/square.png + masks/square.png 0 textActive textActive @@ -604,8 +604,8 @@ 144 123 163 - colors/white.png - colors/white.png + masks/square.png + masks/square.png 0 textActive textActive @@ -620,8 +620,8 @@ 145 124 164 - colors/white.png - colors/white.png + masks/square.png + masks/square.png 0 textActive textActive @@ -636,8 +636,8 @@ 146 125 165 - colors/white.png - colors/white.png + masks/square.png + masks/square.png 0 textActive textActive @@ -652,8 +652,8 @@ 147 126 166 - colors/white.png - colors/white.png + masks/square.png + masks/square.png 0 textActive textActive @@ -668,8 +668,8 @@ 148 127 167 - colors/white.png - colors/white.png + masks/square.png + masks/square.png 0 textActive textActive @@ -684,8 +684,8 @@ 149 128 168 - colors/white.png - colors/white.png + masks/square.png + masks/square.png 0 textActive textActive @@ -700,8 +700,8 @@ 150 129 169 - colors/white.png - colors/white.png + masks/square.png + masks/square.png 0 textActive textActive @@ -716,8 +716,8 @@ 151 130 170 - colors/white.png - colors/white.png + masks/square.png + masks/square.png 0 textActive textActive @@ -732,8 +732,8 @@ 303 131 171 - colors/white.png - colors/white.png + masks/square.png + masks/square.png 0 textActive textActive @@ -754,8 +754,8 @@ 307 303 309 - colors/white.png - colors/white.png + masks/square.png + masks/square.png @@ -776,8 +776,8 @@ 0 2-col 1-col - colors/white.png - colors/white.png + masks/square.png + masks/square.png 0 304 @@ -798,8 +798,8 @@ 161 140 32 - colors/white.png - colors/white.png + masks/square.png + masks/square.png 0 textActive textActive @@ -814,8 +814,8 @@ 162 141 32 - colors/white.png - colors/white.png + masks/square.png + masks/square.png 0 textActive textActive @@ -830,8 +830,8 @@ 163 142 32 - colors/white.png - colors/white.png + masks/square.png + masks/square.png 0 textActive textActive @@ -846,8 +846,8 @@ 164 143 32 - colors/white.png - colors/white.png + masks/square.png + masks/square.png 0 textActive textActive @@ -862,8 +862,8 @@ 165 144 32 - colors/white.png - colors/white.png + masks/square.png + masks/square.png 0 textActive textActive @@ -878,8 +878,8 @@ 166 145 32 - colors/white.png - colors/white.png + masks/square.png + masks/square.png 0 textActive textActive @@ -894,8 +894,8 @@ 167 146 305 - colors/white.png - colors/white.png + masks/square.png + masks/square.png 0 textActive textActive @@ -910,8 +910,8 @@ 168 147 306 - colors/white.png - colors/white.png + masks/square.png + masks/square.png 0 textActive textActive @@ -926,8 +926,8 @@ 169 148 8 - colors/white.png - colors/white.png + masks/square.png + masks/square.png 0 textActive textActive @@ -942,8 +942,8 @@ 170 149 8 - colors/white.png - colors/white.png + masks/square.png + masks/square.png 0 textActive textActive @@ -958,8 +958,8 @@ 171 150 8 - colors/white.png - colors/white.png + masks/square.png + masks/square.png 0 textActive textActive @@ -974,8 +974,8 @@ 304 151 111 - colors/white.png - colors/white.png + masks/square.png + masks/square.png 0 textActive textActive @@ -996,8 +996,8 @@ 32 304 312 - colors/white.png - colors/white.png + masks/square.png + masks/square.png textActive textActive center @@ -1010,8 +1010,8 @@ 462 1-col - colors/white.png - colors/white.png + masks/square.png + masks/square.png 0 textActive textActive @@ -1033,8 +1033,8 @@ 309 171 312 - colors/white.png - colors/white.png + masks/square.png + masks/square.png 0 textActive textActive @@ -1048,8 +1048,8 @@ 1-col 1-col - colors/white.png - colors/white.png + masks/square.png + masks/square.png 0 textActive textActive @@ -1066,8 +1066,8 @@ 1-col 1-col - colors/white.png - colors/white.png + masks/square.png + masks/square.png 0 textActive textActive diff --git a/1080i/DialogMusicInfo.xml b/1080i/DialogMusicInfo.xml index b458fd3..3b13d25 100644 --- a/1080i/DialogMusicInfo.xml +++ b/1080i/DialogMusicInfo.xml @@ -176,6 +176,7 @@ 6-row Refresh button + false thumbTitle center 0 @@ -187,6 +188,7 @@ Get Thumb + false 4-col thumbTitle center @@ -255,12 +257,12 @@ 0 - row-5-begin + 10-row textbox 8-col left textActive - 402 + 482 false 61 @@ -269,13 +271,13 @@ 12r 216 10-row - 6 - 6 + 8000 + 8000 -12 - 18-row + row-5-begin 10-col 6-row false @@ -324,60 +326,34 @@ - + 12 - row-24-begin + row-26-begin 10-col - 6-row - - Refresh button + 2-row + horizontal + 61 + + + Go to artist thumbTitle center 0 UIControls/button.png UIControls/button.png - - 7 - 61 - 10 + + dialog.close(all,true) + activatewindow(music,musicdb://albums/$INFO[listitem.DBID]/,return) - - Set rating - 4-col + + Go to album thumbTitle center 0 UIControls/button.png UIControls/button.png - - 6 - 61 - 12 - - - Get Thumb - 2-row - thumbTitle - center - 0 - UIControls/button.png - UIControls/button.png - - 6 - 12 - - - Get Fanart - 4-col - 2-row - thumbTitle - center - 0 - UIControls/button.png - UIControls/button.png - - 7 - 10 + + @@ -444,8 +420,7 @@ 99000000 - - + -36 diff --git a/1080i/DialogSettings.xml b/1080i/DialogSettings.xml index acb6f85..3fc2e21 100644 --- a/1080i/DialogSettings.xml +++ b/1080i/DialogSettings.xml @@ -9,14 +9,14 @@ - col-5-begin + col-7-begin row-4-begin modalDialogInOutVertical -12 -12 - 1176 + 888 768 dialogBackground.png overlay @@ -26,7 +26,7 @@ player.hasvideo -12 -12 - 1176 + 888 768 dialogBackground.png overlay @@ -35,7 +35,7 @@ 0 0 - 16-col + 12-col 71 masks/menuTitle2.png highlight @@ -93,120 +93,26 @@ highlight - - + + + false 12-col 84 4-col 6-row - vertical 5 - - - 0 - 0 - 1-col - 2-row - center - center - symbolLarge - textActive - - - - - 1-col-indent - 0 - 5-col-gutter - 2-row - center - buttonTitle - textActive - - - - - - - 0 - 0 - 1-col - 2-row - stretch - colors/white.png - highlight - spinFocusIcon - - - 1-col - 0 - 5-col - 2-row - stretch - colors/white.png - - - 0 - 0 - 1-col - 2-row - center - center - symbolLarge - textActive - - - - - 1-col-indent - 0 - 5-col-gutter - 2-row - center - buttonTitle - black - - - - - - - Control.IsEnabled(28) + !window.isactive(osdsubtitlesettings) - Ok Button - - - - SendClick(28) - - - Control.IsEnabled(29) - Cancel Button - - - - SendClick(29) - - - Control.IsEnabled(30) + !window.isactive(osdvideosettings) + !window.isactive(osdaudiosettings) + !window.isactive(osdsubtitlesettings) - clear / settings - - - - SendClick(30) - - - - - - false + vertical OK + Cancel + Clear / Settings + diff --git a/1080i/DialogVideoInfo.xml b/1080i/DialogVideoInfo.xml index ac843dd..27c2e34 100644 --- a/1080i/DialogVideoInfo.xml +++ b/1080i/DialogVideoInfo.xml @@ -198,11 +198,11 @@ 24 - 24-row + 948 10-col 6-row horizontal - 24 + 12 61 999981 diff --git a/1080i/VideoOSD.xml b/1080i/VideoOSD.xml index c7e9b9d..15f4344 100644 --- a/1080i/VideoOSD.xml +++ b/1080i/VideoOSD.xml @@ -165,7 +165,7 @@ 0 9-row textbox - 564 + 552 left textActive 314 @@ -238,10 +238,16 @@ - Previous - + Vol Down + - PlayerControl(previous) + VolumeDown + + + Vol Up + + + VolumeUp Rewind @@ -276,12 +282,7 @@ PlayerControl(forward) - - Next Chapter - - - PlayerControl(next) - + PVR.CanRecordPlayingChannel diff --git a/1080i/custom_musicPlayerFullscreen.xml b/1080i/custom_musicPlayerFullscreen.xml index b0691c3..00265e2 100644 --- a/1080i/custom_musicPlayerFullscreen.xml +++ b/1080i/custom_musicPlayerFullscreen.xml @@ -95,6 +95,19 @@ 99000000 + + Pvr.IsPlayingRadio + 4-col + 112 + 16-col + 3-row + center + buttonTitle + textActive + true + + 99000000 + Progress Bar 9-col