Mercurial Repositories > eric / changeset

--- a/APIs/Python3/eric5.api	Sat Oct 19 17:48:20 2013 +0200
+++ b/APIs/Python3/eric5.api	Sat Oct 19 18:06:42 2013 +0200
@@ -7072,8 +7072,50 @@
 eric5.QScintilla.Lexers.LexerPygments.LexerPygments.styleBitsNeeded?4()
 eric5.QScintilla.Lexers.LexerPygments.LexerPygments.styleText?4(start, end)
 eric5.QScintilla.Lexers.LexerPygments.LexerPygments?1(parent=None, name="")
+eric5.QScintilla.Lexers.LexerPygments.PYGMENTS_ATTRIBUTE?7
+eric5.QScintilla.Lexers.LexerPygments.PYGMENTS_BUILTIN?7
+eric5.QScintilla.Lexers.LexerPygments.PYGMENTS_CHAR?7
+eric5.QScintilla.Lexers.LexerPygments.PYGMENTS_CLASS?7
+eric5.QScintilla.Lexers.LexerPygments.PYGMENTS_COMMENT?7
+eric5.QScintilla.Lexers.LexerPygments.PYGMENTS_CONSTANT?7
+eric5.QScintilla.Lexers.LexerPygments.PYGMENTS_DECORATOR?7
+eric5.QScintilla.Lexers.LexerPygments.PYGMENTS_DEFAULT?7
+eric5.QScintilla.Lexers.LexerPygments.PYGMENTS_DELETED?7
+eric5.QScintilla.Lexers.LexerPygments.PYGMENTS_DOCSTRING?7
+eric5.QScintilla.Lexers.LexerPygments.PYGMENTS_EMPHASIZE?7
+eric5.QScintilla.Lexers.LexerPygments.PYGMENTS_ENTITY?7
+eric5.QScintilla.Lexers.LexerPygments.PYGMENTS_ERROR?7
+eric5.QScintilla.Lexers.LexerPygments.PYGMENTS_ESCAPE?7
+eric5.QScintilla.Lexers.LexerPygments.PYGMENTS_EXCEPTION?7
+eric5.QScintilla.Lexers.LexerPygments.PYGMENTS_FUNCTION?7
+eric5.QScintilla.Lexers.LexerPygments.PYGMENTS_GENERIC_ERROR?7
+eric5.QScintilla.Lexers.LexerPygments.PYGMENTS_HEADING?7
+eric5.QScintilla.Lexers.LexerPygments.PYGMENTS_HEREDOC?7
 eric5.QScintilla.Lexers.LexerPygments.PYGMENTS_INSERTED?7
+eric5.QScintilla.Lexers.LexerPygments.PYGMENTS_KEYWORD?7
+eric5.QScintilla.Lexers.LexerPygments.PYGMENTS_LABEL?7
+eric5.QScintilla.Lexers.LexerPygments.PYGMENTS_MULTILINECOMMENT?7
+eric5.QScintilla.Lexers.LexerPygments.PYGMENTS_NAMESPACE?7
+eric5.QScintilla.Lexers.LexerPygments.PYGMENTS_NUMBER?7
+eric5.QScintilla.Lexers.LexerPygments.PYGMENTS_OPERATOR?7
+eric5.QScintilla.Lexers.LexerPygments.PYGMENTS_OTHER?7
+eric5.QScintilla.Lexers.LexerPygments.PYGMENTS_OUTPUT?7
+eric5.QScintilla.Lexers.LexerPygments.PYGMENTS_PREPROCESSOR?7
+eric5.QScintilla.Lexers.LexerPygments.PYGMENTS_PROMPT?7
+eric5.QScintilla.Lexers.LexerPygments.PYGMENTS_PROPERTY?7
+eric5.QScintilla.Lexers.LexerPygments.PYGMENTS_PSEUDOKEYWORD?7
 eric5.QScintilla.Lexers.LexerPygments.PYGMENTS_PUNCTUATION?7
