Mon, 04 Jan 2021 15:59:40 +0100
Updated source docu.
--- a/eric6/APIs/Python3/eric6.api Mon Jan 04 15:59:22 2021 +0100 +++ b/eric6/APIs/Python3/eric6.api Mon Jan 04 15:59:40 2021 +0100 @@ -8212,6 +8212,7 @@ eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.getSelectionCount?4() eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.getSelectionN?4(index) eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.getSelections?4() +eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.getSubStyleRange?4(styleNr) eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.getVisibleLineFromDocLine?4(docLine) eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.getZoom?4() eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.gotoNextIndicator?4(indicator, wrap) @@ -8980,14 +8981,11 @@ eric6.UI.LogView.LogViewerEdit.searchPrev?4(txt, caseSensitive, wholeWord, regexp) eric6.UI.LogView.LogViewerEdit.searchStringFound?7 eric6.UI.LogView.LogViewerEdit?1(parent=None) +eric6.UI.NotificationWidget.NotificationFrame?1(icon, heading, text, parent=None) eric6.UI.NotificationWidget.NotificationWidget.mouseMoveEvent?4(evt) eric6.UI.NotificationWidget.NotificationWidget.mousePressEvent?4(evt) eric6.UI.NotificationWidget.NotificationWidget.mouseReleaseEvent?4(evt) -eric6.UI.NotificationWidget.NotificationWidget.setHeading?4(heading) -eric6.UI.NotificationWidget.NotificationWidget.setPixmap?4(icon) -eric6.UI.NotificationWidget.NotificationWidget.setText?4(text) -eric6.UI.NotificationWidget.NotificationWidget.setTimeout?4(timeout) -eric6.UI.NotificationWidget.NotificationWidget.show?4() +eric6.UI.NotificationWidget.NotificationWidget.showNotification?4(icon, heading, text, timeout=0) eric6.UI.NotificationWidget.NotificationWidget?1(parent=None, setPosition=False) eric6.UI.NumbersWidget.BinaryModel.columnCount?4(parent) eric6.UI.NumbersWidget.BinaryModel.data?4(index, role=Qt.DisplayRole)
--- a/eric6/APIs/Python3/eric6.bas Mon Jan 04 15:59:22 2021 +0100 +++ b/eric6/APIs/Python3/eric6.bas Mon Jan 04 15:59:40 2021 +0100 @@ -628,7 +628,8 @@ NewDialogClassDialog QDialog Ui_NewDialogClassDialog NewPythonPackageDialog QDialog Ui_NewPythonPackageDialog NoExtToken peg.Symbol -NotificationWidget QWidget Ui_NotificationWidget +NotificationFrame QFrame Ui_NotificationFrame +NotificationWidget QWidget NotificationsPage ConfigurationPageBase Ui_NotificationsPage NsHtmlReader QObject NsHtmlWriter QObject
--- a/eric6/Documentation/Help/source.qhp Mon Jan 04 15:59:22 2021 +0100 +++ b/eric6/Documentation/Help/source.qhp Mon Jan 04 15:59:40 2021 +0100 @@ -5613,6 +5613,7 @@ <keyword name="ExporterRTF (Module)" id="ExporterRTF (Module)" ref="eric6.QScintilla.Exporters.ExporterRTF.html" /> <keyword name="ExporterRTF.__GetRTFNextControl" id="ExporterRTF.__GetRTFNextControl" ref="eric6.QScintilla.Exporters.ExporterRTF.html#ExporterRTF.__GetRTFNextControl" /> <keyword name="ExporterRTF.__GetRTFStyleChange" id="ExporterRTF.__GetRTFStyleChange" ref="eric6.QScintilla.Exporters.ExporterRTF.html#ExporterRTF.__GetRTFStyleChange" /> + <keyword name="ExporterRTF.__prepareStyles" id="ExporterRTF.__prepareStyles" ref="eric6.QScintilla.Exporters.ExporterRTF.html#ExporterRTF.__prepareStyles" /> <keyword name="ExporterRTF.exportSource" id="ExporterRTF.exportSource" ref="eric6.QScintilla.Exporters.ExporterRTF.html#ExporterRTF.exportSource" /> <keyword name="ExporterTEX" id="ExporterTEX" ref="eric6.QScintilla.Exporters.ExporterTEX.html#ExporterTEX" /> <keyword name="ExporterTEX (Constructor)" id="ExporterTEX (Constructor)" ref="eric6.QScintilla.Exporters.ExporterTEX.html#ExporterTEX.__init__" /> @@ -10373,20 +10374,21 @@ <keyword name="NoneSplashScreen.clearMessage" id="NoneSplashScreen.clearMessage" ref="eric6.UI.SplashScreen.html#NoneSplashScreen.clearMessage" /> <keyword name="NoneSplashScreen.finish" id="NoneSplashScreen.finish" ref="eric6.UI.SplashScreen.html#NoneSplashScreen.finish" /> <keyword name="NoneSplashScreen.showMessage" id="NoneSplashScreen.showMessage" ref="eric6.UI.SplashScreen.html#NoneSplashScreen.showMessage" /> + <keyword name="NotificationFrame" id="NotificationFrame" ref="eric6.UI.NotificationWidget.html#NotificationFrame" /> + <keyword name="NotificationFrame (Constructor)" id="NotificationFrame (Constructor)" ref="eric6.UI.NotificationWidget.html#NotificationFrame.__init__" /> <keyword name="NotificationWidget" id="NotificationWidget" ref="eric6.UI.NotificationWidget.html#NotificationWidget" /> <keyword name="NotificationWidget (Constructor)" id="NotificationWidget (Constructor)" ref="eric6.UI.NotificationWidget.html#NotificationWidget.__init__" /> <keyword name="NotificationWidget (Module)" id="NotificationWidget (Module)" ref="eric6.UI.NotificationWidget.html" /> + <keyword name="NotificationWidget.__adjustSizeAndPosition" id="NotificationWidget.__adjustSizeAndPosition" ref="eric6.UI.NotificationWidget.html#NotificationWidget.__adjustSizeAndPosition" /> + <keyword name="NotificationWidget.__removeNotification" id="NotificationWidget.__removeNotification" ref="eric6.UI.NotificationWidget.html#NotificationWidget.__removeNotification" /> <keyword name="NotificationWidget.mouseMoveEvent" id="NotificationWidget.mouseMoveEvent" ref="eric6.UI.NotificationWidget.html#NotificationWidget.mouseMoveEvent" /> <keyword name="NotificationWidget.mousePressEvent" id="NotificationWidget.mousePressEvent" ref="eric6.UI.NotificationWidget.html#NotificationWidget.mousePressEvent" /> <keyword name="NotificationWidget.mouseReleaseEvent" id="NotificationWidget.mouseReleaseEvent" ref="eric6.UI.NotificationWidget.html#NotificationWidget.mouseReleaseEvent" /> - <keyword name="NotificationWidget.setHeading" id="NotificationWidget.setHeading" ref="eric6.UI.NotificationWidget.html#NotificationWidget.setHeading" /> - <keyword name="NotificationWidget.setPixmap" id="NotificationWidget.setPixmap" ref="eric6.UI.NotificationWidget.html#NotificationWidget.setPixmap" /> - <keyword name="NotificationWidget.setText" id="NotificationWidget.setText" ref="eric6.UI.NotificationWidget.html#NotificationWidget.setText" /> - <keyword name="NotificationWidget.setTimeout" id="NotificationWidget.setTimeout" ref="eric6.UI.NotificationWidget.html#NotificationWidget.setTimeout" /> - <keyword name="NotificationWidget.show" id="NotificationWidget.show" ref="eric6.UI.NotificationWidget.html#NotificationWidget.show" /> + <keyword name="NotificationWidget.showNotification" id="NotificationWidget.showNotification" ref="eric6.UI.NotificationWidget.html#NotificationWidget.showNotification" /> <keyword name="NotificationsPage" id="NotificationsPage" ref="eric6.Preferences.ConfigurationPages.NotificationsPage.html#NotificationsPage" /> <keyword name="NotificationsPage (Constructor)" id="NotificationsPage (Constructor)" ref="eric6.Preferences.ConfigurationPages.NotificationsPage.html#NotificationsPage.__init__" /> <keyword name="NotificationsPage (Module)" id="NotificationsPage (Module)" ref="eric6.Preferences.ConfigurationPages.NotificationsPage.html" /> + <keyword name="NotificationsPage.__moveNotification" id="NotificationsPage.__moveNotification" ref="eric6.Preferences.ConfigurationPages.NotificationsPage.html#NotificationsPage.__moveNotification" /> <keyword name="NotificationsPage.on_visualButton_clicked" id="NotificationsPage.on_visualButton_clicked" ref="eric6.Preferences.ConfigurationPages.NotificationsPage.html#NotificationsPage.on_visualButton_clicked" /> <keyword name="NotificationsPage.save" id="NotificationsPage.save" ref="eric6.Preferences.ConfigurationPages.NotificationsPage.html#NotificationsPage.save" /> <keyword name="NsHtmlReader" id="NsHtmlReader" ref="eric6.WebBrowser.Bookmarks.NsHtmlReader.html#NsHtmlReader" /> @@ -12201,6 +12203,7 @@ <keyword name="QsciScintillaCompat.getSelectionCount" id="QsciScintillaCompat.getSelectionCount" ref="eric6.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.getSelectionCount" /> <keyword name="QsciScintillaCompat.getSelectionN" id="QsciScintillaCompat.getSelectionN" ref="eric6.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.getSelectionN" /> <keyword name="QsciScintillaCompat.getSelections" id="QsciScintillaCompat.getSelections" ref="eric6.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.getSelections" /> + <keyword name="QsciScintillaCompat.getSubStyleRange" id="QsciScintillaCompat.getSubStyleRange" ref="eric6.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.getSubStyleRange" /> <keyword name="QsciScintillaCompat.getVisibleLineFromDocLine" id="QsciScintillaCompat.getVisibleLineFromDocLine" ref="eric6.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.getVisibleLineFromDocLine" /> <keyword name="QsciScintillaCompat.getZoom" id="QsciScintillaCompat.getZoom" ref="eric6.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.getZoom" /> <keyword name="QsciScintillaCompat.gotoNextIndicator" id="QsciScintillaCompat.gotoNextIndicator" ref="eric6.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.gotoNextIndicator" />
--- a/eric6/Documentation/Source/eric6.Preferences.ConfigurationPages.NotificationsPage.html Mon Jan 04 15:59:22 2021 +0100 +++ b/eric6/Documentation/Source/eric6.Preferences.ConfigurationPages.NotificationsPage.html Mon Jan 04 15:59:40 2021 +0100 @@ -77,6 +77,10 @@ <td>Constructor</td> </tr> <tr> +<td><a href="#NotificationsPage.__moveNotification">__moveNotification</a></td> +<td>Private slot to move the notification widget.</td> +</tr> +<tr> <td><a href="#NotificationsPage.on_visualButton_clicked">on_visualButton_clicked</a></td> <td>Private slot to select the position visually.</td> </tr> @@ -98,6 +102,13 @@ <p> Constructor </p> +<a NAME="NotificationsPage.__moveNotification" ID="NotificationsPage.__moveNotification"></a> +<h4>NotificationsPage.__moveNotification</h4> +<b>__moveNotification</b>(<i></i>) + +<p> + Private slot to move the notification widget. +</p> <a NAME="NotificationsPage.on_visualButton_clicked" ID="NotificationsPage.on_visualButton_clicked"></a> <h4>NotificationsPage.on_visualButton_clicked</h4> <b>on_visualButton_clicked</b>(<i>checked</i>)
--- a/eric6/Documentation/Source/eric6.QScintilla.Exporters.ExporterRTF.html Mon Jan 04 15:59:22 2021 +0100 +++ b/eric6/Documentation/Source/eric6.QScintilla.Exporters.ExporterRTF.html Mon Jan 04 15:59:40 2021 +0100 @@ -81,6 +81,10 @@ <td>Private method to extract control words that are different between two styles.</td> </tr> <tr> +<td><a href="#ExporterRTF.__prepareStyles">__prepareStyles</a></td> +<td>Private method to generate and store the different styles.</td> +</tr> +<tr> <td><a href="#ExporterRTF.exportSource">exportSource</a></td> <td>Public method performing the export.</td> </tr> @@ -159,6 +163,32 @@ string containing the delta between these styles (string) </dd> </dl> +<a NAME="ExporterRTF.__prepareStyles" ID="ExporterRTF.__prepareStyles"></a> +<h4>ExporterRTF.__prepareStyles</h4> +<b>__prepareStyles</b>(<i>f</i>) + +<p> + Private method to generate and store the different styles. +</p> +<dl> + +<dt><i>f</i> (object)</dt> +<dd> +filepointer to the open RTF +</dd> +</dl> +<dl> +<dt>Returns:</dt> +<dd> +styles, fontsize +</dd> +</dl> +<dl> +<dt>Return Type:</dt> +<dd> +dict, int +</dd> +</dl> <a NAME="ExporterRTF.exportSource" ID="ExporterRTF.exportSource"></a> <h4>ExporterRTF.exportSource</h4> <b>exportSource</b>(<i></i>)
--- a/eric6/Documentation/Source/eric6.QScintilla.QsciScintillaCompat.html Mon Jan 04 15:59:22 2021 +0100 +++ b/eric6/Documentation/Source/eric6.QScintilla.QsciScintillaCompat.html Mon Jan 04 15:59:40 2021 +0100 @@ -318,6 +318,10 @@ <td>Public method to get the start and end coordinates of all active selections.</td> </tr> <tr> +<td><a href="#QsciScintillaCompat.getSubStyleRange">getSubStyleRange</a></td> +<td>Public method to get the sub style range for given style number.</td> +</tr> +<tr> <td><a href="#QsciScintillaCompat.getVisibleLineFromDocLine">getVisibleLineFromDocLine</a></td> <td>Public method to convert a document line number to a visible line number (i.e.</td> </tr> @@ -1440,6 +1444,32 @@ of each active selection (list of tuples of four int) </dd> </dl> +<a NAME="QsciScintillaCompat.getSubStyleRange" ID="QsciScintillaCompat.getSubStyleRange"></a> +<h4>QsciScintillaCompat.getSubStyleRange</h4> +<b>getSubStyleRange</b>(<i>styleNr</i>) + +<p> + Public method to get the sub style range for given style number. +</p> +<dl> + +<dt><i>styleNr</i> (int)</dt> +<dd> +Number of the base style +</dd> +</dl> +<dl> +<dt>Returns:</dt> +<dd> +start index of the sub style and their count +</dd> +</dl> +<dl> +<dt>Return Type:</dt> +<dd> +int, int +</dd> +</dl> <a NAME="QsciScintillaCompat.getVisibleLineFromDocLine" ID="QsciScintillaCompat.getVisibleLineFromDocLine"></a> <h4>QsciScintillaCompat.getVisibleLineFromDocLine</h4> <b>getVisibleLineFromDocLine</b>(<i>docLine</i>)
--- a/eric6/Documentation/Source/eric6.UI.NotificationWidget.html Mon Jan 04 15:59:22 2021 +0100 +++ b/eric6/Documentation/Source/eric6.UI.NotificationWidget.html Mon Jan 04 15:59:40 2021 +0100 @@ -35,8 +35,12 @@ <table> <tr> +<td><a href="#NotificationFrame">NotificationFrame</a></td> +<td>Class implementing a Notification widget.</td> +</tr> +<tr> <td><a href="#NotificationWidget">NotificationWidget</a></td> -<td>Class implementing a Notification widget.</td> +<td>Class implementing a Notification list widget.</td> </tr> </table> <h3>Functions</h3> @@ -46,14 +50,76 @@ </table> <hr /> <hr /> -<a NAME="NotificationWidget" ID="NotificationWidget"></a> -<h2>NotificationWidget</h2> +<a NAME="NotificationFrame" ID="NotificationFrame"></a> +<h2>NotificationFrame</h2> <p> Class implementing a Notification widget. </p> <h3>Derived from</h3> -QWidget, Ui_NotificationWidget +QFrame, Ui_NotificationFrame +<h3>Class Attributes</h3> + +<table> +<tr><td>None</td></tr> +</table> +<h3>Class Methods</h3> + +<table> +<tr><td>None</td></tr> +</table> +<h3>Methods</h3> + +<table> + +<tr> +<td><a href="#NotificationFrame.__init__">NotificationFrame</a></td> +<td>Constructor</td> +</tr> +</table> +<h3>Static Methods</h3> + +<table> +<tr><td>None</td></tr> +</table> + +<a NAME="NotificationFrame.__init__" ID="NotificationFrame.__init__"></a> +<h4>NotificationFrame (Constructor)</h4> +<b>NotificationFrame</b>(<i>icon, heading, text, parent=None</i>) + +<p> + Constructor +</p> +<dl> + +<dt><i>icon</i> (QPixmap)</dt> +<dd> +icon to be used +</dd> +<dt><i>heading</i> (str)</dt> +<dd> +heading to be used +</dd> +<dt><i>text</i> (str)</dt> +<dd> +text to be used +</dd> +<dt><i>parent</i> (QWidget)</dt> +<dd> +reference to the parent widget +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /> +<hr /> +<a NAME="NotificationWidget" ID="NotificationWidget"></a> +<h2>NotificationWidget</h2> + +<p> + Class implementing a Notification list widget. +</p> +<h3>Derived from</h3> +QWidget <h3>Class Attributes</h3> <table> @@ -73,6 +139,14 @@ <td>Constructor</td> </tr> <tr> +<td><a href="#NotificationWidget.__adjustSizeAndPosition">__adjustSizeAndPosition</a></td> +<td>Private slot to adjust the notification list widget size and position.</td> +</tr> +<tr> +<td><a href="#NotificationWidget.__removeNotification">__removeNotification</a></td> +<td>Private method to remove a notification from the list.</td> +</tr> +<tr> <td><a href="#NotificationWidget.mouseMoveEvent">mouseMoveEvent</a></td> <td>Protected method to handle dragging the window.</td> </tr> @@ -85,24 +159,8 @@ <td>Protected method to handle releases of a mouse button.</td> </tr> <tr> -<td><a href="#NotificationWidget.setHeading">setHeading</a></td> -<td>Public method to set the heading for the notification.</td> -</tr> -<tr> -<td><a href="#NotificationWidget.setPixmap">setPixmap</a></td> -<td>Public method to set the icon for the notification.</td> -</tr> -<tr> -<td><a href="#NotificationWidget.setText">setText</a></td> -<td>Public method to set the text for the notification.</td> -</tr> -<tr> -<td><a href="#NotificationWidget.setTimeout">setTimeout</a></td> -<td>Public method to set the timeout for the notification.</td> -</tr> -<tr> -<td><a href="#NotificationWidget.show">show</a></td> -<td>Public method to show the notification.</td> +<td><a href="#NotificationWidget.showNotification">showNotification</a></td> +<td>Public method to show a notification.</td> </tr> </table> <h3>Static Methods</h3> @@ -120,14 +178,35 @@ </p> <dl> -<dt><i>parent</i></dt> +<dt><i>parent</i> (QWidget)</dt> <dd> -reference to the parent widget (QWidget) +reference to the parent widget </dd> -<dt><i>setPosition</i></dt> +<dt><i>setPosition</i> (bool)</dt> <dd> flag indicating to set the display - position interactively (boolean) + position interactively +</dd> +</dl> +<a NAME="NotificationWidget.__adjustSizeAndPosition" ID="NotificationWidget.__adjustSizeAndPosition"></a> +<h4>NotificationWidget.__adjustSizeAndPosition</h4> +<b>__adjustSizeAndPosition</b>(<i></i>) + +<p> + Private slot to adjust the notification list widget size and position. +</p> +<a NAME="NotificationWidget.__removeNotification" ID="NotificationWidget.__removeNotification"></a> +<h4>NotificationWidget.__removeNotification</h4> +<b>__removeNotification</b>(<i>notification</i>) + +<p> + Private method to remove a notification from the list. +</p> +<dl> + +<dt><i>notification</i> (NotificationFrame)</dt> +<dd> +reference to the notification to be removed </dd> </dl> <a NAME="NotificationWidget.mouseMoveEvent" ID="NotificationWidget.mouseMoveEvent"></a> @@ -172,69 +251,33 @@ reference to the mouse event (QMouseEvent) </dd> </dl> -<a NAME="NotificationWidget.setHeading" ID="NotificationWidget.setHeading"></a> -<h4>NotificationWidget.setHeading</h4> -<b>setHeading</b>(<i>heading</i>) +<a NAME="NotificationWidget.showNotification" ID="NotificationWidget.showNotification"></a> +<h4>NotificationWidget.showNotification</h4> +<b>showNotification</b>(<i>icon, heading, text, timeout=0</i>) <p> - Public method to set the heading for the notification. -</p> -<dl> - -<dt><i>heading</i></dt> -<dd> -heading to be used (string) -</dd> -</dl> -<a NAME="NotificationWidget.setPixmap" ID="NotificationWidget.setPixmap"></a> -<h4>NotificationWidget.setPixmap</h4> -<b>setPixmap</b>(<i>icon</i>) - -<p> - Public method to set the icon for the notification. + Public method to show a notification. </p> <dl> -<dt><i>icon</i></dt> +<dt><i>icon</i> (QPixmap)</dt> <dd> -icon to be used (QPixmap) +icon to be used +</dd> +<dt><i>heading</i> (str)</dt> +<dd> +heading to be used </dd> -</dl> -<a NAME="NotificationWidget.setText" ID="NotificationWidget.setText"></a> -<h4>NotificationWidget.setText</h4> -<b>setText</b>(<i>text</i>) - -<p> - Public method to set the text for the notification. -</p> -<dl> - -<dt><i>text</i></dt> +<dt><i>text</i> (str)</dt> <dd> -text to be used (string) +text to be used +</dd> +<dt><i>timeout</i></dt> +<dd> +timeout in seconds after which the notification is + to be removed (0 = do not remove until it is clicked on) </dd> </dl> -<a NAME="NotificationWidget.setTimeout" ID="NotificationWidget.setTimeout"></a> -<h4>NotificationWidget.setTimeout</h4> -<b>setTimeout</b>(<i>timeout</i>) - -<p> - Public method to set the timeout for the notification. -</p> -<dl> - -<dt><i>timeout</i> (int)</dt> -<dd> -timeout to be used in seconds (0 = indefinitely) -</dd> -</dl> -<a NAME="NotificationWidget.show" ID="NotificationWidget.show"></a> -<h4>NotificationWidget.show</h4> -<b>show</b>(<i></i>) - -<p> - Public method to show the notification. -</p> <div align="right"><a href="#top">Up</a></div> <hr /> </body></html> \ No newline at end of file