--- a/src/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.html Thu Jan 04 17:16:15 2024 +0100
+++ b/src/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.html Thu Jan 04 18:02:25 2024 +0100
@@ -7,55 +7,53 @@
<body>
<a NAME="top" ID="top"></a>
<h1>eric7.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog</h1>
-
<p>
Module implementing a dialog to show a list of files which had or still have
conflicts.
</p>
+
<h3>Global Attributes</h3>
-
<table>
<tr><td>None</td></tr>
</table>
+
<h3>Classes</h3>
-
<table>
-
<tr>
<td><a href="#HgConflictsListDialog">HgConflictsListDialog</a></td>
<td>Class implementing a dialog to show a list of files which had or still have conflicts.</td>
</tr>
</table>
+
<h3>Functions</h3>
-
<table>
<tr><td>None</td></tr>
</table>
+
<hr />
<hr />
<a NAME="HgConflictsListDialog" ID="HgConflictsListDialog"></a>
<h2>HgConflictsListDialog</h2>
-
<p>
Class implementing a dialog to show a list of files which had or still
have conflicts.
</p>
+
<h3>Derived from</h3>
QWidget, Ui_HgConflictsListDialog
<h3>Class Attributes</h3>
+<table>
+<tr><td>FilenameRole</td></tr>
+<tr><td>StatusRole</td></tr>
+</table>
-<table>
-<tr><td>FilenameRole</td></tr><tr><td>StatusRole</td></tr>
-</table>
<h3>Class Methods</h3>
-
<table>
<tr><td>None</td></tr>
</table>
+
<h3>Methods</h3>
-
<table>
-
<tr>
<td><a href="#HgConflictsListDialog.__init__">HgConflictsListDialog</a></td>
<td>Constructor</td>
@@ -133,19 +131,20 @@
<td>Public slot to start the tags command.</td>
</tr>
</table>
+
<h3>Static Methods</h3>
-
<table>
<tr><td>None</td></tr>
</table>
+
<a NAME="HgConflictsListDialog.__init__" ID="HgConflictsListDialog.__init__"></a>
<h4>HgConflictsListDialog (Constructor)</h4>
<b>HgConflictsListDialog</b>(<i>vcs, parent=None</i>)
-
<p>
Constructor
</p>
+
<dl>
<dt><i>vcs</i> (Hg)</dt>
@@ -160,18 +159,18 @@
<a NAME="HgConflictsListDialog.__finish" ID="HgConflictsListDialog.__finish"></a>
<h4>HgConflictsListDialog.__finish</h4>
<b>__finish</b>(<i></i>)
-
<p>
Private slot called when the process finished or the user pressed
the button.
</p>
+
<a NAME="HgConflictsListDialog.__generateItem" ID="HgConflictsListDialog.__generateItem"></a>
<h4>HgConflictsListDialog.__generateItem</h4>
<b>__generateItem</b>(<i>status, name</i>)
-
<p>
Private method to generate a tag item in the tag list.
</p>
+
<dl>
<dt><i>status</i> (str)</dt>
@@ -186,17 +185,17 @@
<a NAME="HgConflictsListDialog.__getEntries" ID="HgConflictsListDialog.__getEntries"></a>
<h4>HgConflictsListDialog.__getEntries</h4>
<b>__getEntries</b>(<i></i>)
-
<p>
Private method to get the conflict entries.
</p>
+
<a NAME="HgConflictsListDialog.__processOutputLine" ID="HgConflictsListDialog.__processOutputLine"></a>
<h4>HgConflictsListDialog.__processOutputLine</h4>
<b>__processOutputLine</b>(<i>line</i>)
-
<p>
Private method to process the lines of output.
</p>
+
<dl>
<dt><i>line</i> (str)</dt>
@@ -207,24 +206,24 @@
<a NAME="HgConflictsListDialog.__resizeColumns" ID="HgConflictsListDialog.__resizeColumns"></a>
<h4>HgConflictsListDialog.__resizeColumns</h4>
<b>__resizeColumns</b>(<i></i>)
-
<p>
Private method to resize the list columns.
</p>
+
<a NAME="HgConflictsListDialog.__resort" ID="HgConflictsListDialog.__resort"></a>
<h4>HgConflictsListDialog.__resort</h4>
<b>__resort</b>(<i></i>)
-
<p>
Private method to resort the tree.
</p>
+
<a NAME="HgConflictsListDialog.__showError" ID="HgConflictsListDialog.__showError"></a>
<h4>HgConflictsListDialog.__showError</h4>
<b>__showError</b>(<i>out</i>)
-
<p>
Private slot to show some error.
</p>
+
<dl>
<dt><i>out</i> (str)</dt>
@@ -235,10 +234,10 @@
<a NAME="HgConflictsListDialog.closeEvent" ID="HgConflictsListDialog.closeEvent"></a>
<h4>HgConflictsListDialog.closeEvent</h4>
<b>closeEvent</b>(<i>e</i>)
-
<p>
Protected slot implementing a close event handler.
</p>
+
<dl>
<dt><i>e</i> (QCloseEvent)</dt>
@@ -249,10 +248,10 @@
<a NAME="HgConflictsListDialog.on_buttonBox_clicked" ID="HgConflictsListDialog.on_buttonBox_clicked"></a>
<h4>HgConflictsListDialog.on_buttonBox_clicked</h4>
<b>on_buttonBox_clicked</b>(<i>button</i>)
-
<p>
Private slot called by a button of the button box clicked.
</p>
+
<dl>
<dt><i>button</i> (QAbstractButton)</dt>
@@ -263,10 +262,10 @@
<a NAME="HgConflictsListDialog.on_conflictsList_itemDoubleClicked" ID="HgConflictsListDialog.on_conflictsList_itemDoubleClicked"></a>
<h4>HgConflictsListDialog.on_conflictsList_itemDoubleClicked</h4>
<b>on_conflictsList_itemDoubleClicked</b>(<i>item, column</i>)
-
<p>
Private slot to open the double clicked entry.
</p>
+
<dl>
<dt><i>item</i> (QTreeWidgetItem)</dt>
@@ -281,59 +280,59 @@
<a NAME="HgConflictsListDialog.on_conflictsList_itemSelectionChanged" ID="HgConflictsListDialog.on_conflictsList_itemSelectionChanged"></a>
<h4>HgConflictsListDialog.on_conflictsList_itemSelectionChanged</h4>
<b>on_conflictsList_itemSelectionChanged</b>(<i></i>)
-
<p>
Private slot to handle a change of selected conflict entries.
</p>
+
<a NAME="HgConflictsListDialog.on_editButton_clicked" ID="HgConflictsListDialog.on_editButton_clicked"></a>
<h4>HgConflictsListDialog.on_editButton_clicked</h4>
<b>on_editButton_clicked</b>(<i></i>)
-
<p>
Private slot to open the selected file in an editor.
</p>
+
<a NAME="HgConflictsListDialog.on_reMergeButton_clicked" ID="HgConflictsListDialog.on_reMergeButton_clicked"></a>
<h4>HgConflictsListDialog.on_reMergeButton_clicked</h4>
<b>on_reMergeButton_clicked</b>(<i></i>)
-
<p>
Private slot to re-merge the selected entries.
</p>
+
<a NAME="HgConflictsListDialog.on_refreshButton_clicked" ID="HgConflictsListDialog.on_refreshButton_clicked"></a>
<h4>HgConflictsListDialog.on_refreshButton_clicked</h4>
<b>on_refreshButton_clicked</b>(<i></i>)
-
<p>
Private slot to refresh the log.
</p>
+
<a NAME="HgConflictsListDialog.on_resolvedButton_clicked" ID="HgConflictsListDialog.on_resolvedButton_clicked"></a>
<h4>HgConflictsListDialog.on_resolvedButton_clicked</h4>
<b>on_resolvedButton_clicked</b>(<i></i>)
-
<p>
Private slot to mark the selected entries as resolved.
</p>
+
<a NAME="HgConflictsListDialog.on_unresolvedButton_clicked" ID="HgConflictsListDialog.on_unresolvedButton_clicked"></a>
<h4>HgConflictsListDialog.on_unresolvedButton_clicked</h4>
<b>on_unresolvedButton_clicked</b>(<i></i>)
-
<p>
Private slot to mark the selected entries as unresolved.
</p>
+
<a NAME="HgConflictsListDialog.show" ID="HgConflictsListDialog.show"></a>
<h4>HgConflictsListDialog.show</h4>
<b>show</b>(<i></i>)
-
<p>
Public slot to show the dialog.
</p>
+
<a NAME="HgConflictsListDialog.start" ID="HgConflictsListDialog.start"></a>
<h4>HgConflictsListDialog.start</h4>
<b>start</b>(<i></i>)
-
<p>
Public slot to start the tags command.
</p>
+
<div align="right"><a href="#top">Up</a></div>
<hr />
-</body></html>
\ No newline at end of file
+</body></html>
