Commits · master · Plasma / KHotkeys

19 May, 2022 2 commits
- Update version number for 5.25.80 · 41ac365e
  Jonathan Esk-Riddell authored May 19, 2022
```
GIT_SILENT
```
  41ac365e
- Update version number for 5.24.90 · b9f428d2
  Jonathan Esk-Riddell authored May 19, 2022
```
GIT_SILENT
```
  b9f428d2
15 May, 2022 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 58171c2d

Script Kiddy authored May 15, 2022

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

58171c2d

06 May, 2022 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 2e44f497

Script Kiddy authored May 06, 2022

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

2e44f497

05 May, 2022 1 commit

docbook: Update settings.png · ab4736e9

Fushan Wen authored Dec 21, 2021

The spinbox has been replaced with a combobox, so the screenshot also
needs to be updated.

ab4736e9

02 May, 2022 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 0a74984b

Script Kiddy authored May 02, 2022

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

0a74984b

01 May, 2022 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · d1bbef2a

Script Kiddy authored May 01, 2022

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

d1bbef2a

25 Apr, 2022 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 5cc2e621

Script Kiddy authored Apr 25, 2022

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

5cc2e621

22 Apr, 2022 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 67bff82b

Script Kiddy authored Apr 22, 2022

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

67bff82b

17 Apr, 2022 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 44ba5715

Script Kiddy authored Apr 17, 2022

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

44ba5715

15 Apr, 2022 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 3a391380

Script Kiddy authored Apr 15, 2022

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

3a391380

09 Apr, 2022 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 5cf97eac

Script Kiddy authored Apr 09, 2022

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

5cf97eac

07 Apr, 2022 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 2a7f1721

Script Kiddy authored Apr 07, 2022

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

2a7f1721

01 Apr, 2022 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 5735c4a0

Script Kiddy authored Apr 01, 2022

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

5735c4a0

30 Mar, 2022 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · b70e2d5d

Script Kiddy authored Mar 30, 2022

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

b70e2d5d

29 Mar, 2022 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 67de76bc

Script Kiddy authored Mar 29, 2022

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

67de76bc

23 Mar, 2022 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 3b3ebbfe

Script Kiddy authored Mar 23, 2022

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

3b3ebbfe

20 Mar, 2022 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 3c707747

Script Kiddy authored Mar 20, 2022

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

3c707747

03 Mar, 2022 1 commit

Only show KCM when on X11 · ed47291d

Arjen Hiemstra authored Mar 03, 2022

KHotkeys doesn't work on Wayland, so it doesn't make sense to show the
KCM there.

ed47291d

01 Feb, 2022 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · cbe6a75f

Script Kiddy authored Feb 01, 2022

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

cbe6a75f

13 Jan, 2022 2 commits
- Update version number for 5.24.80 · 52442ab5
  Jonathan Esk-Riddell authored Jan 13, 2022
```
GIT_SILENT
```
  52442ab5
- Update version number for 5.23.90 · a108d22e
  Jonathan Esk-Riddell authored Jan 13, 2022
```
GIT_SILENT
```
  a108d22e
20 Dec, 2021 2 commits

gestures: Replace mouse button spinbox with a combobox · 3c4fbfa5

Fushan Wen authored Nov 05, 2021

The mouse button spinbox only shows a number, which is not intuitive
enough for newcomers. We should use a combobox to indicate the mouse
button.

BUG: 445001
GUI: 445001

3c4fbfa5

SVN_SILENT made messages (.desktop file) - always resolve ours · 0d4624ee

Script Kiddy authored Dec 20, 2021

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

0d4624ee

15 Dec, 2021 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 342e12d8

Script Kiddy authored Dec 15, 2021

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

342e12d8

06 Dec, 2021 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 02ae7ea5

Script Kiddy authored Dec 06, 2021

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

02ae7ea5

29 Nov, 2021 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · e1694e08

Script Kiddy authored Nov 29, 2021

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

e1694e08

28 Nov, 2021 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · e34e8c40

Script Kiddy authored Nov 28, 2021

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

e34e8c40

27 Nov, 2021 1 commit
- Add GitLab CI · 37a7972e
  Nicolas Fella authored Nov 27, 2021
  
  37a7972e
15 Nov, 2021 1 commit

when deleting an entry, also delete the widgets · 97f9339f

Harald Sitter authored Oct 13, 2021

previously what would happen is that KCMHotkeys::currentChanged would
run, find the new index (-1,-1) now invalid and show the global settings
instead. this however left the simple_action's underlying widgets still
sitting around referring to the previous index AND holding a dangling
trigger point that would eventually crash when the simple_action would
be poked by anything

instead force unset the internal state of the simple_action when showing
the global settings.

FIXED-IN: 5.23.5
BUG: 443656

97f9339f

03 Nov, 2021 1 commit
- Minor: s/Q_DECL_OVERRIDE/override/ · 13fe346b
  Kevin Funk authored Nov 03, 2021
  
  13fe346b
01 Nov, 2021 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 6b8e5f7d

Script Kiddy authored Nov 01, 2021

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

6b8e5f7d

26 Oct, 2021 1 commit
- GIT_SILENT: add missing overide · 533eab83
  Laurent Montel authored Oct 26, 2021
  
  533eab83
11 Oct, 2021 1 commit
- Update kf5 version requirement to 5.86 · b99fa8d4
  Jonathan Esk-Riddell authored Oct 11, 2021
```
GIT_SILENT
```
  b99fa8d4
07 Oct, 2021 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · bcc02904

Script Kiddy authored Oct 07, 2021

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

bcc02904

05 Oct, 2021 1 commit
- Add .kde-ci.yml · 5658da5c
  Nicolas Fella authored Oct 05, 2021
  
  5658da5c
19 Sep, 2021 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 3bfd01f1

Script Kiddy authored Sep 19, 2021

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

3bfd01f1

16 Sep, 2021 2 commits
- Update version number for 5.23.80 · c6f4cb95
  Jonathan Esk-Riddell authored Sep 16, 2021
```
GIT_SILENT
```
  c6f4cb95
- Update version number for 5.22.90 · 6f016abd
  Jonathan Esk-Riddell authored Sep 16, 2021
```
GIT_SILENT
```
  6f016abd
03 Sep, 2021 1 commit
- Make unused variables anonymous or Q_UNUSED · fe5c2a88
  Adriaan de Groot authored Jul 20, 2021
  
  fe5c2a88