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