Mercurial Repositories > eric / file comparison
comparison: eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.html
eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.html
- branch
- eric7
- changeset 9029
- 14efd8fa5d8f
- parent 8596
- d64760b2da50
equal
deleted
inserted
replaced
| 9028:b3a7f0368163 | 9029:14efd8fa5d8f |
|---|---|
| 64 </tr> | 64 </tr> |
| 65 <tr> | 65 <tr> |
| 66 <td><a href="#HgMergeDialog.getParameters">getParameters</a></td> | 66 <td><a href="#HgMergeDialog.getParameters">getParameters</a></td> |
| 67 <td>Public method to retrieve the merge data.</td> | 67 <td>Public method to retrieve the merge data.</td> |
| 68 </tr> | 68 </tr> |
| 69 <tr> | |
| 70 <td><a href="#HgMergeDialog.on_bookmarkButton_toggled">on_bookmarkButton_toggled</a></td> | |
| 71 <td>Private slot to handle changes of the Bookmark select button.</td> | |
| 72 </tr> | |
| 73 <tr> | |
| 74 <td><a href="#HgMergeDialog.on_bookmarkCombo_editTextChanged">on_bookmarkCombo_editTextChanged</a></td> | |
| 75 <td>Private slot to handle changes of the Bookmark combo.</td> | |
| 76 </tr> | |
| 77 <tr> | |
| 78 <td><a href="#HgMergeDialog.on_branchButton_toggled">on_branchButton_toggled</a></td> | |
| 79 <td>Private slot to handle changes of the Branch select button.</td> | |
| 80 </tr> | |
| 81 <tr> | |
| 82 <td><a href="#HgMergeDialog.on_branchCombo_editTextChanged">on_branchCombo_editTextChanged</a></td> | |
| 83 <td>Private slot to handle changes of the Branch combo.</td> | |
| 84 </tr> | |
| 85 <tr> | |
| 86 <td><a href="#HgMergeDialog.on_idButton_toggled">on_idButton_toggled</a></td> | |
| 87 <td>Private slot to handle changes of the ID select button.</td> | |
| 88 </tr> | |
| 89 <tr> | |
| 90 <td><a href="#HgMergeDialog.on_idEdit_textChanged">on_idEdit_textChanged</a></td> | |
| 91 <td>Private slot to handle changes of the ID edit.</td> | |
| 92 </tr> | |
| 93 <tr> | |
| 94 <td><a href="#HgMergeDialog.on_tagButton_toggled">on_tagButton_toggled</a></td> | |
| 95 <td>Private slot to handle changes of the Tag select button.</td> | |
| 96 </tr> | |
| 97 <tr> | |
| 98 <td><a href="#HgMergeDialog.on_tagCombo_editTextChanged">on_tagCombo_editTextChanged</a></td> | |
| 99 <td>Private slot to handle changes of the Tag combo.</td> | |
| 100 </tr> | |
| 101 </table> | 69 </table> |
| 102 <h3>Static Methods</h3> | 70 <h3>Static Methods</h3> |
| 103 | 71 |
| 104 <table> | 72 <table> |
| 105 <tr><td>None</td></tr> | 73 <tr><td>None</td></tr> |
| 112 <p> | 80 <p> |
| 113 Constructor | 81 Constructor |
| 114 </p> | 82 </p> |
| 115 <dl> | 83 <dl> |
| 116 | 84 |
| 117 <dt><i>tagsList</i></dt> | 85 <dt><i>tagsList</i> (list of str)</dt> |
| 118 <dd> | 86 <dd> |
| 119 list of tags (list of strings) | 87 list of tags |
| 120 </dd> | 88 </dd> |
| 121 <dt><i>branchesList</i></dt> | 89 <dt><i>branchesList</i> (list of str)</dt> |
| 122 <dd> | 90 <dd> |
| 123 list of branches (list of strings) | 91 list of branches |
| 124 </dd> | 92 </dd> |
| 125 <dt><i>bookmarksList</i></dt> | 93 <dt><i>bookmarksList</i> (list of str)</dt> |
| 126 <dd> | 94 <dd> |
| 127 list of bookmarks (list of strings) | 95 list of bookmarks |
| 128 </dd> | 96 </dd> |
| 129 <dt><i>parent</i></dt> | 97 <dt><i>parent</i> (QWidget)</dt> |
| 130 <dd> | 98 <dd> |
| 131 parent widget (QWidget) | 99 parent widget |
| 132 </dd> | 100 </dd> |
| 133 </dl> | 101 </dl> |
| 134 <a NAME="HgMergeDialog.__updateOK" ID="HgMergeDialog.__updateOK"></a> | 102 <a NAME="HgMergeDialog.__updateOK" ID="HgMergeDialog.__updateOK"></a> |
| 135 <h4>HgMergeDialog.__updateOK</h4> | 103 <h4>HgMergeDialog.__updateOK</h4> |
| 136 <b>__updateOK</b>(<i></i>) | 104 <b>__updateOK</b>(<i></i>) |
| 147 </p> | 115 </p> |
| 148 <dl> | 116 <dl> |
| 149 <dt>Return:</dt> | 117 <dt>Return:</dt> |
| 150 <dd> | 118 <dd> |
| 151 tuple naming the revision and a flag indicating a | 119 tuple naming the revision and a flag indicating a |
| 152 forced merge (string, boolean) | 120 forced merge |
| 153 </dd> | 121 </dd> |
| 154 </dl> | 122 </dl> |
| 155 <a NAME="HgMergeDialog.on_bookmarkButton_toggled" ID="HgMergeDialog.on_bookmarkButton_toggled"></a> | |
| 156 <h4>HgMergeDialog.on_bookmarkButton_toggled</h4> | |
| 157 <b>on_bookmarkButton_toggled</b>(<i>checked</i>) | |
| 158 | |
| 159 <p> | |
| 160 Private slot to handle changes of the Bookmark select button. | |
| 161 </p> | |
| 162 <dl> | 123 <dl> |
| 163 | 124 <dt>Return Type:</dt> |
| 164 <dt><i>checked</i></dt> | |
| 165 <dd> | 125 <dd> |
| 166 state of the button (boolean) | 126 tuple of (str, bool) |
| 167 </dd> | |
| 168 </dl> | |
| 169 <a NAME="HgMergeDialog.on_bookmarkCombo_editTextChanged" ID="HgMergeDialog.on_bookmarkCombo_editTextChanged"></a> | |
| 170 <h4>HgMergeDialog.on_bookmarkCombo_editTextChanged</h4> | |
| 171 <b>on_bookmarkCombo_editTextChanged</b>(<i>txt</i>) | |
| 172 | |
| 173 <p> | |
| 174 Private slot to handle changes of the Bookmark combo. | |
| 175 </p> | |
| 176 <dl> | |
| 177 | |
| 178 <dt><i>txt</i></dt> | |
| 179 <dd> | |
| 180 text of the combo (string) | |
| 181 </dd> | |
| 182 </dl> | |
| 183 <a NAME="HgMergeDialog.on_branchButton_toggled" ID="HgMergeDialog.on_branchButton_toggled"></a> | |
| 184 <h4>HgMergeDialog.on_branchButton_toggled</h4> | |
| 185 <b>on_branchButton_toggled</b>(<i>checked</i>) | |
| 186 | |
| 187 <p> | |
| 188 Private slot to handle changes of the Branch select button. | |
| 189 </p> | |
| 190 <dl> | |
| 191 | |
| 192 <dt><i>checked</i></dt> | |
| 193 <dd> | |
| 194 state of the button (boolean) | |
| 195 </dd> | |
| 196 </dl> | |
| 197 <a NAME="HgMergeDialog.on_branchCombo_editTextChanged" ID="HgMergeDialog.on_branchCombo_editTextChanged"></a> | |
| 198 <h4>HgMergeDialog.on_branchCombo_editTextChanged</h4> | |
| 199 <b>on_branchCombo_editTextChanged</b>(<i>txt</i>) | |
| 200 | |
| 201 <p> | |
| 202 Private slot to handle changes of the Branch combo. | |
| 203 </p> | |
| 204 <dl> | |
| 205 | |
| 206 <dt><i>txt</i></dt> | |
| 207 <dd> | |
| 208 text of the combo (string) | |
| 209 </dd> | |
| 210 </dl> | |
| 211 <a NAME="HgMergeDialog.on_idButton_toggled" ID="HgMergeDialog.on_idButton_toggled"></a> | |
| 212 <h4>HgMergeDialog.on_idButton_toggled</h4> | |
| 213 <b>on_idButton_toggled</b>(<i>checked</i>) | |
| 214 | |
| 215 <p> | |
| 216 Private slot to handle changes of the ID select button. | |
| 217 </p> | |
| 218 <dl> | |
| 219 | |
| 220 <dt><i>checked</i></dt> | |
| 221 <dd> | |
| 222 state of the button (boolean) | |
| 223 </dd> | |
| 224 </dl> | |
| 225 <a NAME="HgMergeDialog.on_idEdit_textChanged" ID="HgMergeDialog.on_idEdit_textChanged"></a> | |
| 226 <h4>HgMergeDialog.on_idEdit_textChanged</h4> | |
| 227 <b>on_idEdit_textChanged</b>(<i>txt</i>) | |
| 228 | |
| 229 <p> | |
| 230 Private slot to handle changes of the ID edit. | |
| 231 </p> | |
| 232 <dl> | |
| 233 | |
| 234 <dt><i>txt</i></dt> | |
| 235 <dd> | |
| 236 text of the edit (string) | |
| 237 </dd> | |
| 238 </dl> | |
| 239 <a NAME="HgMergeDialog.on_tagButton_toggled" ID="HgMergeDialog.on_tagButton_toggled"></a> | |
| 240 <h4>HgMergeDialog.on_tagButton_toggled</h4> | |
| 241 <b>on_tagButton_toggled</b>(<i>checked</i>) | |
| 242 | |
| 243 <p> | |
| 244 Private slot to handle changes of the Tag select button. | |
| 245 </p> | |
| 246 <dl> | |
| 247 | |
| 248 <dt><i>checked</i></dt> | |
| 249 <dd> | |
| 250 state of the button (boolean) | |
| 251 </dd> | |
| 252 </dl> | |
| 253 <a NAME="HgMergeDialog.on_tagCombo_editTextChanged" ID="HgMergeDialog.on_tagCombo_editTextChanged"></a> | |
| 254 <h4>HgMergeDialog.on_tagCombo_editTextChanged</h4> | |
| 255 <b>on_tagCombo_editTextChanged</b>(<i>txt</i>) | |
| 256 | |
| 257 <p> | |
| 258 Private slot to handle changes of the Tag combo. | |
| 259 </p> | |
| 260 <dl> | |
| 261 | |
| 262 <dt><i>txt</i></dt> | |
| 263 <dd> | |
| 264 text of the combo (string) | |
| 265 </dd> | 127 </dd> |
| 266 </dl> | 128 </dl> |
| 267 <div align="right"><a href="#top">Up</a></div> | 129 <div align="right"><a href="#top">Up</a></div> |
| 268 <hr /> | 130 <hr /> |
| 269 </body></html> | 131 </body></html> |
