X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/57fadd1bacbbe2ae9d16ff24dc0a821a6b5da828..939c323eadd7ec9d3656bfe59a46c630415bdb19:/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py diff --git a/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py b/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py index dca75af1..25639818 100755 --- a/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py +++ b/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py @@ -2,13 +2,14 @@ from Plugins.Plugin import PluginDescriptor from Components.config import config, getConfigListEntry, ConfigSubsection, ConfigText, ConfigSelection, ConfigYesNo,ConfigText from Components.ConfigList import ConfigListScreen from Components.ActionMap import ActionMap -from Components.Label import Label +from Components.Sources.StaticText import StaticText from Components.Pixmap import Pixmap from Screens.Screen import Screen from Screens.VirtualKeyBoard import VirtualKeyBoard from Screens.ChoiceBox import ChoiceBox from Screens.MessageBox import MessageBox from enigma import ePoint +from Tools import Notifications import os from twisted.mail import smtp, relaymanager @@ -22,24 +23,25 @@ config.plugins.crashlogautosubmit.sendlog = ConfigSelection(default = "rename", config.plugins.crashlogautosubmit.attachemail = ConfigYesNo(default = False) config.plugins.crashlogautosubmit.email = ConfigText(default = "myemail@home.com", fixed_size = False) config.plugins.crashlogautosubmit.name = ConfigText(default = "Dreambox User", fixed_size = False) - +config.plugins.crashlogautosubmit.sendAnonCrashlog = ConfigYesNo(default = True) +config.plugins.crashlogautosubmit.addNetwork = ConfigYesNo(default = False) +config.plugins.crashlogautosubmit.addWlan = ConfigYesNo(default = False) class CrashlogAutoSubmitConfiguration(Screen, ConfigListScreen): oldMailEntryValue = config.plugins.crashlogautosubmit.sendmail.value skin = """ - - - - - - - - - - - + + + + + + + + + + """ def __init__(self, session): @@ -50,6 +52,9 @@ class CrashlogAutoSubmitConfiguration(Screen, ConfigListScreen): self.addEmailEntry = None self.EmailEntry = None self.NameEntry = None + self.AnonCrashlogEntry = None + self.NetworkEntry = None + self.WlanEntry = None self.msgCrashlogMailer = False self["shortcuts"] = ActionMap(["ShortcutActions", "SetupActions" ], @@ -60,23 +65,21 @@ class CrashlogAutoSubmitConfiguration(Screen, ConfigListScreen): "green": self.keySave, }, -2) - self["VirtualKB"] = ActionMap(["ColorActions" ], + self["VirtualKB"] = ActionMap(["VirtualKeyboardActions" ], { - "yellow": self.KeyYellow, + "showVirtualKeyboard": self.KeyText, }, -1) self.list = [] ConfigListScreen.__init__(self, self.list,session = self.session) self.createSetup() - self["VKeyButton"] = Pixmap() + self["key_red"] = StaticText(_("Close")) + self["key_green"] = StaticText(_("Save")) + self["status"] = StaticText() self["VKeyIcon"] = Pixmap() - self["closetext"] = Label(_("Close")) - self["installtext"] = Label(_("Save")) - self["HelpWindow"] = Label() - self["status"] = Label() + self["HelpWindow"] = Pixmap() - self["VKeyButton"].hide() self["VKeyIcon"].hide() self["VirtualKB"].setEnabled(False) self.onShown.append(self.setWindowTitle) @@ -94,7 +97,7 @@ class CrashlogAutoSubmitConfiguration(Screen, ConfigListScreen): ConfigListScreen.keyRight(self) self.newConfig() - def KeyYellow(self): + def KeyText(self): if self["config"].getCurrent() == self.EmailEntry: self.session.openWithCallback(self.EmailCallback, VirtualKeyBoard, title = (_("Please enter your email address here:")), text = config.plugins.crashlogautosubmit.email.value) if self["config"].getCurrent() == self.NameEntry: @@ -117,6 +120,10 @@ class CrashlogAutoSubmitConfiguration(Screen, ConfigListScreen): self.addEmailEntry = getConfigListEntry(_("Include your email and name (optional) in the mail?"), config.plugins.crashlogautosubmit.attachemail) self.EmailEntry = getConfigListEntry(_("Your email address:"), config.plugins.crashlogautosubmit.email) self.NameEntry = getConfigListEntry(_("Your name (optional):"), config.plugins.crashlogautosubmit.name) + self.AnonCrashlogEntry = getConfigListEntry(_("Anonymize crashlog?"), config.plugins.crashlogautosubmit.sendAnonCrashlog) + self.NetworkEntry = getConfigListEntry(_("Add network configuration?"), config.plugins.crashlogautosubmit.addNetwork) + self.WlanEntry = getConfigListEntry(_("Add WLAN configuration?"), config.plugins.crashlogautosubmit.addWlan) + self.list.append( self.MailEntry ) if config.plugins.crashlogautosubmit.sendmail.value is not "send_never": self.list.append( self.LogEntry ) @@ -124,6 +131,9 @@ class CrashlogAutoSubmitConfiguration(Screen, ConfigListScreen): if config.plugins.crashlogautosubmit.attachemail.value is True: self.list.append( self.EmailEntry ) self.list.append( self.NameEntry ) + self.list.append( self.AnonCrashlogEntry ) + self.list.append( self.NetworkEntry ) + self.list.append( self.WlanEntry ) self["config"].list = self.list self["config"].l.setList(self.list) @@ -164,9 +174,17 @@ class CrashlogAutoSubmitConfiguration(Screen, ConfigListScreen): self["status"].setText(_("Optionally enter your name if you want to.")) self.enableVKeyIcon() self.showKeypad() + elif current == self.AnonCrashlogEntry: + self["status"].setText(_("Adds enigma2 settings and dreambox model informations like SN, rev... if enabled.")) + self.disableVKeyIcon() + elif current == self.NetworkEntry: + self["status"].setText(_("Adds network configuration if enabled.")) + self.disableVKeyIcon() + elif current == self.WlanEntry: + self["status"].setText(_("Adds wlan configuration if enabled.")) + self.disableVKeyIcon() def enableVKeyIcon(self): - self["VKeyButton"].show() self["VKeyIcon"].show() self["VirtualKB"].setEnabled(True) @@ -179,7 +197,6 @@ class CrashlogAutoSubmitConfiguration(Screen, ConfigListScreen): current[1].help_window.instance.move(ePoint(helpwindowpos[0],helpwindowpos[1])) def disableVKeyIcon(self): - self["VKeyButton"].hide() self["VKeyIcon"].hide() self["VirtualKB"].setEnabled(False) @@ -318,7 +335,7 @@ def mxServerFound(mxServer,session): if len(crashLogFilelist): if config.plugins.crashlogautosubmit.sendmail.value == "send": - session.openWithCallback(handleAnswer, ChoiceBox, title=_("Crashlogs found!\nSend them to Dream Multimedia ?"), list = list) + Notifications.AddNotificationWithCallback(handleAnswer, ChoiceBox, title=_("Crashlogs found!\nSend them to Dream Multimedia?"), list = list) elif config.plugins.crashlogautosubmit.sendmail.value == "send_always": send_mail() else: @@ -374,7 +391,7 @@ def selSetup(menuid, **kwargs): if menuid != "system": return [ ] - return [(_("Crashlog settings") + "...", openconfig, "crashlog_config", 70)] + return [(_("Crashlog settings"), openconfig, "crashlog_config", 70)] def Plugins(**kwargs):