Hi team I would like to ask if there is a possibility to make a freeze exception for eric_4.4.7-1 which is a bug fix release since version 4.4.6.
The debdiff is attached. Thanks in advance Gudjon
diff -Nru eric-4.4.6/changelog eric-4.4.7/changelog --- eric-4.4.6/changelog 2010-07-04 09:59:42.000000000 +0200 +++ eric-4.4.7/changelog 2010-08-01 17:15:20.000000000 +0200 @@ -1,5 +1,9 @@ Change Log ---------- +Version 4.4.7: +- bug fixes +- added code to adjust the cursor flash time of the editor to the global settings + Version 4.4.6: - bug fixes diff -Nru eric-4.4.6/debian/changelog eric-4.4.7/debian/changelog --- eric-4.4.6/debian/changelog 2010-07-09 22:13:49.000000000 +0200 +++ eric-4.4.7/debian/changelog 2010-08-17 22:57:26.000000000 +0200 @@ -1,3 +1,10 @@ +eric (4.4.7-1) unstable; urgency=low + + * New upstream release + * Bump standards version to 3.9.1 + + -- Gudjon I. Gudjonsson <gud...@gudjon.org> Thu, 12 Aug 2010 09:48:37 +0200 + eric (4.4.6-1) unstable; urgency=low * New upstream release diff -Nru eric-4.4.6/debian/control eric-4.4.7/debian/control --- eric-4.4.6/debian/control 2010-07-09 22:13:49.000000000 +0200 +++ eric-4.4.7/debian/control 2010-08-17 22:57:26.000000000 +0200 @@ -9,7 +9,7 @@ python-sip-dev , qt4-dev-tools, libqt4-dev, python-qt4-dev #, python-kde4 XS-Python-Version: >=2.5 -Standards-Version: 3.9.0 +Standards-Version: 3.9.1 Homepage: http://eric-ide.python-projects.org/ Vcs-Svn: svn://svn.debian.org/svn/python-apps/packages/eric/trunk/ Vcs-Browser: http://svn.debian.org/viewsvn/python-apps/packages/eric/trunk/ diff -Nru eric-4.4.6/debian/patches/03_disable-update-warning.patch eric-4.4.7/debian/patches/03_disable-update-warning.patch --- eric-4.4.6/debian/patches/03_disable-update-warning.patch 2010-03-29 00:17:28.000000000 +0200 +++ eric-4.4.7/debian/patches/03_disable-update-warning.patch 2010-08-17 22:57:25.000000000 +0200 @@ -1,4 +1,5 @@ Index: eric-4.4.1/eric/UI/UserInterface.py +Disables upgrade of eric outside the Debian package system =================================================================== --- eric-4.4.1.orig/eric/UI/UserInterface.py 2010-03-26 20:40:23.000000000 +0100 +++ eric-4.4.1/eric/UI/UserInterface.py 2010-03-26 20:42:03.000000000 +0100 diff -Nru eric-4.4.6/eric/APIs/Python/eric4.api eric-4.4.7/eric/APIs/Python/eric4.api --- eric-4.4.6/eric/APIs/Python/eric4.api 2010-05-24 14:04:27.000000000 +0200 +++ eric-4.4.7/eric/APIs/Python/eric4.api 2010-08-01 12:56:13.000000000 +0200 @@ -4531,6 +4531,7 @@ eric4.QScintilla.Printer.Printer.formatPage?4(painter, drawing, area, pagenr) eric4.QScintilla.Printer.Printer?1(mode = QPrinter.ScreenResolution) eric4.QScintilla.QsciScintillaCompat.QSCINTILLA_VERSION?4() +eric4.QScintilla.QsciScintillaCompat.QsciScintillaCompat.UserSeparator?7 eric4.QScintilla.QsciScintillaCompat.QsciScintillaCompat.charAt?4(pos) eric4.QScintilla.QsciScintillaCompat.QsciScintillaCompat.clearAllIndicators?4(indicator) eric4.QScintilla.QsciScintillaCompat.QsciScintillaCompat.clearAlternateKeys?4() @@ -4556,10 +4557,12 @@ eric4.QScintilla.QsciScintillaCompat.QsciScintillaCompat.extendSelectionWordRight?4() eric4.QScintilla.QsciScintillaCompat.QsciScintillaCompat.findFirstTarget?4(expr_, re_, cs_, wo_, begline = -1, begindex = -1, endline = -1, endindex = -1, ws_ = False) eric4.QScintilla.QsciScintillaCompat.QsciScintillaCompat.findNextTarget?4() +eric4.QScintilla.QsciScintillaCompat.QsciScintillaCompat.focusOutEvent?4(event) eric4.QScintilla.QsciScintillaCompat.QsciScintillaCompat.foldExpandedAt?4(line) eric4.QScintilla.QsciScintillaCompat.QsciScintillaCompat.foldFlagsAt?4(line) eric4.QScintilla.QsciScintillaCompat.QsciScintillaCompat.foldHeaderAt?4(line) eric4.QScintilla.QsciScintillaCompat.QsciScintillaCompat.foldLevelAt?4(line) +eric4.QScintilla.QsciScintillaCompat.QsciScintillaCompat.getCursorFlashTime?4() eric4.QScintilla.QsciScintillaCompat.QsciScintillaCompat.getEndStyled?4() eric4.QScintilla.QsciScintillaCompat.QsciScintillaCompat.getEolIndicator?4() eric4.QScintilla.QsciScintillaCompat.QsciScintillaCompat.getFileName?4() @@ -4588,6 +4591,7 @@ eric4.QScintilla.QsciScintillaCompat.QsciScintillaCompat.replaceTarget?4(replaceStr) eric4.QScintilla.QsciScintillaCompat.QsciScintillaCompat.scrollVertical?4(lines) eric4.QScintilla.QsciScintillaCompat.QsciScintillaCompat.setCurrentIndicator?4(indicator) +eric4.QScintilla.QsciScintillaCompat.QsciScintillaCompat.setCursorFlashTime?4(time) eric4.QScintilla.QsciScintillaCompat.QsciScintillaCompat.setEolModeByEolString?4(eolStr) eric4.QScintilla.QsciScintillaCompat.QsciScintillaCompat.setIndentationGuideView?4(view) eric4.QScintilla.QsciScintillaCompat.QsciScintillaCompat.setIndicator?4(indicator, sline, sindex, eline, eindex) @@ -4595,6 +4599,7 @@ eric4.QScintilla.QsciScintillaCompat.QsciScintillaCompat.setLexer?4(lex = None) eric4.QScintilla.QsciScintillaCompat.QsciScintillaCompat.setStyleBits?4(bits) eric4.QScintilla.QsciScintillaCompat.QsciScintillaCompat.setStyling?4(length, style) +eric4.QScintilla.QsciScintillaCompat.QsciScintillaCompat.showUserList?4(id, lst) eric4.QScintilla.QsciScintillaCompat.QsciScintillaCompat.startStyling?4(pos, mask) eric4.QScintilla.QsciScintillaCompat.QsciScintillaCompat.styleAt?4(pos) eric4.QScintilla.QsciScintillaCompat.QsciScintillaCompat.zoomIn?4(zoom = 1) diff -Nru eric-4.4.6/eric/changelog eric-4.4.7/eric/changelog --- eric-4.4.6/eric/changelog 2010-06-13 13:22:23.000000000 +0200 +++ eric-4.4.7/eric/changelog 2010-07-25 11:58:52.000000000 +0200 @@ -1,5 +1,9 @@ Change Log ---------- +Version 4.4.7: +- bug fixes +- added code to adjust the cursor flash time of the editor to the global settings + Version 4.4.6: - bug fixes Binary files /tmp/XQwtYszJHh/eric-4.4.6/eric/Documentation/Help/source.qch and /tmp/_KVAvyNEjO/eric-4.4.7/eric/Documentation/Help/source.qch differ diff -Nru eric-4.4.6/eric/Documentation/Help/source.qhp eric-4.4.7/eric/Documentation/Help/source.qhp --- eric-4.4.6/eric/Documentation/Help/source.qhp 2010-05-22 12:52:57.000000000 +0200 +++ eric-4.4.7/eric/Documentation/Help/source.qhp 2010-08-01 12:56:27.000000000 +0200 @@ -5278,10 +5278,12 @@ <keyword name="QsciScintillaCompat.extendSelectionWordRight" id="QsciScintillaCompat.extendSelectionWordRight" ref="eric4.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.extendSelectionWordRight" /> <keyword name="QsciScintillaCompat.findFirstTarget" id="QsciScintillaCompat.findFirstTarget" ref="eric4.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.findFirstTarget" /> <keyword name="QsciScintillaCompat.findNextTarget" id="QsciScintillaCompat.findNextTarget" ref="eric4.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.findNextTarget" /> + <keyword name="QsciScintillaCompat.focusOutEvent" id="QsciScintillaCompat.focusOutEvent" ref="eric4.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.focusOutEvent" /> <keyword name="QsciScintillaCompat.foldExpandedAt" id="QsciScintillaCompat.foldExpandedAt" ref="eric4.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.foldExpandedAt" /> <keyword name="QsciScintillaCompat.foldFlagsAt" id="QsciScintillaCompat.foldFlagsAt" ref="eric4.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.foldFlagsAt" /> <keyword name="QsciScintillaCompat.foldHeaderAt" id="QsciScintillaCompat.foldHeaderAt" ref="eric4.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.foldHeaderAt" /> <keyword name="QsciScintillaCompat.foldLevelAt" id="QsciScintillaCompat.foldLevelAt" ref="eric4.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.foldLevelAt" /> + <keyword name="QsciScintillaCompat.getCursorFlashTime" id="QsciScintillaCompat.getCursorFlashTime" ref="eric4.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.getCursorFlashTime" /> <keyword name="QsciScintillaCompat.getEndStyled" id="QsciScintillaCompat.getEndStyled" ref="eric4.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.getEndStyled" /> <keyword name="QsciScintillaCompat.getEolIndicator" id="QsciScintillaCompat.getEolIndicator" ref="eric4.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.getEolIndicator" /> <keyword name="QsciScintillaCompat.getFileName" id="QsciScintillaCompat.getFileName" ref="eric4.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.getFileName" /> @@ -5310,6 +5312,7 @@ <keyword name="QsciScintillaCompat.replaceTarget" id="QsciScintillaCompat.replaceTarget" ref="eric4.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.replaceTarget" /> <keyword name="QsciScintillaCompat.scrollVertical" id="QsciScintillaCompat.scrollVertical" ref="eric4.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.scrollVertical" /> <keyword name="QsciScintillaCompat.setCurrentIndicator" id="QsciScintillaCompat.setCurrentIndicator" ref="eric4.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.setCurrentIndicator" /> + <keyword name="QsciScintillaCompat.setCursorFlashTime" id="QsciScintillaCompat.setCursorFlashTime" ref="eric4.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.setCursorFlashTime" /> <keyword name="QsciScintillaCompat.setEolModeByEolString" id="QsciScintillaCompat.setEolModeByEolString" ref="eric4.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.setEolModeByEolString" /> <keyword name="QsciScintillaCompat.setIndentationGuideView" id="QsciScintillaCompat.setIndentationGuideView" ref="eric4.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.setIndentationGuideView" /> <keyword name="QsciScintillaCompat.setIndicator" id="QsciScintillaCompat.setIndicator" ref="eric4.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.setIndicator" /> @@ -5317,6 +5320,7 @@ <keyword name="QsciScintillaCompat.setLexer" id="QsciScintillaCompat.setLexer" ref="eric4.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.setLexer" /> <keyword name="QsciScintillaCompat.setStyleBits" id="QsciScintillaCompat.setStyleBits" ref="eric4.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.setStyleBits" /> <keyword name="QsciScintillaCompat.setStyling" id="QsciScintillaCompat.setStyling" ref="eric4.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.setStyling" /> + <keyword name="QsciScintillaCompat.showUserList" id="QsciScintillaCompat.showUserList" ref="eric4.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.showUserList" /> <keyword name="QsciScintillaCompat.startStyling" id="QsciScintillaCompat.startStyling" ref="eric4.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.startStyling" /> <keyword name="QsciScintillaCompat.styleAt" id="QsciScintillaCompat.styleAt" ref="eric4.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.styleAt" /> <keyword name="QsciScintillaCompat.zoomIn" id="QsciScintillaCompat.zoomIn" ref="eric4.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.zoomIn" /> diff -Nru eric-4.4.6/eric/Documentation/Source/eric4.QScintilla.QsciScintillaCompat.html eric-4.4.7/eric/Documentation/Source/eric4.QScintilla.QsciScintillaCompat.html --- eric-4.4.6/eric/Documentation/Source/eric4.QScintilla.QsciScintillaCompat.html 2010-05-22 12:52:53.000000000 +0200 +++ eric-4.4.7/eric/Documentation/Source/eric4.QScintilla.QsciScintillaCompat.html 2010-08-01 12:56:23.000000000 +0200 @@ -56,7 +56,7 @@ QsciScintilla <h3>Class Attributes</h3> <table> -<tr><td>None</td></tr> +<tr><td>UserSeparator</td></tr> </table> <h3>Methods</h3> <table> @@ -142,6 +142,9 @@ <td><a href="#QsciScintillaCompat.findNextTarget">findNextTarget</a></td> <td>Public method to find the next occurrence in the target range.</td> </tr><tr> +<td><a href="#QsciScintillaCompat.focusOutEvent">focusOutEvent</a></td> +<td>Public method called when the editor loses focus.</td> +</tr><tr> <td><a href="#QsciScintillaCompat.foldExpandedAt">foldExpandedAt</a></td> <td>Public method to determine, if a fold is expanded.</td> </tr><tr> @@ -154,6 +157,9 @@ <td><a href="#QsciScintillaCompat.foldLevelAt">foldLevelAt</a></td> <td>Public method to get the fold level of a line of the document.</td> </tr><tr> +<td><a href="#QsciScintillaCompat.getCursorFlashTime">getCursorFlashTime</a></td> +<td>Public method to get the flash (blink) time of the cursor in milliseconds.</td> +</tr><tr> <td><a href="#QsciScintillaCompat.getEndStyled">getEndStyled</a></td> <td>Public method to get the last styled position.</td> </tr><tr> @@ -238,6 +244,9 @@ <td><a href="#QsciScintillaCompat.setCurrentIndicator">setCurrentIndicator</a></td> <td>Public method to set the current indicator.</td> </tr><tr> +<td><a href="#QsciScintillaCompat.setCursorFlashTime">setCursorFlashTime</a></td> +<td>Public method to get the flash (blink) time of the cursor in milliseconds.</td> +</tr><tr> <td><a href="#QsciScintillaCompat.setEolModeByEolString">setEolModeByEolString</a></td> <td>Public method to set the eol mode given the eol string.</td> </tr><tr> @@ -259,6 +268,9 @@ <td><a href="#QsciScintillaCompat.setStyling">setStyling</a></td> <td>Public method to style some text.</td> </tr><tr> +<td><a href="#QsciScintillaCompat.showUserList">showUserList</a></td> +<td>Public method to show a user supplied list.</td> +</tr><tr> <td><a href="#QsciScintillaCompat.startStyling">startStyling</a></td> <td>Public method to prepare styling.</td> </tr><tr> @@ -543,6 +555,16 @@ <dd> flag indicating a successful search (boolean) </dd> +</dl><a NAME="QsciScintillaCompat.focusOutEvent" ID="QsciScintillaCompat.focusOutEvent"></a> +<h4>QsciScintillaCompat.focusOutEvent</h4> +<b>focusOutEvent</b>(<i>event</i>) +<p> + Public method called when the editor loses focus. +</p><dl> +<dt><i>event</i></dt> +<dd> +the event object (QFocusEvent) +</dd> </dl><a NAME="QsciScintillaCompat.foldExpandedAt" ID="QsciScintillaCompat.foldExpandedAt"></a> <h4>QsciScintillaCompat.foldExpandedAt</h4> <b>foldExpandedAt</b>(<i>line</i>) @@ -603,6 +625,20 @@ <dd> fold level of the given line (integer) </dd> +</dl><a NAME="QsciScintillaCompat.getCursorFlashTime" ID="QsciScintillaCompat.getCursorFlashTime"></a> +<h4>QsciScintillaCompat.getCursorFlashTime</h4> +<b>getCursorFlashTime</b>(<i></i>) +<p> + Public method to get the flash (blink) time of the cursor in milliseconds. +</p><p> + The flash time is the time required to display, invert and restore the + caret display. Usually the text cursor is displayed for half the cursor + flash time, then hidden for the same amount of time. +</p><dl> +<dt>Returns:</dt> +<dd> +flash time of the cursor in milliseconds (integer) +</dd> </dl><a NAME="QsciScintillaCompat.getEndStyled" ID="QsciScintillaCompat.getEndStyled"></a> <h4>QsciScintillaCompat.getEndStyled</h4> <b>getEndStyled</b>(<i></i>) @@ -933,6 +969,20 @@ <dd> the indicator or style are not valid </dd> +</dl><a NAME="QsciScintillaCompat.setCursorFlashTime" ID="QsciScintillaCompat.setCursorFlashTime"></a> +<h4>QsciScintillaCompat.setCursorFlashTime</h4> +<b>setCursorFlashTime</b>(<i>time</i>) +<p> + Public method to get the flash (blink) time of the cursor in milliseconds. +</p><p> + The flash time is the time required to display, invert and restore the + caret display. Usually the text cursor is displayed for half the cursor + flash time, then hidden for the same amount of time. +</p><dl> +<dt><i>time</i></dt> +<dd> +flash time of the cursor in milliseconds (integer) +</dd> </dl><a NAME="QsciScintillaCompat.setEolModeByEolString" ID="QsciScintillaCompat.setEolModeByEolString"></a> <h4>QsciScintillaCompat.setEolModeByEolString</h4> <b>setEolModeByEolString</b>(<i>eolStr</i>) @@ -1032,6 +1082,19 @@ <dd> style to set for text (integer) </dd> +</dl><a NAME="QsciScintillaCompat.showUserList" ID="QsciScintillaCompat.showUserList"></a> +<h4>QsciScintillaCompat.showUserList</h4> +<b>showUserList</b>(<i>id, lst</i>) +<p> + Public method to show a user supplied list. +</p><dl> +<dt><i>id</i></dt> +<dd> +id of the list (integer) +</dd><dt><i>lst</i></dt> +<dd> +list to be show (QStringList) +</dd> </dl><a NAME="QsciScintillaCompat.startStyling" ID="QsciScintillaCompat.startStyling"></a> <h4>QsciScintillaCompat.startStyling</h4> <b>startStyling</b>(<i>pos, mask</i>) diff -Nru eric-4.4.6/eric/KdeQt/KQFileDialog.py eric-4.4.7/eric/KdeQt/KQFileDialog.py --- eric-4.4.6/eric/KdeQt/KQFileDialog.py 2010-01-09 12:13:40.000000000 +0100 +++ eric-4.4.7/eric/KdeQt/KQFileDialog.py 2010-07-17 10:18:40.000000000 +0200 @@ -108,7 +108,8 @@ filter = __convertFilter(filter, selectedFilter) wdir = __workingDirectory(dir_) dlg = KFileDialog(KUrl.fromPath(wdir), filter, parent) - dlg.setSelection(dir_) + if wdir != dir_: + dlg.setSelection(dir_) dlg.setOperationMode(KFileDialog.Saving) dlg.setMode(KFile.Modes(KFile.File) | KFile.Modes(KFile.LocalOnly)) dlg.setWindowTitle(caption.isEmpty() and \ diff -Nru eric-4.4.6/eric/Plugins/PluginEricapi.py eric-4.4.7/eric/Plugins/PluginEricapi.py --- eric-4.4.6/eric/Plugins/PluginEricapi.py 2010-01-31 17:53:22.000000000 +0100 +++ eric-4.4.7/eric/Plugins/PluginEricapi.py 2010-07-18 17:56:18.000000000 +0200 @@ -23,6 +23,8 @@ import Utilities +from eric4config import getConfig + # Start-Of-Header name = "Ericapi Plugin" author = "Detlev Offenbach <det...@die-offenbachs.de>" @@ -47,7 +49,7 @@ """ exe = 'eric4-api' if Utilities.isWindowsPlatform(): - exe += '.bat' + exe = os.path.join(getConfig("bindir"), exe +'.bat') data = { "programEntry" : True, diff -Nru eric-4.4.6/eric/Plugins/PluginEricdoc.py eric-4.4.7/eric/Plugins/PluginEricdoc.py --- eric-4.4.6/eric/Plugins/PluginEricdoc.py 2010-01-09 12:12:47.000000000 +0100 +++ eric-4.4.7/eric/Plugins/PluginEricdoc.py 2010-07-18 17:57:05.000000000 +0200 @@ -23,6 +23,8 @@ import Utilities +from eric4config import getConfig + # Start-Of-Header name = "Ericdoc Plugin" author = "Detlev Offenbach <det...@die-offenbachs.de>" @@ -48,7 +50,7 @@ """ exe = 'eric4-doc' if Utilities.isWindowsPlatform(): - exe += '.bat' + exe = os.path.join(getConfig("bindir"), exe +'.bat') data = { "programEntry" : True, diff -Nru eric-4.4.6/eric/Plugins/VcsPlugins/vcsPySvn/subversion.py eric-4.4.7/eric/Plugins/VcsPlugins/vcsPySvn/subversion.py --- eric-4.4.6/eric/Plugins/VcsPlugins/vcsPySvn/subversion.py 2010-04-04 15:46:52.000000000 +0200 +++ eric-4.4.7/eric/Plugins/VcsPlugins/vcsPySvn/subversion.py 2010-07-31 15:29:00.000000000 +0200 @@ -1418,7 +1418,7 @@ entry = client.info(path) url = entry.url except pysvn.ClientError: - url = None + url = "" locker.unlock() return url @@ -1991,7 +1991,11 @@ if scheme == "file": return "%s:%s" % (scheme, urllib.quote(url[1])) else: - host, path = url[1][2:].split("/",1) + try: + host, path = url[1][2:].split("/", 1) + except ValueError: + host = url[1][2:] + path = "" return "%s://%s/%s" % (scheme, host, urllib.quote(path)) def svnNormalizeURL(self, url): diff -Nru eric-4.4.6/eric/Plugins/VcsPlugins/vcsSubversion/subversion.py eric-4.4.7/eric/Plugins/VcsPlugins/vcsSubversion/subversion.py --- eric-4.4.6/eric/Plugins/VcsPlugins/vcsSubversion/subversion.py 2010-04-04 15:46:53.000000000 +0200 +++ eric-4.4.7/eric/Plugins/VcsPlugins/vcsSubversion/subversion.py 2010-07-31 15:29:01.000000000 +0200 @@ -1292,7 +1292,7 @@ reposURL = line.replace('<url>', '').replace('</url>', '') return reposURL - return None + return "" def svnResolve(self, name): """ @@ -1767,7 +1767,11 @@ if scheme == "file": return "%s:%s" % (scheme, urllib.quote(url[1])) else: - host, path = url[1][2:].split("/",1) + try: + host, path = url[1][2:].split("/", 1) + except ValueError: + host = url[1][2:] + path = "" return "%s://%s/%s" % (scheme, host, urllib.quote(path)) def svnNormalizeURL(self, url): diff -Nru eric-4.4.6/eric/Preferences/ConfigurationPages/EmailPage.py eric-4.4.7/eric/Preferences/ConfigurationPages/EmailPage.py --- eric-4.4.6/eric/Preferences/ConfigurationPages/EmailPage.py 2010-01-09 12:13:31.000000000 +0100 +++ eric-4.4.7/eric/Preferences/ConfigurationPages/EmailPage.py 2010-07-13 19:11:39.000000000 +0200 @@ -7,8 +7,6 @@ Module implementing the Email configuration page. """ -from PyQt4.QtGui import QIntValidator - from ConfigurationPageBase import ConfigurationPageBase from Ui_EmailPage import Ui_EmailPage @@ -26,12 +24,9 @@ self.setupUi(self) self.setObjectName("EmailPage") - self.portValidator = QIntValidator(1, 65535, self.portEdit) - self.portEdit.setValidator(self.portValidator) - # set initial values self.mailServerEdit.setText(Preferences.getUser("MailServer")) - self.portEdit.setText("%d" % Preferences.getUser("MailServerPort")) + self.portSpin.setValue(Preferences.getUser("MailServerPort")) self.emailEdit.setText(Preferences.getUser("Email")) self.signatureEdit.setPlainText(Preferences.getUser("Signature")) self.mailAuthenticationCheckBox.setChecked(\ @@ -49,7 +44,7 @@ Preferences.setUser("MailServer", self.mailServerEdit.text()) Preferences.setUser("MailServerPort", - int(self.portEdit.text())) + self.portSpin.value()) Preferences.setUser("Email", self.emailEdit.text()) Preferences.setUser("Signature", diff -Nru eric-4.4.6/eric/Preferences/ConfigurationPages/EmailPage.ui eric-4.4.7/eric/Preferences/ConfigurationPages/EmailPage.ui --- eric-4.4.6/eric/Preferences/ConfigurationPages/EmailPage.ui 2010-01-09 12:13:31.000000000 +0100 +++ eric-4.4.7/eric/Preferences/ConfigurationPages/EmailPage.ui 2010-07-13 19:10:02.000000000 +0200 @@ -40,7 +40,7 @@ </property> </widget> </item> - <item row="0" column="1"> + <item row="0" column="1" colspan="2"> <widget class="QLineEdit" name="mailServerEdit"> <property name="toolTip"> <string>Enter the address of your mail server</string> @@ -55,15 +55,37 @@ </widget> </item> <item row="1" column="1"> - <widget class="QLineEdit" name="portEdit"> + <widget class="QSpinBox" name="portSpin"> <property name="toolTip"> <string>Enter the port of the mail server</string> </property> - <property name="inputMask"> - <string/> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + <property name="minimum"> + <number>1</number> + </property> + <property name="maximum"> + <number>65535</number> + </property> + <property name="value"> + <number>25</number> </property> </widget> </item> + <item row="1" column="2"> + <spacer name="horizontalSpacer"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>118</width> + <height>20</height> + </size> + </property> + </spacer> + </item> <item row="2" column="0"> <widget class="QLabel" name="textLabel1_5"> <property name="text"> @@ -71,7 +93,7 @@ </property> </widget> </item> - <item row="2" column="1"> + <item row="2" column="1" colspan="2"> <widget class="QLineEdit" name="emailEdit"> <property name="toolTip"> <string>Enter your email address</string> @@ -88,7 +110,7 @@ </property> </widget> </item> - <item row="3" column="1"> + <item row="3" column="1" colspan="2"> <widget class="QTextEdit" name="signatureEdit"> <property name="toolTip"> <string>Enter your email signature</string> @@ -184,7 +206,7 @@ </widget> <tabstops> <tabstop>mailServerEdit</tabstop> - <tabstop>portEdit</tabstop> + <tabstop>portSpin</tabstop> <tabstop>emailEdit</tabstop> <tabstop>signatureEdit</tabstop> <tabstop>useTlsCheckBox</tabstop> diff -Nru eric-4.4.6/eric/Preferences/__init__.py eric-4.4.7/eric/Preferences/__init__.py --- eric-4.4.6/eric/Preferences/__init__.py 2010-06-19 13:24:00.000000000 +0200 +++ eric-4.4.7/eric/Preferences/__init__.py 2010-07-30 19:02:16.000000000 +0200 @@ -1108,8 +1108,12 @@ return pwDecode(prefClass.settings.value("UI/" + key, QtCore.QVariant(prefClass.uiDefaults[key])).toString()) if key in ["VersionsUrls"]: - return prefClass.settings.value("UI/" + key, + urls = prefClass.settings.value("UI/" + key, QtCore.QVariant(prefClass.uiDefaults[key])).toStringList() + if len(urls) == 0: + return prefClass.uiDefaults[key] + else: + return urls if key in ["LogStdErrColour"]: col = prefClass.settings.value("UI/" + key) if col.isValid(): diff -Nru eric-4.4.6/eric/Preferences/ProgramsDialog.py eric-4.4.7/eric/Preferences/ProgramsDialog.py --- eric-4.4.6/eric/Preferences/ProgramsDialog.py 2010-03-28 11:22:17.000000000 +0200 +++ eric-4.4.7/eric/Preferences/ProgramsDialog.py 2010-07-18 17:57:50.000000000 +0200 @@ -22,6 +22,8 @@ import Preferences import Utilities +from eric4config import getConfig + class ProgramsDialog(QDialog, Ui_ProgramsDialog): """ Class implementing the Programs page. @@ -138,11 +140,15 @@ # 5. do the Eric4 programs # 5a. Translation Previewer self.__createProgramEntry(self.trUtf8("Eric4 Translation Previewer"), - Utilities.isWindowsPlatform() and "eric4-trpreviewer.bat" or "eric4-trpreviewer", + Utilities.isWindowsPlatform() and \ + os.path.join(getConfig("bindir"), "eric4-trpreviewer.bat") or \ + "eric4-trpreviewer", '--version', 'Eric4', -2) # 5b. Forms Previewer self.__createProgramEntry(self.trUtf8("Eric4 Forms Previewer"), - Utilities.isWindowsPlatform() and "eric4-uipreviewer.bat" or "eric4-uipreviewer", + Utilities.isWindowsPlatform() and \ + os.path.join(getConfig("bindir"), "eric4-uipreviewer.bat") or \ + "eric4-uipreviewer", '--version', 'Eric4', -2) # 6. do the CORBA programs diff -Nru eric-4.4.6/eric/Project/Project.py eric-4.4.7/eric/Project/Project.py --- eric-4.4.6/eric/Project/Project.py 2010-06-11 18:43:40.000000000 +0200 +++ eric-4.4.7/eric/Project/Project.py 2010-07-25 10:18:47.000000000 +0200 @@ -2537,10 +2537,12 @@ if fnmatch.fnmatch(ts, pattern): self.pdata["TRANSLATIONS"].append(ts) self.emit(SIGNAL('projectLanguageAdded'), ts) - if self.pdata["PROGLANGUAGE"][0] in ["Python", "Python3"]: - self.pdata["MAINSCRIPT"] = ['%s.py' % mainscriptname] - elif self.pdata["PROGLANGUAGE"][0] == "Ruby": - self.pdata["MAINSCRIPT"] = ['%s.rb' % mainscriptname] + if len(self.pdata["MAINSCRIPT"]) == 0 or \ + len(self.pdata["MAINSCRIPT"][0]) == 0: + if self.pdata["PROGLANGUAGE"][0] in ["Python", "Python3"]: + self.pdata["MAINSCRIPT"] = ['%s.py' % mainscriptname] + elif self.pdata["PROGLANGUAGE"][0] == "Ruby": + self.pdata["MAINSCRIPT"] = ['%s.rb' % mainscriptname] if self.pdata["TRANSLATIONSBINPATH"]: tpd = os.path.join(self.ppath, self.pdata["TRANSLATIONSBINPATH"][0]) diff -Nru eric-4.4.6/eric/QScintilla/Editor.py eric-4.4.7/eric/QScintilla/Editor.py --- eric-4.4.6/eric/QScintilla/Editor.py 2010-02-28 14:54:28.000000000 +0100 +++ eric-4.4.7/eric/QScintilla/Editor.py 2010-08-01 12:52:46.000000000 +0200 @@ -2560,7 +2560,8 @@ if wc is None or not useWordChars: regExp = QRegExp('[^\w_]', cs) else: - regExp = QRegExp('[^%s]' % re.escape(wc), cs) + wc = re.sub('\w', "", wc) + regExp = QRegExp('[^\w%s]' % re.escape(wc), cs) start = text.lastIndexOf(regExp, index) + 1 end = text.indexOf(regExp, index) if start == end + 1 and index > 0: @@ -3359,6 +3360,8 @@ Preferences.getEditorColour("SpellingMarkers")) self.__setSpelling() + self.setCursorFlashTime(QApplication.cursorFlashTime()) + def __setEolMode(self): """ Private method to configure the eol mode of the editor. @@ -4675,6 +4678,8 @@ self.lastModified = QFileInfo(self.fileName).lastModified() self.inReopenPrompt = False + self.setCursorFlashTime(QApplication.cursorFlashTime()) + QsciScintillaCompat.focusInEvent(self, event) def focusOutEvent(self, event): diff -Nru eric-4.4.6/eric/QScintilla/MiniEditor.py eric-4.4.7/eric/QScintilla/MiniEditor.py --- eric-4.4.6/eric/QScintilla/MiniEditor.py 2010-01-09 12:13:37.000000000 +0100 +++ eric-4.4.7/eric/QScintilla/MiniEditor.py 2010-08-01 12:53:37.000000000 +0200 @@ -73,6 +73,8 @@ except AttributeError: pass + self.setCursorFlashTime(QApplication.cursorFlashTime()) + QsciScintillaCompat.focusInEvent(self, event) def focusOutEvent(self, event): @@ -1793,6 +1795,8 @@ self.searchIndicator = QsciScintilla.INDIC_CONTAINER self.__textEdit.indicatorDefine(self.searchIndicator, QsciScintilla.INDIC_BOX, Preferences.getEditorColour("SearchMarkers")) + + self.__textEdit.setCursorFlashTime(QApplication.cursorFlashTime()) def __setEolMode(self): """ @@ -2239,7 +2243,8 @@ if wc is None: regExp = QRegExp('[^\w_]', cs) else: - regExp = QRegExp('[^%s]' % re.escape(wc), cs) + wc = re.sub('\w', "", wc) + regExp = QRegExp('[^\w%s]' % re.escape(wc), cs) start = text.lastIndexOf(regExp, index) + 1 end = text.indexOf(regExp, index) if start == end + 1 and index > 0: diff -Nru eric-4.4.6/eric/QScintilla/QsciScintillaCompat.py eric-4.4.7/eric/QScintilla/QsciScintillaCompat.py --- eric-4.4.6/eric/QScintilla/QsciScintillaCompat.py 2010-06-11 18:43:40.000000000 +0200 +++ eric-4.4.7/eric/QScintilla/QsciScintillaCompat.py 2010-08-01 12:46:48.000000000 +0200 @@ -41,6 +41,8 @@ QsciScintilla incrementally. This class ensures compatibility to older versions of QsciScintilla. """ + UserSeparator = '\x04' + def __init__(self, parent = None): """ Constructor @@ -515,6 +517,30 @@ else: return None + def getCursorFlashTime(self): + """ + Public method to get the flash (blink) time of the cursor in milliseconds. + + The flash time is the time required to display, invert and restore the + caret display. Usually the text cursor is displayed for half the cursor + flash time, then hidden for the same amount of time. + + @return flash time of the cursor in milliseconds (integer) + """ + return 2 * self.SendScintilla(QsciScintilla.SCI_GETCARETPERIOD) + + def setCursorFlashTime(self, time): + """ + Public method to get the flash (blink) time of the cursor in milliseconds. + + The flash time is the time required to display, invert and restore the + caret display. Usually the text cursor is displayed for half the cursor + flash time, then hidden for the same amount of time. + + @param time flash time of the cursor in milliseconds (integer) + """ + self.SendScintilla(QsciScintilla.SCI_SETCARETPERIOD, time // 2) + ##################################################################################### # methods to perform searches in target range ##################################################################################### @@ -902,6 +928,28 @@ except AttributeError: return QString() + ##################################################################################### + # replacements for buggy methods + ##################################################################################### + + def showUserList(self, id, lst): + """ + Public method to show a user supplied list. + + @param id id of the list (integer) + @param lst list to be show (QStringList) + """ + if id <= 0: + return + + self.SendScintilla(QsciScintilla.SCI_AUTOCSETSEPARATOR, + ord(self.UserSeparator)) + if self.isUtf8(): + lst = lst.join(self.UserSeparator).toUtf8() + else: + lst = lst.join(self.UserSeparator).toLatin1() + self.SendScintilla(QsciScintilla.SCI_USERLISTSHOW, id, lst.data()) + ## ##################################################################################### ## # methods below have been added to QScintilla starting with version after 2.x ## ##################################################################################### diff -Nru eric-4.4.6/eric/QScintilla/Shell.py eric-4.4.7/eric/QScintilla/Shell.py --- eric-4.4.6/eric/QScintilla/Shell.py 2010-02-28 14:54:30.000000000 +0100 +++ eric-4.4.7/eric/QScintilla/Shell.py 2010-07-25 11:33:33.000000000 +0200 @@ -328,6 +328,8 @@ self.useMonospaced = Preferences.getShell("UseMonospacedFont") self.__setMonospaced(self.useMonospaced) + self.setCursorFlashTime(QApplication.cursorFlashTime()) + def __setMonospaced(self, on): """ Private method to set/reset a monospaced font. @@ -1401,6 +1403,8 @@ except AttributeError: pass self.setCaretWidth(self.caretWidth) + self.setCursorFlashTime(QApplication.cursorFlashTime()) + QsciScintillaCompat.focusInEvent(self, event) def focusOutEvent(self, event): diff -Nru eric-4.4.6/eric/QScintilla/Terminal.py eric-4.4.7/eric/QScintilla/Terminal.py --- eric-4.4.6/eric/QScintilla/Terminal.py 2010-02-28 14:54:31.000000000 +0100 +++ eric-4.4.7/eric/QScintilla/Terminal.py 2010-07-25 11:33:33.000000000 +0200 @@ -331,6 +331,8 @@ self.useMonospaced = Preferences.getTerminal("UseMonospacedFont") self.__setMonospaced(self.useMonospaced) + self.setCursorFlashTime(QApplication.cursorFlashTime()) + def __setMonospaced(self, on): """ Private method to set/reset a monospaced font. @@ -901,6 +903,8 @@ except AttributeError: pass self.setCaretWidth(self.caretWidth) + self.setCursorFlashTime(QApplication.cursorFlashTime()) + QsciScintillaCompat.focusInEvent(self, event) def focusOutEvent(self, event): diff -Nru eric-4.4.6/eric/UI/Info.py eric-4.4.7/eric/UI/Info.py --- eric-4.4.6/eric/UI/Info.py 2010-07-04 09:59:50.000000000 +0200 +++ eric-4.4.7/eric/UI/Info.py 2010-08-01 17:15:29.000000000 +0200 @@ -8,7 +8,7 @@ """ Program = 'eric4' -Version = '4.4.6 (r3784)' +Version = '4.4.7 (r3805)' Copyright = 'Copyright (c) 2002 - 2010 Detlev Offenbach <det...@die-offenbachs.de>' BugAddress = 'eric4-b...@eric-ide.python-projects.org' FeatureAddress = 'eric4-featurerequ...@eric-ide.python-projects.org'