[gtk: 12/12] Merge branch 'stackpage' into 'master'



commit 4763406439fbaf172a3e055ee4cfa9a5c75f8e1e
Merge: 101f7c7aa4 b675597075
Author: Matthias Clasen <mclasen redhat com>
Date:   Fri Feb 8 05:22:30 2019 +0000

    Merge branch 'stackpage' into 'master'
    
    Stack page
    
    See merge request GNOME/gtk!564

 demos/gtk-demo/application.ui            |    4 +-
 demos/gtk-demo/appmenu.ui                |    2 -
 demos/gtk-demo/blendmodes.ui             |  510 ++--
 demos/gtk-demo/cursors.ui                |    2 -
 demos/gtk-demo/demo.ui                   |   11 +-
 demos/gtk-demo/filtermodel.ui            |   10 +-
 demos/gtk-demo/fishbowl.ui               |    8 +-
 demos/gtk-demo/font-features.ui          |   44 +-
 demos/gtk-demo/listbox.ui                |    5 +-
 demos/gtk-demo/main.ui                   |   11 +-
 demos/gtk-demo/menus.ui                  |    1 -
 demos/gtk-demo/modelbutton.ui            |   11 +-
 demos/gtk-demo/popover.ui                |    4 -
 demos/gtk-demo/revealer.ui               |    2 -
 demos/gtk-demo/scale.ui                  |   22 +-
 demos/gtk-demo/shortcuts-boxes.ui        |    9 -
 demos/gtk-demo/shortcuts-builder.ui      |    2 -
 demos/gtk-demo/shortcuts-clocks.ui       |    2 -
 demos/gtk-demo/shortcuts-gedit.ui        |    2 -
 demos/gtk-demo/shortcuts.ui              |    2 -
 demos/gtk-demo/spinbutton.ui             |    1 -
 demos/gtk-demo/stack.ui                  |   52 +-
 demos/gtk-demo/theming.ui                |    1 -
 demos/icon-browser/menus.ui              |    2 -
 demos/icon-browser/window.ui             |    6 +-
 demos/widget-factory/widget-factory.c    |    2 +-
 demos/widget-factory/widget-factory.ui   | 4234 +++++++++++++++---------------
 docs/reference/gtk/gtk4-builder-tool.xml |    4 +
 docs/reference/gtk/gtk4-sections.txt     |    6 +
 docs/reference/gtk/gtk4.types.in         |    2 +
 docs/reference/gtk/migrating-3to4.xml    |   34 +
 examples/application10/app-menu.ui       |    2 -
 examples/application10/gears-menu.ui     |    2 -
 examples/application10/prefs.ui          |    9 +-
 examples/application10/window.ui         |    2 -
 examples/application2/window.ui          |    5 +-
 examples/application3/window.ui          |    5 +-
 examples/application4/app-menu.ui        |    2 -
 examples/application4/window.ui          |    5 +-
 examples/application5/app-menu.ui        |    2 -
 examples/application5/window.ui          |    5 +-
 examples/application6/app-menu.ui        |    2 -
 examples/application6/prefs.ui           |    9 +-
 examples/application6/window.ui          |    5 +-
 examples/application7/app-menu.ui        |    2 -
 examples/application7/prefs.ui           |    9 +-
 examples/application7/window.ui          |    2 -
 examples/application8/app-menu.ui        |    2 -
 examples/application8/gears-menu.ui      |    2 -
 examples/application8/prefs.ui           |    9 +-
 examples/application8/window.ui          |    2 -
 examples/application9/app-menu.ui        |    2 -
 examples/application9/gears-menu.ui      |    2 -
 examples/application9/prefs.ui           |    9 +-
 examples/application9/window.ui          |    2 -
 gtk/gtkassistant.c                       |  449 ++--
 gtk/gtkassistant.h                       |   18 +
 gtk/gtkbuilder.c                         |   10 +-
 gtk/gtkbuilderparser.c                   |   18 +-
 gtk/gtkbuilderprivate.h                  |   11 +
 gtk/gtkcontainer.c                       |    1 -
 gtk/gtkmenusectionbox.c                  |    2 +-
 gtk/gtkstack.c                           |  633 +++--
 gtk/gtkstack.h                           |   20 +
 gtk/gtkstacksidebar.c                    |   33 +-
 gtk/gtkstackswitcher.c                   |   92 +-
 gtk/inspector/actions.ui                 |    1 -
 gtk/inspector/css-editor.ui              |    1 -
 gtk/inspector/css-node-tree.ui           |    1 -
 gtk/inspector/data-list.ui               |    4 +-
 gtk/inspector/general.ui                 |    3 -
 gtk/inspector/gtkstackcombo.c            |    8 +-
 gtk/inspector/logs.ui                    |    7 +-
 gtk/inspector/magnifier.ui               |    1 -
 gtk/inspector/menu.ui                    |    6 -
 gtk/inspector/misc-info.ui               |    2 -
 gtk/inspector/object-hierarchy.ui        |    1 -
 gtk/inspector/object-tree.ui             |    2 -
 gtk/inspector/prop-list.ui               |    1 -
 gtk/inspector/recorder.ui                |    3 +-
 gtk/inspector/resource-list.ui           |  369 +--
 gtk/inspector/selector.ui                |    1 -
 gtk/inspector/signals-list.ui            |    1 -
 gtk/inspector/statistics.ui              |  202 +-
 gtk/inspector/visual.ui                  |    7 +-
 gtk/inspector/window.ui                  |  799 +++---
 gtk/tools/gtk-builder-tool-enumerate.c   |   74 +
 gtk/tools/gtk-builder-tool-preview.c     |  197 ++
 gtk/tools/gtk-builder-tool-simplify.c    |  872 ++++++
 gtk/tools/gtk-builder-tool-validate.c    |  164 ++
 gtk/tools/gtk-builder-tool.c             | 1029 +-------
 gtk/tools/meson.build                    |    6 +-
 gtk/ui/gtkaboutdialog.ui                 |  292 ++-
 gtk/ui/gtkappchooserdialog.ui            |    2 -
 gtk/ui/gtkappchooserwidget.ui            |   14 +-
 gtk/ui/gtkapplication-quartz.ui          |    8 -
 gtk/ui/gtkassistant.ui                   |    2 -
 gtk/ui/gtkcolorchooserdialog.ui          |    2 -
 gtk/ui/gtkcoloreditor.ui                 |    4 -
 gtk/ui/gtkcombobox.ui                    |    2 -
 gtk/ui/gtkdialog.ui                      |    9 +-
 gtk/ui/gtkemojichooser.ui                |  518 ++--
 gtk/ui/gtkemojicompletion.ui             |    2 -
 gtk/ui/gtkfilechooserdialog.ui           |    2 -
 gtk/ui/gtkfilechooserwidget.ui           |  412 +--
 gtk/ui/gtkfontchooserdialog.ui           |    2 -
 gtk/ui/gtkfontchooserwidget.ui           |  490 ++--
 gtk/ui/gtkinfobar.ui                     |    2 -
 gtk/ui/gtklockbutton.ui                  |    2 -
 gtk/ui/gtkmediacontrols.ui               |   11 +-
 gtk/ui/gtkmessagedialog.ui               |    2 -
 gtk/ui/gtkpagesetupunixdialog.ui         |    7 -
 gtk/ui/gtkpathbar.ui                     |    2 -
 gtk/ui/gtkplacesview.ui                  |  228 +-
 gtk/ui/gtkplacesviewrow.ui               |   44 +-
 gtk/ui/gtkprintunixdialog.ui             |   26 +-
 gtk/ui/gtkscalebutton.ui                 |    3 -
 gtk/ui/gtksidebarrow.ui                  |    3 +-
 gtk/ui/gtkstatusbar.ui                   |    2 -
 gtk/ui/gtktooltipwindow.ui               |    2 -
 gtk/ui/gtkvideo.ui                       |    5 +-
 gtk/ui/gtkvolumebutton.ui                |    2 -
 122 files changed, 6427 insertions(+), 5830 deletions(-)
---


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