Mercurial Repositories > eric / changeset

--- a/IconEditor/IconEditorWindow.py	Thu Sep 02 16:36:23 2010 +0200
+++ b/IconEditor/IconEditorWindow.py	Fri Sep 03 10:05:50 2010 +0200
@@ -1118,16 +1118,15 @@
         if self.__editor.isDirty():
             ret = E5MessageBox.warning(self,
                 self.trUtf8("eric5 Icon Editor"),
-                self.trUtf8("""The icon image has been modified.\n"""
-                            """Do you want to save your changes?"""),
+                self.trUtf8("""The icon image has unsaved changes."""),
                 QMessageBox.StandardButtons(\
-                    QMessageBox.Cancel | \
-                    QMessageBox.No | \
-                    QMessageBox.Yes),
-                QMessageBox.Cancel)
-            if ret == QMessageBox.Yes:
+                    QMessageBox.Abort | \
+                    QMessageBox.Discard | \
+                    QMessageBox.Save),
+                QMessageBox.Save)
+            if ret == QMessageBox.Save:
                 return self.__saveIcon()
-            elif ret == QMessageBox.Cancel:
+            elif ret == QMessageBox.Abort:
                 return False
         return True
     

--- a/MultiProject/MultiProject.py	Thu Sep 02 16:36:23 2010 +0200
+++ b/MultiProject/MultiProject.py	Fri Sep 03 10:05:50 2010 +0200
@@ -639,7 +639,7 @@
                 return True
             elif res == QMessageBox.Abort:
                 return False
-            
+        
         return True
     
     def closeMultiProject(self):

--- a/QScintilla/Editor.py	Thu Sep 02 16:36:23 2010 +0200
+++ b/QScintilla/Editor.py	Fri Sep 03 10:05:50 2010 +0200
@@ -2190,7 +2190,7 @@
                 if ok:
                     self.vm.setEditorName(self, newName)
                 return ok
-            elif res == QMessageBox.Abort or res == QMessageBox.Cancel:
+            elif res == QMessageBox.Abort:
                 return False
         
         return True

--- a/QScintilla/MiniEditor.py	Thu Sep 02 16:36:23 2010 +0200
+++ b/QScintilla/MiniEditor.py	Fri Sep 03 10:05:50 2010 +0200
@@ -1478,16 +1478,15 @@
         if self.__textEdit.isModified():
             ret = E5MessageBox.warning(self, 
                     self.trUtf8("eric5 Mini Editor"),
-                    self.trUtf8("The document has been modified.\n"
-                            "Do you want to save your changes?"),
+                    self.trUtf8("The document has been unsaved changes."),
                     QMessageBox.StandardButtons(\
-                        QMessageBox.Cancel | \
-                        QMessageBox.No | \
-                        QMessageBox.Yes),
-                    QMessageBox.Cancel)
-            if ret == QMessageBox.Yes:
+                        QMessageBox.Abort | \
+                        QMessageBox.Discard | \
+                        QMessageBox.Save),
+                    QMessageBox.Save)
+            if ret == QMessageBox.Save:
                 return self.__save()
-            elif ret == QMessageBox.Cancel:
+            elif ret == QMessageBox.Abort:
                 return False
         return True
     
@@ -2287,4 +2286,4 @@
         fileEol = self.__textEdit.detectEolString(txt)
         self.__textEdit.setEolModeByEolString(fileEol)
         
-        self.__textEdit.setModified(False)
\ No newline at end of file
+        self.__textEdit.setModified(False)