Fri, 03 Sep 2010 20:06:18 +0200
Updated source docu.
--- a/APIs/Python3/eric5.api Fri Sep 03 20:04:49 2010 +0200 +++ b/APIs/Python3/eric5.api Fri Sep 03 20:06:18 2010 +0200 @@ -1151,6 +1151,50 @@ eric5.E5Gui.E5ListView.E5ListView.keyPressEvent?4(evt) eric5.E5Gui.E5ListView.E5ListView.removeAll?4() eric5.E5Gui.E5ListView.E5ListView.removeSelected?4() +eric5.E5Gui.E5MessageBox.Abort?7 +eric5.E5Gui.E5MessageBox.AcceptRole?7 +eric5.E5Gui.E5MessageBox.ActionRole?7 +eric5.E5Gui.E5MessageBox.Apply?7 +eric5.E5Gui.E5MessageBox.ApplyRole?7 +eric5.E5Gui.E5MessageBox.Cancel?7 +eric5.E5Gui.E5MessageBox.Close?7 +eric5.E5Gui.E5MessageBox.Critical?7 +eric5.E5Gui.E5MessageBox.DestructiveRole?7 +eric5.E5Gui.E5MessageBox.Discard?7 +eric5.E5Gui.E5MessageBox.E5MessageBox?1(icon, title, text, modal = False, buttons = QMessageBox.StandardButtons(QMessageBox.NoButton), parent = None) +eric5.E5Gui.E5MessageBox.Help?7 +eric5.E5Gui.E5MessageBox.HelpRole?7 +eric5.E5Gui.E5MessageBox.Ignore?7 +eric5.E5Gui.E5MessageBox.Information?7 +eric5.E5Gui.E5MessageBox.InvalidRole?7 +eric5.E5Gui.E5MessageBox.No?7 +eric5.E5Gui.E5MessageBox.NoButton?7 +eric5.E5Gui.E5MessageBox.NoRole?7 +eric5.E5Gui.E5MessageBox.NoToAll?7 +eric5.E5Gui.E5MessageBox.Ok?7 +eric5.E5Gui.E5MessageBox.Open?7 +eric5.E5Gui.E5MessageBox.Question?7 +eric5.E5Gui.E5MessageBox.RejectRole?7 +eric5.E5Gui.E5MessageBox.Reset?7 +eric5.E5Gui.E5MessageBox.ResetRole?7 +eric5.E5Gui.E5MessageBox.RestoreDefaults?7 +eric5.E5Gui.E5MessageBox.Retry?7 +eric5.E5Gui.E5MessageBox.Save?7 +eric5.E5Gui.E5MessageBox.SaveAll?7 +eric5.E5Gui.E5MessageBox.StandardButtons?7 +eric5.E5Gui.E5MessageBox.Warning?7 +eric5.E5Gui.E5MessageBox.Yes?7 +eric5.E5Gui.E5MessageBox.YesRole?7 +eric5.E5Gui.E5MessageBox.YesToAll?7 +eric5.E5Gui.E5MessageBox.about?7 +eric5.E5Gui.E5MessageBox.aboutQt?7 +eric5.E5Gui.E5MessageBox.critical?4(parent, title, text, buttons = QMessageBox.Ok, defaultButton = QMessageBox.NoButton) +eric5.E5Gui.E5MessageBox.information?4(parent, title, text, buttons = QMessageBox.Ok, defaultButton = QMessageBox.NoButton) +eric5.E5Gui.E5MessageBox.okToClearData?4(parent, title, text, saveFunc) +eric5.E5Gui.E5MessageBox.question?4(parent, title, text, buttons = QMessageBox.Ok, defaultButton = QMessageBox.NoButton) +eric5.E5Gui.E5MessageBox.retryAbort?4(parent, title, text, icon = Question) +eric5.E5Gui.E5MessageBox.warning?4(parent, title, text, buttons = QMessageBox.Ok, defaultButton = QMessageBox.NoButton) +eric5.E5Gui.E5MessageBox.yesNo?4(parent, title, text, icon = Question, yesDefault = False) eric5.E5Gui.E5ModelMenu.E5ModelMenu.activated?7 eric5.E5Gui.E5ModelMenu.E5ModelMenu.createBaseMenu?4() eric5.E5Gui.E5ModelMenu.E5ModelMenu.createMenu?4(parent, max_, parentMenu = None, menu = None) @@ -6277,7 +6321,7 @@ eric5.VCS.VersionControl.VersionControl.vcsSwitch?4(name) eric5.VCS.VersionControl.VersionControl.vcsTag?4(name) eric5.VCS.VersionControl.VersionControl.vcsUpdate?4(name, noDialog = False) -eric5.VCS.VersionControl.VersionControl?1(parent=None, name=None) +eric5.VCS.VersionControl.VersionControl?1(parent = None, name = None) eric5.VCS.factory?4(vcs) eric5.ViewManager.BookmarkedFilesDialog.BookmarkedFilesDialog.getBookmarkedFiles?4() eric5.ViewManager.BookmarkedFilesDialog.BookmarkedFilesDialog.on_addButton_clicked?4()
--- a/Documentation/Help/source.qhp Fri Sep 03 20:04:49 2010 +0200 +++ b/Documentation/Help/source.qhp Fri Sep 03 20:06:18 2010 +0200 @@ -119,6 +119,7 @@ <section title="eric5.E5Gui.E5Led" ref="eric5.E5Gui.E5Led.html" /> <section title="eric5.E5Gui.E5LineEdit" ref="eric5.E5Gui.E5LineEdit.html" /> <section title="eric5.E5Gui.E5ListView" ref="eric5.E5Gui.E5ListView.html" /> + <section title="eric5.E5Gui.E5MessageBox" ref="eric5.E5Gui.E5MessageBox.html" /> <section title="eric5.E5Gui.E5ModelMenu" ref="eric5.E5Gui.E5ModelMenu.html" /> <section title="eric5.E5Gui.E5ModelToolBar" ref="eric5.E5Gui.E5ModelToolBar.html" /> <section title="eric5.E5Gui.E5SideBar" ref="eric5.E5Gui.E5SideBar.html" /> @@ -4439,6 +4440,17 @@ <keyword name="E5TreeSortFilterProxyModel (Constructor)" id="E5TreeSortFilterProxyModel (Constructor)" ref="eric5.E5Gui.E5TreeSortFilterProxyModel.html#E5TreeSortFilterProxyModel.__init__" /> <keyword name="E5TreeSortFilterProxyModel.filterAcceptsRow" id="E5TreeSortFilterProxyModel.filterAcceptsRow" ref="eric5.E5Gui.E5TreeSortFilterProxyModel.html#E5TreeSortFilterProxyModel.filterAcceptsRow" /> <keyword name="E5TreeSortFilterProxyModel.hasChildren" id="E5TreeSortFilterProxyModel.hasChildren" ref="eric5.E5Gui.E5TreeSortFilterProxyModel.html#E5TreeSortFilterProxyModel.hasChildren" /> + <keyword name="E5MessageBox (Module)" id="E5MessageBox (Module)" ref="eric5.E5Gui.E5MessageBox.html" /> + <keyword name="E5MessageBox" id="E5MessageBox" ref="eric5.E5Gui.E5MessageBox.html#E5MessageBox" /> + <keyword name="__messageBox" id="__messageBox" ref="eric5.E5Gui.E5MessageBox.html#__messageBox" /> + <keyword name="critical" id="critical" ref="eric5.E5Gui.E5MessageBox.html#critical" /> + <keyword name="information" id="information" ref="eric5.E5Gui.E5MessageBox.html#information" /> + <keyword name="okToClearData" id="okToClearData" ref="eric5.E5Gui.E5MessageBox.html#okToClearData" /> + <keyword name="question" id="question" ref="eric5.E5Gui.E5MessageBox.html#question" /> + <keyword name="retryAbort" id="retryAbort" ref="eric5.E5Gui.E5MessageBox.html#retryAbort" /> + <keyword name="warning" id="warning" ref="eric5.E5Gui.E5MessageBox.html#warning" /> + <keyword name="yesNo" id="yesNo" ref="eric5.E5Gui.E5MessageBox.html#yesNo" /> + <keyword name="E5MessageBox (Constructor)" id="E5MessageBox (Constructor)" ref="eric5.E5Gui.E5MessageBox.html#E5MessageBox.__init__" /> <keyword name="E5TabWidget (Module)" id="E5TabWidget (Module)" ref="eric5.E5Gui.E5TabWidget.html" /> <keyword name="E5DnDTabBar" id="E5DnDTabBar" ref="eric5.E5Gui.E5TabWidget.html#E5DnDTabBar" /> <keyword name="E5TabWidget" id="E5TabWidget" ref="eric5.E5Gui.E5TabWidget.html#E5TabWidget" /> @@ -9857,6 +9869,7 @@ <file>eric5.E5Gui.E5Led.html</file> <file>eric5.E5Gui.E5LineEdit.html</file> <file>eric5.E5Gui.E5ListView.html</file> + <file>eric5.E5Gui.E5MessageBox.html</file> <file>eric5.E5Gui.E5ModelMenu.html</file> <file>eric5.E5Gui.E5ModelToolBar.html</file> <file>eric5.E5Gui.E5SideBar.html</file>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Documentation/Source/eric5.E5Gui.E5MessageBox.html Fri Sep 03 20:06:18 2010 +0200 @@ -0,0 +1,367 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' +'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'> +<html><head> +<title>eric5.E5Gui.E5MessageBox</title> +<style> +body { + background: #EDECE6; + margin: 0em 1em 10em 1em; + color: black; +} + +h1 { color: white; background: #85774A; } +h2 { color: white; background: #85774A; } +h3 { color: white; background: #9D936E; } +h4 { color: white; background: #9D936E; } + +a { color: #BA6D36; } + +</style> +</head> +<body><a NAME="top" ID="top"></a> +<h1>eric5.E5Gui.E5MessageBox</h1> +<p> +Module implementing QMessageBox replacements and more convenience function. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>Abort</td></tr><tr><td>AcceptRole</td></tr><tr><td>ActionRole</td></tr><tr><td>Apply</td></tr><tr><td>ApplyRole</td></tr><tr><td>Cancel</td></tr><tr><td>Close</td></tr><tr><td>Critical</td></tr><tr><td>DestructiveRole</td></tr><tr><td>Discard</td></tr><tr><td>Help</td></tr><tr><td>HelpRole</td></tr><tr><td>Ignore</td></tr><tr><td>Information</td></tr><tr><td>InvalidRole</td></tr><tr><td>No</td></tr><tr><td>NoButton</td></tr><tr><td>NoRole</td></tr><tr><td>NoToAll</td></tr><tr><td>Ok</td></tr><tr><td>Open</td></tr><tr><td>Question</td></tr><tr><td>RejectRole</td></tr><tr><td>Reset</td></tr><tr><td>ResetRole</td></tr><tr><td>RestoreDefaults</td></tr><tr><td>Retry</td></tr><tr><td>Save</td></tr><tr><td>SaveAll</td></tr><tr><td>StandardButtons</td></tr><tr><td>Warning</td></tr><tr><td>Yes</td></tr><tr><td>YesRole</td></tr><tr><td>YesToAll</td></tr><tr><td>about</td></tr><tr><td>aboutQt</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#E5MessageBox">E5MessageBox</a></td> +<td>Class implementing a replacement for QMessageBox.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr> +<td><a href="#__messageBox">__messageBox</a></td> +<td>Private module function to show a modal message box.</td> +</tr><tr> +<td><a href="#critical">critical</a></td> +<td>Function to show a modal critical message box.</td> +</tr><tr> +<td><a href="#information">information</a></td> +<td>Function to show a modal information message box.</td> +</tr><tr> +<td><a href="#okToClearData">okToClearData</a></td> +<td>Function to show a model message box to ask for clearing the data.</td> +</tr><tr> +<td><a href="#question">question</a></td> +<td>Function to show a modal question message box.</td> +</tr><tr> +<td><a href="#retryAbort">retryAbort</a></td> +<td>Function to show a model abort/retry message box.</td> +</tr><tr> +<td><a href="#warning">warning</a></td> +<td>Function to show a modal warning message box.</td> +</tr><tr> +<td><a href="#yesNo">yesNo</a></td> +<td>Function to show a model yes/no message box.</td> +</tr> +</table> +<hr /><hr /> +<a NAME="E5MessageBox" ID="E5MessageBox"></a> +<h2>E5MessageBox</h2> +<p> + Class implementing a replacement for QMessageBox. +</p> +<h3>Derived from</h3> +QMessageBox +<h3>Class Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Methods</h3> +<table> +<tr> +<td><a href="#E5MessageBox.__init__">E5MessageBox</a></td> +<td>Constructor</td> +</tr> +</table> +<a NAME="E5MessageBox.__init__" ID="E5MessageBox.__init__"></a> +<h4>E5MessageBox (Constructor)</h4> +<b>E5MessageBox</b>(<i>icon, title, text, modal = False, buttons = QMessageBox.StandardButtons(QMessageBox.NoButton), parent = None</i>) +<p> + Constructor +</p><dl> +<dt><i>icon</i></dt> +<dd> +type of icon to be shown (QMessageBox.Icon) +</dd><dt><i>title</i></dt> +<dd> +caption of the message box (string) +</dd><dt><i>text</i></dt> +<dd> +text to be shown by the message box (string) +</dd><dt><i>modal=</i></dt> +<dd> +flag indicating a modal dialog (boolean) +</dd><dt><i>buttons=</i></dt> +<dd> +set of standard buttons to generate (StandardButtons) +</dd><dt><i>parent=</i></dt> +<dd> +parent widget of the message box (QWidget) +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> +<a NAME="__messageBox" ID="__messageBox"></a> +<h2>__messageBox</h2> +<b>__messageBox</b>(<i>parent, title, text, icon, buttons = QMessageBox.Ok, defaultButton = QMessageBox.NoButton</i>) +<p> + Private module function to show a modal message box. +</p><dl> +<dt><i>parent</i></dt> +<dd> +parent widget of the message box (QWidget) +</dd><dt><i>title</i></dt> +<dd> +caption of the message box (string) +</dd><dt><i>text</i></dt> +<dd> +text to be shown by the message box (string) +</dd><dt><i>icon</i></dt> +<dd> +type of icon to be shown (QMessageBox.Icon) +</dd><dt><i>buttons</i></dt> +<dd> +flags indicating which buttons to show + (QMessageBox.StandardButtons) +</dd><dt><i>defaultButton</i></dt> +<dd> +flag indicating the default button + (QMessageBox.StandardButton) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +button pressed by the user + (QMessageBox.StandardButton) +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> +<a NAME="critical" ID="critical"></a> +<h2>critical</h2> +<b>critical</b>(<i>parent, title, text, buttons = QMessageBox.Ok, defaultButton = QMessageBox.NoButton</i>) +<p> + Function to show a modal critical message box. +</p><dl> +<dt><i>parent</i></dt> +<dd> +parent widget of the message box (QWidget) +</dd><dt><i>title</i></dt> +<dd> +caption of the message box (string) +</dd><dt><i>text</i></dt> +<dd> +text to be shown by the message box (string) +</dd><dt><i>buttons</i></dt> +<dd> +flags indicating which buttons to show + (QMessageBox.StandardButtons) +</dd><dt><i>defaultButton</i></dt> +<dd> +flag indicating the default button + (QMessageBox.StandardButton) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +button pressed by the user + (QMessageBox.StandardButton) +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> +<a NAME="information" ID="information"></a> +<h2>information</h2> +<b>information</b>(<i>parent, title, text, buttons = QMessageBox.Ok, defaultButton = QMessageBox.NoButton</i>) +<p> + Function to show a modal information message box. +</p><dl> +<dt><i>parent</i></dt> +<dd> +parent widget of the message box (QWidget) +</dd><dt><i>title</i></dt> +<dd> +caption of the message box (string) +</dd><dt><i>text</i></dt> +<dd> +text to be shown by the message box (string) +</dd><dt><i>buttons</i></dt> +<dd> +flags indicating which buttons to show + (QMessageBox.StandardButtons) +</dd><dt><i>defaultButton</i></dt> +<dd> +flag indicating the default button + (QMessageBox.StandardButton) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +button pressed by the user + (QMessageBox.StandardButton) +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> +<a NAME="okToClearData" ID="okToClearData"></a> +<h2>okToClearData</h2> +<b>okToClearData</b>(<i>parent, title, text, saveFunc</i>) +<p> + Function to show a model message box to ask for clearing the data. +</p><dl> +<dt><i>parent</i></dt> +<dd> +parent widget of the message box (QWidget) +</dd><dt><i>title</i></dt> +<dd> +caption of the message box (string) +</dd><dt><i>text</i></dt> +<dd> +text to be shown by the message box (string) +</dd><dt><i>saveFunc</i></dt> +<dd> +reference to a function performing the save action. It + must be a parameterless function returning a flag indicating success. +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +flag indicating that it is ok to clear the data (boolean) +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> +<a NAME="question" ID="question"></a> +<h2>question</h2> +<b>question</b>(<i>parent, title, text, buttons = QMessageBox.Ok, defaultButton = QMessageBox.NoButton</i>) +<p> + Function to show a modal question message box. +</p><dl> +<dt><i>parent</i></dt> +<dd> +parent widget of the message box (QWidget) +</dd><dt><i>title</i></dt> +<dd> +caption of the message box (string) +</dd><dt><i>text</i></dt> +<dd> +text to be shown by the message box (string) +</dd><dt><i>buttons</i></dt> +<dd> +flags indicating which buttons to show + (QMessageBox.StandardButtons) +</dd><dt><i>defaultButton</i></dt> +<dd> +flag indicating the default button + (QMessageBox.StandardButton) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +button pressed by the user + (QMessageBox.StandardButton) +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> +<a NAME="retryAbort" ID="retryAbort"></a> +<h2>retryAbort</h2> +<b>retryAbort</b>(<i>parent, title, text, icon = Question</i>) +<p> + Function to show a model abort/retry message box. +</p><dl> +<dt><i>parent</i></dt> +<dd> +parent widget of the message box (QWidget) +</dd><dt><i>title</i></dt> +<dd> +caption of the message box (string) +</dd><dt><i>text</i></dt> +<dd> +text to be shown by the message box (string) +</dd><dt><i>icon=</i></dt> +<dd> +icon for the dialog (Critical, Information, Question or Warning) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +flag indicating the selection of the Retry button (boolean) +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> +<a NAME="warning" ID="warning"></a> +<h2>warning</h2> +<b>warning</b>(<i>parent, title, text, buttons = QMessageBox.Ok, defaultButton = QMessageBox.NoButton</i>) +<p> + Function to show a modal warning message box. +</p><dl> +<dt><i>parent</i></dt> +<dd> +parent widget of the message box (QWidget) +</dd><dt><i>title</i></dt> +<dd> +caption of the message box (string) +</dd><dt><i>text</i></dt> +<dd> +text to be shown by the message box (string) +</dd><dt><i>buttons</i></dt> +<dd> +flags indicating which buttons to show + (QMessageBox.StandardButtons) +</dd><dt><i>defaultButton</i></dt> +<dd> +flag indicating the default button + (QMessageBox.StandardButton) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +button pressed by the user + (QMessageBox.StandardButton) +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> +<a NAME="yesNo" ID="yesNo"></a> +<h2>yesNo</h2> +<b>yesNo</b>(<i>parent, title, text, icon = Question, yesDefault = False</i>) +<p> + Function to show a model yes/no message box. +</p><dl> +<dt><i>parent</i></dt> +<dd> +parent widget of the message box (QWidget) +</dd><dt><i>title</i></dt> +<dd> +caption of the message box (string) +</dd><dt><i>text</i></dt> +<dd> +text to be shown by the message box (string) +</dd><dt><i>icon=</i></dt> +<dd> +icon for the dialog (Critical, Information, Question or Warning) +</dd><dt><i>yesDefault=</i></dt> +<dd> +flag indicating that the Yes button should be the default + button (boolean) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +flag indicating the selection of the Yes button (boolean) +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /> +</body></html> \ No newline at end of file
--- a/Documentation/Source/eric5.QScintilla.Editor.html Fri Sep 03 20:04:49 2010 +0200 +++ b/Documentation/Source/eric5.QScintilla.Editor.html Fri Sep 03 20:06:18 2010 +0200 @@ -2934,8 +2934,7 @@ </dl><dl> <dt>Returns:</dt> <dd> -tuple of two values (boolean, string) giving a success indicator and - the name of the saved file +flag indicating success (boolean) </dd> </dl><a NAME="Editor.saveFileAs" ID="Editor.saveFileAs"></a> <h4>Editor.saveFileAs</h4>
--- a/Documentation/Source/eric5.VCS.VersionControl.html Fri Sep 03 20:04:49 2010 +0200 +++ b/Documentation/Source/eric5.VCS.VersionControl.html Fri Sep 03 20:06:18 2010 +0200 @@ -240,7 +240,7 @@ </table> <a NAME="VersionControl.__init__" ID="VersionControl.__init__"></a> <h4>VersionControl (Constructor)</h4> -<b>VersionControl</b>(<i>parent=None, name=None</i>) +<b>VersionControl</b>(<i>parent = None, name = None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/index-eric5.E5Gui.html Fri Sep 03 20:04:49 2010 +0200 +++ b/Documentation/Source/index-eric5.E5Gui.html Fri Sep 03 20:06:18 2010 +0200 @@ -52,6 +52,9 @@ <td><a href="eric5.E5Gui.E5ListView.html">E5ListView</a></td> <td>Module implementing specialized list views.</td> </tr><tr> +<td><a href="eric5.E5Gui.E5MessageBox.html">E5MessageBox</a></td> +<td>Module implementing QMessageBox replacements and more convenience function.</td> +</tr><tr> <td><a href="eric5.E5Gui.E5ModelMenu.html">E5ModelMenu</a></td> <td>Module implementing a menu populated from a QAbstractItemModel.</td> </tr><tr>