Mercurial Repositories > eric / file comparison
comparison: src/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.html
src/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.html
- branch
- eric7
- changeset 10479
- 856476537696
- parent 10438
- 4cd7e5a8b3cf
- child 10690
- fab36645aa7d
equal
deleted
inserted
replaced
| 10478:de9106c55c3d | 10479:856476537696 |
|---|---|
| 5 <link rel="stylesheet" href="styles.css"> | 5 <link rel="stylesheet" href="styles.css"> |
| 6 </head> | 6 </head> |
| 7 <body> | 7 <body> |
| 8 <a NAME="top" ID="top"></a> | 8 <a NAME="top" ID="top"></a> |
| 9 <h1>eric7.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog</h1> | 9 <h1>eric7.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog</h1> |
| 10 | |
| 11 <p> | 10 <p> |
| 12 Module implementing a dialog to show a list of files which had or still have | 11 Module implementing a dialog to show a list of files which had or still have |
| 13 conflicts. | 12 conflicts. |
| 14 </p> | 13 </p> |
| 14 | |
| 15 <h3>Global Attributes</h3> | 15 <h3>Global Attributes</h3> |
| 16 | |
| 17 <table> | 16 <table> |
| 18 <tr><td>None</td></tr> | 17 <tr><td>None</td></tr> |
| 19 </table> | 18 </table> |
| 19 | |
| 20 <h3>Classes</h3> | 20 <h3>Classes</h3> |
| 21 | 21 <table> |
| 22 <table> | |
| 23 | |
| 24 <tr> | 22 <tr> |
| 25 <td><a href="#HgConflictsListDialog">HgConflictsListDialog</a></td> | 23 <td><a href="#HgConflictsListDialog">HgConflictsListDialog</a></td> |
| 26 <td>Class implementing a dialog to show a list of files which had or still have conflicts.</td> | 24 <td>Class implementing a dialog to show a list of files which had or still have conflicts.</td> |
| 27 </tr> | 25 </tr> |
| 28 </table> | 26 </table> |
| 27 | |
| 29 <h3>Functions</h3> | 28 <h3>Functions</h3> |
| 30 | |
| 31 <table> | 29 <table> |
| 32 <tr><td>None</td></tr> | 30 <tr><td>None</td></tr> |
| 33 </table> | 31 </table> |
| 32 | |
| 34 <hr /> | 33 <hr /> |
| 35 <hr /> | 34 <hr /> |
| 36 <a NAME="HgConflictsListDialog" ID="HgConflictsListDialog"></a> | 35 <a NAME="HgConflictsListDialog" ID="HgConflictsListDialog"></a> |
| 37 <h2>HgConflictsListDialog</h2> | 36 <h2>HgConflictsListDialog</h2> |
| 38 | |
| 39 <p> | 37 <p> |
| 40 Class implementing a dialog to show a list of files which had or still | 38 Class implementing a dialog to show a list of files which had or still |
| 41 have conflicts. | 39 have conflicts. |
| 42 </p> | 40 </p> |
| 41 | |
| 43 <h3>Derived from</h3> | 42 <h3>Derived from</h3> |
| 44 QWidget, Ui_HgConflictsListDialog | 43 QWidget, Ui_HgConflictsListDialog |
| 45 <h3>Class Attributes</h3> | 44 <h3>Class Attributes</h3> |
| 46 | 45 <table> |
| 47 <table> | 46 <tr><td>FilenameRole</td></tr> |
| 48 <tr><td>FilenameRole</td></tr><tr><td>StatusRole</td></tr> | 47 <tr><td>StatusRole</td></tr> |
| 49 </table> | 48 </table> |
| 49 | |
| 50 <h3>Class Methods</h3> | 50 <h3>Class Methods</h3> |
| 51 | |
| 52 <table> | 51 <table> |
| 53 <tr><td>None</td></tr> | 52 <tr><td>None</td></tr> |
| 54 </table> | 53 </table> |
| 54 | |
| 55 <h3>Methods</h3> | 55 <h3>Methods</h3> |
| 56 | 56 <table> |
| 57 <table> | |
| 58 | |
| 59 <tr> | 57 <tr> |
| 60 <td><a href="#HgConflictsListDialog.__init__">HgConflictsListDialog</a></td> | 58 <td><a href="#HgConflictsListDialog.__init__">HgConflictsListDialog</a></td> |
| 61 <td>Constructor</td> | 59 <td>Constructor</td> |
| 62 </tr> | 60 </tr> |
| 63 <tr> | 61 <tr> |
| 131 <tr> | 129 <tr> |
| 132 <td><a href="#HgConflictsListDialog.start">start</a></td> | 130 <td><a href="#HgConflictsListDialog.start">start</a></td> |
| 133 <td>Public slot to start the tags command.</td> | 131 <td>Public slot to start the tags command.</td> |
| 134 </tr> | 132 </tr> |
| 135 </table> | 133 </table> |
| 134 | |
| 136 <h3>Static Methods</h3> | 135 <h3>Static Methods</h3> |
| 137 | |
| 138 <table> | 136 <table> |
| 139 <tr><td>None</td></tr> | 137 <tr><td>None</td></tr> |
| 140 </table> | 138 </table> |
| 139 | |
| 141 | 140 |
| 142 <a NAME="HgConflictsListDialog.__init__" ID="HgConflictsListDialog.__init__"></a> | 141 <a NAME="HgConflictsListDialog.__init__" ID="HgConflictsListDialog.__init__"></a> |
| 143 <h4>HgConflictsListDialog (Constructor)</h4> | 142 <h4>HgConflictsListDialog (Constructor)</h4> |
| 144 <b>HgConflictsListDialog</b>(<i>vcs, parent=None</i>) | 143 <b>HgConflictsListDialog</b>(<i>vcs, parent=None</i>) |
| 145 | |
| 146 <p> | 144 <p> |
| 147 Constructor | 145 Constructor |
| 148 </p> | 146 </p> |
| 147 | |
| 149 <dl> | 148 <dl> |
| 150 | 149 |
| 151 <dt><i>vcs</i> (Hg)</dt> | 150 <dt><i>vcs</i> (Hg)</dt> |
| 152 <dd> | 151 <dd> |
| 153 reference to the vcs object | 152 reference to the vcs object |
| 158 </dd> | 157 </dd> |
| 159 </dl> | 158 </dl> |
| 160 <a NAME="HgConflictsListDialog.__finish" ID="HgConflictsListDialog.__finish"></a> | 159 <a NAME="HgConflictsListDialog.__finish" ID="HgConflictsListDialog.__finish"></a> |
| 161 <h4>HgConflictsListDialog.__finish</h4> | 160 <h4>HgConflictsListDialog.__finish</h4> |
| 162 <b>__finish</b>(<i></i>) | 161 <b>__finish</b>(<i></i>) |
| 163 | |
| 164 <p> | 162 <p> |
| 165 Private slot called when the process finished or the user pressed | 163 Private slot called when the process finished or the user pressed |
| 166 the button. | 164 the button. |
| 167 </p> | 165 </p> |
| 166 | |
| 168 <a NAME="HgConflictsListDialog.__generateItem" ID="HgConflictsListDialog.__generateItem"></a> | 167 <a NAME="HgConflictsListDialog.__generateItem" ID="HgConflictsListDialog.__generateItem"></a> |
| 169 <h4>HgConflictsListDialog.__generateItem</h4> | 168 <h4>HgConflictsListDialog.__generateItem</h4> |
| 170 <b>__generateItem</b>(<i>status, name</i>) | 169 <b>__generateItem</b>(<i>status, name</i>) |
| 171 | |
| 172 <p> | 170 <p> |
| 173 Private method to generate a tag item in the tag list. | 171 Private method to generate a tag item in the tag list. |
| 174 </p> | 172 </p> |
| 173 | |
| 175 <dl> | 174 <dl> |
| 176 | 175 |
| 177 <dt><i>status</i> (str)</dt> | 176 <dt><i>status</i> (str)</dt> |
| 178 <dd> | 177 <dd> |
| 179 status of the file | 178 status of the file |
| 184 </dd> | 183 </dd> |
| 185 </dl> | 184 </dl> |
| 186 <a NAME="HgConflictsListDialog.__getEntries" ID="HgConflictsListDialog.__getEntries"></a> | 185 <a NAME="HgConflictsListDialog.__getEntries" ID="HgConflictsListDialog.__getEntries"></a> |
| 187 <h4>HgConflictsListDialog.__getEntries</h4> | 186 <h4>HgConflictsListDialog.__getEntries</h4> |
| 188 <b>__getEntries</b>(<i></i>) | 187 <b>__getEntries</b>(<i></i>) |
| 189 | |
| 190 <p> | 188 <p> |
| 191 Private method to get the conflict entries. | 189 Private method to get the conflict entries. |
| 192 </p> | 190 </p> |
| 191 | |
| 193 <a NAME="HgConflictsListDialog.__processOutputLine" ID="HgConflictsListDialog.__processOutputLine"></a> | 192 <a NAME="HgConflictsListDialog.__processOutputLine" ID="HgConflictsListDialog.__processOutputLine"></a> |
| 194 <h4>HgConflictsListDialog.__processOutputLine</h4> | 193 <h4>HgConflictsListDialog.__processOutputLine</h4> |
| 195 <b>__processOutputLine</b>(<i>line</i>) | 194 <b>__processOutputLine</b>(<i>line</i>) |
| 196 | |
| 197 <p> | 195 <p> |
| 198 Private method to process the lines of output. | 196 Private method to process the lines of output. |
| 199 </p> | 197 </p> |
| 198 | |
| 200 <dl> | 199 <dl> |
| 201 | 200 |
| 202 <dt><i>line</i> (str)</dt> | 201 <dt><i>line</i> (str)</dt> |
| 203 <dd> | 202 <dd> |
| 204 output line to be processed | 203 output line to be processed |
| 205 </dd> | 204 </dd> |
| 206 </dl> | 205 </dl> |
| 207 <a NAME="HgConflictsListDialog.__resizeColumns" ID="HgConflictsListDialog.__resizeColumns"></a> | 206 <a NAME="HgConflictsListDialog.__resizeColumns" ID="HgConflictsListDialog.__resizeColumns"></a> |
| 208 <h4>HgConflictsListDialog.__resizeColumns</h4> | 207 <h4>HgConflictsListDialog.__resizeColumns</h4> |
| 209 <b>__resizeColumns</b>(<i></i>) | 208 <b>__resizeColumns</b>(<i></i>) |
| 210 | |
| 211 <p> | 209 <p> |
| 212 Private method to resize the list columns. | 210 Private method to resize the list columns. |
| 213 </p> | 211 </p> |
| 212 | |
| 214 <a NAME="HgConflictsListDialog.__resort" ID="HgConflictsListDialog.__resort"></a> | 213 <a NAME="HgConflictsListDialog.__resort" ID="HgConflictsListDialog.__resort"></a> |
| 215 <h4>HgConflictsListDialog.__resort</h4> | 214 <h4>HgConflictsListDialog.__resort</h4> |
| 216 <b>__resort</b>(<i></i>) | 215 <b>__resort</b>(<i></i>) |
| 217 | |
| 218 <p> | 216 <p> |
| 219 Private method to resort the tree. | 217 Private method to resort the tree. |
| 220 </p> | 218 </p> |
| 219 | |
| 221 <a NAME="HgConflictsListDialog.__showError" ID="HgConflictsListDialog.__showError"></a> | 220 <a NAME="HgConflictsListDialog.__showError" ID="HgConflictsListDialog.__showError"></a> |
| 222 <h4>HgConflictsListDialog.__showError</h4> | 221 <h4>HgConflictsListDialog.__showError</h4> |
| 223 <b>__showError</b>(<i>out</i>) | 222 <b>__showError</b>(<i>out</i>) |
| 224 | |
| 225 <p> | 223 <p> |
| 226 Private slot to show some error. | 224 Private slot to show some error. |
| 227 </p> | 225 </p> |
| 226 | |
| 228 <dl> | 227 <dl> |
| 229 | 228 |
| 230 <dt><i>out</i> (str)</dt> | 229 <dt><i>out</i> (str)</dt> |
| 231 <dd> | 230 <dd> |
| 232 error to be shown | 231 error to be shown |
| 233 </dd> | 232 </dd> |
| 234 </dl> | 233 </dl> |
| 235 <a NAME="HgConflictsListDialog.closeEvent" ID="HgConflictsListDialog.closeEvent"></a> | 234 <a NAME="HgConflictsListDialog.closeEvent" ID="HgConflictsListDialog.closeEvent"></a> |
| 236 <h4>HgConflictsListDialog.closeEvent</h4> | 235 <h4>HgConflictsListDialog.closeEvent</h4> |
| 237 <b>closeEvent</b>(<i>e</i>) | 236 <b>closeEvent</b>(<i>e</i>) |
| 238 | |
| 239 <p> | 237 <p> |
| 240 Protected slot implementing a close event handler. | 238 Protected slot implementing a close event handler. |
| 241 </p> | 239 </p> |
| 240 | |
| 242 <dl> | 241 <dl> |
| 243 | 242 |
| 244 <dt><i>e</i> (QCloseEvent)</dt> | 243 <dt><i>e</i> (QCloseEvent)</dt> |
| 245 <dd> | 244 <dd> |
| 246 close event | 245 close event |
| 247 </dd> | 246 </dd> |
| 248 </dl> | 247 </dl> |
| 249 <a NAME="HgConflictsListDialog.on_buttonBox_clicked" ID="HgConflictsListDialog.on_buttonBox_clicked"></a> | 248 <a NAME="HgConflictsListDialog.on_buttonBox_clicked" ID="HgConflictsListDialog.on_buttonBox_clicked"></a> |
| 250 <h4>HgConflictsListDialog.on_buttonBox_clicked</h4> | 249 <h4>HgConflictsListDialog.on_buttonBox_clicked</h4> |
| 251 <b>on_buttonBox_clicked</b>(<i>button</i>) | 250 <b>on_buttonBox_clicked</b>(<i>button</i>) |
| 252 | |
| 253 <p> | 251 <p> |
| 254 Private slot called by a button of the button box clicked. | 252 Private slot called by a button of the button box clicked. |
| 255 </p> | 253 </p> |
| 254 | |
| 256 <dl> | 255 <dl> |
| 257 | 256 |
| 258 <dt><i>button</i> (QAbstractButton)</dt> | 257 <dt><i>button</i> (QAbstractButton)</dt> |
| 259 <dd> | 258 <dd> |
| 260 button that was clicked | 259 button that was clicked |
| 261 </dd> | 260 </dd> |
| 262 </dl> | 261 </dl> |
| 263 <a NAME="HgConflictsListDialog.on_conflictsList_itemDoubleClicked" ID="HgConflictsListDialog.on_conflictsList_itemDoubleClicked"></a> | 262 <a NAME="HgConflictsListDialog.on_conflictsList_itemDoubleClicked" ID="HgConflictsListDialog.on_conflictsList_itemDoubleClicked"></a> |
| 264 <h4>HgConflictsListDialog.on_conflictsList_itemDoubleClicked</h4> | 263 <h4>HgConflictsListDialog.on_conflictsList_itemDoubleClicked</h4> |
| 265 <b>on_conflictsList_itemDoubleClicked</b>(<i>item, column</i>) | 264 <b>on_conflictsList_itemDoubleClicked</b>(<i>item, column</i>) |
| 266 | |
| 267 <p> | 265 <p> |
| 268 Private slot to open the double clicked entry. | 266 Private slot to open the double clicked entry. |
| 269 </p> | 267 </p> |
| 268 | |
| 270 <dl> | 269 <dl> |
| 271 | 270 |
| 272 <dt><i>item</i> (QTreeWidgetItem)</dt> | 271 <dt><i>item</i> (QTreeWidgetItem)</dt> |
| 273 <dd> | 272 <dd> |
| 274 reference to the double clicked item | 273 reference to the double clicked item |
| 279 </dd> | 278 </dd> |
| 280 </dl> | 279 </dl> |
| 281 <a NAME="HgConflictsListDialog.on_conflictsList_itemSelectionChanged" ID="HgConflictsListDialog.on_conflictsList_itemSelectionChanged"></a> | 280 <a NAME="HgConflictsListDialog.on_conflictsList_itemSelectionChanged" ID="HgConflictsListDialog.on_conflictsList_itemSelectionChanged"></a> |
| 282 <h4>HgConflictsListDialog.on_conflictsList_itemSelectionChanged</h4> | 281 <h4>HgConflictsListDialog.on_conflictsList_itemSelectionChanged</h4> |
| 283 <b>on_conflictsList_itemSelectionChanged</b>(<i></i>) | 282 <b>on_conflictsList_itemSelectionChanged</b>(<i></i>) |
| 284 | |
| 285 <p> | 283 <p> |
| 286 Private slot to handle a change of selected conflict entries. | 284 Private slot to handle a change of selected conflict entries. |
| 287 </p> | 285 </p> |
| 286 | |
| 288 <a NAME="HgConflictsListDialog.on_editButton_clicked" ID="HgConflictsListDialog.on_editButton_clicked"></a> | 287 <a NAME="HgConflictsListDialog.on_editButton_clicked" ID="HgConflictsListDialog.on_editButton_clicked"></a> |
| 289 <h4>HgConflictsListDialog.on_editButton_clicked</h4> | 288 <h4>HgConflictsListDialog.on_editButton_clicked</h4> |
| 290 <b>on_editButton_clicked</b>(<i></i>) | 289 <b>on_editButton_clicked</b>(<i></i>) |
| 291 | |
| 292 <p> | 290 <p> |
| 293 Private slot to open the selected file in an editor. | 291 Private slot to open the selected file in an editor. |
| 294 </p> | 292 </p> |
| 293 | |
| 295 <a NAME="HgConflictsListDialog.on_reMergeButton_clicked" ID="HgConflictsListDialog.on_reMergeButton_clicked"></a> | 294 <a NAME="HgConflictsListDialog.on_reMergeButton_clicked" ID="HgConflictsListDialog.on_reMergeButton_clicked"></a> |
| 296 <h4>HgConflictsListDialog.on_reMergeButton_clicked</h4> | 295 <h4>HgConflictsListDialog.on_reMergeButton_clicked</h4> |
| 297 <b>on_reMergeButton_clicked</b>(<i></i>) | 296 <b>on_reMergeButton_clicked</b>(<i></i>) |
| 298 | |
| 299 <p> | 297 <p> |
| 300 Private slot to re-merge the selected entries. | 298 Private slot to re-merge the selected entries. |
| 301 </p> | 299 </p> |
| 300 | |
| 302 <a NAME="HgConflictsListDialog.on_refreshButton_clicked" ID="HgConflictsListDialog.on_refreshButton_clicked"></a> | 301 <a NAME="HgConflictsListDialog.on_refreshButton_clicked" ID="HgConflictsListDialog.on_refreshButton_clicked"></a> |
| 303 <h4>HgConflictsListDialog.on_refreshButton_clicked</h4> | 302 <h4>HgConflictsListDialog.on_refreshButton_clicked</h4> |
| 304 <b>on_refreshButton_clicked</b>(<i></i>) | 303 <b>on_refreshButton_clicked</b>(<i></i>) |
| 305 | |
| 306 <p> | 304 <p> |
| 307 Private slot to refresh the log. | 305 Private slot to refresh the log. |
| 308 </p> | 306 </p> |
| 307 | |
| 309 <a NAME="HgConflictsListDialog.on_resolvedButton_clicked" ID="HgConflictsListDialog.on_resolvedButton_clicked"></a> | 308 <a NAME="HgConflictsListDialog.on_resolvedButton_clicked" ID="HgConflictsListDialog.on_resolvedButton_clicked"></a> |
| 310 <h4>HgConflictsListDialog.on_resolvedButton_clicked</h4> | 309 <h4>HgConflictsListDialog.on_resolvedButton_clicked</h4> |
| 311 <b>on_resolvedButton_clicked</b>(<i></i>) | 310 <b>on_resolvedButton_clicked</b>(<i></i>) |
| 312 | |
| 313 <p> | 311 <p> |
| 314 Private slot to mark the selected entries as resolved. | 312 Private slot to mark the selected entries as resolved. |
| 315 </p> | 313 </p> |
| 314 | |
| 316 <a NAME="HgConflictsListDialog.on_unresolvedButton_clicked" ID="HgConflictsListDialog.on_unresolvedButton_clicked"></a> | 315 <a NAME="HgConflictsListDialog.on_unresolvedButton_clicked" ID="HgConflictsListDialog.on_unresolvedButton_clicked"></a> |
| 317 <h4>HgConflictsListDialog.on_unresolvedButton_clicked</h4> | 316 <h4>HgConflictsListDialog.on_unresolvedButton_clicked</h4> |
| 318 <b>on_unresolvedButton_clicked</b>(<i></i>) | 317 <b>on_unresolvedButton_clicked</b>(<i></i>) |
| 319 | |
| 320 <p> | 318 <p> |
| 321 Private slot to mark the selected entries as unresolved. | 319 Private slot to mark the selected entries as unresolved. |
| 322 </p> | 320 </p> |
| 321 | |
| 323 <a NAME="HgConflictsListDialog.show" ID="HgConflictsListDialog.show"></a> | 322 <a NAME="HgConflictsListDialog.show" ID="HgConflictsListDialog.show"></a> |
| 324 <h4>HgConflictsListDialog.show</h4> | 323 <h4>HgConflictsListDialog.show</h4> |
| 325 <b>show</b>(<i></i>) | 324 <b>show</b>(<i></i>) |
| 326 | |
| 327 <p> | 325 <p> |
| 328 Public slot to show the dialog. | 326 Public slot to show the dialog. |
| 329 </p> | 327 </p> |
| 328 | |
| 330 <a NAME="HgConflictsListDialog.start" ID="HgConflictsListDialog.start"></a> | 329 <a NAME="HgConflictsListDialog.start" ID="HgConflictsListDialog.start"></a> |
| 331 <h4>HgConflictsListDialog.start</h4> | 330 <h4>HgConflictsListDialog.start</h4> |
| 332 <b>start</b>(<i></i>) | 331 <b>start</b>(<i></i>) |
| 333 | |
| 334 <p> | 332 <p> |
| 335 Public slot to start the tags command. | 333 Public slot to start the tags command. |
| 336 </p> | 334 </p> |
| 335 | |
| 337 <div align="right"><a href="#top">Up</a></div> | 336 <div align="right"><a href="#top">Up</a></div> |
| 338 <hr /> | 337 <hr /> |
| 339 </body></html> | 338 </body></html> |
