0.19.0

CONTROL/control

@@ -1,6 +1,6 @@
 Description: TVMagazineCockpit
 Maintainer: dream-alpha
 Package: enigma2-plugin-extensions-tvmagazinecockpit
-Version: 0.18.0
+Version: 0.19.0
 Architecture: all
 Depends: enigma2-plugin-skincomponents-extmultilistselection

po/TVMagazineCockpit.pot

@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2024-06-13 13:00+0200\n"
-"PO-Revision-Date: 2024-06-13 13:03+0200\n"
+"POT-Creation-Date: 2024-06-14 19:00+0200\n"
+"PO-Revision-Date: 2024-06-14 19:00+0200\n"
 "Last-Translator: dream-alpha\n"
 "Language-Team: \n"
 "Language: de_DE\n"
@@ -71,31 +71,28 @@ msgstr ""
 msgid "Channels (TV)"
 msgstr ""
 
-msgid "TV Bouquet Channels"
-msgstr ""
-
 msgid "Move mode enabled"
 msgstr ""
 
-msgid "Press OK to add channel, or Menu for more options"
+msgid "TV Bouquet Channels"
 msgstr ""
 
-msgid "TV Spielfilm Rows"
+msgid "Press OK to add channel, or Menu for more options"
 msgstr ""
 
-msgid "TV Spielfilm Columns"
+msgid "Default"
 msgstr ""
 
-msgid "Standard"
+msgid "Sky"
 msgstr ""
 
-msgid "Favoriten"
+msgid "All"
 msgstr ""
 
-msgid "Sky"
+msgid "TV Spielfilm Rows"
 msgstr ""
 
-msgid "Alle"
+msgid "TV Spielfilm Columns"
 msgstr ""
 
 msgid "default"
@@ -119,10 +116,13 @@ msgstr ""
 msgid "Error during download"
 msgstr ""
 
-msgid "row view"
+msgid "Row view"
 msgstr ""
 
-msgid "column view"
+msgid "Column view"
+msgstr ""
+
+msgid "Bouquet selection"
 msgstr ""
 
 msgid "Setup"
@@ -137,6 +137,9 @@ msgstr ""
 msgid "Input"
 msgstr ""
 
+msgid "Bouquet Selection"
+msgstr ""
+
 msgid "Please wait... Loading list..."
 msgstr ""
 
@@ -158,6 +161,9 @@ msgstr ""
 msgid "Reload"
 msgstr ""
 
+msgid "column view"
+msgstr ""
+
 msgid "Loading..."
 msgstr ""
 
@@ -203,9 +209,6 @@ msgstr ""
 msgid "Channel"
 msgstr ""
 
-msgid "Default"
-msgstr ""
-
 msgid "Index"
 msgstr ""
 
@@ -221,6 +224,12 @@ msgstr ""
 msgid "Browse TV Magazine"
 msgstr ""
 
+msgid "Search TV Magazine ..."
+msgstr ""
+
+msgid "TVMagazineCockpit Search"
+msgstr ""
+
 msgid "installed"
 msgstr ""
 

po/de.po

@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2024-06-13 13:00+0200\n"
-"PO-Revision-Date: 2024-06-13 13:03+0200\n"
+"POT-Creation-Date: 2024-06-14 19:00+0200\n"
+"PO-Revision-Date: 2024-06-14 19:00+0200\n"
 "Last-Translator: dream-alpha\n"
 "Language-Team: \n"
 "Language: de_DE\n"
@@ -73,35 +73,32 @@ msgstr "Alle Kanäle hinzufügen"
 msgid "Channels (TV)"
 msgstr "Kanäle (TV)"
 
-msgid "TV Bouquet Channels"
-msgstr "TV Bouquet Kanäle"
-
 msgid "Move mode enabled"
 msgstr "Verschiebemodus"
 
+msgid "TV Bouquet Channels"
+msgstr "TV Bouquet Kanäle"
+
 msgid "Press OK to add channel, or Menu for more options"
 msgstr ""
 "Drücke OK um den Kanal zum Bouquet hinzuzufügen oder Menü für weitere "
 "Funktionen"
 
-msgid "TV Spielfilm Rows"
-msgstr "TV Spielfilm - Listenansicht"
-
-msgid "TV Spielfilm Columns"
-msgstr "TV Spielfilm - Spaltenansicht"
-
-msgid "Standard"
+msgid "Default"
 msgstr "Standard"
 
