Mercurial Repositories > eric / changeset
changeset
Continued replacing QMessageBox methods with own methods.
Tue, 31 Aug 2010 12:36:10 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Tue, 31 Aug 2010 12:36:10 +0200
- changeset 538
- 7f1a56e80124
- parent 537
- 72b32daeb8d6
- child 539
- 87f9bce38a44
Continued replacing QMessageBox methods with own methods.
--- a/Cooperation/Connection.py Tue Aug 31 12:17:02 2010 +0200 +++ b/Cooperation/Connection.py Tue Aug 31 12:36:10 2010 +0200 @@ -11,6 +11,8 @@ from PyQt4.QtGui import QMessageBox from PyQt4.QtNetwork import QTcpSocket +from E5Gui import E5MessageBox + import Preferences MaxBufferSize = 1024 * 1024 @@ -191,7 +193,7 @@ not Preferences.getCooperation("AutoAcceptConnections"): # don't ask for reverse connections or # if we shall accept automatically - res = QMessageBox.question(None, + res = E5MessageBox.question(None, self.trUtf8("New Connection"), self.trUtf8("""<p>Accept connection from """ """<strong>{0}@{1}</strong>?</p>""").format( @@ -415,4 +417,4 @@ self.__pingTimer.stop() if self.__state == Connection.WaitingForGreeting: self.rejected.emit(self.trUtf8("* Connection to {0}:{1} refused.").format( - self.peerName(), self.peerPort())) + self.peerName(), self.peerPort())) \ No newline at end of file
--- a/E5Gui/E5ToolBarDialog.py Tue Aug 31 12:17:02 2010 +0200 +++ b/E5Gui/E5ToolBarDialog.py Tue Aug 31 12:36:10 2010 +0200 @@ -149,7 +149,7 @@ Private slot to remove a custom toolbar """ name = self.toolbarComboBox.currentText() - res = QMessageBox.question(self, + res = E5MessageBox.question(self, self.trUtf8("Remove Toolbar"), self.trUtf8("""Should the toolbar <b>{0}</b> really be removed?""")\ .format(name),
--- a/Helpviewer/AdBlock/AdBlockAccessHandler.py Tue Aug 31 12:17:02 2010 +0200 +++ b/Helpviewer/AdBlock/AdBlockAccessHandler.py Tue Aug 31 12:36:10 2010 +0200 @@ -10,6 +10,8 @@ from PyQt4.QtGui import QMessageBox from PyQt4.QtNetwork import QNetworkAccessManager +from E5Gui import E5MessageBox + from .AdBlockSubscription import AdBlockSubscription import Helpviewer.HelpWindow @@ -38,7 +40,7 @@ subscription = AdBlockSubscription(request.url(), Helpviewer.HelpWindow.HelpWindow.adblockManager()) - res = QMessageBox.question(None, + res = E5MessageBox.question(None, self.trUtf8("Subscribe?"), self.trUtf8("""<p>Subscribe to this AdBlock subscription?</p><p>{0}</p>""")\ .format(subscription.title()), @@ -53,4 +55,4 @@ dlg.setCurrentIndex(model.index(model.rowCount() - 1, 0)) dlg.setFocus() - return None + return None \ No newline at end of file
--- a/Helpviewer/DownloadDialog.py Tue Aug 31 12:17:02 2010 +0200 +++ b/Helpviewer/DownloadDialog.py Tue Aug 31 12:36:10 2010 +0200 @@ -11,6 +11,8 @@ from PyQt4.QtGui import * from PyQt4.QtNetwork import QNetworkReply, QNetworkAccessManager, QNetworkRequest +from E5Gui import E5MessageBox + import Preferences import Helpviewer.HelpWindow @@ -121,7 +123,7 @@ fileName = defaultFileName self.__autoOpen = False if not self.__toDownload: - res = QMessageBox.question(None, + res = E5MessageBox.question(self, self.trUtf8("Downloading"), self.trUtf8("""<p>You are about to download the file <b>{0}</b>.</p>""" """<p>What do you want to do?</p>""").format(fileName), @@ -430,4 +432,4 @@ self.__reply.close() self.__reply.deleteLater() - self.done.emit() + self.done.emit() \ No newline at end of file
--- a/Helpviewer/HelpBrowserWV.py Tue Aug 31 12:17:02 2010 +0200 +++ b/Helpviewer/HelpBrowserWV.py Tue Aug 31 12:36:10 2010 +0200 @@ -1192,7 +1192,7 @@ # accessed for the first time return - res = QMessageBox.question(self, + res = E5MessageBox.question(self, self.trUtf8("Web Database Quota"), self.trUtf8("""<p>The database quota of <strong>{0}</strong> has""" """ been exceeded while accessing database <strong>{1}"""
--- a/Helpviewer/HelpWindow.py Tue Aug 31 12:17:02 2010 +0200 +++ b/Helpviewer/HelpWindow.py Tue Aug 31 12:36:10 2010 +0200 @@ -2052,7 +2052,7 @@ """ Until you close the window, you can still click""" """ the Back and Forward buttons to return to the""" """ web pages you have opened.</p>""") - res = QMessageBox.question(self, "", txt, + res = E5MessageBox.question(self, "", txt, QMessageBox.StandardButtons(\ QMessageBox.Yes | \ QMessageBox.No),
--- a/Helpviewer/History/HistoryMenu.py Tue Aug 31 12:17:02 2010 +0200 +++ b/Helpviewer/History/HistoryMenu.py Tue Aug 31 12:36:10 2010 +0200 @@ -301,11 +301,11 @@ Private slot to clear the history. """ if self.__historyManager is not None and \ - QMessageBox.question(None, + E5MessageBox.question(self, self.trUtf8("Clear History"), self.trUtf8("""Do you want to clear the history?"""), QMessageBox.StandardButtons(\ QMessageBox.No | \ QMessageBox.Yes), QMessageBox.No) == QMessageBox.Yes: - self.__historyManager.clear() + self.__historyManager.clear() \ No newline at end of file
--- a/Helpviewer/Network/NetworkAccessManager.py Tue Aug 31 12:17:02 2010 +0200 +++ b/Helpviewer/Network/NetworkAccessManager.py Tue Aug 31 12:36:10 2010 +0200 @@ -18,6 +18,8 @@ except ImportError: SSL_AVAILABLE = False +from E5Gui import E5MessageBox + from E5Network.E5NetworkProxyFactory import E5NetworkProxyFactory, \ proxyAuthenticationRequired @@ -217,7 +219,7 @@ certinfos = [] for cert in caNew: certinfos.append(self.__certToString(cert)) - ret = QMessageBox.question(None, + ret = E5MessageBox.question(None, self.trUtf8("Certificates"), self.trUtf8("""<p>Certificates:<br/>{0}<br/>""" """Do you want to accept all these certificates?</p>""")\ @@ -301,4 +303,4 @@ diskCache.setMaximumCacheSize(size) else: diskCache = None - self.setCache(diskCache) + self.setCache(diskCache) \ No newline at end of file
--- a/Helpviewer/OpenSearch/OpenSearchManager.py Tue Aug 31 12:17:02 2010 +0200 +++ b/Helpviewer/OpenSearch/OpenSearchManager.py Tue Aug 31 12:36:10 2010 +0200 @@ -19,6 +19,7 @@ from .OpenSearchWriter import OpenSearchWriter from E5Gui.E5Application import e5App +from E5Gui import E5MessageBox from Utilities.AutoSaver import AutoSaver import Utilities @@ -384,7 +385,7 @@ host = QUrl(engine.searchUrlTemplate()).host() - res = QMessageBox.question(None, + res = E5MessageBox.question(None, "", self.trUtf8("""<p>Do you want to add the following engine to your list of""" """ search engines?<br/><br/>Name: {0}<br/>""" @@ -517,4 +518,4 @@ """ Public slot to tell the search engine manager, that something has changed. """ - self.changed.emit() + self.changed.emit() \ No newline at end of file
--- a/Helpviewer/Passwords/PasswordsDialog.py Tue Aug 31 12:17:02 2010 +0200 +++ b/Helpviewer/Passwords/PasswordsDialog.py Tue Aug 31 12:36:10 2010 +0200 @@ -10,6 +10,8 @@ from PyQt4.QtCore import * from PyQt4.QtGui import * +from E5Gui import E5MessageBox + import Helpviewer.HelpWindow from .PasswordModel import PasswordModel @@ -82,7 +84,7 @@ self.__passwordModel.setShowPasswords(False) self.passwordsButton.setText(self.__showPasswordsText) else: - res = QMessageBox.question(self, + res = E5MessageBox.question(self, self.trUtf8("Saved Passwords"), self.trUtf8("""Do you really want to show passwords?"""), QMessageBox.StandardButtons(\ @@ -92,4 +94,4 @@ if res == QMessageBox.Yes: self.__passwordModel.setShowPasswords(True) self.passwordsButton.setText(self.__hidePasswordsText) - self.__calculateHeaderSizes() + self.__calculateHeaderSizes() \ No newline at end of file
--- a/Helpviewer/QtHelpDocumentationDialog.py Tue Aug 31 12:17:02 2010 +0200 +++ b/Helpviewer/QtHelpDocumentationDialog.py Tue Aug 31 12:36:10 2010 +0200 @@ -90,7 +90,7 @@ """ Private slot to remove a document from the help database. """ - res = QMessageBox.question(None, + res = E5MessageBox.question(self, self.trUtf8("Remove Documentation"), self.trUtf8("""Do you really want to remove the selected documentation """ """sets from the database?"""), @@ -146,4 +146,4 @@ @return list of tab ids to be closed (list of integers) """ - return self.__tabsToClose + return self.__tabsToClose \ No newline at end of file
--- a/IconEditor/IconEditorGrid.py Tue Aug 31 12:17:02 2010 +0200 +++ b/IconEditor/IconEditorGrid.py Tue Aug 31 12:36:10 2010 +0200 @@ -10,6 +10,8 @@ from PyQt4.QtCore import * from PyQt4.QtGui import * +from E5Gui import E5MessageBox + from .cursors import cursors_rc from .IconSizeDialog import IconSizeDialog @@ -830,7 +832,7 @@ img, ok = self.__clipboardImage() if ok: if img.width() > self.__image.width() or img.height() > self.__image.height(): - res = QMessageBox.question(self, + res = E5MessageBox.question(self, self.trUtf8("Paste"), self.trUtf8("""<p>The clipboard image is larger than the current """ """image.<br/>Paste as new image?</p>"""), @@ -1054,4 +1056,4 @@ @return flag indicating the availability of a selection (boolean) """ - return self.__selectionAvailable + return self.__selectionAvailable \ No newline at end of file
--- a/Plugins/VcsPlugins/vcsMercurial/hg.py Tue Aug 31 12:17:02 2010 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/hg.py Tue Aug 31 12:36:10 2010 +0200 @@ -1849,7 +1849,7 @@ repodir, self.trUtf8("Mercurial Changegroup Files (*.hg);;All Files (*)")) if files: - update = QMessageBox.question(None, + update = E5MessageBox.question(self.__ui, self.trUtf8("Apply changegroups"), self.trUtf8("""Shall the working directory be updated?"""), QMessageBox.StandardButtons(\
--- a/Project/Project.py Tue Aug 31 12:17:02 2010 +0200 +++ b/Project/Project.py Tue Aug 31 12:36:10 2010 +0200 @@ -2355,7 +2355,7 @@ ms = "" # add existing files to the project - res = QMessageBox.question(None, + res = E5MessageBox.question(self.ui, self.trUtf8("New Project"), self.trUtf8("""Add existing files to the project?"""), QMessageBox.StandardButtons(\ @@ -2406,7 +2406,7 @@ self.setDirty(True) if self.vcs is not None: # edit VCS command options - vcores = QMessageBox.question(None, + vcores = E5MessageBox.question(self.ui, self.trUtf8("New Project"), self.trUtf8("""Would you like to edit the VCS""" """ command options?"""), @@ -2420,7 +2420,7 @@ self.vcs.vcsSetOptions(codlg.getOptions()) # add project file to repository if res == 0: - apres = QMessageBox.question(None, + apres = E5MessageBox.question(self.ui, self.trUtf8("New project"), self.trUtf8("Shall the project file be added" " to the repository?"), @@ -2470,7 +2470,7 @@ self.setDirty(True) if self.vcs is not None: # edit VCS command options - vcores = QMessageBox.question(None, + vcores = E5MessageBox.question(self.ui, self.trUtf8("New Project"), self.trUtf8("""Would you like to edit the VCS command""" """ options?"""), @@ -4368,7 +4368,7 @@ """ Private method to handle the application diagram context menu action. """ - res = QMessageBox.question(None, + res = E5MessageBox.question(self.ui, self.trUtf8("Application Diagram"), self.trUtf8("""Include module names?"""), QMessageBox.StandardButtons(\
--- a/Project/ProjectSourcesBrowser.py Tue Aug 31 12:17:02 2010 +0200 +++ b/Project/ProjectSourcesBrowser.py Tue Aug 31 12:36:10 2010 +0200 @@ -803,7 +803,7 @@ fn = itm.fileName() except AttributeError: fn = itm.dirName() - res = QMessageBox.question(None, + res = E5MessageBox.question(self, self.trUtf8("Class Diagram"), self.trUtf8("""Include class attributes?"""), QMessageBox.StandardButtons(\ @@ -824,7 +824,7 @@ except AttributeError: fn = itm.dirName() package = os.path.isdir(fn) and fn or os.path.dirname(fn) - res = QMessageBox.question(None, + res = E5MessageBox.question(self, self.trUtf8("Imports Diagram"), self.trUtf8("""Include imports from external modules?"""), QMessageBox.StandardButtons(\ @@ -845,7 +845,7 @@ except AttributeError: fn = itm.dirName() package = os.path.isdir(fn) and fn or os.path.dirname(fn) - res = QMessageBox.question(None, + res = E5MessageBox.question(self, self.trUtf8("Package Diagram"), self.trUtf8("""Include class attributes?"""), QMessageBox.StandardButtons(\ @@ -860,7 +860,7 @@ """ Private method to handle the application diagram context menu action. """ - res = QMessageBox.question(None, + res = E5MessageBox.question(self, self.trUtf8("Application Diagram"), self.trUtf8("""Include module names?"""), QMessageBox.StandardButtons(\
--- a/QScintilla/Editor.py Tue Aug 31 12:17:02 2010 +0200 +++ b/QScintilla/Editor.py Tue Aug 31 12:36:10 2010 +0200 @@ -5173,7 +5173,7 @@ package = os.path.isdir(self.fileName) and self.fileName \ or os.path.dirname(self.fileName) - res = QMessageBox.question(None, + res = E5MessageBox.question(self, self.trUtf8("Package Diagram"), self.trUtf8("""Include class attributes?"""), QMessageBox.StandardButtons(\ @@ -5194,7 +5194,7 @@ package = os.path.isdir(self.fileName) and self.fileName \ or os.path.dirname(self.fileName) - res = QMessageBox.question(None, + res = E5MessageBox.question(self, self.trUtf8("Imports Diagram"), self.trUtf8("""Include imports from external modules?"""), QMessageBox.StandardButtons(\ @@ -5210,7 +5210,7 @@ Private method to handle the Imports Diagram context menu action. """ from Graphics.ApplicationDiagram import ApplicationDiagram - res = QMessageBox.question(None, + res = E5MessageBox.question(self, self.trUtf8("Application Diagram"), self.trUtf8("""Include module names?"""), QMessageBox.StandardButtons(\
--- a/Tasks/TaskViewer.py Tue Aug 31 12:17:02 2010 +0200 +++ b/Tasks/TaskViewer.py Tue Aug 31 12:36:10 2010 +0200 @@ -712,7 +712,7 @@ @param on flag indicating the filter state (boolean) """ if on and not self.taskFilter.hasActiveFilter(): - res = QMessageBox.question(self, + res = E5MessageBox.question(self, self.trUtf8("Activate task filter"), self.trUtf8("""The task filter doesn't have any active filters.""" """ Do you want to configure the filter settings?"""), @@ -808,4 +808,4 @@ """ Private method to open the configuration dialog. """ - e5App().getObject("UserInterface").showPreferences("tasksPage") + e5App().getObject("UserInterface").showPreferences("tasksPage") \ No newline at end of file
--- a/Templates/TemplatePropertiesDialog.py Tue Aug 31 12:17:02 2010 +0200 +++ b/Templates/TemplatePropertiesDialog.py Tue Aug 31 12:36:10 2010 +0200 @@ -92,7 +92,7 @@ @param ev key event (QKeyEvent) """ if ev.key() == Qt.Key_Escape: - res = QMessageBox.question(self, + res = E5MessageBox.question(self, self.trUtf8("Close dialog"), self.trUtf8("""Do you really want to close the dialog?"""), QMessageBox.StandardButtons(\ @@ -198,4 +198,4 @@ self.descriptionEdit.text(), self.groupCombo.currentText(), self.templateEdit.toPlainText() - ) + ) \ No newline at end of file
--- a/Templates/TemplateViewer.py Tue Aug 31 12:17:02 2010 +0200 +++ b/Templates/TemplateViewer.py Tue Aug 31 12:36:10 2010 +0200 @@ -502,7 +502,7 @@ Private slot to handle the Remove context menu action. """ itm = self.currentItem() - res = QMessageBox.question(self, + res = E5MessageBox.question(self, self.trUtf8("Remove Template"), self.trUtf8("""<p>Do you really want to remove <b>{0}</b>?</p>""")\ .format(itm.getName()),
--- a/UI/EmailDialog.py Tue Aug 31 12:17:02 2010 +0200 +++ b/UI/EmailDialog.py Tue Aug 31 12:36:10 2010 +0200 @@ -106,7 +106,7 @@ @param ev key event (QKeyEvent) """ if ev.key() == Qt.Key_Escape: - res = QMessageBox.question(self, + res = E5MessageBox.question(self, self.trUtf8("Close dialog"), self.trUtf8("""Do you really want to close the dialog?"""), QMessageBox.StandardButtons(\ @@ -129,7 +129,7 @@ """ Private slot to handle the rejected signal of the button box. """ - res = QMessageBox.question(self, + res = E5MessageBox.question(self, self.trUtf8("Close dialog"), self.trUtf8("""Do you really want to close the dialog?"""), QMessageBox.StandardButtons(\
--- a/UI/UserInterface.py Tue Aug 31 12:17:02 2010 +0200 +++ b/UI/UserInterface.py Tue Aug 31 12:36:10 2010 +0200 @@ -2996,7 +2996,7 @@ """ Private method to restart the application. """ - res = QMessageBox.question(None, + res = E5MessageBox.question(self, self.trUtf8("Restart application"), self.trUtf8("""The application needs to be restarted. Do it now?"""), QMessageBox.StandardButtons(\ @@ -5520,7 +5520,7 @@ if "-snapshot-" in Version: # check snapshot version if versions[2] > Version: - res = QMessageBox.question(self, + res = E5MessageBox.question(self, self.trUtf8("Update available"), self.trUtf8("""The update to <b>{0}</b> of eric5 is available""" """ at <b>{1}</b>. Would you like to get it?""")\ @@ -5531,7 +5531,7 @@ QMessageBox.Yes) url = res == QMessageBox.Yes and versions[3] or '' elif versions[0] > Version: - res = QMessageBox.question(self, + res = E5MessageBox.question(self, self.trUtf8("Update available"), self.trUtf8("""The update to <b>{0}</b> of eric5 is available""" """ at <b>{1}</b>. Would you like to get it?""")\ @@ -5549,7 +5549,7 @@ else: # check release version if versions[0] > Version: - res = QMessageBox.question(self, + res = E5MessageBox.question(self, self.trUtf8("Update available"), self.trUtf8("""The update to <b>{0}</b> of eric5 is available""" """ at <b>{1}</b>. Would you like to get it?""")\
--- a/VCS/ProjectHelper.py Tue Aug 31 12:17:02 2010 +0200 +++ b/VCS/ProjectHelper.py Tue Aug 31 12:36:10 2010 +0200 @@ -155,7 +155,7 @@ self.project.pdata["VCS"] = [vcsSystem] self.project.vcs = self.project.initVCS(vcsSystem) # edit VCS command options - vcores = QMessageBox.question(self.parent(), + vcores = E5MessageBox.question(self.parent(), self.trUtf8("New Project"), self.trUtf8("""Would you like to edit the VCS command options?"""), QMessageBox.StandardButtons(\ @@ -212,7 +212,7 @@ self.project.setDirty(True) self.project.saveProject() else: - res = QMessageBox.question(self.parent(), + res = E5MessageBox.question(self.parent(), self.trUtf8("New project from repository"), self.trUtf8("The project retrieved from the repository" " does not contain an eric project file" @@ -243,7 +243,7 @@ self.project.saveProject() self.project.openProject(self.project.pfile) if not export: - res = QMessageBox.question(self.parent(), + res = E5MessageBox.question(self.parent(), self.trUtf8("New project from repository"), self.trUtf8("Shall the project file be added to" " the repository?"), @@ -323,7 +323,7 @@ if vcsdlg.exec_() == QDialog.Accepted: vcsDataDict = vcsdlg.getData() # edit VCS command options - vcores = QMessageBox.question(self.parent(), + vcores = E5MessageBox.question(self.parent(), self.trUtf8("Import Project"), self.trUtf8("""Would you like to edit the VCS command options?"""), QMessageBox.StandardButtons(\ @@ -356,7 +356,7 @@ """ shouldReopen = self.vcs.vcsUpdate(self.project.ppath) if shouldReopen: - res = QMessageBox.question(self.parent(), + res = E5MessageBox.question(self.parent(), self.trUtf8("Update"), self.trUtf8("""The project should be reread. Do this now?"""), QMessageBox.StandardButtons(\ @@ -383,7 +383,7 @@ Depending on the parameters set in the vcs object the project may be removed from the local disk as well. """ - res = QMessageBox.question(self.parent(), + res = E5MessageBox.question(self.parent(), self.trUtf8("Remove project from repository"), self.trUtf8("Dou you really want to remove this project from" " the repository (and disk)?"),
