diff --git a/sys.py/UI/delete_confirm_page.py b/sys.py/UI/delete_confirm_page.py index da76b82..002fbc6 100644 --- a/sys.py/UI/delete_confirm_page.py +++ b/sys.py/UI/delete_confirm_page.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# -*- coding: utf-8 -*- import pygame import os @@ -19,25 +19,25 @@ class DeleteConfirmPage(ConfirmPage): _FileName = "" _TrashDir = "" _ConfirmText = "Confirm delete?" - + def SetTrashDir(self,d): self._TrashDir = d - + if os.path.isdir(self._TrashDir) == False: raise IOError("Trash not existed") - + def SetFileName(self,fn): self._FileName = fn - + def KeyDown(self,event): - + if event.key == CurKeys["Menu"] or event.key == CurKeys["A"]: - + self.ReturnToUpLevelPage() self._Screen.Draw() self._Screen.SwapAndShow() - - + + if event.key == CurKeys["B"]: try: os.remove(self._TrashDir+"/"+os.path.basename(self._FileName)) @@ -50,19 +50,16 @@ class DeleteConfirmPage(ConfirmPage): if "already exists" in str(e): self._Screen._MsgBox.SetText("Already existed") else: - self._Screen._MsgBox.SetText("Error ") - + self._Screen._MsgBox.SetText("Error") + self._Screen._MsgBox.Draw() self._Screen.SwapAndShow() - else: - #self._Screen._MsgBox.SetText("Deleteing..") - #self._Screen._MsgBox.Draw() - #self._Screen.SwapAndShow() - self.SnapMsg("Deleteing....") + else: + self.SnapMsg("Deleting....") self._Screen.Draw() self._Screen.SwapAndShow() self.Reset() - + pygame.time.delay(300) self.ReturnToUpLevelPage() self._Screen.Draw() @@ -70,4 +67,4 @@ class DeleteConfirmPage(ConfirmPage): print(self._FileName) - +