[gtk: 4/4] Merge branch 'demo-keywords' into 'master'




commit 8094f757eba1334dea6f2d6adcf29e15a35f81e3
Merge: cddbc8f1cc d732c869c2
Author: Matthias Clasen <mclasen redhat com>
Date:   Sun Sep 13 21:13:21 2020 +0000

    Merge branch 'demo-keywords' into 'master'
    
    gtk-demo: add keywords to filtering
    
    See merge request GNOME/gtk!2567

 demos/gtk-demo/assistant.c            |  6 ++--
 demos/gtk-demo/combobox.c             |  1 +
 demos/gtk-demo/constraints.c          |  1 +
 demos/gtk-demo/constraints2.c         |  1 +
 demos/gtk-demo/css_accordion.c        |  1 -
 demos/gtk-demo/css_basics.c           |  3 +-
 demos/gtk-demo/css_multiplebgs.c      |  3 +-
 demos/gtk-demo/dialog.c               |  1 +
 demos/gtk-demo/drawingarea.c          |  1 +
 demos/gtk-demo/filtermodel.c          |  1 +
 demos/gtk-demo/fixed.c                |  1 +
 demos/gtk-demo/geninclude.py          | 52 ++++++++++++++++++++++++-----------
 demos/gtk-demo/gestures.c             |  1 +
 demos/gtk-demo/headerbar.c            |  1 +
 demos/gtk-demo/hypertext.c            |  1 +
 demos/gtk-demo/iconscroll.c           |  1 +
 demos/gtk-demo/images.c               |  1 +
 demos/gtk-demo/infobar.c              |  1 +
 demos/gtk-demo/layoutmanager.c        |  1 +
 demos/gtk-demo/layoutmanager2.c       |  1 +
 demos/gtk-demo/list_store.c           |  1 -
 demos/gtk-demo/listbox.c              |  1 -
 demos/gtk-demo/listview_applauncher.c |  1 +
 demos/gtk-demo/listview_clocks.c      |  3 +-
 demos/gtk-demo/listview_colors.c      |  1 +
 demos/gtk-demo/listview_filebrowser.c |  1 +
 demos/gtk-demo/listview_minesweeper.c |  3 +-
 demos/gtk-demo/listview_settings.c    |  1 +
 demos/gtk-demo/listview_words.c       |  1 +
 demos/gtk-demo/main.c                 | 34 ++++++++++++++++++++++-
 demos/gtk-demo/markup.c               |  1 +
 demos/gtk-demo/overlay.c              |  1 +
 demos/gtk-demo/overlay2.c             |  1 +
 demos/gtk-demo/pagesetup.c            |  1 +
 demos/gtk-demo/paint.c                |  1 +
 demos/gtk-demo/peg_solitaire.c        |  1 +
 demos/gtk-demo/pickers.c              |  2 ++
 demos/gtk-demo/printing.c             |  1 -
 demos/gtk-demo/rotated_text.c         |  4 +--
 demos/gtk-demo/search_entry2.c        | 12 +++++---
 demos/gtk-demo/shadertoy.c            |  1 +
 demos/gtk-demo/shortcut_triggers.c    |  1 +
 demos/gtk-demo/sliding_puzzle.c       |  2 +-
 demos/gtk-demo/spinbutton.c           |  1 +
 demos/gtk-demo/spinner.c              |  1 -
 demos/gtk-demo/textscroll.c           |  1 +
 demos/gtk-demo/transparent.c          |  1 +
 demos/gtk-demo/video_player.c         |  2 ++
 48 files changed, 124 insertions(+), 38 deletions(-)
---


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