Re: Cursors and keyboards



Hi,

I am sending a small patch that fixed the behaviour of the Push/Pull buttons in the auto merge mode when only the middle pane is editable. 
To be frank, I am not fully convinced all 4 buttons are really needed. Personally, I would keep only Pull ones to make the UI look more tidy. In this case the user will be able to modify the pane where the cursor is, no need to think what button to click. I was thinking about adding new toolbar buttons that will merge all non-conflicting changes from one file to the other, but having another set of 4 buttons would make the UI really difficult to use. 

Cheers,
Piotr

On Tue, Mar 2, 2010 at 6:29 AM, Kai Willadsen <kai willadsen gmail com> wrote:
Hi all,

I've just pushed an updated version of my previous cursor patch. The
main result is that Meld now has toolbar and menu items and keyboard
shortcuts for actions on diff chunks. Not everything is there yet, and
we really need some custom artwork for these actions, but it should be
functional. I've so far been unable to break the actions, sensitivity
setting, etc. but I'm sure someone can come up with a creative corner
case if they try.

Also, I'd encourage people to discuss/bikeshed what actions make
sense. At the moment, we have:
 Alt+Left to replace the chunk to the left with the current chunk
(Push change to left)
 Alt+Right to replace the chunk to the right with the current chunk
(Push change to right)
 Alt+Shift+Right to replace the current chunk with the chunk to the
left (Pull change from left)
 Alt+Shift+Left to replace the current chunk with the chunk to the
right (Pull change from right)
 Alt+Delete to delete the current chunk (Delete change)
Also, to help keep RSI to a minimum, Alt+Up and Alt+Down should
probably become shortcuts for Next/Previous Diff.

Testing and feedback welcomed.

cheers,
Kai
_______________________________________________
meld-list mailing list
meld-list gnome org
http://mail.gnome.org/mailman/listinfo/meld-list

Attachment: 0001-Fix-Push-Pull-buttons-sensitivity.patch
Description: Binary data



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]