ngraham closed this revision.
ngraham added a comment.
Never mind, it just needed a clean build, my bad.
REPOSITORY
R133 KScreenLocker
REVISION DETAIL
https://phabricator.kde.org/D25212
To: ervin, #plasma, davidedmundson, bport, crossi, mart
Cc: ngraham, plasma-devel, LeGast00n,
ngraham reopened this revision.
ngraham added a comment.
This revision is now accepted and ready to land.
This patch causes a build failure for me:
/home/nate/kde/src/kscreenlocker/kcm/kcm.cpp: In constructor
‘ScreenLockerKcm::ScreenLockerKcm(QWidget*, const QVariantList&)’:
This revision was automatically updated to reflect the committed changes.
Closed by commit R133:68bdeb8cd7d9: Move the shortcut management in the
settings object (authored by ervin).
REPOSITORY
R133 KScreenLocker
CHANGES SINCE LAST UPDATE
https://phabricator.kde.org/D25212?vs=69435=69675
davidedmundson added inline comments.
INLINE COMMENTS
> ervin wrote in kcm.cpp:198
> Yes, it was never triggered. It turns out KKeySequenceWidget does that
> already as soon as you pick a new shortcut, so it could never end up
> conflicting here since said conflict would have been handled
ervin added inline comments.
INLINE COMMENTS
> davidedmundson wrote in kcm.cpp:198
> This part appears to have gone?
Yes, it was never triggered. It turns out KKeySequenceWidget does that already
as soon as you pick a new shortcut, so it could never end up conflicting here
since said conflict
davidedmundson added inline comments.
INLINE COMMENTS
> kcm.cpp:198
> -// the keys sequence
> -if (!KGlobalAccel::promptStealShortcutSystemwide(this,
> conflicting, sequence)) {
> -return false;
This part appears to have gone?
>
ervin updated this revision to Diff 69435.
ervin added a comment.
Remove stale updateState() function
REPOSITORY
R133 KScreenLocker
CHANGES SINCE LAST UPDATE
https://phabricator.kde.org/D25212?vs=69433=69435
REVISION DETAIL
https://phabricator.kde.org/D25212
AFFECTED FILES
ervin created this revision.
ervin added reviewers: Plasma, davidedmundson, bport, crossi.
Herald added a project: Plasma.
Herald added a subscriber: plasma-devel.
ervin requested review of this revision.
REVISION SUMMARY
This uses the new KPropertySkeletonItem facility to allow proper