Fix gtk_column_view_sort_by_column

We must clear the current sort columns before setting the new one, to prevent double arrows in the headers. Fixes: #4696
2022-04-18 20:37:04 -04:00
950 changed files with 1067733 additions and 82652 deletions
@@ -21,12 +21,12 @@ stages:

 # Common variables
 variables:
-  COMMON_MESON_FLAGS: "-Dwerror=true -Dglib:werror=false -Dpango:werror=false -Dgtk-doc:werror=false -Dwayland-protocols:werror=false -Dsysprof:werror=false -Dwayland:werror=false"
+  COMMON_MESON_FLAGS: "-Dwerror=true -Dglib:werror=false -Dpango:werror=false -Dgtk-doc:werror=false -Dwayland-protocols:werror=false -Dsysprof:werror=false"
  BACKEND_FLAGS: "-Dx11-backend=true -Dwayland-backend=true -Dbroadway-backend=true"
  FEATURE_FLAGS: "-Dvulkan=enabled -Dcloudproviders=enabled"
  MESON_TEST_TIMEOUT_MULTIPLIER: 3
-  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v38"
-  FLATPAK_IMAGE: "quay.io/gnome_infrastructure/gnome-runtime-images:gnome-master"
+  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v36"
+  FLATPAK_IMAGE: "registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master"

 .only-default:
  only:
@@ -58,7 +58,6 @@ style-check-diff:
      - "${CI_PROJECT_DIR}/_build/report*.xml"
      - "${CI_PROJECT_DIR}/_build/report*.html"
      - "${CI_PROJECT_DIR}/_build/testsuite/reftests/output/*/*.png"
-      - "${CI_PROJECT_DIR}/_build/testsuite/reftests/output/*/*.node"
      - "${CI_PROJECT_DIR}/_build/testsuite/tools/output/*/*"
      - "${CI_PROJECT_DIR}/_build/testsuite/gsk/compare/*/*/*.png"
      - "${CI_PROJECT_DIR}/_build/testsuite/css/output/*/*.syscap"
@@ -109,29 +108,6 @@ release-build:
    - ninja -C _build
    - .gitlab-ci/run-tests.sh _build x11

-fedora-mingw64:
-  extends: .build-fedora-default
-  stage: build
-  needs: []
-  before_script:
-    - sudo dnf install -y
-            mingw64-filesystem
-            mingw64-gcc
-            mingw64-binutils
-            mingw64-cairo
-            mingw64-gdk-pixbuf
-            mingw64-gstreamer1-plugins-bad-free
-            mingw64-glib2
-            mingw64-libepoxy
-            mingw64-pango
-            # mingw64-graphene (rawhide)
-  script:
-    - .gitlab-ci/show-info-linux.sh
-    - meson subprojects update
-    - mkdir _build && cd _build
-    - mingw64-meson -Dintrospection=disabled -Dgraphene:introspection=disabled
-    - ninja
-
 installed-tests:
  extends: .build-fedora-default
  stage: build
@@ -196,7 +172,7 @@ macos:
  needs: []
  before_script:
    - bash .gitlab-ci/show-info-osx.sh
-    - pip3 install --user meson==0.60.3
+    - pip3 install --user meson==0.59
    - pip3 install --user ninja
    - export PATH=/Users/gitlabrunner/Library/Python/3.7/bin:$PATH
    - export MESON_FORCE_BACKTRACE=1
@@ -292,18 +268,6 @@ flatpak-main:icon-browser:
  variables:
    APPID: org.gtk.IconBrowser4

-flatpak-manual:node-editor:
-  extends: .flatpak-manual
-  needs: []
-  variables:
-    APPID: org.gtk.gtk4.NodeEditor
-
-flatpak-main:node-editor:
-  extends: .flatpak-main
-  needs: []
-  variables:
-    APPID: org.gtk.gtk4.NodeEditor
-
 # Publish the demo apps to the GNOME Nightly repo
 # https://wiki.gnome.org/Apps/Nightly
 # https://gitlab.gnome.org/GNOME/Initiatives/-/wikis/DevOps-with-Flatpak
@@ -322,11 +286,6 @@ nightly icon-browser:
    dependencies: ['flatpak-main:icon-browser']
    needs: ['flatpak-main:icon-browser']

-nightly node-editor:
-    extends: '.publish_nightly'
-    dependencies: ['flatpak-main:node-editor']
-    needs: ['flatpak-main:node-editor']
-
 static-scan:
  image: $FEDORA_IMAGE
  stage: analysis
@@ -386,7 +345,6 @@ reference:
      - _reference

 publish-docs:
-  image: fedora:latest
  stage: publish
  needs: ['reference']
  script:
@@ -14,9 +14,6 @@ Each Docker image has a tag composed of two parts:
 See the [container registry][registry] for the available images for each
 branch, as well as their available versions.

-Note that using `latest` as version number will overwrite the most
-recently uploaded image in the registry.
-
 ### Checklist for Updating a CI image

 - [ ] Update the `${image}.Dockerfile` file with the dependencies
@@ -1,4 +1,4 @@
-FROM fedora:36
+FROM fedora:34

 RUN dnf -y install \
    adwaita-icon-theme \
@@ -87,6 +87,7 @@ RUN dnf -y install \
    python3-wheel \
    redhat-rpm-config \
    sassc \
+    systemtap-sdt-devel \
    vulkan-devel \
    wayland-devel \
    wayland-protocols-devel \
@@ -16,9 +16,10 @@ flatpak-builder \
 flatpak build ${builddir} meson \
                --prefix=/app \
                --libdir=/app/lib \
-                --buildtype=debugoptimized \
+                --buildtype=release \
                -Dx11-backend=true \
                -Dwayland-backend=true \
+                -Dprint-backends=file \
                -Dbuild-tests=false \
                -Dbuild-examples=false \
                -Dintrospection=disabled \
