Mercurial Repositories > eric / file diff

--- a/Project/Project.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Project/Project.py	Sun Jun 05 18:25:36 2011 +0200
@@ -16,8 +16,10 @@
 import zipfile
 import re
 
-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import QFile, QFileInfo, pyqtSignal, QCryptographicHash, QIODevice, \
+    QByteArray, QObject, Qt
+from PyQt4.QtGui import QCursor, QLineEdit, QToolBar, QDialog, QInputDialog, \
+    QApplication, QMenu
 
 from E5Gui.E5Application import e5App
 from E5Gui import E5FileDialog, E5MessageBox
@@ -813,10 +815,9 @@
         Private method to delete the session file.
         """
         if self.pfile is None:
-            if not quiet:
-                E5MessageBox.critical(self.ui,
-                    self.trUtf8("Delete project session"),
-                    self.trUtf8("Please save the project first."))
+            E5MessageBox.critical(self.ui,
+                self.trUtf8("Delete project session"),
+                self.trUtf8("Please save the project first."))
             return
             
         fname, ext = os.path.splitext(os.path.basename(self.pfile))
@@ -942,10 +943,9 @@
         Private method to delete the project debugger properties file (.e4d)
         """
         if self.pfile is None:
-            if not quiet:
-                E5MessageBox.critical(self.ui,
-                    self.trUtf8("Delete debugger properties"),
-                    self.trUtf8("Please save the project first."))
+            E5MessageBox.critical(self.ui,
+                self.trUtf8("Delete debugger properties"),
+                self.trUtf8("Please save the project first."))
             return
             
         fname, ext = os.path.splitext(os.path.basename(self.pfile))
@@ -1755,7 +1755,7 @@
             E5MessageBox.critical(self.ui,
                 self.trUtf8("Delete directory"),
                 self.trUtf8("<p>The selected directory <b>{0}</b> could not be"
-                    " deleted.</p>").format(fn))
+                    " deleted.</p>").format(dn))
             return False
         
         self.removeDirectory(dn)
@@ -4143,7 +4143,7 @@
                 self.trUtf8("Create Plugin Archive"),
                 self.trUtf8("""<p>The plugin file <b>{0}</b> could """
                             """not be read.</p>"""
-                            """<p>Reason: {1}</p>""").format(archive, str(why)))
+                            """<p>Reason: {1}</p>""").format(filename, str(why)))
             return b"", ""
         
         lineno = 0
@@ -4180,7 +4180,7 @@
                 self.trUtf8("Create Plugin Archive"),
                 self.trUtf8("""<p>The plugin file <b>{0}</b> could """
                             """not be read.</p>"""
-                            """<p>Reason: {1}</p>""").format(archive, str(why)))
+                            """<p>Reason: {1}</p>""").format(filename, str(why)))
             return ""
         
         for sourceline in sourcelines: