Mercurial Repositories > eric / changeset
changeset
Fixed a few hidden bugs.
Sun, 05 Jun 2011 18:27:56 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Sun, 05 Jun 2011 18:27:56 +0200
- branch
- 5_1_x
- changeset 1113
- 95d837803666
- parent 1111
- 8f7ebfc5b087
- child 1116
- ba7dd484ce98
Fixed a few hidden bugs.
--- a/Documentation/Source/eric5.Graphics.UMLItem.html Sat Jun 04 18:58:48 2011 +0200 +++ b/Documentation/Source/eric5.Graphics.UMLItem.html Sun Jun 05 18:27:56 2011 +0200 @@ -22,7 +22,7 @@ <body><a NAME="top" ID="top"></a> <h1>eric5.Graphics.UMLItem</h1> <p> -Module implementing the UMLWidget base class. +Module implementing the UMLItem base class. </p> <h3>Global Attributes</h3> <table>
--- a/Documentation/Source/index-eric5.Graphics.html Sat Jun 04 18:58:48 2011 +0200 +++ b/Documentation/Source/index-eric5.Graphics.html Sun Jun 05 18:27:56 2011 +0200 @@ -71,7 +71,7 @@ <td>Module implementing a subclass of E5GraphicsView for our diagrams.</td> </tr><tr> <td><a href="eric5.Graphics.UMLItem.html">UMLItem</a></td> -<td>Module implementing the UMLWidget base class.</td> +<td>Module implementing the UMLItem base class.</td> </tr><tr> <td><a href="eric5.Graphics.UMLSceneSizeDialog.html">UMLSceneSizeDialog</a></td> <td>Module implementing a dialog to set the scene sizes.</td>
--- a/E5Gui/E5ToolBarManager.py Sat Jun 04 18:58:48 2011 +0200 +++ b/E5Gui/E5ToolBarManager.py Sun Jun 05 18:27:56 2011 +0200 @@ -260,7 +260,7 @@ @param toolBar reference to the toolbar to configure (QToolBar) """ - if not isDefaultToolBar(): + if not self.isDefaultToolBar(): return self.setToolBar(toolBar, self.__defaultToolBars[id(toolBar)])
--- a/Graphics/PackageItem.py Sat Jun 04 18:58:48 2011 +0200 +++ b/Graphics/PackageItem.py Sun Jun 05 18:27:56 2011 +0200 @@ -32,7 +32,7 @@ @param modulename module name to be added (string) """ - self.moduleslist.append(classname) + self.moduleslist.append(modulename) def getModules(self): """
--- a/Graphics/UMLGraphicsView.py Sat Jun 04 18:58:48 2011 +0200 +++ b/Graphics/UMLGraphicsView.py Sun Jun 05 18:27:56 2011 +0200 @@ -255,7 +255,7 @@ # step 2: select all given items for itm in items: - if isinstance(itm, UMLWidget): + if isinstance(itm, UMLItem): itm.setSelected(True) def selectItem(self, item): @@ -264,7 +264,7 @@ @param item item to be selected (QGraphicsItemItem) """ - if isinstance(item, UMLWidget): + if isinstance(item, UMLItem): item.setSelected(not item.isSelected()) def __deleteShape(self):
--- a/Graphics/UMLItem.py Sat Jun 04 18:58:48 2011 +0200 +++ b/Graphics/UMLItem.py Sun Jun 05 18:27:56 2011 +0200 @@ -4,7 +4,7 @@ # """ -Module implementing the UMLWidget base class. +Module implementing the UMLItem base class. """ from PyQt4.QtCore import *
--- a/Helpviewer/Bookmarks/BookmarksManager.py Sat Jun 04 18:58:48 2011 +0200 +++ b/Helpviewer/Bookmarks/BookmarksManager.py Sun Jun 05 18:27:56 2011 +0200 @@ -401,7 +401,7 @@ E5MessageBox.critical(None, self.trUtf8("Exporting Bookmarks"), self.trUtf8("""Error exporting bookmarks to <b>{0}</b>.""")\ - .format(bookmarkFile)) + .format(fileName)) def __convertFromOldBookmarks(self): """
--- a/Helpviewer/History/HistoryMenu.py Sat Jun 04 18:58:48 2011 +0200 +++ b/Helpviewer/History/HistoryMenu.py Sun Jun 05 18:27:56 2011 +0200 @@ -13,6 +13,7 @@ from PyQt4.QtGui import * from E5Gui.E5ModelMenu import E5ModelMenu +from E5Gui import E5MessageBox import Helpviewer.HelpWindow
--- a/MultiProject/MultiProject.py Sat Jun 04 18:58:48 2011 +0200 +++ b/MultiProject/MultiProject.py Sun Jun 05 18:27:56 2011 +0200 @@ -474,7 +474,7 @@ res = E5MessageBox.yesNo(self.parent(), self.trUtf8("Save File"), self.trUtf8("<p>The file <b>{0}</b> already exists." - " Overwrite it?</p>").format(fileName), + " Overwrite it?</p>").format(fn), icon = E5MessageBox.Warning) if not res: return False
--- a/Plugins/VcsPlugins/vcsPySvn/SvnUrlSelectionDialog.py Sat Jun 04 18:58:48 2011 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnUrlSelectionDialog.py Sun Jun 05 18:27:56 2011 +0200 @@ -17,6 +17,8 @@ from .Ui_SvnUrlSelectionDialog import Ui_SvnUrlSelectionDialog +import Utilities + class SvnUrlSelectionDialog(QDialog, Ui_SvnUrlSelectionDialog): """ Class implementing a dialog to enter the URLs for the svn diff command.
--- a/Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py Sat Jun 04 18:58:48 2011 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py Sun Jun 05 18:27:56 2011 +0200 @@ -7,6 +7,8 @@ Module implementing a dialog to show the output of the svn blame command. """ +import os + from PyQt4.QtCore import * from PyQt4.QtGui import * @@ -244,4 +246,4 @@ self.intercept = False evt.accept() return - QDialog.keyPressEvent(self, evt) \ No newline at end of file + QDialog.keyPressEvent(self, evt)
--- a/Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py Sat Jun 04 18:58:48 2011 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py Sun Jun 05 18:27:56 2011 +0200 @@ -7,6 +7,8 @@ Module implementing a dialog to show a list of tags or branches. """ +import os + from PyQt4.QtCore import * from PyQt4.QtGui import *
--- a/Plugins/VcsPlugins/vcsSubversion/SvnUrlSelectionDialog.py Sat Jun 04 18:58:48 2011 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnUrlSelectionDialog.py Sun Jun 05 18:27:56 2011 +0200 @@ -15,6 +15,8 @@ from .Ui_SvnUrlSelectionDialog import Ui_SvnUrlSelectionDialog +import Utilities + class SvnUrlSelectionDialog(QDialog, Ui_SvnUrlSelectionDialog): """
--- a/Project/Project.py Sat Jun 04 18:58:48 2011 +0200 +++ b/Project/Project.py Sun Jun 05 18:27:56 2011 +0200 @@ -812,10 +812,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)) @@ -941,10 +940,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)) @@ -1754,7 +1752,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) @@ -4142,7 +4140,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 @@ -4179,7 +4177,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:
--- a/Project/ProjectFormsBrowser.py Sat Jun 04 18:58:48 2011 +0200 +++ b/Project/ProjectFormsBrowser.py Sun Jun 05 18:27:56 2011 +0200 @@ -714,7 +714,7 @@ fn = itm.fileName() if self.hooks["generateDialogCode"] is not None: - self.hooks["generateDialogCode"](filename) + self.hooks["generateDialogCode"](fn) else: from .CreateDialogCodeDialog import CreateDialogCodeDialog
--- a/QScintilla/Editor.py Sat Jun 04 18:58:48 2011 +0200 +++ b/QScintilla/Editor.py Sun Jun 05 18:27:56 2011 +0200 @@ -11,13 +11,9 @@ import re import difflib -from PyQt4.Qsci import QsciScintilla, QsciMacro -try: - from PyQt4.Qsci import QsciStyledText -except ImportError: - QsciStyledText = None # __IGNORE_WARNING__ from PyQt4.QtCore import * from PyQt4.QtGui import * +from PyQt4.Qsci import QsciScintilla, QsciMacro, QsciStyledText from E5Gui.E5Application import e5App from E5Gui import E5FileDialog, E5MessageBox
--- a/QScintilla/Exporters/ExporterHTML.py Sat Jun 04 18:58:48 2011 +0200 +++ b/QScintilla/Exporters/ExporterHTML.py Sun Jun 05 18:27:56 2011 +0200 @@ -244,7 +244,7 @@ html += ''' ''' * ts column += ts else: - if tabs: + if useTabs: html += '\t' column += 1 else: @@ -400,4 +400,4 @@ """<p>Reason: {1}</p>""")\ .format(filename, str(err))) finally: - QApplication.restoreOverrideCursor() \ No newline at end of file + QApplication.restoreOverrideCursor()
--- a/UI/FindFileDialog.py Sat Jun 04 18:58:48 2011 +0200 +++ b/UI/FindFileDialog.py Sun Jun 05 18:27:56 2011 +0200 @@ -591,7 +591,7 @@ text, encoding, hash = \ Utilities.readEncodedFileWithHash(fn) lines = text.splitlines(True) - except (UnicodeError, IOError): + except (UnicodeError, IOError) as err: E5MessageBox.critical(self, self.trUtf8("Replace in Files"), self.trUtf8(
--- a/UI/UserInterface.py Sat Jun 04 18:58:48 2011 +0200 +++ b/UI/UserInterface.py Sun Jun 05 18:27:56 2011 +0200 @@ -5617,7 +5617,7 @@ @param errors list of SSL errors (list of QSslError) """ errorStrings = [] - for err in sslErrors: + for err in errors: errorStrings.append(err.errorString()) errorString = '.<br />'.join(errorStrings) ret = E5MessageBox.yesNo(self,