+eric5.QScintilla.Lexers.LexerPygments.PYGMENTS_REGEX?7
+eric5.QScintilla.Lexers.LexerPygments.PYGMENTS_SCALAR?7
+eric5.QScintilla.Lexers.LexerPygments.PYGMENTS_STRING?7
+eric5.QScintilla.Lexers.LexerPygments.PYGMENTS_STRONG?7
+eric5.QScintilla.Lexers.LexerPygments.PYGMENTS_SUBHEADING?7
+eric5.QScintilla.Lexers.LexerPygments.PYGMENTS_SYMBOL?7
+eric5.QScintilla.Lexers.LexerPygments.PYGMENTS_TAG?7
+eric5.QScintilla.Lexers.LexerPygments.PYGMENTS_TRACEBACK?7
+eric5.QScintilla.Lexers.LexerPygments.PYGMENTS_TYPEKEYWORD?7
+eric5.QScintilla.Lexers.LexerPygments.PYGMENTS_VARIABLE?7
+eric5.QScintilla.Lexers.LexerPygments.PYGMENTS_WORD?7
 eric5.QScintilla.Lexers.LexerPygments.TOKEN_MAP?7
 eric5.QScintilla.Lexers.LexerPython.LexerPython.autoCompletionWordSeparators?4()
 eric5.QScintilla.Lexers.LexerPython.LexerPython.defaultKeywords?4(kwSet)
@@ -8643,8 +8685,8 @@
 eric5.UtilitiesPython2.py2flakes.messages.UnusedImport?1(filename, lineno, name)
 eric5.UtilitiesPython2.py2flakes.messages.UnusedVariable.message?7
 eric5.UtilitiesPython2.py2flakes.messages.UnusedVariable?1(filename, lineno, names)
-eric5.VCS.CommandOptionsDialog.vcsCommandOptionsDialog.getOptions?4()
-eric5.VCS.CommandOptionsDialog.vcsCommandOptionsDialog?1(vcs, parent=None)
+eric5.VCS.CommandOptionsDialog.VcsCommandOptionsDialog.getOptions?4()
+eric5.VCS.CommandOptionsDialog.VcsCommandOptionsDialog?1(vcs, parent=None)
 eric5.VCS.ProjectBrowserHelper.VcsProjectBrowserHelper._VCSAdd?5()
 eric5.VCS.ProjectBrowserHelper.VcsProjectBrowserHelper._VCSAddTree?5()
 eric5.VCS.ProjectBrowserHelper.VcsProjectBrowserHelper._VCSCommit?5()

--- a/APIs/Python3/eric5.bas	Sat Oct 19 17:48:20 2013 +0200
+++ b/APIs/Python3/eric5.bas	Sat Oct 19 18:06:42 2013 +0200
@@ -730,6 +730,7 @@
 VariableItem QTreeWidgetItem
 VariablesFilterDialog QDialog Ui_VariablesFilterDialog
 VariablesViewer QTreeWidget
+VcsCommandOptionsDialog QDialog Ui_VcsCommandOptionsDialog
 VcsMercurialPlugin QObject
 VcsPage ConfigurationPageBase Ui_VcsPage
 VcsProjectBrowserHelper QObject
@@ -761,4 +762,3 @@
 XmlEntityResolver QXmlStreamEntityResolver
 ZoomDialog QDialog Ui_ZoomDialog
 _StrikeThroughExtension markdown.Extension
-vcsCommandOptionsDialog QDialog Ui_vcsCommandOptionsDialog

Binary file Documentation/Help/source.qch has changed

