[Xfce4-commits] <libxfce4ui:master> Merge branch 'jeromeg/keyboard-shortcuts' of ssh://git.xfce.org/xfce/libxfce4ui into jeromeg/keyboard-shortcuts

[Jérôme Guelfucci]

Updating branch refs/heads/master
         to f79efc609adea4155683c5d3cf381823f60ce95c (commit)
       from dcac544ec6c81e0f1e1b024b32ad56f753ea75c1 (commit)

commit f79efc609adea4155683c5d3cf381823f60ce95c
Merge: dcac544 154454e
Author: Jérôme Guelfucci <jeromeg at xfce.org>
Date:   Fri Dec 28 15:52:00 2012 +0100

    Merge branch 'jeromeg/keyboard-shortcuts' of ssh://git.xfce.org/xfce/libxfce4ui into jeromeg/keyboard-shortcuts

commit 154454e31ef4a31293a6200ba74db5448e3c14e4
Author: Jérôme Guelfucci <jeromeg at xfce.org>
Date:   Sat Dec 22 10:48:17 2012 +0100

    When refusing a shortcut, show the explanation again.

commit 5ca5fe53554e738200705ea532634e10515c3a1f
Author: Jérôme Guelfucci <jeromeg at xfce.org>
Date:   Sat Dec 22 10:44:34 2012 +0100

    Show shortcut label instead of Gtk accelerator in conflict dialog.

commit 60ee8b36952ab4fd8157b27cf413f4e74771b898
Author: Jérôme Guelfucci <jeromeg at xfce.org>
Date:   Sat Dec 22 10:32:33 2012 +0100

    Use parent when showing warning.

commit 77eded0c2c4dd95e7117db4bce6634f998a825aa
Author: Jérôme Guelfucci <jeromeg at xfce.org>
Date:   Sat Dec 22 10:22:29 2012 +0100

    Improve explanation label.
    
    Make it italic and escape the text because the command may contain
    special caracters.

commit 76c2d966f23155e7faa40427dbd8a8cc0e26a038
Author: Jérôme Guelfucci <jeromeg at xfce.org>
Date:   Fri Dec 21 15:05:55 2012 +0100

    Improve the UI of the dialog to grab shortcuts.
    
    Add an explanation string to make it clear that the user is expected to
    press the keys.

commit f3ed87bd674c0e7464018082566fbb62a9226628
Author: Jérôme Guelfucci <jeromeg at xfce.org>
Date:   Thu Dec 20 23:38:22 2012 +0100

    Show the accelerator label in the shortcut dialog.

commit e5637cc58ae7b44ba0e0ff2cdc797757d23d8f05
Author: Jérôme Guelfucci <jeromeg at xfce.org>
Date:   Thu Dec 20 23:21:43 2012 +0100

    Add some debugging information for conflict.

commit b56143b76d5e25ac661252d177cb7f598abfde87
Author: Jérôme Guelfucci <jeromeg at xfce.org>
Date:   Thu Dec 20 11:04:20 2012 +0100

    Allow passing parent window to conflict dialog.

commit 4c2a8a1dd003091288f4b86521ae8f3ff7359370
Author: Jérôme Guelfucci <jeromeg at xfce.org>
Date:   Thu Dec 20 10:34:23 2012 +0100

    Fix keyboard shortcuts with keypad (bug #4178).
    
    To do so, we also grab all shortcuts with the numlock modifier.

commit f48c83b67cb46f7b64d4d5cd3bb474e7ee4e9b8b
Author: Jérôme Guelfucci <jeromeg at xfce.org>
Date:   Thu Dec 20 10:32:39 2012 +0100

    Get rid of FinallyGetModifiersForKeycode.
    
    It simply does not work as expected and the logic seems boggus.

commit 8f1bb1455886ee653979fddd3d2aaedf43a0ee2c
Author: Jérôme Guelfucci <jeromeg at xfce.org>
Date:   Wed Dec 19 22:28:07 2012 +0100

    Add xfwm4 shortcut values to POTFILES.in

commit 53be9bc959c524a140c89e0649be7bb86f191550
Author: Jérôme Guelfucci <jeromeg at xfce.org>
Date:   Wed Dec 19 22:26:09 2012 +0100

    Show the window manager action name when conflicting.
    
    We use the translated string representing the window manager action so
    that the conflict is easy to understand.

commit c08f561880fcf5633b48549aef8b11710b6ded37
Author: Jérôme Guelfucci <jeromeg at xfce.org>
Date:   Wed Dec 19 17:38:10 2012 +0100

    Move xfwm4 shortcut names to libxfce4kbd-private.

commit 128a25d53a689896f29a0936d0d686478c107aa7
Author: Jérôme Guelfucci <jeromeg at xfce.org>
Date:   Wed Dec 19 14:56:06 2012 +0100

    Use <Primary> instead of <Control> (bug #8200).
    
    While <Control> works fine now for grabbing / detecting, shortcut
    comparison is broken because the strings are different.
    
    This only deals with the default shortcuts, we need to migrate the
    custom shortcuts.

commit 0d2c165aeff3da0268276cbc75f9470bfc349e4b
Author: Jérôme Guelfucci <jeromeg at xfce.org>
Date:   Tue Dec 18 10:00:42 2012 +0100

    Fix alt + print being detected as SysReq (bug #7897).
    
    If we were able to grab it, it means that this combination is not used
    as SysReq, users should then be able to use that.
    
    Note that this won't work by default on most distributions because the
    SysReq key is enabled and X won't pass the event. You need to disable the
    SysReq key, for example by setting "kernel.sysrq = 0" in /etc/sysctl.conf.

commit 927438b9ce57253d705a846725892935d02f9f1f
Author: Jérôme Guelfucci <jeromeg at xfce.org>
Date:   Tue Dec 18 09:03:38 2012 +0100

    No need to remove consumed modifiers twice.

commit 0da716be5ecc87bcc74c5ea40b14b8f93c0d7d73
Author: Harald Judt <h.judt at gmx.at>
Date:   Tue Dec 18 09:00:44 2012 +0100

    Fix keyboard shortcuts with Shift modifier (bug #8744).

commit 3bb8c7d4de8132741da54a26c98459167c51fd87
Author: Jérôme Guelfucci <jeromeg at xfce.org>
Date:   Tue Dec 18 08:21:03 2012 +0100

    Improve key comparison.
    
    Remove horrible hardcoded hack and use the recommanded way of comparison
    described in the GDK documentation instead.

commit 160d4fe42952284a4bcc48760ae6706ca28fa7e5
Author: Jérôme Guelfucci <jeromeg at xfce.org>
Date:   Tue Dec 18 08:05:21 2012 +0100

    Fix indentation.

commit bb03d1007f7f14796bbae1d2b6c00cfb38ac57b2
Author: Jérôme Guelfucci <jeromeg at xfce.org>
Date:   Tue Dec 18 08:04:16 2012 +0100

    Pass event group when translating keyboard state.