From 1a9635e73d3725af360b3246f041771a84f53dbe Mon Sep 17 00:00:00 2001 From: acid-burn Date: Fri, 13 Feb 2009 08:03:12 +0100 Subject: remove Imagewizard --- lib/python/Screens/ImageWizard.py | 38 -------------------------------------- lib/python/Screens/Makefile.am | 2 +- 2 files changed, 1 insertion(+), 39 deletions(-) delete mode 100644 lib/python/Screens/ImageWizard.py (limited to 'lib/python/Screens') diff --git a/lib/python/Screens/ImageWizard.py b/lib/python/Screens/ImageWizard.py deleted file mode 100644 index faf6120b..00000000 --- a/lib/python/Screens/ImageWizard.py +++ /dev/null @@ -1,38 +0,0 @@ -from Wizard import Wizard, wizardManager - -from Tools.Directories import fileExists - -import os - -backupfile = "backupenigma2settings.tar" - -def checkConfigBackup(): - paths = ['/media/hdd/', '/media/cf/'] - for x in paths: - if fileExists(x + backupfile): - return x - return None - -if checkConfigBackup() is None: - backupAvailable = 0 -else: - backupAvailable = 1 - -class ImageWizard(Wizard): - def __init__(self, session): - self.xmlfile = "imagewizard.xml" - Wizard.__init__(self, session, showSteps=False, showStepSlider=False, showList=True, showConfig=True) - - def markDone(self): - pass - -wizardManager.registerWizard(ImageWizard, backupAvailable, priority = 10) - -def doBackup(path): - os.system('tar cvpf ' + path + backupfile + ' /etc/enigma2') - -def doRestore(path): - os.system('cd / && /bin/tar xvpf ' + path + backupfile) - - - \ No newline at end of file diff --git a/lib/python/Screens/Makefile.am b/lib/python/Screens/Makefile.am index cde2d6c3..00204a94 100755 --- a/lib/python/Screens/Makefile.am +++ b/lib/python/Screens/Makefile.am @@ -9,7 +9,7 @@ install_PYTHON = \ InfoBarGenerics.py HelpMenu.py Wizard.py __init__.py \ Dish.py LanguageSelection.py StartWizard.py PiPSetup.py Subtitles.py \ TutorialWizard.py PluginBrowser.py MinuteInput.py Scart.py PVRState.py \ - Console.py InputBox.py ChoiceBox.py SimpleSummary.py ImageWizard.py \ + Console.py InputBox.py ChoiceBox.py SimpleSummary.py \ TimerSelection.py PictureInPicture.py TimeDateInput.py \ SubtitleDisplay.py SubservicesQuickzap.py ParentalControlSetup.py NumericalTextInputHelpDialog.py \ SleepTimerEdit.py Ipkg.py RdsDisplay.py Globals.py DefaultWizard.py \ -- cgit v1.2.3 From cd3cd96e2ff4c6e6a9a38393e4d93167d30f74ea Mon Sep 17 00:00:00 2001 From: acid-burn Date: Fri, 13 Feb 2009 08:27:58 +0100 Subject: add remove to ipkg component and screen --- lib/python/Components/Ipkg.py | 4 ++++ lib/python/Screens/Ipkg.py | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) mode change 100644 => 100755 lib/python/Components/Ipkg.py mode change 100644 => 100755 lib/python/Screens/Ipkg.py (limited to 'lib/python/Screens') diff --git a/lib/python/Components/Ipkg.py b/lib/python/Components/Ipkg.py old mode 100644 new mode 100755 index 31889bcf..0ba1165c --- a/lib/python/Components/Ipkg.py +++ b/lib/python/Components/Ipkg.py @@ -52,6 +52,8 @@ class IpkgComponent: self.runCmd("list") elif cmd == self.CMD_INSTALL: self.runCmd("install " + args['package']) + elif cmd == self.CMD_REMOVE: + self.runCmd("remove " + args['package']) self.setCurrentCommand(cmd) def cmdFinished(self, retval): @@ -90,6 +92,8 @@ class IpkgComponent: self.callCallbacks(self.EVENT_UPGRADE, data.split(' ', 1)[1].split(' ')[0]) elif data.find('Installing') == 0: self.callCallbacks(self.EVENT_INSTALL, data.split(' ', 1)[1].split(' ')[0]) + elif data.find('Removing') == 0: + self.callCallbacks(self.EVENT_REMOVE, data.split(' ', 1)[1].split(' ')[1]) elif data.find('Configuring') == 0: self.callCallbacks(self.EVENT_CONFIGURING, data.split(' ', 1)[1].split(' ')[0]) elif data.find('An error occurred') == 0: diff --git a/lib/python/Screens/Ipkg.py b/lib/python/Screens/Ipkg.py old mode 100644 new mode 100755 index eac03479..96876336 --- a/lib/python/Screens/Ipkg.py +++ b/lib/python/Screens/Ipkg.py @@ -54,7 +54,7 @@ class Ipkg(Screen): self.slider.setValue(len(self.cmdList)) self.package.setText("") - self.status.setText(_("Done - Installed or upgraded %d packages with %d errors") % (self.packages, self.error)) + self.status.setText(_("Done - Installed, upgraded or removed %d packages with %d errors") % (self.packages, self.error)) return False else: cmd = self.cmdList[self.runningCmd] @@ -90,6 +90,10 @@ class Ipkg(Screen): self.package.setText(param) self.status.setText(_("Installing")) self.packages += 1 + elif event == IpkgComponent.EVENT_REMOVE: + self.package.setText(param) + self.status.setText(_("Removing")) + self.packages += 1 elif event == IpkgComponent.EVENT_CONFIGURING: self.package.setText(param) self.status.setText(_("Configuring")) -- cgit v1.2.3