--- a/Documentation/Help/source.qhp	Sat Oct 19 17:48:20 2013 +0200
+++ b/Documentation/Help/source.qhp	Sat Oct 19 18:06:42 2013 +0200
@@ -12071,6 +12071,9 @@
       <keyword name="VariablesViewer.mouseDoubleClickEvent" id="VariablesViewer.mouseDoubleClickEvent" ref="eric5.Debugger.VariablesViewer.html#VariablesViewer.mouseDoubleClickEvent" />
       <keyword name="VariablesViewer.showVariable" id="VariablesViewer.showVariable" ref="eric5.Debugger.VariablesViewer.html#VariablesViewer.showVariable" />
       <keyword name="VariablesViewer.showVariables" id="VariablesViewer.showVariables" ref="eric5.Debugger.VariablesViewer.html#VariablesViewer.showVariables" />
+      <keyword name="VcsCommandOptionsDialog" id="VcsCommandOptionsDialog" ref="eric5.VCS.CommandOptionsDialog.html#VcsCommandOptionsDialog" />
+      <keyword name="VcsCommandOptionsDialog (Constructor)" id="VcsCommandOptionsDialog (Constructor)" ref="eric5.VCS.CommandOptionsDialog.html#VcsCommandOptionsDialog.__init__" />
+      <keyword name="VcsCommandOptionsDialog.getOptions" id="VcsCommandOptionsDialog.getOptions" ref="eric5.VCS.CommandOptionsDialog.html#VcsCommandOptionsDialog.getOptions" />
       <keyword name="VcsMercurialPlugin" id="VcsMercurialPlugin" ref="eric5.Plugins.PluginVcsMercurial.html#VcsMercurialPlugin" />
       <keyword name="VcsMercurialPlugin (Constructor)" id="VcsMercurialPlugin (Constructor)" ref="eric5.Plugins.PluginVcsMercurial.html#VcsMercurialPlugin.__init__" />
       <keyword name="VcsMercurialPlugin.activate" id="VcsMercurialPlugin.activate" ref="eric5.Plugins.PluginVcsMercurial.html#VcsMercurialPlugin.activate" />
@@ -13364,9 +13367,6 @@
       <keyword name="usage" id="usage" ref="eric5.install.html#usage" />
       <keyword name="usage" id="usage" ref="eric5.patch_modpython.html#usage" />
       <keyword name="usage" id="usage" ref="eric5.uninstall.html#usage" />
-      <keyword name="vcsCommandOptionsDialog" id="vcsCommandOptionsDialog" ref="eric5.VCS.CommandOptionsDialog.html#vcsCommandOptionsDialog" />
-      <keyword name="vcsCommandOptionsDialog (Constructor)" id="vcsCommandOptionsDialog (Constructor)" ref="eric5.VCS.CommandOptionsDialog.html#vcsCommandOptionsDialog.__init__" />
-      <keyword name="vcsCommandOptionsDialog.getOptions" id="vcsCommandOptionsDialog.getOptions" ref="eric5.VCS.CommandOptionsDialog.html#vcsCommandOptionsDialog.getOptions" />
       <keyword name="vcsMercurial (Package)" id="vcsMercurial (Package)" ref="index-eric5.Plugins.VcsPlugins.vcsMercurial.html" />
       <keyword name="vcsPySvn (Package)" id="vcsPySvn (Package)" ref="index-eric5.Plugins.VcsPlugins.vcsPySvn.html" />
       <keyword name="vcsSubversion (Package)" id="vcsSubversion (Package)" ref="index-eric5.Plugins.VcsPlugins.vcsSubversion.html" />

--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.subversion.html	Sat Oct 19 17:48:20 2013 +0200
+++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.subversion.html	Sat Oct 19 18:06:42 2013 +0200
@@ -923,7 +923,7 @@
         Subversion repository.
 </p><p>
         If name is a directory and is the project directory, all project files
-        are saved first. If name is a file (or list of files), which is/are 
+        are saved first. If name is a file (or list of files), which is/are
         being edited and has unsaved modification, they can be saved or the
         operation may be aborted.
 </p><dl>

