Details

Reviewers

davidedmundson
mlaurent

Group Reviewers

Plasma

Maniphest Tasks

T2050: sunsetting KHotKeys

Commits

R103:507bc58bf3e8: Port to KGlobalAccel

Summary

Replace KHotkeys with KGlobalAccel

Diff Detail

Repository

R103 KMenu Editor

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

davidre created this revision.Oct 31 2019, 10:46 AM

Restricted Application added a project: Plasma. · View Herald TranscriptOct 31 2019, 10:46 AM

Restricted Application added a subscriber: plasma-devel. · View Herald Transcript

davidre requested review of this revision.Oct 31 2019, 10:46 AM

Harbormaster completed remote builds in B18384: Diff 69095.Oct 31 2019, 10:46 AM

davidre added reviewers: Plasma, davidedmundson.Oct 31 2019, 10:47 AM

davidre added a task: T2050: sunsetting KHotKeys.

Concept ++++

We don't need WITH_GLOBALACCEL guards. It's a dep of kxmlgui which we link against anyway.

mlaurent added a subscriber: mlaurent.Oct 31 2019, 12:27 PM

mlaurent added inline comments.

CMakeLists.txt
40	Why removing it ?

mlaurent requested changes to this revision.Oct 31 2019, 12:29 PM

This revision now requires changes to proceed.Oct 31 2019, 12:29 PM

Don't delete disabled
Remove guards

Harbormaster completed remote builds in B18389: Diff 69105.Oct 31 2019, 12:54 PM

davidre marked an inline comment as done.Oct 31 2019, 12:54 PM

davidre added inline comments.

CMakeLists.txt
40	Accidentally

mlaurent added inline comments.Oct 31 2019, 1:08 PM

