[gtk: 133/133] Merge branch 'wip/matthiasc/shortcut-4' into 'master'



commit eaa20f5cdf83c9933142f58c36e0eb2c97304c6f
Merge: e17db0abde d07e22dc03
Author: Matthias Clasen <mclasen redhat com>
Date:   Thu Mar 26 03:40:22 2020 +0000

    Merge branch 'wip/matthiasc/shortcut-4' into 'master'
    
    Shortcuts
    
    See merge request GNOME/gtk!1569

 demos/gtk-demo/demo.gresource.xml                  |    1 +
 demos/gtk-demo/fontplane.c                         |   25 -
 demos/gtk-demo/main.c                              |    1 -
 demos/gtk-demo/meson.build                         |    1 +
 demos/gtk-demo/shortcut_triggers.c                 |   91 +
 demos/gtk-demo/sliding_puzzle.c                    |   79 +-
 docs/reference/gtk/gtk4-docs.xml                   |   13 +-
 docs/reference/gtk/gtk4-sections.txt               |  248 +--
 docs/reference/gtk/gtk4.types.in                   |    5 +-
 docs/reference/gtk/input-handling.xml              |  158 +-
 docs/tools/widgets.c                               |    8 +-
 gdk/broadway/broadway.js                           |    3 +-
 gdk/gdktypes.h                                     |   49 +-
 gtk/gtk.h                                          |    7 +-
 gtk/gtkaccelgroup.c                                | 1278 ++++----------
 gtk/gtkaccelgroup.h                                |  176 +-
 gtk/gtkaccelgroupprivate.h                         |   16 +-
 gtk/gtkaccellabel.c                                |  590 +------
 gtk/gtkaccellabel.h                                |   10 -
 gtk/gtkaccelmap.c                                  | 1086 ------------
 gtk/gtkaccelmap.h                                  |  109 --
 gtk/gtkaccelmapprivate.h                           |   39 -
 gtk/gtkapplication.c                               |    1 -
 gtk/gtkapplicationaccels.c                         |  518 ++----
 gtk/gtkapplicationaccelsprivate.h                  |   10 +-
 gtk/gtkassistant.c                                 |    8 +-
 gtk/gtkbindings.c                                  | 1793 --------------------
 gtk/gtkbindings.h                                  |  124 --
 gtk/gtkbuilder.c                                   |   28 +
 gtk/gtkcoloreditor.c                               |   25 +-
 gtk/gtkcolorplane.c                                |   37 +-
 gtk/gtkcolorscale.c                                |   39 +-
 gtk/gtkcolorswatch.c                               |   21 +-
 gtk/gtkcombobox.c                                  |  155 +-
 gtk/gtkdialog.c                                    |    5 +-
 gtk/gtkemojichooser.c                              |   40 +-
 gtk/gtkenums.h                                     |   19 +
 gtk/gtkeventcontrollerkey.c                        |    4 -
 gtk/gtkfilechooserwidget.c                         |  310 ++--
 gtk/gtkflowbox.c                                   |  101 +-
 gtk/gtkiconview.c                                  |  144 +-
 gtk/gtkinfobar.c                                   |   19 +-
 gtk/gtkkeyhash.c                                   |  580 -------
 gtk/gtkkeyhash.h                                   |   49 -
 gtk/gtklabel.c                                     |  252 +--
 gtk/gtklinkbutton.c                                |   24 +-
 gtk/gtklistbox.c                                   |   97 +-
 gtk/gtkmain.c                                      |   12 +-
 gtk/gtkmnemonichash.c                              |  201 ---
 gtk/gtkmnemonichash.h                              |   52 -
 gtk/gtkmodelbutton.c                               |   90 +-
 gtk/gtkmountoperation.c                            |   21 +-
 gtk/gtknotebook.c                                  |  203 +--
 gtk/gtkpaned.c                                     |  194 +--
 gtk/gtkplacesview.c                                |   62 +-
 gtk/gtkplacesviewrow.c                             |   30 +-
 gtk/gtkpopover.c                                   |  299 +++-
 gtk/gtkpopover.h                                   |    6 +
 gtk/gtkpopovermenu.c                               |  109 +-
 gtk/gtkpopoverprivate.h                            |    2 +
 gtk/gtkrange.c                                     |   10 -
 gtk/gtkroot.c                                      |    2 +
 gtk/gtkscale.c                                     |   13 +-
 gtk/gtkscalebutton.c                               |   40 +-
 gtk/gtkscrollbar.c                                 |   11 -
 gtk/gtkscrolledwindow.c                            |   66 +-
 gtk/gtksearchentry.c                               |   22 +-
 gtk/gtkshortcut.c                                  |  386 +++++
 gtk/gtkshortcut.h                                  |   62 +
 gtk/gtkshortcutaction.c                            | 1188 +++++++++++++
 gtk/gtkshortcutaction.h                            |  158 ++
 gtk/gtkshortcutactionprivate.h                     |   29 +
 gtk/gtkshortcutcontroller.c                        |  835 +++++++++
 gtk/gtkshortcutcontroller.h                        |   70 +
 gtk/gtkshortcutcontrollerprivate.h                 |   28 +
 gtk/gtkshortcutlabel.c                             |    3 +-
 gtk/gtkshortcutmanager.c                           |  143 ++
 gtk/gtkshortcutmanager.h                           |   71 +
 gtk/gtkshortcutmanagerprivate.h                    |   12 +
 gtk/gtkshortcutssection.c                          |   36 +-
 gtk/gtkshortcutswindow.c                           |   12 +-
 gtk/gtkshortcuttrigger.c                           | 1296 ++++++++++++++
 gtk/gtkshortcuttrigger.h                           |  163 ++
 gtk/gtkspinbutton.c                                |   32 +-
 gtk/gtktext.c                                      |  309 ++--
 gtk/gtktextview.c                                  |  360 ++--
 gtk/gtktreeview.c                                  |  428 +++--
 gtk/gtktypes.h                                     |    3 +
 gtk/gtkwidget.c                                    |  747 +++-----
 gtk/gtkwidget.h                                    |   39 +-
 gtk/gtkwidgetprivate.h                             |   10 +-
 gtk/gtkwindow.c                                    |  910 ++--------
 gtk/gtkwindow.h                                    |   31 -
 gtk/gtkwindowprivate.h                             |    1 -
 gtk/inspector/init.c                               |    2 +
 gtk/inspector/meson.build                          |    1 +
 gtk/inspector/shortcuts.c                          |  158 ++
 .../shortcuts.h}                                   |   21 +-
 gtk/inspector/shortcuts.ui                         |   59 +
 gtk/inspector/window.c                             |    3 +
 gtk/inspector/window.h                             |    1 +
 gtk/inspector/window.ui                            |   10 +
 gtk/meson.build                                    |   16 +-
 gtk/ui/gtkcoloreditor.ui                           |    6 +-
 gtk/ui/gtkfilechooserwidget.ui                     |   10 -
 gtk/ui/gtkplacesviewrow.ui                         |    6 -
 po-properties/POTFILES.in                          |    1 -
 po/POTFILES.in                                     |    1 -
 tests/testgtk.c                                    |   53 +-
 tests/testmenubutton.c                             |    4 -
 testsuite/css/parser/at-invalid-22.css             |    1 -
 testsuite/css/parser/at-invalid-22.errors          |    1 -
 testsuite/css/parser/at-invalid-22.ref.css         |    0
 testsuite/css/parser/meson.build                   |    3 -
 testsuite/gtk/accel.c                              |   15 +-
 testsuite/gtk/action.c                             |    7 +-
 testsuite/gtk/builder.c                            |   53 -
 testsuite/gtk/defaultvalue.c                       |    9 +
 testsuite/gtk/keyhash.c                            |  217 ---
 testsuite/gtk/meson.build                          |    4 +-
 testsuite/gtk/notify.c                             |   15 +
 testsuite/gtk/objects-finalize.c                   |    4 +-
 testsuite/gtk/shortcuts.c                          |  309 ++++
 123 files changed, 8447 insertions(+), 9746 deletions(-)
---


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]