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