Mercurial Repositories > eric / file comparison
comparison: eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsGit.GitStatusDialog.html
eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsGit.GitStatusDialog.html
- branch
- eric7
- changeset 8623
- fced5aa98d41
- parent 8596
- d64760b2da50
equal
deleted
inserted
replaced
| 8622:149d51870ce8 | 8623:fced5aa98d41 |
|---|---|
| 92 <td><a href="#GitStatusDialog.__diff">__diff</a></td> | 92 <td><a href="#GitStatusDialog.__diff">__diff</a></td> |
| 93 <td>Private slot to handle the Diff context menu entry.</td> | 93 <td>Private slot to handle the Diff context menu entry.</td> |
| 94 </tr> | 94 </tr> |
| 95 <tr> | 95 <tr> |
| 96 <td><a href="#GitStatusDialog.__editConflict">__editConflict</a></td> | 96 <td><a href="#GitStatusDialog.__editConflict">__editConflict</a></td> |
| 97 <td>Private slot to handle the Edit file context menu entry.</td> | 97 <td>Private slot to handle the Edit Conflict context menu entry.</td> |
| 98 </tr> | 98 </tr> |
| 99 <tr> | 99 <tr> |
| 100 <td><a href="#GitStatusDialog.__finish">__finish</a></td> | 100 <td><a href="#GitStatusDialog.__finish">__finish</a></td> |
| 101 <td>Private slot called when the process finished or the user pressed the button.</td> | 101 <td>Private slot called when the process finished or the user pressed the button.</td> |
| 102 </tr> | 102 </tr> |
| 192 <td><a href="#GitStatusDialog.__revertHunkOrLines">__revertHunkOrLines</a></td> | 192 <td><a href="#GitStatusDialog.__revertHunkOrLines">__revertHunkOrLines</a></td> |
| 193 <td>Private method to revert the selected lines or hunk.</td> | 193 <td>Private method to revert the selected lines or hunk.</td> |
| 194 </tr> | 194 </tr> |
| 195 <tr> | 195 <tr> |
| 196 <td><a href="#GitStatusDialog.__sbsDiff">__sbsDiff</a></td> | 196 <td><a href="#GitStatusDialog.__sbsDiff">__sbsDiff</a></td> |
| 197 <td>Private slot to handle the Diff context menu entry.</td> | 197 <td>Private slot to handle the Side-By-Side Diff context menu entry.</td> |
| 198 </tr> | 198 </tr> |
| 199 <tr> | 199 <tr> |
| 200 <td><a href="#GitStatusDialog.__selectedLinesIndexes">__selectedLinesIndexes</a></td> | 200 <td><a href="#GitStatusDialog.__selectedLinesIndexes">__selectedLinesIndexes</a></td> |
| 201 <td>Private method to extract the indexes of the selected lines.</td> | 201 <td>Private method to extract the indexes of the selected lines.</td> |
| 202 </tr> | 202 </tr> |
| 374 <a NAME="GitStatusDialog.__editConflict" ID="GitStatusDialog.__editConflict"></a> | 374 <a NAME="GitStatusDialog.__editConflict" ID="GitStatusDialog.__editConflict"></a> |
| 375 <h4>GitStatusDialog.__editConflict</h4> | 375 <h4>GitStatusDialog.__editConflict</h4> |
| 376 <b>__editConflict</b>(<i></i>) | 376 <b>__editConflict</b>(<i></i>) |
| 377 | 377 |
| 378 <p> | 378 <p> |
| 379 Private slot to handle the Edit file context menu entry. | 379 Private slot to handle the Edit Conflict context menu entry. |
| 380 </p> | 380 </p> |
| 381 <a NAME="GitStatusDialog.__finish" ID="GitStatusDialog.__finish"></a> | 381 <a NAME="GitStatusDialog.__finish" ID="GitStatusDialog.__finish"></a> |
| 382 <h4>GitStatusDialog.__finish</h4> | 382 <h4>GitStatusDialog.__finish</h4> |
| 383 <b>__finish</b>(<i></i>) | 383 <b>__finish</b>(<i></i>) |
| 384 | 384 |
| 638 <a NAME="GitStatusDialog.__sbsDiff" ID="GitStatusDialog.__sbsDiff"></a> | 638 <a NAME="GitStatusDialog.__sbsDiff" ID="GitStatusDialog.__sbsDiff"></a> |
| 639 <h4>GitStatusDialog.__sbsDiff</h4> | 639 <h4>GitStatusDialog.__sbsDiff</h4> |
| 640 <b>__sbsDiff</b>(<i></i>) | 640 <b>__sbsDiff</b>(<i></i>) |
| 641 | 641 |
| 642 <p> | 642 <p> |
| 643 Private slot to handle the Diff context menu entry. | 643 Private slot to handle the Side-By-Side Diff context menu entry. |
| 644 </p> | 644 </p> |
| 645 <a NAME="GitStatusDialog.__selectedLinesIndexes" ID="GitStatusDialog.__selectedLinesIndexes"></a> | 645 <a NAME="GitStatusDialog.__selectedLinesIndexes" ID="GitStatusDialog.__selectedLinesIndexes"></a> |
| 646 <h4>GitStatusDialog.__selectedLinesIndexes</h4> | 646 <h4>GitStatusDialog.__selectedLinesIndexes</h4> |
| 647 <b>__selectedLinesIndexes</b>(<i>diffEdit</i>) | 647 <b>__selectedLinesIndexes</b>(<i>diffEdit</i>) |
| 648 | 648 |
