[gtk: 16/16] Merge branch 'matthiasc/for-master' into 'master'



commit 9f3fb69dce4aa73cf5bb37d3aa0af7fc5788fc8a
Merge: bb8fa045c2 0e18e52f00
Author: Matthias Clasen <mclasen redhat com>
Date:   Mon May 11 12:51:08 2020 +0000

    Merge branch 'matthiasc/for-master' into 'master'
    
    Matthiasc/for master
    
    Closes #2729 and #2730
    
    See merge request GNOME/gtk!1870

 docs/reference/gtk/getting_started.xml.in          | 312 ++++++++++-----------
 docs/reference/gtk/images/getting-started-app1.png | Bin 3004 -> 4764 bytes
 docs/reference/gtk/images/getting-started-app2.png | Bin 5718 -> 7246 bytes
 docs/reference/gtk/images/getting-started-app3.png | Bin 37590 -> 39268 bytes
 docs/reference/gtk/images/getting-started-app4.png | Bin 211105 -> 50510 bytes
 docs/reference/gtk/images/getting-started-app6.png | Bin 223488 -> 153201 bytes
 docs/reference/gtk/images/getting-started-app7.png | Bin 38964 -> 48914 bytes
 docs/reference/gtk/images/getting-started-app8.png | Bin 58744 -> 80142 bytes
 docs/reference/gtk/images/getting-started-app9.png | Bin 46932 -> 71600 bytes
 examples/application1/README                       |   2 +
 examples/application10/Makefile.example            |  35 ---
 examples/application10/exampleapp.c                | 114 --------
 examples/application10/exampleapp.gresource.xml    |   9 -
 examples/application10/exampleapp.h                |  14 -
 examples/application10/exampleappprefs.c           |  59 ----
 examples/application10/exampleappprefs.h           |  15 -
 examples/application10/exampleappwin.c             | 295 -------------------
 examples/application10/exampleappwin.h             |  16 --
 examples/application10/gears-menu.ui               |  14 -
 examples/application10/main.c                      |  16 --
 examples/application10/meson.build                 |  14 -
 .../application10/org.gtk.exampleapp.gschema.xml   |  25 --
 examples/application10/prefs.ui                    |  67 -----
 examples/application10/window.ui                   |  81 ------
 examples/application2/README                       |   1 +
 examples/application2/window.ui                    |  10 +-
 examples/application3/README                       |   1 +
 examples/application3/window.ui                    |  20 +-
 examples/application4/README                       |   1 +
 examples/application4/exampleapp.c                 |   7 -
 examples/application4/exampleapp.gresource.xml     |   2 +-
 examples/application4/exampleappwin.c              |  10 +
 .../app-menu.ui => application4/gears-menu.ui}     |   3 +-
 examples/application4/window.ui                    |  25 +-
 examples/application5/exampleapp.c                 |   7 -
 examples/application5/exampleapp.gresource.xml     |   2 +-
 examples/application5/exampleappwin.c              |  12 +-
 .../app-menu.ui => application5/gears-menu.ui}     |   3 +-
 examples/application5/window.ui                    |  25 +-
 examples/application6/exampleapp.c                 |   7 -
 examples/application6/exampleapp.gresource.xml     |   2 +-
 examples/application6/exampleappwin.c              |  11 +
 .../app-menu.ui => application6/gears-menu.ui}     |   3 +-
 examples/application6/prefs.ui                     |  14 +-
 examples/application6/window.ui                    |  25 +-
 examples/application7/README                       |   1 +
 examples/application7/app-menu.ui                  |  16 --
 examples/application7/exampleapp.c                 |   7 -
 examples/application7/exampleapp.gresource.xml     |   2 +-
 examples/application7/exampleappwin.c              |  11 +
 .../app-menu.ui => application7/gears-menu.ui}     |   3 +-
 examples/application7/prefs.ui                     |  14 +-
 examples/application7/window.ui                    |  36 ++-
 examples/application8/README                       |   1 +
 examples/application8/app-menu.ui                  |  16 --
 examples/application8/exampleapp.c                 |   7 -
 examples/application8/exampleapp.gresource.xml     |   1 -
 examples/application8/exampleappwin.c              |  15 +-
 examples/application8/gears-menu.ui                |  11 +
 examples/application8/prefs.ui                     |  14 +-
 examples/application8/window.ui                    |  44 ++-
 examples/application9/README                       |   1 +
 examples/application9/app-menu.ui                  |  16 --
 examples/application9/exampleapp.c                 |   7 -
 examples/application9/exampleapp.gresource.xml     |   1 -
 examples/application9/exampleappwin.c              |  15 +-
 examples/application9/gears-menu.ui                |  11 +
 examples/application9/prefs.ui                     |  14 +-
 examples/application9/window.ui                    |  66 +++--
 examples/meson.build                               |   1 -
 gtk/gtkapplicationwindow.c                         |   2 +-
 gtk/gtkbuilderscope.c                              |   2 +-
 gtk/gtkmenubutton.h                                |   5 +-
 gtk/gtkprintunixdialog.c                           |  12 +-
 gtk/gtktextview.c                                  |   3 +
 gtk/gtktextviewchild.c                             |   2 +-
 gtk/gtktreeview.c                                  |   3 +
 gtk/gtktreeviewcolumn.c                            |   7 +-
 tests/print-editor.c                               |  11 +-
 testsuite/gtk/templates.c                          | 150 ++++++++--
 testsuite/gtk/treeview.c                           |   2 +-
 81 files changed, 559 insertions(+), 1250 deletions(-)
---


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