Skip to content
  • Arjen Hiemstra's avatar
    Merge branch "krita-canvasinteraction-ahiemstra" · be1c9b14
    Arjen Hiemstra authored
    REVIEW: 105250
    
    Squashed commit of the following:
    
    commit 626645f6e68f7423c9422b569ae8979805664eea
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Fri Jun 15 14:31:50 2012 +0200
    
        Add support for wheel events and try to improve shortcut recognition.
    
    commit 6103da39983cfde245e7219a90618dd6e4452ff3
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Fri Jun 15 14:31:27 2012 +0200
    
        Add support for shortcuts to KisShortcut.
    
    commit b68bc1725d35bdb0d1c0ca1f0a34249f16c7cff8
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Fri Jun 15 14:29:49 2012 +0200
    
        Ensure we update the mouse position correctly.
    
    commit c8f2268af524df2f4769d37367c79f02d14164bc
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Fri Jun 15 14:29:09 2012 +0200
    
        Reduce rotation speed and ensure we update the mouse position correctly
    
    commit 60dcab504e8289a1e6b17906541680dfeb660251
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Fri Jun 15 14:27:18 2012 +0200
    
        Fix building with GCC < 4.7
    
    commit a77c9562e665638730f11459273cd7c6d78e5357
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Thu Jun 14 13:36:03 2012 +0200
    
        Clean up and comment.
    
    commit 9466ab130380e455da7c5620cbc58c634eb48181
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Thu Jun 14 13:35:41 2012 +0200
    
        Document all the classes.
    
    commit 7f34cffa41068fe907ec3c4de9596a8d563a02a7
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Thu Jun 14 12:23:34 2012 +0200
    
        Remove obsolete input related code.
    
    commit 7a316502466b7389c261714a3ee2f8663279bcaf
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Thu Jun 14 12:21:48 2012 +0200
    
        Update AbstractInputAction to a more clean API.
    
    commit 6b871419e67b0a267a2a4d7794ae1b33423dea3f
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Wed Jun 13 14:47:53 2012 +0200
    
        Implement Change Primary Setting action.
    
    commit 5e0e8d25661d3f498fc1fcf39e0ae36e72028fbc
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Wed Jun 13 14:47:20 2012 +0200
    
        Implement alternate invocation by simulating mouse events for now.
    
    commit 8de97d3ed35397cc9c54444e347e33df45fcf36f
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Wed Jun 13 14:46:43 2012 +0200
    
        Add a description to the Tool Invocation action.
    
    commit c0d4caf157d9941d6fa1675e4d3f185bf12c1a90
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Wed Jun 13 14:46:04 2012 +0200
    
        Add a description method to abstract input aciton.
    
    commit 57fde74b2b94a42e0450e76d1684beee0046c1a6
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Tue Jun 12 17:05:59 2012 +0200
    
        Enable previously disabled actions again.
    
    commit 5568539f5803655762d9533c3d9f56d2a8733bca
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Tue Jun 12 17:05:06 2012 +0200
    
        Update Show Palette action
    
    commit 9db2dc5e19ed4d08a578180ba940ff120f9ee022
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Tue Jun 12 17:04:29 2012 +0200
    
        Update Rotate Canvas action and add support for some shortcut keys
    
    commit 42f086e4010c2d5e856421189d1643ff3539a1b0
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Tue Jun 12 17:03:44 2012 +0200
    
        Update Alternate invocation to new API and start implementing it.
    
    commit 06b47a22f40f96c701f4134743f0cce020591374
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Mon Jun 11 21:55:21 2012 +0200
    
        Update zoom action and add several zoom related shortcuts.
    
    commit 6640467ad90980e4142b1823ab063c7cc4f96822
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Mon Jun 11 21:54:52 2012 +0200
    
        Update Pan Action and make it possible to pan with keys.
    
    commit 9338db9428c80577c7db568408620a6f9595e6bf
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Mon Jun 11 21:54:20 2012 +0200
    
        Update the Tool Invocation action to the changed API.
    
    commit 4bd161e6ae015b4670e5d3cb3933fb64c6d188b7
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Mon Jun 11 21:53:03 2012 +0200
    
        Change the actions to support different shortcuts.
    
    commit 41a63d2ec1c1b021e636a5cab1d781c174ef01df
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Mon Jun 11 15:01:30 2012 +0200
    
        Invert the zoom direction.
    
        Now drag up is zoom in, drag down zoom out. Far more intuitive.
    
    commit 817e63b8b78e3ec74a35cee79b9024b7c6205dbe
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Mon Jun 11 15:00:34 2012 +0200
    
        Make tablet events work properly.
    
        Now the intial event is sent as a tablet event and so has proper
        pressure.
    
    commit 20972cb62b5d69fd2e6ce4c47c6d1d4739dc601a
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Thu Jun 7 16:41:25 2012 +0200
    
        Attempt to handle tablet events properly.
    
        Only supports TabletMove at the moment, the initial TabletPress still
        needs to be converted.
    
    commit 26044ac16f2048008c56d9c3cc7e912e6a4e7dc1
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Thu Jun 7 16:38:56 2012 +0200
    
        Add a zoom and open palette action
    
    commit 1351977ee0d49cbe0f39d4f9038ca6d0b88eb80a
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Thu Jun 7 16:37:07 2012 +0200
    
        Prevent the canvas from handling tablet events
    
        This ensures we get Mouse events when we do not handle a tablet event.
    
    commit a21d061b288cb00fb50685ac6efbcb6729eddd8b
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Tue Jun 5 16:58:04 2012 +0200
    
        Fix shortcuts not resetting properly and ignore auto repeat events.
    
    commit c666e9f4b6af87a03c50d7999c6e1d90fe3e9e95
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Tue Jun 5 16:05:59 2012 +0200
    
        Add a rotate canvas action
    
    commit d47a9d3ed6d3c04ae49dd2d711de069bdf69ef9a
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Tue Jun 5 16:04:50 2012 +0200
    
        Update the tool invocation action to use the proper API.
    
    commit aedbd3fa662d8a7f13c4a74e8a4f5e7d93143a31
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Tue Jun 5 16:01:20 2012 +0200
    
        Update the pan action to use widget coordinates.
    
    commit 8ee99aecf4d8f80a7c7b7b5595938eb2da8bf2cb
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Tue Jun 5 15:57:56 2012 +0200
    
        Perform the matching in KisShortcut instead of KisInputManager
    
        This avoids several duplications of loops and allows us to reuse the
        matching code.
    
    commit 5d164edbee9cd4ca73386b7408bc105bf90ea520
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Mon Jun 4 15:17:06 2012 +0200
    
        Use the correct position for the tool invocaton action.
    
    commit 0eef2584959ba7bfaea96c9ed04074b1956d0f4e
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Mon Jun 4 15:16:38 2012 +0200
    
        Use document position for movement instead of view
    
    commit c49a1652d7706256445c81631113fb0391116d09
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Mon Jun 4 15:16:01 2012 +0200
    
        Set mousePosition to the document position instead of the view.
    
    commit 211451754454b766bcf707b5ebe88cb8af2cd156
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Mon Jun 4 14:40:55 2012 +0200
    
        Implement a basic Pan action.
    
    commit 23c8800bdbf1253029320dbaae351412e16e28a3
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Mon Jun 4 13:13:10 2012 +0200
    
        Restore basic painting functionality.
    
        Still a little off position-wise, but the basics now at least work.
    
    commit 25d4f706577a69d3379eae30e4434d3e43e742e0
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Fri Jun 1 11:26:21 2012 +0200
    
        Add missing files
    
    commit 6d2fc262dc42444dd2c9d66330eb0658179a8e9e
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Fri Jun 1 11:25:17 2012 +0200
    
        Update recognition code; use KisShortcut more directly
    
    commit feac32a42c35d6e16920ab8a1c197f445040bfbb
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Thu May 31 15:53:17 2012 +0200
    
        Very basic action detection working.
    
        Still no conflict resolution or anything, just selection based on a
        single input event. Still, the design seems to work.
    
    commit 2b4c7bb4c33ac7b2e90b1e357581d09a6396de78
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Wed May 30 14:51:52 2012 +0200
    
        Add a basic InputManager class that catches all input events.
    be1c9b14