Mercurial Repositories > eric / file comparison
comparison: Documentation/Source/eric5.UI.CompareDialog.html
Documentation/Source/eric5.UI.CompareDialog.html
- changeset 3018
- 70924c0bdaf1
- parent 2835
- 678978fe9ffd
equal
deleted
inserted
replaced
| 3017:6a8cb7632448 | 3018:70924c0bdaf1 |
|---|---|
| 19 </style> | 19 </style> |
| 20 </head> | 20 </head> |
| 21 <body><a NAME="top" ID="top"></a> | 21 <body><a NAME="top" ID="top"></a> |
| 22 <h1>eric5.UI.CompareDialog</h1> | 22 <h1>eric5.UI.CompareDialog</h1> |
| 23 <p> | 23 <p> |
| 24 Module implementing a dialog to compare two files and show the result side by side. | 24 Module implementing a dialog to compare two files and show the result side by |
| 25 side. | |
| 25 </p> | 26 </p> |
| 26 <h3>Global Attributes</h3> | 27 <h3>Global Attributes</h3> |
| 27 <table> | 28 <table> |
| 28 <tr><td>None</td></tr> | 29 <tr><td>None</td></tr> |
| 29 </table> | 30 </table> |
| 49 </table> | 50 </table> |
| 50 <hr /><hr /> | 51 <hr /><hr /> |
| 51 <a NAME="CompareDialog" ID="CompareDialog"></a> | 52 <a NAME="CompareDialog" ID="CompareDialog"></a> |
| 52 <h2>CompareDialog</h2> | 53 <h2>CompareDialog</h2> |
| 53 <p> | 54 <p> |
| 54 Class implementing a dialog to compare two files and show the result side by side. | 55 Class implementing a dialog to compare two files and show the result side |
| 56 by side. | |
| 55 </p> | 57 </p> |
| 56 <h3>Derived from</h3> | 58 <h3>Derived from</h3> |
| 57 QWidget, Ui_CompareDialog | 59 QWidget, Ui_CompareDialog |
| 58 <h3>Class Attributes</h3> | 60 <h3>Class Attributes</h3> |
| 59 <table> | 61 <table> |
| 377 <hr /><hr /> | 379 <hr /><hr /> |
| 378 <a NAME="sbsdiff" ID="sbsdiff"></a> | 380 <a NAME="sbsdiff" ID="sbsdiff"></a> |
| 379 <h2>sbsdiff</h2> | 381 <h2>sbsdiff</h2> |
| 380 <b>sbsdiff</b>(<i>a, b, linenumberwidth=4</i>) | 382 <b>sbsdiff</b>(<i>a, b, linenumberwidth=4</i>) |
| 381 <p> | 383 <p> |
| 382 Compare two sequences of lines; generate the delta for display side by side. | 384 Compare two sequences of lines; generate the delta for display side by |
| 385 side. | |
| 383 </p><dl> | 386 </p><dl> |
| 384 <dt><i>a</i></dt> | 387 <dt><i>a</i></dt> |
| 385 <dd> | 388 <dd> |
| 386 first sequence of lines (list of strings) | 389 first sequence of lines (list of strings) |
| 387 </dd><dt><i>b</i></dt> | 390 </dd><dt><i>b</i></dt> |
| 395 <dt>Returns:</dt> | 398 <dt>Returns:</dt> |
| 396 <dd> | 399 <dd> |
| 397 a generator yielding tuples of differences. The tuple is composed | 400 a generator yielding tuples of differences. The tuple is composed |
| 398 of strings as follows. | 401 of strings as follows. |
| 399 <ul> | 402 <ul> |
| 400 <li>opcode -- one of e, d, i, r for equal, delete, insert, replace</li> | 403 <li>opcode -- one of e, d, i, r for equal, delete, insert, |
| 404 replace</li> | |
| 401 <li>lineno a -- linenumber of sequence a</li> | 405 <li>lineno a -- linenumber of sequence a</li> |
| 402 <li>line a -- line of sequence a</li> | 406 <li>line a -- line of sequence a</li> |
| 403 <li>lineno b -- linenumber of sequence b</li> | 407 <li>lineno b -- linenumber of sequence b</li> |
| 404 <li>line b -- line of sequence b</li> | 408 <li>line b -- line of sequence b</li> |
| 405 </ul> | 409 </ul> |
