[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: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2006-09-11 17:55:46 CEST

Jeremy Whitby wrote:
> Stefan Küng wrote:
>> Jeremy Whitby wrote:
>>> Should all three functions (Search, differences, conflicts) use the
>>> same cursor or should we introduce a search cursor and a view cursor
>>> to go alongside the difference and conflict cursors? Or have I
>>> missed something when looking at the code?
>> I think we should just use the same cursor for all three functions
>> (search, diffs/conflicts and views).
>> Stefan
> 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!


   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Mon Sep 11 18:54:56 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.