error message when trying to load feed and no feed url defined

[enigma2-curlytx.git] / src / CurlyTxSettings.py

diff --git a/src/CurlyTxSettings.py b/src/CurlyTxSettings.py
index 18e43c9c2f85efbbda967603d72e5f9e84b94b9a..f733e125839a898246ed2e41282fad24ae3d381a 100644 (file)
--- a/src/CurlyTxSettings.py
+++ b/src/CurlyTxSettings.py
@@ -1,9 +1,15 @@
+# -*- coding: utf-8 -*-
+# CurlyTx configuration window
+# Copyright (C) 2011 Christian Weiske <cweiske@cweiske.de>
+# License: GPLv3 or later
+
 from . import _
 
 from Screens.Screen import Screen
 from Screens.HelpMenu import HelpableScreen
 from Components.ActionMap import ActionMap, NumberActionMap
 from Components.Sources.StaticText import StaticText
+from Screens.MessageBox import MessageBox
 
 from . import config
 from config import createPage, loadDefaultPageOptions
@@ -12,7 +18,7 @@ from Components.ConfigList import ConfigList, ConfigListScreen
 
 class CurlyTxSettings(ConfigListScreen, HelpableScreen, Screen):
     skin = """
-       <screen name="Setup" position="center,center" size="560,430" title="Setup">
+       <screen name="Setup" position="center,center" size="560,430" title="Settings">
          <ePixmap pixmap="skin_default/buttons/red.png"    position="0,0"   size="140,40" transparent="1" alphatest="on" />
          <ePixmap pixmap="skin_default/buttons/green.png"  position="140,0" size="140,40" transparent="1" alphatest="on" />
          <ePixmap pixmap="skin_default/buttons/yellow.png" position="280,0" size="140,40" transparent="1" alphatest="on" />
@@ -48,7 +54,6 @@ class CurlyTxSettings(ConfigListScreen, HelpableScreen, Screen):
         ConfigListScreen.__init__(self, self.getConfigList(), session = self.session)
 
         self.loadHelp()
-        self.onClose.append(self.abort)
 
     def getConfigList(self):
         #reload titles
@@ -127,9 +132,13 @@ class CurlyTxSettings(ConfigListScreen, HelpableScreen, Screen):
                 self.pageEdited, CurlyTxPageEdit,
                 config.plugins.CurlyTx.pages[id], False
                 )
-        else:
+        elif config.plugins.CurlyTx.feedUrl.value:
             from AtomFeed import AtomFeed
             AtomFeed(config.plugins.CurlyTx.feedUrl.value, self.feedPagesReceived)
+        else:
+            self.session.open(
+                MessageBox, _("No page feed URL defined"), MessageBox.TYPE_ERROR
+                )
 
     def pageEdited(self, page, new):
         if not page:
@@ -161,7 +170,18 @@ class CurlyTxSettings(ConfigListScreen, HelpableScreen, Screen):
         config.plugins.CurlyTx.pages.save()
         ConfigListScreen.keySave(self)
 
-    def abort(self):
+    def cancelConfirm(self, result):
+        """Overwriting ConfigListScreen.cancelConfirm to call cancelAll method"""
+        if not result:
+            return
+
+        self.cancelAll()
+        self.close()
+
+    def cancelAll(self):
+        for x in self["config"].list:
+            x[1].cancel()
+
         #restore old page configuration
         cfg = config.plugins.CurlyTx
         del cfg.pages[:]