Mercurial Repositories > eric / file comparison
comparison: Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.SvnMergeDialog.html
Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.SvnMergeDialog.html
- changeset 1228
- 7afaf2fca55b
- parent 945
- 8cd4d08fa9f6
- child 1229
- a8207dc73672
equal
deleted
inserted
replaced
| 1227:c5db073a124f | 1228:7afaf2fca55b |
|---|---|
| 49 QDialog, Ui_SvnMergeDialog | 49 QDialog, Ui_SvnMergeDialog |
| 50 <h3>Class Attributes</h3> | 50 <h3>Class Attributes</h3> |
| 51 <table> | 51 <table> |
| 52 <tr><td>None</td></tr> | 52 <tr><td>None</td></tr> |
| 53 </table> | 53 </table> |
| 54 <h3>Class Methods</h3> | |
| 55 <table> | |
| 56 <tr><td>None</td></tr> | |
| 57 </table> | |
| 54 <h3>Methods</h3> | 58 <h3>Methods</h3> |
| 55 <table> | 59 <table> |
| 56 <tr> | 60 <tr> |
| 57 <td><a href="#SvnMergeDialog.__init__">SvnMergeDialog</a></td> | |
| 58 <td>Constructor</td> | |
| 59 </tr><tr> | |
| 60 <td><a href="#SvnMergeDialog.__enableOkButton">__enableOkButton</a></td> | 61 <td><a href="#SvnMergeDialog.__enableOkButton">__enableOkButton</a></td> |
| 61 <td>Private method used to enable/disable the OK-button.</td> | 62 <td>Private method used to enable/disable the OK-button.</td> |
| 62 </tr><tr> | 63 </tr><tr> |
| 63 <td><a href="#SvnMergeDialog.getParameters">getParameters</a></td> | 64 <td><a href="#SvnMergeDialog.getParameters">getParameters</a></td> |
| 64 <td>Public method to retrieve the merge data.</td> | 65 <td>Public method to retrieve the merge data.</td> |
| 67 <td>Private slot to handle the tag1Combo editTextChanged signal.</td> | 68 <td>Private slot to handle the tag1Combo editTextChanged signal.</td> |
| 68 </tr><tr> | 69 </tr><tr> |
| 69 <td><a href="#SvnMergeDialog.on_tag2Combo_editTextChanged">on_tag2Combo_editTextChanged</a></td> | 70 <td><a href="#SvnMergeDialog.on_tag2Combo_editTextChanged">on_tag2Combo_editTextChanged</a></td> |
| 70 <td>Private slot to handle the tag2Combo editTextChanged signal.</td> | 71 <td>Private slot to handle the tag2Combo editTextChanged signal.</td> |
| 71 </tr> | 72 </tr> |
| 73 </table> | |
| 74 <h3>Static Methods</h3> | |
| 75 <table> | |
| 76 <tr><td>None</td></tr> | |
| 72 </table> | 77 </table> |
| 73 <a NAME="SvnMergeDialog.__init__" ID="SvnMergeDialog.__init__"></a> | 78 <a NAME="SvnMergeDialog.__init__" ID="SvnMergeDialog.__init__"></a> |
| 74 <h4>SvnMergeDialog (Constructor)</h4> | 79 <h4>SvnMergeDialog (Constructor)</h4> |
| 75 <b>SvnMergeDialog</b>(<i>mergelist1, mergelist2, targetlist, force=False, parent=None</i>) | 80 <b>SvnMergeDialog</b>(<i>mergelist1, mergelist2, targetlist, force=False, parent=None</i>) |
| 76 <p> | 81 <p> |
