diff -r de9106c55c3d -r 856476537696 src/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsGit.GitMergeDialog.html
--- a/src/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsGit.GitMergeDialog.html Thu Jan 04 17:16:15 2024 +0100
+++ b/src/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsGit.GitMergeDialog.html Thu Jan 04 18:02:25 2024 +0100
@@ -7,53 +7,50 @@
<body>
<a NAME="top" ID="top"></a>
<h1>eric7.Plugins.VcsPlugins.vcsGit.GitMergeDialog</h1>
-
<p>
Module implementing a dialog to enter the merge data.
</p>
+
<h3>Global Attributes</h3>
-
<table>
<tr><td>None</td></tr>
</table>
+
<h3>Classes</h3>
-
<table>
-
<tr>
<td><a href="#GitMergeDialog">GitMergeDialog</a></td>
<td>Class implementing a dialog to enter the merge data.</td>
</tr>
</table>
+
<h3>Functions</h3>
-
<table>
<tr><td>None</td></tr>
</table>
+
<hr />
<hr />
<a NAME="GitMergeDialog" ID="GitMergeDialog"></a>
<h2>GitMergeDialog</h2>
-
<p>
Class implementing a dialog to enter the merge data.
</p>
+
<h3>Derived from</h3>
QDialog, Ui_GitMergeDialog
<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="#GitMergeDialog.__init__">GitMergeDialog</a></td>
<td>Constructor</td>
@@ -115,19 +112,20 @@
<td>Private slot to handle changes of the Tag combo.</td>
</tr>
</table>
+
<h3>Static Methods</h3>
-
<table>
<tr><td>None</td></tr>
</table>
+
<a NAME="GitMergeDialog.__init__" ID="GitMergeDialog.__init__"></a>
<h4>GitMergeDialog (Constructor)</h4>
<b>GitMergeDialog</b>(<i>tagsList, branchesList, currentBranch, remoteBranchesList, parent=None</i>)
-
<p>
Constructor
</p>
+
<dl>
<dt><i>tagsList</i> (list of str)</dt>
@@ -154,25 +152,25 @@
<a NAME="GitMergeDialog.__generateDefaultCommitMessage" ID="GitMergeDialog.__generateDefaultCommitMessage"></a>
<h4>GitMergeDialog.__generateDefaultCommitMessage</h4>
<b>__generateDefaultCommitMessage</b>(<i></i>)
-
<p>
Private slot to generate a default commit message based on the
data entered.
</p>
+
<a NAME="GitMergeDialog.__updateOK" ID="GitMergeDialog.__updateOK"></a>
<h4>GitMergeDialog.__updateOK</h4>
<b>__updateOK</b>(<i></i>)
-
<p>
Private slot to update the OK button.
</p>
+
<a NAME="GitMergeDialog.getParameters" ID="GitMergeDialog.getParameters"></a>
<h4>GitMergeDialog.getParameters</h4>
<b>getParameters</b>(<i></i>)
-
<p>
Public method to retrieve the merge data.
</p>
+
<dl>
<dt>Return:</dt>
<dd>
@@ -191,10 +189,10 @@
<a NAME="GitMergeDialog.on_branchButton_toggled" ID="GitMergeDialog.on_branchButton_toggled"></a>
<h4>GitMergeDialog.on_branchButton_toggled</h4>
<b>on_branchButton_toggled</b>(<i>checked</i>)
-
<p>
Private slot to handle changes of the Branch select button.
</p>
+
<dl>
<dt><i>checked</i> (bool)</dt>
@@ -205,10 +203,10 @@
<a NAME="GitMergeDialog.on_branchCombo_editTextChanged" ID="GitMergeDialog.on_branchCombo_editTextChanged"></a>
<h4>GitMergeDialog.on_branchCombo_editTextChanged</h4>
<b>on_branchCombo_editTextChanged</b>(<i>txt</i>)
-
<p>
Private slot to handle changes of the Branch combo.
</p>
+
<dl>
<dt><i>txt</i> (str)</dt>
@@ -219,10 +217,10 @@
<a NAME="GitMergeDialog.on_commitGroupBox_toggled" ID="GitMergeDialog.on_commitGroupBox_toggled"></a>
<h4>GitMergeDialog.on_commitGroupBox_toggled</h4>
<b>on_commitGroupBox_toggled</b>(<i>checked</i>)
-
<p>
Private slot to handle changes of the Commit select group.
</p>
+
<dl>
<dt><i>checked</i> (bool)</dt>
@@ -233,17 +231,17 @@
<a NAME="GitMergeDialog.on_commitMessageEdit_textChanged" ID="GitMergeDialog.on_commitMessageEdit_textChanged"></a>
<h4>GitMergeDialog.on_commitMessageEdit_textChanged</h4>
<b>on_commitMessageEdit_textChanged</b>(<i></i>)
-
<p>
Private slot to handle changes of the commit message edit.
</p>
+
<a NAME="GitMergeDialog.on_idButton_toggled" ID="GitMergeDialog.on_idButton_toggled"></a>
<h4>GitMergeDialog.on_idButton_toggled</h4>
<b>on_idButton_toggled</b>(<i>checked</i>)
-
<p>
Private slot to handle changes of the ID select button.
</p>
+
<dl>
<dt><i>checked</i> (bool)</dt>
@@ -254,10 +252,10 @@
<a NAME="GitMergeDialog.on_idEdit_textChanged" ID="GitMergeDialog.on_idEdit_textChanged"></a>
<h4>GitMergeDialog.on_idEdit_textChanged</h4>
<b>on_idEdit_textChanged</b>(<i>txt</i>)
-
<p>
Private slot to handle changes of the Commit edit.
</p>
+
<dl>
<dt><i>txt</i> (str)</dt>
@@ -268,10 +266,10 @@
<a NAME="GitMergeDialog.on_noneButton_toggled" ID="GitMergeDialog.on_noneButton_toggled"></a>
<h4>GitMergeDialog.on_noneButton_toggled</h4>
<b>on_noneButton_toggled</b>(<i>checked</i>)
-
<p>
Private slot to handle changes of the None select button.
</p>
+
<dl>
<dt><i>checked</i> (bool)</dt>
@@ -282,10 +280,10 @@
<a NAME="GitMergeDialog.on_remoteBranchButton_toggled" ID="GitMergeDialog.on_remoteBranchButton_toggled"></a>
<h4>GitMergeDialog.on_remoteBranchButton_toggled</h4>
<b>on_remoteBranchButton_toggled</b>(<i>checked</i>)
-
<p>
Private slot to handle changes of the Remote Branch select button.
</p>
+
<dl>
<dt><i>checked</i> (bool)</dt>
@@ -296,10 +294,10 @@
<a NAME="GitMergeDialog.on_remoteBranchCombo_editTextChanged" ID="GitMergeDialog.on_remoteBranchCombo_editTextChanged"></a>
<h4>GitMergeDialog.on_remoteBranchCombo_editTextChanged</h4>
<b>on_remoteBranchCombo_editTextChanged</b>(<i>txt</i>)
-
<p>
Private slot to handle changes of the Remote Branch combo.
</p>
+
<dl>
<dt><i>txt</i> (str)</dt>
@@ -310,10 +308,10 @@
<a NAME="GitMergeDialog.on_tagButton_toggled" ID="GitMergeDialog.on_tagButton_toggled"></a>
<h4>GitMergeDialog.on_tagButton_toggled</h4>
<b>on_tagButton_toggled</b>(<i>checked</i>)
-
<p>
Private slot to handle changes of the Tag select button.
</p>
+
<dl>
<dt><i>checked</i> (bool)</dt>
@@ -324,10 +322,10 @@
<a NAME="GitMergeDialog.on_tagCombo_editTextChanged" ID="GitMergeDialog.on_tagCombo_editTextChanged"></a>
<h4>GitMergeDialog.on_tagCombo_editTextChanged</h4>
<b>on_tagCombo_editTextChanged</b>(<i>txt</i>)
-
<p>
Private slot to handle changes of the Tag combo.
</p>
+
<dl>
<dt><i>txt</i> (str)</dt>
@@ -337,4 +335,4 @@
</dl>
<div align="right"><a href="#top">Up</a></div>
<hr />
-</body></html>
\ No newline at end of file
+</body></html>
