Mercurial Repositories > eric / changeset

--- a/Helpviewer/AdBlock/AdBlockSubscription.py	Tue Aug 31 13:23:27 2010 +0200
+++ b/Helpviewer/AdBlock/AdBlockSubscription.py	Tue Aug 31 13:39:24 2010 +0200
@@ -11,7 +11,6 @@
 
 from PyQt4.QtCore import *
 from PyQt4.QtNetwork import QNetworkRequest, QNetworkReply
-from PyQt4.QtGui import QMessageBox
 
 from E5Gui import E5MessageBox
 
@@ -409,4 +408,4 @@
             elif rule.isException():
                 self.__networkExceptionRules.append(rule)
             else:
-                self.__networkBlockRules.append(rule)
\ No newline at end of file
+                self.__networkBlockRules.append(rule)

--- a/Plugins/VcsPlugins/vcsPySvn/SvnDialogMixin.py	Tue Aug 31 13:23:27 2010 +0200
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnDialogMixin.py	Tue Aug 31 13:39:24 2010 +0200
@@ -8,6 +8,7 @@
 the pysvn client.
 """
 
+from PyQt4.QtCore import Qt
 from PyQt4.QtGui import QApplication, QDialog, QWidget, QCursor
 
 class SvnDialogMixin(object):
@@ -110,6 +111,8 @@
                         trust_dict["issuer_dname"]),
             QMessageBox.StandardButtons(QMessageBox.NoButton),
             parent)
+        if parent is not None:
+            msgBox.setWindowModality(Qt.WindowModal)
         permButton = msgBox.addButton(self.trUtf8("&Permanent accept"), 
                                       QMessageBox.AcceptRole)
         tempButton = msgBox.addButton(self.trUtf8("&Temporary accept"), 

--- a/Tools/TrayStarter.py	Tue Aug 31 13:23:27 2010 +0200
+++ b/Tools/TrayStarter.py	Tue Aug 31 13:39:24 2010 +0200
@@ -11,7 +11,7 @@
 import os
 
 from PyQt4.QtCore import QProcess, QSettings, QFileInfo
-from PyQt4.QtGui  import QSystemTrayIcon, QMenu, qApp, QCursor, QMessageBox
+from PyQt4.QtGui  import QSystemTrayIcon, QMenu, qApp, QCursor
 
 from E5Gui import E5MessageBox
 
@@ -383,4 +383,4 @@
         """
         filename = act.data()
         if filename:
-            self.__startProc("eric5.py", filename)
\ No newline at end of file
+            self.__startProc("eric5.py", filename)

--- a/ViewManager/ViewManager.py	Tue Aug 31 13:23:27 2010 +0200
+++ b/ViewManager/ViewManager.py	Tue Aug 31 13:39:24 2010 +0200
@@ -3012,7 +3012,7 @@
                 if ok:
                     self.setEditorName(editor, newName)
                 return ok
-            elif res == QMessageBox.Abort or res == QMessageBox.Cancel:
+            elif res == QMessageBox.Abort:
                 return False
         
         return True
@@ -5101,4 +5101,4 @@
             if aw is not None:
                 if aw.hasSelectedText():
                     txt = aw.selectedText()
-        return txt
\ No newline at end of file
+        return txt