Skip to content

Show macOS modifier keys in Canvas Input Settings

Freya Lupen requested to merge freyalupen/krita:freyalupen/bug-388394 into master

Show the correct macOS modifier symbols in Canvas Input like in Keyboard Shortcuts, instead of referring to Cmd as Ctrl and etc.

BUG:388394

This adds some macOS-specific code while leaving the other OSes untouched. QKeySequence(Qt::Key_Control).toString(QKeySequence::NativeText) gives the proper modifier key symbols on Mac, but on other platforms seems to give garbage for some reason.

QKeySequence(Qt::ControlModifier).toString(QKeySequence::NativeText) as used by Keyboard Shortcuts (KisKKeySequenceWidgetPrivate::updateShortcutDisplay()) does work on all OSes, but (on non-Mac) has a + at the end ("Ctrl+") which would have to be removed to match the expected result. It also isn't translated like the Canvas Input modifiers currently are (see Turkish). I'm not sure whether they're translatable in a different way.

Test Plan

On macOS, open Preferences->Canvas Input Settings and check the way modifier keys are displayed.

Formalities Checklist

  • I confirmed this builds.
  • I confirmed Krita ran and the relevant functions work.
  • I tested the relevant unit tests and can confirm they are not broken. (If not possible, don't hesitate to ask for help!)
  • I made sure my commits build individually and have good descriptions as per KDE guidelines.
  • I made sure my code conforms to the standards set in the HACKING file.
  • I can confirm the code is licensed and attributed appropriately, and that unattributed code is mine, as per KDE Licensing Policy.
  • Does the patch add a user-visible feature? If yes, is there a documentation MR ready for it at Krita Documentation Repository?

Reminder: the reviewer is responsible for merging the patch, this is to ensure at the least two people can build the patch. In case a patch breaks the build, both the author and the reviewer should be contacted to fix the build. If this is not possible, the commits shall be reverted, and a notification with the reasoning and any relevant logs shall be sent to the mailing list, kimageshop@kde.org.

Merge request reports