-msgid "Favoriten"
-msgstr "Favoriten"
-
 msgid "Sky"
 msgstr "SKY"
 
-msgid "Alle"
+msgid "All"
 msgstr "Alle"
 
+msgid "TV Spielfilm Rows"
+msgstr "TV Spielfilm - Listenansicht"
+
+msgid "TV Spielfilm Columns"
+msgstr "TV Spielfilm - Spaltenansicht"
+
 msgid "default"
 msgstr "Standard"
 
@@ -123,12 +120,15 @@ msgstr "deaktiviere"
 msgid "Error during download"
 msgstr "Fehler beim Download"
 
-msgid "row view"
+msgid "Row view"
 msgstr "Zeilenansicht"
 
-msgid "column view"
+msgid "Column view"
 msgstr "Spaltenansicht"
 
+msgid "Bouquet selection"
+msgstr "Bouquetauswahl"
+
 msgid "Setup"
 msgstr "Einstellungen"
 
@@ -141,6 +141,9 @@ msgstr "Einfach-Auswahl"
 msgid "Input"
 msgstr "Eingabe"
 
+msgid "Bouquet Selection"
+msgstr "Bouquetauswahl"
+
 msgid "Please wait... Loading list..."
 msgstr "Lade..."
 
@@ -162,6 +165,9 @@ msgstr "Hauptseite"
 msgid "Reload"
 msgstr "Neu laden"
 
+msgid "column view"
+msgstr "Spaltenansicht"
+
 msgid "Loading..."
 msgstr "Lade..."
 
@@ -207,9 +213,6 @@ msgstr "Zeit"
 msgid "Channel"
 msgstr "Kanal"
 
-msgid "Default"
-msgstr "Standard"
-
 msgid "Index"
 msgstr "Index"
 
@@ -225,6 +228,12 @@ msgstr "Programm-Layout"
 msgid "Browse TV Magazine"
 msgstr "TV Magazin duchblättern"
 
+msgid "Search TV Magazine ..."
+msgstr "TV Magazin Suche ..."
+
+msgid "TVMagazineCockpit Search"
+msgstr "TV Magazin Suche"
+
 msgid "installed"
 msgstr "installiert"
 

src/ConfigInit.py

@@ -25,6 +25,12 @@
 
 
 plugindir = resolveFilename(SCOPE_PLUGINS, 'Extensions/TVMagazineCockpit/')
+bouquet_choices = [
+	("default", _("Default")),
+	("favorites", _("Favorites")),
+	("sky", _("Sky")),
+	("all", _("All")),
+]
 
 
 class ConfigInit():
@@ -43,12 +49,4 @@ def __init__(self):
 				("programcolumns", _("TV Spielfilm Columns")),
 			]
 		)
-		config.plugins.tvmagazinecockpit.bouquet = ConfigSelection(
-			default="default",
-			choices=[
-				("default", _("Standard")),
-				("favorites", _("Favoriten")),
-				("sky", _("Sky")),
-				("all", _("Alle")),
-			]
-		)
+		config.plugins.tvmagazinecockpit.bouquet = ConfigSelection(default="default", choices=bouquet_choices)

src/EasyMenu.py

@@ -1,9 +1,11 @@
 from Screens.ChoiceBox import ChoiceBox
+from Components.config import config
 from .__init__ import _
 from .Debug import logger
 from .Setup import Setup
 from .ChannelManagement import ChannelManagement
 from .Constants import TVS
+from .ConfigInit import bouquet_choices
 
 
 class EasyMenu():
@@ -16,13 +18,22 @@ def openEasyMenu(self, session, bouquet, channel_list, channel_dict):
 		self.channel_list = channel_list
 		self.channel_dict = channel_dict
 		alist = [
-			("%s - %s" % (TVS, _("row view")), 'programrows'),
-			("%s - %s" % (TVS, _("column view")), 'programcolumns'),
+			("%s - %s" % (TVS, _("Row view")), 'programrows'),
+			("%s - %s" % (TVS, _("Column view")), 'programcolumns'),
+			("%s - %s" % (TVS, _("Bouquet selection")), 'bouquetselection'),
 			("%s - %s" % (TVS, _("Setup")), 'setup'),
 			("%s - %s" % (TVS, _("Favorites/Bouquets Setup")), 'channel'),
 		]
 