--- a/Documentation/Source/eric5.QScintilla.Lexers.Lexer.html	Sat Oct 19 17:48:20 2013 +0200
+++ b/Documentation/Source/eric5.QScintilla.Lexers.Lexer.html	Sat Oct 19 18:06:42 2013 +0200
@@ -149,7 +149,7 @@
 <h4>Lexer.canBlockComment</h4>
 <b>canBlockComment</b>(<i></i>)
 <p>
-        Public method to determine, whether the lexer language supports a 
+        Public method to determine, whether the lexer language supports a
         block comment.
 </p><dl>
 <dt>Returns:</dt>

--- a/Documentation/Source/eric5.QScintilla.Lexers.LexerPygments.html	Sat Oct 19 17:48:20 2013 +0200
+++ b/Documentation/Source/eric5.QScintilla.Lexers.LexerPygments.html	Sat Oct 19 18:06:42 2013 +0200
@@ -25,7 +25,7 @@
 </p>
 <h3>Global Attributes</h3>
 <table>
-<tr><td>PYGMENTS_INSERTED</td></tr><tr><td>PYGMENTS_PUNCTUATION</td></tr><tr><td>TOKEN_MAP</td></tr>
+<tr><td>PYGMENTS_ATTRIBUTE</td></tr><tr><td>PYGMENTS_BUILTIN</td></tr><tr><td>PYGMENTS_CHAR</td></tr><tr><td>PYGMENTS_CLASS</td></tr><tr><td>PYGMENTS_COMMENT</td></tr><tr><td>PYGMENTS_CONSTANT</td></tr><tr><td>PYGMENTS_DECORATOR</td></tr><tr><td>PYGMENTS_DEFAULT</td></tr><tr><td>PYGMENTS_DELETED</td></tr><tr><td>PYGMENTS_DOCSTRING</td></tr><tr><td>PYGMENTS_EMPHASIZE</td></tr><tr><td>PYGMENTS_ENTITY</td></tr><tr><td>PYGMENTS_ERROR</td></tr><tr><td>PYGMENTS_ESCAPE</td></tr><tr><td>PYGMENTS_EXCEPTION</td></tr><tr><td>PYGMENTS_FUNCTION</td></tr><tr><td>PYGMENTS_GENERIC_ERROR</td></tr><tr><td>PYGMENTS_HEADING</td></tr><tr><td>PYGMENTS_HEREDOC</td></tr><tr><td>PYGMENTS_INSERTED</td></tr><tr><td>PYGMENTS_KEYWORD</td></tr><tr><td>PYGMENTS_LABEL</td></tr><tr><td>PYGMENTS_MULTILINECOMMENT</td></tr><tr><td>PYGMENTS_NAMESPACE</td></tr><tr><td>PYGMENTS_NUMBER</td></tr><tr><td>PYGMENTS_OPERATOR</td></tr><tr><td>PYGMENTS_OTHER</td></tr><tr><td>PYGMENTS_OUTPUT</td></tr><tr><td>PYGMENTS_PREPROCESSOR</td></tr><tr><td>PYGMENTS_PROMPT</td></tr><tr><td>PYGMENTS_PROPERTY</td></tr><tr><td>PYGMENTS_PSEUDOKEYWORD</td></tr><tr><td>PYGMENTS_PUNCTUATION</td></tr><tr><td>PYGMENTS_REGEX</td></tr><tr><td>PYGMENTS_SCALAR</td></tr><tr><td>PYGMENTS_STRING</td></tr><tr><td>PYGMENTS_STRONG</td></tr><tr><td>PYGMENTS_SUBHEADING</td></tr><tr><td>PYGMENTS_SYMBOL</td></tr><tr><td>PYGMENTS_TAG</td></tr><tr><td>PYGMENTS_TRACEBACK</td></tr><tr><td>PYGMENTS_TYPEKEYWORD</td></tr><tr><td>PYGMENTS_VARIABLE</td></tr><tr><td>PYGMENTS_WORD</td></tr><tr><td>TOKEN_MAP</td></tr>
 </table>
 <h3>Classes</h3>
 <table>

