Changes between Version 3 and Version 4 of Features/AutoDiff


Ignore:
Timestamp:
09/21/11 19:14:13 (3 years ago)
Author:
bowtie
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • Features/AutoDiff

    v3 v4  
    44 
    55---- 
    6 == Diff-Icons 
    7 [[Image(diff-icon.png)]] 
     6== Margin Markers 
     7 
     8Revision 16300 marks a new milestone in Padre version control system (VCS) support. You can now type and Padre will automatically calculate differences and display them as margin markers. 
     9* plus (added), dark green. 
     10* minus (deleted), red. 
     11* right arrow markers (changed), blue. 
     12You can click then on those margin markers to show what has actually been added, deleted or changed. 
     13 
     14[[Image(padre_diffs.png)]] 
    815 
    916---- 
     17 
    1018== Diff-Box 
    11 [[Image(diff-box.png)]] 
     19 
     20Just wanted to say that I recently added a differences popup window to Padre's editor. 
     21* You can now traverse all differences in your current document (via **Ctrl + comma**). 
     22* The dialog shows you what was added, deleted or changed at the current difference and enables you to revert the change if needed. 
     23* Padre can also automatically detect and find differences against your local repository (subversion or git) or the locally saved document. 
     24 
     25[[Image(cool_diff_box.png)]] 
    1226 
    1327=== Previous Diff 
    14 [[Image(go-up.png)]] 
     28[[Image(go-up.png)]] Move to Previous Diff. 
    1529 
    1630=== Next Diff 
    17 [[Image(go-down.png)]] 
     31[[Image(go-down.png)]] Move to Next Diff. 
    1832 
    1933=== Revert 
    20 [[Image(edit-undo.png)]] 
     34[[Image(edit-undo.png)]] Revert current Diff. 
    2135---- 
    2236== Miscellaneous