-		session.openWithCallback(self.openEasyMenuCallback, ChoiceBox, title='TV Spielfilm', list=alist, windowTitle=_('Easy-Selection'), allow_cancel=True, titlebartext=_("Input"))
+		session.openWithCallback(
+			self.openEasyMenuCallback,
+			ChoiceBox,
+			title='TV Spielfilm',
+			list=alist,
+			windowTitle=_('Easy-Selection'),
+			allow_cancel=True,
+			titlebartext=_("Input")
+		)
 
 	def openEasyMenuCallback(self, answer=None):
 		logger.info("...")
@@ -38,10 +49,26 @@ def openEasyMenuCallback(self, answer=None):
 				)
 			elif screen == 'setup':
 				self.session.open(Setup)
+			elif screen == 'bouquetselection':
+				alist =  [(value[1], value[0]) for value in bouquet_choices]
+				self.session.openWithCallback(
+					self.openBouquetSelectionCallback,
+					ChoiceBox,
+					title='Bouquet Selection',
+					list=alist,
+					windowTitle=_('Bouquet Selection'),
+					allow_cancel=True,
+					titlebartext=_("Input")
+				)
 			else:
 				self.close(screen)
 
 	def openChannelManagementCallback(self, channel_list):
 		logger.info("...")
 		self.channel_list = channel_list
 		self.key_blue()
+
+	def openBouquetSelectionCallback(self, bouquet):
+		logger.info("bouquet: %s", bouquet)
+		config.plugins.tvmagazinecockpit.bouquet.value = bouquet[1]
+		config.plugins.tvmagazinecockpit.bouquet.save()

src/PluginServices.py

@@ -0,0 +1,3 @@
+WHERE_SEARCH = -99
+WHERE_MEDIATHEK_SEARCH = -98
+WHERE_TVMAGAZINE_SEARCH = -97

src/ProgramColumns.py

@@ -9,6 +9,7 @@
 from Components.Label import Label
 from Components.Pixmap import Pixmap
 from Components.Sources.StaticText import StaticText
+from Components.config import config
 from Tools.LoadPixmap import LoadPixmap
 from .Downloader import headers_gzip, MydownloadPage, http_failed, MyDeferredSemaphore
 from ._tvdict import listprogresindex
@@ -26,9 +27,9 @@
 
 
 class ProgramColumns(Screen, EasyMenu):
-	def __init__(self, session, bouquet, channel_list, channel_dict):
+	def __init__(self, session, channel_list, channel_dict):
 		logger.info("...")
-		self.bouquet = bouquet
+		self.bouquet = config.plugins.tvmagazinecockpit.bouquet.value
 		self.channel_list = channel_list
 		self.channel_dict = channel_dict
 		Screen.__init__(self, session)
@@ -121,6 +122,9 @@ def showPage(self):
 			else:
 				logger.debug("need to download data")
 				self.downloadChannel(channel_id, i)
+		else:
+			title = "%s %s - %s: %s: %s/%s, %s: %s" % (TVS, _("column view"), BOUQUETS[self.bouquet], _("Page"), self.page_index + 1, self.pages, _("Services"), len(self.channel_list))
+			self.setTitle(title)
 
 	def showChannel(self, list_events, channel_id, i):
 		logger.info("i: %s", i)

src/ProgramRows.py

@@ -10,6 +10,7 @@
 from Components.Sources.StaticText import StaticText
 from Components.config import config
 from Components.UsageConfig import preferredTimerPath
+from Components.config import config
 from Downloader import headers_gzip, MygetPage, http_failed, MyDeferredSemaphore, _downloads as _state_
 from tools import listmainindex as mindex, tvspielfilm_parse
 from tvconfig import read_tvconfig, write_tvconfig, make_order_string
@@ -28,9 +29,9 @@
 
 
 class ProgramRows(Screen, EasyMenu):
-	def __init__(self, session, bouquet, channel_list, channel_dict):
+	def __init__(self, session, channel_list, channel_dict):
 		logger.info("...")
-		self.bouquet = bouquet
+		self.bouquet = config.plugins.tvmagazinecockpit.bouquet.value
 		self.channel_list = channel_list
 		self.channel_dict = channel_dict
 		self.skinName = "ProgramRows"

src/Search.py

@@ -0,0 +1,10 @@
+
+
+from Screens.Screen import Screen
+from .Debug import logger
+
+
+class Search(Screen):
+	def __init__(self, session, query):
+		logger.info("query: %s", query)
+		Screen.__init__(self, session)