add switch between tv and radio mode

diff --git a/easymedia/po/EasyMedia.pot b/easymedia/po/EasyMedia.pot
index 36e3aa0..ea8b8bd 100644 (file)
--- a/easymedia/po/EasyMedia.pot
+++ b/easymedia/po/EasyMedia.pot
@@ -127,8 +127,17 @@ msgstr ""
 msgid "Select bookmark..."
 msgstr ""
 
-msgid "Radio"
+msgid "Tv/Radio"
 msgstr ""
 
-msgid "Show radio:"
+msgid "Show tv/radio switch:"
+msgstr ""
+
+msgid "TV-mode"
+msgstr ""
+
+msgid "Radio-mode"
+msgstr ""
+
+msgid "Nothing"
 msgstr ""

diff --git a/easymedia/po/de.po b/easymedia/po/de.po
index bbf964d..36f74eb 100644 (file)
--- a/easymedia/po/de.po
+++ b/easymedia/po/de.po
@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: EasyMedia\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-09-24 16:10+0200\n"
-"PO-Revision-Date: 2010-12-09 16:39+0100\n"
+"PO-Revision-Date: 2010-12-13 19:00+0100\n"
 "Last-Translator: \n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -127,9 +127,18 @@ msgstr "EasyMedia Einstellungen..."
 msgid "Select bookmark..."
 msgstr "Lesezeichen wählen..."
 
-msgid "Radio"
-msgstr "Radio"
+msgid "Tv/Radio"
+msgstr "TV/Radio"
 
-msgid "Show radio:"
-msgstr "Radio zeigen:"
+msgid "Show tv/radio switch:"
+msgstr "Tv/Radio Umschalter zeigen:"
+
+msgid "TV-mode"
+msgstr "TV-Modus"
+
+msgid "Radio-mode"
+msgstr "Radio-Modus"
+
+msgid "Nothing"
+msgstr "Zurück"
 

diff --git a/easymedia/src/plugin.py b/easymedia/src/plugin.py
index 9a3149f..3f8ba1f 100644 (file)
--- a/easymedia/src/plugin.py
+++ b/easymedia/src/plugin.py
@@ -137,6 +137,17 @@ def BookmarksCallback(choice):
 
 
 
+def TvRadioCallback(choice):
+       choice = choice and choice[1]
+       if choice == "TM":
+               if InfoBar_instance:
+                       InfoBar_instance.showTv()
+       elif choice == "RM":
+               if InfoBar_instance:
+                       InfoBar_instance.showRadio()
+
+
+
 class ConfigEasyMedia(ConfigListScreen, Screen):
        skin = """
                <screen name="ConfigEasyMedia" position="center,center" size="600,410" title="EasyMedia settings...">
@@ -151,7 +162,7 @@ class ConfigEasyMedia(ConfigListScreen, Screen):
                list.append(getConfigListEntry(_("Music player:"), config.plugins.easyMedia.music))
                list.append(getConfigListEntry(_("Files browser:"), config.plugins.easyMedia.files))
                list.append(getConfigListEntry(_("Show bookmarks:"), config.plugins.easyMedia.bookmarks))
-               list.append(getConfigListEntry(_("Show radio:"), config.plugins.easyMedia.radio))
+               list.append(getConfigListEntry(_("Show tv/radio switch:"), config.plugins.easyMedia.radio))
                list.append(getConfigListEntry(_("YouTube player:"), config.plugins.easyMedia.mytube))
                list.append(getConfigListEntry(_("VLC player:"), config.plugins.easyMedia.vlc))
                list.append(getConfigListEntry(_("DVD player:"), config.plugins.easyMedia.dvd))
@@ -214,7 +225,7 @@ class EasyMedia(Screen):
                        MPaskList.append((_("Music"), "MUSIC"))
                if config.plugins.easyMedia.radio.value != "no":
                        self.__keys.append("radio")
-                       MPaskList.append((_("Radio"), "RADIO"))
+                       MPaskList.append((_("Tv/Radio"), "RADIO"))
                if config.plugins.easyMedia.dvd.value != "no":
                        self.__keys.append("dvd")
                        MPaskList.append((_("DVD Player"), "DVD"))
@@ -283,8 +294,11 @@ def MPcallbackFunc(answer):
                if InfoBar_instance:
                        InfoBar_instance.showMovies()
        elif answer == "RADIO":
-               if InfoBar_instance:
-                       InfoBar_instance.showRadio()
+               askBM = []
+               askBM.append((_("TV-mode"), "TM"))
+               askBM.append((_("Radio-mode"), "RM"))
+               askBM.append((_("Nothing"), "NO"))
+               EMsession.openWithCallback(TvRadioCallback, ChoiceBox, title="EasyMedia...", list = askBM)
        elif answer == "BOOKMARKS":
                tmpBookmarks = config.movielist.videodirs
                myBookmarks = tmpBookmarks and tmpBookmarks.value[:] or []