Mercurial Repositories > eric / changeset

diff -r f89fc1162ffe -r 15b4e58d61d7 DebugClients/Python/DebugBase.py
--- a/DebugClients/Python/DebugBase.py	Mon Oct 29 19:13:00 2012 +0100
+++ b/DebugClients/Python/DebugBase.py	Mon Oct 29 19:21:15 2012 +0100
@@ -144,7 +144,7 @@
     
     def profile(self, frame, event, arg):
         """
-        Public method used to trace some stuff independant of the debugger
+        Public method used to trace some stuff independent of the debugger
         trace function.
         
         @param frame The current stack frame.

diff -r f89fc1162ffe -r 15b4e58d61d7 DebugClients/Python3/DebugBase.py
--- a/DebugClients/Python3/DebugBase.py	Mon Oct 29 19:13:00 2012 +0100
+++ b/DebugClients/Python3/DebugBase.py	Mon Oct 29 19:21:15 2012 +0100
@@ -143,7 +143,7 @@
     
     def profile(self, frame, event, arg):
         """
-        Public method used to trace some stuff independant of the debugger
+        Public method used to trace some stuff independent of the debugger
         trace function.
         
         @param frame The current stack frame.

diff -r f89fc1162ffe -r 15b4e58d61d7 Documentation/Help/source.qch
Binary file Documentation/Help/source.qch has changed

diff -r f89fc1162ffe -r 15b4e58d61d7 Documentation/Help/source.qhp
--- a/Documentation/Help/source.qhp	Mon Oct 29 19:13:00 2012 +0100
+++ b/Documentation/Help/source.qhp	Mon Oct 29 19:21:15 2012 +0100
@@ -3800,6 +3800,7 @@
       <keyword name="Editor.__contextOpenRejections" id="Editor.__contextOpenRejections" ref="eric5.QScintilla.Editor.html#Editor.__contextOpenRejections" />
       <keyword name="Editor.__contextSave" id="Editor.__contextSave" ref="eric5.QScintilla.Editor.html#Editor.__contextSave" />
       <keyword name="Editor.__contextSaveAs" id="Editor.__contextSaveAs" ref="eric5.QScintilla.Editor.html#Editor.__contextSaveAs" />
+      <keyword name="Editor.__createChangeMarkerPixmap" id="Editor.__createChangeMarkerPixmap" ref="eric5.QScintilla.Editor.html#Editor.__createChangeMarkerPixmap" />
       <keyword name="Editor.__cursorPositionChanged" id="Editor.__cursorPositionChanged" ref="eric5.QScintilla.Editor.html#Editor.__cursorPositionChanged" />
       <keyword name="Editor.__deleteAllChangeMarkers" id="Editor.__deleteAllChangeMarkers" ref="eric5.QScintilla.Editor.html#Editor.__deleteAllChangeMarkers" />
       <keyword name="Editor.__deleteBreakPoints" id="Editor.__deleteBreakPoints" ref="eric5.QScintilla.Editor.html#Editor.__deleteBreakPoints" />

diff -r f89fc1162ffe -r 15b4e58d61d7 Documentation/Source/eric5.DebugClients.Python.DebugBase.html
--- a/Documentation/Source/eric5.DebugClients.Python.DebugBase.html	Mon Oct 29 19:13:00 2012 +0100
+++ b/Documentation/Source/eric5.DebugClients.Python.DebugBase.html	Mon Oct 29 19:21:15 2012 +0100
@@ -131,7 +131,7 @@
 <td>Public method to return the broken state of the debugger.</td>
 </tr><tr>
 <td><a href="#DebugBase.profile">profile</a></td>
-<td>Public method used to trace some stuff independant of the debugger trace function.</td>
+<td>Public method used to trace some stuff independent of the debugger trace function.</td>
 </tr><tr>
 <td><a href="#DebugBase.setRecursionDepth">setRecursionDepth</a></td>
 <td>Public method to determine the current recursion depth.</td>
@@ -475,7 +475,7 @@
 <h4>DebugBase.profile</h4>
 <b>profile</b>(<i>frame, event, arg</i>)
 <p>
-        Public method used to trace some stuff independant of the debugger
+        Public method used to trace some stuff independent of the debugger
         trace function.
 </p><dl>
 <dt><i>frame</i></dt>

