Mercurial Repositories > eric / changeset

--- a/APIs/Python3/eric5.api	Sun Nov 20 14:44:05 2011 +0100
+++ b/APIs/Python3/eric5.api	Sun Nov 20 14:44:50 2011 +0100
@@ -5715,6 +5715,7 @@
 eric5.QScintilla.Lexers.LexerCSharp.LexerCSharp.isStringStyle?4(style)
 eric5.QScintilla.Lexers.LexerCSharp.LexerCSharp?1(parent=None)
 eric5.QScintilla.Lexers.LexerContainer.LexerContainer.description?4(style)
+eric5.QScintilla.Lexers.LexerContainer.LexerContainer.keywords?4(kwSet)
 eric5.QScintilla.Lexers.LexerContainer.LexerContainer.language?4()
 eric5.QScintilla.Lexers.LexerContainer.LexerContainer.lexer?4()
 eric5.QScintilla.Lexers.LexerContainer.LexerContainer.styleBitsNeeded?4()

Binary file Documentation/Help/source.qch has changed

--- a/Documentation/Help/source.qhp	Sun Nov 20 14:44:05 2011 +0100
+++ b/Documentation/Help/source.qhp	Sun Nov 20 14:44:50 2011 +0100
@@ -4266,6 +4266,7 @@
       <keyword name="UserInterface.__linguist4" id="UserInterface.__linguist4" ref="eric5.UI.UserInterface.html#UserInterface.__linguist4" />
       <keyword name="UserInterface.__masterPasswordChanged" id="UserInterface.__masterPasswordChanged" ref="eric5.UI.UserInterface.html#UserInterface.__masterPasswordChanged" />
       <keyword name="UserInterface.__newProject" id="UserInterface.__newProject" ref="eric5.UI.UserInterface.html#UserInterface.__newProject" />
+      <keyword name="UserInterface.__newWindow" id="UserInterface.__newWindow" ref="eric5.UI.UserInterface.html#UserInterface.__newWindow" />
       <keyword name="UserInterface.__openMiniEditor" id="UserInterface.__openMiniEditor" ref="eric5.UI.UserInterface.html#UserInterface.__openMiniEditor" />
       <keyword name="UserInterface.__openOnStartup" id="UserInterface.__openOnStartup" ref="eric5.UI.UserInterface.html#UserInterface.__openOnStartup" />
       <keyword name="UserInterface.__pluginsConfigure" id="UserInterface.__pluginsConfigure" ref="eric5.UI.UserInterface.html#UserInterface.__pluginsConfigure" />
@@ -10859,6 +10860,7 @@
       <keyword name="LexerContainer" id="LexerContainer" ref="eric5.QScintilla.Lexers.LexerContainer.html#LexerContainer" />
       <keyword name="LexerContainer (Constructor)" id="LexerContainer (Constructor)" ref="eric5.QScintilla.Lexers.LexerContainer.html#LexerContainer.__init__" />
       <keyword name="LexerContainer.description" id="LexerContainer.description" ref="eric5.QScintilla.Lexers.LexerContainer.html#LexerContainer.description" />
+      <keyword name="LexerContainer.keywords" id="LexerContainer.keywords" ref="eric5.QScintilla.Lexers.LexerContainer.html#LexerContainer.keywords" />
       <keyword name="LexerContainer.language" id="LexerContainer.language" ref="eric5.QScintilla.Lexers.LexerContainer.html#LexerContainer.language" />
       <keyword name="LexerContainer.lexer" id="LexerContainer.lexer" ref="eric5.QScintilla.Lexers.LexerContainer.html#LexerContainer.lexer" />
       <keyword name="LexerContainer.styleBitsNeeded" id="LexerContainer.styleBitsNeeded" ref="eric5.QScintilla.Lexers.LexerContainer.html#LexerContainer.styleBitsNeeded" />

--- a/Documentation/Source/eric5.E5Gui.E5SideBar.html	Sun Nov 20 14:44:05 2011 +0100
+++ b/Documentation/Source/eric5.E5Gui.E5SideBar.html	Sun Nov 20 14:44:50 2011 +0100
@@ -241,7 +241,7 @@
 reference to the widget to add (QWidget)
 </dd><dt><i>iconOrLabel</i></dt>
 <dd>
-reference to the icon or the labeltext of the tab
+reference to the icon or the label text of the tab
             (QIcon, string)
 </dd><dt><i>label</i></dt>
 <dd>

--- a/Documentation/Source/eric5.QScintilla.Lexers.LexerContainer.html	Sun Nov 20 14:44:05 2011 +0100
+++ b/Documentation/Source/eric5.QScintilla.Lexers.LexerContainer.html	Sun Nov 20 14:44:50 2011 +0100
@@ -64,6 +64,9 @@
 <td><a href="#LexerContainer.description">description</a></td>
 <td>Public method returning the descriptions of the styles supported by the lexer.</td>
 </tr><tr>
+<td><a href="#LexerContainer.keywords">keywords</a></td>
+<td>Public method to get the keywords.</td>
+</tr><tr>
 <td><a href="#LexerContainer.language">language</a></td>
 <td>Public method returning the language of the lexer.</td>
 </tr><tr>
@@ -109,6 +112,21 @@
 <dd>
 description for the given style (string)
 </dd>
+</dl><a NAME="LexerContainer.keywords" ID="LexerContainer.keywords"></a>
+<h4>LexerContainer.keywords</h4>
+<b>keywords</b>(<i>kwSet</i>)
+<p>
+        Public method to get the keywords.
+</p><dl>
+<dt><i>kwSet</i></dt>
+<dd>
+number of the keyword set (integer)
+</dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+string giving the keywords (string) or None
+</dd>
 </dl><a NAME="LexerContainer.language" ID="LexerContainer.language"></a>
 <h4>LexerContainer.language</h4>
 <b>language</b>(<i></i>)

--- a/Documentation/Source/eric5.UI.UserInterface.html	Sun Nov 20 14:44:05 2011 +0100
+++ b/Documentation/Source/eric5.UI.UserInterface.html	Sun Nov 20 14:44:50 2011 +0100
@@ -368,6 +368,9 @@
 <td><a href="#UserInterface.__newProject">__newProject</a></td>
 <td>Private slot to handle the NewProject signal.</td>
 </tr><tr>
+<td><a href="#UserInterface.__newWindow">__newWindow</a></td>
+<td>Private slot to start a new instance of eric5.</td>
+</tr><tr>
 <td><a href="#UserInterface.__openMiniEditor">__openMiniEditor</a></td>
 <td>Private slot to show a mini editor window.</td>
 </tr><tr>
@@ -1214,6 +1217,11 @@
 <b>__newProject</b>(<i></i>)
 <p>
         Private slot to handle the NewProject signal.
+</p><a NAME="UserInterface.__newWindow" ID="UserInterface.__newWindow"></a>
+<h4>UserInterface.__newWindow</h4>
+<b>__newWindow</b>(<i></i>)
+<p>
+        Private slot to start a new instance of eric5.
 </p><a NAME="UserInterface.__openMiniEditor" ID="UserInterface.__openMiniEditor"></a>
 <h4>UserInterface.__openMiniEditor</h4>
 <b>__openMiniEditor</b>(<i></i>)