Mercurial Repositories > eric / file comparison
comparison: Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.html
Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.html
- changeset 3591
- 2f2a4a76dd22
- parent 3586
- 6e3a6c5b58bf
equal
deleted
inserted
replaced
| 3590:5280e37405b8 | 3591:2f2a4a76dd22 |
|---|---|
| 48 </p> | 48 </p> |
| 49 <h3>Derived from</h3> | 49 <h3>Derived from</h3> |
| 50 QWidget, Ui_HgConflictsListDialog | 50 QWidget, Ui_HgConflictsListDialog |
| 51 <h3>Class Attributes</h3> | 51 <h3>Class Attributes</h3> |
| 52 <table> | 52 <table> |
| 53 <tr><td>StatusRole</td></tr> | 53 <tr><td>FilenameRole</td></tr><tr><td>StatusRole</td></tr> |
| 54 </table> | 54 </table> |
| 55 <h3>Class Methods</h3> | 55 <h3>Class Methods</h3> |
| 56 <table> | 56 <table> |
| 57 <tr><td>None</td></tr> | 57 <tr><td>None</td></tr> |
| 58 </table> | 58 </table> |
| 91 </tr><tr> | 91 </tr><tr> |
| 92 <td><a href="#HgConflictsListDialog.__showError">__showError</a></td> | 92 <td><a href="#HgConflictsListDialog.__showError">__showError</a></td> |
| 93 <td>Private slot to show some error.</td> | 93 <td>Private slot to show some error.</td> |
| 94 </tr><tr> | 94 </tr><tr> |
| 95 <td><a href="#HgConflictsListDialog.closeEvent">closeEvent</a></td> | 95 <td><a href="#HgConflictsListDialog.closeEvent">closeEvent</a></td> |
| 96 <td>Private slot implementing a close event handler.</td> | 96 <td>Protected slot implementing a close event handler.</td> |
| 97 </tr><tr> | 97 </tr><tr> |
| 98 <td><a href="#HgConflictsListDialog.keyPressEvent">keyPressEvent</a></td> | 98 <td><a href="#HgConflictsListDialog.keyPressEvent">keyPressEvent</a></td> |
| 99 <td>Protected slot to handle a key press event.</td> | 99 <td>Protected slot to handle a key press event.</td> |
| 100 </tr><tr> | 100 </tr><tr> |
| 101 <td><a href="#HgConflictsListDialog.on_buttonBox_clicked">on_buttonBox_clicked</a></td> | 101 <td><a href="#HgConflictsListDialog.on_buttonBox_clicked">on_buttonBox_clicked</a></td> |
| 240 </dd> | 240 </dd> |
| 241 </dl><a NAME="HgConflictsListDialog.closeEvent" ID="HgConflictsListDialog.closeEvent"></a> | 241 </dl><a NAME="HgConflictsListDialog.closeEvent" ID="HgConflictsListDialog.closeEvent"></a> |
| 242 <h4>HgConflictsListDialog.closeEvent</h4> | 242 <h4>HgConflictsListDialog.closeEvent</h4> |
| 243 <b>closeEvent</b>(<i>e</i>) | 243 <b>closeEvent</b>(<i>e</i>) |
| 244 <p> | 244 <p> |
| 245 Private slot implementing a close event handler. | 245 Protected slot implementing a close event handler. |
| 246 </p><dl> | 246 </p><dl> |
| 247 <dt><i>e</i></dt> | 247 <dt><i>e</i></dt> |
| 248 <dd> | 248 <dd> |
| 249 close event (QCloseEvent) | 249 close event (QCloseEvent) |
| 250 </dd> | 250 </dd> |
| 271 </dl><a NAME="HgConflictsListDialog.on_conflictsList_itemDoubleClicked" ID="HgConflictsListDialog.on_conflictsList_itemDoubleClicked"></a> | 271 </dl><a NAME="HgConflictsListDialog.on_conflictsList_itemDoubleClicked" ID="HgConflictsListDialog.on_conflictsList_itemDoubleClicked"></a> |
| 272 <h4>HgConflictsListDialog.on_conflictsList_itemDoubleClicked</h4> | 272 <h4>HgConflictsListDialog.on_conflictsList_itemDoubleClicked</h4> |
| 273 <b>on_conflictsList_itemDoubleClicked</b>(<i>item, column</i>) | 273 <b>on_conflictsList_itemDoubleClicked</b>(<i>item, column</i>) |
| 274 <p> | 274 <p> |
| 275 Private slot to open the double clicked entry. | 275 Private slot to open the double clicked entry. |
| 276 </p><a NAME="HgConflictsListDialog.on_conflictsList_itemSelectionChanged" ID="HgConflictsListDialog.on_conflictsList_itemSelectionChanged"></a> | 276 </p><dl> |
| 277 <dt><i>item</i></dt> | |
| 278 <dd> | |
| 279 reference to the double clicked item (QTreeWidgetItem) | |
| 280 </dd><dt><i>column</i></dt> | |
| 281 <dd> | |
| 282 column that was double clicked (integer) | |
| 283 </dd> | |
| 284 </dl><a NAME="HgConflictsListDialog.on_conflictsList_itemSelectionChanged" ID="HgConflictsListDialog.on_conflictsList_itemSelectionChanged"></a> | |
| 277 <h4>HgConflictsListDialog.on_conflictsList_itemSelectionChanged</h4> | 285 <h4>HgConflictsListDialog.on_conflictsList_itemSelectionChanged</h4> |
| 278 <b>on_conflictsList_itemSelectionChanged</b>(<i></i>) | 286 <b>on_conflictsList_itemSelectionChanged</b>(<i></i>) |
| 279 <p> | 287 <p> |
| 280 Private slot to handle a change of selected conflict entries. | 288 Private slot to handle a change of selected conflict entries. |
| 281 </p><a NAME="HgConflictsListDialog.on_editButton_clicked" ID="HgConflictsListDialog.on_editButton_clicked"></a> | 289 </p><a NAME="HgConflictsListDialog.on_editButton_clicked" ID="HgConflictsListDialog.on_editButton_clicked"></a> |
