Mercurial Repositories > eric / file comparison
comparison: eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.html
eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.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.vcsMercurial.HgConflictsListDialog</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.vcsMercurial.HgConflictsListDialog</h1> | |
| 24 | |
| 25 <p> | |
| 26 Module implementing a dialog to show a list of files which had or still have | |
| 27 conflicts. | |
| 28 </p> | |
| 29 <h3>Global Attributes</h3> | |
| 30 | |
| 31 <table> | |
| 32 <tr><td>None</td></tr> | |
| 33 </table> | |
| 34 <h3>Classes</h3> | |
| 35 | |
| 36 <table> | |
| 37 | |
| 38 <tr> | |
| 39 <td><a href="#HgConflictsListDialog">HgConflictsListDialog</a></td> | |
| 40 <td>Class implementing a dialog to show a list of files which had or still have conflicts.</td> | |
| 41 </tr> | |
| 42 </table> | |
| 43 <h3>Functions</h3> | |
| 44 | |
| 45 <table> | |
| 46 <tr><td>None</td></tr> | |
| 47 </table> | |
| 48 <hr /> | |
| 49 <hr /> | |
| 50 <a NAME="HgConflictsListDialog" ID="HgConflictsListDialog"></a> | |
| 51 <h2>HgConflictsListDialog</h2> | |
| 52 | |
| 53 <p> | |
| 54 Class implementing a dialog to show a list of files which had or still | |
| 55 have conflicts. | |
| 56 </p> | |
| 57 <h3>Derived from</h3> | |
| 58 QWidget, Ui_HgConflictsListDialog | |
| 59 <h3>Class Attributes</h3> | |
| 60 | |
| 61 <table> | |
| 62 <tr><td>FilenameRole</td></tr><tr><td>StatusRole</td></tr> | |
| 63 </table> | |
| 64 <h3>Class Methods</h3> | |
| 65 | |
| 66 <table> | |
| 67 <tr><td>None</td></tr> | |
| 68 </table> | |
| 69 <h3>Methods</h3> | |
| 70 | |
| 71 <table> | |
| 72 | |
| 73 <tr> | |
| 74 <td><a href="#HgConflictsListDialog.__init__">HgConflictsListDialog</a></td> | |
| 75 <td>Constructor</td> | |
| 76 </tr> | |
| 77 <tr> | |
| 78 <td><a href="#HgConflictsListDialog.__finish">__finish</a></td> | |
| 79 <td>Private slot called when the process finished or the user pressed the button.</td> | |
| 80 </tr> | |
| 81 <tr> | |
| 82 <td><a href="#HgConflictsListDialog.__generateItem">__generateItem</a></td> | |
| 83 <td>Private method to generate a tag item in the tag list.</td> | |
| 84 </tr> | |
| 85 <tr> | |
| 86 <td><a href="#HgConflictsListDialog.__getEntries">__getEntries</a></td> | |
| 87 <td>Private method to get the conflict entries.</td> | |
| 88 </tr> | |
| 89 <tr> | |
| 90 <td><a href="#HgConflictsListDialog.__processOutputLine">__processOutputLine</a></td> | |
| 91 <td>Private method to process the lines of output.</td> | |
| 92 </tr> | |
| 93 <tr> | |
| 94 <td><a href="#HgConflictsListDialog.__resizeColumns">__resizeColumns</a></td> | |
| 95 <td>Private method to resize the list columns.</td> | |
| 96 </tr> | |
| 97 <tr> | |
| 98 <td><a href="#HgConflictsListDialog.__resort">__resort</a></td> | |
| 99 <td>Private method to resort the tree.</td> | |
| 100 </tr> | |
| 101 <tr> | |
| 102 <td><a href="#HgConflictsListDialog.__showError">__showError</a></td> | |
| 103 <td>Private slot to show some error.</td> | |
| 104 </tr> | |
| 105 <tr> | |
| 106 <td><a href="#HgConflictsListDialog.closeEvent">closeEvent</a></td> | |
| 107 <td>Protected slot implementing a close event handler.</td> | |
| 108 </tr> | |
| 109 <tr> | |
| 110 <td><a href="#HgConflictsListDialog.on_buttonBox_clicked">on_buttonBox_clicked</a></td> | |
| 111 <td>Private slot called by a button of the button box clicked.</td> | |
| 112 </tr> | |
| 113 <tr> | |
| 114 <td><a href="#HgConflictsListDialog.on_conflictsList_itemDoubleClicked">on_conflictsList_itemDoubleClicked</a></td> | |
| 115 <td>Private slot to open the double clicked entry.</td> | |
| 116 </tr> | |
| 117 <tr> | |
| 118 <td><a href="#HgConflictsListDialog.on_conflictsList_itemSelectionChanged">on_conflictsList_itemSelectionChanged</a></td> | |
| 119 <td>Private slot to handle a change of selected conflict entries.</td> | |
| 120 </tr> | |
| 121 <tr> | |
| 122 <td><a href="#HgConflictsListDialog.on_editButton_clicked">on_editButton_clicked</a></td> | |
| 123 <td>Private slot to open the selected file in an editor.</td> | |
| 124 </tr> | |
| 125 <tr> | |
| 126 <td><a href="#HgConflictsListDialog.on_reMergeButton_clicked">on_reMergeButton_clicked</a></td> | |
| 127 <td>Private slot to re-merge the selected entries.</td> | |
| 128 </tr> | |
| 129 <tr> | |
| 130 <td><a href="#HgConflictsListDialog.on_refreshButton_clicked">on_refreshButton_clicked</a></td> | |
| 131 <td>Private slot to refresh the log.</td> | |
| 132 </tr> | |
| 133 <tr> | |
| 134 <td><a href="#HgConflictsListDialog.on_resolvedButton_clicked">on_resolvedButton_clicked</a></td> | |
| 135 <td>Private slot to mark the selected entries as resolved.</td> | |
| 136 </tr> | |
| 137 <tr> | |
| 138 <td><a href="#HgConflictsListDialog.on_unresolvedButton_clicked">on_unresolvedButton_clicked</a></td> | |
| 139 <td>Private slot to mark the selected entries as unresolved.</td> | |
| 140 </tr> | |
| 141 <tr> | |
| 142 <td><a href="#HgConflictsListDialog.show">show</a></td> | |
| 143 <td>Public slot to show the dialog.</td> | |
| 144 </tr> | |
| 145 <tr> | |
| 146 <td><a href="#HgConflictsListDialog.start">start</a></td> | |
| 147 <td>Public slot to start the tags command.</td> | |
| 148 </tr> | |
| 149 </table> | |
| 150 <h3>Static Methods</h3> | |
| 151 | |
| 152 <table> | |
| 153 <tr><td>None</td></tr> | |
| 154 </table> | |
| 155 | |
| 156 <a NAME="HgConflictsListDialog.__init__" ID="HgConflictsListDialog.__init__"></a> | |
| 157 <h4>HgConflictsListDialog (Constructor)</h4> | |
| 158 <b>HgConflictsListDialog</b>(<i>vcs, parent=None</i>) | |
| 159 | |
| 160 <p> | |
| 161 Constructor | |
| 162 </p> | |
| 163 <dl> | |
| 164 | |
| 165 <dt><i>vcs</i></dt> | |
| 166 <dd> | |
| 167 reference to the vcs object | |
| 168 </dd> | |
| 169 <dt><i>parent</i></dt> | |
| 170 <dd> | |
| 171 parent widget (QWidget) | |
| 172 </dd> | |
| 173 </dl> | |
| 174 <a NAME="HgConflictsListDialog.__finish" ID="HgConflictsListDialog.__finish"></a> | |
| 175 <h4>HgConflictsListDialog.__finish</h4> | |
| 176 <b>__finish</b>(<i></i>) | |
| 177 | |
| 178 <p> | |
| 179 Private slot called when the process finished or the user pressed | |
| 180 the button. | |
| 181 </p> | |
| 182 <a NAME="HgConflictsListDialog.__generateItem" ID="HgConflictsListDialog.__generateItem"></a> | |
| 183 <h4>HgConflictsListDialog.__generateItem</h4> | |
| 184 <b>__generateItem</b>(<i>status, name</i>) | |
| 185 | |
| 186 <p> | |
| 187 Private method to generate a tag item in the tag list. | |
| 188 </p> | |
| 189 <dl> | |
| 190 | |
| 191 <dt><i>status</i></dt> | |
| 192 <dd> | |
| 193 status of the file (string) | |
| 194 </dd> | |
| 195 <dt><i>name</i></dt> | |
| 196 <dd> | |
| 197 name of the file (string) | |
| 198 </dd> | |
| 199 </dl> | |
| 200 <a NAME="HgConflictsListDialog.__getEntries" ID="HgConflictsListDialog.__getEntries"></a> | |
| 201 <h4>HgConflictsListDialog.__getEntries</h4> | |
| 202 <b>__getEntries</b>(<i></i>) | |
| 203 | |
| 204 <p> | |
| 205 Private method to get the conflict entries. | |
| 206 </p> | |
| 207 <a NAME="HgConflictsListDialog.__processOutputLine" ID="HgConflictsListDialog.__processOutputLine"></a> | |
| 208 <h4>HgConflictsListDialog.__processOutputLine</h4> | |
| 209 <b>__processOutputLine</b>(<i>line</i>) | |
| 210 | |
| 211 <p> | |
| 212 Private method to process the lines of output. | |
| 213 </p> | |
| 214 <dl> | |
| 215 | |
| 216 <dt><i>line</i></dt> | |
| 217 <dd> | |
| 218 output line to be processed (string) | |
| 219 </dd> | |
| 220 </dl> | |
| 221 <a NAME="HgConflictsListDialog.__resizeColumns" ID="HgConflictsListDialog.__resizeColumns"></a> | |
| 222 <h4>HgConflictsListDialog.__resizeColumns</h4> | |
| 223 <b>__resizeColumns</b>(<i></i>) | |
| 224 | |
| 225 <p> | |
| 226 Private method to resize the list columns. | |
| 227 </p> | |
| 228 <a NAME="HgConflictsListDialog.__resort" ID="HgConflictsListDialog.__resort"></a> | |
| 229 <h4>HgConflictsListDialog.__resort</h4> | |
| 230 <b>__resort</b>(<i></i>) | |
| 231 | |
| 232 <p> | |
| 233 Private method to resort the tree. | |
| 234 </p> | |
| 235 <a NAME="HgConflictsListDialog.__showError" ID="HgConflictsListDialog.__showError"></a> | |
| 236 <h4>HgConflictsListDialog.__showError</h4> | |
| 237 <b>__showError</b>(<i>out</i>) | |
| 238 | |
| 239 <p> | |
| 240 Private slot to show some error. | |
| 241 </p> | |
| 242 <dl> | |
| 243 | |
| 244 <dt><i>out</i></dt> | |
| 245 <dd> | |
| 246 error to be shown (string) | |
| 247 </dd> | |
| 248 </dl> | |
| 249 <a NAME="HgConflictsListDialog.closeEvent" ID="HgConflictsListDialog.closeEvent"></a> | |
| 250 <h4>HgConflictsListDialog.closeEvent</h4> | |
| 251 <b>closeEvent</b>(<i>e</i>) | |
| 252 | |
| 253 <p> | |
| 254 Protected slot implementing a close event handler. | |
| 255 </p> | |
| 256 <dl> | |
| 257 | |
| 258 <dt><i>e</i></dt> | |
| 259 <dd> | |
| 260 close event (QCloseEvent) | |
| 261 </dd> | |
| 262 </dl> | |
| 263 <a NAME="HgConflictsListDialog.on_buttonBox_clicked" ID="HgConflictsListDialog.on_buttonBox_clicked"></a> | |
| 264 <h4>HgConflictsListDialog.on_buttonBox_clicked</h4> | |
| 265 <b>on_buttonBox_clicked</b>(<i>button</i>) | |
| 266 | |
| 267 <p> | |
| 268 Private slot called by a button of the button box clicked. | |
| 269 </p> | |
| 270 <dl> | |
| 271 | |
| 272 <dt><i>button</i></dt> | |
| 273 <dd> | |
| 274 button that was clicked (QAbstractButton) | |
| 275 </dd> | |
| 276 </dl> | |
| 277 <a NAME="HgConflictsListDialog.on_conflictsList_itemDoubleClicked" ID="HgConflictsListDialog.on_conflictsList_itemDoubleClicked"></a> | |
| 278 <h4>HgConflictsListDialog.on_conflictsList_itemDoubleClicked</h4> | |
| 279 <b>on_conflictsList_itemDoubleClicked</b>(<i>item, column</i>) | |
| 280 | |
| 281 <p> | |
| 282 Private slot to open the double clicked entry. | |
| 283 </p> | |
| 284 <dl> | |
| 285 | |
| 286 <dt><i>item</i></dt> | |
| 287 <dd> | |
| 288 reference to the double clicked item (QTreeWidgetItem) | |
| 289 </dd> | |
| 290 <dt><i>column</i></dt> | |
| 291 <dd> | |
| 292 column that was double clicked (integer) | |
| 293 </dd> | |
| 294 </dl> | |
| 295 <a NAME="HgConflictsListDialog.on_conflictsList_itemSelectionChanged" ID="HgConflictsListDialog.on_conflictsList_itemSelectionChanged"></a> | |
| 296 <h4>HgConflictsListDialog.on_conflictsList_itemSelectionChanged</h4> | |
| 297 <b>on_conflictsList_itemSelectionChanged</b>(<i></i>) | |
| 298 | |
| 299 <p> | |
| 300 Private slot to handle a change of selected conflict entries. | |
| 301 </p> | |
| 302 <a NAME="HgConflictsListDialog.on_editButton_clicked" ID="HgConflictsListDialog.on_editButton_clicked"></a> | |
| 303 <h4>HgConflictsListDialog.on_editButton_clicked</h4> | |
| 304 <b>on_editButton_clicked</b>(<i></i>) | |
| 305 | |
| 306 <p> | |
| 307 Private slot to open the selected file in an editor. | |
| 308 </p> | |
| 309 <a NAME="HgConflictsListDialog.on_reMergeButton_clicked" ID="HgConflictsListDialog.on_reMergeButton_clicked"></a> | |
| 310 <h4>HgConflictsListDialog.on_reMergeButton_clicked</h4> | |
| 311 <b>on_reMergeButton_clicked</b>(<i></i>) | |
| 312 | |
| 313 <p> | |
| 314 Private slot to re-merge the selected entries. | |
| 315 </p> | |
| 316 <a NAME="HgConflictsListDialog.on_refreshButton_clicked" ID="HgConflictsListDialog.on_refreshButton_clicked"></a> | |
| 317 <h4>HgConflictsListDialog.on_refreshButton_clicked</h4> | |
| 318 <b>on_refreshButton_clicked</b>(<i></i>) | |
| 319 | |
| 320 <p> | |
| 321 Private slot to refresh the log. | |
| 322 </p> | |
| 323 <a NAME="HgConflictsListDialog.on_resolvedButton_clicked" ID="HgConflictsListDialog.on_resolvedButton_clicked"></a> | |
| 324 <h4>HgConflictsListDialog.on_resolvedButton_clicked</h4> | |
| 325 <b>on_resolvedButton_clicked</b>(<i></i>) | |
| 326 | |
| 327 <p> | |
| 328 Private slot to mark the selected entries as resolved. | |
| 329 </p> | |
| 330 <a NAME="HgConflictsListDialog.on_unresolvedButton_clicked" ID="HgConflictsListDialog.on_unresolvedButton_clicked"></a> | |
| 331 <h4>HgConflictsListDialog.on_unresolvedButton_clicked</h4> | |
| 332 <b>on_unresolvedButton_clicked</b>(<i></i>) | |
| 333 | |
| 334 <p> | |
| 335 Private slot to mark the selected entries as unresolved. | |
| 336 </p> | |
| 337 <a NAME="HgConflictsListDialog.show" ID="HgConflictsListDialog.show"></a> | |
| 338 <h4>HgConflictsListDialog.show</h4> | |
| 339 <b>show</b>(<i></i>) | |
| 340 | |
| 341 <p> | |
| 342 Public slot to show the dialog. | |
| 343 </p> | |
| 344 <a NAME="HgConflictsListDialog.start" ID="HgConflictsListDialog.start"></a> | |
| 345 <h4>HgConflictsListDialog.start</h4> | |
| 346 <b>start</b>(<i></i>) | |
| 347 | |
| 348 <p> | |
| 349 Public slot to start the tags command. | |
| 350 </p> | |
| 351 <div align="right"><a href="#top">Up</a></div> | |
| 352 <hr /> | |
| 353 </body></html> |
