--- a/eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsSubversion.SvnMergeDialog.html Wed Sep 25 19:40:31 2019 +0200 +++ b/eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsSubversion.SvnMergeDialog.html Wed Sep 25 19:42:44 2019 +0200 @@ -18,121 +18,159 @@ </style> </head> -<body><a NAME="top" ID="top"></a> +<body> +<a NAME="top" ID="top"></a> <h1>eric6.Plugins.VcsPlugins.vcsSubversion.SvnMergeDialog</h1> + <p> Module implementing a dialog to enter the data for a merge operation. </p> <h3>Global Attributes</h3> + <table> <tr><td>None</td></tr> </table> <h3>Classes</h3> + <table> + <tr> <td><a href="#SvnMergeDialog">SvnMergeDialog</a></td> <td>Class implementing a dialog to enter the data for a merge operation.</td> </tr> </table> <h3>Functions</h3> + <table> <tr><td>None</td></tr> </table> -<hr /><hr /> +<hr /> +<hr /> <a NAME="SvnMergeDialog" ID="SvnMergeDialog"></a> <h2>SvnMergeDialog</h2> + <p> Class implementing a dialog to enter the data for a merge operation. </p> <h3>Derived from</h3> QDialog, Ui_SvnMergeDialog <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="#SvnMergeDialog.__init__">SvnMergeDialog</a></td> <td>Constructor</td> -</tr><tr> +</tr> +<tr> <td><a href="#SvnMergeDialog.__enableOkButton">__enableOkButton</a></td> <td>Private method used to enable/disable the OK-button.</td> -</tr><tr> +</tr> +<tr> <td><a href="#SvnMergeDialog.getParameters">getParameters</a></td> <td>Public method to retrieve the merge data.</td> -</tr><tr> +</tr> +<tr> <td><a href="#SvnMergeDialog.on_tag1Combo_editTextChanged">on_tag1Combo_editTextChanged</a></td> <td>Private slot to handle the tag1Combo editTextChanged signal.</td> -</tr><tr> +</tr> +<tr> <td><a href="#SvnMergeDialog.on_tag2Combo_editTextChanged">on_tag2Combo_editTextChanged</a></td> <td>Private slot to handle the tag2Combo editTextChanged signal.</td> </tr> </table> <h3>Static Methods</h3> + <table> <tr><td>None</td></tr> </table> + <a NAME="SvnMergeDialog.__init__" ID="SvnMergeDialog.__init__"></a> <h4>SvnMergeDialog (Constructor)</h4> <b>SvnMergeDialog</b>(<i>mergelist1, mergelist2, targetlist, force=False, parent=None</i>) + <p> Constructor -</p><dl> +</p> +<dl> + <dt><i>mergelist1</i></dt> <dd> list of previously entered URLs/revisions (list of strings) -</dd><dt><i>mergelist2</i></dt> +</dd> +<dt><i>mergelist2</i></dt> <dd> list of previously entered URLs/revisions (list of strings) -</dd><dt><i>targetlist</i></dt> +</dd> +<dt><i>targetlist</i></dt> <dd> list of previously entered targets (list of strings) -</dd><dt><i>force</i></dt> +</dd> +<dt><i>force</i></dt> <dd> flag indicating a forced merge (boolean) -</dd><dt><i>parent</i></dt> +</dd> +<dt><i>parent</i></dt> <dd> parent widget (QWidget) </dd> -</dl><a NAME="SvnMergeDialog.__enableOkButton" ID="SvnMergeDialog.__enableOkButton"></a> +</dl> +<a NAME="SvnMergeDialog.__enableOkButton" ID="SvnMergeDialog.__enableOkButton"></a> <h4>SvnMergeDialog.__enableOkButton</h4> <b>__enableOkButton</b>(<i></i>) + <p> Private method used to enable/disable the OK-button. -</p><a NAME="SvnMergeDialog.getParameters" ID="SvnMergeDialog.getParameters"></a> +</p> +<a NAME="SvnMergeDialog.getParameters" ID="SvnMergeDialog.getParameters"></a> <h4>SvnMergeDialog.getParameters</h4> <b>getParameters</b>(<i></i>) + <p> Public method to retrieve the merge data. -</p><dl> +</p> +<dl> <dt>Returns:</dt> <dd> tuple naming two tag names or two revisions, a target and a flag indicating a forced merge (string, string, string, boolean) </dd> -</dl><a NAME="SvnMergeDialog.on_tag1Combo_editTextChanged" ID="SvnMergeDialog.on_tag1Combo_editTextChanged"></a> +</dl> +<a NAME="SvnMergeDialog.on_tag1Combo_editTextChanged" ID="SvnMergeDialog.on_tag1Combo_editTextChanged"></a> <h4>SvnMergeDialog.on_tag1Combo_editTextChanged</h4> <b>on_tag1Combo_editTextChanged</b>(<i>text</i>) + <p> Private slot to handle the tag1Combo editTextChanged signal. -</p><dl> +</p> +<dl> + <dt><i>text</i></dt> <dd> text of the combo (string) </dd> -</dl><a NAME="SvnMergeDialog.on_tag2Combo_editTextChanged" ID="SvnMergeDialog.on_tag2Combo_editTextChanged"></a> +</dl> +<a NAME="SvnMergeDialog.on_tag2Combo_editTextChanged" ID="SvnMergeDialog.on_tag2Combo_editTextChanged"></a> <h4>SvnMergeDialog.on_tag2Combo_editTextChanged</h4> <b>on_tag2Combo_editTextChanged</b>(<i>text</i>) + <p> Private slot to handle the tag2Combo editTextChanged signal. -</p><dl> +</p> +<dl> + <dt><i>text</i></dt> <dd> text of the combo (string)