Mercurial Repositories > eric / file comparison
comparison: Documentation/Source/eric6.Plugins.VcsPlugins.vcsSubversion.SvnMergeDialog.html
Documentation/Source/eric6.Plugins.VcsPlugins.vcsSubversion.SvnMergeDialog.html
- changeset 3673
- e26d7d0c1088
equal
deleted
inserted
replaced
| 3670:f0cb7579c0b4 | 3673:e26d7d0c1088 |
|---|---|
| 1 <!DOCTYPE html> | |
| 2 <html><head> | |
| 3 <title>eric6.Plugins.VcsPlugins.vcsSubversion.SvnMergeDialog</title> | |
| 4 <meta charset="UTF-8"> | |
| 5 <style> | |
| 6 body { | |
| 7 background: #EDECE6; | |
| 8 margin: 0em 1em 10em 1em; | |
| 9 color: black; | |
| 10 } | |
| 11 | |
| 12 h1 { color: white; background: #85774A; } | |
| 13 h2 { color: white; background: #85774A; } | |
| 14 h3 { color: white; background: #9D936E; } | |
| 15 h4 { color: white; background: #9D936E; } | |
| 16 | |
| 17 a { color: #BA6D36; } | |
| 18 | |
| 19 </style> | |
| 20 </head> | |
| 21 <body><a NAME="top" ID="top"></a> | |
| 22 <h1>eric6.Plugins.VcsPlugins.vcsSubversion.SvnMergeDialog</h1> | |
| 23 <p> | |
| 24 Module implementing a dialog to enter the data for a merge operation. | |
| 25 </p> | |
| 26 <h3>Global Attributes</h3> | |
| 27 <table> | |
| 28 <tr><td>None</td></tr> | |
| 29 </table> | |
| 30 <h3>Classes</h3> | |
| 31 <table> | |
| 32 <tr> | |
| 33 <td><a href="#SvnMergeDialog">SvnMergeDialog</a></td> | |
| 34 <td>Class implementing a dialog to enter the data for a merge operation.</td> | |
| 35 </tr> | |
| 36 </table> | |
| 37 <h3>Functions</h3> | |
| 38 <table> | |
| 39 <tr><td>None</td></tr> | |
| 40 </table> | |
| 41 <hr /><hr /> | |
| 42 <a NAME="SvnMergeDialog" ID="SvnMergeDialog"></a> | |
| 43 <h2>SvnMergeDialog</h2> | |
| 44 <p> | |
| 45 Class implementing a dialog to enter the data for a merge operation. | |
| 46 </p> | |
| 47 <h3>Derived from</h3> | |
| 48 QDialog, Ui_SvnMergeDialog | |
| 49 <h3>Class Attributes</h3> | |
| 50 <table> | |
| 51 <tr><td>None</td></tr> | |
| 52 </table> | |
| 53 <h3>Class Methods</h3> | |
| 54 <table> | |
| 55 <tr><td>None</td></tr> | |
| 56 </table> | |
| 57 <h3>Methods</h3> | |
| 58 <table> | |
| 59 <tr> | |
| 60 <td><a href="#SvnMergeDialog.__init__">SvnMergeDialog</a></td> | |
| 61 <td>Constructor</td> | |
| 62 </tr><tr> | |
| 63 <td><a href="#SvnMergeDialog.__enableOkButton">__enableOkButton</a></td> | |
| 64 <td>Private method used to enable/disable the OK-button.</td> | |
| 65 </tr><tr> | |
| 66 <td><a href="#SvnMergeDialog.getParameters">getParameters</a></td> | |
| 67 <td>Public method to retrieve the merge data.</td> | |
| 68 </tr><tr> | |
| 69 <td><a href="#SvnMergeDialog.on_tag1Combo_editTextChanged">on_tag1Combo_editTextChanged</a></td> | |
| 70 <td>Private slot to handle the tag1Combo editTextChanged signal.</td> | |
| 71 </tr><tr> | |
| 72 <td><a href="#SvnMergeDialog.on_tag2Combo_editTextChanged">on_tag2Combo_editTextChanged</a></td> | |
| 73 <td>Private slot to handle the tag2Combo editTextChanged signal.</td> | |
| 74 </tr> | |
| 75 </table> | |
| 76 <h3>Static Methods</h3> | |
| 77 <table> | |
| 78 <tr><td>None</td></tr> | |
| 79 </table> | |
| 80 <a NAME="SvnMergeDialog.__init__" ID="SvnMergeDialog.__init__"></a> | |
| 81 <h4>SvnMergeDialog (Constructor)</h4> | |
| 82 <b>SvnMergeDialog</b>(<i>mergelist1, mergelist2, targetlist, force=False, parent=None</i>) | |
| 83 <p> | |
| 84 Constructor | |
| 85 </p><dl> | |
| 86 <dt><i>mergelist1</i></dt> | |
| 87 <dd> | |
| 88 list of previously entered URLs/revisions | |
| 89 (list of strings) | |
| 90 </dd><dt><i>mergelist2</i></dt> | |
| 91 <dd> | |
| 92 list of previously entered URLs/revisions | |
| 93 (list of strings) | |
| 94 </dd><dt><i>targetlist</i></dt> | |
| 95 <dd> | |
| 96 list of previously entered targets (list of strings) | |
| 97 </dd><dt><i>force</i></dt> | |
| 98 <dd> | |
| 99 flag indicating a forced merge (boolean) | |
| 100 </dd><dt><i>parent</i></dt> | |
| 101 <dd> | |
| 102 parent widget (QWidget) | |
| 103 </dd> | |
| 104 </dl><a NAME="SvnMergeDialog.__enableOkButton" ID="SvnMergeDialog.__enableOkButton"></a> | |
| 105 <h4>SvnMergeDialog.__enableOkButton</h4> | |
| 106 <b>__enableOkButton</b>(<i></i>) | |
| 107 <p> | |
| 108 Private method used to enable/disable the OK-button. | |
| 109 </p><a NAME="SvnMergeDialog.getParameters" ID="SvnMergeDialog.getParameters"></a> | |
| 110 <h4>SvnMergeDialog.getParameters</h4> | |
| 111 <b>getParameters</b>(<i></i>) | |
| 112 <p> | |
| 113 Public method to retrieve the merge data. | |
| 114 </p><dl> | |
| 115 <dt>Returns:</dt> | |
| 116 <dd> | |
| 117 tuple naming two tag names or two revisions, a target and | |
| 118 a flag indicating a forced merge (string, string, string, boolean) | |
| 119 </dd> | |
| 120 </dl><a NAME="SvnMergeDialog.on_tag1Combo_editTextChanged" ID="SvnMergeDialog.on_tag1Combo_editTextChanged"></a> | |
| 121 <h4>SvnMergeDialog.on_tag1Combo_editTextChanged</h4> | |
| 122 <b>on_tag1Combo_editTextChanged</b>(<i>text</i>) | |
| 123 <p> | |
| 124 Private slot to handle the tag1Combo editTextChanged signal. | |
| 125 </p><dl> | |
| 126 <dt><i>text</i></dt> | |
| 127 <dd> | |
| 128 text of the combo (string) | |
| 129 </dd> | |
| 130 </dl><a NAME="SvnMergeDialog.on_tag2Combo_editTextChanged" ID="SvnMergeDialog.on_tag2Combo_editTextChanged"></a> | |
| 131 <h4>SvnMergeDialog.on_tag2Combo_editTextChanged</h4> | |
| 132 <b>on_tag2Combo_editTextChanged</b>(<i>text</i>) | |
| 133 <p> | |
| 134 Private slot to handle the tag2Combo editTextChanged signal. | |
| 135 </p><dl> | |
| 136 <dt><i>text</i></dt> | |
| 137 <dd> | |
| 138 text of the combo (string) | |
| 139 </dd> | |
| 140 </dl> | |
| 141 <div align="right"><a href="#top">Up</a></div> | |
| 142 <hr /> | |
| 143 </body></html> |
