fix #288679 and #269262: ensure support of set QStandardKey #4991
Conversation
|
Please fix the issue number in PR- and commit title to #288679, #288769 has got nothing to do with it (obviously a typo). |
malaka712
changed the title
|
You're right, yes. #269262 is basically the same problem. Issue number fixed, too. |
|
Also you need to rebase, not to merge. Try |
malaka712
force-pushed
the
288679-add-shortcut
branch
2 times, most recently
from
1d0b5e0
to
14dd148
Compare
|
With the last changes, the default settings for Save-As are a QKeySequence. The Save-As shortcut is now "Ctrl+Shift+S" on all platforms (Ctrl is translated to Command on a Mac). The additional checks are not needed with the modified shortcuts.xml, as all used StandardKeys are supported on all platforms (as defined in first table here: https://doc.qt.io/archives/qt-4.8/qkeysequence.html). Yet, I recommend keeping the checks, as these make the code less error-prone, especially, when the shortcuts.xml changes in future. |
|
What about |
malaka712
force-pushed
the
288679-add-shortcut
branch
from
14dd148
to
56a1147
Compare
|
Hm, I have now modified the shortcuts_AZERTY.xml as it is platform independent. But I did not touch shortcuts-Mac.xml, as it is only applied for |
|
Thanks |
given platform and replace 'Save As' StandardKey with KeySequence to enable it on all platforms by default. Signed-off-by: Patrick <my_web_spam_address@web.de>
The used QKeySequence::StandardKey may not be set on all Platforms, as described here (and in table above given link): https://doc.qt.io/archives/qt-4.8/qkeysequence.html#StandardKey-enum
This way the UI has an unsupported StandardKey as a shortcut (in the reported bug, it is Save-As, which has number 63). When now adding a manual shortcut, the Ms::Shortcut object has two shortcuts, the (unsupported) StandardKey and the manual entry. As a result,
QAction* Shortcut::action() constwill return the StandardKey and the added shortcut is never applied.This commit double checks that the OS supports the defined StandardKey, and if not, it blocks setting it as a shortcut.
Note: This also applies when clicking on "Reset All Preferences to Default", as the default shortcuts.xml contains the StandardKey causing these issues.