Mercurial Repositories > eric / file diff

--- a/QScintilla/Editor.py	Fri Sep 03 18:53:24 2010 +0200
+++ b/QScintilla/Editor.py	Fri Sep 03 20:04:49 2010 +0200
@@ -287,7 +287,7 @@
                                     """ Do you really want to load it?</p>""")\
                                     .format(self.fileName, 
                                             QFileInfo(self.fileName).size() // 1024),
-                        type_ = E5MessageBox.Warning)
+                        icon = E5MessageBox.Warning)
                     if not res:
                         raise IOError()
                 self.readFile(self.fileName, True)
@@ -2366,7 +2366,7 @@
                         self.trUtf8("Save File"),
                         self.trUtf8("<p>The file <b>{0}</b> already exists."
                                     " Overwrite it?</p>").format(fn),
-                        type_ = E5MessageBox.Warning)
+                        icon = E5MessageBox.Warning)
                     if not res:
                         return False
                 fn = Utilities.toNativeSeparators(fn)
@@ -4635,7 +4635,7 @@
                 self.trUtf8("Save macro"),
                 self.trUtf8("<p>The macro file <b>{0}</b> already exists."
                             " Overwrite it?</p>").format(fname),
-                type_ = E5MessageBox.Warning)
+                icon = E5MessageBox.Warning)
             if not res:
                 return
         fname = Utilities.toNativeSeparators(fname)
@@ -4660,7 +4660,7 @@
             res = E5MessageBox.yesNo(self, 
                 self.trUtf8("Start Macro Recording"),
                 self.trUtf8("Macro recording is already active. Start new?"),
-                type_ = E5MessageBox.Warning, 
+                icon = E5MessageBox.Warning, 
                 yesDefault = True)
             if res:
                 self.macroRecordingStop()
@@ -4806,7 +4806,7 @@
                     yesDefault = False
                 res = E5MessageBox.yesNo(self,
                     self.trUtf8("File changed"), msg,
-                    type_ = E5MessageBox.Warning, 
+                    icon = E5MessageBox.Warning, 
                     yesDefault = yesDefault)
                 if res:
                     self.refresh()
@@ -5728,4 +5728,4 @@
                command = self.__receivedWhileSyncing.pop(0) 
                self.__dispatchCommand(command)
             
-            self.__isSyncing = False
+            self.__isSyncing = False
\ No newline at end of file