GNOME Bugzilla – Bug 638436
Add simpler push/pull keyboard shortcuts for two-pane merges
Last modified: 2017-12-13 18:53:39 UTC
From Peter Tyser: If there are only 2 panes, it might be nice to have Alt+<dir> and Alt+Shift+<dir> to do the same thing. Eg if I'm in the left of 2 panes, it'd be nice to just press Alt+right to move a chunk to the right, and Alt+left to pull a chunk from the right. I work in 2-pane mode 98% of the time and I'm having issues remembering to hold shift in for pulls. I'm not a UI expert, so maybe changing the functionality of Alt+Shift+<dir> based on 2/3 panes is a big no-no...
I think this is reasonable enough, since there's basically no other sensible interpretation of e.g., Alt+Right when you're in the right-hand pane. Probably this would have to be implemented as additional keybindings that were added in somewhere like FileDiff.set_num_panes() when there's exactly two panes.
Created attachment 312247 [details] [review] change key binding from shift+alt+<dir> to alt+<dir> Changed data/ui/filediff.ui to change the key binding. Commands used(in order): git pull vi data/ui/filediff.ui git add data/ui/filediff.ui git commit -m 'filediff.ui: Change shift+alt+<dir> to alt+<dir> (bgo#638436)' git format-patch --stdout HEAD~1 > ~/638436.patch Is this ok?
The form of the patch is perfect, thanks! However, the patch itself isn't quite doing the right thing. The idea here is that we'd only add this new behaviour for two-pane comparisons (that is, we *wouldn't* have the behaviour for three-pane comparisons), and it would be additional behaviour, not replacing the existing shortcuts. The desired behaviour is: * If in three-pane mode, nothing changes. Alt+direction pushes a change and Alt+Shift+direction pulls a change. * If in two-pane mode: * Alt+Shift+direction continues to pull a change * Alt+direction pushes a change *if* there is a pane in the direction chosen, or pulls a change if there is not. In other words, if I'm in the left pane and hit Alt+Left, I'm pulling from the right pane. I'm not actually certain how we can accomplish this by the way. We might be able to just add an extra binding in two-pane mode, or we might have to dynamically change the bindings when a pane becomes focused. Let me know if I can help clarify anything.
-- GitLab Migration Automatic Message -- This bug has been migrated to GNOME's GitLab instance and has been closed from further activity. You can subscribe and participate further through the new bug through this link to our GitLab instance: https://gitlab.gnome.org/GNOME/meld/issues/25.