From 27a74ec80b3f932fc334254c40325b8191678318 Mon Sep 17 00:00:00 2001 From: "Andrew J.Swan" Date: Wed, 20 Mar 2024 16:04:41 +0200 Subject: [PATCH 1/2] MP1.34-Pre: German language update Co-authored-by: catavolt --- mediaportal/MediaPortal.Base/language/strings_de.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mediaportal/MediaPortal.Base/language/strings_de.xml b/mediaportal/MediaPortal.Base/language/strings_de.xml index c43cdeb6135..9fb77bf43d1 100644 --- a/mediaportal/MediaPortal.Base/language/strings_de.xml +++ b/mediaportal/MediaPortal.Base/language/strings_de.xml @@ -926,7 +926,7 @@ Erweiterte Aufnahme Nicht aufnehmen Erinnern - Folgen / Wiederholungen dieser Sendung + Folgen/Wiederholungen dieser Sendung Behalte bis Bis gesehen Solange freier Speicher verfügbar From db63cb6bda2b3316b2cba91d175aa8c4bf2db08f Mon Sep 17 00:00:00 2001 From: "Andrew J.Swan" Date: Wed, 20 Mar 2024 16:13:08 +0200 Subject: [PATCH 2/2] MP1.34-Pre: DefaultWideHD skin update Co-authored-by: catavolt --- .../skin/DefaultWideHD/common.window.xml | 210 ++++---- .../skin/DefaultWideHD/mytvprogram.xml | 464 +++++++++--------- 2 files changed, 348 insertions(+), 326 deletions(-) diff --git a/mediaportal/MediaPortal.Base/skin/DefaultWideHD/common.window.xml b/mediaportal/MediaPortal.Base/skin/DefaultWideHD/common.window.xml index e33a3946e3a..335230f9179 100644 --- a/mediaportal/MediaPortal.Base/skin/DefaultWideHD/common.window.xml +++ b/mediaportal/MediaPortal.Base/skin/DefaultWideHD/common.window.xml @@ -1,94 +1,116 @@ - - - - - background top overlay - image - 1 - 0 - 0 - 1920 - 140 - overlay_top.png - 99ffffff - - - - - - label - 1 - 45 - 15 - - Label - left - ff6FAFE1 - - - Number of Files Label - label - 1 - 45 - 52 - - left - ff6FAFE1 - Label - string.equals(#selectedindex)+string.equals(#itemcount) - - - Total duration Label - label - 1 - 1866 - 52 - - right - ff6FAFE1 - Label - string.equals(#totalduration)+[window.isvisible(500)|window.isvisible(501)|window.isvisible(504)] - - - - - - background selecteditem - image - 0 - -20 - 97 - 2025 - 90 - general_overlay_selecteditem.png - bbffffff - !window.isvisible(0)+!window.isvisible(34)+!window.isvisible(510)+!window.isvisible(7978) - - - Selected item Label - fadelabel - 1 - 0 - 142 - 1920 - - Menutitle - center - ff6FAFE1 - !window.isvisible(6)+!window.isvisible(25)+!window.isvisible(0)+!window.isvisible(34)+!window.isvisible(801) - - - Selected item Label - fadelabel - 1 - 0 - 142 - 1920 - - Menutitle - center - ff6FAFE1 - window.isvisible(801) - - - + + + + + background top overlay + image + 1 + 0 + 0 + 1920 + 140 + overlay_top.png + 99ffffff + + + + + + label + 1 + 45 + 15 + + Label + left + ff6FAFE1 + + + label + 1 + 45 + 15 + + Label + left + ff6FAFE1 + + + Number of Files Label + label + 1 + 45 + 52 + + left + ff6FAFE1 + Label + string.equals(#selectedindex)+string.equals(#itemcount)+!string.equals(#currentmodule,#(L(100748))) + + + Number of Files Label + label + 1 + 45 + 52 + + left + ff6FAFE1 + Label + string.equals(#selectedindex)+string.equals(#itemcount)+string.equals(#currentmodule,#(L(100748))) + + + Total duration Label + label + 1 + 1866 + 52 + + right + ff6FAFE1 + Label + string.equals(#totalduration)+[window.isvisible(500)|window.isvisible(501)|window.isvisible(504)] + + + + + + background selecteditem + image + 0 + -20 + 97 + 2025 + 90 + general_overlay_selecteditem.png + bbffffff + !window.isvisible(0)+!window.isvisible(34)+!window.isvisible(510)+!window.isvisible(7978) + + + Selected item Label + fadelabel + 1 + 0 + 142 + 1920 + + Menutitle + center + ff6FAFE1 + !window.isvisible(6)+!window.isvisible(25)+!window.isvisible(0)+!window.isvisible(34)+!window.isvisible(801) + + + Selected item Label + fadelabel + 1 + 0 + 142 + 1920 + + Menutitle + center + ff6FAFE1 + window.isvisible(801) + + + diff --git a/mediaportal/MediaPortal.Base/skin/DefaultWideHD/mytvprogram.xml b/mediaportal/MediaPortal.Base/skin/DefaultWideHD/mytvprogram.xml index 2d722fd0eab..3909e2bdf43 100644 --- a/mediaportal/MediaPortal.Base/skin/DefaultWideHD/mytvprogram.xml +++ b/mediaportal/MediaPortal.Base/skin/DefaultWideHD/mytvprogram.xml @@ -1,232 +1,232 @@ - - - - 748 - 2 - yes - #header.label:1037 - #header.hover:hover_my tv.png - #selecteditem: - - - BG - image - 1 - blue.png - 1920 - 1080 - - common.window.xml - common.time.xml - - General Overlay - 0 - image - 0 - 45 - 1920 - 1080 - general_overlay.png - - - actiongroup - action menu - 2 - 0 - 0 - -60 - 159 - 1080 - - - Action_nofocus.png - 412 - 1080 - 00ffffff - - image - 0 - 1920 - 1080 - white.png - 50005eef - - - image - 39 - 117 - 480 - 886 - Backslide.png - fffffffff - !Control.HasFocus(11)+!Control.HasFocus(10) - visible - hidden - - - group element - group - visible - hidden - StackLayout(0, Vertical, true) - 75 - 181 - - Record - button - 2 - 17 - 3 - 10 - - - Advanced Record - button - 3 - - 2 - 4 - 10 - - - Keep - button - 4 - - 2 - 6 - 10 - - - Quality - button - 6 - - 4 - 7 - 10 - - - Episodes - button - 7 - - 6 - 8 - 10 - - - PreRecord - button - 8 - - 7 - 9 - 10 - - - PostRecord - button - 9 - - 8 - 99 - 10 - - - - - upcoming episodes label - label - 11 - 3708 - 90 - left - 1200 - - FFFFFFFF - - - upcoming episodes listcontrol - listcontrol - 10 - 450 - - - Seperator - image - 1 - 120 - 637 - 1710 - 1 - hbar1white.png - 60ffffff - - - image - 120 - 660 - 90 - 90 - yes - yes - no - #selectedthumb - - - channel - 16 - fadelabel - 240 - 660 - 450 - ff6FAFE1 - font12 - - - Current program time - 14 - label - 690 - 660 - 450 - left - font12 - ff6FAFE1 - - - Current program genre - label - 17 - 1140 - 660 - 750 - left - font12 - ff6FAFE1 - - - Program Title - 13 - fadelabel - 240 - 697 - 1590 - left - font14 - ivory - - - Description1 - textboxscrollup - 15 - 240 - 757 - 1590 - 157 - - font11 - FFFFFFFF - - - + + + + 748 + 2 + yes + #header.label:1041 + #header.hover:hover_my tv.png + #selecteditem: + + + BG + image + 1 + blue.png + 1920 + 1080 + + common.window.xml + common.time.xml + + General Overlay + 0 + image + 0 + 45 + 1920 + 1080 + general_overlay.png + + + actiongroup + action menu + 2 + 0 + 0 + -60 + 159 + 1080 + - + Action_nofocus.png + 412 + 1080 + 00ffffff + + image + 0 + 1920 + 1080 + white.png + 50005eef + + + image + 39 + 117 + 480 + 886 + Backslide.png + fffffffff + !Control.HasFocus(11)+!Control.HasFocus(10) + visible + hidden + + + group element + group + visible + hidden + StackLayout(0, Vertical, true) + 75 + 181 + + Record + button + 2 + 17 + 3 + 10 + + + Advanced Record + button + 3 + + 2 + 4 + 10 + + + Keep + button + 4 + + 2 + 6 + 10 + + + Quality + button + 6 + + 4 + 7 + 10 + + + Episodes + button + 7 + + 6 + 8 + 10 + + + PreRecord + button + 8 + + 7 + 9 + 10 + + + PostRecord + button + 9 + + 8 + 99 + 10 + + + + + upcoming episodes label + label + 11 + 3708 + 90 + left + 1200 + + FFFFFFFF + + + upcoming episodes listcontrol + listcontrol + 10 + 450 + + + Seperator + image + 1 + 120 + 637 + 1710 + 1 + hbar1white.png + 60ffffff + + + image + 120 + 660 + 90 + 90 + yes + yes + no + #selectedthumb + + + channel + 16 + fadelabel + 240 + 660 + 450 + ff6FAFE1 + font12 + + + Current program time + 14 + label + 690 + 660 + 450 + left + font12 + ff6FAFE1 + + + Current program genre + label + 17 + 1140 + 660 + 750 + left + font12 + ff6FAFE1 + + + Program Title + 13 + fadelabel + 240 + 697 + 1590 + left + font14 + ivory + + + Description1 + textboxscrollup + 15 + 240 + 757 + 1590 + 157 + + font11 + FFFFFFFF + + +