[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Issue 284: TortoiseMerge Accelerator Key & Menu Reorganisation

From: Jeremy Whitby <jeremy.whitby_at_googlemail.com>
Date: 2006-09-11 22:24:35 CEST

Stefan Küng wrote:
> Jeremy Whitby wrote:
>> Stefan Küng wrote:
>> OK, Please find attached patch to implement Issue 284.
>> Note:
>> 1. Previously, each view (left, right, bottom) had their own
>> independent cursors, this patch synchronises the cursors between
>> views. As each window scrolled when any cursor was changed this does
>> not seem to me to be a problem.
>> 2. I have done nothing with the langauge po file as I'm unsure how
>> the internationalisation stuff is handled.
>> 3. The new icons on the toolbar are just smudged clones of the diff,
>> conflict ones. Since my skills are nowhere near Lubbe's I took a
>> shortcut here.
>> I hope the patch is of use
>> Regards
>> Jeremy Whitby
>> ------------------------------------------------------------------------
>> Index: src/Resources/Toolbar.bmp
>> ===================================================================
>> Cannot display: file marked as a binary type.
>> svn:mime-type = image/bmp
> Can you please send the Toolbar.bmp separately? A unified diff doesn't
> contain binary data (unfortunately).
> And if it's not too much to ask: please also provide a log message for
> the patch.
> And thanks a *lot* for the patch!
> Stefan

Please find attached the toolbar.bmp, apologies for not realizing that
it would not be in the diff.

As for a log message how about the following:

"Add accelerator keys to Text block selection:
    Use Text Block from "Theirs": (Ctrl+)F9
    Use Text Block from "Mine": (Ctrl+)F10
    Use Text Block from "Theirs" before "Mine": (Ctrl+)Shift+F9
    Use Text Block from "Mine" before "Theirs": (Ctrl+)Shift+F10

Rename the "Merge" menu item to "Navigate"

Previously, each view (left, right, bottom) had their own independent
cursors, this patch synchronizes the cursors between views. "

I'm pleased you think the patch will be of use I just wanted to
contribute in some small way as you have done a brilliant job on
TortoiseSVN. Keep up the great work!



To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org

Received on Mon Sep 11 22:30:52 2006

This is an archived mail posted to the TortoiseSVN Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.