diff -r f89fc1162ffe -r 15b4e58d61d7 Documentation/Source/eric5.DebugClients.Python3.DebugBase.html
--- a/Documentation/Source/eric5.DebugClients.Python3.DebugBase.html	Mon Oct 29 19:13:00 2012 +0100
+++ b/Documentation/Source/eric5.DebugClients.Python3.DebugBase.html	Mon Oct 29 19:21:15 2012 +0100
@@ -134,7 +134,7 @@
 <td>Public method to return the broken state of the debugger.</td>
 </tr><tr>
 <td><a href="#DebugBase.profile">profile</a></td>
-<td>Public method used to trace some stuff independant of the debugger trace function.</td>
+<td>Public method used to trace some stuff independent of the debugger trace function.</td>
 </tr><tr>
 <td><a href="#DebugBase.setRecursionDepth">setRecursionDepth</a></td>
 <td>Public method to determine the current recursion depth.</td>
@@ -489,7 +489,7 @@
 <h4>DebugBase.profile</h4>
 <b>profile</b>(<i>frame, event, arg</i>)
 <p>
-        Public method used to trace some stuff independant of the debugger
+        Public method used to trace some stuff independent of the debugger
         trace function.
 </p><dl>
 <dt><i>frame</i></dt>

diff -r f89fc1162ffe -r 15b4e58d61d7 Documentation/Source/eric5.QScintilla.Editor.html
--- a/Documentation/Source/eric5.QScintilla.Editor.html	Mon Oct 29 19:13:00 2012 +0100
+++ b/Documentation/Source/eric5.QScintilla.Editor.html	Mon Oct 29 19:21:15 2012 +0100
@@ -240,6 +240,9 @@
 <td><a href="#Editor.__contextSaveAs">__contextSaveAs</a></td>
 <td>Private slot handling the save as context menu entry.</td>
 </tr><tr>
+<td><a href="#Editor.__createChangeMarkerPixmap">__createChangeMarkerPixmap</a></td>
+<td>Private method to create a pixmap for the change markers.</td>
+</tr><tr>
 <td><a href="#Editor.__cursorPositionChanged">__cursorPositionChanged</a></td>
 <td>Private slot to handle the cursorPositionChanged signal.</td>
 </tr><tr>
@@ -1342,7 +1345,28 @@
 <b>__contextSaveAs</b>(<i></i>)
 <p>
         Private slot handling the save as context menu entry.
-</p><a NAME="Editor.__cursorPositionChanged" ID="Editor.__cursorPositionChanged"></a>
+</p><a NAME="Editor.__createChangeMarkerPixmap" ID="Editor.__createChangeMarkerPixmap"></a>
+<h4>Editor.__createChangeMarkerPixmap</h4>
+<b>__createChangeMarkerPixmap</b>(<i>key, size=16, width=4</i>)
+<p>
+        Private method to create a pixmap for the change markers.
+</p><dl>
+<dt><i>key</i></dt>
+<dd>
+key of the color to use (string)
+</dd><dt><i>size</i></dt>
+<dd>
+size of the pixmap (integer)
+</dd><dt><i>width</i></dt>
+<dd>
+width of the marker line (integer)
+</dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+create pixmap (QPixmap)
+</dd>
+</dl><a NAME="Editor.__cursorPositionChanged" ID="Editor.__cursorPositionChanged"></a>
 <h4>Editor.__cursorPositionChanged</h4>
 <b>__cursorPositionChanged</b>(<i>line, index</i>)
 <p>

diff -r f89fc1162ffe -r 15b4e58d61d7 Plugins/AboutPlugin/AboutDialog.py
--- a/Plugins/AboutPlugin/AboutDialog.py	Mon Oct 29 19:13:00 2012 +0100
+++ b/Plugins/AboutPlugin/AboutDialog.py	Mon Oct 29 19:21:15 2012 +0100
@@ -68,7 +68,7 @@
 """Phil Thompson for providing PyQt and QScintilla and pushing me into this business.
 
 Andrew Bushnell of Fluent Inc. for contributing the multithreading debugger
-and a bunch of fixes to enhance the platform independance.
+and a bunch of fixes to enhance the platform independence.
 
 Alexander Darovsky and Mikhail Terekhov for providing Russian translations.
 Julien Vienne for providing French translations.