@@ -185,8 +185,6 @@ ul.images li {
                <li><img alt="ref" src="{{ failure.image_data.ref }}" /></li>
                <li><img alt="out" src="{{ failure.image_data.out }}" /></li>
                <li><img alt="diff" src="{{ failure.image_data.diff }}" /></li>
-                <li><a href="{{ failure.image_data.refnode }}">ref node</a></li>
-                <li><a href="{{ failure.image_data.outnode }}">out node</a></li>
              </ul>
              {% endif %}
            </li>
@@ -313,8 +311,6 @@ for line in args.infile:
        image_data = {
            'ref': os.path.join(args.reftest_output_dir, '{}.ref.png'.format(basename)),
            'out': os.path.join(args.reftest_output_dir, '{}.out.png'.format(basename)),
-            'refnode': os.path.join(args.reftest_output_dir, '{}.ref.node'.format(basename)),
-            'outnode': os.path.join(args.reftest_output_dir, '{}.out.node'.format(basename)),
            'diff': os.path.join(args.reftest_output_dir, '{}.diff.png'.format(basename)),
        }

@@ -5,7 +5,7 @@ call "C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliar
@echo on

 :: FIXME: make warnings fatal
-pip3 install --upgrade --user meson==0.60.3 || goto :error
+pip3 install --upgrade --user meson==0.59 || goto :error
 meson -Ddebug=false -Dmedia-gstreamer=disabled _build || goto :error
 ninja -C _build || goto :error

@@ -38,6 +38,25 @@ mkdir -p _ccache
 export CCACHE_BASEDIR="$(pwd)"
 export CCACHE_DIR="${CCACHE_BASEDIR}/_ccache"

+# https://gitlab.gnome.org/GNOME/gtk/-/issues/2243
+# https://gitlab.gnome.org/GNOME/gtk/-/issues/3002
+
+if ! pkg-config --atleast-version=2.66.0 glib-2.0; then
+    git clone https://gitlab.gnome.org/GNOME/glib.git _glib
+    meson setup _glib_build _glib
+    meson compile -C _glib_build
+    meson install -C _glib_build
+fi
+pkg-config --modversion glib-2.0
+
+if ! pkg-config --atleast-version=1.50.0 pango; then
+    git clone https://gitlab.gnome.org/GNOME/pango.git _pango
+    meson setup _pango_build _pango
+    meson compile -C _pango_build
+    meson install -C _pango_build
+fi
+pkg-config --modversion pango
+
 # Build
 ccache --zero-stats
 ccache --show-stats
@@ -1,382 +1,3 @@
-Overview of Changes in 4.8.0, 06-09-2022
-========================================
-
-* GtkTreeView:
- - Fix a problem with scrolling animations
- - Fix some event handling problems
- - Drop unreachable code
-
-* GtkText:
- - Respect the no-emoji input hint fully
-
-* GtkEmojiChooser:
- - Fix arrow key navigation
-
-* GtkFontChooser:
- - Improve the handling of OpenType font features
-
-* GtkTreeListModel:
- - Fix handling of collapsed child nodes
-
-* GtkInscription:
- - Fix accessible name
-
-* Theme:
- - Fix placeholder text in HighContrast
-
-* Increase the memory limit for the jpeg loader to 300M
-
-* Miscellaneous memory leak fixes
-
-* Wayland:
- - Refator handling of text protocol client updates
-
-* Windows:
- - Support high-resolution scroll wheel events
- - Generate GdkWin32.gir
- - Implement color picking
-
-* Translation updates
- Abkhazian
- Basque
- Brazilian Portuguese
- Bulgarian
- Catalan
- Chinese (China)
- Croatian
- Czech
- Danish
- Dutch
- Galician
- Georgian
- German
- Hungarian
- Icelandic
- Indonesian
- Korean
- Latvian
- Lithuanian
- Persian
- Polish
- Portuguese
- Russian
- Serbian
- Spanish
- Swedish
- Turkish
- Ukrainian
-
-
-Overview of Changes in 4.7.2, 10-08-2022
-========================================
-
-* GtkTextView:
- - Fix child positioning with gutters
-
-* GtkText:
- - Update placeholder visibility when necessary
-
-* GtkPicture:
- - Add a content-fit property
-
-* GtkPopover:
- - Fix a size allocation problem with the arrow
-
-* GtkTreeView:
- - Fix a problem with DND
-
-* GtkTreePopover:
- - Support scrolling
-
-* GtkGridView:
- - Fix issues with rubberband selection
-
-* GtkLabel:
- - Add a tabs property
-
-* GtkSnapshot:
- - Make GtkSnapshot work from bindings
-
-* GtkScrolledWindow:
- - Scroll at a reasonable speed
-
-* GtkPaned:
- - Avoid an infinite loop
-
-* GtkWindow:
- - Improve generation and handling of crossing events
-
-* CSS:
- - Fix handling of certain transform values
-
-* Media support:
- - Add audio support to the ffmpeg backend
- - Avoid oom with pathological jpeg images
-
-* GDK:
- - Fix handling of touchpad hold events
- - Add support for hi-resolution scroll events
-
-* X11:
- - Fix preferred action for DND
-
-* Windows:
- - Fix DND
-
-* List models:
- - Fix items-changed emission
- - Add more list model tests
-
-* Demos:
- - Add a winning sound to game demos
- - Make app icons work uninstalled
-
-* Translation updates:
- Abkhazian
- Basque
- Catalan
- Georgian
- German
- Indonesian
- Occitan
- Persian
- Portuguese
- Russian
- Spanish
- Ukrainian
-
-
-Overview of Changes in 4.7.1, 12-07-2022
-========================================
-
-* GtkInscription:
- - A new label-like widget for use in list views
-
-* GtkColorChooser:
- - Style improvements
-
-* GtkFontChooser:
- - Improve support for OpenType features a bit
-
-* GtkLabel:
- - Allow selectable labels to be activated via mnemonic
-
-* GtkTextView:
- - Implement GetCharacterExtents for accessibility
-
-* GtkStack:
- - Fix a poblem with stack page accessibility
-
-* GtkListView:
- - Cull listitems that are out of view
- - Make all our list models implement ::n-items and
-   ::item-type properties
-
-* Translations:
- - Stop translating property nicks and blurbs
- - Fix extracting translations from ui files
-
-* Debugging:
- - Support GTK_DEBUG=invert-text-dir
- - Allow inspecting inspectors
- - Replace GTK_USE_PORTAL with GDK_DEBUG=portals
- - Improve responsiveness of the inspector
-
-* CSS:
- - Allow fractional letterspacing
-
-* Theme:
- - Improve legibility of selectable labels
-
-* Demos:
- - Improve the font features demo
- - Add demos for GtkInscription
-
-* Wayland:
- - Freeze popups when hidden
- - Only send smooth scroll events for tablet tools
- - Make scaled cursor image have the right size
- - Fix problems with the activation protocol
- - Don't force the HighContrast icon theme
- - Support xdg_toplevel.bounds
-
-* X11:
- - Always update the shadoe size
-
-* Windows:
- - Improve touchpad support by using DirectManipulation
- - Add more directories to the builtin hicolor icon theme
-
-* Translation updates:
- Basque
- Catalan
- Chinese (China)
- Galician
- German
- Lithuanian
- Nepali
- Occitan
- Persian
- Polish
- Portuguese
- Russian
- Serbian
- Spanish
- Swedish
- Turkish
- Ukrainian
-
-
-Overview of Changes in 4.7.0, 07-05-2022
-========================================
-
-* GtkTextView:
- - Reduce overdraws
-
-* GtkViewport:
- - Default scroll-to-focus to TRUE
-
-* GtkText:
- - Stop blinking when we lose focus
-
-* GtkSearchEntry:
- - Make search delay configurable
-
-* GtkPopoverMenu:
- - Fix RTL positioning of buttons
-
-* GtkLabel:
- - Fix focus keynav with links
-
-* GtkFileChooser:
- - Prevent undesirable completion popups
- - Fix a corner case in save mode
- - Keep the portal filechooser alive long enough
-
-* GtkCheckButton:
- - Allow setting a custom child
-
-* GtkEditableLabel:
- - Make the :editing property writable
-
-* GtkColumnView:
- - Various optimizations to improve scrolling performance
-
-* GtkTreeStore:
- - Allow populating tree stores from ui files
-
-* GtkBoxLayout:
- - Avoid infinite loops
-
-* CSS:
- - Optimize reordering within the same parent
-
-* Emoji:
- - Update to CLDR v40 / Unicode 14
- - Add more locales
-
-* Input:
- - Add scroll unit handling
- - Handle display changes in GtkIMMultiContext
- - Always populate GDK_AXIS_X/Y in event history
- - Don't crash for large compose tables
-
-* Accessibility:
- - Fix a crash at start when orca is running
-
-* Theme:
- - Refresh icons
- - Fix selection in vertical spin buttons
- - Fix selection in editable labels
-
-* gdk:
- - Optimize pixel format conversions
- - Use EGL_KHR_swap_buffers_with_damage for NVidia
-
-* gsk:
- - Handle large viewports
- - Prepare texture libraries for glyphy rendering
- - Don't leak big glyphs in the glyph cache
- - Align offscreen rendering with th pixel grid
- - Check for half-float support before using it
-
-* Wayland:
- - Use xdg-activation protocol
- - Fix text caret coordinates
- - Fix on-screen keyboard activation
-
-* MacOS:
- - Fix sluggish and reversed scrolling
- - Improve monitor detection
- - Event handling fixes
- - Fix keyboard input on popovers
- - Support OpenGL-based video playback
- - Suport fullscreen
- - Improve native filechoooser size allocation
- - Use CALayer and IOSurface for rendering
- - Use a per-monitor CVDisplayLink
- - Fix kinetic scrolling
- - Improve window placement
- - Improve multi-monitor handling
- - Start applications in the foreground
- - Fix cursor blink time
-
-* Windows:
- - Fix preedit window placement on HiDPI
-
-* Tools:
- - gtk4-builder-tool: Don't require a display for all commands
- - gtk4-builder-tool: Add a screenshot command
- - gtk4-node-editor: Install this utility
-
-* Debugging:
- - inspector: Show more application data
- - inspector: Allow viewing PangoAttrList properties
-
-* Documentation:
- - Use the gtk-builder-tool to generate screenshots
-
-* Build:
- - Fix cross-compilation
- - Fix build on aarch64
- - Fix build with gcc 12
-
-* Translation updates
- Basque
- Brazilian Portuguese
- British English
- Catalan
- Chinese (China)
- Chinese (Taiwan)
- Croatian
- Czech
- Danish
- Finnish
- Galician
- Georgian
- German
- Hebrew
- Hungarian
- Indonesian
- Italian
- Kazakh
- Korean
- Latvian
- Lithuanian
- Norwegian Bokmål
- Persian
- Polish
- Portuguese
- Russian
- Serbian
- Slovak
- Slovenian
- Spanish
- Swedish
- Turkish
- Ukrainian
-
-
 Overview of Changes in 4.6.1, 11-02-2022
 ========================================

@@ -54,7 +54,8 @@
            "builddir" : true,
            "config-opts" : [
                "--libdir=/app/lib",
-                "-Dtests=false"
+                "-Dtests=false",
+                "-Dbenchmarks=false"
            ],
            "sources" : [
                {
@@ -104,8 +105,8 @@
             "sources": [
                 {
                     "type": "archive",
-                     "url": "https://boostorg.jfrog.io/artifactory/main/release/1.79.0/source/boost_1_79_0.tar.bz2",
-                     "sha256": "475d589d51a7f8b3ba2ba4eda022b170e562ca3b760ee922c146b6c65856ef39"
+                     "url": "https://boostorg.jfrog.io/artifactory/main/release/1.69.0/source/boost_1_69_0.tar.bz2",
+                     "sha256": "8f32d4617390d1c2d16f26a27ab60d97807b35440d45891fa340fc2648b04406"
                 }
            ]
        },
@@ -185,7 +186,7 @@
            "builddir" : true,
            "config-opts" : [
                "--libdir=/app/lib",
-                "-Dvulkan=disabled",
+                "-Denable_vulkan=no",
                "-Dbuildtype=debugoptimized",
                "-Dprofile=devel"
            ],
@@ -54,7 +54,8 @@
            "builddir" : true,
            "config-opts" : [
                "--libdir=/app/lib",
-                "-Dtests=false"
+                "-Dtests=false",
+                "-Dbenchmarks=false"
            ],
            "sources" : [
                {
@@ -114,7 +115,7 @@
            "builddir" : true,
            "config-opts" : [
                "--libdir=/app/lib",
-                "-Dvulkan=disabled",
+                "-Denable_vulkan=no",
                "-Dbuildtype=debugoptimized",
                "-Dprofile=devel"
            ],
@@ -54,7 +54,8 @@
            "builddir" : true,
            "config-opts" : [
                "--libdir=/app/lib",
-                "-Dtests=false"
+                "-Dtests=false",
+                "-Dbenchmarks=false"
            ],
            "sources" : [
                {
@@ -114,7 +115,7 @@
            "builddir" : true,
            "config-opts" : [
                "--libdir=/app/lib",
-                "-Dvulkan=disabled",
+                "-Denable_vulkan=no",
                "-Dbuildtype=debugoptimized",
                "-Dprofile=devel"
            ],
@@ -1,138 +0,0 @@
-{
-    "app-id" : "org.gtk.gtk4.NodeEditor",
-    "runtime" : "org.gnome.Platform",
-    "runtime-version" : "master",
-    "sdk" : "org.gnome.Sdk",
-    "command" : "gtk4-node-editor",
-    "tags" : [
-        "devel",
-        "development",
-        "nightly"
-    ],
-    "desktop-file-name-prefix" : "(Development) ",
-    "finish-args" : [
-        "--device=dri",
-        "--share=ipc",
-        "--socket=fallback-x11",
-        "--socket=wayland",
-        "--talk-name=org.gtk.vfs",
-        "--talk-name=org.gtk.vfs.*"
-    ],
-    "cleanup" : [
-        "/include",
-        "/lib/pkgconfig",
-        "/share/pkgconfig",
-        "/share/aclocal",
-        "/man",
-        "/share/man",
-        "/share/gtk-doc",
-        "*.la",
-        ".a",
-        "/lib/girepository-1.0",
-        "/share/gir-1.0",
-        "/share/doc"
-    ],
-    "modules" : [
-        {
-            "name" : "wayland",
-            "buildsystem" : "meson",
-            "builddir" : true,
-            "config-opts" : [
-                "-Ddocumentation=false"
-            ],
-            "sources" : [
-                {
-                    "type" : "git",
-                    "url" : "https://gitlab.freedesktop.org/wayland/wayland.git",
-                    "branch" : "main"
-                }
-            ]
-        },
-        {
-            "name" : "graphene",
-            "buildsystem" : "meson",
-            "builddir" : true,
-            "config-opts" : [
-                "--libdir=/app/lib",
-                "-Dtests=false"
-            ],
-            "sources" : [
-                {
-                    "type" : "git",
-                    "url" : "https://github.com/ebassi/graphene.git"
-                }
-            ]
-        },
-        {
-            "name" : "libsass",
-            "buildsystem" : "meson",
-            "builddir" : true,
-            "config-opts" : [
-                "--libdir=/app/lib"
-            ],
-            "sources" : [
-                {
-                    "type" : "git",
-                    "url" : "https://github.com/lazka/libsass.git",
-                    "branch" : "meson"
-                }
-            ]
-        },
-        {
-            "name" : "sassc",
-            "buildsystem" : "meson",
-            "builddir" : true,
-            "config-opts" : [
-                "--libdir=/app/lib"
-            ],
-            "sources" : [
-                {
-                    "type" : "git",
-                    "url" : "https://github.com/lazka/sassc.git",
-                    "branch" : "meson"
-                }
-            ]
-        },
-        {
-            "name" : "pango",
-            "buildsystem" : "meson",
-            "builddir" : true,
-            "config-opts" : [
-                "--libdir=/app/lib"
-            ],
-            "sources" : [
-                {
-                    "type" : "git",
-                    "url" : "https://gitlab.gnome.org/GNOME/pango.git",
-                    "branch" : "main"
-                }
-            ]
-        },
-        {
-            "name" : "gtk",
-            "buildsystem" : "meson",
-            "builddir" : true,
-            "config-opts" : [
-                "--libdir=/app/lib",
-                "-Dvulkan=disabled",
-                "-Dbuildtype=debugoptimized",
-                "-Dprofile=devel"
-            ],
-            "sources" : [
-                {
-                    "type" : "git",
-                    "url" : "https://gitlab.gnome.org/GNOME/gtk.git",
-                    "branch" : "main"
-                }
-            ]
-        }
-    ],
-    "build-options" : {
-        "env" : {
-            "DBUS_SESSION_BUS_ADDRESS" : "''",
-            "GSK_RENDERER" : "opengl",
-            "GDK_DEBUG" : "vulkan-disable",
-            "G_ENABLE_DEBUG" : "true"
-        }
-    }
-}
@@ -361,11 +361,11 @@ save_cb (GtkWidget              *button,
 }

 static void
-constraint_editor_window_dispose (GObject *object)
+constraint_editor_window_finalize (GObject *object)
 {
-  gtk_widget_dispose_template (GTK_WIDGET (object), CONSTRAINT_EDITOR_WINDOW_TYPE);
+  //ConstraintEditorWindow *self = (ConstraintEditorWindow *)object;

-  G_OBJECT_CLASS (constraint_editor_window_parent_class)->dispose (object);
+  G_OBJECT_CLASS (constraint_editor_window_parent_class)->finalize (object);
 }

 static int child_counter;
@@ -497,7 +497,7 @@ constraint_editor_window_class_init (ConstraintEditorWindowClass *class)
  GObjectClass *object_class = G_OBJECT_CLASS (class);
  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);

-  object_class->dispose = constraint_editor_window_dispose;
+  object_class->finalize = constraint_editor_window_finalize;

  gtk_widget_class_set_template_from_resource (widget_class,
                                               "/org/gtk/gtk4/constraint-editor/constraint-editor-window.ui");
@@ -607,11 +607,10 @@ constraint_editor_dispose (GObject *object)
 {
  ConstraintEditor *self = (ConstraintEditor *)object;

+  g_clear_pointer (&self->grid, gtk_widget_unparent);
  g_clear_object (&self->model);
  g_clear_object (&self->constraint);

-  gtk_widget_dispose_template (GTK_WIDGET (object), CONSTRAINT_EDITOR_TYPE);
-
  G_OBJECT_CLASS (constraint_editor_parent_class)->dispose (object);
 }

@@ -294,10 +294,9 @@ guide_editor_dispose (GObject *object)
 {
  GuideEditor *self = (GuideEditor *)object;

+  g_clear_pointer (&self->grid, gtk_widget_unparent);
  g_clear_object (&self->guide);

-  gtk_widget_dispose_template (GTK_WIDGET (self), GUIDE_EDITOR_TYPE);
-
  G_OBJECT_CLASS (guide_editor_parent_class)->dispose (object);
 }

@@ -504,8 +504,6 @@ demo_application_window_dispose (GObject *object)

  demo_application_window_store_state (window);

-  gtk_widget_dispose_template (GTK_WIDGET (window), demo_application_window_get_type ());
-
  G_OBJECT_CLASS (demo_application_window_parent_class)->dispose (object);
 }

@@ -341,13 +341,16 @@ do_clipboard (GtkWidget *do_widget)
      GtkWidget *button;

      scope = gtk_builder_cscope_new ();
-      gtk_builder_cscope_add_callback (scope, copy_button_clicked);
-      gtk_builder_cscope_add_callback (scope, paste_button_clicked);
-      gtk_builder_cscope_add_callback (scope, source_changed_cb);
-      gtk_builder_cscope_add_callback (scope, text_changed_cb);
-      gtk_builder_cscope_add_callback (scope, open_file_cb);
-      gtk_builder_cscope_add_callback (scope, on_drop);
-      gtk_builder_cscope_add_callback (scope, drag_prepare);
+      gtk_builder_cscope_add_callback_symbols (GTK_BUILDER_CSCOPE (scope),
+                                               "copy_button_clicked", G_CALLBACK (copy_button_clicked),
+                                               "paste_button_clicked", G_CALLBACK (paste_button_clicked),
+                                               "source_changed_cb", G_CALLBACK (source_changed_cb),
+                                               "text_changed_cb", G_CALLBACK (text_changed_cb),
+                                               "open_file_cb", G_CALLBACK (open_file_cb),
+                                               "on_drop", G_CALLBACK (on_drop),
+                                               "drag_prepare", G_CALLBACK (drag_prepare),
+                                               NULL);
+
      builder = gtk_builder_new ();
      gtk_builder_set_scope (builder, scope);
      gtk_builder_add_from_resource (builder, "/clipboard/clipboard.ui", NULL);
@@ -329,7 +329,6 @@
    <file>pickers.c</file>
    <file>printing.c</file>
    <file>revealer.c</file>
-    <file>read_more.c</file>
    <file>rotated_text.c</file>
    <file>scale.c</file>
    <file>search_entry.c</file>
@@ -376,7 +375,7 @@
    <file>glarea-gles.vs.glsl</file>
  </gresource>
  <gresource prefix="/font_features">
-    <file>font_features.ui</file>
+    <file>font-features.ui</file>
    <file>fontplane.c</file>
  </gresource>
  <gresource prefix="/spinbutton">
@@ -428,8 +427,6 @@
    <file>icons/16x16/emotes/face-laugh-symbolic.symbolic.png</file>
    <file>icons/16x16/status/battery-caution-charging-symbolic.symbolic.png</file>
    <file>icons/16x16/categories/applications-other.png</file>
-    <file>icons/48x48/status/starred.png</file>
-    <file alias="icons/scalable/apps/org.gtk.Demo4.svg">data/scalable/apps/org.gtk.Demo4.svg</file>
  </gresource>
  <gresource prefix="/org/gtk/Demo4/gtk">
    <file preprocess="xml-stripblanks">help-overlay.ui</file>
@@ -37,8 +37,7 @@ demo3_widget_dispose (GObject *object)
  Demo3Widget *self = DEMO3_WIDGET (object);

  g_clear_object (&self->paintable);
-
-  gtk_widget_dispose_template (GTK_WIDGET (self), DEMO3_TYPE_WIDGET);
+  g_clear_pointer (&self->menu, gtk_widget_unparent);

  G_OBJECT_CLASS (demo3_widget_parent_class)->dispose (object);
 }
@@ -90,9 +90,12 @@ do_errorstates (GtkWidget *do_widget)
      toplevel = GTK_WIDGET (gtk_widget_get_root (do_widget));

      scope = gtk_builder_cscope_new ();
-      gtk_builder_cscope_add_callback (scope, validate_more_details);
-      gtk_builder_cscope_add_callback (scope, mode_switch_state_set);
-      gtk_builder_cscope_add_callback (scope, level_scale_value_changed);
+      gtk_builder_cscope_add_callback_symbols (GTK_BUILDER_CSCOPE (scope),
+              "validate_more_details", G_CALLBACK (validate_more_details),
+              "mode_switch_state_set", G_CALLBACK (mode_switch_state_set),
+              "level_scale_value_changed", G_CALLBACK (level_scale_value_changed),
+              NULL);
+
      builder = gtk_builder_new ();
      gtk_builder_set_scope (builder, scope);
      gtk_builder_expose_object (builder, "toplevel", G_OBJECT (toplevel));
@@ -0,0 +1,190 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <object class="GtkWindow" id="window">
+    <property name="default-width">600</property>
+    <property name="default-height">500</property>
+    <property name="title">Font Explorer</property>
+    <child type="titlebar">
+      <object class="GtkHeaderBar">
+        <child>
+          <object class="GtkButton" id="reset">
+            <property name="receives-default">1</property>
+            <property name="tooltip-text">Reset</property>
+            <property name="icon-name">view-refresh-symbolic</property>
+            <signal name="clicked" handler="font_features_reset_features" swapped="no"/>
+          </object>
+        </child>
+      </object>
+    </child>
+    <child>
+      <object class="GtkBox">
+        <child>
+          <object class="GtkScrolledWindow">
+            <property name="hscrollbar-policy">never</property>
+            <child>
+              <object class="GtkViewport">
+                <child>
+                  <object class="GtkBox">
+                    <property name="margin-start">10</property>
+                    <property name="margin-end">10</property>
+                    <property name="margin-top">10</property>
+                    <property name="margin-bottom">10</property>
+                    <property name="orientation">vertical</property>
+                    <property name="spacing">6</property>
+                    <child>
+                      <object class="GtkFontButton" id="font">
+                        <property name="receives-default">1</property>
+                        <property name="font">Sans 12</property>
+                        <property name="level">family|style|size|variations|features</property>
+                        <signal name="font-set" handler="font_features_font_changed" swapped="no"/>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkExpander">
+                        <child type="label">
+                          <object class="GtkLabel">
+                            <property name="xalign">0</property>
+                            <property name="label" translatable="yes">Font Features</property>
+                            <attributes>
+                              <attribute name="weight" value="bold"></attribute>
+                            </attributes>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkBox" id="feature_list">
+                            <property name="orientation">vertical</property>
+                            <child>
+                              <object class="GtkComboBox" id="script_lang">
+                                <property name="margin-top">10</property>
+                                <signal name="changed" handler="font_features_script_changed" swapped="no"/>
+                                <child>
+                                  <object class="GtkCellRendererText"/>
+                                  <attributes>
+                                    <attribute name="text">0</attribute>
+                                  </attributes>
+                                </child>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkExpander">
+                        <child type="label">
+                          <object class="GtkLabel" id="variations_heading">
+                            <property name="label" translatable="yes">Font Variations</property>
+                            <property name="xalign">0</property>
+                            <attributes>
+                              <attribute name="weight" value="bold"></attribute>
+                            </attributes>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkGrid" id="variations_grid">
+                            <property name="column-spacing">10</property>
+                            <property name="row-spacing">10</property>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+                <style>
+                  <class name="view"/>
+                </style>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child>
+          <object class="GtkBox">
+            <property name="orientation">vertical</property>
+            <property name="hexpand">1</property>
+            <property name="vexpand">1</property>
+            <property name="margin-start">20</property>
+            <property name="margin-end">20</property>
+            <property name="margin-top">20</property>
+            <property name="margin-bottom">20</property>
+            <property name="spacing">20</property>
+            <child>
+              <object class="GtkStack" id="stack">
+                <child>
+                  <object class="GtkStackPage">
+                    <property name="name">label</property>
+                    <property name="child">
+                      <object class="GtkLabel" id="label">
+                        <property name="wrap">1</property>
+                        <property name="xalign">0</property>
+                        <property name="yalign">0</property>
+                        <property name="valign">start</property>
+                        <property name="selectable">1</property>
+                      </object>
+                    </property>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkStackPage">
+                    <property name="name">entry</property>
+                    <property name="child">
+                      <object class="GtkEntry" id="entry">
+                        <property name="text">Grumpy wizards make toxic brew for the evil Queen and Jack. A quick movement of the enemy will jeopardize six gunboats. The job of waxing linoleum frequently peeves chintzy kids. My girl wove six dozen plaid jackets before she quit. Twelve ziggurats quickly jumped a finch box.
+
+Разъяренный чтец эгоистично бьёт пятью жердями шустрого фехтовальщика. Наш банк вчера же выплатил Ф.Я. Эйхгольду комиссию за ценные вещи. Эх, чужак, общий съём цен шляп (юфть) – вдрызг! В чащах юга жил бы цитрус? Да, но фальшивый экземпляр!
+
+Τάχιστη αλώπηξ βαφής ψημένη γη, δρασκελίζει υπέρ νωθρού κυνός</property>
+                        <signal name="activate" handler="font_features_stop_edit"/>
+                        <property name="valign">start</property>
+                        <property name="width-chars">50</property>
+                      </object>
+                    </property>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child>
+              <object class="GtkLabel" id="settings">
+                <property name="wrap">1</property>
+                <property name="xalign">0</property>
+                <property name="valign">end</property>
+                <property name="width-chars">50</property>
+                <property name="max-width-chars">50</property>
+                <property name="hexpand">1</property>
+                <property name="vexpand">1</property>
+                <style>
+                  <class name="monospace"/>
+                </style>
+              </object>
+            </child>
+            <child>
+              <object class="GtkBox">
+                <property name="spacing">10</property>
+                <child>
+                  <object class="GtkLabel" id="description">
+                    <property name="wrap">1</property>
+                    <property name="xalign">0</property>
+                    <property name="valign">end</property>
+                    <property name="width-chars">50</property>
+                    <property name="max-width-chars">50</property>
+                    <property name="hexpand">1</property>
+                    <style>
+                      <class name="monospace"/>
+                    </style>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkToggleButton" id="edit_toggle">
+                    <property name="icon-name">document-edit-symbolic</property>
+                    <property name="halign">end</property>
+                    <property name="valign">end</property>
+                    <signal name="toggled" handler="font_features_toggle_edit"/>
+                  </object>
+                </child>
+              </object>
+            </child>
+          </object>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>
@@ -1,454 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <object class="GtkAdjustment" id="size_adjustment">
-    <property name="lower">7</property>
-    <property name="upper">100</property>
-    <property name="value">14</property>
-    <property name="step_increment">0.5</property>
-    <property name="page_increment">10</property>
-    <signal name="value-changed" handler="basic_value_changed" object="size_entry" swapped="false"/>
-  </object>
-  <object class="GtkAdjustment" id="letterspacing_adjustment">
-    <property name="lower">-1024</property>
-    <property name="upper">8192</property>
-    <property name="value">0</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">512</property>
-    <signal name="value-changed" handler="basic_value_changed" object="letterspacing_entry" swapped="false"/>
-  </object>
-  <object class="GtkAdjustment" id="line_height_adjustment">
-    <property name="lower">0.75</property>
-    <property name="upper">2.5</property>
-    <property name="value">1.0</property>
-    <property name="step_increment">0.1</property>
-    <property name="page_increment">1</property>
-    <signal name="value-changed" handler="basic_value_changed" object="line_height_entry" swapped="false"/>
-  </object>
-  <object class="GtkWindow" id="window">
-    <property name="default-width">600</property>
-    <property name="default-height">500</property>
-    <property name="title">Font Explorer</property>
-    <child type="titlebar">
-      <object class="GtkHeaderBar">
-        <child>
-          <object class="GtkButton" id="reset">
-            <property name="receives-default">1</property>
-            <property name="tooltip-text">Reset</property>
-            <property name="icon-name">view-refresh-symbolic</property>
-            <signal name="clicked" handler="font_features_reset_basic" swapped="no"/>
-            <signal name="clicked" handler="font_features_reset_features" swapped="no"/>
-            <signal name="clicked" handler="font_features_reset_variations" swapped="no"/>
-          </object>
-        </child>
-      </object>
-    </child>
-    <child>
-      <object class="GtkBox">
-        <child>
-          <object class="GtkScrolledWindow">
-            <property name="hscrollbar-policy">never</property>
-            <child>
-              <object class="GtkViewport">
-                <child>
-                  <object class="GtkBox">
-                    <property name="margin-start">10</property>
-                    <property name="margin-end">10</property>
-                    <property name="margin-top">10</property>
-                    <property name="margin-bottom">10</property>
-                    <property name="orientation">vertical</property>
-                    <property name="spacing">6</property>
-                    <child>
-                      <object class="GtkFontButton" id="font">
-                        <property name="receives-default">1</property>
-                        <property name="font">Sans 12</property>
-                        <property name="level">family|style</property>
-                        <signal name="font-set" handler="font_features_font_changed" swapped="no"/>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkGrid">
-                        <property name="column-spacing">10</property>
-                        <property name="row-spacing">10</property>
-                        <child>
-                          <object class="GtkLabel">
-                            <property name="label">Size</property>
-                            <property name="xalign">0</property>
-                            <property name="valign">baseline</property>
-                            <layout>
-                              <property name="column">0</property>
-                              <property name="row">0</property>
-                            </layout>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkScale" id="size_scale">
-                            <property name="hexpand">1</property>
-                            <property name="width-request">100</property>
-                            <property name="valign">baseline</property>
-                            <property name="adjustment">size_adjustment</property>
-                            <layout>
-                              <property name="column">1</property>
-                              <property name="row">0</property>
-                            </layout>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkEntry" id="size_entry">
-                            <property name="width-chars">4</property>
-                            <property name="max-width-chars">4</property>
-                            <property name="hexpand">0</property>
-                            <property name="valign">baseline</property>
-                            <signal name="activate" handler="basic_entry_activated"
-                                    object="size_adjustment" swapped="false"/>
-                            <layout>
-                              <property name="column">2</property>
-                              <property name="row">0</property>
-                            </layout>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkLabel">
-                            <property name="label">Letterspacing</property>
-                            <property name="xalign">0</property>
-                            <property name="valign">baseline</property>
-                            <layout>
-                              <property name="column">0</property>
-                              <property name="row">1</property>
-                            </layout>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkScale">
-                            <property name="hexpand">1</property>
-                            <property name="width-request">100</property>
-                            <property name="valign">baseline</property>
-                            <property name="adjustment">letterspacing_adjustment</property>
-                            <layout>
-                              <property name="column">1</property>
-                              <property name="row">1</property>
-                            </layout>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkEntry" id="letterspacing_entry">
-                            <property name="width-chars">4</property>
-                            <property name="max-width-chars">4</property>
-                            <property name="hexpand">0</property>
-                            <property name="valign">baseline</property>
-                            <signal name="activate" handler="basic_entry_activated"
-                                    object="letterspacing_adjustment" swapped="false"/>
-                            <layout>
-                              <property name="column">2</property>
-                              <property name="row">1</property>
-                            </layout>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkLabel">
-                            <property name="label">Line Height</property>
-                            <property name="xalign">0</property>
-                            <property name="valign">baseline</property>
-                            <layout>
-                              <property name="column">0</property>
-                              <property name="row">2</property>
-                            </layout>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkScale">
-                            <property name="hexpand">1</property>
-                            <property name="width-request">100</property>
-                            <property name="valign">baseline</property>
-                            <property name="adjustment">line_height_adjustment</property>
-                            <layout>
-                              <property name="column">1</property>
-                              <property name="row">2</property>
-                            </layout>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkEntry" id="line_height_entry">
-                            <property name="width-chars">4</property>
-                            <property name="max-width-chars">4</property>
-                            <property name="hexpand">0</property>
-                            <property name="valign">baseline</property>
-                            <signal name="activate" handler="basic_entry_activated"
-                                    object="line_height_adjustment" swapped="false"/>
-                            <layout>
-                              <property name="column">2</property>
-                              <property name="row">2</property>
-                            </layout>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkLabel">
-                            <property name="label">Foreground</property>
-                            <property name="xalign">0</property>
-                            <property name="valign">baseline</property>
-                            <layout>
-                              <property name="column">0</property>
-                              <property name="row">3</property>
-                            </layout>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkColorButton" id="foreground">
-                            <property name="valign">baseline</property>
-                            <property name="rgba">black</property>
-                            <signal name="notify::rgba" handler="color_set_cb"/>
-                            <layout>
-                              <property name="column">1</property>
-                              <property name="row">3</property>
-                            </layout>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkLabel">
-                            <property name="label">Background</property>
-                            <property name="xalign">0</property>
-                            <property name="valign">baseline</property>
-                            <layout>
-                              <property name="column">0</property>
-                              <property name="row">4</property>
-                            </layout>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkColorButton" id="background">
-                            <property name="valign">baseline</property>
-                            <property name="rgba">white</property>
-                            <signal name="notify::rgba" handler="color_set_cb"/>
-                            <layout>
-                              <property name="column">1</property>
-                              <property name="row">4</property>
-                            </layout>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkButton">
-                            <property name="icon-name">object-flip-vertical-symbolic</property>
-                            <property name="halign">start</property>
-                            <property name="valign">center</property>
-                            <style>
-                              <class name="circular"/>
-                            </style>
-                            <signal name="clicked" handler="swap_colors"/>
-                            <layout>
-                              <property name="column">2</property>
-                              <property name="row">3</property>
-                              <property name="row-span">2</property>
-                            </layout>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkExpander">
-                        <child type="label">
-                          <object class="GtkLabel">
-                            <property name="xalign">0</property>
-                            <property name="label" translatable="yes">OpenType Features</property>
-                            <property name="margin-top">10</property>
-                            <property name="margin-bottom">10</property>
-                            <style>
-                              <class name="title-4"/>
-                            </style>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkBox" id="feature_list">
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="GtkComboBox" id="script_lang">
-                                <property name="tooltip-text" translatable="yes">Language System</property>
-                                <property name="margin-top">10</property>
-                                <signal name="changed" handler="font_features_script_changed" swapped="no"/>
-                                <child>
-                                  <object class="GtkCellRendererText"/>
-                                  <attributes>
-                                    <attribute name="text">0</attribute>
-                                  </attributes>
-                                </child>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkExpander">
-                        <child type="label">
-                          <object class="GtkLabel" id="variations_heading">
-                            <property name="label" translatable="yes">Variation Axes</property>
-                            <property name="xalign">0</property>
-                            <property name="margin-top">10</property>
-                            <property name="margin-bottom">10</property>
-                            <style>
-                              <class name="title-4"/>
-                            </style>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkGrid" id="variations_grid">
-                            <property name="column-spacing">10</property>
-                            <property name="row-spacing">10</property>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-                <style>
-                  <class name="view"/>
-                </style>
-              </object>
-            </child>
-          </object>
-        </child>
-        <child>
-          <object class="GtkBox">
-            <property name="orientation">vertical</property>
-            <property name="hexpand">1</property>
-            <property name="vexpand">1</property>
-            <property name="margin-start">20</property>
-            <property name="margin-end">20</property>
-            <property name="margin-top">20</property>
-            <property name="margin-bottom">20</property>
-            <property name="spacing">20</property>
-            <child>
-              <object class="GtkScrolledWindow" id="swin">
-                <property name="hscrollbar-policy">automatic</property>
-                <property name="vscrollbar-policy">automatic</property>
-                <property name="propagate-natural-height">1</property>
-                <property name="vexpand">1</property>
-                <style>
-                  <class name="font_features_background"/>
-                </style>
-                <child>
-                  <object class="GtkStack" id="stack">
-                    <child>
-                      <object class="GtkStackPage">
-                        <property name="name">label</property>
-                        <property name="child">
-                          <object class="GtkLabel" id="label">
-                            <property name="wrap">1</property>
-                            <property name="xalign">0</property>
-                            <property name="yalign">0</property>
-                            <property name="valign">start</property>
-                            <property name="selectable">1</property>
-                          </object>
-                        </property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkStackPage">
-                        <property name="name">entry</property>
-                        <property name="child">
-                          <object class="GtkTextView" id="entry">
-                            <property name="buffer">
-                              <object class="GtkTextBuffer">
-                                <property name="text">Grumpy wizards make toxic brew for the evil Queen and Jack. A quick movement of the enemy will jeopardize six gunboats. The job of waxing linoleum frequently peeves chintzy kids. My girl wove six dozen plaid jackets before she quit. Twelve ziggurats quickly jumped a finch box.
-
-    Разъяренный чтец эгоистично бьёт пятью жердями шустрого фехтовальщика. Наш банк вчера же выплатил Ф.Я. Эйхгольду комиссию за ценные вещи. Эх, чужак, общий съём цен шляп (юфть) – вдрызг! В чащах юга жил бы цитрус? Да, но фальшивый экземпляр!
-
-    Τάχιστη αλώπηξ βαφής ψημένη γη, δρασκελίζει υπέρ νωθρού κυνός</property>
-                              </object>
-                            </property>
-                            <property name="valign">fill</property>
-                          </object>
-                        </property>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-              </object>
-            </child>
-            <child>
-              <object class="GtkBox">
-                <property name="spacing">10</property>
-                <child>
-                  <object class="GtkLabel" id="settings">
-                    <property name="wrap">1</property>
-                    <property name="xalign">0</property>
-                    <property name="valign">end</property>
-                    <property name="width-chars">50</property>
-                    <property name="max-width-chars">50</property>
-                    <property name="hexpand">1</property>
-                    <style>
-                      <class name="monospace"/>
-                    </style>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkButton">
-                    <property name="label" translatable="yes">Alphabet</property>
-                    <signal name="clicked" handler="set_text_alphabet"/>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkButton">
-                    <property name="label" translatable="yes">Paragraph</property>
-                    <signal name="clicked" handler="set_text_paragraph"/>
-                  </object>
-                </child>
-              </object>
-            </child>
-            <child>
-              <object class="GtkBox">
-                <property name="spacing">10</property>
-                <child>
-                  <object class="GtkLabel" id="description">
-                    <property name="wrap">1</property>
-                    <property name="wrap-mode">char</property>
-                    <property name="xalign">0</property>
-                    <property name="valign">end</property>
-                    <property name="width-chars">50</property>
-                    <property name="max-width-chars">50</property>
-                    <property name="hexpand">1</property>
-                    <style>
-                      <class name="monospace"/>
-                    </style>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkBox">
-                    <style>
-                      <class name="linked"/>
-                    </style>
-                    <property name="valign">end</property>
-                    <child>
-                      <object class="GtkToggleButton" id="plain_toggle">
-                        <property name="label" translatable="yes">Plain</property>
-                        <property name="active">1</property>
-                        <property name="valign">baseline</property>
-                        <signal name="toggled" handler="font_features_toggle_plain"/>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkToggleButton" id="waterfall_toggle">
-                        <property name="label" translatable="yes">Waterfall</property>
-                        <property name="valign">baseline</property>
-                        <property name="group">plain_toggle</property>
-                        <signal name="toggled" handler="font_features_toggle_plain"/>
-                        <signal name="notify::active" handler="font_features_notify_waterfall"/>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkToggleButton" id="edit_toggle">
-                    <property name="group">waterfall_toggle</property>
-                    <property name="icon-name">document-edit-symbolic</property>
-                    <property name="halign">end</property>
-                    <property name="valign">end</property>
-                    <signal name="clicked" handler="font_features_toggle_edit"/>
-                  </object>
-                </child>
-              </object>
-            </child>
-          </object>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>
@@ -223,7 +223,6 @@ static void
 destroy_gear (struct gear *g)
 {
  g_free (g->strips);
-  g_free (g->vertices);
  g_free (g);
 }

@@ -23,7 +23,7 @@ do_headerbar (GtkWidget *do_widget)
    {
      window = gtk_window_new ();
      gtk_window_set_display (GTK_WINDOW (window),  gtk_widget_get_display (do_widget));
-      gtk_window_set_title (GTK_WINDOW (window), "Welcome to the Hotel California");
+      gtk_window_set_title (GTK_WINDOW (window), "Welcome to Facebook - Log in, sign up or learn more");
      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);

      gtk_window_set_default_size (GTK_WINDOW (window), 600, 400);
@@ -31,7 +31,6 @@ do_headerbar (GtkWidget *do_widget)
      header = gtk_header_bar_new ();

      button = gtk_button_new_from_icon_name ("mail-send-receive-symbolic");
-      gtk_widget_set_tooltip_text (button, "Check out");
      gtk_header_bar_pack_end (GTK_HEADER_BAR (header), button);

      box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
@@ -100,7 +100,7 @@ show_page (GtkTextView *text_view,

      theme = gtk_icon_theme_get_for_display (gtk_widget_get_display (GTK_WIDGET (text_view)));
      icon = gtk_icon_theme_lookup_icon (theme,
-                                         "view-conceal-symbolic",
+                                         "eye-not-looking-symbolic",
                                         NULL,
                                         16,
                                         1,
@@ -66,9 +66,11 @@ do_links (GtkWidget *do_widget)
                             "as hyperlinks, which can be clicked "
                             "or activated via <a href=\"keynav\">keynav</a> "
                             "and they work fine with other markup, like when "
-                             "linking to <a href=\"http://www.flathub.org/\"><b>"
-                             "<span letter_spacing=\"1024\" underline=\"none\" color=\"pink\" background=\"darkslategray\">Flathub</span>"
-                             "</b></a>.");
+                             "searching on <a href=\"http://www.google.com/\">"
+                             "<span color=\"#0266C8\">G</span><span color=\"#F90101\">o</span>"
+                             "<span color=\"#F2B50F\">o</span><span color=\"#0266C8\">g</span>"
+                             "<span color=\"#00933B\">l</span><span color=\"#F90101\">e</span>"
+                             "</a>.");
      gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
      gtk_label_set_max_width_chars (GTK_LABEL (label), 40);
      gtk_label_set_wrap (GTK_LABEL (label), TRUE);
@@ -260,19 +260,12 @@ gtk_message_row_state_flags_changed (GtkWidget    *widget,
  GTK_WIDGET_CLASS (gtk_message_row_parent_class)->state_flags_changed (widget, previous_state_flags);
 }

-static void
-gtk_message_row_dispose (GObject *obj)
-{
-  gtk_widget_dispose_template (GTK_WIDGET (obj), GTK_TYPE_MESSAGE_ROW);
-  G_OBJECT_CLASS (gtk_message_row_parent_class)->dispose (obj);
-}
-
 static void
 gtk_message_row_finalize (GObject *obj)
 {
  GtkMessageRowPrivate *priv = GTK_MESSAGE_ROW (obj)->priv;
  g_object_unref (priv->message);
-  G_OBJECT_CLASS (gtk_message_row_parent_class)->finalize (obj);
+  G_OBJECT_CLASS (gtk_message_row_parent_class)->finalize(obj);
 }

 static void
@@ -281,7 +274,6 @@ gtk_message_row_class_init (GtkMessageRowClass *klass)
  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
  GObjectClass *object_class = G_OBJECT_CLASS (klass);

-  object_class->dispose = gtk_message_row_dispose;
  object_class->finalize = gtk_message_row_finalize;

  gtk_widget_class_set_template_from_resource (widget_class, "/listbox/listbox.ui");
@@ -42,7 +42,8 @@ do_listbox_controls (GtkWidget *do_widget)
      GtkBuilder *builder;

      scope = gtk_builder_cscope_new ();
-      gtk_builder_cscope_add_callback (scope, row_activated);
+      gtk_builder_cscope_add_callback_symbol (GTK_BUILDER_CSCOPE (scope),
+                                              "row_activated", G_CALLBACK (row_activated));
      builder = gtk_builder_new ();
      gtk_builder_set_scope (builder, scope);

@@ -356,10 +356,10 @@ do_listview_settings (GtkWidget *do_widget)
      g_type_ensure (SETTINGS_TYPE_KEY);

      scope = gtk_builder_cscope_new ();
-      gtk_builder_cscope_add_callback (scope, search_enabled);
-      gtk_builder_cscope_add_callback (scope, search_changed);
-      gtk_builder_cscope_add_callback (scope, stop_search);
-      gtk_builder_cscope_add_callback (scope, item_value_changed);
+      gtk_builder_cscope_add_callback_symbol (GTK_BUILDER_CSCOPE (scope), "search_enabled", (GCallback)search_enabled);
+      gtk_builder_cscope_add_callback_symbol (GTK_BUILDER_CSCOPE (scope), "search_changed", (GCallback)search_changed);
+      gtk_builder_cscope_add_callback_symbol (GTK_BUILDER_CSCOPE (scope), "stop_search", (GCallback)stop_search);
+      gtk_builder_cscope_add_callback_symbol (GTK_BUILDER_CSCOPE (scope), "item_value_changed", (GCallback)item_value_changed);

      builder = gtk_builder_new ();
      gtk_builder_set_scope (builder, scope);
@@ -1,5 +1,5 @@
 /* Lists/Words
- * #Keywords: GtkListView, GtkFilterListModel, GtkInscription
+ * #Keywords: GtkListView, GtkFilterListModel
 *
 * This demo shows filtering a long list - of words.
 *
@@ -17,9 +17,10 @@ const char *factory_text =
 "<interface>\n"
 "  <template class='GtkListItem'>\n"
 "    <property name='child'>\n"
-"      <object class='GtkInscription'>\n"
+"      <object class='GtkLabel'>\n"
+"        <property name='ellipsize'>end</property>\n"
 "        <property name='xalign'>0</property>\n"
-"        <binding name='text'>\n"
+"        <binding name='label'>\n"
 "          <lookup name='string' type='GtkStringObject'>\n"
 "            <lookup name='item'>GtkListItem</lookup>\n"
 "          </lookup>\n"
@@ -7,9 +7,9 @@
          <lookup name="item">GtkListItem</lookup>
        </binding>
        <property name="child">
-          <object class="GtkInscription">
-            <property name="hexpand">1</property>
-            <binding name="text">
+          <object class="GtkLabel">
+            <property name="halign">start</property>
+            <binding name="label">
              <lookup name="title" type="GtkDemo">
                <lookup name="item">expander</lookup>
              </lookup>
@@ -73,7 +73,6 @@ demos = files([
  'peg_solitaire.c',
  'pickers.c',
  'printing.c',
-  'read_more.c',
  'revealer.c',
  'rotated_text.c',
  'scale.c',
@@ -2,7 +2,7 @@
 * #Keywords: GtkColorChooser, GtkFontChooser, GtkApplicationChooser
 *
 * These widgets are mainly intended for use in preference dialogs.
- * They allow to select colors, fonts and applications.
+ * They allow to select colors, fonts, directories and applications.
 *
 * This demo shows both the default appearance for these dialogs,
 * as well as some of the customizations that are possible.
@@ -1,239 +0,0 @@
-/* Read More
- * #Keywords: GtkInscription
- *
- * A simple implementation of a widget that can either
- * display a lot of text or just the first few lines with a
- * "Read More" button.
- */
-
-#include <gtk/gtk.h>
-
-#define READ_TYPE_MORE (read_more_get_type ())
-G_DECLARE_FINAL_TYPE(ReadMore, read_more, READ, MORE, GtkWidget)
-
-struct _ReadMore {
-  GtkWidget parent_instance;
- 
-  GtkWidget *label;
-  GtkWidget *inscription;
-  GtkWidget *box;
-  gboolean show_more;
-};
-
-G_DEFINE_TYPE (ReadMore, read_more, GTK_TYPE_WIDGET)
-
-static GtkSizeRequestMode
-read_more_get_request_mode (GtkWidget *widget)
-{
-  return GTK_SIZE_REQUEST_HEIGHT_FOR_WIDTH;
-}
-
-static void
-read_more_measure (GtkWidget      *widget,
-                   GtkOrientation  orientation,
-                   int             for_size,
-                   int            *minimum,
-                   int            *natural,
-                   int            *minimum_baseline,
-                   int            *natural_baseline)
-{
-  ReadMore *self = READ_MORE (widget);
-  int label_min, label_nat, label_min_baseline, label_nat_baseline;
-  int box_min, box_nat, box_min_baseline, box_nat_baseline;
-  int min_check;
-
-  if (self->show_more)
-    min_check = G_MAXINT;
-  else if (for_size >= 0)
-    gtk_widget_measure (self->box, 1 - orientation, -1, &min_check, NULL, NULL, NULL);
-  else
-    min_check = -1;
-
-  if (min_check > for_size)
-    {
-      gtk_widget_measure (self->label,
-                          orientation,
-                          for_size,
-                          minimum, natural,
-                          minimum_baseline, natural_baseline);
-      return;
-    }
-
-  else if (for_size >= 0)
-    gtk_widget_measure (self->label, 1 - orientation, -1, &min_check, NULL, NULL, NULL);
-  else
-    min_check = -1;
-
-  if (min_check > for_size)
-    {
-      gtk_widget_measure (self->box,
-                          orientation,
-                          for_size,
-                          minimum, natural,
-                          minimum_baseline, natural_baseline);
-      return;
-    }
-
-  gtk_widget_measure (self->label,
-                      orientation,
-                      for_size,
-                      &label_min, &label_nat,
-                      &label_min_baseline, &label_nat_baseline);
-  gtk_widget_measure (self->box,
-                      orientation,
-                      for_size,
-                      &box_min, &box_nat,
-                      &box_min_baseline, &box_nat_baseline);
-
-  *minimum = MIN (label_min, box_min);
-  *natural = MIN (label_nat, box_nat);
-
-  /* FIXME: Figure out baselines! */
-}
-
-static void
-read_more_allocate (GtkWidget *widget,
-                    int        width,
-                    int        height,
-                    int        baseline)
-{
-  ReadMore *self = READ_MORE (widget);
-  gboolean show_more;
-
-  if (self->show_more)
-    {
-      show_more = TRUE;
-    }
-  else
-    {
-      int needed;
-
-      /* check to see if we have enough space to show all text */
-      gtk_widget_measure (self->label,
-                          GTK_ORIENTATION_VERTICAL,
-                          width,
-                          &needed, NULL, NULL, NULL);
-
-      show_more = needed <= height;
-    }
-
-  gtk_widget_set_child_visible (self->label, show_more);
-  gtk_widget_set_child_visible (self->box, !show_more);
-
-  if (show_more)
-    gtk_widget_size_allocate (self->label, &(GtkAllocation) { 0, 0, width, height }, baseline);
-  else
-    gtk_widget_size_allocate (self->box, &(GtkAllocation) { 0, 0, width, height }, baseline);
-}
-
-static void
-read_more_dispose (GObject *object)
-{
-  ReadMore *self = READ_MORE (object);
-
-  g_clear_pointer (&self->label, gtk_widget_unparent);
-  g_clear_pointer (&self->box, gtk_widget_unparent);
-
-  G_OBJECT_CLASS (read_more_parent_class)->dispose (object);
-}
-
-static void
-read_more_class_init (ReadMoreClass *klass)
-{
-  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-  widget_class->get_request_mode = read_more_get_request_mode;
-  widget_class->measure = read_more_measure;
-  widget_class->size_allocate = read_more_allocate;
-
-  object_class->dispose = read_more_dispose;
-}
-
-static void
-read_more_clicked (GtkButton *button,
-                   ReadMore  *self)
-{
-  self->show_more = TRUE;
-  gtk_widget_queue_resize (GTK_WIDGET (self));
-}
-
-static void
-read_more_init (ReadMore *self)
-{
-  GtkWidget *button;
-
-  self->label = gtk_label_new (NULL);
-  gtk_label_set_xalign (GTK_LABEL (self->label), 0.0);
-  gtk_label_set_yalign (GTK_LABEL (self->label), 0.0);
-  gtk_label_set_wrap (GTK_LABEL (self->label), TRUE);
-  gtk_label_set_width_chars (GTK_LABEL (self->label), 3);
-  gtk_label_set_max_width_chars (GTK_LABEL (self->label), 30);
-  gtk_widget_set_parent (self->label, GTK_WIDGET (self));
-
-  self->box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-  gtk_widget_set_vexpand (self->box, FALSE);
-  gtk_widget_set_parent (self->box, GTK_WIDGET (self));
-
-  self->inscription = gtk_inscription_new (NULL);
-  gtk_inscription_set_xalign (GTK_INSCRIPTION (self->inscription), 0.0);
-  gtk_inscription_set_yalign (GTK_INSCRIPTION (self->inscription), 0.0);
-  gtk_inscription_set_min_lines (GTK_INSCRIPTION (self->inscription), 3);
-  gtk_inscription_set_nat_chars (GTK_INSCRIPTION (self->inscription), 30);
-  gtk_widget_set_vexpand (self->inscription, TRUE);
-  gtk_box_append (GTK_BOX (self->box), self->inscription);
-  
-  button = gtk_button_new_with_label ("Read More");
-  g_signal_connect (button, "clicked", G_CALLBACK (read_more_clicked), self);
-  gtk_box_append (GTK_BOX (self->box), button);
-}
-
-static void
-read_more_set_text (ReadMore   *self,
-                    const char *text)
-{
-  gtk_label_set_label (GTK_LABEL (self->label), text);
-  gtk_inscription_set_text (GTK_INSCRIPTION (self->inscription), text);
-}
-
-static GtkWidget *
-read_more_new (const char *text)
-{
-  ReadMore *self = g_object_new (READ_TYPE_MORE, NULL);
-
-  read_more_set_text (self, text);
-
-  return GTK_WIDGET (self);
-}
-
-GtkWidget *
-do_read_more (GtkWidget *do_widget)
-{
-  static GtkWidget *window = NULL;
-
-  if (!window)
-    {
-      GtkWidget *readmore;
-
-      window = gtk_window_new ();
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
-      gtk_window_set_title (GTK_WINDOW (window), "Read More");
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
-
-      readmore = read_more_new (
-"I'd just like to interject for a moment. What you're referring to as Linux, is in fact, GNU/Linux, or as I've recently taken to calling it, GNU plus Linux. Linux is not an operating system unto itself, but rather another free component of a fully functioning GNU system made useful by the GNU corelibs, shell utilities and vital system components comprising a full OS as defined by POSIX.\n"
-"\n"
-"Many computer users run a modified version of the GNU system every day, without realizing it. Through a peculiar turn of events, the version of GNU which is widely used today is often called \"Linux\", and many of its users are not aware that it is basically the GNU system, developed by the GNU Project.\n"
-"\n"
-"There really is a Linux, and these people are using it, but it is just a part of the system they use. Linux is the kernel: the program in the system that allocates the machine's resources to the other programs that you run. The kernel is an essential part of an operating system, but useless by itself; it can only function in the context of a complete operating system. Linux is normally used in combination with the GNU operating system: the whole system is basically GNU with Linux added, or GNU/Linux. All the so-called \"Linux\" distributions are really distributions of GNU/Linux.");
-      gtk_window_set_child (GTK_WINDOW (window), readmore);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
-  else
-    gtk_window_destroy (GTK_WINDOW (window));
-
-  return window;
-}
@@ -5,7 +5,6 @@
 * small sliding puzzle game.
 */

-#include "config.h"
 #include <gtk/gtk.h>

 /* Include the header for the puzzle piece */
@@ -25,30 +24,6 @@ static guint height = 3;
 static guint pos_x;
 static guint pos_y;

-static void
-ended (GObject *object)
-{
-  g_object_unref (object);
-}
-
-static void
-celebrate (gboolean win)
-{
-  char *path;
-  GtkMediaStream *stream;
-
-  if (win)
-    path = g_build_filename (GTK_DATADIR, "sounds", "freedesktop", "stereo", "complete.oga", NULL);
-  else
-    path = g_build_filename (GTK_DATADIR, "sounds", "freedesktop", "stereo", "dialog-error.oga", NULL);
-  stream = gtk_media_file_new_for_filename (path);
-  gtk_media_stream_set_volume (stream, 1.0);
-  gtk_media_stream_play (stream);
-
-  g_signal_connect (stream, "notify::ended", G_CALLBACK (ended), NULL);
-  g_free (path);
-}
-
 static gboolean
 move_puzzle (GtkWidget *grid,
             int        dx,
@@ -182,8 +157,6 @@ check_solved (GtkWidget *grid)
  picture = gtk_grid_get_child_at (GTK_GRID (grid), pos_x, pos_y);
  gtk_picture_set_paintable (GTK_PICTURE (picture), piece);

-  celebrate (TRUE);
-
  return TRUE;
 }

@@ -357,7 +330,7 @@ start_puzzle (GdkPaintable *paintable)
                                          x, y,
                                          width, height);
          picture = gtk_picture_new_for_paintable (piece);
-          gtk_picture_set_content_fit (GTK_PICTURE (picture), GTK_CONTENT_FIT_FILL);
+          gtk_picture_set_keep_aspect_ratio (GTK_PICTURE (picture), FALSE);
          gtk_grid_attach (GTK_GRID (grid),
                           picture,
                           x, y,
@@ -137,7 +137,7 @@ insert_text (GtkTextView *view)

  icon_theme = gtk_icon_theme_get_for_display (gtk_widget_get_display (widget));
  icon = gtk_icon_theme_lookup_icon (icon_theme,
-                                     "drive-harddisk",
+                                     "face-cool",
                                     NULL,
                                     32, 1,
                                     gtk_widget_get_direction (widget),
@@ -239,6 +239,8 @@ insert_text (GtkTextView *view)

  gtk_text_buffer_insert (buffer, &iter, "The buffer can have images in it: ", -1);
  gtk_text_buffer_insert_paintable (buffer, &iter, GDK_PAINTABLE (icon));
+  gtk_text_buffer_insert_paintable (buffer, &iter, GDK_PAINTABLE (icon));
+
  gtk_text_buffer_insert_paintable (buffer, &iter, nuclear);

  gtk_text_buffer_insert (buffer, &iter, " for example.\n\n", -1);
@@ -439,12 +441,11 @@ attach_widgets (GtkTextView *text_view)
        {
          widget = gtk_scale_new (GTK_ORIENTATION_HORIZONTAL, NULL);
          gtk_range_set_range (GTK_RANGE (widget), 0, 100);
-          gtk_widget_set_size_request (widget, 100, -1);
+          gtk_widget_set_size_request (widget, 70, -1);
        }
      else if (i == 3)
        {
          widget = gtk_entry_new ();
-          gtk_editable_set_width_chars (GTK_EDITABLE (widget), 10);
        }
      else
        {
@@ -409,14 +409,6 @@ icon_browser_window_init (IconBrowserWindow *win)
  g_signal_connect (win->context_model, "notify::selected",  G_CALLBACK (selected_name_changed), win);
 }

-static void
-icon_browser_window_dispose (GObject *object)
-{
-  gtk_widget_dispose_template (GTK_WIDGET (object), ICON_BROWSER_WINDOW_TYPE);
-
-  G_OBJECT_CLASS (icon_browser_window_parent_class)->dispose (object);
-}
-
 static void
 icon_browser_window_finalize (GObject *object)
 {
@@ -432,7 +424,6 @@ icon_browser_window_class_init (IconBrowserWindowClass *class)
 {
  GObjectClass *object_class = G_OBJECT_CLASS (class);

-  object_class->dispose = icon_browser_window_dispose;
  object_class->finalize = icon_browser_window_finalize;

  g_type_ensure (IB_TYPE_ICON);
@@ -19,24 +19,12 @@ executable('gtk4-node-editor',
  ] + common_cflags,
  win_subsystem: 'windows',
  link_args: extra_demo_ldflags,
-  install: true,
+  install: false,
 )

-# icons
-icontheme_dir = join_paths(gtk_datadir, 'icons/hicolor')
-
-foreach size: ['scalable', 'symbolic']
-  install_subdir('data/' + size, install_dir: icontheme_dir)
-endforeach
-
-# desktop file
-install_data('org.gtk.gtk4.NodeEditor.desktop', install_dir: gtk_applicationsdir)
-
-# appdata
-configure_file(
-  input: 'org.gtk.gtk4.NodeEditor.appdata.xml.in',
-  output: 'org.gtk.gtk4.NodeEditor.appdata.xml',
-  configuration: appdata_config,
-  install_dir: gtk_appdatadir
-)
+# icons, don't install them until we decide to install gtk4-node-editor
+#icontheme_dir = join_paths(gtk_datadir, 'icons/hicolor')

+#foreach size: ['scalable', 'symbolic']
+#  install_subdir('data/' + size, install_dir: icontheme_dir)
+#endforeach
@@ -57,7 +57,6 @@ struct _NodeEditorWindow
  GtkWidget *testcase_cairo_checkbutton;
  GtkWidget *testcase_name_entry;
  GtkWidget *testcase_save_button;
-  GtkWidget *scale_scale;

  GtkWidget *renderer_listbox;
  GListStore *renderers;
@@ -172,7 +171,6 @@ text_changed (GtkTextBuffer    *buffer,
  GBytes *bytes;
  GtkTextIter iter;
  GtkTextIter start, end;
-  float scale;

  g_array_remove_range (self->errors, 0, self->errors->len);
  text = get_current_text (self->text_buffer);
@@ -183,17 +181,6 @@ text_changed (GtkTextBuffer    *buffer,

  /* If this is too slow, go fix the parser performance */
  self->node = gsk_render_node_deserialize (bytes, deserialize_error_func, self);
-
-  scale = gtk_scale_button_get_value (GTK_SCALE_BUTTON (self->scale_scale));
-  if (self->node && scale != 1.0)
-    {
-      GskRenderNode *node;
-
-      node = gsk_transform_node_new (self->node, gsk_transform_scale (NULL, scale, scale));
-      gsk_render_node_unref (self->node);
-      self->node = node;
-    }
-
  g_bytes_unref (bytes);
  if (self->node)
    {
@@ -290,14 +277,6 @@ text_changed (GtkTextBuffer    *buffer,
                                     &start, &end);
 }

-static void
-scale_changed (GObject          *object,
-               GParamSpec       *pspec,
-               NodeEditorWindow *self)
-{
-  text_changed (self->text_buffer, self);
-}
-
 static gboolean
 text_view_query_tooltip_cb (GtkWidget        *widget,
                            int               x,
@@ -873,14 +852,6 @@ dark_mode_cb (GtkToggleButton *button,
                NULL);
 }

-static void
-node_editor_window_dispose (GObject *object)
-{
-  gtk_widget_dispose_template (GTK_WIDGET (object), NODE_EDITOR_WINDOW_TYPE);
-
-  G_OBJECT_CLASS (node_editor_window_parent_class)->dispose (object);
-}
-
 static void
 node_editor_window_finalize (GObject *object)
 {
@@ -975,7 +946,6 @@ node_editor_window_class_init (NodeEditorWindowClass *class)
  GObjectClass *object_class = G_OBJECT_CLASS (class);
  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);

-  object_class->dispose = node_editor_window_dispose;
  object_class->finalize = node_editor_window_finalize;

  gtk_widget_class_set_template_from_resource (widget_class,
@@ -992,7 +962,6 @@ node_editor_window_class_init (NodeEditorWindowClass *class)
  gtk_widget_class_bind_template_child (widget_class, NodeEditorWindow, testcase_cairo_checkbutton);
  gtk_widget_class_bind_template_child (widget_class, NodeEditorWindow, testcase_name_entry);
  gtk_widget_class_bind_template_child (widget_class, NodeEditorWindow, testcase_save_button);
-  gtk_widget_class_bind_template_child (widget_class, NodeEditorWindow, scale_scale);

  gtk_widget_class_bind_template_callback (widget_class, text_view_query_tooltip_cb);
  gtk_widget_class_bind_template_callback (widget_class, open_cb);
@@ -1099,7 +1068,6 @@ node_editor_window_init (NodeEditorWindow *self)

  self->text_buffer = gtk_text_buffer_new (self->tag_table);
  g_signal_connect (self->text_buffer, "changed", G_CALLBACK (text_changed), self);
-  g_signal_connect (self->scale_scale, "notify::value", G_CALLBACK (scale_changed), self);
  gtk_text_view_set_buffer (GTK_TEXT_VIEW (self->text_view), self->text_buffer);

  /* Default */
@@ -157,23 +157,6 @@
            <signal name="notify::active" handler="dark_mode_cb" swapped="0"/>
          </object>
        </child>
-        <child type="end">
-          <object class="GtkScaleButton" id="scale_scale">
-            <property name="focus-on-click">0</property>
-            <property name="valign">center</property>
-            <property name="adjustment">
-              <object class="GtkAdjustment">
-                <property name="lower">1</property>
-                <property name="value">1</property>
-                <property name="upper">10</property>
-                <property name="step-increment">0.1</property>
-                <property name="page-increment">0.5</property>
-              </object>
-            </property>
-            <property name="icons">zoom-in-symbolic</property>
-            <property name="tooltip-text" translatable="yes">Scale the image</property>
-          </object>
-        </child>
      </object>
    </child>
    <child>
@@ -216,6 +199,7 @@
                    <child>
                      <object class="GtkPicture" id="picture">
                        <property name="can-shrink">0</property>
+                        <property name="keep-aspect-ratio">1</property>
                        <property name="halign">center</property>
                        <property name="valign">center</property>
                        <child>
@@ -13,8 +13,6 @@ Each node has its own `<node-name>` and supports a custom set of properties, eac

 When serializing and the value of a property equals the default value, this value will not be serialized. Serialization aims to produce an output as small as possible.

-To embed newlines in strings, use \A. To break a long string into multiple lines, escape the newline with a \.
-
 # Nodes

 ### container
@@ -137,23 +135,6 @@ Creates a node like `gsk_cross_fade_node_new()` with the given properties.

 Creates a node like `gsk_debug_node_new()` with the given properties.

-### glshader
-
-| property   | syntax             | default                | printed     |
-| ---------- | ------------------ | ---------------------- | ----------- |
-| bounds     | `<rect>`           | 50                     | always      |
-| sourcecode | `<string>`         | ""                     | always      |
-| args       | `<uniform values>` | none                   | non-default |
-| child1     | `<node>`           | none                   | non-default |
-| child2     | `<node>`           | none                   | non-default |
-| child3     | `<node>`           | none                   | non-default |
-| child4     | `<node>`           | none                   | non-default |
-
-Creates a GLShader node. The `sourcecode` must be a GLSL fragment shader.
-The `args` must match the uniforms of simple types declared in that shader,
-in order and comma-separated. The `child` properties must match the sampler
-uniforms in the shader.
-
 ### inset-shadow

 | property | syntax           | default                | printed     |
@@ -305,3 +286,20 @@ representation for this texture is `url("data:image/png;base64,iVBORw0KGgoAAAANS
 | transform| `<transform>`    | none                   | non-default |

 Creates a node like `gsk_transform_node_new()` with the given properties.
+
+### glshader
+
+| property   | syntax             | default                | printed     |
+| ---------- | ------------------ | ---------------------- | ----------- |
+| bounds     | `<rect>`           | 50                     | always      |
+| sourcecode | `<string>`         | ""                     | always      |
+| args       | `<uniform values>` | none                   | non-default |
+| child1     | `<node>`           | none                   | non-default |
+| child2     | `<node>`           | none                   | non-default |
+| child3     | `<node>`           | none                   | non-default |
+| child4     | `<node>`           | none                   | non-default |
+
+Creates a GLShader node. The `sourcecode` must be a GLSL fragment shader.
+The `args` must match the uniforms of simple types declared in that shader,
+in order and comma-separated. The `child` properties must match the sampler
+uniforms in the shader.
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component type="desktop">
-  <id>org.gtk.gtk4.NodeEditor</id>
-  <launchable type="desktop-id">org.gtk.gtk4.NodeEditor.desktop</launchable>
-  <metadata_license>CC0-1.0</metadata_license>
-  <project_license>LGPL-2.1-or-later</project_license>
-  <name>GTK Node Editor</name>
-  <summary>Program to edit render node files</summary>
-  <description>
-    <p>
-      GTK Node Editor is a simple application to show and edit
-      render node files.
-    </p>
-    <p>
-      Render node files can e.g. be created by the GTK inspector.
-    </p>
-  </description>
-  <screenshots>
-    <screenshot>
-      <image>https://static.gnome.org/appdata/gtk4-node-editor/gtk4-node-editor.png</image>
-      <caption>Node Editor</caption>
-    </screenshot>
-  </screenshots>
-  <kudos>
-    <kudo>HiDpiIcon</kudo>
-    <kudo>ModernToolkit</kudo>
-  </kudos>
-  <url type="homepage">https://www.gtk.org</url>
-  <translation type="gettext">gtk-4.0</translation>
-  <update_contact>matthias.clasen_at_gmail.com</update_contact>
-  <developer_name>Matthias Clasen and others</developer_name>
-  <content_rating type="oars-1.1"/>
-  <releases>
-    <release version="@BUILD_VERSION@">
-      <description>
-        <p>A new build of GTK.</p>
-      </description>
-    </release>
-  </releases>
-</component>
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Node Editor
-Comment=An application that edits render nodes
-Exec=gtk4-node-editor
-Icon=org.gtk.gtk4.NodeEditor
-Terminal=false
-Type=Application
-StartupNotify=true
-Categories=Development;GTK;
@@ -2081,24 +2081,26 @@ activate (GApplication *app)

  builder = gtk_builder_new ();
  scope = gtk_builder_cscope_new ();
-  gtk_builder_cscope_add_callback (scope, on_entry_icon_release);
-  gtk_builder_cscope_add_callback (scope, on_scale_button_value_changed);
-  gtk_builder_cscope_add_callback (scope, on_record_button_toggled);
-  gtk_builder_cscope_add_callback (scope, on_page_combo_changed);
-  gtk_builder_cscope_add_callback (scope, on_range_from_changed);
-  gtk_builder_cscope_add_callback (scope, on_range_to_changed);
-  gtk_builder_cscope_add_callback (scope, on_picture_drag_prepare);
-  gtk_builder_cscope_add_callback (scope, on_picture_drop);
-  gtk_builder_cscope_add_callback (scope, tab_close_cb);
-  gtk_builder_cscope_add_callback (scope, increase_icon_size);
-  gtk_builder_cscope_add_callback (scope, decrease_icon_size);
-  gtk_builder_cscope_add_callback (scope, osd_frame_pressed);
-  gtk_builder_cscope_add_callback (scope, age_entry_changed);
-  gtk_builder_cscope_add_callback (scope, validate_more_details);
-  gtk_builder_cscope_add_callback (scope, mode_switch_state_set);
-  gtk_builder_cscope_add_callback (scope, level_scale_value_changed);
-  gtk_builder_cscope_add_callback (scope, transition_speed_changed);
-  gtk_builder_cscope_add_callback (scope, reset_icon_size);
+  gtk_builder_cscope_add_callback_symbols (GTK_BUILDER_CSCOPE (scope),
+          "on_entry_icon_release", (GCallback)on_entry_icon_release,
+          "on_scale_button_value_changed", (GCallback)on_scale_button_value_changed,
+          "on_record_button_toggled", (GCallback)on_record_button_toggled,
+          "on_page_combo_changed", (GCallback)on_page_combo_changed,
+          "on_range_from_changed", (GCallback)on_range_from_changed,
+          "on_range_to_changed", (GCallback)on_range_to_changed,
+          "on_picture_drag_prepare", (GCallback)on_picture_drag_prepare,
+          "on_picture_drop", (GCallback)on_picture_drop,
+          "tab_close_cb", (GCallback)tab_close_cb,
+          "increase_icon_size", (GCallback)increase_icon_size,
+          "decrease_icon_size", (GCallback)decrease_icon_size,
+          "reset_icon_size", (GCallback)reset_icon_size,
+          "osd_frame_pressed", (GCallback)osd_frame_pressed,
+          "age_entry_changed", (GCallback)age_entry_changed,
+          "validate_more_details", (GCallback)validate_more_details,
+          "mode_switch_state_set", (GCallback)mode_switch_state_set,
+          "level_scale_value_changed", (GCallback)level_scale_value_changed,
+          "transition_speed_changed", (GCallback)transition_speed_changed,
+          NULL);
  gtk_builder_set_scope (builder, scope);
  g_object_unref (scope);
  if (!gtk_builder_add_from_resource (builder, "/org/gtk/WidgetFactory4/widget-factory.ui", &error))
@@ -111,8 +111,6 @@
    <file>icons/scalable/status/weather-showers-symbolic.svg</file>
    <file>icons/scalable/status/weather-snow-symbolic.svg</file>

-    <file alias='icons/scalable/apps/org.gtk.WidgetFactory4.svg'>data/scalable/apps/org.gtk.WidgetFactory4.svg</file>
-
  </gresource>
  <gresource prefix="/org/gtk/WidgetFactory4">
    <file>gtk-logo.webm</file>
@@ -1265,7 +1265,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                <property name="child">
                                  <object class="GtkPicture">
                                    <property name="file">resource:///org/gtk/WidgetFactory4/sunset.jpg</property>
-                                    <property name="content-fit">cover</property>
                                    <child>
                                      <object class="GtkDragSource">
                                        <signal name="prepare" handler="on_picture_drag_prepare" swapped="no"/>
@@ -5,7 +5,7 @@ repository_url = "https://gitlab.gnome.org/GNOME/gtk.git"
 website_url = "https://www.gtk.org"
 authors = "GTK Development Team"
 logo_url = "gtk-logo.svg"
-license = "LGPL-2.1-or-later"
+license = "GPL-2.1-or-later"
 description = "The GTK toolkit"
 devhelp = true

@@ -5,7 +5,7 @@ repository_url = "https://gitlab.gnome.org/GNOME/gtk.git"
 website_url = "https://www.gtk.org"
 authors = "GTK Development Team"
 logo_url = "gtk-logo.svg"
-license = "LGPL-2.1-or-later"
+license = "GPL-2.1-or-later"
 description = "The GTK toolkit"
 dependencies = ["Gdk-4.0"]
 devhelp = true
@@ -1,27 +0,0 @@
-.. _gtk4-node-editor(1):
-
-=================
-gtk4-node-editor
-=================
-
-----------------
-Editor render nodes
-----------------
-
-SYNOPSIS
--------
-
-|   **gtk4-node-editor** [OPTIONS...]
-
-DESCRIPTION
-----------
-
-``gtk4-node-editor`` is a utility to show and edit render node files.
-Such render node files can be obtained e.g. from the GTK inspector.
-
-OPTIONS
-------
-
-``-h, --help``
-
-  Show the application help.
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <object class="GtkAboutDialog">
-    <property name="program-name">GTK Code Demos</property>
-    <property name="version">4.8.0</property>
-    <property name="copyright">© 1997-2022 The GTK Team</property>
-    <property name="comments">Program to demonstrate GTK functions</property>
-    <property name="logo">gtk-logo.png</property>
-    <property name="title">About GTK Code Demos</property>
-    <property name="authors">Peter Mattis
-Spencer Kimball
-Josh MacDonald
-and many more…
-</property>
-  </object>
-</interface>
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <object class="GtkWindow">
-    <property name="decorated">0</property>
-    <property name="resizable">0</property>
-    <property name="default-width">280</property>
-    <property name="default-height">120</property>
-    <style>
-       <class name="nobackground"/>
-    </style>
-    <child>
-      <object class="GtkBox">
-        <style>
-          <class name="shadow"/>
-          <class name="background"/>
-          <class name="frame"/>
-        </style>
-        <child>
-          <object class="GtkBox">
-            <property name="orientation">vertical</property>
-            <property name="hexpand">1</property>
-            <property name="vexpand">1</property>
-            <child>
-              <object class="GtkTextView">
-                <property name="vexpand">1</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkActionBar">
-                <child>
-                  <object class="GtkButton">
-                    <property name="icon-name">object-select-symbolic</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkButton">
-                    <property name="icon-name">call-start-symbolic</property>
-                  </object>
-                </child>
-              </object>
-            </child>
-          </object>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <object class="GtkWindow">
-    <property name="decorated">0</property>
-    <property name="resizable">0</property>
-    <property name="default-width">280</property>
-    <property name="default-height">120</property>
-    <style>
-       <class name="nobackground"/>
-    </style>
-    <child>
-      <object class="GtkBox">
-        <style>
-          <class name="shadow"/>
-          <class name="background"/>
-          <class name="frame"/>
-        </style>
-        <child>
-          <object class="GtkBox">
-            <property name="orientation">vertical</property>
-            <property name="spacing">3</property>
-            <property name="hexpand">1</property>
-            <property name="vexpand">1</property>
-            <property name="halign">center</property>
-            <property name="valign">center</property>
-            <child>
-              <object class="GtkAppChooserButton">
-                <property name="content-type">text/plain</property>
-                <property name="halign">center</property>
-                <property name="valign">center</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkLabel">
-                <property name="label">Application Button</property>
-              </object>
-            </child>
-          </object>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <object class="GtkAppChooserDialog">
-    <property name="content-type">image/png</property>
-    <property name="default-width">200</property>
-    <property name="default-height">300</property>
-  </object>
-</interface>
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <object class="GtkAssistant">
-    <property name="resizable">0</property>
-    <property name="default-width">300</property>
-    <property name="default-height">140</property>
-    <property name="title">Assistant</property>
-    <child>
-      <object class="GtkAssistantPage">
-        <property name="title">Assistant page</property>
-        <property name="complete">1</property>
-        <property name="child">
-          <object class="GtkLabel">
-            <property name="label">Assistant</property>
-          </object>
-        </property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkAssistantPage">
-        <property name="page-type">confirm</property>
-        <property name="child">
-          <object class="GtkLabel">
-            <property name="label">You sure?</property>
-          </object>
-        </property>
-      </object>
-    </child>
-  </object>
-</interface>
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <object class="GtkWindow">
-    <property name="decorated">0</property>
-    <property name="resizable">0</property>
-    <property name="default-width">280</property>
-    <property name="default-height">120</property>
-    <style>
-      <class name="nobackground"/>
-    </style>
-    <child>
-      <object class="GtkBox">
-        <style>
-          <class name="shadow"/>
-          <class name="background"/>
-          <class name="frame"/>
-        </style>
-        <child>
-          <object class="GtkBox">
-            <property name="margin-top">10</property>
-            <property name="margin-bottom">10</property>
-            <property name="margin-start">10</property>
-            <property name="margin-end">10</property>
-            <property name="orientation">vertical</property>
-            <property name="spacing">3</property>
-            <child>
-              <object class="GtkBox">
-                <property name="orientation">horizontal</property>
-                <property name="homogeneous">1</property>
-
-                <child>
-                  <object class="GtkBox">
-                    <property name="orientation">horizontal</property>
-                    <property name="spacing">4</property>
-                    <property name="halign">center</property>
-                    <property name="valign">center</property>
-                    <child>
-                      <object class="GtkButton">
-                        <style><class name="small-button"/></style>
-                        <property name="valign">center</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkButton">
-                        <style><class name="small-button"/></style>
-                        <property name="valign">center</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkLabel">
-                        <property name="label">⋯</property>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-
-                <child>
-                  <object class="GtkBox">
-                    <property name="orientation">vertical</property>
-                    <property name="spacing">4</property>
-                    <property name="halign">center</property>
-                    <property name="valign">center</property>
-                    <child>
-                      <object class="GtkButton">
-                        <style><class name="small-button"/></style>
-                        <property name="halign">center</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkButton">
-                        <style><class name="small-button"/></style>
-                        <property name="halign">center</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkLabel">
-                        <property name="label">⋮</property>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-
-              </object>
-            </child>
-            <child>
-              <object class="GtkLabel">
-                <property name="justify">center</property>
-                <property name="label">Horizontal and Vertical Boxes</property>
-              </object>
-            </child>
-          </object>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <object class="GtkWindow">
-    <property name="decorated">0</property>
-    <property name="resizable">0</property>
-    <property name="default-width">280</property>
-    <property name="default-height">120</property>
-    <style>
-       <class name="nobackground"/>
-    </style>
-    <child>
-      <object class="GtkBox">
-        <style>
-          <class name="shadow"/>
-          <class name="background"/>
-          <class name="frame"/>
-        </style>
-        <child>
-          <object class="GtkButton">
-            <property name="hexpand">1</property>
-            <property name="vexpand">1</property>
-            <property name="halign">center</property>
-            <property name="valign">center</property>
-            <property name="label">Button</property>
-          </object>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <object class="GtkWindow">
-    <property name="decorated">0</property>
-    <property name="resizable">0</property>
-    <style>
-       <class name="nobackground"/>
-    </style>
-    <child>
-      <object class="GtkBox">
-        <style>
-          <class name="shadow"/>
-          <class name="background"/>
-          <class name="frame"/>
-        </style>
-        <child>
-          <object class="GtkBox">
-            <property name="orientation">vertical</property>
-            <property name="spacing">3</property>
-            <property name="hexpand">1</property>
-            <property name="vexpand">1</property>
-            <property name="halign">center</property>
-            <property name="valign">center</property>
-            <property name="margin-start">10</property>
-            <property name="margin-end">10</property>
-            <property name="margin-top">10</property>
-            <property name="margin-bottom">10</property>
-            <child>
-              <object class="GtkCalendar">
-                <property name="halign">center</property>
-                <property name="valign">center</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkLabel">
-                <property name="label">Calendar</property>
-              </object>
-            </child>
-          </object>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <object class="GtkWindow">
-    <property name="decorated">0</property>
-    <property name="resizable">0</property>
-    <property name="default-width">280</property>
-    <property name="default-height">120</property>
-    <style>
-      <class name="nobackground"/>
-    </style>
-    <child>
-      <object class="GtkBox">
-        <style>
-          <class name="shadow"/>
-          <class name="background"/>
-          <class name="frame"/>
-        </style>
-        <child>
-          <object class="GtkBox">
-            <property name="margin-top">10</property>
-            <property name="margin-bottom">10</property>
-            <property name="margin-start">20</property>
-            <property name="margin-end">20</property>
-            <property name="orientation">vertical</property>
-            <property name="spacing">3</property>
-            <child>
-              <object class="GtkCenterBox">
-                <property name="orientation">horizontal</property>
-                <property name="hexpand">1</property>
-                <property name="vexpand">1</property>
-                <property name="halign">fill</property>
-                <child type="start">
-                  <object class="GtkButton">
-                    <style><class name="small-button"/></style>
-                    <property name="valign">center</property>
-                  </object>
-                </child>
-                <child type="center">
-                  <object class="GtkButton">
-                    <style><class name="small-button"/></style>
-                    <property name="valign">center</property>
-                  </object>
-                </child>
-                <child type="end">
-                  <object class="GtkButton">
-                    <style><class name="small-button"/></style>
-                    <property name="valign">center</property>
-                  </object>
-                </child>
-              </object>
-            </child>
-            <child>
-              <object class="GtkLabel">
-                <property name="justify">center</property>
-                <property name="label">Center Box</property>
-              </object>
-            </child>
-          </object>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <object class="GtkWindow">
-    <property name="decorated">0</property>
-    <property name="resizable">0</property>
-    <property name="default-width">280</property>
-    <property name="default-height">120</property>
-    <style>
-       <class name="nobackground"/>
-    </style>
-    <child>
-      <object class="GtkBox">
-        <style>
-          <class name="shadow"/>
-          <class name="background"/>
-          <class name="frame"/>
-        </style>
-        <child>
-          <object class="GtkBox">
-            <property name="orientation">vertical</property>
-            <property name="spacing">3</property>
-            <property name="hexpand">1</property>
-            <property name="vexpand">1</property>
-            <property name="halign">center</property>
-            <property name="valign">center</property>
-            <child>
-              <object class="GtkCheckButton">
-                <property name="active">1</property>
-                <property name="label">Check Button</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkCheckButton">
-                <property name="active">0</property>
-                <property name="label">Check Button</property>
-              </object>
-            </child>
-          </object>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <object class="GtkWindow">
-    <property name="decorated">0</property>
-    <property name="resizable">0</property>
-    <property name="default-width">280</property>
-    <property name="default-height">120</property>
-    <style>
-       <class name="nobackground"/>
-    </style>
-    <child>
-      <object class="GtkBox">
-        <style>
-          <class name="shadow"/>
-          <class name="background"/>
-          <class name="frame"/>
-        </style>
-        <child>
-          <object class="GtkBox">
-            <property name="orientation">vertical</property>
-            <property name="spacing">3</property>
-            <property name="hexpand">1</property>
-            <property name="vexpand">1</property>
-            <property name="halign">center</property>
-            <property name="valign">center</property>
-            <child>
-              <object class="GtkColorButton">
-                <property name="rgba">#1e90ff</property>
-                <property name="halign">center</property>
-                <property name="valign">center</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkLabel">
-                <property name="label">Color Button</property>
-              </object>
-            </child>
-          </object>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <object class="GtkColorChooserDialog">
-    <property name="title">Color Chooser Dialog</property>
-  </object>
-</interface>
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <object class="GtkWindow">
-    <property name="decorated">0</property>
-    <property name="resizable">0</property>
-    <property name="default-width">280</property>
-    <property name="default-height">120</property>
-    <style>
-       <class name="nobackground"/>
-    </style>
-    <child>
-      <object class="GtkBox">
-        <style>
-          <class name="shadow"/>
-          <class name="background"/>
-          <class name="frame"/>
-        </style>
-        <child>
-          <object class="GtkComboBox">
-            <property name="hexpand">1</property>
-            <property name="vexpand">1</property>
-            <property name="halign">center</property>
-            <property name="valign">center</property>
-            <property name="has-entry">1</property>
-            <child internal-child="entry">
-              <object class="GtkEntry">
-                <property name="text">Combo Box Entry</property>
-              </object>
-            </child>
-          </object>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <object class="GtkWindow">
-    <property name="decorated">0</property>
-    <property name="resizable">0</property>
-    <property name="default-width">280</property>
-    <property name="default-height">120</property>
-    <style>
-       <class name="nobackground"/>
-    </style>
-    <child>
-      <object class="GtkBox">
-        <style>
-          <class name="shadow"/>
-          <class name="background"/>
-          <class name="frame"/>
-        </style>
-        <child>
-          <object class="GtkComboBoxText">
-            <property name="hexpand">1</property>
-            <property name="vexpand">1</property>
-            <property name="halign">center</property>
-            <property name="valign">center</property>
-            <items>
-              <item>Combo Box Text</item>
-            </items>
-            <property name="active">0</property>
-          </object>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <object class="GtkWindow">
-    <property name="decorated">0</property>
-    <property name="resizable">0</property>
-    <property name="default-width">280</property>
-    <property name="default-height">120</property>
-    <style>
-       <class name="nobackground"/>
-    </style>
-    <child>
-      <object class="GtkBox">
-        <style>
-          <class name="shadow"/>
-          <class name="background"/>
-          <class name="frame"/>
-        </style>
-        <child>
-          <object class="GtkComboBox">
-            <property name="hexpand">1</property>
-            <property name="vexpand">1</property>
-            <property name="halign">center</property>
-            <property name="valign">center</property>
-            <property name="model">
-              <object class="GtkListStore">
-                <columns>
-                  <column type="gchararray"/>
-                </columns>
-                <data>
-                  <row>
-                    <col id="0">Combo Box</col>
-                  </row>
-                </data>
-              </object>
-            </property>
-            <child>
-              <object class="GtkCellRendererText">
-              </object>
-              <attributes>
-                <attribute name="text">0</attribute>
-              </attributes>
-            </child>
-            <property name="active">0</property>
-          </object>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <object class="GtkDialog">
-    <property name="resizable">0</property>
-    <property name="default-width">280</property>
-    <property name="default-height">120</property>
-    <property name="title">Dialog</property>
-    <child type="action">
-      <object class="GtkButton" id="button_cancel">
-        <property name="label">Cancel</property>
-      </object>
-    </child>
-    <child type="action">
-      <object class="GtkButton" id="button_ok">
-        <property name="label">Accept</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkLabel">
-        <property name="label">Content</property>
-        <property name="hexpand">1</property>
-        <property name="halign">center</property>
-      </object>
-    </child>
-    <action-widgets>
-      <action-widget response="ok" default="true">button_ok</action-widget>
-      <action-widget response="cancel" default="true">button_cancel</action-widget>
-    </action-widgets>
-  </object>
-</interface>
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <object class="GtkWindow">
-    <property name="decorated">0</property>
-    <property name="resizable">0</property>
-    <style>
-       <class name="nobackground"/>
-    </style>
-    <child>
-      <object class="GtkBox">
-        <style>
-          <class name="shadow"/>
-          <class name="background"/>
-          <class name="frame"/>
-        </style>
-        <child>
-          <object class="GtkBox">
-            <property name="orientation">vertical</property>
-            <property name="spacing">3</property>
-            <property name="hexpand">1</property>
-            <property name="vexpand">1</property>
-            <property name="halign">fill</property>
-            <property name="valign">center</property>
-            <property name="margin-top">10</property>
-            <property name="margin-bottom">10</property>
-            <child>
-              <object class="GtkFrame">
-                <property name="margin-start">10</property>
-                <property name="margin-end">10</property>
-                <child>
-                  <object class="GtkPicture">
-                    <property name="paintable">drawingarea-content.png</property>
-                    <property name="halign">center</property>
-                    <property name="valign">center</property>
-                  </object>
-                </child>
-              </object>
-            </child>
-            <child>
-              <object class="GtkLabel">
-                <property name="label">Drawing Area</property>
-              </object>
-            </child>
-          </object>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <object class="GtkWindow">
-    <property name="decorated">0</property>
-    <property name="resizable">0</property>
-    <property name="default-width">280</property>
-    <property name="default-height">120</property>
-    <style>
-       <class name="nobackground"/>
-    </style>
-    <child>
-      <object class="GtkBox">
-        <style>
-          <class name="shadow"/>
-          <class name="background"/>
-          <class name="frame"/>
-        </style>
-        <child>
-          <object class="GtkDropDown">
-            <property name="hexpand">1</property>
-            <property name="vexpand">1</property>
-            <property name="halign">center</property>
-            <property name="valign">center</property>
-            <property name="model">
-              <object class="GtkStringList">
-                <items>
-                  <item>Drop Down</item>
-                  <item>Almost a combo</item>
-                </items>
-              </object>
-            </property>
-          </object>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <object class="GtkWindow">
-    <property name="decorated">0</property>
-    <property name="resizable">0</property>
-    <property name="default-width">280</property>
-    <property name="default-height">120</property>
-    <property name="focus-widget">editable2</property>
-    <style>
-       <class name="nobackground"/>
-    </style>
-    <child>
-      <object class="GtkBox">
-        <style>
-          <class name="shadow"/>
-          <class name="background"/>
-          <class name="frame"/>
-        </style>
-        <child>
-          <object class="GtkBox">
-            <property name="orientation">vertical</property>
-            <property name="spacing">12</property>
-            <property name="hexpand">1</property>
-            <property name="vexpand">1</property>
-            <property name="halign">center</property>
-            <property name="valign">center</property>
-            <child>
-              <object class="GtkEditableLabel">
-                <property name="text">Editable Label</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkSeparator">
-              </object>
-            </child>
-            <child>
-              <object class="GtkEditableLabel" id="editable2">
-                <property name="text">Editable Label</property>
-                <property name="editing">1</property>
-                <style>
-                  <class name="frame"/>
-                </style>
-              </object>
-            </child>
-          </object>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-      <object class="GtkEmojiChooser">
-        <property name="autohide">0</property>
-      </object>
-</interface>
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <object class="GtkWindow">
-    <property name="decorated">0</property>
-    <property name="resizable">0</property>
-    <property name="default-width">280</property>
-    <property name="default-height">120</property>
-    <style>
-       <class name="nobackground"/>
-    </style>
-    <child>
-      <object class="GtkBox">
-        <style>
-          <class name="shadow"/>
-          <class name="background"/>
-          <class name="frame"/>
-        </style>
-        <child>
-          <object class="GtkEntry">
-            <property name="hexpand">1</property>
-            <property name="vexpand">1</property>
-            <property name="halign">fill</property>
-            <property name="valign">center</property>
-            <property name="text">Entry</property>
-            <property name="margin-start">10</property>
-            <property name="margin-end">10</property>
-            <property name="margin-top">10</property>
-            <property name="margin-bottom">10</property>
-          </object>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <object class="GtkWindow">
-    <property name="decorated">0</property>
-    <property name="resizable">0</property>
-    <property name="default-width">280</property>
-    <property name="default-height">120</property>
-    <style>
-       <class name="nobackground"/>
-    </style>
-    <child>
-      <object class="GtkBox">
-        <style>
-          <class name="shadow"/>
-          <class name="background"/>
-          <class name="frame"/>
-        </style>
-        <child>
-          <object class="GtkExpander">
-            <property name="label">Expander</property>
-            <property name="hexpand">1</property>
-            <property name="halign">center</property>
-            <property name="valign">center</property>
-            <child>
-              <object class="GtkLabel">
-                <property name="label">Hidden Content</property>
-              </object>
-            </child>
-          </object>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <object class="GtkWindow">
-    <property name="decorated">0</property>
-    <property name="resizable">0</property>
-    <property name="default-width">280</property>
-    <style>
-       <class name="nobackground"/>
-    </style>
-    <child>
-      <object class="GtkBox">
-        <style>
-          <class name="frame"/>
-          <class name="shadow"/>
-          <class name="background"/>
-        </style>
-        <property name="orientation">vertical</property>
-        <property name="spacing">3</property>
-        <property name="hexpand">1</property>
-        <property name="vexpand">1</property>
-        <child>
-          <object class="GtkFlowBox">
-            <property name="min-children-per-line">2</property>
-            <property name="max-children-per-line">2</property>
-            <property name="selection-mode">browse</property>
-            <child>
-              <object class="GtkLabel">
-                <property name="label">Child One</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkButton">
-                <property name="label">Child Two</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkFlowBoxChild">
-                <child>
-                  <object class="GtkBox">
-                    <property name="orientation">horizontal</property>
-                    <property name="spacing">6</property>
-                    <child>
-                      <object class="GtkLabel">
-                        <property name="label">Child Three</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkCheckButton">
-                        <property name="active">1</property>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-              </object>
-            </child>
-          </object>
-        </child>
-        <child>
-          <object class="GtkLabel">
-            <property name="label">Flow Box</property>
-          </object>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <object class="GtkWindow">
-    <property name="decorated">0</property>
-    <property name="resizable">0</property>
-    <property name="default-width">280</property>
-    <property name="default-height">120</property>
-    <style>
-       <class name="nobackground"/>
-    </style>
-    <child>
-      <object class="GtkBox">
-        <style>
-          <class name="shadow"/>
-          <class name="background"/>
-          <class name="frame"/>
-        </style>
-        <child>
-          <object class="GtkBox">
-            <property name="orientation">vertical</property>
-            <property name="spacing">3</property>
-            <property name="hexpand">1</property>
-            <property name="vexpand">1</property>
-            <property name="halign">center</property>
-            <property name="valign">center</property>
-            <child>
-              <object class="GtkFontButton">
-                <property name="font-desc">Sans Serif 10</property>
-                <property name="halign">center</property>
-                <property name="valign">center</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkLabel">
-                <property name="label">Font Button</property>
-              </object>
-            </child>
-          </object>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>
--- a/Show More
+++ b/Show More