Review Request 119053: KGlobalAccel fixes for loading shortcuts

[Martin Gräßlin]

-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/119053/
-----------------------------------------------------------

(Updated July 1, 2014, 8:37 a.m.)


Status
------

This change has been marked as submitted.


Review request for KDE Frameworks, Plasma and David Faure.


Repository: kglobalaccel


Description
-------

Sorry for the last minute changes. I expected the bugs to be in the KCM and not in kglobalaccel and unfortunately the autotests cannot be executed on build.kde.org thus I never noticed that they don't pass :-(


Update actionShortcuts on auto loading shortcuts

When using auto-loading the shortcut needs to be updated from what the
daemon returns. This had not been done yet and KGlobalAccel still kept
the shortcut passed in.

With this change the autotests pass and the global shortcut KCM shows
the used shortcuts properly.

Update actionShortcuts when daemon emits yourShortcutGotChanged

Without updating the shortcut kept in actionShortcuts KGlobalAccel
still returns the old shortcut when invoking the shortcut() method.

The unit test for this was unfortunately broken as it checked the
wrong QAction. This is also fixed with this change.

Set componentName and DisplayName on QActions in KGlobalShortcutTest

This fixes the testFindActionByKey.


Diffs
-----

  autotests/kglobalshortcuttest.cpp 3f76760cb9e06a19d636a81546706cee548e1869 
  src/kglobalaccel.cpp a98891c806764132b4f02b828d59584a85745fb3 

Diff: https://git.reviewboard.kde.org/r/119053/diff/


Testing
-------

unit tests pass now.


Thanks,

Martin Gräßlin

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kde-frameworks-devel/attachments/20140701/83e32cae/attachment.html>