--- a/Documentation/Source/eric5.VCS.CommandOptionsDialog.html	Sat Oct 19 17:48:20 2013 +0200
+++ b/Documentation/Source/eric5.VCS.CommandOptionsDialog.html	Sat Oct 19 18:06:42 2013 +0200
@@ -30,7 +30,7 @@
 <h3>Classes</h3>
 <table>
 <tr>
-<td><a href="#vcsCommandOptionsDialog">vcsCommandOptionsDialog</a></td>
+<td><a href="#VcsCommandOptionsDialog">VcsCommandOptionsDialog</a></td>
 <td>Class implementing the VCS command options dialog.</td>
 </tr>
 </table>
@@ -39,13 +39,13 @@
 <tr><td>None</td></tr>
 </table>
 <hr /><hr />
-<a NAME="vcsCommandOptionsDialog" ID="vcsCommandOptionsDialog"></a>
-<h2>vcsCommandOptionsDialog</h2>
+<a NAME="VcsCommandOptionsDialog" ID="VcsCommandOptionsDialog"></a>
+<h2>VcsCommandOptionsDialog</h2>
 <p>
     Class implementing the VCS command options dialog.
 </p>
 <h3>Derived from</h3>
-QDialog, Ui_vcsCommandOptionsDialog
+QDialog, Ui_VcsCommandOptionsDialog
 <h3>Class Attributes</h3>
 <table>
 <tr><td>None</td></tr>
@@ -57,10 +57,10 @@
 <h3>Methods</h3>
 <table>
 <tr>
-<td><a href="#vcsCommandOptionsDialog.__init__">vcsCommandOptionsDialog</a></td>
+<td><a href="#VcsCommandOptionsDialog.__init__">VcsCommandOptionsDialog</a></td>
 <td>Constructor</td>
 </tr><tr>
-<td><a href="#vcsCommandOptionsDialog.getOptions">getOptions</a></td>
+<td><a href="#VcsCommandOptionsDialog.getOptions">getOptions</a></td>
 <td>Public method used to retrieve the entered options.</td>
 </tr>
 </table>
@@ -68,9 +68,9 @@
 <table>
 <tr><td>None</td></tr>
 </table>
-<a NAME="vcsCommandOptionsDialog.__init__" ID="vcsCommandOptionsDialog.__init__"></a>
-<h4>vcsCommandOptionsDialog (Constructor)</h4>
-<b>vcsCommandOptionsDialog</b>(<i>vcs, parent=None</i>)
+<a NAME="VcsCommandOptionsDialog.__init__" ID="VcsCommandOptionsDialog.__init__"></a>
+<h4>VcsCommandOptionsDialog (Constructor)</h4>
+<b>VcsCommandOptionsDialog</b>(<i>vcs, parent=None</i>)
 <p>
         Constructor
 </p><dl>
@@ -81,8 +81,8 @@
 <dd>
 parent widget (QWidget)
 </dd>
-</dl><a NAME="vcsCommandOptionsDialog.getOptions" ID="vcsCommandOptionsDialog.getOptions"></a>
-<h4>vcsCommandOptionsDialog.getOptions</h4>
+</dl><a NAME="VcsCommandOptionsDialog.getOptions" ID="VcsCommandOptionsDialog.getOptions"></a>
+<h4>VcsCommandOptionsDialog.getOptions</h4>
 <b>getOptions</b>(<i></i>)
 <p>
         Public method used to retrieve the entered options.

--- a/QScintilla/Lexers/LexerPygments.py	Sat Oct 19 17:48:20 2013 +0200
+++ b/QScintilla/Lexers/LexerPygments.py	Sat Oct 19 18:06:42 2013 +0200
@@ -18,51 +18,51 @@
 
 import Utilities
 