globalaccel.cpp
56	if (!shortcut.isEmpty()) {
menuinfo.cpp
179–180	you can remove this ifdef

comments

Harbormaster completed remote builds in B18391: Diff 69107.Oct 31 2019, 1:13 PM

apol added a subscriber: apol.Oct 31 2019, 1:45 PM

apol added inline comments.

globalaccel.cpp
51	Why just return one if it can be a list?
globalaccel.h
28	I'd call them `menuEntryShortcut` and `setMenuEntryShortcut`

davidre added inline comments.Oct 31 2019, 1:54 PM

globalaccel.cpp
51	I think the list that is returned can have up to 2 entries. The shortcut and the alternate shortcut. However the currently Gui shows/configures only one shortcut.
globalaccel.h
28	I just used the old names.

davidre mentioned this in D25088: Use X-KDE-NoGlobalShortcut instead of NoDisplay to store that a component is disabled.Oct 31 2019, 2:32 PM

mlaurent added inline comments.Nov 1 2019, 6:02 AM

basictab.cpp
37–38	still necessary to #ifndef ?

Thanks for spotting!

Harbormaster completed remote builds in B18496: Diff 69279.Nov 4 2019, 3:10 PM

davidre mentioned this in D25144: [RFC][Global Shortcuts KCM] Categorize into Applications and System Services.Nov 4 2019, 6:04 PM

For me it seems ok

Did you finish it ? is it work ? or still in progress ?

In D25086#559109, @mlaurent wrote:

For me it seems ok

Did you finish it ? is it work ? or still in progress ?

Shortcut setting and displaying works so far in my testing.
I still need to do the migration of existing shortcuts otherwise if user had set a shortcut though kmenuedit before it wouldn't be displayed in kmenuedit (although it would be functional).

davidre mentioned this in T2050: sunsetting KHotKeys.Nov 6 2019, 1:54 PM

update application for migration based on the one I did for spectacle

Harbormaster completed remote builds in B18634: Diff 69483.Nov 8 2019, 8:21 PM

davidre retitled this revision from [WIP] Port to KGlobalAccel to Port to KGlobalAccel.Nov 8 2019, 8:22 PM

davidre edited the summary of this revision. (Show Details)

After that it seems ok for me

kconf_update/globalaccel.cpp
26	QLatin1String("...") it's a minor optimization
39	same here

This revision now requires changes to proceed.Nov 9 2019, 9:03 AM

QLatin1String

Harbormaster completed remote builds in B18693: Diff 69577.Nov 11 2019, 10:13 AM

for me all is ok.

This revision is now accepted and ready to land.Nov 11 2019, 11:40 AM

Did you have some problem for commiting it ?
Regards

No, I wanted to let David take a second look. But I can commit later.

Closed by commit R103:507bc58bf3e8: Port to KGlobalAccel (authored by davidre). · Explain WhyNov 18 2019, 10:15 AM

This revision was automatically updated to reflect the committed changes.

		Path
M		CMakeLists.txt (21 lines)
M		basictab.cpp (25 lines)
A	M	globalaccel.h (31 lines)
A	M	globalaccel.cpp (61 lines)
A	M	kconf_update/CMakeLists.txt (5 lines)
A	M	kconf_update/globalaccel.cpp (62 lines)
A	M	kconf_update/globalaccel.upd (4 lines)
D	M	khotkeys.h (38 lines)
D	M	khotkeys.cpp (131 lines)
M		main.cpp (11 lines)
M		menuinfo.cpp (20 lines)

Diff	ID	Base	Description	Created	Lint	Unit
Base			Base
Diff 1	69095	5d0e53f		Oct 31 2019, 10:46 AM	★	★
Diff 2	69105	5d0e53f	- Don't delete disabled	Oct 31 2019, 12:54 PM	★	★
Diff 3	69107	5d0e53f	- comments	Oct 31 2019, 1:13 PM	★	★
Diff 4	69279	5d0e53f	Thanks for spotting!	Nov 4 2019, 3:10 PM	★	★
Diff 5	69483	5d0e53f	update application for migration based on the one I did for spectacle	Nov 8 2019, 8:21 PM	★	★
Diff 6	69577	5d0e53f	QLatin1String	Nov 11 2019, 10:13 AM	★	★
Diff 7	69913	e99f996	R103:507bc58bf3e8704cdb4eab51ca16a2eb28299bb6	Nov 18 2019, 10:15 AM	★	★

Commit	Tree	Parents	Author	Summary	Date
59be8f67d0c2	b6051eda17ee	d3dc5d2ef737	David Redondo	update application	Nov 8 2019, 8:20 PM
d3dc5d2ef737	7899929f2369	d6b3639fa160	David Redondo	Remove guards	Oct 31 2019, 12:53 PM
d6b3639fa160	1e062e127281	5f48c3948f94	David Redondo	Don't delete disabled	Oct 31 2019, 12:50 PM
5f48c3948f94	3a0561268953	5d0e53f5602f	David Redondo	[WIP] Port to KGlobalAccel (Show More…)	Oct 30 2019, 3:15 PM

Port to KGlobalAccel
ClosedPublic
Actions

Details

Diff Detail

QLatin1String("...") it's a minor optimization

Revision Contents
Changeset List

Diff 69913

CMakeLists.txt

basictab.cpp

globalaccel.h

globalaccel.cpp

kconf_update/CMakeLists.txt

kconf_update/globalaccel.cpp

kconf_update/globalaccel.upd

khotkeys.h

khotkeys.cpp

main.cpp

menuinfo.cpp

Port to KGlobalAccelClosedPublicActions

Details

Diff Detail

QLatin1String("...") it's a minor optimization

Revision ContentsChangeset List

Diff 69913

CMakeLists.txt

basictab.cpp

globalaccel.h

globalaccel.cpp

kconf_update/CMakeLists.txt

kconf_update/globalaccel.cpp

kconf_update/globalaccel.upd

khotkeys.h

khotkeys.cpp

main.cpp

menuinfo.cpp

Port to KGlobalAccel
ClosedPublic
Actions

Revision Contents
Changeset List