add config option to disable the zap warning message when trying to record

diff --git a/RecordTimer.py b/RecordTimer.py
index f1f4e14be813aae1b7f416cdfaf909c8ef1a9d2e..7088bb479606e39150c54e4d9f5ee553bb234c25 100644 (file)
--- a/RecordTimer.py
+++ b/RecordTimer.py
@@ -3,6 +3,7 @@ import codecs
 #from time import datetime
 from Tools import Directories, Notifications
 
 #from time import datetime
 from Tools import Directories, Notifications
 

+from Components.config import config

 import timer
 import xml.dom.minidom
 
 import timer
 import xml.dom.minidom
 


@@ -85,7 +86,10 @@ class RecordTimerEntry(timer.TimerEntry):
                                self.prepareOK = True
                        else:
                                # error.
                                self.prepareOK = True
                        else:
                                # error.

-                               Notifications.AddNotificationWithCallback(self.failureCB, MessageBox, _("A timer failed to record!\nDisable TV and try again?\n"))
+                               if config.recording.asktozap.value == 0:
+                                       Notifications.AddNotificationWithCallback(self.failureCB, MessageBox, _("A timer failed to record!\nDisable TV and try again?\n"))
+                               else: # zap without asking
+                                       self.failureCB(True)

                elif event == self.EventStart:
                        if self.prepareOK:
                                self.record_service.start()
                elif event == self.EventStart:
                        if self.prepareOK:
                                self.record_service.start()


@@ -112,6 +116,7 @@ class RecordTimerEntry(timer.TimerEntry):
                        self.activate(self.EventPrepare)
                        if self.wantStart:
                                print "post-activating record"
                        self.activate(self.EventPrepare)
                        if self.wantStart:
                                print "post-activating record"

+                               NavigationInstance.instance.playService(self.serviceref)

                                self.activate(self.EventStart)
                else:
                        print "user killed record"
                                self.activate(self.EventStart)
                else:
                        print "user killed record"

diff --git a/data/menu.xml b/data/menu.xml
index be0119fcb0659046be91f8721c9a522b52b9c23b..9aacc98a2f0f3bc75c012b4de482208eb6ae3929 100644 (file)
--- a/data/menu.xml
+++ b/data/menu.xml
@@ -42,6 +42,7 @@
                        </menu>
                        <menu text="System">
                                <item text="Language"><screen module="LanguageSelection" /></item>
                        </menu>
                        <menu text="System">
                                <item text="Language"><screen module="LanguageSelection" /></item>

+                               <item text="Recording"><setup id="recording" /></item>

                                <item text="Timezone"><setup id="timezone" /></item>
                                <item text="Video Audio"><setup id="avsetup" /></item>
                                <item text="UHF Modulator"><setup id="RFmod" /></item>
                                <item text="Timezone"><setup id="timezone" /></item>
                                <item text="Video Audio"><setup id="avsetup" /></item>
                                <item text="UHF Modulator"><setup id="RFmod" /></item>

diff --git a/data/setup.xml b/data/setup.xml
index 371955615b288c88e78778f6da4c77343e85e491..51945cfa65ec4a2d558610ab66c761032fd556bc 100644 (file)
--- a/data/setup.xml
+++ b/data/setup.xml
@@ -15,6 +15,9 @@
                        <item text="AC3 default">config.av.defaultac3</item>
                        <item text="VCR Switch">config.av.vcrswitch</item>
                </setup>
                        <item text="AC3 default">config.av.defaultac3</item>
                        <item text="VCR Switch">config.av.vcrswitch</item>
                </setup>

+               <setup key="recording" title="Recording">
+                       <item text="Ask before zapping">config.recording.asktozap</item>
+               </setup>

                <setup key="network" title="Network setup">
                        <item text="Use DHCP">config.network.dhcp</item>
                        <item text="IP Address">config.network.ip</item>
                <setup key="network" title="Network setup">
                        <item text="Use DHCP">config.network.dhcp</item>
                        <item text="IP Address">config.network.ip</item>

diff --git a/lib/python/Components/Makefile.am b/lib/python/Components/Makefile.am
index 340730a67e9483f6720be61e4e5416ade55c7ff4..656527b20b4dc1205f4ffd5ba3767510924ae50a 100644 (file)
--- a/lib/python/Components/Makefile.am
+++ b/lib/python/Components/Makefile.am
@@ -11,4 +11,4 @@ install_PYTHON = \
        AVSwitch.py Network.py RFmod.py DiskInfo.py NimManager.py Lcd.py                                \
        EpgList.py ScrollLabel.py Timezones.py Language.py HelpMenuList.py \
        BlinkingPixmap.py Pixmap.py ConditionalWidget.py Slider.py LanguageList.py \
        AVSwitch.py Network.py RFmod.py DiskInfo.py NimManager.py Lcd.py                                \
        EpgList.py ScrollLabel.py Timezones.py Language.py HelpMenuList.py \
        BlinkingPixmap.py Pixmap.py ConditionalWidget.py Slider.py LanguageList.py \

-       PluginList.py PluginComponent.py
+       PluginList.py PluginComponent.py RecordingConfig.py

diff --git a/mytest.py b/mytest.py
index 571747c9b1cf304a7c91f8eceb25a23e1d2caf95..c94993b8110d6ae7d80493aac49a139927775dcf 100644 (file)
--- a/mytest.py
+++ b/mytest.py
@@ -217,6 +217,9 @@ Components.InputDevice.InitInputDevices()
 import Components.AVSwitch
 Components.AVSwitch.InitAVSwitch()
 
 import Components.AVSwitch
 Components.AVSwitch.InitAVSwitch()
 

+import Components.RecordingConfig
+Components.RecordingConfig.InitRecordingConfig()
+

 import Components.Network
 Components.Network.InitNetwork()
 
 import Components.Network
 Components.Network.InitNetwork()
 

diff --git a/po/Makefile.am b/po/Makefile.am
index b444efc1a0cd518c2d28f0ddbc12ecef2050b819..1a29b70d9d612d7cd3b8796f0de0a3efb99a140b 100644 (file)
--- a/po/Makefile.am
+++ b/po/Makefile.am
@@ -50,6 +50,7 @@ enigma2.pot:
                        ../lib/python/Components/NimManager.py \
                        ../lib/python/Components/EventInfo.py \
                        ../lib/python/Components/Network.py \
                        ../lib/python/Components/NimManager.py \
                        ../lib/python/Components/EventInfo.py \
                        ../lib/python/Components/Network.py \

+                       ../lib/python/Components/RecordingConfig.py \

                        ../RecordTimer.py
        ./xml2po.py     ../data/ >> enigma2.pot
 
                        ../RecordTimer.py
        ./xml2po.py     ../data/ >> enigma2.pot