From 06fd4aa6aec4ee0710124a502f5d962c1e8ba696 Mon Sep 17 00:00:00 2001
From: ksooo <3226626+ksooo@users.noreply.github.com>
Date: Sat, 22 Jun 2024 15:32:07 +0200
Subject: [Estuary] PVR Group manager: Display name of selected group in header
 bar, instead of redundant total number of groups.

---
 addons/skin.estuary/xml/DialogPVRGroupManager.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons')

diff --git a/addons/skin.estuary/xml/DialogPVRGroupManager.xml b/addons/skin.estuary/xml/DialogPVRGroupManager.xml
index 0e3523e37d..4bc5372751 100644
--- a/addons/skin.estuary/xml/DialogPVRGroupManager.xml
+++ b/addons/skin.estuary/xml/DialogPVRGroupManager.xml
@@ -11,7 +11,7 @@
 			<include content="DialogBackgroundCommons">
 				<param name="width" value="1820" />
 				<param name="height" value="995" />
-				<param name="header_label" value="$VAR[PVRGroupMgrHeader]$INFO[Container(13).NumItems, (,)]" />
+				<param name="header_label" value="$VAR[PVRGroupMgrHeader]$INFO[Container(13).ListItem.Label, - ,]" />
 				<param name="header_id" value="1" />
 			</include>
 			<control type="group">
-- 
cgit v1.2.3


From 388c809bffaa539c441be2f11b49a8af82e7882b Mon Sep 17 00:00:00 2001
From: ksooo <3226626+ksooo@users.noreply.github.com>
Date: Mon, 24 Jun 2024 16:56:50 +0200
Subject: [guilib][PVR] New GUI info label: ListItem.PVRGroupOrigin.

---
 addons/resource.language.en_gb/resources/strings.po | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

(limited to 'addons')

diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po
index 76ba757a12..70c600ca6d 100644
--- a/addons/resource.language.en_gb/resources/strings.po
+++ b/addons/resource.language.en_gb/resources/strings.po
@@ -3942,7 +3942,25 @@ msgctxt "#855"
 msgid "Recently added channels"
 msgstr ""
 
-#empty strings from id 856 to 996
+#. Label for the origin of a channel group (provided by a PVR client add-on).
+#: xbmc/pvr/guilib/guiinfo/PVRGUIInfo.cpp
+msgctxt "#856"
+msgid "Client"
+msgstr ""
+
+#. Label for the origin of a channel group (automatically created by Kodi).
+#: xbmc/pvr/guilib/guiinfo/PVRGUIInfo.cpp
+msgctxt "#857"
+msgid "System"
+msgstr ""
+
+#. Label for the origin of a channel group (manually created by the user).
+#: xbmc/pvr/guilib/guiinfo/PVRGUIInfo.cpp
+msgctxt "#858"
+msgid "User"
+msgstr ""
+
+#empty strings from id 859 to 996
 
 #: xbmc/windows/GUIMediaWindow.cpp
 msgctxt "#997"
-- 
cgit v1.2.3


From 04a3d1f9ac7a9e3637138f25a255466b20293667 Mon Sep 17 00:00:00 2001
From: ksooo <3226626+ksooo@users.noreply.github.com>
Date: Mon, 24 Jun 2024 16:59:10 +0200
Subject: [Estuary] PVR Group manager: Display group's origin along with the
 group name so the user has an idea what kind of groups they face (and what
 can be done with them).

---
 addons/skin.estuary/xml/DialogPVRGroupManager.xml | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

(limited to 'addons')

diff --git a/addons/skin.estuary/xml/DialogPVRGroupManager.xml b/addons/skin.estuary/xml/DialogPVRGroupManager.xml
index 4bc5372751..c354acb05e 100644
--- a/addons/skin.estuary/xml/DialogPVRGroupManager.xml
+++ b/addons/skin.estuary/xml/DialogPVRGroupManager.xml
@@ -49,13 +49,25 @@
 					<itemlayout width="400" height="70">
 						<control type="label">
 							<left>20</left>
+							<top>5</top>
 							<right>70</right>
-							<height>70</height>
+							<height>30</height>
 							<aligny>center</aligny>
-							<font>font27</font>
+							<font>font12</font>
 							<textcolor>grey</textcolor>
 							<label>[B]$INFO[ListItem.Label][/B]</label>
 						</control>
+						<control type="label">
+							<left>20</left>
+							<top>35</top>
+							<right>70</right>
+							<height>30</height>
+							<font>font10</font>
+							<aligny>center</aligny>
+							<label>[I]$INFO[ListItem.PVRGroupOrigin][/I]</label>
+							<textcolor>grey</textcolor>
+							<scroll>true</scroll>
+						</control>
 						<control type="image">
 							<width>60</width>
 							<height>60</height>
@@ -93,7 +105,7 @@
 							<height>30</height>
 							<font>font10</font>
 							<aligny>center</aligny>
-							<label>[I]$INFO[ListItem.Property(ClientName)][/I]</label>
+							<label>[I]$INFO[ListItem.PVRGroupOrigin]$INFO[ListItem.Property(ClientName),: ,][/I]</label>
 							<scroll>true</scroll>
 						</control>
 						<control type="image">
-- 
cgit v1.2.3