[QBZR][Merge] Add unidiff format to diff dialog

Goffredo Baroncelli kreijack at tiscalinet.it
Mon Oct 15 19:16:54 BST 2007


Ok, I update my patch:
- remove the border (asked by M.Pool)
- correct the error in the font height calculation, now I use html to do the 
highlight (Alexander Belchenko)
- remove the automatic word-wrap (Alexander Belchenko)

Now the highlight style is coded as HTML style, so it is easier to change (see 
function html_unidiff()):
Every unidiff source line is translated as 

	<div style="blablabla">unidiff_line </div>

Where "blablabla" is the style of the line, on the basis of the following 
sequence:

            '---': 'background-color:#c5e3f7; color:black',
            '+++': 'background-color:#c5e3f7; color:black',
            '-':   'background-color:#FFDDDD; color:black',
            '+':   'background-color:#DDFFDD; color:black',
            '@':   'background-color:#c5e3f7; color:black',
            '=':   'background-color:#c5e3f7; color:black',
            defaultstyle = 'background-color:#ffffff; color=black',

BR
Goffredo



-- 
gpg key@ keyserver.linux.it: Goffredo Baroncelli (ghigo) <kreijack at inwind.it>
Key fingerprint = CE3C 7E01 6782 30A3 5B87  87C0 BB86 505C 6B2A CFF9
-------------- next part --------------
A non-text attachment was scrubbed...
Name: diff.bundle.patch
Type: text/x-diff
Size: 11404 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20071015/69ac9e39/attachment-0001.bin 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: image/png
Size: 51029 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20071015/69ac9e39/attachment-0001.png 


More information about the bazaar mailing list