From 1d3d23887761b54419b981c1a267e876cb2d91fd Mon Sep 17 00:00:00 2001 From: root Date: Mon, 28 Aug 2023 19:03:03 +0200 Subject: [PATCH] 16.0.3 --- CONTROL/control | 2 +- src/RecordingUtils.py | 14 + src/Version.py | 2 +- src/skin/CockpitDisplaySummary.xmlinc | 11 - src/skin/CockpitMusicPlayerSummary.xmlinc | 22 -- src/skin/Default-FHD/CockpitPlayerIcon.xmlinc | 1 - .../Default-FHD/CockpitPlayerSummary.xmlinc | 21 -- src/skin/Default-FHD/ColorButtons.xmlinc | 6 - .../Default-FHD/ColorButtonsLabels.xmlinc | 6 - src/skin/Default-FHD/ConfigScreen.xmlinc | 10 - src/skin/Default-FHD/DateTime.xmlinc | 10 - src/skin/Default-FHD/ScreenPVRState.xmlinc | 4 - src/skin/Default-FHD/colors.xmlinc | 15 + src/skin/Default-FHD/images/display_bg.png | Bin 0 -> 9319 bytes src/skin/Default-FHD/skin.xml | 98 +++-- src/skin/Default-FHD/skin_src.xml | 154 -------- src/skin/Default-HD/CockpitContextMenu.xmlinc | 5 - src/skin/Default-HD/CockpitPlayer.xmlinc | 66 ---- src/skin/Default-HD/CockpitPlayerIcon.xmlinc | 1 - .../Default-HD/CockpitPlayerSummary.xmlinc | 21 -- src/skin/Default-HD/ColorButtons.xmlinc | 6 - src/skin/Default-HD/ColorButtonsLabels.xmlinc | 6 - src/skin/Default-HD/ConfigScreen.xmlinc | 10 - src/skin/Default-HD/DateTime.xmlinc | 10 - src/skin/Default-HD/ScreenPVRState.xmlinc | 4 - src/skin/Default-HD/colors.xmlinc | 15 + src/skin/Default-HD/images/display_bg.png | Bin 0 -> 9319 bytes src/skin/Default-HD/listboxcontent.xmlinc | 3 - src/skin/Default-HD/skin.xml | 342 +++++++++--------- src/skin/Default-HD/skin_src.xml | 154 -------- src/skin/Default-WQHD/Bar_gradient.xmlinc | 2 - .../Default-WQHD/CockpitContextMenu.xmlinc | 5 - src/skin/Default-WQHD/CockpitPlayer.xmlinc | 67 ---- .../Default-WQHD/CockpitPlayerIcon.xmlinc | 1 - src/skin/Default-WQHD/ColorButtons.xmlinc | 6 - .../Default-WQHD/ColorButtonsLabels.xmlinc | 6 - src/skin/Default-WQHD/ConfigScreen.xmlinc | 10 - src/skin/Default-WQHD/DateTime.xmlinc | 10 - src/skin/Default-WQHD/ScreenPVRState.xmlinc | 4 - src/skin/Default-WQHD/colors.xmlinc | 15 +- .../images/display_bg.png} | Bin src/skin/Default-WQHD/listboxcontent.xmlinc | 3 - .../Default-WQHD/screen_CockpitPlayer.xmlinc | 67 ++++ src/skin/Default-WQHD/skin.xml | 328 +++++++++-------- src/skin/Default-WQHD/skin_src.xml | 154 -------- src/skin/Other-WQHD/CockpitContextMenu.xmlinc | 5 - src/skin/Other-WQHD/CockpitPlayer.xmlinc | 66 ---- src/skin/Other-WQHD/CockpitPlayerIcon.xmlinc | 1 - .../Other-WQHD/CockpitPlayerSummary.xmlinc | 21 -- src/skin/Other-WQHD/ColorButtons.xmlinc | 6 - src/skin/Other-WQHD/ColorButtonsLabels.xmlinc | 6 - src/skin/Other-WQHD/ConfigScreen.xmlinc | 10 - src/skin/Other-WQHD/DateTime.xmlinc | 10 - src/skin/Other-WQHD/ScreenPVRState.xmlinc | 4 - src/skin/Other-WQHD/images/display_bg.png | Bin 0 -> 9319 bytes src/skin/Other-WQHD/listboxcontent.xmlinc | 3 - src/skin/Other-WQHD/skin.xml | 162 ++++----- src/skin/Other-WQHD/skin_src.xml | 145 -------- src/skin/Shadow-FHD/CockpitContextMenu.xmlinc | 5 - src/skin/Shadow-FHD/CockpitPlayerIcon.xmlinc | 1 - .../Shadow-FHD/CockpitPlayerSummary.xmlinc | 21 -- src/skin/Shadow-FHD/ColorButtons.xmlinc | 6 - src/skin/Shadow-FHD/ColorButtonsLabels.xmlinc | 6 - src/skin/Shadow-FHD/DateTime.xmlinc | 10 - src/skin/Shadow-FHD/images/display_bg.png | Bin 0 -> 8440 bytes src/skin/Shadow-FHD/listboxcontent.xmlinc | 3 - ...yer.xmlinc => screen_CockpitPlayer.xmlinc} | 16 +- src/skin/Shadow-FHD/skin.xml | 110 +++--- src/skin/images/player.svg | 1 + .../{Default-FHD => }/listboxcontent.xmlinc | 0 ...mlinc => screen_CockpitContextMenu.xmlinc} | 0 src/skin/screen_CockpitDisplaySummary.xmlinc | 5 + src/skin/screen_CockpitMusicPlayer.xmlinc | 31 ++ .../screen_CockpitMusicPlayerSummary.xmlinc | 13 + ...yer.xmlinc => screen_CockpitPlayer.xmlinc} | 10 +- ...inc => screen_CockpitPlayerSummary.xmlinc} | 2 +- ...reen.xmlinc => screen_ConfigScreen.xmlinc} | 7 +- ...kin_src.xml => screen_MediaCockpit.xmlinc} | 67 ---- src/skin/screen_MediaInfo.xmlinc | 19 + ...te.xmlinc => screen_ScreenPVRState.xmlinc} | 2 +- src/skin/screen_Slideshow.xmlinc | 6 + .../screenpart_Bar_gradient.xmlinc | 2 +- src/skin/screenpart_ColorButtons.xmlinc | 4 + src/skin/screenpart_ColorButtonsLabels.xmlinc | 4 + src/skin/screenpart_DateTime.xmlinc | 6 + src/skin/skin_src.xml | 18 + 86 files changed, 758 insertions(+), 1753 deletions(-) delete mode 100755 src/skin/CockpitDisplaySummary.xmlinc delete mode 100755 src/skin/CockpitMusicPlayerSummary.xmlinc delete mode 100644 src/skin/Default-FHD/CockpitPlayerIcon.xmlinc delete mode 100644 src/skin/Default-FHD/CockpitPlayerSummary.xmlinc delete mode 100644 src/skin/Default-FHD/ColorButtons.xmlinc delete mode 100644 src/skin/Default-FHD/ColorButtonsLabels.xmlinc delete mode 100644 src/skin/Default-FHD/ConfigScreen.xmlinc delete mode 100644 src/skin/Default-FHD/DateTime.xmlinc delete mode 100644 src/skin/Default-FHD/ScreenPVRState.xmlinc create mode 100644 src/skin/Default-FHD/colors.xmlinc create mode 100644 src/skin/Default-FHD/images/display_bg.png delete mode 100755 src/skin/Default-FHD/skin_src.xml delete mode 100644 src/skin/Default-HD/CockpitContextMenu.xmlinc delete mode 100644 src/skin/Default-HD/CockpitPlayer.xmlinc delete mode 100644 src/skin/Default-HD/CockpitPlayerIcon.xmlinc delete mode 100644 src/skin/Default-HD/CockpitPlayerSummary.xmlinc delete mode 100644 src/skin/Default-HD/ColorButtons.xmlinc delete mode 100644 src/skin/Default-HD/ColorButtonsLabels.xmlinc delete mode 100644 src/skin/Default-HD/ConfigScreen.xmlinc delete mode 100644 src/skin/Default-HD/DateTime.xmlinc delete mode 100644 src/skin/Default-HD/ScreenPVRState.xmlinc create mode 100644 src/skin/Default-HD/colors.xmlinc create mode 100644 src/skin/Default-HD/images/display_bg.png delete mode 100644 src/skin/Default-HD/listboxcontent.xmlinc delete mode 100644 src/skin/Default-HD/skin_src.xml delete mode 100644 src/skin/Default-WQHD/Bar_gradient.xmlinc delete mode 100644 src/skin/Default-WQHD/CockpitContextMenu.xmlinc delete mode 100644 src/skin/Default-WQHD/CockpitPlayer.xmlinc delete mode 100644 src/skin/Default-WQHD/CockpitPlayerIcon.xmlinc delete mode 100644 src/skin/Default-WQHD/ColorButtons.xmlinc delete mode 100644 src/skin/Default-WQHD/ColorButtonsLabels.xmlinc delete mode 100644 src/skin/Default-WQHD/ConfigScreen.xmlinc delete mode 100644 src/skin/Default-WQHD/DateTime.xmlinc delete mode 100644 src/skin/Default-WQHD/ScreenPVRState.xmlinc rename src/skin/{images/backdrop.png => Default-WQHD/images/display_bg.png} (100%) mode change 100755 => 100644 delete mode 100644 src/skin/Default-WQHD/listboxcontent.xmlinc create mode 100644 src/skin/Default-WQHD/screen_CockpitPlayer.xmlinc delete mode 100644 src/skin/Default-WQHD/skin_src.xml delete mode 100644 src/skin/Other-WQHD/CockpitContextMenu.xmlinc delete mode 100644 src/skin/Other-WQHD/CockpitPlayer.xmlinc delete mode 100644 src/skin/Other-WQHD/CockpitPlayerIcon.xmlinc delete mode 100644 src/skin/Other-WQHD/CockpitPlayerSummary.xmlinc delete mode 100644 src/skin/Other-WQHD/ColorButtons.xmlinc delete mode 100644 src/skin/Other-WQHD/ColorButtonsLabels.xmlinc delete mode 100644 src/skin/Other-WQHD/ConfigScreen.xmlinc delete mode 100644 src/skin/Other-WQHD/DateTime.xmlinc delete mode 100644 src/skin/Other-WQHD/ScreenPVRState.xmlinc create mode 100644 src/skin/Other-WQHD/images/display_bg.png delete mode 100644 src/skin/Other-WQHD/listboxcontent.xmlinc delete mode 100755 src/skin/Other-WQHD/skin_src.xml delete mode 100644 src/skin/Shadow-FHD/CockpitContextMenu.xmlinc delete mode 100644 src/skin/Shadow-FHD/CockpitPlayerIcon.xmlinc delete mode 100644 src/skin/Shadow-FHD/CockpitPlayerSummary.xmlinc delete mode 100644 src/skin/Shadow-FHD/ColorButtons.xmlinc delete mode 100644 src/skin/Shadow-FHD/ColorButtonsLabels.xmlinc delete mode 100644 src/skin/Shadow-FHD/DateTime.xmlinc create mode 100644 src/skin/Shadow-FHD/images/display_bg.png delete mode 100644 src/skin/Shadow-FHD/listboxcontent.xmlinc rename src/skin/Shadow-FHD/{CockpitPlayer.xmlinc => screen_CockpitPlayer.xmlinc} (88%) create mode 100644 src/skin/images/player.svg rename src/skin/{Default-FHD => }/listboxcontent.xmlinc (100%) rename src/skin/{Default-FHD/CockpitContextMenu.xmlinc => screen_CockpitContextMenu.xmlinc} (100%) create mode 100755 src/skin/screen_CockpitDisplaySummary.xmlinc create mode 100755 src/skin/screen_CockpitMusicPlayer.xmlinc create mode 100755 src/skin/screen_CockpitMusicPlayerSummary.xmlinc rename src/skin/{Default-FHD/CockpitPlayer.xmlinc => screen_CockpitPlayer.xmlinc} (85%) rename src/skin/{Default-WQHD/CockpitPlayerSummary.xmlinc => screen_CockpitPlayerSummary.xmlinc} (94%) rename src/skin/{Shadow-FHD/ConfigScreen.xmlinc => screen_ConfigScreen.xmlinc} (78%) rename src/skin/{Shadow-FHD/skin_src.xml => screen_MediaCockpit.xmlinc} (53%) mode change 100644 => 100755 create mode 100755 src/skin/screen_MediaInfo.xmlinc rename src/skin/{Shadow-FHD/ScreenPVRState.xmlinc => screen_ScreenPVRState.xmlinc} (80%) create mode 100755 src/skin/screen_Slideshow.xmlinc rename src/skin/{Shadow-FHD => }/screenpart_Bar_gradient.xmlinc (54%) create mode 100644 src/skin/screenpart_ColorButtons.xmlinc create mode 100644 src/skin/screenpart_ColorButtonsLabels.xmlinc create mode 100644 src/skin/screenpart_DateTime.xmlinc create mode 100755 src/skin/skin_src.xml diff --git a/CONTROL/control b/CONTROL/control index aa5cf0b..eac1efb 100644 --- a/CONTROL/control +++ b/CONTROL/control @@ -1,6 +1,6 @@ Description: MediaCockpit Maintainer: dream-alpha Package: enigma2-plugin-extensions-mediacockpit -Version: 15.2.5 +Version: 16.0.3 Architecture: all Depends: python-imaging, python-twisted, python-mutagen, ffmpeg, python-merlinpictureviewer, python-merlinmusicplayer, enigma2-plugin-systemplugins-mountcockpit, enigma2-plugin-systemplugins-componentscockpit diff --git a/src/RecordingUtils.py b/src/RecordingUtils.py index 0fe23c6..e7237fd 100644 --- a/src/RecordingUtils.py +++ b/src/RecordingUtils.py @@ -108,3 +108,17 @@ def startTimeshiftRecording(): logger.info("...") if hasattr(InfoBar.instance, "startTimeshiftRecording"): InfoBar.instance.startTimeshiftRecording() + + +def getSeriesDir(name): + logger.info("name: %s", name) + parts = [] + dirname = "" + if ": " in name: + parts = name.split(": ") + elif " - " in name: + parts = name.split(" - ") + if len(parts) > 1: + dirname = parts[0] + logger.info("dirname: %s", dirname) + return dirname diff --git a/src/Version.py b/src/Version.py index d153ea5..add492e 100644 --- a/src/Version.py +++ b/src/Version.py @@ -21,6 +21,6 @@ PLUGIN = "MediaCockpit" ID = "MDC" -VERSION = "15.2.5" +VERSION = "16.0.3" COPYRIGHT = "2018-2023 by dream-alpha" LICENSE = "This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version." diff --git a/src/skin/CockpitDisplaySummary.xmlinc b/src/skin/CockpitDisplaySummary.xmlinc deleted file mode 100755 index 6f0ac9f..0000000 --- a/src/skin/CockpitDisplaySummary.xmlinc +++ /dev/null @@ -1,11 +0,0 @@ - - - - - diff --git a/src/skin/CockpitMusicPlayerSummary.xmlinc b/src/skin/CockpitMusicPlayerSummary.xmlinc deleted file mode 100755 index 08cfa04..0000000 --- a/src/skin/CockpitMusicPlayerSummary.xmlinc +++ /dev/null @@ -1,22 +0,0 @@ - - - - - Position - - - Default - - - Remaining - - diff --git a/src/skin/Default-FHD/CockpitPlayerIcon.xmlinc b/src/skin/Default-FHD/CockpitPlayerIcon.xmlinc deleted file mode 100644 index d252955..0000000 --- a/src/skin/Default-FHD/CockpitPlayerIcon.xmlinc +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/skin/Default-FHD/CockpitPlayerSummary.xmlinc b/src/skin/Default-FHD/CockpitPlayerSummary.xmlinc deleted file mode 100644 index 41846f9..0000000 --- a/src/skin/Default-FHD/CockpitPlayerSummary.xmlinc +++ /dev/null @@ -1,21 +0,0 @@ - - - - Name - - - Position - - - Position - - - Position - - - EndTime,ShowNoSeconds - - - Remaining,ShowNoSeconds - - diff --git a/src/skin/Default-FHD/ColorButtons.xmlinc b/src/skin/Default-FHD/ColorButtons.xmlinc deleted file mode 100644 index f3fafd5..0000000 --- a/src/skin/Default-FHD/ColorButtons.xmlinc +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/skin/Default-FHD/ColorButtonsLabels.xmlinc b/src/skin/Default-FHD/ColorButtonsLabels.xmlinc deleted file mode 100644 index 3b2a15b..0000000 --- a/src/skin/Default-FHD/ColorButtonsLabels.xmlinc +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/skin/Default-FHD/ConfigScreen.xmlinc b/src/skin/Default-FHD/ConfigScreen.xmlinc deleted file mode 100644 index 285aee1..0000000 --- a/src/skin/Default-FHD/ConfigScreen.xmlinc +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/src/skin/Default-FHD/DateTime.xmlinc b/src/skin/Default-FHD/DateTime.xmlinc deleted file mode 100644 index 810a5cf..0000000 --- a/src/skin/Default-FHD/DateTime.xmlinc +++ /dev/null @@ -1,10 +0,0 @@ - - - Date - - - - - Default - - diff --git a/src/skin/Default-FHD/ScreenPVRState.xmlinc b/src/skin/Default-FHD/ScreenPVRState.xmlinc deleted file mode 100644 index cfca221..0000000 --- a/src/skin/Default-FHD/ScreenPVRState.xmlinc +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/skin/Default-FHD/colors.xmlinc b/src/skin/Default-FHD/colors.xmlinc new file mode 100644 index 0000000..239e7c9 --- /dev/null +++ b/src/skin/Default-FHD/colors.xmlinc @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/src/skin/Default-FHD/images/display_bg.png b/src/skin/Default-FHD/images/display_bg.png new file mode 100644 index 0000000000000000000000000000000000000000..a314625cef73e9fcf5992d3daf70f49044e66444 GIT binary patch literal 9319 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 - - - - - - - - - - - - - - - - Date - - - - - Default - - - - - - - - + + + + + + + + + + Date + + + Default + + - + @@ -53,10 +39,20 @@ - - - - + + + + + + + + + + Date + + + Default + @@ -100,7 +96,7 @@ Blink - + Position @@ -129,7 +125,7 @@ - + Name @@ -227,19 +223,6 @@ - - - - - Position - - - Default - - - Remaining - - @@ -271,13 +254,26 @@ + + + + + Position + + + Default + + + Remaining + + - + - + diff --git a/src/skin/Default-FHD/skin_src.xml b/src/skin/Default-FHD/skin_src.xml deleted file mode 100755 index b79a661..0000000 --- a/src/skin/Default-FHD/skin_src.xml +++ /dev/null @@ -1,154 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - { - "template": [ - MultiContentEntryText(pos=(5,0), size=(340,40), flags=RT_VALIGN_CENTER, text=0), - MultiContentEntryText(pos=(350,0), size=(980,40), flags=RT_VALIGN_CENTER, text=1), - ], - "fonts": [gFont("Regular",29)], - "itemHeight":40 - } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Gauge - - - Remaining - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/skin/Default-HD/CockpitContextMenu.xmlinc b/src/skin/Default-HD/CockpitContextMenu.xmlinc deleted file mode 100644 index 86b4c59..0000000 --- a/src/skin/Default-HD/CockpitContextMenu.xmlinc +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/src/skin/Default-HD/CockpitPlayer.xmlinc b/src/skin/Default-HD/CockpitPlayer.xmlinc deleted file mode 100644 index 3d989e4..0000000 --- a/src/skin/Default-HD/CockpitPlayer.xmlinc +++ /dev/null @@ -1,66 +0,0 @@ - - - - Name - - - - IsMultichannel - - - - - IsWidescreen - - - - VideoWidth - 0,720 - - - - VideoWidth - 721,1980 - - - - VideoWidth - 2160,3840 - - - - IsHdr - - - - Blink - - - - Position - - - - Gauge - - - Gauge - - - Gauge - - - Remaining - - - MovieDuration - InMinutes - - - Default - - - EndTime,ShowNoSeconds - - - diff --git a/src/skin/Default-HD/CockpitPlayerIcon.xmlinc b/src/skin/Default-HD/CockpitPlayerIcon.xmlinc deleted file mode 100644 index b701f31..0000000 --- a/src/skin/Default-HD/CockpitPlayerIcon.xmlinc +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/skin/Default-HD/CockpitPlayerSummary.xmlinc b/src/skin/Default-HD/CockpitPlayerSummary.xmlinc deleted file mode 100644 index 41846f9..0000000 --- a/src/skin/Default-HD/CockpitPlayerSummary.xmlinc +++ /dev/null @@ -1,21 +0,0 @@ - - - - Name - - - Position - - - Position - - - Position - - - EndTime,ShowNoSeconds - - - Remaining,ShowNoSeconds - - diff --git a/src/skin/Default-HD/ColorButtons.xmlinc b/src/skin/Default-HD/ColorButtons.xmlinc deleted file mode 100644 index b14c7f3..0000000 --- a/src/skin/Default-HD/ColorButtons.xmlinc +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/skin/Default-HD/ColorButtonsLabels.xmlinc b/src/skin/Default-HD/ColorButtonsLabels.xmlinc deleted file mode 100644 index 684a13f..0000000 --- a/src/skin/Default-HD/ColorButtonsLabels.xmlinc +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/skin/Default-HD/ConfigScreen.xmlinc b/src/skin/Default-HD/ConfigScreen.xmlinc deleted file mode 100644 index 71c7556..0000000 --- a/src/skin/Default-HD/ConfigScreen.xmlinc +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/src/skin/Default-HD/DateTime.xmlinc b/src/skin/Default-HD/DateTime.xmlinc deleted file mode 100644 index 0e1c1ae..0000000 --- a/src/skin/Default-HD/DateTime.xmlinc +++ /dev/null @@ -1,10 +0,0 @@ - - - Date - - - - - Default - - diff --git a/src/skin/Default-HD/ScreenPVRState.xmlinc b/src/skin/Default-HD/ScreenPVRState.xmlinc deleted file mode 100644 index 8df27fd..0000000 --- a/src/skin/Default-HD/ScreenPVRState.xmlinc +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/skin/Default-HD/colors.xmlinc b/src/skin/Default-HD/colors.xmlinc new file mode 100644 index 0000000..239e7c9 --- /dev/null +++ b/src/skin/Default-HD/colors.xmlinc @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/src/skin/Default-HD/images/display_bg.png b/src/skin/Default-HD/images/display_bg.png new file mode 100644 index 0000000000000000000000000000000000000000..a314625cef73e9fcf5992d3daf70f49044e66444 GIT binary patch literal 9319 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 - - diff --git a/src/skin/Default-HD/skin.xml b/src/skin/Default-HD/skin.xml index 89330d6..496c348 100644 --- a/src/skin/Default-HD/skin.xml +++ b/src/skin/Default-HD/skin.xml @@ -7,129 +7,125 @@ - - - - - - - - - - - - - - - - Date - - - - - Default - - - - - - - - - - - + + + + + + + + + + Date + + + Default + + + + + - + - - - - + + + + + + + + + + Date + + + Default + - - - { "template": [ MultiContentEntryText(pos=(3,0), size=(224,26), flags=RT_VALIGN_CENTER, text=0), MultiContentEntryText(pos=(231,0), size=(647,26), flags=RT_VALIGN_CENTER, text=1), ], "fonts": [gFont("Regular",20)], "itemHeight":26 } + + + { "template": [ MultiContentEntryText(pos=(5,0), size=(340,40), flags=RT_VALIGN_CENTER, text=0), MultiContentEntryText(pos=(350,0), size=(980,40), flags=RT_VALIGN_CENTER, text=1), ], "fonts": [gFont("Regular",29)], "itemHeight":40 } - + Name - - + + IsMultichannel - - + + IsWidescreen - + VideoWidth 0,720 - + VideoWidth 721,1980 - + VideoWidth 2160,3840 - + IsHdr - + Blink - - + + Position - - + + Gauge - + Gauge - + Gauge - + Remaining - + MovieDuration InMinutes - + Default - + EndTime,ShowNoSeconds - + Name @@ -150,82 +146,113 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Gauge + + + Remaining + + + + + + + + + + + + + + + + + + + + @@ -240,44 +267,13 @@ Remaining - - - - - - - Gauge - - - Remaining - - - - - - - - - - - - - - - - - - - - - - - + + - - - + + + diff --git a/src/skin/Default-HD/skin_src.xml b/src/skin/Default-HD/skin_src.xml deleted file mode 100644 index af41154..0000000 --- a/src/skin/Default-HD/skin_src.xml +++ /dev/null @@ -1,154 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - { - "template": [ - MultiContentEntryText(pos=(3,0), size=(224,26), flags=RT_VALIGN_CENTER, text=0), - MultiContentEntryText(pos=(231,0), size=(647,26), flags=RT_VALIGN_CENTER, text=1), - ], - "fonts": [gFont("Regular",20)], - "itemHeight":26 - } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Gauge - - - Remaining - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/skin/Default-WQHD/Bar_gradient.xmlinc b/src/skin/Default-WQHD/Bar_gradient.xmlinc deleted file mode 100644 index 9f9124a..0000000 --- a/src/skin/Default-WQHD/Bar_gradient.xmlinc +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/src/skin/Default-WQHD/CockpitContextMenu.xmlinc b/src/skin/Default-WQHD/CockpitContextMenu.xmlinc deleted file mode 100644 index 1c1d936..0000000 --- a/src/skin/Default-WQHD/CockpitContextMenu.xmlinc +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/src/skin/Default-WQHD/CockpitPlayer.xmlinc b/src/skin/Default-WQHD/CockpitPlayer.xmlinc deleted file mode 100644 index 3e8ff5b..0000000 --- a/src/skin/Default-WQHD/CockpitPlayer.xmlinc +++ /dev/null @@ -1,67 +0,0 @@ - - - VideoWidth - 2160,4320 - - - - VideoWidth - 1920,2159 - - - - VideoWidth - 1280,1919 - - - - VideoWidth - 960,1279 - - - - - - IsWidescreen - - - - - - IsMultichannel - - - - Position,Negate - - - MovieDuration - InMinutes - - - Remaining - - - - - Name - - - - Default - - - - EndTime,ShowNoSeconds - - - Gauge - - - Gauge - - - Gauge - - - diff --git a/src/skin/Default-WQHD/CockpitPlayerIcon.xmlinc b/src/skin/Default-WQHD/CockpitPlayerIcon.xmlinc deleted file mode 100644 index 18e4489..0000000 --- a/src/skin/Default-WQHD/CockpitPlayerIcon.xmlinc +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/skin/Default-WQHD/ColorButtons.xmlinc b/src/skin/Default-WQHD/ColorButtons.xmlinc deleted file mode 100644 index 7a88277..0000000 --- a/src/skin/Default-WQHD/ColorButtons.xmlinc +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/skin/Default-WQHD/ColorButtonsLabels.xmlinc b/src/skin/Default-WQHD/ColorButtonsLabels.xmlinc deleted file mode 100644 index 8fffed7..0000000 --- a/src/skin/Default-WQHD/ColorButtonsLabels.xmlinc +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/skin/Default-WQHD/ConfigScreen.xmlinc b/src/skin/Default-WQHD/ConfigScreen.xmlinc deleted file mode 100644 index 81d9d91..0000000 --- a/src/skin/Default-WQHD/ConfigScreen.xmlinc +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/src/skin/Default-WQHD/DateTime.xmlinc b/src/skin/Default-WQHD/DateTime.xmlinc deleted file mode 100644 index 5060cf3..0000000 --- a/src/skin/Default-WQHD/DateTime.xmlinc +++ /dev/null @@ -1,10 +0,0 @@ - - - Date - - - - - Default - - diff --git a/src/skin/Default-WQHD/ScreenPVRState.xmlinc b/src/skin/Default-WQHD/ScreenPVRState.xmlinc deleted file mode 100644 index dae9e00..0000000 --- a/src/skin/Default-WQHD/ScreenPVRState.xmlinc +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/skin/Default-WQHD/colors.xmlinc b/src/skin/Default-WQHD/colors.xmlinc index 88b18fa..3c28293 100644 --- a/src/skin/Default-WQHD/colors.xmlinc +++ b/src/skin/Default-WQHD/colors.xmlinc @@ -1,23 +1,26 @@ - + - + - - + + - + - + + + + diff --git a/src/skin/images/backdrop.png b/src/skin/Default-WQHD/images/display_bg.png old mode 100755 new mode 100644 similarity index 100% rename from src/skin/images/backdrop.png rename to src/skin/Default-WQHD/images/display_bg.png diff --git a/src/skin/Default-WQHD/listboxcontent.xmlinc b/src/skin/Default-WQHD/listboxcontent.xmlinc deleted file mode 100644 index 7727a18..0000000 --- a/src/skin/Default-WQHD/listboxcontent.xmlinc +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/skin/Default-WQHD/screen_CockpitPlayer.xmlinc b/src/skin/Default-WQHD/screen_CockpitPlayer.xmlinc new file mode 100644 index 0000000..fc79ccc --- /dev/null +++ b/src/skin/Default-WQHD/screen_CockpitPlayer.xmlinc @@ -0,0 +1,67 @@ + + + VideoWidth + 2160,4320 + + + + VideoWidth + 1920,2159 + + + + VideoWidth + 1280,1919 + + + + VideoWidth + 960,1279 + + + + + + IsWidescreen + + + + + + AudioIcon + + + VideoInfoCodec + + + Position,Negate + + + MovieDuration + InMinutes + + + Remaining + + + + + Name + + + Default + + + EndTime,ShowNoSeconds + + + Gauge + + + Gauge + + + Gauge + + + diff --git a/src/skin/Default-WQHD/skin.xml b/src/skin/Default-WQHD/skin.xml index 36954d5..5aee0fc 100644 --- a/src/skin/Default-WQHD/skin.xml +++ b/src/skin/Default-WQHD/skin.xml @@ -5,133 +5,129 @@ - + - - - - - - - - - - - - - - - - Date - - - - - Default - - - - - - - - - + + + + + + + + + + + Date + + + Default + + - - + + - + - - - - - + + + + + + + + + + + Date + + + Default + - - { "template": [ MultiContentEntryText(pos=(7,0), size=(452,53), flags=RT_VALIGN_CENTER, text=0), MultiContentEntryText(pos=(466,0), size=(1303,53), flags=RT_VALIGN_CENTER, text=1), ], "fonts": [gFont("Regular",40)], "itemHeight":53 } + + { "template": [ MultiContentEntryText(pos=(5,0), size=(340,40), flags=RT_VALIGN_CENTER, text=0), MultiContentEntryText(pos=(350,0), size=(980,40), flags=RT_VALIGN_CENTER, text=1), ], "fonts": [gFont("Regular",29)], "itemHeight":40 } - - + + VideoWidth 2160,4320 - + VideoWidth 1920,2159 - + VideoWidth 1280,1919 - + VideoWidth 960,1279 - - - + + + IsWidescreen - - - - IsMultichannel - + + + + AudioIcon + + + VideoInfoCodec Position,Negate - + MovieDuration InMinutes Remaining - - - - + + + + Name - - + Default - - + EndTime,ShowNoSeconds - + Gauge - + Gauge - + Gauge - + Name @@ -152,134 +148,134 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Position - - - Default - - - Remaining - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + Gauge - + Remaining - - + + - - - - - - - - + + + + + + + + - - - + + + + + + + + Position + + + Default + + + Remaining + + - + - + - + diff --git a/src/skin/Default-WQHD/skin_src.xml b/src/skin/Default-WQHD/skin_src.xml deleted file mode 100644 index 72b36ca..0000000 --- a/src/skin/Default-WQHD/skin_src.xml +++ /dev/null @@ -1,154 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - { - "template": [ - MultiContentEntryText(pos=(7,0), size=(452,53), flags=RT_VALIGN_CENTER, text=0), - MultiContentEntryText(pos=(466,0), size=(1303,53), flags=RT_VALIGN_CENTER, text=1), - ], - "fonts": [gFont("Regular",40)], - "itemHeight":53 - } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Gauge - - - Remaining - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/skin/Other-WQHD/CockpitContextMenu.xmlinc b/src/skin/Other-WQHD/CockpitContextMenu.xmlinc deleted file mode 100644 index 7b05d0f..0000000 --- a/src/skin/Other-WQHD/CockpitContextMenu.xmlinc +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/src/skin/Other-WQHD/CockpitPlayer.xmlinc b/src/skin/Other-WQHD/CockpitPlayer.xmlinc deleted file mode 100644 index 58f2baa..0000000 --- a/src/skin/Other-WQHD/CockpitPlayer.xmlinc +++ /dev/null @@ -1,66 +0,0 @@ - - - - Name - - - - IsMultichannel - - - - - IsWidescreen - - - - VideoWidth - 0,720 - - - - VideoWidth - 721,1980 - - - - VideoWidth - 2160,3840 - - - - IsHdr - - - - Blink - - - - Position - - - - Gauge - - - Gauge - - - Gauge - - - Remaining - - - MovieDuration - InMinutes - - - Default - - - EndTime,ShowNoSeconds - - - diff --git a/src/skin/Other-WQHD/CockpitPlayerIcon.xmlinc b/src/skin/Other-WQHD/CockpitPlayerIcon.xmlinc deleted file mode 100644 index 09e99c4..0000000 --- a/src/skin/Other-WQHD/CockpitPlayerIcon.xmlinc +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/skin/Other-WQHD/CockpitPlayerSummary.xmlinc b/src/skin/Other-WQHD/CockpitPlayerSummary.xmlinc deleted file mode 100644 index 41846f9..0000000 --- a/src/skin/Other-WQHD/CockpitPlayerSummary.xmlinc +++ /dev/null @@ -1,21 +0,0 @@ - - - - Name - - - Position - - - Position - - - Position - - - EndTime,ShowNoSeconds - - - Remaining,ShowNoSeconds - - diff --git a/src/skin/Other-WQHD/ColorButtons.xmlinc b/src/skin/Other-WQHD/ColorButtons.xmlinc deleted file mode 100644 index ef9d28c..0000000 --- a/src/skin/Other-WQHD/ColorButtons.xmlinc +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/skin/Other-WQHD/ColorButtonsLabels.xmlinc b/src/skin/Other-WQHD/ColorButtonsLabels.xmlinc deleted file mode 100644 index 80cba22..0000000 --- a/src/skin/Other-WQHD/ColorButtonsLabels.xmlinc +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/skin/Other-WQHD/ConfigScreen.xmlinc b/src/skin/Other-WQHD/ConfigScreen.xmlinc deleted file mode 100644 index 3d49c20..0000000 --- a/src/skin/Other-WQHD/ConfigScreen.xmlinc +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/src/skin/Other-WQHD/DateTime.xmlinc b/src/skin/Other-WQHD/DateTime.xmlinc deleted file mode 100644 index 9a0229d..0000000 --- a/src/skin/Other-WQHD/DateTime.xmlinc +++ /dev/null @@ -1,10 +0,0 @@ - - - Date - - - - - Default - - diff --git a/src/skin/Other-WQHD/ScreenPVRState.xmlinc b/src/skin/Other-WQHD/ScreenPVRState.xmlinc deleted file mode 100644 index cf429b8..0000000 --- a/src/skin/Other-WQHD/ScreenPVRState.xmlinc +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/skin/Other-WQHD/images/display_bg.png b/src/skin/Other-WQHD/images/display_bg.png new file mode 100644 index 0000000000000000000000000000000000000000..a314625cef73e9fcf5992d3daf70f49044e66444 GIT binary patch literal 9319 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 - - diff --git a/src/skin/Other-WQHD/skin.xml b/src/skin/Other-WQHD/skin.xml index c879a28..32c81eb 100644 --- a/src/skin/Other-WQHD/skin.xml +++ b/src/skin/Other-WQHD/skin.xml @@ -7,43 +7,29 @@ - - - - - - - - - - - - - - - - Date - - - - - Default - - - - - - - - + + + + + + + + + + Date + + + Default + + - + @@ -53,14 +39,24 @@ - - - - + + + + + + + + + + Date + + + Default + - {"template": [MultiContentEntryText(pos=(7,0), size=(453,53), flags=RT_VALIGN_CENTER, text=0), MultiContentEntryText(pos=(467,0), size=(1307,53), flags=RT_VALIGN_CENTER, text=1), ], "fonts": [gFont("Regular",39)], "itemHeight":53} + { "template": [ MultiContentEntryText(pos=(5,0), size=(340,40), flags=RT_VALIGN_CENTER, text=0), MultiContentEntryText(pos=(350,0), size=(980,40), flags=RT_VALIGN_CENTER, text=1), ], "fonts": [gFont("Regular",29)], "itemHeight":40 } @@ -100,11 +96,11 @@ Blink - + Position - + Gauge @@ -129,7 +125,7 @@ - + Name @@ -151,36 +147,36 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -227,19 +223,6 @@ - - - - - Position - - - Default - - - Remaining - - @@ -271,13 +254,26 @@ + + + + + Position + + + Default + + + Remaining + + - + - + diff --git a/src/skin/Other-WQHD/skin_src.xml b/src/skin/Other-WQHD/skin_src.xml deleted file mode 100755 index 37919dd..0000000 --- a/src/skin/Other-WQHD/skin_src.xml +++ /dev/null @@ -1,145 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {"template": [MultiContentEntryText(pos=(7,0), size=(453,53), flags=RT_VALIGN_CENTER, text=0), MultiContentEntryText(pos=(467,0), size=(1307,53), flags=RT_VALIGN_CENTER, text=1), ], "fonts": [gFont("Regular",39)], "itemHeight":53} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Gauge - - - Remaining - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/skin/Shadow-FHD/CockpitContextMenu.xmlinc b/src/skin/Shadow-FHD/CockpitContextMenu.xmlinc deleted file mode 100644 index 4ddd142..0000000 --- a/src/skin/Shadow-FHD/CockpitContextMenu.xmlinc +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/src/skin/Shadow-FHD/CockpitPlayerIcon.xmlinc b/src/skin/Shadow-FHD/CockpitPlayerIcon.xmlinc deleted file mode 100644 index 3b054ce..0000000 --- a/src/skin/Shadow-FHD/CockpitPlayerIcon.xmlinc +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/skin/Shadow-FHD/CockpitPlayerSummary.xmlinc b/src/skin/Shadow-FHD/CockpitPlayerSummary.xmlinc deleted file mode 100644 index dd3510f..0000000 --- a/src/skin/Shadow-FHD/CockpitPlayerSummary.xmlinc +++ /dev/null @@ -1,21 +0,0 @@ - - - - Name - - - Position - - - Position - - - Position - - - EndTime,ShowNoSeconds - - - Remaining,ShowNoSeconds - - diff --git a/src/skin/Shadow-FHD/ColorButtons.xmlinc b/src/skin/Shadow-FHD/ColorButtons.xmlinc deleted file mode 100644 index 25943a8..0000000 --- a/src/skin/Shadow-FHD/ColorButtons.xmlinc +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/skin/Shadow-FHD/ColorButtonsLabels.xmlinc b/src/skin/Shadow-FHD/ColorButtonsLabels.xmlinc deleted file mode 100644 index e7ead0c..0000000 --- a/src/skin/Shadow-FHD/ColorButtonsLabels.xmlinc +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/skin/Shadow-FHD/DateTime.xmlinc b/src/skin/Shadow-FHD/DateTime.xmlinc deleted file mode 100644 index b968420..0000000 --- a/src/skin/Shadow-FHD/DateTime.xmlinc +++ /dev/null @@ -1,10 +0,0 @@ - - - Date - - - - - Default - - diff --git a/src/skin/Shadow-FHD/images/display_bg.png b/src/skin/Shadow-FHD/images/display_bg.png new file mode 100644 index 0000000000000000000000000000000000000000..7c184d8de46d2a977972b17db81c8f13ce275c10 GIT binary patch literal 8440 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 J@Py0N{{i>!w!Q!W literal 0 HcmV?d00001 diff --git a/src/skin/Shadow-FHD/listboxcontent.xmlinc b/src/skin/Shadow-FHD/listboxcontent.xmlinc deleted file mode 100644 index df877b2..0000000 --- a/src/skin/Shadow-FHD/listboxcontent.xmlinc +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/skin/Shadow-FHD/CockpitPlayer.xmlinc b/src/skin/Shadow-FHD/screen_CockpitPlayer.xmlinc similarity index 88% rename from src/skin/Shadow-FHD/CockpitPlayer.xmlinc rename to src/skin/Shadow-FHD/screen_CockpitPlayer.xmlinc index 2bd6d44..0b6375c 100644 --- a/src/skin/Shadow-FHD/CockpitPlayer.xmlinc +++ b/src/skin/Shadow-FHD/screen_CockpitPlayer.xmlinc @@ -1,25 +1,25 @@ - + VideoWidth 2160,4320 - + VideoWidth 1920,2159 - + VideoWidth 1280,1919 - + VideoWidth 960,1279 - + IsWidescreen @@ -30,7 +30,7 @@ AudioIcon - + VideoInfoCodec @@ -44,7 +44,7 @@ Remaining - + Name @@ -64,4 +64,4 @@ Gauge - + diff --git a/src/skin/Shadow-FHD/skin.xml b/src/skin/Shadow-FHD/skin.xml index c9112b3..37bad01 100644 --- a/src/skin/Shadow-FHD/skin.xml +++ b/src/skin/Shadow-FHD/skin.xml @@ -7,40 +7,26 @@ - - - - - - - - - - - - - - - - Date - - - - - Default - - - - - - - + + + + + + + + + + Date + + + Default + @@ -53,38 +39,48 @@ - - - - + + + + + + + + + + Date + + + Default + - {"template": [MultiContentEntryText(pos=(5,0), size=(339,40), flags=RT_VALIGN_CENTER, text=0), MultiContentEntryText(pos=(350,0), size=(977,40), flags=RT_VALIGN_CENTER, text=1), ], "fonts": [gFont("Regular",30)], "itemHeight":40} + { "template": [ MultiContentEntryText(pos=(5,0), size=(340,40), flags=RT_VALIGN_CENTER, text=0), MultiContentEntryText(pos=(350,0), size=(980,40), flags=RT_VALIGN_CENTER, text=1), ], "fonts": [gFont("Regular",29)], "itemHeight":40 } - + VideoWidth 2160,4320 - + VideoWidth 1920,2159 - + VideoWidth 1280,1919 - + VideoWidth 960,1279 - + IsWidescreen @@ -95,7 +91,7 @@ AudioIcon - + VideoInfoCodec @@ -109,8 +105,8 @@ Remaining - - + + Name @@ -131,8 +127,8 @@ - - + + Name @@ -229,19 +225,6 @@ - - - - - Position - - - Default - - - Remaining - - @@ -273,12 +256,25 @@ + + + + + Position + + + Default + + + Remaining + + - + diff --git a/src/skin/images/player.svg b/src/skin/images/player.svg new file mode 100644 index 0000000..b8d4867 --- /dev/null +++ b/src/skin/images/player.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/skin/Default-FHD/listboxcontent.xmlinc b/src/skin/listboxcontent.xmlinc similarity index 100% rename from src/skin/Default-FHD/listboxcontent.xmlinc rename to src/skin/listboxcontent.xmlinc diff --git a/src/skin/Default-FHD/CockpitContextMenu.xmlinc b/src/skin/screen_CockpitContextMenu.xmlinc similarity index 100% rename from src/skin/Default-FHD/CockpitContextMenu.xmlinc rename to src/skin/screen_CockpitContextMenu.xmlinc diff --git a/src/skin/screen_CockpitDisplaySummary.xmlinc b/src/skin/screen_CockpitDisplaySummary.xmlinc new file mode 100755 index 0000000..1a6a601 --- /dev/null +++ b/src/skin/screen_CockpitDisplaySummary.xmlinc @@ -0,0 +1,5 @@ + + + + + diff --git a/src/skin/screen_CockpitMusicPlayer.xmlinc b/src/skin/screen_CockpitMusicPlayer.xmlinc new file mode 100755 index 0000000..3deda0e --- /dev/null +++ b/src/skin/screen_CockpitMusicPlayer.xmlinc @@ -0,0 +1,31 @@ + + + + + + + Gauge + + + Remaining + + + + + + + + + + + + + + + + + + + + + diff --git a/src/skin/screen_CockpitMusicPlayerSummary.xmlinc b/src/skin/screen_CockpitMusicPlayerSummary.xmlinc new file mode 100755 index 0000000..4663e06 --- /dev/null +++ b/src/skin/screen_CockpitMusicPlayerSummary.xmlinc @@ -0,0 +1,13 @@ + + + + + Position + + + Default + + + Remaining + + diff --git a/src/skin/Default-FHD/CockpitPlayer.xmlinc b/src/skin/screen_CockpitPlayer.xmlinc similarity index 85% rename from src/skin/Default-FHD/CockpitPlayer.xmlinc rename to src/skin/screen_CockpitPlayer.xmlinc index acc1abb..d0f4ad6 100644 --- a/src/skin/Default-FHD/CockpitPlayer.xmlinc +++ b/src/skin/screen_CockpitPlayer.xmlinc @@ -35,18 +35,18 @@ Blink - + Position - + Gauge - + Gauge - + Gauge @@ -63,4 +63,4 @@ EndTime,ShowNoSeconds - + diff --git a/src/skin/Default-WQHD/CockpitPlayerSummary.xmlinc b/src/skin/screen_CockpitPlayerSummary.xmlinc similarity index 94% rename from src/skin/Default-WQHD/CockpitPlayerSummary.xmlinc rename to src/skin/screen_CockpitPlayerSummary.xmlinc index daf7c05..d60ac61 100644 --- a/src/skin/Default-WQHD/CockpitPlayerSummary.xmlinc +++ b/src/skin/screen_CockpitPlayerSummary.xmlinc @@ -1,5 +1,5 @@ - + Name diff --git a/src/skin/Shadow-FHD/ConfigScreen.xmlinc b/src/skin/screen_ConfigScreen.xmlinc similarity index 78% rename from src/skin/Shadow-FHD/ConfigScreen.xmlinc rename to src/skin/screen_ConfigScreen.xmlinc index b6417ba..9c8af2a 100644 --- a/src/skin/Shadow-FHD/ConfigScreen.xmlinc +++ b/src/skin/screen_ConfigScreen.xmlinc @@ -1,8 +1,7 @@ - - - - + + + diff --git a/src/skin/Shadow-FHD/skin_src.xml b/src/skin/screen_MediaCockpit.xmlinc old mode 100644 new mode 100755 similarity index 53% rename from src/skin/Shadow-FHD/skin_src.xml rename to src/skin/screen_MediaCockpit.xmlinc index d5cbc55..5a74a13 --- a/src/skin/Shadow-FHD/skin_src.xml +++ b/src/skin/screen_MediaCockpit.xmlinc @@ -1,35 +1,3 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {"template": [MultiContentEntryText(pos=(5,0), size=(339,40), flags=RT_VALIGN_CENTER, text=0), MultiContentEntryText(pos=(350,0), size=(977,40), flags=RT_VALIGN_CENTER, text=1), ], "fonts": [gFont("Regular",30)], "itemHeight":40} - - - @@ -108,38 +76,3 @@ - - - - - - - - Gauge - - - Remaining - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/skin/screen_MediaInfo.xmlinc b/src/skin/screen_MediaInfo.xmlinc new file mode 100755 index 0000000..0cef0d6 --- /dev/null +++ b/src/skin/screen_MediaInfo.xmlinc @@ -0,0 +1,19 @@ + + + + + + + + + { + "template": [ + MultiContentEntryText(pos=(5,0), size=(340,40), flags=RT_VALIGN_CENTER, text=0), + MultiContentEntryText(pos=(350,0), size=(980,40), flags=RT_VALIGN_CENTER, text=1), + ], + "fonts": [gFont("Regular",29)], + "itemHeight":40 + } + + + diff --git a/src/skin/Shadow-FHD/ScreenPVRState.xmlinc b/src/skin/screen_ScreenPVRState.xmlinc similarity index 80% rename from src/skin/Shadow-FHD/ScreenPVRState.xmlinc rename to src/skin/screen_ScreenPVRState.xmlinc index 125e0eb..9c52c4d 100644 --- a/src/skin/Shadow-FHD/ScreenPVRState.xmlinc +++ b/src/skin/screen_ScreenPVRState.xmlinc @@ -1,4 +1,4 @@ - + diff --git a/src/skin/screen_Slideshow.xmlinc b/src/skin/screen_Slideshow.xmlinc new file mode 100755 index 0000000..a467fc3 --- /dev/null +++ b/src/skin/screen_Slideshow.xmlinc @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/skin/Shadow-FHD/screenpart_Bar_gradient.xmlinc b/src/skin/screenpart_Bar_gradient.xmlinc similarity index 54% rename from src/skin/Shadow-FHD/screenpart_Bar_gradient.xmlinc rename to src/skin/screenpart_Bar_gradient.xmlinc index 8ff0a31..de66cbf 100644 --- a/src/skin/Shadow-FHD/screenpart_Bar_gradient.xmlinc +++ b/src/skin/screenpart_Bar_gradient.xmlinc @@ -1,2 +1,2 @@ - + diff --git a/src/skin/screenpart_ColorButtons.xmlinc b/src/skin/screenpart_ColorButtons.xmlinc new file mode 100644 index 0000000..bb7a49d --- /dev/null +++ b/src/skin/screenpart_ColorButtons.xmlinc @@ -0,0 +1,4 @@ + + + + diff --git a/src/skin/screenpart_ColorButtonsLabels.xmlinc b/src/skin/screenpart_ColorButtonsLabels.xmlinc new file mode 100644 index 0000000..bc2a337 --- /dev/null +++ b/src/skin/screenpart_ColorButtonsLabels.xmlinc @@ -0,0 +1,4 @@ + + + + diff --git a/src/skin/screenpart_DateTime.xmlinc b/src/skin/screenpart_DateTime.xmlinc new file mode 100644 index 0000000..b25906a --- /dev/null +++ b/src/skin/screenpart_DateTime.xmlinc @@ -0,0 +1,6 @@ + + Date + + + Default + diff --git a/src/skin/skin_src.xml b/src/skin/skin_src.xml new file mode 100755 index 0000000..85c253a --- /dev/null +++ b/src/skin/skin_src.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + +