[geary: 7/7] Merge branch 'wip/fix-main-window-shortcuts' into 'mainline'

[Michael Gratton <mjog src gnome org>]

commit 01d34ccc127eea0646db5187297fd8688e714ec4
Merge: 93311aeb dfe0b5cc
Author: Michael Gratton <mike vee net>
Date:   Wed Nov 20 23:25:01 2019 +0000

    Merge branch 'wip/fix-main-window-shortcuts' into 'mainline'
    
    Make single key shortcuts optional
    
    See merge request GNOME/geary!373

 desktop/org.gnome.Geary.appdata.xml.in.in          |   2 +
 desktop/org.gnome.Geary.gschema.xml                |   8 +
 help/C/preferences.page                            |  16 +-
 help/C/shortcuts.page                              |  55 ++-
 po/POTFILES.in                                     |   3 +-
 src/client/application/application-client.vala     |  54 ++-
 .../application/application-configuration.vala     |   7 +-
 .../application/application-main-window.vala       | 425 +++++++++++++++------
 .../components/components-preferences-window.vala  | 157 ++++++++
 src/client/dialogs/preferences-dialog.vala         |  46 ---
 src/client/meson.build                             |   2 +-
 ui/application-main-window.ui                      |   3 +
 ui/gtk/help-overlay.ui                             |  89 ++---
 ui/org.gnome.Geary.gresource.xml                   |   2 +-
 ui/preferences-dialog.ui                           | 136 -------
 ui/single-key-shortcuts.css                        |  39 ++
 16 files changed, 658 insertions(+), 386 deletions(-)
---