-(PYGMENTS_DEFAULT,
- PYGMENTS_COMMENT,
- PYGMENTS_PREPROCESSOR,
- PYGMENTS_KEYWORD,
- PYGMENTS_PSEUDOKEYWORD,
- PYGMENTS_TYPEKEYWORD,
- PYGMENTS_OPERATOR,
- PYGMENTS_WORD,
- PYGMENTS_BUILTIN,
- PYGMENTS_FUNCTION,
- PYGMENTS_CLASS,
- PYGMENTS_NAMESPACE,
- PYGMENTS_EXCEPTION,
- PYGMENTS_VARIABLE,
- PYGMENTS_CONSTANT,
- PYGMENTS_LABEL,
- PYGMENTS_ENTITY,
- PYGMENTS_ATTRIBUTE,
- PYGMENTS_TAG,
- PYGMENTS_DECORATOR,
- PYGMENTS_STRING,
- PYGMENTS_DOCSTRING,
- PYGMENTS_SCALAR,
- PYGMENTS_ESCAPE,
- PYGMENTS_REGEX,
- PYGMENTS_SYMBOL,
- PYGMENTS_OTHER,
- PYGMENTS_NUMBER,
- PYGMENTS_HEADING,
- PYGMENTS_SUBHEADING,
- PYGMENTS_DELETED,
- PYGMENTS_INSERTED) = list(range(32))
+PYGMENTS_DEFAULT = 0
+PYGMENTS_COMMENT = 1
+PYGMENTS_PREPROCESSOR = 2
+PYGMENTS_KEYWORD = 3
+PYGMENTS_PSEUDOKEYWORD = 4
+PYGMENTS_TYPEKEYWORD = 5
+PYGMENTS_OPERATOR = 6
+PYGMENTS_WORD = 7
+PYGMENTS_BUILTIN = 8
+PYGMENTS_FUNCTION = 9
+PYGMENTS_CLASS = 10
+PYGMENTS_NAMESPACE = 11
+PYGMENTS_EXCEPTION = 12
+PYGMENTS_VARIABLE = 13
+PYGMENTS_CONSTANT = 14
+PYGMENTS_LABEL = 15
+PYGMENTS_ENTITY = 16
+PYGMENTS_ATTRIBUTE = 17
+PYGMENTS_TAG = 18
+PYGMENTS_DECORATOR = 19
+PYGMENTS_STRING = 20
+PYGMENTS_DOCSTRING = 21
+PYGMENTS_SCALAR = 22
+PYGMENTS_ESCAPE = 23
+PYGMENTS_REGEX = 24
+PYGMENTS_SYMBOL = 25
+PYGMENTS_OTHER = 26
+PYGMENTS_NUMBER = 27
+PYGMENTS_HEADING = 28
+PYGMENTS_SUBHEADING = 29
+PYGMENTS_DELETED = 30
+PYGMENTS_INSERTED = 31
 # 32 to 39 are reserved for QScintilla internal styles
-(PYGMENTS_GENERIC_ERROR,
- PYGMENTS_EMPHASIZE,
- PYGMENTS_STRONG,
- PYGMENTS_PROMPT,
- PYGMENTS_OUTPUT,
- PYGMENTS_TRACEBACK,
- PYGMENTS_ERROR,
- PYGMENTS_MULTILINECOMMENT,
- PYGMENTS_PROPERTY,
- PYGMENTS_CHAR,
- PYGMENTS_HEREDOC,
- PYGMENTS_PUNCTUATION) = list(range(40, 52))
+PYGMENTS_GENERIC_ERROR = 40
+PYGMENTS_EMPHASIZE = 41
+PYGMENTS_STRONG = 42
+PYGMENTS_PROMPT = 43
+PYGMENTS_OUTPUT = 44
+PYGMENTS_TRACEBACK = 45
+PYGMENTS_ERROR = 46
+PYGMENTS_MULTILINECOMMENT = 47
+PYGMENTS_PROPERTY = 48
+PYGMENTS_CHAR = 49
+PYGMENTS_HEREDOC = 50
+PYGMENTS_PUNCTUATION = 51
 
 #-----------------------------------------------------------------------------#