searchengine: Implement GListModel

This is a quick attempt to turn GtkSearchEngine
into a GListModel.

.gitlab-ci.yml

@@ -17,12 +17,7 @@ stages:
 # Common variables
 variables:
   COMMON_MESON_FLAGS: "--fatal-meson-warnings --werror"
-  BACKEND_FLAGS: "-Dx11-backend=true -Dwayland-backend=true -Dbroadway-backend=true -Dvulkan=yes"
-  FEATURE_FLAGS: "-Dcloudproviders=true"
-  MESON_TEST_TIMEOUT_MULTIPLIER: 3
-  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v20"
-  FLATPAK_IMAGE: "registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master"
-  DOCS_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora-docs:v19"
+  MESON_TEST_TIMEOUT_MULTIPLIER: 2
 
 .only-default:
   only:
@@ -32,14 +27,14 @@ variables:
 
 style-check-diff:
   extends: .only-default
-  image: $FEDORA_IMAGE
+  image: registry.gitlab.gnome.org/gnome/gtk/fedora:v17
   stage: .pre
   allow_failure: true
   script:
     - .gitlab-ci/run-style-check-diff.sh
 
 .build-fedora-default:
-  image: $FEDORA_IMAGE
+  image: registry.gitlab.gnome.org/gnome/gtk/fedora:v17
   artifacts:
     when: always
     reports:
@@ -71,7 +66,11 @@ fedora-x86_64:
   variables:
     EXTRA_MESON_FLAGS: "--buildtype=debug --default-library=both"
   script:
-    - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} ${BACKEND_FLAGS} ${FEATURE_FLAGS}
+    - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS}
+            -Dx11-backend=true
+            -Dwayland-backend=true
+            -Dbroadway-backend=true
+            -Dvulkan=yes
             -Dprofiler=true
             _build
     - ninja -C _build
@@ -85,7 +84,11 @@ release-build:
   variables:
     EXTRA_MESON_FLAGS: "--buildtype=release"
   script:
-    - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} ${BACKEND_FLAGS} ${FEATURE_FLAGS}
+    - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS}
+            -Dx11-backend=true
+            -Dwayland-backend=true
+            -Dbroadway-backend=true
+            -Dvulkan=yes
             _build
     - ninja -C _build
     - .gitlab-ci/run-tests.sh _build x11
@@ -107,14 +110,14 @@ release-build:
       - subprojects/libepoxy/
       - subprojects/pango/
 
-msys2-mingw64:
+msys2-mingw32:
   extends: .mingw-defaults
   variables:
-    MSYSTEM: "MINGW64"
+    MSYSTEM: "MINGW32"
     CHERE_INVOKING: "yes"
 
 .flatpak-defaults:
-  image: $FLATPAK_IMAGE
+  image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master
   stage: flatpak
   allow_failure: true
   tags:
@@ -168,7 +171,7 @@ flatpak-master:icon-browser:
     APPID: org.gtk.IconBrowser4
 
 static-scan:
-  image: $FEDORA_IMAGE
+  image: registry.gitlab.gnome.org/gnome/gtk/fedora:v16
   stage: analysis
   variables:
     EXTRA_MESON_FLAGS: "--buildtype=debug"
@@ -180,24 +183,8 @@ static-scan:
       - _scan_build/meson-logs
   allow_failure: true
 
-# Run tests with the address sanitizer. We need to turn off introspection,
-# since it is incompatible with asan
-asan-build:
-  image: $FEDORA_IMAGE
-  tags: [ privileged ]
-  stage: analysis
-  variables:
-  script:
-    - CC=clang meson --buildtype=debugoptimized -Db_sanitize=address -Db_lundef=false -Dintrospection=false _build
-    - ninja -C _build
-    - .gitlab-ci/run-tests.sh _build wayland
-  artifacts:
-    paths:
-      - _build/meson-logs
-  allow_failure: true
-
 reference:
-  image: $DOCS_IMAGE
+  image: registry.gitlab.gnome.org/gnome/gtk/fedora-docs:v19
   stage: docs
   variables:
     EXTRA_MESON_FLAGS: "--buildtype=release"

.gitlab-ci/README.md

@@ -35,13 +35,4 @@ branch, as well as their available versions.
  - [ ] Add the new job to `.gitlab-ci.yml` referencing the image
  - [ ] Open a merge request with your changes and let it run
 
-### Checklist for Adding a new dependency to a CI image
-
-Our images are layered, and the base (called fedora-base) contains
-all the rpm payload. Therefore, adding a new dependency is a 2-step
-process:
-
- 1. [ ] Build and upload fedora-base:$version+1
- 1. [ ] Build and upload fedora:$version+1 based on fedora-base:version+1
-
 [registry]: https://gitlab.gnome.org/GNOME/gtk/container_registry

.gitlab-ci/fedora-base.Dockerfile

@@ -41,14 +41,12 @@ RUN dnf -y install \
     itstool \
     json-glib-devel \
     lcov \
-    libasan \
     libattr-devel \
     libepoxy-devel \
     libffi-devel \
     libmount-devel \
     librsvg2 \
     libselinux-devel \
-    libubsan \
     libXcomposite-devel \
     libXcursor-devel \
     libXcursor-devel \

.gitlab-ci/fedora.Dockerfile

@@ -1,4 +1,4 @@
-FROM registry.gitlab.gnome.org/gnome/gtk/fedora-base:v20
+FROM registry.gitlab.gnome.org/gnome/gtk/fedora-base:v19
 
 ARG HOST_USER_ID=5555
 ENV HOST_USER_ID ${HOST_USER_ID}

.gitlab-ci/run-style-check-diff.sh

@@ -4,15 +4,8 @@ set -e
 
 # We need to add a new remote for the upstream master, since this script could
 # be running in a personal fork of the repository which has out of date branches.
-if [ "${CI_PROJECT_NAMESPACE}" != "GNOME" ]; then
-    echo "Retrieving the current upstream repository from ${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}..."
-    git remote add upstream https://gitlab.gnome.org/GNOME/gtk.git
-    git fetch upstream
-    ORIGIN="upstream"
-else
-    echo "Reusing the existing repository on ${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}"
-    ORIGIN="origin"
-fi
+git remote add upstream https://gitlab.gnome.org/GNOME/gtk.git
+git fetch upstream
 
 # Work out the newest common ancestor between the detached HEAD that this CI job
 # has checked out, and the upstream target branch (which will typically be
@@ -20,7 +13,7 @@ fi
 #
 # `${CI_MERGE_REQUEST_TARGET_BRANCH_NAME}` is only defined if we’re running in
 # a merge request pipeline; fall back to `${CI_DEFAULT_BRANCH}` otherwise.
-newest_common_ancestor_sha=$(diff --old-line-format='' --new-line-format='' <(git rev-list --first-parent "${ORIGIN}/${CI_MERGE_REQUEST_TARGET_BRANCH_NAME:-${CI_DEFAULT_BRANCH}}") <(git rev-list --first-parent HEAD) | head -1)
+newest_common_ancestor_sha=$(diff --old-line-format='' --new-line-format='' <(git rev-list --first-parent "upstream/${CI_MERGE_REQUEST_TARGET_BRANCH_NAME:-${CI_DEFAULT_BRANCH}}") <(git rev-list --first-parent HEAD) | head -1)
 git diff -U0 --no-color "${newest_common_ancestor_sha}" | .gitlab-ci/clang-format-diff.py -binary "clang-format" -p1
 exit_status=$?
 

.gitlab-ci/run-tests.sh

@@ -7,14 +7,10 @@ srcdir=$( pwd )
 builddir=$1
 backend=$2
 
-# Ignore memory leaks lower in dependencies
-export LSAN_OPTIONS=suppressions=$srcdir/lsan.supp
-
 case "${backend}" in
   x11)
     xvfb-run -a -s "-screen 0 1024x768x24" \
           meson test -C ${builddir} \
-                --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}" \
                 --print-errorlogs \
                 --setup=${backend} \
                 --suite=gtk \
@@ -34,7 +30,6 @@ case "${backend}" in
     export WAYLAND_DISPLAY=wayland-5
 
     meson test -C ${builddir} \
-                --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}" \
                 --print-errorlogs \
                 --setup=${backend} \
                 --suite=gtk \
@@ -53,7 +48,6 @@ case "${backend}" in
     export BROADWAY_DISPLAY=:5
 
     meson test -C ${builddir} \
-                --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}" \
                 --print-errorlogs \
                 --setup=${backend} \
                 --suite=gtk \

NEWS

@@ -1,80 +1,3 @@
-Overview of Changes in GTK 3.99.0
-=================================
-
-* Add GtkEditableLabel
-
-* Add GtkBookmarkList, a list model for bookmarks
-
-* Add GtkStringList, a list model for strings
-
-* Add GtkBitset, and use it for representing selections
-
-* GtkTreeView:
- - Make cell editing work again
-
-* GtkSpinButton:
- - Make autosizing work again
-
-* Printing:
- - Use GtkDropDown in the print dialog
-
-* GtkApplication
- - Support opening files on OS X
-
-* GtkFileChooser:
- - Fix libcloudproviders support
- - Turn GtkFileFilter into a GtkFilter
- - Simplify the api
-
-* GtkGridView, GtkListView:
- - Improve scrolling behavior
- - Autoscroll and autoexpand during DND
-
-* GtkScrolledWindow:
- - Make autoscrolling work again
-
-* GtkFilterListModel:
- - Add incremental filtering
-
-* GtkEntry:
- - Make entry completion work again
- - Drop action support from GtkEntryCompletion
-
-* Inspector:
- - Improve list model support
- - Add direct navigation between objects
-
-* GDK:
- - Compress scroll events
- - Keep a scroll history
- - Clean up GdkDevice api
- - Improve frame clock accuracy
-
-* GSK:
- - Use GL_ARB_framebuffer_object
-
-* gtk-demo:
- - Add incremental refill to the color grid
- - Improve performance of the color grid
- - Add an incrementally filtering word list
- - Improve the sidebar
-
-* Install print-editor as another demo
-
-* Translation updates
- Basque
- Catalan
- Chinese
- Japanese
- Kazakh
- Lithuanian
- Polish
- Romanian
- Spanish
- Turkish
- Ukrainian
-
-
 Overview of Changes in GTK 3.98.5
 =================================
 

build-aux/flatpak/org.gtk.WidgetFactory4.json

@@ -1,38 +1,29 @@
 {
-    "app-id" : "org.gtk.WidgetFactory4",
-    "runtime" : "org.gnome.Platform",
-    "runtime-version" : "master",
-    "sdk" : "org.gnome.Sdk",
-    "command" : "gtk4-widget-factory",
-    "tags" : [
-        "devel",
-        "development",
-        "nightly"
-    ],
-    "desktop-file-name-prefix" : "(Development) ",
-    "finish-args" : [
+    "app-id": "org.gtk.WidgetFactory4",
+    "runtime": "org.gnome.Platform",
+    "runtime-version": "master",
+    "sdk": "org.gnome.Sdk",
+    "command": "gtk4-widget-factory",
+    "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.*"
+        "--talk-name=org.gtk.vfs", "--talk-name=org.gtk.vfs.*"
     ],
-    "cleanup" : [
+    "cleanup": [
         "/include",
-        "/lib/pkgconfig",
-        "/share/pkgconfig",
+        "/lib/pkgconfig", "/share/pkgconfig",
         "/share/aclocal",
-        "/man",
-        "/share/man",
-        "/share/gtk-doc",
-        "*.la",
-        ".a",
+        "/man", "/share/man", "/share/gtk-doc",
+        "*.la", ".a",
         "/lib/girepository-1.0",
         "/share/gir-1.0",
         "/share/doc"
     ],
-    "modules" : [
+    "modules": [
         {
             "name" : "wayland",
             "buildsystem" : "autotools",
@@ -48,18 +39,18 @@
             ]
         },
         {
-            "name" : "graphene",
-            "buildsystem" : "meson",
-            "builddir" : true,
-            "config-opts" : [
+            "name": "graphene",
+            "buildsystem": "meson",
+            "builddir": true,
+            "config-opts": [
                 "--libdir=/app/lib",
                 "-Dtests=false",
                 "-Dbenchmarks=false"
             ],
-            "sources" : [
+            "sources": [
                 {
-                    "type" : "git",
-                    "url" : "https://github.com/ebassi/graphene.git"
+                    "type": "git",
+                    "url": "https://github.com/ebassi/graphene.git"
                 }
             ]
         },
@@ -67,7 +58,7 @@
             "name" : "libsass",
             "buildsystem" : "meson",
             "builddir" : true,
-            "config-opts" : [
+            "config-opts": [
                 "--libdir=/app/lib"
             ],
             "sources" : [
@@ -82,7 +73,7 @@
             "name" : "sassc",
             "buildsystem" : "meson",
             "builddir" : true,
-            "config-opts" : [
+            "config-opts": [
                 "--libdir=/app/lib"
             ],
             "sources" : [
@@ -94,23 +85,18 @@
             ]
         },
         {
-            "name" : "gtk",
-            "buildsystem" : "meson",
-            "builddir" : true,
-            "config-opts" : [
+            "name": "gtk",
+            "buildsystem": "meson",
+            "builddir": true,
+            "config-opts": [
                 "--libdir=/app/lib"
             ],
-            "sources" : [
+            "sources": [
                 {
-                    "type" : "git",
-                    "url" : "https://gitlab.gnome.org/GNOME/gtk.git"
+                    "type": "git",
+                    "url": "https://gitlab.gnome.org/GNOME/gtk.git"
                 }
             ]
         }
-    ],
-    "build-options" : {
-        "env" : {
-            "DBUS_SESSION_BUS_ADDRESS" : "''"
-        }
-    }
+    ]
 }

build-aux/meson/post-install.py

@@ -15,13 +15,7 @@ if 'DESTDIR' not in os.environ:
     gtk_immodule_dir = os.path.join(gtk_moduledir, 'immodules')
 
     print('Compiling GSettings schemas...')
-    glib_compile_schemas = subprocess.check_output(['pkg-config',
-                                                   '--variable=glib_compile_schemas',
-                                                   'gio-2.0']).strip()
-    if not os.path.exists(glib_compile_schemas):
-        # pkg-config variables only available since GLib 2.62.0.
-        glib_compile_schemas = 'glib-compile-schemas'
-    subprocess.call([glib_compile_schemas,
+    subprocess.call(['glib-compile-schemas',
                     os.path.join(gtk_datadir, 'glib-2.0', 'schemas')])
 
     print('Updating icon cache...')
@@ -30,14 +24,8 @@ if 'DESTDIR' not in os.environ:
 
     print('Updating module cache for print backends...')
     os.makedirs(gtk_printmodule_dir, exist_ok=True)
-    gio_querymodules = subprocess.check_output(['pkg-config',
-                                                '--variable=gio_querymodules',
-                                                'gio-2.0']).strip()
-    if not os.path.exists(gio_querymodules):
-        # pkg-config variables only available since GLib 2.62.0.
-        gio_querymodules = 'gio-querymodules'
-    subprocess.call([gio_querymodules, gtk_printmodule_dir])
+    subprocess.call(['gio-querymodules', gtk_printmodule_dir])
 
     print('Updating module cache for input methods...')
     os.makedirs(gtk_immodule_dir, exist_ok=True)
-    subprocess.call([gio_querymodules, gtk_immodule_dir])
+    subprocess.call(['gio-querymodules', gtk_immodule_dir])

demos/constraint-editor/constraint-editor-window.ui

@@ -9,6 +9,7 @@
     <property name="default-height">768</property>
     <child type="titlebar">
       <object class="GtkHeaderBar" id="header">
+        <property name="show-title-buttons">1</property>
         <child type="start">
           <object class="GtkButton">
             <property name="icon-name">document-open-symbolic</property>

demos/constraint-editor/constraint-view.c

@@ -188,7 +188,7 @@ constraint_view_init (ConstraintView *self)
   g_list_store_append (list, children);
   g_list_store_append (list, guides);
   g_list_store_append (list, constraints);
-  self->model = G_LIST_MODEL (gtk_flatten_list_model_new (G_LIST_MODEL (list)));
+  self->model = G_LIST_MODEL (gtk_flatten_list_model_new (G_TYPE_OBJECT, G_LIST_MODEL (list)));
   g_object_unref (children);
   g_object_unref (guides);
   g_object_unref (constraints);

demos/gtk-demo/css_basics.c

@@ -94,7 +94,7 @@ do_css_basics (GtkWidget *do_widget)
 
       provider = GTK_STYLE_PROVIDER (gtk_css_provider_new ());
 
-      container = gtk_scrolled_window_new ();
+      container = gtk_scrolled_window_new (NULL, NULL);
       gtk_window_set_child (GTK_WINDOW (window), container);
       child = gtk_text_view_new_with_buffer (text);
       gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (container), child);

demos/gtk-demo/css_multiplebgs.c

@@ -132,7 +132,7 @@ do_css_multiplebgs (GtkWidget *do_widget)
 
       provider = GTK_STYLE_PROVIDER (gtk_css_provider_new ());
 
-      sw = gtk_scrolled_window_new ();
+      sw = gtk_scrolled_window_new (NULL, NULL);
       gtk_paned_set_end_child (GTK_PANED (paned), sw);
       child = gtk_text_view_new_with_buffer (text);
       gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), child);

demos/gtk-demo/css_pixbufs.c

@@ -101,7 +101,7 @@ do_css_pixbufs (GtkWidget *do_widget)
 
       provider = GTK_STYLE_PROVIDER (gtk_css_provider_new ());
 
-      container = gtk_scrolled_window_new ();
+      container = gtk_scrolled_window_new (NULL, NULL);
       gtk_paned_set_end_child (GTK_PANED (paned), container);
       child = gtk_text_view_new_with_buffer (text);
       gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (container), child);

demos/gtk-demo/css_shadows.c

@@ -119,7 +119,7 @@ do_css_shadows (GtkWidget *do_widget)
 
       provider = GTK_STYLE_PROVIDER (gtk_css_provider_new ());
 
-      container = gtk_scrolled_window_new ();
+      container = gtk_scrolled_window_new (NULL, NULL);
       gtk_paned_set_end_child (GTK_PANED (paned), container);
       child = gtk_text_view_new_with_buffer (text);
       gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (container), child);

demos/gtk-demo/demo.gresource.xml

@@ -105,9 +105,6 @@
     <file>zoom_in_cursor.png</file>
     <file>zoom_out_cursor.png</file>
   </gresource>
-  <gresource prefix="/dnd">
-    <file>dnd.css</file>
-  </gresource>
   <gresource prefix="/fishbowl">
     <file>fishbowl.ui</file>
     <file>gtkfishbowl.c</file>
@@ -140,7 +137,6 @@
   </gresource>
   <gresource prefix="/listview_colors">
     <file compressed="true">color.names.txt</file>
-    <file>listview_colors.css</file>
   </gresource>
   <gresource prefix="/shortcuts">
     <file>shortcuts.ui</file>
@@ -226,7 +222,6 @@
     <file>listview_minesweeper.c</file>
     <file>listview_settings.c</file>
     <file>listview_weather.c</file>
-    <file>listview_words.c</file>
     <file>list_store.c</file>
     <file>markup.c</file>
     <file>modelbutton.c</file>
@@ -301,7 +296,6 @@
   </gresource>
   <gresource prefix="/transparent">
     <file>portland-rose.jpg</file>
-    <file>bluroverlay.h</file>
     <file>bluroverlay.c</file>
   </gresource>
   <gresource prefix="/markup">

demos/gtk-demo/demotaggedentry.c

@@ -25,36 +25,31 @@
 #include <gtk/gtk.h>
 #include <gtk/gtk-a11y.h>
 
-struct _DemoTaggedEntry
-{
-  GtkWidget parent_instance;
-
+typedef struct {
   GtkWidget *box;
   GtkWidget *entry;
-};
-
-struct _DemoTaggedEntryClass
-{
-  GtkWidgetClass parent_class;
-};
+} DemoTaggedEntryPrivate;
 
 static void demo_tagged_entry_editable_init (GtkEditableInterface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (DemoTaggedEntry, demo_tagged_entry, GTK_TYPE_WIDGET,
+                         G_ADD_PRIVATE (DemoTaggedEntry)
                          G_IMPLEMENT_INTERFACE (GTK_TYPE_EDITABLE, demo_tagged_entry_editable_init))
 
 static void
 demo_tagged_entry_init (DemoTaggedEntry *entry)
 {
-  entry->box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-  gtk_widget_set_parent (entry->box, GTK_WIDGET (entry));
+  DemoTaggedEntryPrivate *priv = demo_tagged_entry_get_instance_private (entry);
 
-  entry->entry = gtk_text_new ();
-  gtk_widget_set_hexpand (entry->entry, TRUE);
-  gtk_widget_set_vexpand (entry->entry, TRUE);
-  gtk_widget_set_hexpand (entry->box, FALSE);
-  gtk_widget_set_vexpand (entry->box, FALSE);
-  gtk_box_append (GTK_BOX (entry->box), entry->entry);
+  priv->box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+  gtk_widget_set_parent (priv->box, GTK_WIDGET (entry));
+
+  priv->entry = gtk_text_new ();
+  gtk_widget_set_hexpand (priv->entry, TRUE);
+  gtk_widget_set_vexpand (priv->entry, TRUE);
+  gtk_widget_set_hexpand (priv->box, FALSE);
+  gtk_widget_set_vexpand (priv->box, FALSE);
+  gtk_box_append (GTK_BOX (priv->box), priv->entry);
   gtk_editable_init_delegate (GTK_EDITABLE (entry));
 }
 
@@ -62,16 +57,23 @@ static void
 demo_tagged_entry_dispose (GObject *object)
 {
   DemoTaggedEntry *entry = DEMO_TAGGED_ENTRY (object);
+  DemoTaggedEntryPrivate *priv = demo_tagged_entry_get_instance_private (entry);
 
-  if (entry->entry)
+  if (priv->entry)
     gtk_editable_finish_delegate (GTK_EDITABLE (entry));
 
-  g_clear_pointer (&entry->entry, gtk_widget_unparent);
-  g_clear_pointer (&entry->box, gtk_widget_unparent);
+  g_clear_pointer (&priv->entry, gtk_widget_unparent);
+  g_clear_pointer (&priv->box, gtk_widget_unparent);
 
   G_OBJECT_CLASS (demo_tagged_entry_parent_class)->dispose (object);
 }
 
+static void
+demo_tagged_entry_finalize (GObject *object)
+{
+  G_OBJECT_CLASS (demo_tagged_entry_parent_class)->finalize (object);
+}
+
 static void
 demo_tagged_entry_set_property (GObject      *object,
                                 guint         prop_id,
@@ -96,12 +98,44 @@ demo_tagged_entry_get_property (GObject    *object,
   G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
 }
 
+static void
+demo_tagged_entry_measure (GtkWidget      *widget,
+                           GtkOrientation  orientation,
+                           int             for_size,
+                           int            *minimum,
+                           int            *natural,
+                           int            *minimum_baseline,
+                           int            *natural_baseline)
+{
+  DemoTaggedEntry *entry = DEMO_TAGGED_ENTRY (widget);
+  DemoTaggedEntryPrivate *priv = demo_tagged_entry_get_instance_private (entry);
+
+  gtk_widget_measure (priv->box, orientation, for_size,
+                      minimum, natural,
+                      minimum_baseline, natural_baseline);
+}
+
+static void
+demo_tagged_entry_size_allocate (GtkWidget *widget,
+                                 int        width,
+                                 int        height,
+                                 int        baseline)
+{
+  DemoTaggedEntry *entry = DEMO_TAGGED_ENTRY (widget);
+  DemoTaggedEntryPrivate *priv = demo_tagged_entry_get_instance_private (entry);
+
+  gtk_widget_size_allocate (priv->box,
+                            &(GtkAllocation) { 0, 0, width, height },
+                            baseline);
+}
+
 static gboolean
 demo_tagged_entry_grab_focus (GtkWidget *widget)
 {
   DemoTaggedEntry *entry = DEMO_TAGGED_ENTRY (widget);
+  DemoTaggedEntryPrivate *priv = demo_tagged_entry_get_instance_private (entry);
 
-  return gtk_widget_grab_focus (entry->entry);
+  return gtk_widget_grab_focus (priv->entry);
 }
 
 static void
@@ -111,14 +145,16 @@ demo_tagged_entry_class_init (DemoTaggedEntryClass *klass)
   GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
 
   object_class->dispose = demo_tagged_entry_dispose;
+  object_class->finalize = demo_tagged_entry_finalize;
   object_class->get_property = demo_tagged_entry_get_property;
   object_class->set_property = demo_tagged_entry_set_property;
 
+  widget_class->measure = demo_tagged_entry_measure;
+  widget_class->size_allocate = demo_tagged_entry_size_allocate;
   widget_class->grab_focus = demo_tagged_entry_grab_focus;
-
+ 
   gtk_editable_install_properties (object_class, 1);
 
-  gtk_widget_class_set_layout_manager_type (widget_class, GTK_TYPE_BIN_LAYOUT);
   gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_ENTRY_ACCESSIBLE);
   gtk_widget_class_set_css_name (widget_class, "entry");
 }
@@ -126,7 +162,10 @@ demo_tagged_entry_class_init (DemoTaggedEntryClass *klass)
 static GtkEditable *
 demo_tagged_entry_get_delegate (GtkEditable *editable)
 {
-  return GTK_EDITABLE (DEMO_TAGGED_ENTRY (editable)->entry);
+  DemoTaggedEntry *entry = DEMO_TAGGED_ENTRY (editable);
+  DemoTaggedEntryPrivate *priv = demo_tagged_entry_get_instance_private (entry);
+
+  return GTK_EDITABLE (priv->entry);
 }
 
 static void
@@ -145,9 +184,11 @@ void
 demo_tagged_entry_add_tag (DemoTaggedEntry *entry,
                            GtkWidget       *tag)
 {
+  DemoTaggedEntryPrivate *priv = demo_tagged_entry_get_instance_private (entry);
+
   g_return_if_fail (DEMO_IS_TAGGED_ENTRY (entry));
 
-  gtk_box_append (GTK_BOX (entry->box), tag);
+  gtk_box_append (GTK_BOX (priv->box), tag);
 }
 
 void
@@ -155,27 +196,30 @@ demo_tagged_entry_insert_tag_after (DemoTaggedEntry *entry,
                                     GtkWidget       *tag,
                                     GtkWidget       *sibling)
 {
+  DemoTaggedEntryPrivate *priv = demo_tagged_entry_get_instance_private (entry);
+
   g_return_if_fail (DEMO_IS_TAGGED_ENTRY (entry));
 
   if (sibling == NULL)
-    gtk_box_append (GTK_BOX (entry->box), tag);
+    gtk_box_append (GTK_BOX (priv->box), tag);
   else
-    gtk_box_insert_child_after (GTK_BOX (entry->box), tag, sibling);
+    gtk_box_insert_child_after (GTK_BOX (priv->box), tag, sibling); 
 }
 
 void
 demo_tagged_entry_remove_tag (DemoTaggedEntry *entry,
                               GtkWidget       *tag)
 {
+  DemoTaggedEntryPrivate *priv = demo_tagged_entry_get_instance_private (entry);
+
   g_return_if_fail (DEMO_IS_TAGGED_ENTRY (entry));
 
-  gtk_box_remove (GTK_BOX (entry->box), tag);
+  gtk_box_remove (GTK_BOX (priv->box), tag);
 }
 
 struct _DemoTaggedEntryTag
 {
   GtkWidget parent;
-
   GtkWidget *box;
   GtkWidget *label;
   GtkWidget *button;
@@ -206,11 +250,11 @@ static guint signals[LAST_SIGNAL] = { 0, };
 G_DEFINE_TYPE (DemoTaggedEntryTag, demo_tagged_entry_tag, GTK_TYPE_WIDGET)
 
 static void
-on_released (GtkGestureClick    *gesture,
-             int                 n_press,
-             double              x,
-             double              y,
-             DemoTaggedEntryTag *tag)
+on_released (GtkGestureClick      *gesture,
+             int                   n_press,
+             double                x,
+             double                y,
+             DemoTaggedEntryTag   *tag)
 {
   g_signal_emit (tag, signals[SIGNAL_CLICKED], 0);
 }
@@ -425,7 +469,7 @@ demo_tagged_entry_tag_set_has_close_button (DemoTaggedEntryTag *tag,
 
       image = gtk_image_new_from_icon_name ("window-close-symbolic");
       tag->button = gtk_button_new ();
-      gtk_button_set_child (GTK_BUTTON (tag->button), image);
+      gtk_box_append (GTK_BOX (tag->button), image);
       gtk_widget_set_halign (tag->button, GTK_ALIGN_CENTER);
       gtk_widget_set_valign (tag->button, GTK_ALIGN_CENTER);
       gtk_button_set_has_frame (GTK_BUTTON (tag->button), FALSE);

demos/gtk-demo/demotaggedentry.h

@@ -25,11 +25,39 @@
 
 G_BEGIN_DECLS
 
-#define DEMO_TYPE_TAGGED_ENTRY (demo_tagged_entry_get_type ())
-G_DECLARE_FINAL_TYPE (DemoTaggedEntry, demo_tagged_entry, DEMO, TAGGED_ENTRY, GtkWidget)
+#define DEMO_TYPE_TAGGED_ENTRY                 (demo_tagged_entry_get_type ())
+#define DEMO_TAGGED_ENTRY(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), DEMO_TYPE_TAGGED_ENTRY, DemoTaggedEntry))
+#define DEMO_TAGGED_ENTRY_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), DEMO_TYPE_TAGGED_ENTRY, DemoTaggedEntryClass))
+#define DEMO_IS_TAGGED_ENTRY(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DEMO_TYPE_TAGGED_ENTRY))
+#define DEMO_IS_TAGGED_ENTRY_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), DEMO_TYPE_TAGGED_ENTRY))
+#define DEMO_TAGGED_ENTRY_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), DEMO_TYPE_TAGGED_ENTRY, DemoTaggedEntryClass))
 
-#define DEMO_TYPE_TAGGED_ENTRY_TAG (demo_tagged_entry_tag_get_type ())
-G_DECLARE_FINAL_TYPE (DemoTaggedEntryTag, demo_tagged_entry_tag, DEMO, TAGGED_ENTRY_TAG, GtkWidget)
+typedef struct _DemoTaggedEntry       DemoTaggedEntry;
+typedef struct _DemoTaggedEntryClass  DemoTaggedEntryClass;
+
+struct _DemoTaggedEntry
+{
+  GtkWidget parent;
+};
+
+struct _DemoTaggedEntryClass
+{
+  GtkWidgetClass parent_class;
+};
+
+#define DEMO_TYPE_TAGGED_ENTRY_TAG                (demo_tagged_entry_tag_get_type ())
+#define DEMO_TAGGED_ENTRY_TAG(obj)                (G_TYPE_CHECK_INSTANCE_CAST ((obj), DEMO_TYPE_TAGGED_ENTRY_TAG, DemoTaggedEntryTag))
+#define DEMO_TAGGED_ENTRY_TAG_CLASS(klass)        (G_TYPE_CHECK_CLASS_CAST ((klass), DEMO_TYPE_TAGGED_ENTRY_TAG, DemoTaggedEntryTag))
+#define DEMO_IS_TAGGED_ENTRY_TAG(obj)             (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DEMO_TYPE_TAGGED_ENTRY_TAG))
+#define DEMO_IS_TAGGED_ENTRY_TAG_CLASS(klass)     (G_TYPE_CHECK_CLASS_TYPE ((klass), DEMO_TYPE_TAGGED_ENTRY_TAG))
+#define DEMO_TAGGED_ENTRY_TAG_GET_CLASS(obj)      (G_TYPE_INSTANCE_GET_CLASS ((obj), DEMO_TYPE_TAGGED_ENTRY_TAG, DemoTaggedEntryTagClass))
+
+typedef struct _DemoTaggedEntryTag       DemoTaggedEntryTag;
+typedef struct _DemoTaggedEntryTagClass  DemoTaggedEntryTagClass;
+
+
+GType           demo_tagged_entry_get_type (void) G_GNUC_CONST;
+GType           demo_tagged_entry_tag_get_type (void) G_GNUC_CONST;
 
 GtkWidget *     demo_tagged_entry_new     (void);
 

demos/gtk-demo/dialog.c

@@ -1,7 +1,6 @@
-/* Dialogs
+/* Dialogs and Message Boxes
  *
- * Dialogs are used to pop up transient windows for information
- * and user feedback.
+ * Dialog widgets are used to pop up a transient window for user feedback.
  */
 
 #include <glib/gi18n.h>
@@ -22,9 +21,10 @@ message_dialog_clicked (GtkButton *button,
                                    GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
                                    GTK_MESSAGE_INFO,
                                    GTK_BUTTONS_OK_CANCEL,
-                                   "Test message");
+                                   "This message box has been popped up the following\n"
+                                   "number of times:");
   gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
-                                            ngettext ("Has been shown once", "Has been shown %d times", i), i);
+                                            "%d", i);
   g_signal_connect (dialog, "response", G_CALLBACK (gtk_window_destroy), NULL);
   gtk_widget_show (dialog);
   i++;
@@ -61,6 +61,8 @@ interactive_dialog_clicked (GtkButton *button,
 {
   GtkWidget *content_area;
   GtkWidget *dialog;
+  GtkWidget *hbox;
+  GtkWidget *image;
   GtkWidget *table;
   GtkWidget *local_entry1;
   GtkWidget *local_entry2;
@@ -69,24 +71,26 @@ interactive_dialog_clicked (GtkButton *button,
 
   dialog = gtk_dialog_new_with_buttons ("Interactive Dialog",
                                         GTK_WINDOW (window),
-                                        GTK_DIALOG_MODAL| GTK_DIALOG_DESTROY_WITH_PARENT|GTK_DIALOG_USE_HEADER_BAR,
-                                        _("_OK"), GTK_RESPONSE_OK,
-                                        _("_Cancel"), GTK_RESPONSE_CANCEL,
+                                        GTK_DIALOG_MODAL| GTK_DIALOG_DESTROY_WITH_PARENT,
+                                        _("_OK"),
+                                        GTK_RESPONSE_OK,
+                                        "_Cancel",
+                                        GTK_RESPONSE_CANCEL,
                                         NULL);
 
-  gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
-
   content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
 
-  table = gtk_grid_new ();
-  gtk_widget_set_hexpand (table, TRUE);
-  gtk_widget_set_vexpand (table, TRUE);
-  gtk_widget_set_halign (table, GTK_ALIGN_CENTER);
-  gtk_widget_set_valign (table, GTK_ALIGN_CENTER);
-  gtk_box_append (GTK_BOX (content_area), table);
-  gtk_grid_set_row_spacing (GTK_GRID (table), 6);
-  gtk_grid_set_column_spacing (GTK_GRID (table), 6);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
+  gtk_box_append (GTK_BOX (content_area), hbox);
 
+  image = gtk_image_new_from_icon_name ("dialog-question");
+  gtk_image_set_icon_size (GTK_IMAGE (image), GTK_ICON_SIZE_LARGE);
+  gtk_box_append (GTK_BOX (hbox), image);
+
+  table = gtk_grid_new ();
+  gtk_grid_set_row_spacing (GTK_GRID (table), 4);
+  gtk_grid_set_column_spacing (GTK_GRID (table), 4);
+  gtk_box_append (GTK_BOX (hbox), table);
   label = gtk_label_new_with_mnemonic ("_Entry 1");
   gtk_grid_attach (GTK_GRID (table), label, 0, 0, 1, 1);
   local_entry1 = gtk_entry_new ();
@@ -119,6 +123,7 @@ interactive_dialog_clicked (GtkButton *button,
 GtkWidget *
 do_dialog (GtkWidget *do_widget)
 {
+  GtkWidget *frame;
   GtkWidget *vbox;
   GtkWidget *vbox2;
   GtkWidget *hbox;
@@ -131,16 +136,22 @@ do_dialog (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), "Dialogs");
-      gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
+      gtk_window_set_title (GTK_WINDOW (window), "Dialogs and Message Boxes");
       g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
 
+      frame = gtk_frame_new ("Dialogs");
+      gtk_widget_set_margin_start (frame, 8);
+      gtk_widget_set_margin_end (frame, 8);
+      gtk_widget_set_margin_top (frame, 8);
+      gtk_widget_set_margin_bottom (frame, 8);
+      gtk_window_set_child (GTK_WINDOW (window), frame);
+
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
       gtk_widget_set_margin_start (vbox, 8);
       gtk_widget_set_margin_end (vbox, 8);
       gtk_widget_set_margin_top (vbox, 8);
       gtk_widget_set_margin_bottom (vbox, 8);
-      gtk_window_set_child (GTK_WINDOW (window), vbox);
+      gtk_frame_set_child (GTK_FRAME (frame), vbox);
 
       /* Standard message dialog */
       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);

demos/gtk-demo/dnd.c

@@ -38,20 +38,15 @@ set_color (CanvasItem *item,
   char *str;
   GtkStyleContext *context;
   GtkCssProvider *provider;
-  const char *old_class;
 
   str = gdk_rgba_to_string (color);
-  css = g_strdup_printf ("* { background: %s; }", str);
+  css = g_strdup_printf ("* { background: %s; padding: 10px; margin: 1px; }", str);
 
   context = gtk_widget_get_style_context (item->label);
   provider = g_object_get_data (G_OBJECT (context), "style-provider");
   if (provider)
     gtk_style_context_remove_provider (context, GTK_STYLE_PROVIDER (provider));
 
-  old_class = (const char *)g_object_get_data (G_OBJECT (item->label), "css-class");
-  if (old_class)
-    gtk_widget_remove_css_class (item->label, old_class);
-
   provider = gtk_css_provider_new ();
   gtk_css_provider_load_from_data (provider, css, -1);
   gtk_style_context_add_provider (gtk_widget_get_style_context (item->label), GTK_STYLE_PROVIDER (provider), 800);
@@ -61,27 +56,6 @@ set_color (CanvasItem *item,
   g_free (css);
 }
 
-static void
-set_css (CanvasItem *item,
-         const char *class)
-{
-  GtkStyleContext *context;
-  GtkCssProvider *provider;
-  const char *old_class;
-
-  context = gtk_widget_get_style_context (item->label);
-  provider = g_object_get_data (G_OBJECT (context), "style-provider");
-  if (provider)
-    gtk_style_context_remove_provider (context, GTK_STYLE_PROVIDER (provider));
-
-  old_class = (const char *)g_object_get_data (G_OBJECT (item->label), "css-class");
-  if (old_class)
-    gtk_widget_remove_css_class (item->label, old_class);
-
-  g_object_set_data_full (G_OBJECT (item->label), "css-class", g_strdup (class), g_free);
-  gtk_widget_add_css_class (item->label, class);
-}
-
 static gboolean
 item_drag_drop (GtkDropTarget *dest,
                 const GValue  *value,
@@ -91,10 +65,7 @@ item_drag_drop (GtkDropTarget *dest,
   GtkWidget *label = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (dest));
   CanvasItem *item = CANVAS_ITEM (gtk_widget_get_parent (gtk_widget_get_parent (label)));
 
-  if (G_VALUE_TYPE (value) == GDK_TYPE_RGBA)
-    set_color (item, g_value_get_boxed (value));
-  else if (G_VALUE_TYPE (value) == G_TYPE_STRING)
-    set_css (item, g_value_get_string (value));
+  set_color (item, g_value_get_boxed (value));
 
   return TRUE;
 }
@@ -161,13 +132,11 @@ canvas_item_init (CanvasItem *item)
   GdkRGBA rgba;
   GtkDropTarget *dest;
   GtkGesture *gesture;
-  GType types[2] = { GDK_TYPE_RGBA, G_TYPE_STRING };
 
   n_items++;
 
   text = g_strdup_printf ("Item %d", n_items);
   item->label = gtk_label_new (text);
-  gtk_widget_add_css_class (item->label, "canvasitem");
   g_free (text);
 
   item->fixed = gtk_fixed_new ();
@@ -185,8 +154,7 @@ canvas_item_init (CanvasItem *item)
 
   item->angle = 0;
 
-  dest = gtk_drop_target_new (G_TYPE_INVALID, GDK_ACTION_COPY);
-  gtk_drop_target_set_gtypes (dest, types, G_N_ELEMENTS (types));
+  dest = gtk_drop_target_new (GDK_TYPE_RGBA, GDK_ACTION_COPY);
   g_signal_connect (dest, "drop", G_CALLBACK (item_drag_drop), NULL);
   gtk_widget_add_controller (GTK_WIDGET (item->label), GTK_EVENT_CONTROLLER (dest));
 
@@ -561,119 +529,6 @@ canvas_new (void)
   return canvas;
 }
 
-static GdkContentProvider *
-css_drag_prepare (GtkDragSource *source,
-                  double         x,
-                  double         y,
-                  GtkWidget     *button)
-{
-  const char *class;
-  GdkPaintable *paintable;
-
-  class = (const char *)g_object_get_data (G_OBJECT (button), "css-class");
-
-  paintable = gtk_widget_paintable_new (button);
-  gtk_drag_source_set_icon (source, paintable, 0, 0);
-  g_object_unref (paintable);
-
-  return gdk_content_provider_new_typed (G_TYPE_STRING, class);
-}
-
-static GtkWidget *
-css_button_new (const char *class)
-{
-  GtkWidget *button;
-  GtkDragSource *source;
-
-  button = gtk_image_new ();
-  gtk_widget_set_size_request (button, 48, 32);
-  gtk_widget_add_css_class (button, class);
-  g_object_set_data (G_OBJECT (button), "css-class", (gpointer)class);
-
-  source = gtk_drag_source_new ();
-  g_signal_connect (source, "prepare", G_CALLBACK (css_drag_prepare), button);
-  gtk_widget_add_controller (button, GTK_EVENT_CONTROLLER (source));
-
-  return button;
-}
-
-typedef struct
-{
-  GtkWidget parent_instance;
-  GdkRGBA color;
-} ColorSwatch;
-
-typedef struct
-{
-  GtkWidgetClass parent_class;
-} ColorSwatchClass;
-
-G_DEFINE_TYPE (ColorSwatch, color_swatch, GTK_TYPE_WIDGET)
-
-static GdkContentProvider *
-color_swatch_drag_prepare (GtkDragSource  *source,
-                           double          x,
-                           double          y,
-                           ColorSwatch    *swatch)
-{
-  return gdk_content_provider_new_typed (GDK_TYPE_RGBA, &swatch->color);
-}
-
-static void
-color_swatch_init (ColorSwatch *swatch)
-{
-  GtkDragSource *source = gtk_drag_source_new ();
-  g_signal_connect (source, "prepare", G_CALLBACK (color_swatch_drag_prepare), swatch);
-  gtk_widget_add_controller (GTK_WIDGET (swatch), GTK_EVENT_CONTROLLER (source));
-}
-
-static void
-color_swatch_snapshot (GtkWidget   *widget,
-                       GtkSnapshot *snapshot)
-{
-  ColorSwatch *swatch = (ColorSwatch *)widget;
-  float w = gtk_widget_get_width (widget);
-  float h = gtk_widget_get_height (widget);
-
-  gtk_snapshot_append_color (snapshot, &swatch->color,
-                             &GRAPHENE_RECT_INIT(0, 0, w, h));
-}
-
-void
-color_swatch_measure (GtkWidget      *widget,
-                      GtkOrientation  orientation,
-                      int             for_size,
-                      int            *minimum_size,
-                      int            *natural_size,
-                      int            *minimum_baseline,
-                      int            *natural_baseline)
-{
-  if (orientation == GTK_ORIENTATION_HORIZONTAL)
-    *minimum_size = *natural_size = 48;
-  else
-    *minimum_size = *natural_size = 32;
-}
-
-static void
-color_swatch_class_init (ColorSwatchClass *class)
-{
-  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
-
-  widget_class->snapshot = color_swatch_snapshot;
-  widget_class->measure = color_swatch_measure;
-  gtk_widget_class_set_css_name (widget_class, "colorswatch");
-}
-
-static GtkWidget *
-color_swatch_new (const char *color)
-{
-  ColorSwatch *swatch = g_object_new (color_swatch_get_type (), NULL);
-
-  gdk_rgba_parse (&swatch->color, color);
-
-  return GTK_WIDGET (swatch);
-}
-
 static GtkWidget *window = NULL;
 
 GtkWidget *
@@ -693,18 +548,10 @@ do_dnd (GtkWidget *do_widget)
       };
       int i;
       int x, y;
-      GtkCssProvider *provider;
 
       button = gtk_color_button_new ();
       g_object_unref (g_object_ref_sink (button));
 
-      provider = gtk_css_provider_new ();
-      gtk_css_provider_load_from_resource (provider, "/dnd/dnd.css");
-      gtk_style_context_add_provider_for_display (gdk_display_get_default (),
-                                                  GTK_STYLE_PROVIDER (provider),
-                                                  800);
-      g_object_unref (provider);
-
       window = gtk_window_new ();
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
@@ -736,7 +583,7 @@ do_dnd (GtkWidget *do_widget)
           y += 100;
         }
 
-      sw = gtk_scrolled_window_new ();
+      sw = gtk_scrolled_window_new (NULL, NULL);
       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                       GTK_POLICY_AUTOMATIC,
                                       GTK_POLICY_NEVER);
@@ -747,11 +594,18 @@ do_dnd (GtkWidget *do_widget)
       gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), box3);
 
       for (i = 0; colors[i]; i++)
-        gtk_box_append (GTK_BOX (box3), color_swatch_new (colors[i]));
+        {
+          GdkRGBA rgba;
+          GtkWidget *swatch;
 
-      gtk_box_append (GTK_BOX (box3), css_button_new ("rainbow1"));
-      gtk_box_append (GTK_BOX (box3), css_button_new ("rainbow2"));
-      gtk_box_append (GTK_BOX (box3), css_button_new ("rainbow3"));
+          gdk_rgba_parse (&rgba, colors[i]);
+
+          swatch = g_object_new (g_type_from_name ("GtkColorSwatch"),
+                                 "rgba", &rgba,
+                                 "selectable", FALSE,
+                                 NULL);
+          gtk_box_append (GTK_BOX (box3), swatch);
+        }
     }
 
   if (!gtk_widget_get_visible (window))

demos/gtk-demo/dnd.css

@@ -1,37 +0,0 @@
-label.canvasitem {
-  padding: 10px;
-  margin: 1px;
-}
-
-.canvasitem.rainbow1,
-image.rainbow1 {
-  background: linear-gradient(140deg,red,orange,yellow,green,blue,purple);
-}
-
-.canvasitem.rainbow2,
-image.rainbow2 {
-  animation: rainbow2 1s infinite linear;
-}
-
-@keyframes rainbow2 {
- 0% { background: linear-gradient(0deg,red,orange,yellow,green,blue,purple); }
- 25% { background: linear-gradient(90deg,red,orange,yellow,green,blue,purple); }
- 50% { background: linear-gradient(180deg,red,orange,yellow,green,blue,purple); }
- 75% { background: linear-gradient(270deg,red,orange,yellow,green,blue,purple); }
- 100% { background: linear-gradient(360deg,red,orange,yellow,green,blue,purple); }
-}
-
-.canvasitem.rainbow3,
-image.rainbow3 {
-  animation: rainbow3 1s infinite linear;
-}
-
-@keyframes rainbow3 {
- 0% { background: linear-gradient(140deg,red,orange,yellow,green,blue,purple); }
- 16.6% { background: linear-gradient(140deg,purple,red,orange,yellow,green,blue); }
- 33.2% { background: linear-gradient(140deg,blue,purple,red,orange,yellow,green); }
- 50% { background: linear-gradient(140deg,green,blue,purple,red,orange,yellow); }
- 66.6% { background: linear-gradient(140deg,yellow,green,blue,purple,red,orange); }
- 83.2% { background: linear-gradient(140deg,orange,yellow,green,blue,purple,red); }
- 100% { background: linear-gradient(140deg,red,orange,yellow,green,blue,purple); }
-}

demos/gtk-demo/dropdown.c

@@ -92,7 +92,7 @@ strings_setup_item_full (GtkSignalListItemFactory *factory,
   gtk_label_set_xalign (GTK_LABEL (title), 0.0);
   description = gtk_label_new ("");
   gtk_label_set_xalign (GTK_LABEL (description), 0.0);
-  gtk_widget_add_css_class (description, "dim-label");
+  gtk_style_context_add_class (gtk_widget_get_style_context (description), "dim-label");
 
   box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
   box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);

demos/gtk-demo/editable_cells.c

@@ -364,7 +364,7 @@ do_editable_cells (GtkWidget *do_widget)
       gtk_box_append (GTK_BOX (vbox),
                           gtk_label_new ("Shopping list (you can edit the cells!)"));
 
-      sw = gtk_scrolled_window_new ();
+      sw = gtk_scrolled_window_new (NULL, NULL);
       gtk_scrolled_window_set_has_frame (GTK_SCROLLED_WINDOW (sw), TRUE);
       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                       GTK_POLICY_AUTOMATIC,

demos/gtk-demo/entry_completion.c

@@ -1,4 +1,4 @@
-/* Entry/Completion
+/* Entry/Entry Completion
  *
  * GtkEntryCompletion provides a mechanism for adding support for
  * completion in GtkEntry.
@@ -12,48 +12,22 @@
 static GtkTreeModel *
 create_completion_model (void)
 {
-  const char *strings[] = {
-    "GNOME",
-    "gnominious",
-    "Gnomonic projection",
-    "Gnosophy",
-    "total",
-    "totally",
-    "toto",
-    "tottery",
-    "totterer",
-    "Totten trust",
-    "Tottenham hotspurs",
-    "totipotent",
-    "totipotency",
-    "totemism",
-    "totem pole",
-    "Totara",
-    "totalizer",
-    "totalizator",
-    "totalitarianism",
-    "total parenteral nutrition",
-    "total eclipse",
-    "Totipresence",
-    "Totipalmi",
-    "zombie",
-    "aæx",
-    "aæy",
-    "aæz",
-    NULL
-  };
-  int i;
   GtkListStore *store;
   GtkTreeIter iter;
 
   store = gtk_list_store_new (1, G_TYPE_STRING);
 
-  for (i = 0; strings[i]; i++)
-    {
-      /* Append one word */
-      gtk_list_store_append (store, &iter);
-      gtk_list_store_set (store, &iter, 0, strings[i], -1);
-    }
+  /* Append one word */
+  gtk_list_store_append (store, &iter);
+  gtk_list_store_set (store, &iter, 0, "GNOME", -1);
+
+  /* Append another word */
+  gtk_list_store_append (store, &iter);
+  gtk_list_store_set (store, &iter, 0, "total", -1);
+
+  /* And another word */
+  gtk_list_store_append (store, &iter);
+  gtk_list_store_set (store, &iter, 0, "totally", -1);
 
   return GTK_TREE_MODEL (store);
 }
@@ -74,7 +48,7 @@ do_entry_completion (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), "Completion");
+      gtk_window_set_title (GTK_WINDOW (window), "Entry Completion");
       gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
       g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
 
@@ -86,7 +60,7 @@ do_entry_completion (GtkWidget *do_widget)
       gtk_window_set_child (GTK_WINDOW (window), vbox);
 
       label = gtk_label_new (NULL);
-      gtk_label_set_markup (GTK_LABEL (label), "Try writing <b>total</b> or <b>gnome</b> for example.");
+      gtk_label_set_markup (GTK_LABEL (label), "Completion demo, try writing <b>total</b> or <b>gnome</b> for example.");
       gtk_box_append (GTK_BOX (vbox), label);
 
       /* Create our entry */
@@ -107,9 +81,6 @@ do_entry_completion (GtkWidget *do_widget)
 
       /* Use model column 0 as the text column */
       gtk_entry_completion_set_text_column (completion, 0);
-
-      gtk_entry_completion_set_inline_completion (completion, TRUE);
-      gtk_entry_completion_set_inline_selection (completion, TRUE);
     }
 
   if (!gtk_widget_get_visible (window))

demos/gtk-demo/entry_undo.c

@@ -1,8 +1,8 @@
-/* Entry/Undo and Redo
+/* Entry/Entry Undo
  *
  * GtkEntry can provide basic Undo/Redo support using standard keyboard
- * accelerators such as Control+z to undo and Control+Shift+z to redo.
- * Additionally, Control+y can be used to redo.
+ * accelerators such as Primary+z to undo and Primary+Shift+z to redo.
+ * Additionally, Primary+y can be used to redo.
  *
  * Use gtk_entry_set_enable_undo() to enable undo/redo support.
  */
@@ -23,7 +23,7 @@ do_entry_undo (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), "Undo and Redo");
+      gtk_window_set_title (GTK_WINDOW (window), "Entry Undo");
       gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
       g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
 

demos/gtk-demo/expander.c

@@ -57,7 +57,7 @@ do_expander (GtkWidget *do_widget)
 
       expander = gtk_expander_new ("Details:");
       gtk_widget_set_vexpand (expander, TRUE);
-      sw = gtk_scrolled_window_new ();
+      sw = gtk_scrolled_window_new (NULL, NULL);
       gtk_scrolled_window_set_min_content_height (GTK_SCROLLED_WINDOW (sw), 100);
       gtk_scrolled_window_set_has_frame (GTK_SCROLLED_WINDOW (sw), TRUE);
       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),

demos/gtk-demo/fishbowl.ui

@@ -6,6 +6,7 @@
     <property name="default-height">400</property>
     <child type="titlebar">
       <object class="GtkHeaderBar" id="">
+        <property name="show-title-buttons">1</property>
         <child>
           <object class="GtkBox">
             <style>

demos/gtk-demo/fixed.c

@@ -130,7 +130,7 @@ create_demo_window (GtkWidget *do_widget)
   gtk_window_set_default_size (GTK_WINDOW (window), 600, 400);
   g_signal_connect (window, "destroy", G_CALLBACK (close_window), NULL);
 
-  sw = gtk_scrolled_window_new ();
+  sw = gtk_scrolled_window_new (NULL, NULL);
   gtk_window_set_child (GTK_WINDOW (window), sw);
 
   fixed = gtk_fixed_new ();

demos/gtk-demo/flowbox.c

@@ -727,7 +727,7 @@ do_flowbox (GtkWidget *do_widget)
       gtk_window_set_default_size (GTK_WINDOW (window), 400, 600);
       g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
 
-      scrolled = gtk_scrolled_window_new ();
+      scrolled = gtk_scrolled_window_new (NULL, NULL);
       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
       flowbox = gtk_flow_box_new ();
       gtk_widget_set_valign (flowbox, GTK_ALIGN_START);

demos/gtk-demo/font-features.ui

@@ -7,6 +7,7 @@
     <property name="title">Font Explorer</property>
     <child type="titlebar">
       <object class="GtkHeaderBar">
+        <property name="show-title-buttons">1</property>
         <child>
           <object class="GtkButton" id="reset">
             <property name="receives-default">1</property>

demos/gtk-demo/gtkfishbowl.c

@@ -108,6 +108,10 @@ gtk_fishbowl_measure (GtkWidget      *widget,
     {
       child = value;
 
+      if (!gtk_widget_get_visible (child->widget))
+        continue;
+
+
       if (orientation == GTK_ORIENTATION_HORIZONTAL)
         {
           gtk_widget_measure (child->widget, orientation, -1, &child_min, &child_nat, NULL, NULL);
@@ -144,6 +148,9 @@ gtk_fishbowl_size_allocate (GtkWidget *widget,
     {
       child = value;
 
+      if (!gtk_widget_get_visible (child->widget))
+        continue;
+
       gtk_widget_get_preferred_size (child->widget, &child_requisition, NULL);
       child_allocation.x = round (child->x * (width - child_requisition.width));
       child_allocation.y = round (child->y * (height - child_requisition.height));
@@ -190,11 +197,17 @@ gtk_fishbowl_remove (GtkFishbowl *fishbowl,
                      GtkWidget   *widget)
 {
   GtkFishbowlPrivate *priv = gtk_fishbowl_get_instance_private (fishbowl);
+  GtkWidget *widget_bowl = GTK_WIDGET (fishbowl);
 
   if (g_hash_table_remove (priv->children, widget))
     {
+      gboolean was_visible = gtk_widget_get_visible (widget);
+
       gtk_widget_unparent (widget);
 
+      if (was_visible && gtk_widget_get_visible (widget_bowl))
+        gtk_widget_queue_resize (widget_bowl);
+
       priv->count--;
       g_object_notify_by_pspec (G_OBJECT (fishbowl), props[PROP_COUNT]);
     }

demos/gtk-demo/headerbar.c

@@ -30,6 +30,7 @@ do_headerbar (GtkWidget *do_widget)
       gtk_window_set_default_size (GTK_WINDOW (window), 600, 400);
 
       header = gtk_header_bar_new ();
+      gtk_header_bar_set_show_title_buttons (GTK_HEADER_BAR (header), TRUE);
 
       button = gtk_button_new ();
       icon = g_themed_icon_new ("mail-send-receive-symbolic");

demos/gtk-demo/hypertext.c

@@ -260,7 +260,7 @@ do_hypertext (GtkWidget *do_widget)
       buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
       gtk_text_buffer_set_enable_undo (buffer, TRUE);
 
-      sw = gtk_scrolled_window_new ();
+      sw = gtk_scrolled_window_new (NULL, NULL);
       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                       GTK_POLICY_AUTOMATIC,
                                       GTK_POLICY_AUTOMATIC);

demos/gtk-demo/iconscroll.ui

@@ -6,6 +6,7 @@
     <property name="default-height">500</property>
     <child type="titlebar">
       <object class="GtkHeaderBar">
+        <property name="show-title-buttons">1</property>
         <child>
           <object class="GtkBox">
             <style>

demos/gtk-demo/iconview.c

@@ -276,7 +276,7 @@ do_iconview (GtkWidget *do_widget)
       gtk_box_append (GTK_BOX (tool_bar), home_button);
 
 
-      sw = gtk_scrolled_window_new ();
+      sw = gtk_scrolled_window_new (NULL, NULL);
       gtk_scrolled_window_set_has_frame (GTK_SCROLLED_WINDOW (sw), TRUE);
       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                       GTK_POLICY_AUTOMATIC,

demos/gtk-demo/list_store.c

@@ -269,7 +269,7 @@ do_list_store (GtkWidget *do_widget)
       label = gtk_label_new ("This is the bug list (note: not based on real data, it would be nice to have a nice ODBC interface to bugzilla or so, though).");
       gtk_box_append (GTK_BOX (vbox), label);
 
-      sw = gtk_scrolled_window_new ();
+      sw = gtk_scrolled_window_new (NULL, NULL);
       gtk_scrolled_window_set_has_frame (GTK_SCROLLED_WINDOW (sw), TRUE);
       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                       GTK_POLICY_NEVER,

demos/gtk-demo/listbox.c

@@ -358,7 +358,7 @@ do_listbox (GtkWidget *do_widget)
       gtk_window_set_child (GTK_WINDOW (window), vbox);
       label = gtk_label_new ("Messages from GTK and friends");
       gtk_box_append (GTK_BOX (vbox), label);
-      scrolled = gtk_scrolled_window_new ();
+      scrolled = gtk_scrolled_window_new (NULL, NULL);
       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
       gtk_widget_set_vexpand (scrolled, TRUE);
       gtk_box_append (GTK_BOX (vbox), scrolled);

demos/gtk-demo/listview_applauncher.c

@@ -188,7 +188,7 @@ do_listview_applauncher (GtkWidget *do_widget)
        * because otherwise they might get too large or they might not
        * be scrollable.
        */
-      sw = gtk_scrolled_window_new ();
+      sw = gtk_scrolled_window_new (NULL, NULL);
       gtk_window_set_child (GTK_WINDOW (window), sw);
       gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), list);
     }

demos/gtk-demo/listview_clocks.c

@@ -249,7 +249,7 @@ gtk_clock_tick (gpointer unused)
     {
       GtkClock *clock = l->data;
 
-      /* We will now return a different value for the time property,
+      /* We will now return a different value for the time porperty,
        * so notify about that.
        */
       g_object_notify_by_pspec (G_OBJECT (clock), properties[PROP_TIME]);
@@ -323,16 +323,16 @@ gtk_clock_init (GtkClock *self)
 
 static GtkClock *
 gtk_clock_new (const char *location,
-               GTimeZone  *_tz)
+               GTimeZone  *_timezone)
 {
   GtkClock *result;
 
   result = g_object_new (GTK_TYPE_CLOCK,
                          "location", location,
-                         "timezone", _tz,
+                         "timezone", _timezone,
                          NULL);
 
-  g_clear_pointer (&_tz, g_time_zone_unref);
+  g_clear_pointer (&_timezone, g_time_zone_unref);
 
   return result;
 }
@@ -474,7 +474,7 @@ do_listview_clocks (GtkWidget *do_widget)
       g_object_add_weak_pointer (G_OBJECT (window), (gpointer *) &window);
 
       /* List widgets go into a scrolled window. Always. */
-      sw = gtk_scrolled_window_new ();
+      sw = gtk_scrolled_window_new (NULL, NULL);
       gtk_window_set_child (GTK_WINDOW (window), sw);
 
       /* Create the factory that creates the listitems. Because we

demos/gtk-demo/listview_colors.c

@@ -1,17 +1,12 @@
 /* Lists/Colors
  *
- * This demo displays a grid of colors.
+ * This demo displays a list of named colors.
  *
  * It is using a GtkGridView, and shows how to display
  * and sort the data in various ways. The controls for
  * this are implemented using GtkDropDown.
  *
- * The dataset used here has up to 16 777 216 items.
- *
- * Note that this demo also functions as a performance
- * test for some of the list model machinery, and the
- * biggest sizes here can lock up the application for
- * extended times when used with sorting.
+ * The dataset used here has 9 283 items.
  */
 
 #include <gtk/gtk.h>
@@ -28,8 +23,9 @@ struct _GtkColor
   GObject parent_instance;
 
   char *name;
-  GdkRGBA color;
+  GdkRGBA *color;
   int h, s, v;
+  gboolean selected;
 };
 
 enum {
@@ -42,8 +38,9 @@ enum {
   PROP_HUE,
   PROP_SATURATION,
   PROP_VALUE,
+  PROP_SELECTED,
 
-  N_COLOR_PROPS
+  N_PROPS
 };
 
 static void
@@ -54,7 +51,7 @@ gtk_color_snapshot (GdkPaintable *paintable,
 {
   GtkColor *self = GTK_COLOR (paintable);
 
-  gtk_snapshot_append_color (snapshot, &self->color, &GRAPHENE_RECT_INIT (0, 0, width, height));
+  gtk_snapshot_append_color (snapshot, self->color, &GRAPHENE_RECT_INIT (0, 0, width, height));
 }
 
 static int
@@ -85,82 +82,7 @@ G_DEFINE_TYPE_WITH_CODE (GtkColor, gtk_color, G_TYPE_OBJECT,
                          G_IMPLEMENT_INTERFACE (GDK_TYPE_PAINTABLE,
                                                 gtk_color_paintable_init))
 
-static GParamSpec *color_properties[N_COLOR_PROPS] = { NULL, };
-
-static void
-rgb_to_hsv (GdkRGBA *rgba,
-            gdouble *h_out,
-            gdouble *s_out,
-            gdouble *v_out)
-{
-  gdouble red, green, blue;
-  gdouble h, s, v;
-  gdouble min, max;
-  gdouble delta;
-
-  red = rgba->red;
-  green = rgba->green;
-  blue = rgba->blue;
-
-  h = 0.0;
-
-  if (red > green)
-    {
-      if (red > blue)
-        max = red;
-      else
-        max = blue;
-
-      if (green < blue)
-        min = green;
-      else
-        min = blue;
-    }
-  else
-    {
-      if (green > blue)
-        max = green;
-      else
-        max = blue;
-
-      if (red < blue)
-        min = red;
-      else
-        min = blue;
-    }
-
-  v = max;
-
-  if (max != 0.0)
-    s = (max - min) / max;
-  else
-    s = 0.0;
-
-  if (s == 0.0)
-    h = 0.0;
-  else
-    {
-      delta = max - min;
-
-      if (red == max)
-        h = (green - blue) / delta;
-      else if (green == max)
-        h = 2 + (blue - red) / delta;
-      else if (blue == max)
-        h = 4 + (red - green) / delta;
-
-      h /= 6.0;
-
-      if (h < 0.0)
-        h += 1.0;
-      else if (h > 1.0)
-        h -= 1.0;
-    }
-
-  *h_out = h;
-  *s_out = s;
-  *v_out = v;
-}
+static GParamSpec *properties[N_PROPS] = { NULL, };
 
 static void
 gtk_color_get_property (GObject    *object,
@@ -177,19 +99,19 @@ gtk_color_get_property (GObject    *object,
       break;
 
     case PROP_COLOR:
-      g_value_set_boxed (value, &self->color);
+      g_value_set_boxed (value, self->color);
       break;
 
     case PROP_RED:
-      g_value_set_float (value, self->color.red);
+      g_value_set_float (value, self->color->red);
       break;
 
     case PROP_GREEN:
-      g_value_set_float (value, self->color.green);
+      g_value_set_float (value, self->color->green);
       break;
 
     case PROP_BLUE:
-      g_value_set_float (value, self->color.blue);
+      g_value_set_float (value, self->color->blue);
       break;
 
     case PROP_HUE:
@@ -204,6 +126,10 @@ gtk_color_get_property (GObject    *object,
       g_value_set_int (value, self->v);
       break;
 
+    case PROP_SELECTED:
+      g_value_set_boolean (value, self->selected);
+      break;
+
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
       break;
@@ -217,7 +143,6 @@ gtk_color_set_property (GObject      *object,
                         GParamSpec   *pspec)
 {
   GtkColor *self = GTK_COLOR (object);
-  double h, s, v;
 
   switch (property_id)
     {
@@ -226,11 +151,23 @@ gtk_color_set_property (GObject      *object,
       break;
 
     case PROP_COLOR:
-      self->color = *(GdkRGBA *) g_value_dup_boxed (value);
-      rgb_to_hsv (&self->color, &h, &s, &v);
-      self->h = round (360 * h);
-      self->s = round (100 * s);
-      self->v = round (100 * v);
+      self->color = g_value_dup_boxed (value);
+      break;
+
+    case PROP_HUE:
+      self->h = g_value_get_int (value);
+      break;
+
+    case PROP_SATURATION:
+      self->s = g_value_get_int (value);
+      break;
+
+    case PROP_VALUE:
+      self->v = g_value_get_int (value);
+      break;
+
+    case PROP_SELECTED:
+      self->selected = g_value_get_boolean (value);
       break;
 
     default:
@@ -245,6 +182,7 @@ gtk_color_finalize (GObject *object)
   GtkColor *self = GTK_COLOR (object);
 
   g_free (self->name);
+  g_clear_pointer (&self->color, gdk_rgba_free);
 
   G_OBJECT_CLASS (gtk_color_parent_class)->finalize (object);
 }
@@ -258,24 +196,26 @@ gtk_color_class_init (GtkColorClass *klass)
   gobject_class->set_property = gtk_color_set_property;
   gobject_class->finalize = gtk_color_finalize;
 
-  color_properties[PROP_NAME] =
+  properties[PROP_NAME] =
     g_param_spec_string ("name", NULL, NULL, NULL, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
-  color_properties[PROP_COLOR] =
+  properties[PROP_COLOR] =
     g_param_spec_boxed ("color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
-  color_properties[PROP_RED] =
+  properties[PROP_RED] =
     g_param_spec_float ("red", NULL, NULL, 0, 1, 0, G_PARAM_READABLE);
-  color_properties[PROP_GREEN] =
+  properties[PROP_GREEN] =
     g_param_spec_float ("green", NULL, NULL, 0, 1, 0, G_PARAM_READABLE);
-  color_properties[PROP_BLUE] =
+  properties[PROP_BLUE] =
     g_param_spec_float ("blue", NULL, NULL, 0, 1, 0, G_PARAM_READABLE);
-  color_properties[PROP_HUE] =
-    g_param_spec_int ("hue", NULL, NULL, 0, 360, 0, G_PARAM_READABLE);
-  color_properties[PROP_SATURATION] =
-    g_param_spec_int ("saturation", NULL, NULL, 0, 100, 0, G_PARAM_READABLE);
-  color_properties[PROP_VALUE] =
-    g_param_spec_int ("value", NULL, NULL, 0, 100, 0, G_PARAM_READABLE);
+  properties[PROP_HUE] =
+    g_param_spec_int ("hue", NULL, NULL, 0, 360, 0, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
+  properties[PROP_SATURATION] =
+    g_param_spec_int ("saturation", NULL, NULL, 0, 100, 0, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
+  properties[PROP_VALUE] =
+    g_param_spec_int ("value", NULL, NULL, 0, 100, 0, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
+  properties[PROP_SELECTED] =
+    g_param_spec_boolean ("selected", NULL, NULL, FALSE, G_PARAM_READWRITE);
 
-  g_object_class_install_properties (gobject_class, N_COLOR_PROPS, color_properties);
+  g_object_class_install_properties (gobject_class, N_PROPS, properties);
 }
 
 static void
@@ -285,7 +225,8 @@ gtk_color_init (GtkColor *self)
 
 static GtkColor *
 gtk_color_new (const char *name,
-               float r, float g, float b)
+               float r, float g, float b,
+               int h, int s, int v)
 {
   GtkColor *result;
   GdkRGBA color = { r, g, b, 1.0 };
@@ -293,206 +234,24 @@ gtk_color_new (const char *name,
   result = g_object_new (GTK_TYPE_COLOR,
                          "name", name,
                          "color", &color,
+                         "hue", h,
+                         "saturation", s,
+                         "value", v,
                          NULL);
 
   return result;
 }
 
-#define N_COLORS (256 * 256 * 256)
-
-#define GTK_TYPE_COLOR_LIST (gtk_color_list_get_type ())
-G_DECLARE_FINAL_TYPE (GtkColorList, gtk_color_list, GTK, COLOR_LIST, GObject)
-
-enum {
-  LIST_PROP_0,
-  LIST_PROP_SIZE,
-
-  N_LIST_PROPS
-};
-
-typedef struct _GtkColorList GtkColorList;
-struct _GtkColorList
-{
-  GObject parent_instance;
-
-  GtkColor **colors; /* Always N_COLORS */
-
-  guint size; /* How many colors we allow */
-};
-
-static GType
-gtk_color_list_get_item_type (GListModel *list)
-{
-  return GTK_TYPE_COLOR;
-}
-
-static guint
-gtk_color_list_get_n_items (GListModel *list)
-{
-  GtkColorList *self = GTK_COLOR_LIST (list);
-
-  return self->size;
-}
-
-static guint
-position_to_color (guint position)
-{
-  static guint map[] = {
-    0xFF0000, 0x00FF00, 0x0000FF,
-    0x7F0000, 0x007F00, 0x00007F,
-    0x3F0000, 0x003F00, 0x00003F,
-    0x1F0000, 0x001F00, 0x00001F,
-    0x0F0000, 0x000F00, 0x00000F,
-    0x070000, 0x000700, 0x000007,
-    0x030000, 0x000300, 0x000003,
-    0x010000, 0x000100, 0x000001
-  };
-  guint result, i;
-
-  result = 0;
-
-  for (i = 0; i < G_N_ELEMENTS (map); i++)
-    {
-      if (position & (1 << i))
-        result ^= map[i];
-    }
-
-  return result;
-}
-
-static gpointer
-gtk_color_list_get_item (GListModel *list,
-                         guint       position)
-{
-  GtkColorList *self = GTK_COLOR_LIST (list);
-
-  if (position >= self->size)
-    return NULL;
-
-  position = position_to_color (position);
-
-  if (self->colors[position] == NULL)
-    {
-      guint red, green, blue;
-
-      red = (position >> 16) & 0xFF;
-      green = (position >> 8) & 0xFF;
-      blue = position & 0xFF;
-
-      self->colors[position] = gtk_color_new ("", red / 255., green / 255., blue / 255.);
-    }
-
-  return g_object_ref (self->colors[position]);
-}
-
-static void
-gtk_color_list_model_init (GListModelInterface *iface)
-{
-  iface->get_item_type = gtk_color_list_get_item_type;
-  iface->get_n_items = gtk_color_list_get_n_items;
-  iface->get_item = gtk_color_list_get_item;
-}
-
-G_DEFINE_TYPE_WITH_CODE (GtkColorList, gtk_color_list, G_TYPE_OBJECT,
-                         G_IMPLEMENT_INTERFACE (G_TYPE_LIST_MODEL,
-                                                gtk_color_list_model_init))
-
-static GParamSpec *list_properties[N_LIST_PROPS] = { NULL, };
-
-static void
-gtk_color_list_get_property (GObject    *object,
-                             guint       property_id,
-                             GValue     *value,
-                             GParamSpec *pspec)
-{
-  GtkColorList *self = GTK_COLOR_LIST (object);
-
-  switch (property_id)
-    {
-    case LIST_PROP_SIZE:
-      g_value_set_uint (value, self->size);
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-      break;
-    }
-}
-
-static void
-gtk_color_list_set_size (GtkColorList *self,
-                         guint         size)
-{
-  guint old_size = self->size;
-
-  self->size = size;
-  if (self->size > old_size)
-    g_list_model_items_changed (G_LIST_MODEL (self), old_size, 0, self->size - old_size);
-  else if (old_size > self->size)
-    g_list_model_items_changed (G_LIST_MODEL (self), self->size, old_size - self->size, 0);
-
-  g_object_notify_by_pspec (G_OBJECT (self), list_properties[LIST_PROP_SIZE]);
-}
-
-static void
-gtk_color_list_set_property (GObject      *object,
-                             guint         property_id,
-                             const GValue *value,
-                             GParamSpec   *pspec)
-{
-  GtkColorList *self = GTK_COLOR_LIST (object);
-
-  switch (property_id)
-    {
-    case LIST_PROP_SIZE:
-      gtk_color_list_set_size (self, g_value_get_uint (value));
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-      break;
-    }
-}
-
-static void
-gtk_color_list_dispose (GObject *object)
-{
-  GtkColorList *self = GTK_COLOR_LIST (object);
-  guint i;
-
-  for (i = 0; i < N_COLORS; i++)
-    {
-      g_clear_object (&self->colors[i]);
-    }
-  g_free (self->colors);
-
-  G_OBJECT_CLASS (gtk_color_parent_class)->finalize (object);
-}
-
-static void
-gtk_color_list_class_init (GtkColorListClass *klass)
-{
-  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-
-  gobject_class->get_property = gtk_color_list_get_property;
-  gobject_class->set_property = gtk_color_list_set_property;
-  gobject_class->dispose = gtk_color_list_dispose;
-
-  list_properties[LIST_PROP_SIZE] =
-    g_param_spec_uint ("size", NULL, NULL, 0, N_COLORS, 0, G_PARAM_READWRITE);
-
-  g_object_class_install_properties (gobject_class, N_LIST_PROPS, list_properties);
-}
-
-static void
-gtk_color_list_init (GtkColorList *self)
+static GListModel *
+create_colors_model (void)
 {
+  GListStore *result;
+  GtkColor *color;
   GBytes *data;
   char **lines;
   guint i;
 
-  self->colors = g_new0 (GtkColor *, N_COLORS);
-
+  result = g_list_store_new (GTK_TYPE_COLOR);
   data = g_resources_lookup_data ("/listview_colors/color.names.txt", 0, NULL);
   lines = g_strsplit (g_bytes_get_data (data, NULL), "\n", 0);
 
@@ -501,7 +260,7 @@ gtk_color_list_init (GtkColorList *self)
       const char *name;
       char **fields;
       int red, green, blue;
-      guint pos;
+      int h, s, v;
 
       if (lines[i][0] == '#' || lines[i][0] == '\0')
         continue;
@@ -511,24 +270,21 @@ gtk_color_list_init (GtkColorList *self)
       red = atoi (fields[3]);
       green = atoi (fields[4]);
       blue = atoi (fields[5]);
+      h = atoi (fields[9]);
+      s = atoi (fields[10]);
+      v = atoi (fields[11]);
 
-      pos = ((red & 0xFF) << 16) | ((green & 0xFF) << 8) | blue;
-      if (self->colors[pos] == NULL)
-        self->colors[pos] = gtk_color_new (name, red / 255., green / 255., blue / 255.);
+      color = gtk_color_new (name, red / 255., green / 255., blue / 255., h, s, v);
+      g_list_store_append (result, color);
+      g_object_unref (color);
 
       g_strfreev (fields);
     }
   g_strfreev (lines);
 
   g_bytes_unref (data);
-}
 
-static GListModel *
-gtk_color_list_new (guint size)
-{
-  return g_object_new (GTK_TYPE_COLOR_LIST,
-                       "size", size,
-                       NULL);
+  return G_LIST_MODEL (result);
 }
 
 static char *
@@ -539,9 +295,9 @@ get_rgb_markup (gpointer this,
     return NULL;
 
   return g_strdup_printf ("<b>R:</b> %d <b>G:</b> %d <b>B:</b> %d",
-                          (int)(color->color.red * 255), 
-                          (int)(color->color.green * 255),
-                          (int)(color->color.blue * 255));
+                          (int)(color->color->red * 255), 
+                          (int)(color->color->green * 255),
+                          (int)(color->color->blue * 255));
 }
 
 static char *
@@ -627,23 +383,6 @@ setup_listitem_cb (GtkListItemFactory *factory,
   gtk_expression_unref (color_expression);
 }
 
-static void
-setup_selection_listitem_cb (GtkListItemFactory *factory,
-                             GtkListItem        *list_item)
-{
-  GtkWidget *picture;
-  GtkExpression *color_expression, *expression;
-
-  expression = gtk_constant_expression_new (GTK_TYPE_LIST_ITEM, list_item);
-  color_expression = gtk_property_expression_new (GTK_TYPE_LIST_ITEM, expression, "item");
-
-  picture = gtk_picture_new ();
-  gtk_widget_set_size_request (picture, 8, 8);
-  gtk_expression_bind (color_expression, picture, "paintable", NULL);
-
-  gtk_list_item_set_child (list_item, picture);
-}
-
 static void
 set_title (gpointer    item,
            const char *title)
@@ -657,6 +396,29 @@ get_title (gpointer item)
   return g_strdup ((char *)g_object_get_data (G_OBJECT (item), "title"));
 }
 
+static gboolean
+set_item (GBinding *binding,
+          const GValue *from,
+          GValue *to,
+          gpointer data)
+{
+  GObject *source = g_binding_get_source (binding);
+  GListModel *model;
+  guint selected;
+  gpointer item;
+
+  selected = g_value_get_uint (from);
+
+  model = gtk_drop_down_get_model (GTK_DROP_DOWN (source));
+  item = g_list_model_get_item (model, selected);
+
+  g_value_set_object (to, item);
+
+  g_clear_object (&item);
+
+  return TRUE;
+}
+
 GtkWidget *
 create_color_grid (void)
 {
@@ -676,9 +438,8 @@ create_color_grid (void)
   gtk_grid_view_set_max_columns (GTK_GRID_VIEW (gridview), 24);
   gtk_grid_view_set_enable_rubberband (GTK_GRID_VIEW (gridview), TRUE);
 
-  model = G_LIST_MODEL (gtk_sort_list_model_new (gtk_color_list_new (0), NULL));
-
-  selection = G_LIST_MODEL (gtk_multi_selection_new (model));
+  model = G_LIST_MODEL (gtk_sort_list_model_new (create_colors_model (), NULL));
+  selection = G_LIST_MODEL (gtk_property_selection_new (model, "selected"));
   gtk_grid_view_set_model (GTK_GRID_VIEW (gridview), selection);
   g_object_unref (selection);
   g_object_unref (model);
@@ -686,155 +447,6 @@ create_color_grid (void)
   return gridview;
 }
 
-static gboolean
-add_colors (GtkWidget     *widget,
-            GdkFrameClock *clock,
-            gpointer       data)
-{
-  GtkColorList *colors = data;
-  guint limit;
-
-  limit = GPOINTER_TO_UINT (g_object_get_data (data, "limit"));
-  gtk_color_list_set_size (colors, MIN (limit, colors->size + MAX (1, limit / 4096)));
-  
-  if (colors->size >= limit)
-    return G_SOURCE_REMOVE;
-  else
-    return G_SOURCE_CONTINUE;
-}
-
-static void
-refill (GtkWidget    *button,
-        GtkColorList *colors)
-{
-  gtk_color_list_set_size (colors, 0);
-  gtk_widget_add_tick_callback (button, add_colors, g_object_ref (colors), g_object_unref);
-}
- 
-static void
-limit_changed_cb (GtkDropDown  *dropdown,
-                  GParamSpec   *pspec,
-                  GtkColorList *colors)
-{
-  guint new_limit, old_limit;
-
-  old_limit = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (colors), "limit"));
-  new_limit = 1 << (3 * (gtk_drop_down_get_selected (dropdown) + 1));
-
-  g_object_set_data (G_OBJECT (colors), "limit", GUINT_TO_POINTER (new_limit));
-
-  if (old_limit == colors->size)
-    gtk_color_list_set_size (colors, new_limit);
-}
-
-static void
-limit_changed_cb2 (GtkDropDown  *dropdown,
-                   GParamSpec   *pspec,
-                   GtkLabel     *label)
-{
-  char *string;
-  int len;
-  guint limit;
-
-  limit = 1 << (3 * (gtk_drop_down_get_selected (dropdown) + 1));
-
-  string = g_strdup_printf ("%'u", limit);
-  len = g_utf8_strlen (string, -1);
-  g_free (string);
-
-  gtk_label_set_width_chars (label, len + 2); /* for " /" */
-}
-
-static void
-items_changed_cb (GListModel *model,
-                  guint       position,
-                  guint       removed,
-                  guint       added,
-                  GtkWidget  *label)
-{
-  guint n = g_list_model_get_n_items (model);
-  char *text;
-
-  text = g_strdup_printf ("%'u /", n);
-  gtk_label_set_label (GTK_LABEL (label), text);
-  g_free (text);
-}
-
-static void
-setup_number_item (GtkSignalListItemFactory *factory,
-                   GtkListItem              *item)
-{
-  GtkWidget *label;
-  PangoAttrList *attrs;
-
-  label = gtk_label_new ("");
-  gtk_label_set_xalign (GTK_LABEL (label), 1);
-
-  attrs = pango_attr_list_new ();
-  pango_attr_list_insert (attrs, pango_attr_font_features_new ("tnum"));
-  gtk_label_set_attributes (GTK_LABEL (label), attrs);
-  pango_attr_list_unref (attrs);
-
-  gtk_list_item_set_child (item, label);
-}
-
-static void
-bind_number_item (GtkSignalListItemFactory *factory,
-                  GtkListItem              *item)
-{
-  GtkWidget *label;
-  guint limit;
-  char *string;
-
-  label = gtk_list_item_get_child (item);
-
-  limit = 1 << (3 * (gtk_list_item_get_position (item) + 1));
-  string = g_strdup_printf ("%'u", limit);
-  gtk_label_set_label (GTK_LABEL (label), string);
-  g_free (string);
-}
-
-static void
-update_selection_count (GListModel *model,
-                        guint       position,
-                        guint       removed,
-                        guint       added,
-                        gpointer    data)
-{
-  char *text;
-  text = g_strdup_printf ("%u", g_list_model_get_n_items (model));
-  gtk_label_set_label (GTK_LABEL (data), text);
-  g_free (text);
-}
-
-static void
-update_selection_average (GListModel *model,
-                          guint       position,
-                          guint       removed,
-                          guint       added,
-                          gpointer    data)
-{
-  guint n = g_list_model_get_n_items (model);
-  GdkRGBA c = { 0, 0, 0, 1 };
-  guint i;
-  GtkColor *color;
-
-  for (i = 0; i < n; i++)
-    {
-      color = g_list_model_get_item (model, i);
-
-      c.red += color->color.red;
-      c.green += color->color.green;
-      c.blue += color->color.blue;
-
-      g_object_unref (color);
-    }
-
-  color = gtk_color_new ("", c.red / n, c.green / n, c.blue / n);
-  gtk_picture_set_paintable (GTK_PICTURE (data), GDK_PAINTABLE (color));
-  g_object_unref (color);
-}
-
 static GtkWidget *window = NULL;
 
 GtkWidget *
@@ -846,35 +458,16 @@ do_listview_colors (GtkWidget *do_widget)
       GtkListItemFactory *factory;
       GListStore *factories;
       GListModel *model;
+
       GtkSorter *sorter;
       GtkSorter *multi_sorter;
       GListStore *sorters;
       GtkExpression *expression;
-      GtkWidget *button;
-      GtkWidget *label;
-      PangoAttrList *attrs;
-      char *string;
-      guint len;
-      GtkWidget *selection_view;
-      GListModel *selection_filter;
-      GListModel *no_selection;
-      GtkWidget *grid;
-      GtkWidget *selection_size_label;
-      GtkWidget *selection_average_picture;
-      GtkWidget *selection_info_toggle;
-      GtkWidget *selection_info_revealer;
-      GtkCssProvider *provider;
-
-      provider = gtk_css_provider_new ();
-      gtk_css_provider_load_from_resource (provider, "/listview_colors/listview_colors.css");
-      gtk_style_context_add_provider_for_display (gdk_display_get_default (),
-                                                  GTK_STYLE_PROVIDER (provider),
-                                                  800);
-      g_object_unref (provider);
 
       window = gtk_window_new ();
       gtk_window_set_title (GTK_WINDOW (window), "Colors");
       header = gtk_header_bar_new ();
+      gtk_header_bar_set_show_title_buttons (GTK_HEADER_BAR (header), TRUE);
       gtk_window_set_titlebar (GTK_WINDOW (window), header);
 
       gtk_window_set_default_size (GTK_WINDOW (window), 600, 400);
@@ -882,134 +475,16 @@ do_listview_colors (GtkWidget *do_widget)
                               gtk_widget_get_display (do_widget));
       g_object_add_weak_pointer (G_OBJECT (window), (gpointer*)&window);
 
-      box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-      gtk_window_set_child (GTK_WINDOW (window), box);
-
-      selection_info_revealer = gtk_revealer_new ();
-      gtk_box_append (GTK_BOX (box), selection_info_revealer);
-
-      grid = gtk_grid_new ();
-      gtk_revealer_set_child (GTK_REVEALER (selection_info_revealer), grid);
-      gtk_widget_set_margin_start (grid, 10);
-      gtk_widget_set_margin_end (grid, 10);
-      gtk_widget_set_margin_top (grid, 10);
-      gtk_widget_set_margin_bottom (grid, 10);
-      gtk_grid_set_row_spacing (GTK_GRID (grid), 10);
-      gtk_grid_set_column_spacing (GTK_GRID (grid), 10);
-
-      label = gtk_label_new ("Selection");
-      gtk_widget_set_hexpand (label, TRUE);
-      gtk_widget_add_css_class (label, "title-3");
-      gtk_grid_attach (GTK_GRID (grid), label, 0, 0, 5, 1);
-
-      gtk_grid_attach (GTK_GRID (grid), gtk_label_new ("Size:"), 0, 2, 1, 1);
-
-      selection_size_label = gtk_label_new ("0");
-      gtk_grid_attach (GTK_GRID (grid), selection_size_label, 1, 2, 1, 1);
-
-      gtk_grid_attach (GTK_GRID (grid), gtk_label_new ("Average:"), 2, 2, 1, 1);
-
-      selection_average_picture = gtk_picture_new ();
-      gtk_widget_set_size_request (selection_average_picture, 32, 32);
-      gtk_grid_attach (GTK_GRID (grid), selection_average_picture, 3, 2, 1, 1);
-
-      label = gtk_label_new ("");
-      gtk_widget_set_hexpand (label, TRUE);
-      gtk_grid_attach (GTK_GRID (grid), label, 4, 2, 1, 1);
-
-      sw = gtk_scrolled_window_new ();
-      gtk_widget_set_hexpand (sw, TRUE);
-
-      gtk_grid_attach (GTK_GRID (grid), sw, 0, 1, 5, 1);
-      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
-                                      GTK_POLICY_NEVER,
-                                      GTK_POLICY_AUTOMATIC);
-
-      factory = gtk_signal_list_item_factory_new ();
-      g_signal_connect (factory, "setup", G_CALLBACK (setup_selection_listitem_cb), NULL);
-      selection_view = gtk_grid_view_new_with_factory (factory);
-      gtk_widget_add_css_class (selection_view, "compact");
-      gtk_grid_view_set_max_columns (GTK_GRID_VIEW (selection_view), 200);
-      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), selection_view);
-
-      sw = gtk_scrolled_window_new ();
-      gtk_box_append (GTK_BOX (box), sw);
+      sw = gtk_scrolled_window_new (NULL, NULL);
+      gtk_window_set_child (GTK_WINDOW (window), sw);
 
       gridview = create_color_grid ();
       gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), gridview);
-      gtk_widget_set_hexpand (sw, TRUE);
-      gtk_widget_set_vexpand (sw, TRUE);
       model = gtk_grid_view_get_model (GTK_GRID_VIEW (gridview));
-
-      selection_filter = G_LIST_MODEL (gtk_selection_filter_model_new (GTK_SELECTION_MODEL (model)));
-      g_signal_connect (selection_filter, "items-changed", G_CALLBACK (update_selection_count), selection_size_label);
-      g_signal_connect (selection_filter, "items-changed", G_CALLBACK (update_selection_average), selection_average_picture);
-
-      no_selection = G_LIST_MODEL (gtk_no_selection_new (selection_filter));
-      gtk_grid_view_set_model (GTK_GRID_VIEW (selection_view), no_selection);
-      g_object_unref (selection_filter);
-      g_object_unref (no_selection);
-
-      model = gtk_multi_selection_get_model (GTK_MULTI_SELECTION (model));
-      g_object_ref (model);
-
-      selection_info_toggle = gtk_toggle_button_new ();
-      gtk_button_set_icon_name (GTK_BUTTON (selection_info_toggle), "emblem-important-symbolic");
-      gtk_widget_set_tooltip_text (selection_info_toggle, "Show selection info");
-      gtk_header_bar_pack_start (GTK_HEADER_BAR (header), selection_info_toggle);
-
-      g_object_bind_property (selection_info_toggle, "active",
-                              selection_info_revealer, "reveal-child",
-                              G_BINDING_DEFAULT);
-
-      button = gtk_button_new_with_mnemonic ("_Refill");
-      g_signal_connect (button, "clicked",
-                        G_CALLBACK (refill),
-                        gtk_sort_list_model_get_model (GTK_SORT_LIST_MODEL (model)));
-
-      gtk_header_bar_pack_start (GTK_HEADER_BAR (header), button);
-
-      label = gtk_label_new ("0 /");
-      attrs = pango_attr_list_new ();
-      pango_attr_list_insert (attrs, pango_attr_font_features_new ("tnum"));
-      gtk_label_set_attributes (GTK_LABEL (label), attrs);
-      pango_attr_list_unref (attrs);
-      string = g_strdup_printf ("%'u", 4096);
-      len = g_utf8_strlen (string, -1);
-      g_free (string);
-      gtk_label_set_width_chars (GTK_LABEL (label), len + 2);
-      gtk_label_set_xalign (GTK_LABEL (label), 1);
-
-      g_signal_connect (gtk_grid_view_get_model (GTK_GRID_VIEW (gridview)),
-                        "items-changed", G_CALLBACK (items_changed_cb), label);
-      gtk_header_bar_pack_start (GTK_HEADER_BAR (header), label);
-
-      dropdown = gtk_drop_down_new ();
-      gtk_drop_down_set_from_strings (GTK_DROP_DOWN (dropdown), (const char *[]) { "8", "64", "512", "4096", "32768", "262144", "2097152", "16777216", NULL });
-      g_signal_connect (dropdown, "notify::selected",
-                        G_CALLBACK (limit_changed_cb), 
-                        gtk_sort_list_model_get_model (GTK_SORT_LIST_MODEL (model)));
-      g_signal_connect (dropdown, "notify::selected",
-                        G_CALLBACK (limit_changed_cb2), 
-                        label);
-      factory = gtk_signal_list_item_factory_new ();
-      g_signal_connect (factory, "setup", G_CALLBACK (setup_number_item), NULL);
-      g_signal_connect (factory, "bind", G_CALLBACK (bind_number_item), NULL);
-      gtk_drop_down_set_factory (GTK_DROP_DOWN (dropdown), factory);
-      g_object_unref (factory);
-      gtk_drop_down_set_selected (GTK_DROP_DOWN (dropdown), 3); /* 4096 */
-      gtk_header_bar_pack_start (GTK_HEADER_BAR (header), dropdown);
+      g_object_get (model, "model", &model, NULL);
 
       sorters = g_list_store_new (GTK_TYPE_SORTER);
 
-      /* An empty multisorter doesn't do any sorting and the sortmodel is
-       * smart enough to know that.
-       */
-      sorter = gtk_multi_sorter_new ();
-      set_title (sorter, "Unsorted");
-      g_list_store_append (sorters, sorter);
-      g_object_unref (sorter);
-
       sorter = gtk_string_sorter_new (gtk_property_expression_new (GTK_TYPE_COLOR, NULL, "name"));
       set_title (sorter, "Name");
       g_list_store_append (sorters, sorter);
@@ -1080,7 +555,11 @@ do_listview_colors (GtkWidget *do_widget)
       gtk_drop_down_set_model (GTK_DROP_DOWN (dropdown), G_LIST_MODEL (sorters));
       g_object_unref (sorters);
 
-      g_object_bind_property (dropdown, "selected-item", model, "sorter", G_BINDING_SYNC_CREATE);
+      g_object_bind_property_full (dropdown, "selected",
+                                   model, "sorter",
+                                   G_BINDING_SYNC_CREATE,
+                                   set_item, NULL,
+                                   NULL, NULL);
 
       factories = g_list_store_new (GTK_TYPE_LIST_ITEM_FACTORY);
 
@@ -1111,7 +590,11 @@ do_listview_colors (GtkWidget *do_widget)
       gtk_drop_down_set_model (GTK_DROP_DOWN (dropdown), G_LIST_MODEL (factories));
       g_object_unref (factories);
 
-      g_object_bind_property (dropdown, "selected-item", gridview, "factory", G_BINDING_SYNC_CREATE);
+      g_object_bind_property_full (dropdown, "selected",
+                                   gridview, "factory",
+                                   G_BINDING_SYNC_CREATE,
+                                   set_item, NULL,
+                                   NULL, NULL);
       g_object_unref (model);
     }
 

demos/gtk-demo/listview_colors.css

@@ -1,3 +0,0 @@
-.view.compact > child {
-  padding: 1px;
-}

demos/gtk-demo/listview_filebrowser.css

@@ -1,11 +1,11 @@
-listview.viewswitcher {
+list.viewswitcher {
   border: 1px solid gray;
 }
 
-listview.viewswitcher > row {
+list.viewswitcher > row {
   padding: 5px;
 }
 
-listview.viewswitcher row:selected {
+list.viewswitcher row:selected {
   background: gray;
 }

demos/gtk-demo/listview_filebrowser.ui

@@ -174,6 +174,7 @@
     <property name="default-height">400</property>
     <child type="titlebar">
       <object class="GtkHeaderBar" id="">
+        <property name="show-title-buttons">1</property>
         <child>
           <object class="GtkButton">
             <property name="icon-name">go-up-symbolic</property>

demos/gtk-demo/listview_minesweeper.ui

@@ -6,6 +6,7 @@
     <property name="title" translatable="yes">Minesweeper</property>
     <child type="titlebar">
       <object class="GtkHeaderBar" id="">
+        <property name="show-title-buttons">1</property>
         <child>
           <object class="GtkButton">
             <property name="label">New Game</property>

demos/gtk-demo/listview_settings.c

@@ -143,9 +143,8 @@ settings_key_new (GSettings          *settings,
 }
 
 static void
-item_value_changed (GtkEditableLabel *label,
-                    GParamSpec       *pspec,
-                    GtkListItem      *item)
+item_value_changed (GtkListItem *item,
+                    GtkEntry    *entry)
 {
   SettingsKey *self;
   const char *text;
@@ -153,9 +152,8 @@ item_value_changed (GtkEditableLabel *label,
   GVariant *variant;
   GError *error = NULL;
   const char *name;
-  char *value;
 
-  text = gtk_editable_get_text (GTK_EDITABLE (label));
+  text = gtk_editable_get_text (GTK_EDITABLE (entry));
 
   g_object_get (item, "item", &self, NULL);
   g_object_unref (self);
@@ -168,25 +166,17 @@ item_value_changed (GtkEditableLabel *label,
     {
       g_warning ("%s", error->message);
       g_clear_error (&error);
-      goto revert;
+      return;
     }
 
   if (!g_settings_schema_key_range_check (self->key, variant))
     {
       g_warning ("Not a valid value for %s", name);
-      goto revert;
+      return;
     }
 
   g_settings_set_value (self->settings, name, variant);
   g_variant_unref (variant);
-  return;
-
-revert:
-  gtk_widget_error_bell (GTK_WIDGET (label));
-
-  g_object_get (self, "value", &value, NULL);
-  gtk_editable_set_text (GTK_EDITABLE (label), value);
-  g_free (value);
 }
 
 static int
@@ -215,6 +205,7 @@ transform_settings_to_keys (GBinding     *binding,
   GtkFilterListModel *filter_model;
   GtkFilter *filter;
   GtkNoSelection *selection_model;
+  GtkExpression *expression;
   char **keys;
   guint i;
 
@@ -245,8 +236,11 @@ transform_settings_to_keys (GBinding     *binding,
                                         gtk_column_view_get_sorter (GTK_COLUMN_VIEW (data)));
   g_object_unref (store);
 
-  filter = gtk_string_filter_new (gtk_property_expression_new (SETTINGS_TYPE_KEY, NULL, "name"));
+  expression = gtk_property_expression_new (SETTINGS_TYPE_KEY, NULL, "name");
+  filter = gtk_string_filter_new ();
+  gtk_string_filter_set_expression (GTK_STRING_FILTER (filter), expression);
   filter_model = gtk_filter_list_model_new (G_LIST_MODEL (sort_model), filter);
+  gtk_expression_unref (expression);
   g_object_unref (sort_model);
 
   g_set_object (&current_filter, filter);

demos/gtk-demo/listview_settings.ui

@@ -6,6 +6,7 @@
     <property name="default-height">480</property>
     <child type="titlebar">
       <object class="GtkHeaderBar">
+        <property name="show-title-buttons">1</property>
         <child type="end">
           <object class="GtkToggleButton" id="search_button">
             <property name="icon-name">system-search-symbolic</property>
@@ -112,13 +113,14 @@
 <interface>
   <template class="GtkListItem">
     <property name="child">
-      <object class="GtkEditableLabel">
+      <object class="GtkEntry">
+        <signal name="activate" handler="item_value_changed" object="GtkListItem" swapped="yes"/>
+        <property name="xalign">0</property>
         <binding name="text">
           <lookup name="value" type="SettingsKey">
             <lookup name="item">GtkListItem</lookup>
           </lookup>
         </binding>
-        <signal name="notify::label" handler="item_value_changed"/>
       </object>
     </property>
   </template>

demos/gtk-demo/listview_weather.c

@@ -70,6 +70,7 @@ gtk_weather_info_new (GDateTime      *timestamp,
     {
       result->temperature = copy_from->temperature;
       result->weather_type = copy_from->weather_type;
+      g_object_unref (copy_from);
     }
 
   return result;
@@ -77,13 +78,13 @@ gtk_weather_info_new (GDateTime      *timestamp,
 
 static GDateTime *
 parse_timestamp (const char *string,
-                 GTimeZone  *_tz)
+                 GTimeZone  *_timezone)
 {
   char *with_seconds;
   GDateTime *result;
 
   with_seconds = g_strconcat (string, ":00", NULL);
-  result = g_date_time_new_from_iso8601 (with_seconds, _tz);
+  result = g_date_time_new_from_iso8601 (with_seconds, _timezone);
   g_free (with_seconds);
 
   return result;
@@ -160,7 +161,6 @@ create_weather_model (void)
   timestamp = g_date_time_new (utc, 2011, 1, 1, 0, 0, 0);
   info = gtk_weather_info_new (timestamp, NULL);
   g_list_store_append (store, info);
-  g_object_unref (info);
 
   for (i = 0; lines[i] != NULL && *lines[i]; i++)
     {
@@ -176,7 +176,6 @@ create_weather_model (void)
           timestamp = new_timestamp;
           info = gtk_weather_info_new (timestamp, info);
           g_list_store_append (store, info);
-          g_object_unref (info);
         }
 
       info->temperature = parse_temperature (fields[1], info->temperature);
@@ -185,7 +184,6 @@ create_weather_model (void)
       g_strfreev (fields);
     }
 
-  g_date_time_unref (timestamp);
   g_strfreev (lines);
   g_bytes_unref (data);
   g_time_zone_unref (utc);
@@ -194,8 +192,8 @@ create_weather_model (void)
 }
 
 static void
-setup_widget (GtkSignalListItemFactory *factory,
-              GtkListItem              *list_item)
+setup_widget (GtkListItem *list_item,
+              gpointer     unused)
 {
   GtkWidget *box, *child;
 
@@ -218,8 +216,8 @@ setup_widget (GtkSignalListItemFactory *factory,
 }
 
 static void
-bind_widget (GtkSignalListItemFactory *factory,
-             GtkListItem              *list_item)
+bind_widget (GtkListItem *list_item,
+             gpointer     unused)
 {
   GtkWidget *box, *child;
   GtkWeatherInfo *info;
@@ -282,12 +280,11 @@ create_weather_view (void)
 {
   GtkWidget *listview;
   GListModel *model, *selection;
-  GtkListItemFactory *factory;
 
-  factory = gtk_signal_list_item_factory_new ();
-  g_signal_connect (factory, "setup", G_CALLBACK (setup_widget), NULL);
-  g_signal_connect (factory, "bind", G_CALLBACK (bind_widget), NULL);
-  listview = gtk_list_view_new_with_factory (factory);
+  listview = gtk_list_view_new_with_factory (
+  gtk_functions_list_item_factory_new (setup_widget,
+                                       bind_widget,
+                                       NULL, NULL));
   gtk_orientable_set_orientation (GTK_ORIENTABLE (listview), GTK_ORIENTATION_HORIZONTAL);
   gtk_list_view_set_show_separators (GTK_LIST_VIEW (listview), TRUE);
   model = create_weather_model ();
@@ -314,7 +311,7 @@ do_listview_weather (GtkWidget *do_widget)
       gtk_window_set_title (GTK_WINDOW (window), "Weather");
       g_object_add_weak_pointer (G_OBJECT (window), (gpointer *) &window);
 
-      sw = gtk_scrolled_window_new ();
+      sw = gtk_scrolled_window_new (NULL, NULL);
       gtk_window_set_child (GTK_WINDOW (window), sw);
       listview = create_weather_view ();
       gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), listview);

demos/gtk-demo/listview_words.c

@@ -1,238 +0,0 @@
-/* Lists/Words
- *
- * This demo shows filtering a long list - of words.
- *
- * You should have the file `/usr/share/dict/words` installed for
- * this demo to work.
- */
-
-#include <gtk/gtk.h>
-
-static GtkWidget *window = NULL;
-static GtkWidget *progress;
-
-const char *factory_text =
-"<?xml version='1.0' encoding='UTF-8'?>\n"
-"<interface>\n"
-"  <template class='GtkListItem'>\n"
-"    <property name='child'>\n"
-"      <object class='GtkLabel'>\n"
-"        <property name='ellipsize'>end</property>\n"
-"        <property name='xalign'>0</property>\n"
-"        <binding name='label'>\n"
-"          <lookup name='string' type='GtkStringObject'>\n"
-"            <lookup name='item'>GtkListItem</lookup>\n"
-"          </lookup>\n"
-"        </binding>\n"
-"      </object>\n"
-"    </property>\n"
-"  </template>\n"
-"</interface>\n";
-
-static void
-update_title_cb (GtkFilterListModel *model)
-{
-  guint total;
-  char *title;
-  guint pending;
-
-  total = g_list_model_get_n_items (gtk_filter_list_model_get_model (model));
-  pending = gtk_filter_list_model_get_pending (model);
-
-  title = g_strdup_printf ("%u lines", g_list_model_get_n_items (G_LIST_MODEL (model)));
-
-  gtk_widget_set_visible (progress, pending != 0);
-  gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (progress), (total - pending) / (double) total);
-  gtk_window_set_title (GTK_WINDOW (window), title);
-  g_free (title);
-}
-
-static void
-read_lines_cb (GObject      *object,
-               GAsyncResult *result,
-               gpointer      data)
-{
-  GBufferedInputStream *stream = G_BUFFERED_INPUT_STREAM (object);
-  GtkStringList *stringlist = data;
-  GError *error = NULL;
-  gsize size;
-  GPtrArray *lines;
-  gssize n_filled;
-  const char *buffer, *newline;
-
-  n_filled = g_buffered_input_stream_fill_finish (stream, result, &error);
-  if (n_filled < 0)
-    {
-      g_print ("Could not read data: %s\n", error->message);
-      g_clear_error (&error);
-      return;
-    }
-
-  buffer = g_buffered_input_stream_peek_buffer (stream, &size);
-
-  if (n_filled == 0)
-    {
-      if (size)
-        gtk_string_list_take (stringlist, g_utf8_make_valid (buffer, size));
-      return;
-    }
-
-  lines = NULL;
-  while ((newline = memchr (buffer, '\n', size)))
-    {
-      if (newline > buffer)
-        {
-          if (lines == NULL)
-            lines = g_ptr_array_new_with_free_func (g_free);
-          g_ptr_array_add (lines, g_utf8_make_valid (buffer, newline - buffer));
-        }
-      if (g_input_stream_skip (G_INPUT_STREAM (stream), newline - buffer + 1, NULL, &error) < 0)
-        {
-          g_clear_error (&error);
-          break;
-        }
-      buffer = g_buffered_input_stream_peek_buffer (stream, &size);
-    }
-  if (lines == NULL)
-    {
-      g_buffered_input_stream_set_buffer_size (stream, g_buffered_input_stream_get_buffer_size (stream) + 4096);
-    }
-  else
-    {
-      g_ptr_array_add (lines, NULL);
-      gtk_string_list_splice (stringlist, g_list_model_get_n_items (G_LIST_MODEL (stringlist)), 0, (const char **) lines->pdata);
-      g_ptr_array_free (lines, TRUE);
-    }
-
-  g_buffered_input_stream_fill_async (stream, -1, G_PRIORITY_HIGH_IDLE, NULL, read_lines_cb, data);
-}
-               
-static void
-file_is_open_cb (GObject      *file,
-                 GAsyncResult *result,
-                 gpointer      data)
-{
-  GError *error = NULL;
-  GFileInputStream *file_stream;
-  GBufferedInputStream *stream;
-
-  file_stream = g_file_read_finish (G_FILE (file), result, &error);
-  if (file_stream == NULL)
-    {
-      g_print ("Could not open file: %s\n", error->message);
-      g_error_free (error);
-      return;
-    }
-
-  stream = G_BUFFERED_INPUT_STREAM (g_buffered_input_stream_new (G_INPUT_STREAM (file_stream)));
-  g_buffered_input_stream_fill_async (stream, -1, G_PRIORITY_HIGH_IDLE, NULL, read_lines_cb, data);
-  g_object_unref (stream);
-}
-
-static void
-load_file (GtkStringList *list,
-           GFile         *file)
-{
-  gtk_string_list_splice (list, 0, g_list_model_get_n_items (G_LIST_MODEL (list)), NULL);
-  g_file_read_async (file, G_PRIORITY_HIGH_IDLE, NULL, file_is_open_cb, list);
-}
-
-static void
-file_selected_cb (GtkWidget     *button,
-                  GtkStringList *stringlist)
-{
-  GFile *file = gtk_file_chooser_get_file (GTK_FILE_CHOOSER (button));
-
-  if (file)
-    {
-      load_file (stringlist, file);
-      g_object_unref (file);
-    }
-}
-
-GtkWidget *
-do_listview_words (GtkWidget *do_widget)
-{
-  if (window == NULL)
-    {
-      GtkWidget *header, *listview, *sw, *vbox, *search_entry, *open_button, *overlay;
-      GtkFilterListModel *filter_model;
-      GtkNoSelection *selection;
-      GtkStringList *stringlist;
-      GtkFilter *filter;
-      GFile *file;
-
-      file = g_file_new_for_path ("/usr/share/dict/words");
-      if (g_file_query_exists (file, NULL))
-        {
-          stringlist = gtk_string_list_new (NULL);
-          load_file (stringlist, file);
-        }
-      else
-        {
-          char **words;
-          words = g_strsplit ("lorem ipsum dolor sit amet consectetur adipisci elit sed eiusmod tempor incidunt labore et dolore magna aliqua ut enim ad minim veniam quis nostrud exercitation ullamco laboris nisi ut aliquid ex ea commodi consequat", " ", -1);
-          stringlist = gtk_string_list_new ((const char **) words);
-          g_strfreev (words);
-        }
-
-      filter = gtk_string_filter_new (gtk_property_expression_new (GTK_TYPE_STRING_OBJECT, NULL, "string"));
-      filter_model = gtk_filter_list_model_new (G_LIST_MODEL (stringlist), filter);
-      gtk_filter_list_model_set_incremental (filter_model, TRUE);
-
-      window = gtk_window_new ();
-      gtk_window_set_default_size (GTK_WINDOW (window), 400, 600);
-
-      header = gtk_header_bar_new ();
-      gtk_header_bar_set_show_title_buttons (GTK_HEADER_BAR (header), TRUE);
-      open_button = gtk_file_chooser_button_new ("_Open", GTK_FILE_CHOOSER_ACTION_OPEN);
-      g_signal_connect (open_button, "file-set", G_CALLBACK (file_selected_cb), stringlist);
-      gtk_header_bar_pack_start (GTK_HEADER_BAR (header), open_button);
-      gtk_window_set_titlebar (GTK_WINDOW (window), header);
-
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer*)&window);
-
-      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-      gtk_window_set_child (GTK_WINDOW (window), vbox);
-
-      search_entry = gtk_search_entry_new ();
-      g_object_bind_property (search_entry, "text", filter, "search", 0);
-      gtk_box_append (GTK_BOX (vbox), search_entry);
-
-      overlay = gtk_overlay_new ();
-      gtk_box_append (GTK_BOX (vbox), overlay);
-
-      progress = gtk_progress_bar_new ();
-      gtk_widget_set_halign (progress, GTK_ALIGN_FILL);
-      gtk_widget_set_valign (progress, GTK_ALIGN_START);
-      gtk_widget_set_hexpand (progress, TRUE);
-      gtk_overlay_add_overlay (GTK_OVERLAY (overlay), progress);
-
-      sw = gtk_scrolled_window_new ();
-      gtk_widget_set_vexpand (sw, TRUE);
-      gtk_overlay_set_child (GTK_OVERLAY (overlay), sw);
-
-      listview = gtk_list_view_new_with_factory (
-          gtk_builder_list_item_factory_new_from_bytes (NULL,
-              g_bytes_new_static (factory_text, strlen (factory_text))));
-      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), listview);
-      selection = gtk_no_selection_new (G_LIST_MODEL (filter_model));
-      gtk_list_view_set_model (GTK_LIST_VIEW (listview), G_LIST_MODEL (selection));
-      g_object_unref (selection);
-
-      g_signal_connect (filter_model, "items-changed", G_CALLBACK (update_title_cb), progress);
-      g_signal_connect (filter_model, "notify::pending", G_CALLBACK (update_title_cb), progress);
-      update_title_cb (filter_model);
-
-      g_object_unref (filter_model);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
-  else
-    gtk_window_destroy (GTK_WINDOW (window));
-
-  return window;
-}

demos/gtk-demo/main.c

@@ -18,7 +18,6 @@ static gchar *current_file = NULL;
 static GtkWidget *notebook;
 static GtkSingleSelection *selection;
 static GtkWidget *toplevel;
-static char **search_needle;
 
 typedef struct _GtkDemo GtkDemo;
 struct _GtkDemo
@@ -134,7 +133,7 @@ gtk_demo_run (GtkDemo   *self,
     }
   return TRUE;
 }
-
+              
 static void
 activate_about (GSimpleAction *action,
                 GVariant      *parameter,
@@ -603,7 +602,7 @@ display_image (const char *resource)
   image = gtk_picture_new_for_resource (resource);
   gtk_widget_set_halign (image, GTK_ALIGN_CENTER);
   gtk_widget_set_valign (image, GTK_ALIGN_CENTER);
-  sw = gtk_scrolled_window_new ();
+  sw = gtk_scrolled_window_new (NULL, NULL);
   gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), image);
 
   return sw;
@@ -643,7 +642,7 @@ display_text (const char *resource)
 
   g_bytes_unref (bytes);
 
-  sw = gtk_scrolled_window_new ();
+  sw = gtk_scrolled_window_new (NULL, NULL);
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                   GTK_POLICY_AUTOMATIC,
                                   GTK_POLICY_AUTOMATIC);
@@ -946,18 +945,7 @@ selection_cb (GtkSingleSelection *sel,
               gpointer            user_data)
 {
   GtkTreeListRow *row = gtk_single_selection_get_selected_item (sel);
-  GtkDemo *demo;
-
-  gtk_widget_set_sensitive (GTK_WIDGET (notebook), !!row);
-
-  if (!row)
-    {
-      gtk_window_set_title (GTK_WINDOW (toplevel), "No match");
-
-      return;
-    }
-
-  demo = gtk_tree_list_row_get_item (row);
+  GtkDemo *demo = gtk_tree_list_row_get_item (row);
 
   if (demo->filename)
     load_file (demo->name, demo->filename);
@@ -965,84 +953,6 @@ selection_cb (GtkSingleSelection *sel,
   gtk_window_set_title (GTK_WINDOW (toplevel), demo->title);
 }
 
-static gboolean
-filter_demo (GtkDemo *demo)
-{
-  int i;
-
-  /* Show only if the name maches every needle */
-  for (i = 0; search_needle[i]; i++)
-    {
-      if (!demo->title)
-        return FALSE;
-
-      if (g_str_match_string (search_needle[i], demo->title, TRUE))
-        continue;
-
-      return FALSE;
-    }
-
-  return TRUE;
-}
-
-static gboolean
-demo_filter_by_name (GtkTreeListRow     *row,
-                     GtkFilterListModel *model)
-{
-  GListModel *children;
-  GtkDemo *demo;
-  guint i, n;
-
-  /* Show all items if search is empty */
-  if (!search_needle || !search_needle[0] || !*search_needle[0])
-    return TRUE;
-
-  g_assert (GTK_IS_TREE_LIST_ROW (row));
-  g_assert (GTK_IS_FILTER_LIST_MODEL (model));
-
-  children = gtk_tree_list_row_get_children (row);
-  if (children)
-    {
-      n = g_list_model_get_n_items (children);
-      for (i = 0; i < n; i++)
-        {
-          demo = g_list_model_get_item (children, i);
-          g_assert (GTK_IS_DEMO (demo));
-
-          if (filter_demo (demo))
-            {
-              g_object_unref (demo);
-              return TRUE;
-            }
-          g_object_unref (demo);
-        }
-    }
-
-  demo = gtk_tree_list_row_get_item (row);
-  g_assert (GTK_IS_DEMO (demo));
-
-  return filter_demo (demo);
-}
-
-static void
-demo_search_changed_cb (GtkSearchEntry *entry,
-                        GtkFilter      *filter)
-{
-  const char *text;
-
-  g_assert (GTK_IS_SEARCH_ENTRY (entry));
-  g_assert (GTK_IS_FILTER (filter));
-
-  text = gtk_editable_get_text (GTK_EDITABLE (entry));
-
-  g_clear_pointer (&search_needle, g_strfreev);
-
-  if (text && *text)
-    search_needle = g_strsplit (text, " ", 0);
-
-  gtk_filter_changed (filter, GTK_FILTER_CHANGE_DIFFERENT);
-}
-
 static GListModel *
 create_demo_model (void)
 {
@@ -1097,25 +1007,13 @@ get_child_model (gpointer item,
   return NULL;
 }
 
-static void
-clear_search (GtkSearchBar *bar)
-{
-  if (!gtk_search_bar_get_search_mode (bar))
-    {
-      GtkWidget *entry = gtk_search_bar_get_child (GTK_SEARCH_BAR (bar));
-      gtk_editable_set_text (GTK_EDITABLE (entry), "");
-    }
-}
-
 static void
 activate (GApplication *app)
 {
   GtkBuilder *builder;
   GListModel *listmodel;
   GtkTreeListModel *treemodel;
-  GtkWidget *window, *listview, *search_entry, *search_bar;
-  GtkFilterListModel *filter_model;
-  GtkFilter *filter;
+  GtkWidget *window, *listview;
 
   static GActionEntry win_entries[] = {
     { "run", activate_run, NULL, NULL, NULL }
@@ -1136,8 +1034,8 @@ activate (GApplication *app)
   toplevel = GTK_WIDGET (window);
   listview = GTK_WIDGET (gtk_builder_get_object (builder, "listview"));
   g_signal_connect (listview, "activate", G_CALLBACK (activate_cb), window);
-  search_bar = GTK_WIDGET (gtk_builder_get_object (builder, "searchbar"));
-  g_signal_connect (search_bar, "notify::search-mode-enabled", G_CALLBACK (clear_search), NULL);
+
+  load_file (gtk_demos[0].name, gtk_demos[0].filename);
 
   listmodel = create_demo_model ();
   treemodel = gtk_tree_list_model_new (FALSE,
@@ -1146,17 +1044,10 @@ activate (GApplication *app)
                                        get_child_model,
                                        NULL,
                                        NULL);
-  filter_model = gtk_filter_list_model_new (G_LIST_MODEL (treemodel), NULL);
-  filter = gtk_custom_filter_new ((GtkCustomFilterFunc)demo_filter_by_name, filter_model, NULL);
-  gtk_filter_list_model_set_filter (filter_model, filter);
-  search_entry = GTK_WIDGET (gtk_builder_get_object (builder, "search-entry"));
-  g_signal_connect (search_entry, "search-changed", G_CALLBACK (demo_search_changed_cb), filter);
-
-  selection = gtk_single_selection_new (G_LIST_MODEL (filter_model));
+  selection = gtk_single_selection_new (G_LIST_MODEL (treemodel));
   g_signal_connect (selection, "notify::selected-item", G_CALLBACK (selection_cb), NULL);
-  gtk_list_view_set_model (GTK_LIST_VIEW (listview), G_LIST_MODEL (selection));
-
-  selection_cb (selection, NULL, NULL);
+  gtk_list_view_set_model (GTK_LIST_VIEW (listview),
+                           G_LIST_MODEL (selection));
 
   g_object_unref (builder);
 }
@@ -1249,6 +1140,7 @@ out:
       demo = (func) (window);
 
       gtk_window_set_transient_for (GTK_WINDOW (demo), GTK_WINDOW (window));
+      gtk_window_set_modal (GTK_WINDOW (demo), TRUE);
 
       g_signal_connect_swapped (G_OBJECT (demo), "destroy", G_CALLBACK (g_application_quit), app);
     }
@@ -1264,7 +1156,7 @@ out:
 static void
 print_version (void)
 {
-  g_print ("gtk4-demo %d.%d.%d\n",
+  g_print ("gtk3-demo %d.%d.%d\n",
            gtk_get_major_version (),
            gtk_get_minor_version (),
            gtk_get_micro_version ());
@@ -1306,6 +1198,16 @@ main (int argc, char **argv)
   };
   int i;
 
+  /* Most code in gtk-demo is intended to be exemplary, but not
+   * these few lines, which are just a hack so gtk-demo will work
+   * in the GTK tree without installing it.
+   */
+  if (g_file_test ("../../modules/input/immodules.cache", G_FILE_TEST_EXISTS))
+    {
+      g_setenv ("GTK_IM_MODULE_FILE", "../../modules/input/immodules.cache", TRUE);
+    }
+  /* -- End of hack -- */
+
   app = gtk_application_new ("org.gtk.Demo4", G_APPLICATION_NON_UNIQUE|G_APPLICATION_HANDLES_COMMAND_LINE);
 
   g_action_map_add_action_entries (G_ACTION_MAP (app),

demos/gtk-demo/main.ui

@@ -16,6 +16,15 @@
       </item>
     </section>
   </menu>
+  <object class="GtkTreeStore" id="treestore">
+    <columns>
+      <column type="gchararray"/>
+      <column type="gchararray"/>
+      <column type="gchararray"/>
+      <column type="gpointer"/>
+      <column type="gint"/>
+    </columns>
+  </object>
   <object class="GtkApplicationWindow" id="window">
     <style>
       <class name="devel"/>
@@ -24,6 +33,7 @@
     <property name="default-height">600</property>
     <child type="titlebar">
       <object class="GtkHeaderBar" id="headerbar">
+        <property name="show-title-buttons">1</property>
         <child>
           <object class="GtkButton">
             <property name="valign">center</property>
@@ -55,29 +65,12 @@
             <property name="hscrollbar-policy">never</property>
             <property name="min-content-width">150</property>
             <child>
-              <object class="GtkBox">
-                <property name="width-request">220</property>
-                <property name="orientation">vertical</property>
-
-                <child>
-                  <object class="GtkSearchBar" id="searchbar">
-                    <property name="key-capture-widget">window</property>
-                    <child>
-                      <object class="GtkSearchEntry" id="search-entry"/>
-                    </child>
+              <object class="GtkListView" id="listview">
+                <property name="factory">
+                  <object class="GtkBuilderListItemFactory">
+                    <property name="resource">/ui/main-listitem.ui</property>
                   </object>
-                </child>
-
-                <child>
-                  <object class="GtkListView" id="listview">
-                    <property name="factory">
-                      <object class="GtkBuilderListItemFactory">
-                        <property name="resource">/ui/main-listitem.ui</property>
-                      </object>
-                    </property>
-                  </object>
-                </child>
-
+                </property>
               </object>
             </child>
           </object>

demos/gtk-demo/markup.c

@@ -69,6 +69,7 @@ do_markup (GtkWidget *do_widget)
       g_signal_connect (show_source, "toggled", G_CALLBACK (source_toggled), stack);
 
       header = gtk_header_bar_new ();
+      gtk_header_bar_set_show_title_buttons (GTK_HEADER_BAR (header), TRUE);
       gtk_header_bar_pack_start (GTK_HEADER_BAR (header), show_source);
       gtk_window_set_titlebar (GTK_WINDOW (window), header);
 
@@ -80,7 +81,7 @@ do_markup (GtkWidget *do_widget)
       gtk_text_view_set_left_margin (GTK_TEXT_VIEW (view), 10);
       gtk_text_view_set_right_margin (GTK_TEXT_VIEW (view), 10);
 
-      sw = gtk_scrolled_window_new ();
+      sw = gtk_scrolled_window_new (NULL, NULL);
       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                       GTK_POLICY_AUTOMATIC,
                                       GTK_POLICY_AUTOMATIC);
@@ -93,7 +94,7 @@ do_markup (GtkWidget *do_widget)
       gtk_text_view_set_left_margin (GTK_TEXT_VIEW (view2), 10);
       gtk_text_view_set_right_margin (GTK_TEXT_VIEW (view2), 10);
 
-      sw = gtk_scrolled_window_new ();
+      sw = gtk_scrolled_window_new (NULL, NULL);
       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                       GTK_POLICY_AUTOMATIC,
                                       GTK_POLICY_AUTOMATIC);

demos/gtk-demo/meson.build

@@ -49,7 +49,6 @@ demos = files([
   'listview_minesweeper.c',
   'listview_settings.c',
   'listview_weather.c',
-  'listview_words.c',
   'markup.c',
   'modelbutton.c',
   'overlay.c',

demos/gtk-demo/messages.txt

@@ -259,7 +259,7 @@
 259|GTK+ and friends|GTKtoolkit|#java bindings version 4.0.16 released: http://article.gmane.org/gmane.comp.gnome.bindings.java/1796 #gtk|1276885917|0||0|0
 260|GTK+ and friends|GTKtoolkit|RT @cwiiis: MxIconTheme and MxIcon respect system's icon theme (and changes) now in #mx master :) Made possible by @thosw's XSettings work|1276883019|0||0|0
 261|GTK+ and friends|GTKtoolkit|#javascript mailing list just created. Discuss its usage in GObject libraries: GTK+, Glib ... http://ur1.ca/08lwz by @jwendell #gtk|1276842639|0||0|0
-262|GTK+ and friends|GTKtoolkit|Note for Win32 users: XP theming is back in 2.90.3 . Please test. #gtk|1276829697|0||0|0
+262|GTK+ and friends|GTKtoolkit|Note fot Win32 users: XP theming is back in 2.90.3 . Please test. #gtk|1276829697|0||0|0
 263|GTK+ and friends|GTKtoolkit|GTK+ 2.90.3 (unstable) released: http://mail.gnome.org/archives/gtk-devel-list/2010-June/msg00137.html #gtk|1276829633|0||0|0
 264|GTK+ and friends|GTKtoolkit|GLib 2.25.9 (unstable) released: http://ur1.ca/08hrl WARNING: API changes in GDBus, GSettings and GApplication #gtk|1276829581|0||0|0
 265|scaroo|scaroo|RT @scaroo: #SeedKit does RGBA window with css shadows and stuff : http://dl.dropbox.com/u/5746554/seedkit-does-rgba.png|1276734086|0|GTKtoolkit|0|1

demos/gtk-demo/modelbutton.ui

@@ -4,7 +4,9 @@
     <property name="title" translatable="yes">Model Button</property>
     <property name="resizable">0</property>
     <child type="titlebar">
-      <object class="GtkHeaderBar"/>
+      <object class="GtkHeaderBar">
+        <property name="show-title-buttons">1</property>
+      </object>
     </child>
     <child>
       <object class="GtkBox">

demos/gtk-demo/overlay2.c

@@ -40,7 +40,7 @@ do_overlay2 (GtkWidget *do_widget)
       gtk_window_set_title (GTK_WINDOW (window), "Decorative Overlay");
 
       overlay = gtk_overlay_new ();
-      sw = gtk_scrolled_window_new ();
+      sw = gtk_scrolled_window_new (NULL, NULL);
       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                       GTK_POLICY_AUTOMATIC,
                                       GTK_POLICY_AUTOMATIC);

demos/gtk-demo/paint.c

@@ -392,6 +392,7 @@ do_paint (GtkWidget *toplevel)
       gtk_window_set_child (GTK_WINDOW (window), draw_area);
 
       headerbar = gtk_header_bar_new ();
+      gtk_header_bar_set_show_title_buttons (GTK_HEADER_BAR (headerbar), TRUE);
 
       colorbutton = gtk_color_button_new ();
       g_signal_connect (colorbutton, "color-set",

demos/gtk-demo/peg_solitaire.c

@@ -276,6 +276,7 @@ do_peg_solitaire (GtkWidget *do_widget)
       g_signal_connect (restart, "clicked", G_CALLBACK (restart), NULL);
 
       header = gtk_header_bar_new ();
+      gtk_header_bar_set_show_title_buttons (GTK_HEADER_BAR (header), TRUE);
       gtk_header_bar_pack_start (GTK_HEADER_BAR (header), restart);
       window = gtk_window_new ();
       gtk_window_set_display (GTK_WINDOW (window),

demos/gtk-demo/sidebar.c

@@ -40,6 +40,7 @@ do_sidebar (GtkWidget *do_widget)
       gtk_widget_set_size_request (window, 500, 350);
 
       header = gtk_header_bar_new ();
+      gtk_header_bar_set_show_title_buttons (GTK_HEADER_BAR(header), TRUE);
       gtk_window_set_titlebar (GTK_WINDOW(window), header);
       gtk_window_set_title (GTK_WINDOW(window), "Stack Sidebar");
       g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);

demos/gtk-demo/sliding_puzzle.c

@@ -443,7 +443,7 @@ do_sliding_puzzle (GtkWidget *do_widget)
       gtk_media_stream_set_muted (media, TRUE);
       gtk_media_stream_play (media);
       add_choice (choices, GDK_PAINTABLE (media));
-      sw = gtk_scrolled_window_new ();
+      sw = gtk_scrolled_window_new (NULL, NULL);
       gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), choices);
       gtk_grid_attach (GTK_GRID (tweaks), sw, 0, 0, 2, 1);
 
@@ -470,6 +470,7 @@ do_sliding_puzzle (GtkWidget *do_widget)
       g_signal_connect (restart, "clicked", G_CALLBACK (reshuffle), NULL);
 
       header = gtk_header_bar_new ();
+      gtk_header_bar_set_show_title_buttons (GTK_HEADER_BAR (header), TRUE);
       gtk_header_bar_pack_start (GTK_HEADER_BAR (header), restart);
       gtk_header_bar_pack_end (GTK_HEADER_BAR (header), tweak);
       window = gtk_window_new ();

demos/gtk-demo/tabs.c

@@ -40,7 +40,7 @@ do_tabs (GtkWidget *do_widget)
       buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
       gtk_text_buffer_set_text (buffer, "one\ttwo\tthree\nfour\tfive\tsix\nseven\teight\tnine", -1);
 
-      sw = gtk_scrolled_window_new ();
+      sw = gtk_scrolled_window_new (NULL, NULL);
       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                       GTK_POLICY_AUTOMATIC,
                                       GTK_POLICY_AUTOMATIC);

demos/gtk-demo/tagged_entry.c

@@ -57,6 +57,7 @@ do_tagged_entry (GtkWidget *do_widget)
   static GtkWidget *window = NULL;
   GtkWidget *box;
   GtkWidget *box2;
+  GtkWidget *header;
   GtkWidget *entry;
   GtkWidget *button;
 
@@ -65,9 +66,12 @@ do_tagged_entry (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), "Tagged Entry");
-      gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
-
+      header = gtk_header_bar_new ();
+      gtk_header_bar_set_show_title_buttons (GTK_HEADER_BAR (header), FALSE);
+      gtk_window_set_titlebar (GTK_WINDOW (window), header);
+      gtk_window_set_title (GTK_WINDOW (window), "A tagged entry");
+      gtk_window_set_resizable (GTK_WINDOW (window), TRUE);
+      gtk_window_set_deletable (GTK_WINDOW (window), FALSE);
       g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
 
       box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
@@ -91,6 +95,13 @@ do_tagged_entry (GtkWidget *do_widget)
       button = gtk_check_button_new_with_mnemonic ("_Spinner");
       g_signal_connect (button, "toggled", G_CALLBACK (toggle_spinner), entry);
       gtk_box_append (GTK_BOX (box2), button);
+      
+      button = gtk_button_new_with_mnemonic ("_Done");
+      gtk_widget_add_css_class (button, "suggested-action");
+      g_signal_connect_swapped (button, "clicked", G_CALLBACK (gtk_window_destroy), window);
+      gtk_header_bar_pack_end (GTK_HEADER_BAR (header), button);
+
+      gtk_window_set_default_widget (GTK_WINDOW (window), button);
     }
 
   if (!gtk_widget_get_visible (window))

demos/gtk-demo/textscroll.c

@@ -156,7 +156,7 @@ create_text_view (GtkWidget *hbox,
   GtkWidget *textview;
   guint timeout;
 
-  swindow = gtk_scrolled_window_new ();
+  swindow = gtk_scrolled_window_new (NULL, NULL);
   gtk_box_append (GTK_BOX (hbox), swindow);
   textview = gtk_text_view_new ();
   gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (swindow), textview);

demos/gtk-demo/textundo.c

@@ -4,7 +4,7 @@
  * GtkTextBuffer. You can enable or disable undo support using
  * gtk_text_buffer_set_enable_undo().
  *
- * Use Control+z to undo and Control+Shift+z or Control+y to
+ * Use Primary+Z to undo and Primary+Shift+Z or Primary+Y to
  * redo previously undone operations.
  */
 
@@ -29,7 +29,7 @@ do_textundo (GtkWidget *do_widget)
       gtk_window_set_default_size (GTK_WINDOW (window), 450, 450);
       g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
 
-      gtk_window_set_title (GTK_WINDOW (window), "Undo and Redo");
+      gtk_window_set_title (GTK_WINDOW (window), "TextView Undo");
 
       view = gtk_text_view_new ();
       gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (view), GTK_WRAP_WORD);
@@ -46,7 +46,7 @@ do_textundo (GtkWidget *do_widget)
                               -1);
       gtk_text_buffer_end_irreversible_action (buffer);
 
-      sw = gtk_scrolled_window_new ();
+      sw = gtk_scrolled_window_new (NULL, NULL);
       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                       GTK_POLICY_AUTOMATIC,
                                       GTK_POLICY_AUTOMATIC);

demos/gtk-demo/textview.c

@@ -494,7 +494,7 @@ do_textview (GtkWidget *do_widget)
       buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view1));
       view2 = gtk_text_view_new_with_buffer (buffer);
 
-      sw = gtk_scrolled_window_new ();
+      sw = gtk_scrolled_window_new (NULL, NULL);
       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                       GTK_POLICY_AUTOMATIC,
                                       GTK_POLICY_AUTOMATIC);
@@ -504,7 +504,7 @@ do_textview (GtkWidget *do_widget)
 
       gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), view1);
 
-      sw = gtk_scrolled_window_new ();
+      sw = gtk_scrolled_window_new (NULL, NULL);
       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                       GTK_POLICY_AUTOMATIC,
                                       GTK_POLICY_AUTOMATIC);
@@ -590,7 +590,7 @@ easter_egg_callback (GtkWidget *button,
   g_object_unref (buffer);
 
   window = gtk_window_new ();
-  sw = gtk_scrolled_window_new ();
+  sw = gtk_scrolled_window_new (NULL, NULL);
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                   GTK_POLICY_AUTOMATIC,
                                   GTK_POLICY_AUTOMATIC);

demos/gtk-demo/themes.ui

@@ -4,6 +4,7 @@
     <property name="resizable">0</property>
     <child type="titlebar">
       <object class="GtkHeaderBar" id="header">
+        <property name="show-title-buttons">1</property>
         <child type="start">
           <object class="GtkToggleButton" id="toggle">
             <property name="label">Cycle</property>

demos/gtk-demo/tree_store.c

@@ -84,7 +84,7 @@ static TreeItem may[] =
 static TreeItem june[] =
 {
   { "June Fathers' Day", FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, NULL },
-  { "Juneteenth (Liberation Day)", FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
+  { "Juneteenth (Liberation of Slaves)", FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
   { "Flag Day", FALSE, TRUE, FALSE, TRUE, FALSE, FALSE, NULL },
   { NULL }
 };
@@ -406,7 +406,7 @@ do_tree_store (GtkWidget *do_widget)
       gtk_box_append (GTK_BOX (vbox),
                           gtk_label_new ("Jonathan's Holiday Card Planning Sheet"));
 
-      sw = gtk_scrolled_window_new ();
+      sw = gtk_scrolled_window_new (NULL, NULL);
       gtk_scrolled_window_set_has_frame (GTK_SCROLLED_WINDOW (sw), TRUE);
       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                       GTK_POLICY_AUTOMATIC,

demos/gtk-demo/video_player.c

@@ -73,6 +73,7 @@ do_video_player (GtkWidget *do_widget)
       gtk_window_set_child (GTK_WINDOW (window), video);
 
       title = gtk_header_bar_new ();
+      gtk_header_bar_set_show_title_buttons (GTK_HEADER_BAR (title), TRUE);
       gtk_window_set_titlebar (GTK_WINDOW (window), title);
 
       open_button = gtk_button_new_with_mnemonic ("_Open");

demos/icon-browser/iconbrowser.gresource.xml

@@ -2,6 +2,7 @@
 <gresources>
   <gresource prefix="/org/gtk/iconbrowser/gtk">
     <file preprocess="xml-stripblanks">window.ui</file>
+    <file preprocess="xml-stripblanks">menus.ui</file>
     <file>icon.list</file>
   </gresource>
 </gresources>

demos/icon-browser/iconbrowsercontext.c

@@ -1,156 +0,0 @@
-#include "iconbrowsercontext.h"
-
-struct _IbContext
-{
-  GObject parent_instance;
-
-  char *id;
-  char *name;
-  char *description;
-};
-
-struct _IbContextClass
-{
-  GObjectClass parent_class;
-};
-
-enum {
-  PROP_ID = 1,
-  PROP_NAME,
-  PROP_DESCRIPTION,
-  PROP_NUM_PROPERTIES
-};
-
-G_DEFINE_TYPE (IbContext, ib_context, G_TYPE_OBJECT)
-
-static void
-ib_context_init (IbContext *context)
-{
-}
-
-static void
-ib_context_finalize (GObject *object)
-{
-  IbContext *context = IB_CONTEXT (object);
-
-  g_free (context->id);
-  g_free (context->name);
-  g_free (context->description);
-
-  G_OBJECT_CLASS (ib_context_parent_class)->finalize (object);
-}
-
-static void
-ib_context_set_property (GObject      *object,
-                         guint         property_id,
-                         const GValue *value,
-                         GParamSpec   *pspec)
-{
-  IbContext *context = IB_CONTEXT (object);
-
-  switch (property_id)
-    {
-    case PROP_ID:
-      g_free (context->id);
-      context->id = g_value_dup_string (value);
-      break;
-
-    case PROP_NAME:
-      g_free (context->name);
-      context->name = g_value_dup_string (value);
-      break;
-
-    case PROP_DESCRIPTION:
-      g_free (context->description);
-      context->description = g_value_dup_string (value);
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-      break;
-    }
-}
-
-static void
-ib_context_get_property (GObject    *object,
-                      guint       property_id,
-                      GValue     *value,
-                      GParamSpec *pspec)
-{
-  IbContext *context = IB_CONTEXT (object);
-
-  switch (property_id)
-    {
-    case PROP_ID:
-      g_value_set_string (value, context->id);
-      break;
-
-    case PROP_NAME:
-      g_value_set_string (value, context->name);
-      break;
-
-    case PROP_DESCRIPTION:
-      g_value_set_string (value, context->description);
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-      break;
-    }
-}
-
-static void
-ib_context_class_init (IbContextClass *class)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (class);
-  GParamSpec *pspec;
-
-  object_class->finalize = ib_context_finalize;
-  object_class->set_property = ib_context_set_property;
-  object_class->get_property = ib_context_get_property;
-
-  pspec = g_param_spec_string ("id", "Id", "Id",
-                               NULL,
-                               G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
-  g_object_class_install_property (object_class, PROP_ID, pspec);
-
-  pspec = g_param_spec_string ("name", "Name", "Name",
-                               NULL,
-                               G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
-  g_object_class_install_property (object_class, PROP_NAME, pspec);
-
-  pspec = g_param_spec_string ("description", "Description", "Description",
-                               NULL,
-                               G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
-  g_object_class_install_property (object_class, PROP_DESCRIPTION, pspec);
-}
-
-IbContext *
-ib_context_new (const char *id,
-                const char *name,
-                const char *description)
-{
-  return g_object_new (IB_TYPE_CONTEXT,
-                       "id", id,
-                       "name", name,
-                       "description", description,
-                       NULL);
-}
-
-const char *
-ib_context_get_id (IbContext *context)
-{
-  return context->id;
-}
-
-const char *
-ib_context_get_name (IbContext *context)
-{
-  return context->name;
-}
-
-const char *
-ib_context_get_description (IbContext *context)
-{
-  return context->description;
-}

demos/icon-browser/iconbrowsercontext.h

@@ -1,14 +0,0 @@
-#pragma once
-
-#include <gtk.h>
-
-#define IB_TYPE_CONTEXT (ib_context_get_type ())
-G_DECLARE_FINAL_TYPE (IbContext, ib_context, IB, CONTEXT, GObject)
-
-IbContext   *ib_context_new             (const char     *id,
-                                         const char     *name,
-                                         const char     *description);
-
-const char *ib_context_get_id           (IbContext      *context);
-const char *ib_context_get_name         (IbContext      *context);
-const char *ib_context_get_description  (IbContext      *context);

demos/icon-browser/iconbrowsericon.c

@@ -1,228 +0,0 @@
-#include "iconbrowsericon.h"
-
-struct _IbIcon
-{
-  GObject parent_instance;
-
-  gboolean use_symbolic;
-
-  char *regular_name;
-  char *symbolic_name;
-  char *description;
-  char *context;
-};
-
-struct _IbIconClass
-{
-  GObjectClass parent_class;
-};
-
-enum {
-  PROP_NAME = 1,
-  PROP_REGULAR_NAME,
-  PROP_SYMBOLIC_NAME,
-  PROP_USE_SYMBOLIC,
-  PROP_DESCRIPTION,
-  PROP_CONTEXT,
-  PROP_NUM_PROPERTIES
-};
-
-G_DEFINE_TYPE (IbIcon, ib_icon, G_TYPE_OBJECT)
-
-static void
-ib_icon_init (IbIcon *icon)
-{
-}
-
-static void
-ib_icon_finalize (GObject *object)
-{
-  IbIcon *icon = IB_ICON (object);
-
-  g_free (icon->regular_name);
-  g_free (icon->symbolic_name);
-  g_free (icon->description);
-  g_free (icon->context);
-
-  G_OBJECT_CLASS (ib_icon_parent_class)->finalize (object);
-}
-
-static void
-ib_icon_set_property (GObject      *object,
-                      guint         property_id,
-                      const GValue *value,
-                      GParamSpec   *pspec)
-{
-  IbIcon *icon = IB_ICON (object);
-
-  switch (property_id)
-    {
-    case PROP_REGULAR_NAME:
-      g_free (icon->regular_name);
-      icon->regular_name = g_value_dup_string (value);
-      if (!icon->use_symbolic)
-        g_object_notify (object, "name");
-      break;
-
-    case PROP_SYMBOLIC_NAME:
-      g_free (icon->symbolic_name);
-      icon->symbolic_name = g_value_dup_string (value);
-      if (icon->use_symbolic)
-        g_object_notify (object, "name");
-      break;
-
-    case PROP_USE_SYMBOLIC:
-      icon->use_symbolic = g_value_get_boolean (value);
-      g_object_notify (object, "name");
-      break;
-
-    case PROP_DESCRIPTION:
-      g_free (icon->description);
-      icon->description = g_value_dup_string (value);
-      break;
-
-    case PROP_CONTEXT:
-      g_free (icon->context);
-      icon->context = g_value_dup_string (value);
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-      break;
-    }
-}
-
-static void
-ib_icon_get_property (GObject    *object,
-                      guint       property_id,
-                      GValue     *value,
-                      GParamSpec *pspec)
-{
-  IbIcon *icon = IB_ICON (object);
-
-  switch (property_id)
-    {
-    case PROP_NAME:
-      g_value_set_string (value, ib_icon_get_name (icon));
-      break;
-
-    case PROP_REGULAR_NAME:
-      g_value_set_string (value, icon->regular_name);
-      break;
-
-    case PROP_SYMBOLIC_NAME:
-      g_value_set_string (value, icon->symbolic_name);
-      break;
-
-    case PROP_USE_SYMBOLIC:
-      g_value_set_boolean (value, icon->use_symbolic);
-      break;
-
-    case PROP_DESCRIPTION:
-      g_value_set_string (value, icon->description);
-      break;
-
-    case PROP_CONTEXT:
-      g_value_set_string (value, icon->context);
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-      break;
-    }
-}
-
-static void
-ib_icon_class_init (IbIconClass *class)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (class);
-  GParamSpec *pspec;
-
-  object_class->finalize = ib_icon_finalize;
-  object_class->set_property = ib_icon_set_property;
-  object_class->get_property = ib_icon_get_property;
-
-  pspec = g_param_spec_string ("name", "Name", "Name",
-                               NULL,
-                               G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
-  g_object_class_install_property (object_class, PROP_NAME, pspec);
-
-  pspec = g_param_spec_string ("regular-name", "Regular Name", "Regular Name",
-                               NULL,
-                               G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
-  g_object_class_install_property (object_class, PROP_REGULAR_NAME, pspec);
-
-  pspec = g_param_spec_string ("symbolic-name", "Symbolic Name", "Symbolic Name",
-                               NULL,
-                               G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
-  g_object_class_install_property (object_class, PROP_SYMBOLIC_NAME, pspec);
-
-  pspec = g_param_spec_boolean ("use-symbolic", "Use Symbolic", "Use Symbolic",
-                                FALSE,
-                                G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
-  g_object_class_install_property (object_class, PROP_USE_SYMBOLIC, pspec);
-
-  pspec = g_param_spec_string ("description", "Description", "Description",
-                               NULL,
-                               G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
-  g_object_class_install_property (object_class, PROP_DESCRIPTION, pspec);
-
-  pspec = g_param_spec_string ("context", "Context", "Context",
-                               NULL,
-                               G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
-  g_object_class_install_property (object_class, PROP_CONTEXT, pspec);
-}
-
-IbIcon *
-ib_icon_new (const char *regular_name,
-             const char *symbolic_name,
-             const char *description,
-             const char *context)
-{
-  return g_object_new (IB_TYPE_ICON,
-                       "regular-name", regular_name,
-                       "symbolic-name", symbolic_name,
-                       "description", description,
-                       "context", context,
-                       NULL);
-}
-
-const char *
-ib_icon_get_name (IbIcon *icon)
-{
-  if (icon->use_symbolic)
-    return icon->symbolic_name;
-  else
-    return icon->regular_name;
-}
-
-const char *
-ib_icon_get_regular_name (IbIcon *icon)
-{
-  return icon->regular_name;
-}
-
-const char *
-ib_icon_get_symbolic_name (IbIcon *icon)
-{
-  return icon->symbolic_name;
-}
-
-gboolean
-ib_icon_get_use_symbolic (IbIcon *icon)
-{
-  return icon->use_symbolic;
-}
-
-const char *
-ib_icon_get_description (IbIcon *icon)
-{
-  return icon->description;
-}
-
-const char *
-ib_icon_get_context (IbIcon *icon)
-{
-  return icon->context;
-}
-

demos/icon-browser/iconbrowsericon.h

@@ -1,18 +0,0 @@
-#pragma once
-
-#include <gtk.h>
-
-#define IB_TYPE_ICON (ib_icon_get_type ())
-G_DECLARE_FINAL_TYPE (IbIcon, ib_icon, IB, ICON, GObject)
-
-IbIcon *ib_icon_new                     (const char     *regular_name,
-                                         const char     *symbolic_name,
-                                         const char     *description,
-                                         const char     *context);
-
-const char *ib_icon_get_name            (IbIcon         *icon);
-const char *ib_icon_get_regular_name    (IbIcon         *icon);
-const char *ib_icon_get_symbolic_name   (IbIcon         *icon);
-gboolean    ib_icon_get_use_symbolic    (IbIcon         *icon);
-const char *ib_icon_get_description     (IbIcon         *icon);
-const char *ib_icon_get_context         (IbIcon         *icon);

demos/icon-browser/iconbrowserwin.c

@@ -1,22 +1,48 @@
 #include <string.h>
 #include "iconbrowserapp.h"
 #include "iconbrowserwin.h"
-#include "iconbrowsericon.h"
-#include "iconbrowsercontext.h"
+#include "iconstore.h"
 #include <gtk/gtk.h>
 
+/* Drag 'n Drop */
+
+typedef struct
+{
+  gchar *id;
+  gchar *name;
+  gchar *description;
+} Context;
+
+static void
+context_free (gpointer data)
+{
+  Context *context = data;
+
+  g_free (context->id);
+  g_free (context->name);
+  g_free (context->description);
+  g_free (context);
+}
 
 struct _IconBrowserWindow
 {
   GtkApplicationWindow parent;
+  GHashTable *contexts;
 
+  GtkWidget *context_list;
+  Context *current_context;
+  gboolean symbolic;
   GtkWidget *symbolic_radio;
-  GtkWidget *searchbar;
-  GListModel *icon_filter_model;
-  GListStore *icon_store;
-  GListStore *context_store;
-  GtkFilter *name_filter;
+  GtkTreeModelFilter *filter_model;
   GtkWidget *details;
+
+  GtkListStore *store;
+  GtkCellRenderer *cell;
+  GtkCellRenderer *text_cell;
+  GtkWidget *search;
+  GtkWidget *searchbar;
+  GtkWidget *searchentry;
+  GtkWidget *list;
   GtkWidget *image1;
   GtkWidget *image2;
   GtkWidget *image3;
@@ -42,6 +68,87 @@ icon_browser_window_get_icon_theme (IconBrowserWindow *win)
   return gtk_icon_theme_get_for_display (gtk_widget_get_display (GTK_WIDGET (win)));
 }
 
+static void
+search_text_changed (GtkEntry *entry, IconBrowserWindow *win)
+{
+  const gchar *text;
+
+  text = gtk_editable_get_text (GTK_EDITABLE (entry));
+
+  if (text[0] == '\0')
+    return;
+
+  gtk_tree_model_filter_refilter (win->filter_model);
+}
+
+static void
+set_image (GtkWidget *image, const gchar *name, gint size)
+{
+  gtk_image_set_from_icon_name (GTK_IMAGE (image), name);
+  gtk_image_set_pixel_size (GTK_IMAGE (image), size);
+}
+
+static void
+item_activated (GtkIconView *icon_view, GtkTreePath *path, IconBrowserWindow *win)
+{
+  GtkIconTheme *icon_theme = icon_browser_window_get_icon_theme (win);
+  GtkTreeIter iter;
+  gchar *name;
+  gchar *description;
+  gint column;
+
+  gtk_tree_model_get_iter (GTK_TREE_MODEL (win->filter_model), &iter, path);
+
+  if (win->symbolic)
+    column = ICON_STORE_SYMBOLIC_NAME_COLUMN;
+  else
+    column = ICON_STORE_NAME_COLUMN;
+  gtk_tree_model_get (GTK_TREE_MODEL (win->filter_model), &iter,
+                      column, &name,
+                      ICON_STORE_DESCRIPTION_COLUMN, &description,
+                      -1);
+
+  if (name == NULL || !gtk_icon_theme_has_icon (icon_theme, name))
+    {
+      g_free (description);
+      return;
+    }
+
+  gtk_window_set_title (GTK_WINDOW (win->details), name);
+  set_image (win->image1, name, 8);
+  set_image (win->image2, name, 16);
+  set_image (win->image3, name, 18);
+  set_image (win->image4, name, 24);
+  set_image (win->image5, name, 32);
+  set_image (win->image6, name, 48);
+  set_image (win->image7, name, 64);
+  if (win->symbolic)
+    {
+      gtk_widget_show (win->image8);
+      gtk_widget_show (win->label8);
+      set_image (win->image8, name, 64);
+    }
+  else
+    {
+      gtk_widget_hide (win->image8);
+      gtk_widget_hide (win->label8);
+    }
+  if (description && description[0])
+    {
+      gtk_label_set_text (GTK_LABEL (win->description), description);
+      gtk_widget_show (win->description);
+    }
+  else
+    {
+      gtk_widget_hide (win->description);
+    }
+
+  gtk_window_present (GTK_WINDOW (win->details));
+
+  g_free (name);
+  g_free (description);
+}
+
 static void
 add_icon (IconBrowserWindow *win,
           const gchar       *name,
@@ -51,7 +158,6 @@ add_icon (IconBrowserWindow *win,
   GtkIconTheme *icon_theme = icon_browser_window_get_icon_theme (win);
   gchar *regular_name;
   gchar *symbolic_name;
-  IbIcon *icon;
 
   regular_name = g_strdup (name);
   if (!gtk_icon_theme_has_icon (icon_theme, regular_name))
@@ -67,12 +173,12 @@ add_icon (IconBrowserWindow *win,
       symbolic_name = NULL;
     }
 
-  icon = ib_icon_new (regular_name, symbolic_name, description, context);
-  g_object_bind_property (win->symbolic_radio, "active",
-                          icon, "use-symbolic",
-                          G_BINDING_DEFAULT);
-  g_list_store_append (win->icon_store, icon);
-  g_object_unref (icon);
+  gtk_list_store_insert_with_values (win->store, NULL, -1,
+                                     ICON_STORE_NAME_COLUMN, regular_name,
+                                     ICON_STORE_SYMBOLIC_NAME_COLUMN, symbolic_name,
+                                     ICON_STORE_DESCRIPTION_COLUMN, description,
+                                     ICON_STORE_CONTEXT_COLUMN, context,
+                                     -1);
 }
 
 static void
@@ -81,11 +187,50 @@ add_context (IconBrowserWindow *win,
              const gchar       *name,
              const gchar       *description)
 {
-  IbContext *context;
+  Context *c;
+  GtkWidget *row;
 
-  context = ib_context_new (id, name, description);
-  g_list_store_append (win->context_store, context);
-  g_object_unref (context);
+  c = g_new (Context, 1);
+  c->id = g_strdup (id);
+  c->name = g_strdup (name);
+  c->description = g_strdup (description);
+
+  g_hash_table_insert (win->contexts, c->id, c);
+
+  row = gtk_label_new (name);
+  gtk_label_set_xalign (GTK_LABEL (row), 0);
+  g_object_set_data (G_OBJECT (row), "context", c);
+  gtk_widget_show (row);
+  gtk_widget_set_margin_start (row, 10);
+  gtk_widget_set_margin_end (row, 10);
+  gtk_widget_set_margin_top (row, 10);
+  gtk_widget_set_margin_bottom (row, 10);
+
+  gtk_list_box_insert (GTK_LIST_BOX (win->context_list), row, -1);
+
+  /* set the tooltip on the list box row */
+  row = gtk_widget_get_parent (row);
+  gtk_widget_set_tooltip_text (row, description);
+
+  if (win->current_context == NULL)
+    win->current_context = c;
+}
+
+static void
+selected_context_changed (GtkListBox *list, IconBrowserWindow *win)
+{
+  GtkWidget *row;
+  GtkWidget *label;
+
+  row = GTK_WIDGET (gtk_list_box_get_selected_row (list));
+  if (row == NULL)
+    return;
+
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (win->search), FALSE);
+
+  label = gtk_list_box_row_get_child (GTK_LIST_BOX_ROW (row));
+  win->current_context = g_object_get_data (G_OBJECT (label), "context");
+  gtk_tree_model_filter_refilter (win->filter_model);
 }
 
 static void
@@ -137,19 +282,6 @@ populate (IconBrowserWindow *win)
   g_strfreev (groups);
 }
 
-static gboolean
-filter_by_icon_name (gpointer item,
-                     gpointer data)
-{
-  return ib_icon_get_name (IB_ICON (item)) != NULL;
-}
-
-static void
-symbolic_toggled (IconBrowserWindow *win)
-{
-  gtk_filter_changed (win->name_filter, GTK_FILTER_CHANGE_DIFFERENT);
-}
-
 static void
 copy_to_clipboard (GtkButton         *button,
                    IconBrowserWindow *win)
@@ -160,60 +292,70 @@ copy_to_clipboard (GtkButton         *button,
   gdk_clipboard_set_text (clipboard, gtk_window_get_title (GTK_WINDOW (win->details)));
 }
 
-static void
-set_image (GtkWidget *image, const gchar *name, gint size)
+static gboolean
+icon_visible_func (GtkTreeModel *model,
+                   GtkTreeIter  *iter,
+                   gpointer      data)
 {
-  gtk_image_set_from_icon_name (GTK_IMAGE (image), name);
-  gtk_image_set_pixel_size (GTK_IMAGE (image), size);
+  IconBrowserWindow *win = data;
+  gchar *context;
+  gchar *name;
+  gint column;
+  gboolean search;
+  const gchar *search_text;
+  gboolean visible;
+
+  search = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (win->search));
+  search_text = gtk_editable_get_text (GTK_EDITABLE (win->searchentry));
+
+  if (win->symbolic)
+    column = ICON_STORE_SYMBOLIC_NAME_COLUMN;
+  else
+    column = ICON_STORE_NAME_COLUMN;
+
+  gtk_tree_model_get (model, iter,
+                      column, &name,
+                      ICON_STORE_CONTEXT_COLUMN, &context,
+                      -1);
+  if (!name)
+    visible = FALSE;
+  else if (search)
+    visible = strstr (name, search_text) != NULL;
+  else
+    visible = win->current_context != NULL && g_strcmp0 (context, win->current_context->id) == 0;
+
+  g_free (name);
+  g_free (context);
+
+  return visible;
 }
 
 static void
-item_activated (GtkGridView       *view,
-                guint              position,
-                IconBrowserWindow *win)
+symbolic_toggled (GtkToggleButton *toggle, IconBrowserWindow *win)
 {
-  GListModel *model = gtk_grid_view_get_model (view);
-  IbIcon *icon = g_list_model_get_item (model, position);
-  const char *name;
-  const char *description;
-  gboolean symbolic;
+  gint column;
 
-  name = ib_icon_get_name (icon);
-  description = ib_icon_get_description (icon);
-  symbolic = ib_icon_get_use_symbolic (icon);
+  win->symbolic = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (toggle));
 
-  gtk_window_set_title (GTK_WINDOW (win->details), name);
-  set_image (win->image1, name, 8);
-  set_image (win->image2, name, 16);
-  set_image (win->image3, name, 18);
-  set_image (win->image4, name, 24);
-  set_image (win->image5, name, 32);
-  set_image (win->image6, name, 48);
-  set_image (win->image7, name, 64);
-  if (symbolic)
-    {
-      gtk_widget_show (win->image8);
-      gtk_widget_show (win->label8);
-      set_image (win->image8, name, 64);
-    }
+  if (win->symbolic)
+    column = ICON_STORE_SYMBOLIC_NAME_COLUMN;
   else
-    {
-      gtk_widget_hide (win->image8);
-      gtk_widget_hide (win->label8);
-    }
-  if (description && description[0])
-    {
-      gtk_label_set_text (GTK_LABEL (win->description), description);
-      gtk_widget_show (win->description);
-    }
-  else
-    {
-      gtk_widget_hide (win->description);
-    }
+    column = ICON_STORE_NAME_COLUMN;
 
-  gtk_window_present (GTK_WINDOW (win->details));
+  icon_store_set_text_column (ICON_STORE (win->store), column);
 
-  g_object_unref (icon);
+  gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (win->list), win->cell, "icon-name", column, NULL);
+  gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (win->list), win->text_cell, "text", column, NULL);
+
+  gtk_tree_model_filter_refilter (win->filter_model);
+  gtk_widget_queue_draw (win->list);
+}
+
+static void
+search_mode_toggled (GObject *searchbar, GParamSpec *pspec, IconBrowserWindow *win)
+{
+  if (gtk_search_bar_get_search_mode (GTK_SEARCH_BAR (searchbar)))
+    gtk_list_box_unselect_all (GTK_LIST_BOX (win->context_list));
 }
 
 static GdkPaintable *
@@ -239,10 +381,7 @@ get_image_paintable (GtkImage *image)
                                          gtk_widget_get_direction (GTK_WIDGET (image)),
                                          0);
       if (icon == NULL)
-        {
-g_print ("no icon for %s\n", icon_name);
-          return NULL;
-        }
+        return NULL;
       return GDK_PAINTABLE (icon);
     case GTK_IMAGE_GICON:
     case GTK_IMAGE_EMPTY:
@@ -280,10 +419,10 @@ drag_prepare_texture (GtkDragSource *source,
 {
   GdkPaintable *paintable = get_image_paintable (GTK_IMAGE (widget));
 
-  if (!GDK_IS_PAINTABLE (paintable))
+  if (!GDK_IS_TEXTURE (paintable))
     return NULL;
 
-  return gdk_content_provider_new_typed (GDK_TYPE_PAINTABLE, paintable);
+  return gdk_content_provider_new_typed (GDK_TYPE_TEXTURE, paintable);
 }
 
 static GdkContentProvider *
@@ -337,10 +476,17 @@ setup_scalable_image_dnd (GtkWidget *image)
 static void
 icon_browser_window_init (IconBrowserWindow *win)
 {
-  GtkFilter *filter;
+  GdkContentFormats *list;
 
   gtk_widget_init_template (GTK_WIDGET (win));
 
+  list = gdk_content_formats_new_for_gtype (G_TYPE_STRING);
+  gtk_icon_view_enable_model_drag_source (GTK_ICON_VIEW (win->list),
+                                          GDK_BUTTON1_MASK,
+                                          list,
+                                          GDK_ACTION_COPY);
+  gdk_content_formats_unref (list);
+
   setup_image_dnd (win->image1);
   setup_image_dnd (win->image2);
   setup_image_dnd (win->image3);
@@ -350,16 +496,19 @@ icon_browser_window_init (IconBrowserWindow *win)
   setup_image_dnd (win->image7);
   setup_scalable_image_dnd (win->image8);
 
+  win->contexts = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, context_free);
+
+  gtk_tree_model_filter_set_visible_func (win->filter_model, icon_visible_func, win, NULL);
   gtk_window_set_transient_for (GTK_WINDOW (win->details), GTK_WINDOW (win));
-  gtk_search_bar_set_key_capture_widget (GTK_SEARCH_BAR (win->searchbar), GTK_WIDGET (win));
+
+  g_signal_connect (win->searchbar, "notify::search-mode-enabled",
+                    G_CALLBACK (search_mode_toggled), win);
+  gtk_search_bar_set_key_capture_widget (GTK_SEARCH_BAR (win->searchbar),
+                                         GTK_WIDGET (win));
+
+  symbolic_toggled (GTK_TOGGLE_BUTTON (win->symbolic_radio), win);
 
   populate (win);
-
-  filter = gtk_filter_list_model_get_filter (GTK_FILTER_LIST_MODEL (win->icon_filter_model));
-
-  win->name_filter = gtk_custom_filter_new (filter_by_icon_name, NULL, NULL);
-
-  gtk_multi_filter_append (GTK_MULTI_FILTER (filter), g_object_ref (win->name_filter));
 }
 
 static void
@@ -367,7 +516,7 @@ icon_browser_window_finalize (GObject *object)
 {
   IconBrowserWindow *win = ICON_BROWSER_WINDOW (object);
 
-  g_clear_object (&win->name_filter);
+  g_hash_table_unref (win->contexts);
 
   G_OBJECT_CLASS (icon_browser_window_parent_class)->finalize (object);
 }
@@ -379,19 +528,23 @@ icon_browser_window_class_init (IconBrowserWindowClass *class)
 
   object_class->finalize = icon_browser_window_finalize;
 
-  g_type_ensure (IB_TYPE_ICON);
-  g_type_ensure (IB_TYPE_CONTEXT);
+  g_type_ensure (ICON_STORE_TYPE);
 
   gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (class),
                                                "/org/gtk/iconbrowser/gtk/window.ui");
 
+  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), IconBrowserWindow, context_list);
+  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), IconBrowserWindow, filter_model);
   gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), IconBrowserWindow, symbolic_radio);
-  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), IconBrowserWindow, searchbar);
-  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), IconBrowserWindow, icon_store);
-  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), IconBrowserWindow, icon_filter_model);
-  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), IconBrowserWindow, context_store);
-
   gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), IconBrowserWindow, details);
+
+  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), IconBrowserWindow, store);
+  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), IconBrowserWindow, cell);
+  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), IconBrowserWindow, text_cell);
+  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), IconBrowserWindow, search);
+  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), IconBrowserWindow, searchbar);
+  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), IconBrowserWindow, searchentry);
+  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), IconBrowserWindow, list);
   gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), IconBrowserWindow, image1);
   gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), IconBrowserWindow, image2);
   gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), IconBrowserWindow, image3);
@@ -403,9 +556,11 @@ icon_browser_window_class_init (IconBrowserWindowClass *class)
   gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), IconBrowserWindow, label8);
   gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), IconBrowserWindow, description);
 
+  gtk_widget_class_bind_template_callback (GTK_WIDGET_CLASS (class), search_text_changed);
   gtk_widget_class_bind_template_callback (GTK_WIDGET_CLASS (class), item_activated);
-  gtk_widget_class_bind_template_callback (GTK_WIDGET_CLASS (class), copy_to_clipboard);
+  gtk_widget_class_bind_template_callback (GTK_WIDGET_CLASS (class), selected_context_changed);
   gtk_widget_class_bind_template_callback (GTK_WIDGET_CLASS (class), symbolic_toggled);
+  gtk_widget_class_bind_template_callback (GTK_WIDGET_CLASS (class), copy_to_clipboard);
 }
 
 IconBrowserWindow *

demos/icon-browser/iconstore.c

@@ -0,0 +1,91 @@
+#include "iconstore.h"
+#include <gtk/gtk.h>
+
+struct _IconStore
+{
+  GtkListStore parent;
+
+  gint text_column;
+};
+
+struct _IconStoreClass
+{
+  GtkListStoreClass parent_class;
+};
+
+static void icon_store_drag_source_init (GtkTreeDragSourceIface *iface);
+
+G_DEFINE_TYPE_WITH_CODE (IconStore, icon_store, GTK_TYPE_LIST_STORE,
+                         G_IMPLEMENT_INTERFACE (GTK_TYPE_TREE_DRAG_SOURCE,
+                                                icon_store_drag_source_init))
+
+
+static void
+icon_store_init (IconStore *store)
+{
+  GType types[4] = { G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING };
+
+  gtk_list_store_set_column_types (GTK_LIST_STORE (store), 4, types);
+
+  store->text_column = ICON_STORE_NAME_COLUMN;
+}
+
+static void
+icon_store_class_init (IconStoreClass *class)
+{
+}
+
+static gboolean
+row_draggable (GtkTreeDragSource *drag_source,
+               GtkTreePath       *path)
+{
+  return TRUE;
+}
+
+static gboolean
+drag_data_delete (GtkTreeDragSource *drag_source,
+                  GtkTreePath       *path)
+{
+  GtkTreeIter iter;
+
+  if (gtk_tree_model_get_iter (GTK_TREE_MODEL (drag_source), &iter, path))
+    return gtk_list_store_remove (GTK_LIST_STORE (drag_source), &iter);
+  return FALSE;
+}
+
+static GdkContentProvider *
+drag_data_get (GtkTreeDragSource *drag_source,
+               GtkTreePath       *path)
+{
+  GdkContentProvider *content;
+  GtkTreeIter iter;
+  gchar *text;
+
+  if (!gtk_tree_model_get_iter (GTK_TREE_MODEL (drag_source), &iter, path))
+    return NULL;
+
+  gtk_tree_model_get (GTK_TREE_MODEL (drag_source), &iter,
+                      ICON_STORE (drag_source)->text_column, &text,
+                      -1);
+
+  content = gdk_content_provider_new_typed (G_TYPE_STRING, text);
+
+  g_free (text);
+
+  return content;
+}
+
+
+static void
+icon_store_drag_source_init (GtkTreeDragSourceIface *iface)
+{
+  iface->row_draggable = row_draggable;
+  iface->drag_data_delete = drag_data_delete;
+  iface->drag_data_get = drag_data_get;
+}
+
+void
+icon_store_set_text_column (IconStore *store, gint text_column)
+{
+  store->text_column = text_column;
+}

demos/icon-browser/iconstore.h

@@ -0,0 +1,26 @@
+#ifndef __ICON_STORE_H
+#define __ICON_STORE_H
+
+#include <gtk/gtk.h>
+
+
+#define ICON_STORE_TYPE (icon_store_get_type ())
+#define ICON_STORE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ICON_STORE_TYPE, IconStore))
+
+
+typedef struct _IconStore       IconStore;
+typedef struct _IconStoreClass  IconStoreClass;
+
+enum {
+  ICON_STORE_NAME_COLUMN,
+  ICON_STORE_SYMBOLIC_NAME_COLUMN,
+  ICON_STORE_DESCRIPTION_COLUMN,
+  ICON_STORE_CONTEXT_COLUMN
+};
+
+GType   icon_store_get_type     (void);
+
+void    icon_store_set_text_column (IconStore *store,
+                                    gint       column);
+
+#endif /* __ICON_STORE_H */

demos/icon-browser/menus.ui

@@ -0,0 +1,10 @@
+<interface>
+  <menu id="app-menu">
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">_Quit</attribute>
+        <attribute name="action">app.quit</attribute>
+      </item>
+    </section>
+  </menu>
+</interface>

demos/icon-browser/meson.build

@@ -2,8 +2,7 @@ iconbrowser_sources = [
   'main.c',
   'iconbrowserapp.c',
   'iconbrowserwin.c',
-  'iconbrowsericon.c',
-  'iconbrowsercontext.c'
+  'iconstore.c'
 ]
 
 iconbrowser_resources = gnome.compile_resources('iconbrowser_resources',
@@ -18,3 +17,14 @@ executable('gtk4-icon-browser',
            gui_app: true,
            link_args: extra_demo_ldflags,
            install: true)
+
+install_data('org.gtk.IconBrowser4.desktop', install_dir: gtk_applicationsdir)
+
+# icons
+icontheme_dir = join_paths(gtk_datadir, 'icons/hicolor')
+
+foreach size: ['scalable', 'symbolic']
+  install_subdir('data/' + size,
+    install_dir: icontheme_dir
+  )
+endforeach

demos/icon-browser/window.ui

@@ -12,6 +12,10 @@
       </item>
     </section>
   </menu>
+  <object class="IconStore" id="store"/>
+  <object class="GtkTreeModelFilter" id="filter_model">
+    <property name="child-model">store</property>
+  </object>
   <template class="IconBrowserWindow" parent="GtkApplicationWindow">
     <style>
       <class name="devel"/>
@@ -21,6 +25,7 @@
     <property name="default-height">768</property>
     <child type="titlebar">
       <object class="GtkHeaderBar" id="header">
+        <property name="show-title-buttons">1</property>
         <child type="title">
           <object class="GtkBox">
             <style>
@@ -37,7 +42,7 @@
                 <property name="draw-indicator">0</property>
                 <property name="label" translatable="yes">Symbolic</property>
                 <property name="group">normal_radio</property>
-                <signal name="notify::active" handler="symbolic_toggled" swapped="yes" after="yes"/>
+                <signal name="toggled" handler="symbolic_toggled"/>
               </object>
             </child>
           </object>
@@ -66,44 +71,8 @@
     <child>
       <object class="GtkBox">
         <child>
-          <object class="GtkScrolledWindow">
-            <property name="hscrollbar-policy">never</property>
-            <child>
-              <object class="GtkListView">
-                <property name="model">
-                  <object class="GtkSingleSelection" id="context_model">
-                    <property name="model">
-                      <object class="GListStore" id="context_store">
-                        <property name="item-type">IbContext</property>
-                      </object>
-                    </property>
-                  </object>
-                </property>
-                <property name="factory">
-                  <object class="GtkBuilderListItemFactory">
-                    <property name="bytes">
-<![CDATA[
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <template class="GtkListItem">
-    <property name="child">
-      <object class="GtkLabel">
-        <property name="xalign">0</property>
-        <binding name="label">
-          <lookup name="name" type="IbContext">
-            <lookup name="item">GtkListItem</lookup>
-          </lookup>
-        </binding>
-      </object>
-    </property>
-  </template>
-</interface>
-]]>
-                    </property>
-                  </object>
-                </property>
-              </object>
-            </child>
+          <object class="GtkListBox" id="context_list">
+            <signal name="selected-rows-changed" handler="selected_context_changed"/>
           </object>
         </child>
         <child>
@@ -119,6 +88,7 @@
                 <property name="search-mode-enabled" bind-source="search" bind-property="active" bind-flags="bidirectional"/>
                 <child>
                   <object class="GtkSearchEntry" id="searchentry">
+                    <signal name="search-changed" handler="search_text_changed"/>
                   </object>
                 </child>
               </object>
@@ -129,91 +99,23 @@
                 <property name="vexpand">1</property>
                 <property name="hscrollbar-policy">never</property>
                 <child>
-                  <object class="GtkGridView" id="list">
-                    <signal name="activate" handler="item_activated"/>
-                    <property name="single-click-activate">1</property>
-                    <property name="model">
-                      <object class="GtkNoSelection">
-                        <property name="model">
-                          <object class="GtkFilterListModel" id="icon_filter_model">
-                            <property name="filter">
-                              <object class="GtkEveryFilter">
-                                <child>
-                                  <object class="GtkStringFilter">
-                                    <property name="expression">
-                                      <lookup name="name" type="IbIcon"/>
-                                    </property>
-                                    <binding name="search">
-                                      <lookup name="text" type="GtkSearchEntry">
-                                        searchentry
-                                      </lookup>
-                                    </binding>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkStringFilter">
-                                    <property name="ignore-case">0</property>
-                                    <property name="match-mode">exact</property>
-                                    <property name="expression">
-                                      <lookup name="context" type="IbIcon"/>
-                                    </property>
-                                    <binding name="search">
-                                      <lookup name="id" type="IbContext">
-                                        <lookup name="selected-item" type="GtkSingleSelection">
-                                          context_model
-                                        </lookup>
-                                      </lookup>
-                                    </binding>
-                                  </object>
-                                </child>
-                              </object>
-                            </property>
-                            <property name="model">
-                              <object class="GListStore" id="icon_store">
-                                <property name="item-type">IbIcon</property>
-                              </object>
-                            </property>
-                          </object>
-                        </property>
+                  <object class="GtkIconView" id="list">
+                    <property name="model">filter_model</property>
+                    <property name="selection-mode">none</property>
+                    <property name="activate-on-single-click">1</property>
+                    <signal name="item_activated" handler="item_activated"/>
+                    <child>
+                      <object class="GtkCellRendererPixbuf" id="cell">
+                        <property name="xpad">10</property>
+                        <property name="ypad">10</property>
                       </object>
-                    </property>
-                    <property name="factory">
-                      <object class="GtkBuilderListItemFactory">
-                        <property name="bytes">
-<![CDATA[
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <template class="GtkListItem">
-    <property name="child">
-      <object class="GtkBox">
-        <property name="orientation">vertical</property>
-        <child>
-          <object class="GtkImage">
-            <property name="pixel-size">48</property>
-            <binding name="icon-name">
-              <lookup name="name" type="IbIcon">
-                <lookup name="item">GtkListItem</lookup>
-              </lookup>
-            </binding>
-          </object>
-        </child>
-        <child>
-          <object class="GtkLabel">
-            <binding name="label">
-              <lookup name="name" type="IbIcon">
-                <lookup name="item">GtkListItem</lookup>
-              </lookup>
-            </binding>
-          </object>
-        </child>
-      </object>
-    </property>
-  </template>
-</interface>
-]]>
-                        </property>
+                    </child>
+                    <child>
+                      <object class="GtkCellRendererText" id="text_cell">
+                        <property name="xpad">10</property>
+                        <property name="ypad">10</property>
                       </object>
-                    </property>
+                    </child>
                   </object>
                 </child>
               </object>
@@ -223,7 +125,14 @@
       </object>
     </child>
   </template>
-
+  <object class="GtkSizeGroup">
+    <property name="mode">vertical</property>
+    <widgets>
+      <widget name="normal_radio"/>
+      <widget name="symbolic_radio"/>
+      <widget name="search"/>
+    </widgets>
+  </object>
   <object class="GtkDialog" id="details">
     <property name="modal">1</property>
     <property name="use-header-bar">1</property>
@@ -255,7 +164,7 @@
               </object>
             </child>
             <child>
-             <object class="GtkImage" id="image2">
+              <object class="GtkImage" id="image2">
                 <property name="halign">center</property>
                 <property name="valign">end</property>
                 <accessibility>
@@ -464,7 +373,7 @@
                 </layout>
               </object>
             </child>
-           <child>
+            <child>
               <object class="GtkLabel" id="label8">
                 <property name="halign">center</property>
                 <property name="valign">baseline</property>
@@ -495,7 +404,7 @@
             <signal name="clicked" handler="copy_to_clipboard"/>
           </object>
         </child>
-       <child>
+        <child>
           <object class="GtkLabel" id="description">
             <property name="margin-start">10</property>
             <property name="margin-end">10</property>
@@ -510,4 +419,3 @@
     </child>
   </object>
 </interface>
-

demos/node-editor/data/scalable/apps/org.gtk.gtk4.NodeEditor.Devel.svg

@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg height="128px" viewBox="0 0 128 128" width="128px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <linearGradient id="a" gradientUnits="userSpaceOnUse" x1="43.000351" x2="85.000351" y1="39.000164" y2="39.000164">
-        <stop offset="0" stop-color="#26a269"/>
-        <stop offset="0.0934161" stop-color="#84e3b7"/>
-        <stop offset="0.330831" stop-color="#26a269"/>
-        <stop offset="0.686952" stop-color="#26a269"/>
-        <stop offset="0.89736" stop-color="#175e3c"/>
-        <stop offset="1" stop-color="#26a269"/>
-    </linearGradient>
-    <linearGradient id="b" gradientUnits="userSpaceOnUse">
-        <stop offset="0" stop-color="#c0bfbc"/>
-        <stop offset="0.154754" stop-color="#ffffff"/>
-        <stop offset="0.433722" stop-color="#bdbbb5"/>
-        <stop offset="0.650505" stop-color="#c1c0ba"/>
-        <stop offset="0.825253" stop-color="#ffffff"/>
-        <stop offset="1" stop-color="#c0bfbc"/>
-    </linearGradient>
-    <linearGradient id="c" gradientTransform="matrix(0.0811899 -0.046875 0.069079 0.119648 307.03142 127.069456)" x1="-1710.210571" x2="-1774.45166" xlink:href="#b" y1="-1202.376709" y2="-1202.376709"/>
-    <linearGradient id="d" gradientTransform="matrix(-0.0811899 -0.046875 -0.069079 0.119648 -177.242852 127.069447)" x1="-1710.210571" x2="-1774.45166" xlink:href="#b" y1="-1202.376709" y2="-1202.376709"/>
-    <linearGradient id="e" gradientUnits="userSpaceOnUse" x1="14" x2="56" y1="94.999964" y2="94.999964">
-        <stop offset="0" stop-color="#813d9c"/>
-        <stop offset="0.109119" stop-color="#b378ca"/>
-        <stop offset="0.241583" stop-color="#813d9c"/>
-        <stop offset="0.731841" stop-color="#813d9c"/>
-        <stop offset="0.872163" stop-color="#4d255d"/>
-        <stop offset="1" stop-color="#813d9c"/>
-    </linearGradient>
-    <linearGradient id="f" gradientUnits="userSpaceOnUse" x1="72" x2="114" y1="94.999964" y2="94.999964">
-        <stop offset="0" stop-color="#e66100"/>
-        <stop offset="0.0678478" stop-color="#ff903e"/>
-        <stop offset="0.168852" stop-color="#e66100"/>
-        <stop offset="0.886626" stop-color="#e66100"/>
-        <stop offset="1" stop-color="#9d4200"/>
-    </linearGradient>
-    <clipPath id="g">
-        <rect height="128" width="128"/>
-    </clipPath>
-    <clipPath id="h">
-        <rect height="128" width="128"/>
-    </clipPath>
-    <filter id="i" height="100%" width="100%" x="0%" y="0%">
-        <feColorMatrix in="SourceGraphic" type="matrix" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
-    </filter>
-    <mask id="j">
-        <g clip-path="url(#h)" filter="url(#i)">
-            <g clip-path="url(#g)">
-                <path d="m 51 18 h 26 c 4.417969 0 8 3.582031 8 8 v 26 c 0 4.417969 -3.582031 8 -8 8 h -26 c -4.417969 0 -8 -3.582031 -8 -8 v -26 c 0 -4.417969 3.582031 -8 8 -8 z m 0 0" fill="url(#a)"/>
-                <path d="m 51 12 h 26 c 4.417969 0 8 3.582031 8 8 v 26 c 0 4.417969 -3.582031 8 -8 8 h -26 c -4.417969 0 -8 -3.582031 -8 -8 v -26 c 0 -4.417969 3.582031 -8 8 -8 z m 0 0" fill="#57e389"/>
-                <path d="m 76.976562 55.453125 c 1.480469 -0.855469 3.371094 -0.347656 4.226563 1.132813 l 6.742187 11.679687 c 0.855469 1.480469 0.347657 3.371094 -1.132812 4.226563 c -1.480469 0.851562 -3.371094 0.347656 -4.226562 -1.132813 l -6.742188 -11.679687 c -0.855469 -1.480469 -0.347656 -3.371094 1.132812 -4.226563 z m 0 0" fill="url(#c)"/>
-                <path d="m 52.8125 55.453125 c -1.480469 -0.855469 -3.371094 -0.347656 -4.226562 1.132813 l -6.742188 11.679687 c -0.855469 1.480469 -0.347656 3.371094 1.132812 4.226563 c 1.480469 0.851562 3.371094 0.347656 4.226563 -1.132813 l 6.742187 -11.679687 c 0.855469 -1.480469 0.347657 -3.371094 -1.132812 -4.226563 z m 0 0" fill="url(#d)"/>
-                <path d="m 22 74 h 26 c 4.417969 0 8 3.582031 8 8 v 26 c 0 4.417969 -3.582031 8 -8 8 h -26 c -4.417969 0 -8 -3.582031 -8 -8 v -26 c 0 -4.417969 3.582031 -8 8 -8 z m 0 0" fill="url(#e)"/>
-                <path d="m 22 68 h 26 c 4.417969 0 8 3.582031 8 8 v 26 c 0 4.417969 -3.582031 8 -8 8 h -26 c -4.417969 0 -8 -3.582031 -8 -8 v -26 c 0 -4.417969 3.582031 -8 8 -8 z m 0 0" fill="#dc8add"/>
-                <path d="m 80 74 h 26 c 4.417969 0 8 3.582031 8 8 v 26 c 0 4.417969 -3.582031 8 -8 8 h -26 c -4.417969 0 -8 -3.582031 -8 -8 v -26 c 0 -4.417969 3.582031 -8 8 -8 z m 0 0" fill="url(#f)"/>
-                <path d="m 80 68 h 26 c 4.417969 0 8 3.582031 8 8 v 26 c 0 4.417969 -3.582031 8 -8 8 h -26 c -4.417969 0 -8 -3.582031 -8 -8 v -26 c 0 -4.417969 3.582031 -8 8 -8 z m 0 0" fill="#ffa348"/>
-            </g>
-        </g>
-    </mask>
-    <mask id="k">
-        <g filter="url(#i)">
-            <rect fill-opacity="0.8" height="128" width="128"/>
-        </g>
-    </mask>
-    <linearGradient id="l" gradientTransform="matrix(0 0.37 -0.98462 0 295.38501 -30.360001)" gradientUnits="userSpaceOnUse" x1="300" x2="428" y1="235" y2="235">
-        <stop offset="0" stop-color="#f9f06b"/>
-        <stop offset="1" stop-color="#f5c211"/>
-    </linearGradient>
-    <clipPath id="m">
-        <rect height="128" width="128"/>
-    </clipPath>
-    <clipPath id="n">
-        <rect height="128" width="128"/>
-    </clipPath>
-    <path d="m 51 18 h 26 c 4.417969 0 8 3.582031 8 8 v 26 c 0 4.417969 -3.582031 8 -8 8 h -26 c -4.417969 0 -8 -3.582031 -8 -8 v -26 c 0 -4.417969 3.582031 -8 8 -8 z m 0 0" fill="url(#a)"/>
-    <path d="m 51 12 h 26 c 4.417969 0 8 3.582031 8 8 v 26 c 0 4.417969 -3.582031 8 -8 8 h -26 c -4.417969 0 -8 -3.582031 -8 -8 v -26 c 0 -4.417969 3.582031 -8 8 -8 z m 0 0" fill="#57e389"/>
-    <path d="m 76.976562 55.453125 c 1.480469 -0.855469 3.371094 -0.347656 4.226563 1.132813 l 6.742187 11.679687 c 0.855469 1.480469 0.347657 3.371094 -1.132812 4.226563 c -1.480469 0.851562 -3.371094 0.347656 -4.226562 -1.132813 l -6.742188 -11.679687 c -0.855469 -1.480469 -0.347656 -3.371094 1.132812 -4.226563 z m 0 0" fill="url(#c)"/>
-    <path d="m 52.8125 55.453125 c -1.480469 -0.855469 -3.371094 -0.347656 -4.226562 1.132813 l -6.742188 11.679687 c -0.855469 1.480469 -0.347656 3.371094 1.132812 4.226563 c 1.480469 0.851562 3.371094 0.347656 4.226563 -1.132813 l 6.742187 -11.679687 c 0.855469 -1.480469 0.347657 -3.371094 -1.132812 -4.226563 z m 0 0" fill="url(#d)"/>
-    <path d="m 22 74 h 26 c 4.417969 0 8 3.582031 8 8 v 26 c 0 4.417969 -3.582031 8 -8 8 h -26 c -4.417969 0 -8 -3.582031 -8 -8 v -26 c 0 -4.417969 3.582031 -8 8 -8 z m 0 0" fill="url(#e)"/>
-    <path d="m 22 68 h 26 c 4.417969 0 8 3.582031 8 8 v 26 c 0 4.417969 -3.582031 8 -8 8 h -26 c -4.417969 0 -8 -3.582031 -8 -8 v -26 c 0 -4.417969 3.582031 -8 8 -8 z m 0 0" fill="#dc8add"/>
-    <path d="m 80 74 h 26 c 4.417969 0 8 3.582031 8 8 v 26 c 0 4.417969 -3.582031 8 -8 8 h -26 c -4.417969 0 -8 -3.582031 -8 -8 v -26 c 0 -4.417969 3.582031 -8 8 -8 z m 0 0" fill="url(#f)"/>
-    <path d="m 80 68 h 26 c 4.417969 0 8 3.582031 8 8 v 26 c 0 4.417969 -3.582031 8 -8 8 h -26 c -4.417969 0 -8 -3.582031 -8 -8 v -26 c 0 -4.417969 3.582031 -8 8 -8 z m 0 0" fill="#ffa348"/>
-    <g clip-path="url(#n)" mask="url(#j)">
-        <g clip-path="url(#m)" mask="url(#k)">
-            <path d="m 128 80.640625 v 47.359375 h -128 v -47.359375 z m 0 0" fill="url(#l)"/>
-            <path d="m 13.308594 80.640625 l 47.355468 47.359375 h 21.214844 l -47.359375 -47.359375 z m 42.421875 0 l 47.363281 47.359375 h 21.214844 l -47.363282 -47.359375 z m 42.429687 0 l 29.839844 29.839844 v -21.210938 l -8.628906 -8.628906 z m -98.160156 7.90625 v 21.214844 l 18.238281 18.238281 h 21.214844 z m 0 0"/>
-        </g>
-    </g>
-</svg>

demos/node-editor/data/scalable/apps/org.gtk.gtk4.NodeEditor.svg

@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg height="128px" viewBox="0 0 128 128" width="128px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <linearGradient id="a" gradientUnits="userSpaceOnUse" x1="43.000351" x2="85.000351" y1="39.000164" y2="39.000164">
-        <stop offset="0" stop-color="#26a269"/>
-        <stop offset="0.0934161" stop-color="#84e3b7"/>
-        <stop offset="0.330831" stop-color="#26a269"/>
-        <stop offset="0.686952" stop-color="#26a269"/>
-        <stop offset="0.89736" stop-color="#175e3c"/>
-        <stop offset="1" stop-color="#26a269"/>
-    </linearGradient>
-    <linearGradient id="b" gradientUnits="userSpaceOnUse">
-        <stop offset="0" stop-color="#c0bfbc"/>
-        <stop offset="0.154754" stop-color="#ffffff"/>
-        <stop offset="0.433722" stop-color="#bdbbb5"/>
-        <stop offset="0.650505" stop-color="#c1c0ba"/>
-        <stop offset="0.825253" stop-color="#ffffff"/>
-        <stop offset="1" stop-color="#c0bfbc"/>
-    </linearGradient>
-    <linearGradient id="c" gradientTransform="matrix(0.0811899 -0.046875 0.069079 0.119648 307.03142 127.069456)" x1="-1710.210571" x2="-1774.45166" xlink:href="#b" y1="-1202.376709" y2="-1202.376709"/>
-    <linearGradient id="d" gradientTransform="matrix(-0.0811899 -0.046875 -0.069079 0.119648 -177.242852 127.069447)" x1="-1710.210571" x2="-1774.45166" xlink:href="#b" y1="-1202.376709" y2="-1202.376709"/>
-    <linearGradient id="e" gradientUnits="userSpaceOnUse" x1="14" x2="56" y1="94.999964" y2="94.999964">
-        <stop offset="0" stop-color="#813d9c"/>
-        <stop offset="0.109119" stop-color="#b378ca"/>
-        <stop offset="0.241583" stop-color="#813d9c"/>
-        <stop offset="0.731841" stop-color="#813d9c"/>
-        <stop offset="0.872163" stop-color="#4d255d"/>
-        <stop offset="1" stop-color="#813d9c"/>
-    </linearGradient>
-    <linearGradient id="f" gradientUnits="userSpaceOnUse" x1="72" x2="114" y1="94.999964" y2="94.999964">
-        <stop offset="0" stop-color="#e66100"/>
-        <stop offset="0.0678478" stop-color="#ff903e"/>
-        <stop offset="0.168852" stop-color="#e66100"/>
-        <stop offset="0.886626" stop-color="#e66100"/>
-        <stop offset="1" stop-color="#9d4200"/>
-    </linearGradient>
-    <path d="m 51 18 h 26 c 4.417969 0 8 3.582031 8 8 v 26 c 0 4.417969 -3.582031 8 -8 8 h -26 c -4.417969 0 -8 -3.582031 -8 -8 v -26 c 0 -4.417969 3.582031 -8 8 -8 z m 0 0" fill="url(#a)"/>
-    <path d="m 51 12 h 26 c 4.417969 0 8 3.582031 8 8 v 26 c 0 4.417969 -3.582031 8 -8 8 h -26 c -4.417969 0 -8 -3.582031 -8 -8 v -26 c 0 -4.417969 3.582031 -8 8 -8 z m 0 0" fill="#57e389"/>
-    <path d="m 76.976562 55.453125 c 1.480469 -0.855469 3.371094 -0.347656 4.226563 1.132813 l 6.742187 11.679687 c 0.855469 1.480469 0.347657 3.371094 -1.132812 4.226563 c -1.480469 0.851562 -3.371094 0.347656 -4.226562 -1.132813 l -6.742188 -11.679687 c -0.855469 -1.480469 -0.347656 -3.371094 1.132812 -4.226563 z m 0 0" fill="url(#c)"/>
-    <path d="m 52.8125 55.453125 c -1.480469 -0.855469 -3.371094 -0.347656 -4.226562 1.132813 l -6.742188 11.679687 c -0.855469 1.480469 -0.347656 3.371094 1.132812 4.226563 c 1.480469 0.851562 3.371094 0.347656 4.226563 -1.132813 l 6.742187 -11.679687 c 0.855469 -1.480469 0.347657 -3.371094 -1.132812 -4.226563 z m 0 0" fill="url(#d)"/>
-    <path d="m 22 74 h 26 c 4.417969 0 8 3.582031 8 8 v 26 c 0 4.417969 -3.582031 8 -8 8 h -26 c -4.417969 0 -8 -3.582031 -8 -8 v -26 c 0 -4.417969 3.582031 -8 8 -8 z m 0 0" fill="url(#e)"/>
-    <path d="m 22 68 h 26 c 4.417969 0 8 3.582031 8 8 v 26 c 0 4.417969 -3.582031 8 -8 8 h -26 c -4.417969 0 -8 -3.582031 -8 -8 v -26 c 0 -4.417969 3.582031 -8 8 -8 z m 0 0" fill="#dc8add"/>
-    <path d="m 80 74 h 26 c 4.417969 0 8 3.582031 8 8 v 26 c 0 4.417969 -3.582031 8 -8 8 h -26 c -4.417969 0 -8 -3.582031 -8 -8 v -26 c 0 -4.417969 3.582031 -8 8 -8 z m 0 0" fill="url(#f)"/>
-    <path d="m 80 68 h 26 c 4.417969 0 8 3.582031 8 8 v 26 c 0 4.417969 -3.582031 8 -8 8 h -26 c -4.417969 0 -8 -3.582031 -8 -8 v -26 c 0 -4.417969 3.582031 -8 8 -8 z m 0 0" fill="#ffa348"/>
-</svg>

demos/node-editor/data/symbolic/apps/org.gtk.gtk4.NodeEditor-symbolic.svg

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg height="16px" viewBox="0 0 16 16" width="16px" xmlns="http://www.w3.org/2000/svg">
-    <path d="m 5.75 1 c -0.414062 0 -0.75 0.335938 -0.75 0.75 v 4.5 c 0 0.414062 0.335938 0.75 0.75 0.75 h 0.191406 l -1 2 h -3.191406 c -0.414062 0 -0.75 0.335938 -0.75 0.75 v 4.5 c 0 0.414062 0.335938 0.75 0.75 0.75 h 4.5 c 0.414062 0 0.75 -0.335938 0.75 -0.75 v -4.5 c 0 -0.414062 -0.335938 -0.75 -0.75 -0.75 h -0.191406 l 1 -2 h 1.882812 l 1 2 h -0.191406 c -0.414062 0 -0.75 0.335938 -0.75 0.75 v 4.5 c 0 0.414062 0.335938 0.75 0.75 0.75 h 4.5 c 0.414062 0 0.75 -0.335938 0.75 -0.75 v -4.5 c 0 -0.414062 -0.335938 -0.75 -0.75 -0.75 h -3.191406 l -1 -2 h 0.191406 c 0.414062 0 0.75 -0.335938 0.75 -0.75 v -4.5 c 0 -0.414062 -0.335938 -0.75 -0.75 -0.75 z m 0 0"/>
-</svg>

demos/node-editor/help-window.ui

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <object class="GtkWindow" id="window">
-    <style>
-      <class name="devel"/>
-    </style>
-    <property name="title" translatable="yes">Help</property>
-    <property name="default-width">720</property>
-    <property name="default-height">520</property>
-    <child>
-      <object class="GtkScrolledWindow">
-        <child>
-          <object class="GtkTextView" id="text_view">
-            <property name="wrap-mode">word</property>
-            <property name="left-margin">20</property>
-            <property name="right-margin">20</property>
-            <property name="top-margin">20</property>
-            <property name="bottom-margin">20</property>
-            <property name="buffer">
-              <object class="GtkTextBuffer" id="buffer"/>
-            </property>
-          </object>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>

demos/node-editor/meson.build

@@ -19,12 +19,3 @@ executable('gtk4-node-editor',
            gui_app: true,
            link_args: extra_demo_ldflags,
            install: false)
-
-# icons
-icontheme_dir = join_paths(gtk_datadir, 'icons/hicolor')
-
-foreach size: ['scalable', 'symbolic']
-  install_subdir('data/' + size,
-    install_dir: icontheme_dir
-  )
-endforeach

demos/node-editor/node-editor-application.c

@@ -51,121 +51,21 @@ node_editor_application_init (NodeEditorApplication *app)
 }
 
 static void
-activate_about (GSimpleAction *action,
+quit_activated (GSimpleAction *action,
                 GVariant      *parameter,
-                gpointer       user_data)
-{
-  GtkApplication *app = user_data;
-  char *version;
-  GString *s;
-  GskRenderer *gsk_renderer;
-  const char *renderer;
-
-  s = g_string_new ("");
-
-  g_string_append (s, "System libraries\n");
-  g_string_append_printf (s, "\tGLib\t%d.%d.%d\n",
-                          glib_major_version,
-                          glib_minor_version,
-                          glib_micro_version);
-  g_string_append_printf (s, "\tPango\t%s\n",
-                          pango_version_string ());
-  g_string_append_printf (s, "\tGTK\t%d.%d.%d\n",
-                          gtk_get_major_version (),
-                          gtk_get_minor_version (),
-                          gtk_get_micro_version ());
-
-  gsk_renderer = gtk_native_get_renderer (GTK_NATIVE (gtk_application_get_active_window (app)));
-  if (strcmp (G_OBJECT_TYPE_NAME (gsk_renderer), "GskVulkanRenderer") == 0)
-    renderer = "Vulkan";
-  else if (strcmp (G_OBJECT_TYPE_NAME (gsk_renderer), "GskGLRenderer") == 0)
-    renderer = "OpenGL";
-  else if (strcmp (G_OBJECT_TYPE_NAME (gsk_renderer), "GskCairoRenderer") == 0)
-    renderer = "Cairo";
-  else
-    renderer = "Unknown";
-
-  g_string_append_printf (s, "\nRenderer\n\t%s", renderer);
-
-  version = g_strdup_printf ("%s\nRunning against GTK %d.%d.%d",
-                             PACKAGE_VERSION,
-                             gtk_get_major_version (),
-                             gtk_get_minor_version (),
-                             gtk_get_micro_version ());
-
-  gtk_show_about_dialog (GTK_WINDOW (gtk_application_get_active_window (app)),
-                         "program-name", "GTK Node Editor",
-                         "version", version,
-                         "copyright", "© 2019—2020 The GTK Team",
-                         "license-type", GTK_LICENSE_LGPL_2_1,
-                         "website", "http://www.gtk.org",
-                         "comments", "Program to test GTK rendering",
-                         "authors", (const char *[]){ "Benjamin Otte", "Timm Bäder", NULL},
-                         "logo-icon-name", "org.gtk.gtk4.NodeEditor.Devel",
-                         "title", "About GTK Node Editor",
-                         "system-information", s->str,
-                         NULL);
-
-  g_string_free (s, TRUE);
-  g_free (version);
-}
-
-static void
-activate_quit (GSimpleAction *action,
-               GVariant      *parameter,
-               gpointer       data)
+                gpointer       data)
 {
   g_application_quit (G_APPLICATION (data));
 }
 
-static void
-activate_inspector (GSimpleAction *action,
-                    GVariant      *parameter,
-                    gpointer       user_data)
-{
-  gtk_window_set_interactive_debugging (TRUE);
-}
-
-static void
-activate_help (GSimpleAction *action,
-               GVariant      *parameter,
-               gpointer       user_data)
-{
-  GtkBuilder *builder;
-  GtkWidget *window;
-  GtkTextBuffer *buffer;
-  GBytes *bytes;
-  const char *text;
-  gsize len;
-
-  builder = gtk_builder_new ();
-  gtk_builder_add_from_resource (builder, "/org/gtk/gtk4/node-editor/help-window.ui", NULL);
-  window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
-  buffer = GTK_TEXT_BUFFER (gtk_builder_get_object (builder, "buffer"));
-
-  bytes = g_resources_lookup_data ("/org/gtk/gtk4/node-editor/node-format.md",
-                                   G_RESOURCE_LOOKUP_FLAGS_NONE,
-                                   NULL);
-  text = g_bytes_get_data (bytes, &len);
-  gtk_text_buffer_set_text (buffer, text, len);
-  g_bytes_unref (bytes);
-
-  gtk_window_present (GTK_WINDOW (window));
-  g_object_unref (builder);
-}
-
 static GActionEntry app_entries[] =
 {
-  { "about", activate_about, NULL, NULL, NULL },
-  { "quit", activate_quit, NULL, NULL, NULL },
-  { "inspector", activate_inspector, NULL, NULL, NULL },
-  { "help", activate_help, NULL, NULL, NULL },
+  { "quit", quit_activated, NULL, NULL, NULL }
 };
 
 static void
 node_editor_application_startup (GApplication *app)
 {
-  const char *help_accels[2] = { "F1", NULL };
   const char *quit_accels[2] = { "<Ctrl>Q", NULL };
   const char *open_accels[2] = { "<Ctrl>O", NULL };
   GtkCssProvider *provider;
@@ -175,7 +75,6 @@ node_editor_application_startup (GApplication *app)
   g_action_map_add_action_entries (G_ACTION_MAP (app),
                                    app_entries, G_N_ELEMENTS (app_entries),
                                    app);
-  gtk_application_set_accels_for_action (GTK_APPLICATION (app), "app.help", help_accels);
   gtk_application_set_accels_for_action (GTK_APPLICATION (app), "app.quit", quit_accels);
   gtk_application_set_accels_for_action (GTK_APPLICATION (app), "win.open", open_accels);
 

demos/node-editor/node-editor-window.c

@@ -825,7 +825,6 @@ node_editor_window_create_renderer_widget (gpointer item,
   gtk_widget_set_size_request (box, 120, 90);
 
   label = gtk_label_new (g_object_get_data (G_OBJECT (paintable), "description"));
-  gtk_widget_add_css_class (label, "title-4");
   gtk_box_append (GTK_BOX (box), label);
 
   picture = gtk_picture_new_for_paintable (paintable);

demos/node-editor/node-editor-window.ui

@@ -1,22 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <menu id="gear_menu">
-    <section>
-      <item>
-        <attribute name="label" translatable="yes">_Help</attribute>
-        <attribute name="action">app.help</attribute>
-      </item>
-      <item>
-        <attribute name="label" translatable="yes">_Inspector</attribute>
-        <attribute name="action">app.inspector</attribute>
-      </item>
-      <item>
-        <attribute name="label" translatable="yes">_About Node Editor</attribute>
-        <attribute name="action">app.about</attribute>
-      </item>
-    </section>
-  </menu>
-
   <object class="GtkPopover" id="testcase_popover">
     <child>
       <object class="GtkGrid">
@@ -103,6 +86,7 @@
     <property name="focus-widget">text_view</property>
     <child type="titlebar">
       <object class="GtkHeaderBar" id="header">
+        <property name="show-title-buttons">1</property>
         <child type="start">
           <object class="GtkButton">
             <property name="icon-name">document-open-symbolic</property>
@@ -135,13 +119,6 @@
             <property name="popover">testcase_popover</property>
           </object>
         </child>
-        <child type="end">
-          <object class="GtkMenuButton" id="gear_menu_button">
-            <property name="valign">center</property>
-            <property name="menu-model">gear_menu</property>
-            <property name="icon-name">open-menu-symbolic</property>
-          </object>
-        </child>
       </object>
     </child>
     <child>

demos/node-editor/node-editor.gresource.xml

@@ -2,7 +2,5 @@
 <gresources>
   <gresource prefix="/org/gtk/gtk4/node-editor">
     <file preprocess="xml-stripblanks">node-editor-window.ui</file>
-    <file preprocess="xml-stripblanks">help-window.ui</file>
-    <file>node-format.md</file>
   </gresource>
 </gresources>

demos/node-editor/node-format.md

@@ -1,213 +0,0 @@
-# The Node file format
-
-GSK render nodes can be serialized and deserialized using APIs such as `gsk_render_node_serialize()` and `gsk_render_node_deserialize()`. The intended use for this is development - primarily the development of GTK - by allowing things such as creating testsuites and benchmarks, exchanging nodes in bug reports. GTK includes the `gtk4-node-editor` application for creating such test files.
-
-The format is a text format that follows the [CSS syntax rules](https://drafts.csswg.org/css-syntax-3/). In particular, this means that every array of bytes will produce a render node when parsed, as there is a defined error recovery method. For more details on error handling, please refer to the documentation of the aprsing APIs.
-
-The grammar of a node text representation using [the CSS value definition syntax](https://drafts.csswg.org/css-values-3/#value-defs) looks like this:
-**document**: `<node>\*`
-**node**: container { <document> } | `<node-name> { <property>* }`
-**property**: `<property-name>: <node> | <value> ;`
-
-Each node has its own `<node-name>` and supports a custom set of properties, each with their own `<property-name>` and syntax. The following paragraphs document each of the nodes and their properties.
-
-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.
-
-# Nodes
-
-### container
-
-The **container** node is a special node that allows specifying a list of child nodes. Its contents follow the same rules as an empty document.
-
-### blend
-
-| property | syntax           | default                | printed     |
-| -------- | ---------------- | ---------------------- | ----------- |
-| bottom   | `<node>`         | color { color: #AF0; } | always      |
-| mode     | `<blend-mode>`   | normal                 | non-default |
-| top      | `<node>`         | color { }              | always      |
-
-Creates a node like `gsk_blend_node_new()` with the given properties.
-
-### blur
-
-| property | syntax           | default                | printed     |
-| -------- | ---------------- | ---------------------- | ----------- |
-| blur     | `<number>`       | 1                      | non-default |
-| child    | `<node>`         | color { }              | always      |
-
-Creates a node like `gsk_blur_node_new()` with the given properties.
-
-### border
-
-| property | syntax           | default                | printed     |
-| -------- | ---------------- | ---------------------- | ----------- |
-| color    | `<color>{1,4}`   | black                  | non-default |
-| outline  | `<rounded-rect>` | 50                     | always      |
-| width    | `<number>{1,4}`  | 1                      | non-default |
-
-Creates a node like `gsk_border_node_new()` with the given properties.
-
-For the color and width properties, the values follow the typical CSS order of top, right, bottom, left. If the last/left value isn't given, the 2nd/right value is used. If the 3rd/bottom value isn't given, the 1st/top value is used. And if the 2nd/right value also isn't given, the 1st/top value is used for every 4 values.
-
-### clip
-
-| property | syntax           | default                | printed     |
-| -------- | ---------------- | ---------------------- | ----------- |
-| child    | `<node>`         | color { }              | always      |
-| clip     | `<rounded-rect>` | 50                     | always      |
-
-Creates a node like `gsk_clip_node_new()` with the given properties.
-
-As an extension, this node allows specifying a rounded rectangle for the clip property. If that rectangle is indeed rounded, a node like `gsk_rounded_clip_node_new()` will be created instead.
-
-### color
-
-| property | syntax           | default                | printed     |
-| -------- | ---------------- | ---------------------- | ----------- |
-| bounds   | `<rect>`         | 50                     | always      |
-| color    | `<color>`        | #FF00CC                | always      |
-
-Creates a node like `gsk_color_node_new()` with the given properties.
-
-The color is chosen as an error pink so it is visible while also reminding people to change it.
-
-### color-matrix
-
-| property | syntax           | default                | printed     |
-| -------- | ---------------- | ---------------------- | ----------- |
-| child    | `<node>`         | color { }              | always      |
-| matrix   | `<transform>`    | none                   | non-default |
-| offset   | `<number>{4}`    | 0 0 0 0                | non-default |
-
-Creates a node like `gsk_color_matrix_node_new()` with the given properties.
-
-The matrix property accepts a <transform> for compatibility purposes, but you should be aware that the allowed values are meant to be used on 3D transformations, so their naming might appear awkward. However, it is always possible to use the matrix3d() production to specify all 16 values individually.
-
-### cross-fade
-
-| property | syntax           | default                | printed     |
-| -------- | ---------------- | ---------------------- | ----------- |
-| end      | `<node>`         | color { }              | always      |
-| mode     | `<number>`       | 0.5                    | non-default |
-| start    | `<node>`         | color { color: #AF0; } | always      |
-
-Creates a node like `gsk_cross_fade_node_new()` with the given properties.
-
-### debug
-
-| property | syntax           | default                | printed     |
-| -------- | ---------------- | ---------------------- | ----------- |
-| child    | `<node>`         | color { }              | always      |
-| message  | `<string>`       | ""                     | non-default |
-
-Creates a node like `gsk_debug_node_new()` with the given properties.
-
-### inset-shadow
-
-| property | syntax           | default                | printed     |
-| -------- | ---------------- | ---------------------- | ----------- |
-| blur     | `<number>`       | 0                      | non-default |
-| color    | `<color>`        | black                  | non-default |
-| dx       | `<number>`       | 1                      | non-default |
-| dy       | `<number>`       | 1                      | non-default |
-| outline  | `<rounded-rect>` | 50                     | always      |
-| spread   | `<number>`       | 0                      | non-default |
-
-Creates a node like `gsk_inset_shadow_node_new()` with the given properties.
-
-### linear-gradient
-
-| property | syntax           | default                | printed     |
-| -------- | ---------------- | ---------------------- | ----------- |
-| bounds   | `<rect>`         | 50                     | always      |
-| end      | `<point>`        | 0 50                   | always      |
-| start    | `<point>`        | 0 0                    | always      |
-| stops    | `<color-stop>`   | 0 #AF0, 1 #F0C         | always      |
-
-Creates a node like `gsk_linear_gradient_node_new()` with the given properties.
-
-### opacity
-
-| property | syntax           | default                | printed     |
-| -------- | ---------------- | ---------------------- | ----------- |
-| child    | `<node>`         | color { }              | always      |
-| opacity  | `<number>`       | 0.5                    | non-default |
-
-Creates a node like `gsk_transform_node_new()` with the given properties.
-
-### outset-shadow
-
-| property | syntax           | default                | printed     |
-| -------- | ---------------- | ---------------------- | ----------- |
-| blur     | `<number>`       | 0                      | non-default |
-| color    | `<color>`        | black                  | non-default |
-| dx       | `<number>`       | 1                      | non-default |
-| dy       | `<number>`       | 1                      | non-default |
-| outline  | `<rounded-rect>` | 50                     | always      |
-| spread   | `<number>`       | 0                      | non-default |
-
-Creates a node like `gsk_outset_shadow_node_new()` with the given properties.
-
-### repeat
-
-| property | syntax           | default                | printed     |
-| -------- | ---------------- | ---------------------- | ----------- |
-| bounds   | `<rect>`         | *bounds of child node* | non-default |
-| child    | `<node>`         | color { }              | always      |
-| child-bounds| `<rect>`      | *bounds of child node* | non-default |
-
-Creates a node like `gsk_repeat_node_new()` with the given properties.
-
-### rounded-clip
-
-| property | syntax           | default                | printed     |
-| -------- | ---------------- | ---------------------- | ----------- |
-| child    | `<node>`         | color { }              | always      |
-| clip     | `<rounded-rect>` | 50                     | always      |
-
-Creates a node like `gsk_rounded_clip_node_new()` with the given properties.
-
-### shadow
-
-| property | syntax           | default                | printed     |
-| -------- | ---------------- | ---------------------- | ----------- |
-| child    | `<node>`         | color { }              | always      |
-| shadow   | `<shadow>`       | black 1 1              | always      |
-
-Creates a node like `gsk_shadow_node_new()` with the given properties.
-
-### text
-
-| property | syntax           | default                | printed     |
-| -------- | ---------------- | ---------------------- | ----------- |
-| color    | `<color>`        | black                  | non-default |
-| font     | `<string>`       | "Cantarell 11"         | always      |
-| glyphs   | `<glyphs>`       | "Hello"                | always      |
-| offset   | `<point>`        | 0 0                    | non-default |
-
-Creates a node like `gsk_text_node_new()` with the given properties.
-
-If the given font does not exist or the given glyphs are invalid for the given font, an error node will be returned.
-
-### texture
-
-| property | syntax           | default                | printed     |
-| -------- | ---------------- | ---------------------- | ----------- |
-| bounds   | `<rect>`         | 50                     | always      |
-| texture  | `<url>`          | *see below*            | always      |
-
-Creates a node like `gsk_texture_node_new()` with the given properties.
-
-The default texture is a 10x10 checkerboard with the top left and bottom right 5x5 being in the color #FF00CC and the other part being transparent. A possible representation for this texture is `url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAABmJLR0QA/wD/AP+gvaeTAAAAKUlEQVQYlWP8z3DmPwMaYGQwYUQXY0IXwAUGUCGGoxkYGBiweXAoeAYAz44F3e3U1xUAAAAASUVORK5CYII=")
-`.
-
-### transform
-
-| property | syntax           | default                | printed     |
-| -------- | ---------------- | ---------------------- | ----------- |
-| child    | `<node>`         | color { }              | always      |
-| transform| `<transform>`    | none                   | non-default |
-
-Creates a node like `gsk_transform_node_new()` with the given properties.
-

demos/print-editor/data/scalable/apps/org.gtk.PrintEditor4.Devel.svg

@@ -1,179 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg height="128px" viewBox="0 0 128 128" width="128px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <defs>
-        <linearGradient id="a" gradientTransform="matrix(0.232143 0 0 0.328947 -7.567033 263.82666)" gradientUnits="userSpaceOnUse" x1="88.595886" x2="536.595886" y1="-449.394012" y2="-449.394012">
-            <stop offset="0" stop-color="#acabae"/>
-            <stop offset="0.0384615" stop-color="#deddda"/>
-            <stop offset="0.0768555" stop-color="#c0bfbc"/>
-            <stop offset="0.923077" stop-color="#c0bfbc"/>
-            <stop offset="0.961538" stop-color="#deddda"/>
-            <stop offset="1" stop-color="#9a9996"/>
-        </linearGradient>
-        <linearGradient id="b" gradientUnits="userSpaceOnUse" x1="26.999876" x2="100.999876" y1="32.999688" y2="32.999688">
-            <stop offset="0" stop-color="#7e7c77"/>
-            <stop offset="0.3" stop-color="#9a9996"/>
-            <stop offset="1" stop-color="#9a9996"/>
-        </linearGradient>
-        <linearGradient id="c" gradientUnits="userSpaceOnUse" x1="67.467916" x2="67.467916" y1="83.999688" y2="36.782906">
-            <stop offset="0" stop-color="#deddda"/>
-            <stop offset="1" stop-color="#c0bfbc"/>
-        </linearGradient>
-        <clipPath id="d">
-            <path d="m 79 72 h 15 v 16 h -15 z m 0 0"/>
-        </clipPath>
-        <clipPath id="e">
-            <path d="m 93.21875 72.921875 l -14.21875 14.21875 h -4.0625 v -18.28125 h 18.28125 z m 0 0"/>
-        </clipPath>
-        <linearGradient id="f" gradientTransform="matrix(0 0.126951 0.126951 0 76.460862 36.359884)" gradientUnits="userSpaceOnUse" x1="344" x2="340" y1="76" y2="72">
-            <stop offset="0" stop-color="#d5d3cf"/>
-            <stop offset="1" stop-color="#ffffff"/>
-        </linearGradient>
-        <filter id="g" height="100%" width="100%" x="0%" y="0%">
-            <feColorMatrix in="SourceGraphic" type="matrix" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
-        </filter>
-        <mask id="h">
-            <g filter="url(#g)">
-                <rect fill-opacity="0.396" height="128" width="128"/>
-            </g>
-        </mask>
-        <linearGradient id="i" gradientUnits="userSpaceOnUse">
-            <stop offset="0" stop-color="#1c71d8"/>
-            <stop offset="0.323117" stop-color="#62a0ea"/>
-            <stop offset="0.59387" stop-color="#1b5aa6"/>
-            <stop offset="1" stop-color="#1c71d8"/>
-        </linearGradient>
-        <linearGradient id="j" gradientTransform="matrix(1.597748 1.597748 -1.06066 1.06066 -56.853041 -543.720139)" x1="224.504562" x2="231.453873" xlink:href="#i" y1="282.5" y2="282.5"/>
-        <radialGradient id="k" cx="227.599915" cy="201.029724" gradientTransform="matrix(4.072817 4.073078 -5.940048 5.939073 373.883117 -2098.049112)" gradientUnits="userSpaceOnUse" r="2.5">
-            <stop offset="0" stop-color="#93bdf1"/>
-            <stop offset="1" stop-color="#1a5fb4"/>
-        </radialGradient>
-        <linearGradient id="l" gradientTransform="matrix(2.121328 2.121328 -2.174353 2.174353 181.766074 -1021.145947)" gradientUnits="userSpaceOnUse" x1="226.90625" x2="228.86203" y1="288.75" y2="288.767151">
-            <stop offset="0" stop-color="#77767b"/>
-            <stop offset="0.443872" stop-color="#f6f5f4"/>
-            <stop offset="1" stop-color="#5e5c64"/>
-        </linearGradient>
-        <linearGradient id="m" gradientTransform="matrix(1.258421 1.258421 -1.06066 1.06066 57.381892 -503.024312)" gradientUnits="userSpaceOnUse" x1="223.1875" x2="233.0625" y1="278" y2="278">
-            <stop offset="0" stop-color="#ffa348"/>
-            <stop offset="0.265823" stop-color="#ffd7af"/>
-            <stop offset="0.734177" stop-color="#ff8d1c"/>
-            <stop offset="1" stop-color="#ffa348"/>
-        </linearGradient>
-        <linearGradient id="n" gradientTransform="matrix(1.573027 1.573027 -1.06066 1.06066 -14.348129 -574.754333)" x1="224.504562" x2="231.453873" xlink:href="#i" y1="282.5" y2="282.5"/>
-        <clipPath id="o">
-            <path d="m 79 72 h 15 v 16 h -15 z m 0 0"/>
-        </clipPath>
-        <clipPath id="p">
-            <path d="m 93.21875 72.921875 l -14.21875 14.21875 h -4.0625 v -18.28125 h 18.28125 z m 0 0"/>
-        </clipPath>
-        <mask id="q">
-            <g filter="url(#g)">
-                <rect fill-opacity="0.396" height="128" width="128"/>
-            </g>
-        </mask>
-        <clipPath id="r">
-            <rect height="152" width="192"/>
-        </clipPath>
-        <g id="s" clip-path="url(#r)">
-            <path d="m 29 112 c -4.433594 0 -8 -3.566406 -8 -8 v -2 c 0 4.433594 3.566406 8 8 8 h 88 c 4.433594 0 8 -3.566406 8 -8 v 2 c 0 4.433594 -3.566406 8 -8 8 z m 0 0" fill="#f6f5f4"/>
-        </g>
-        <clipPath id="t">
-            <rect height="128" width="128"/>
-        </clipPath>
-        <clipPath id="u">
-            <rect height="128" width="128"/>
-        </clipPath>
-        <mask id="v">
-            <g clip-path="url(#u)" filter="url(#g)">
-                <g clip-path="url(#t)">
-                    <path d="m 21 16 c -4.433594 0 -8 3.566406 -8 8 v 84 c 0 4.433594 3.566406 8 8 8 h 4 v -4 h 80 v 4 h 4 c 4.433594 0 8 -3.566406 8 -8 v -84 c 0 -4.433594 -3.566406 -8 -8 -8 z m 0 0" fill="url(#a)"/>
-                    <path d="m 21 12 h 88 c 4.417969 0 8 3.582031 8 8 v 68 c 0 4.417969 -3.582031 8 -8 8 h -88 c -4.417969 0 -8 -3.582031 -8 -8 v -68 c 0 -4.417969 3.582031 -8 8 -8 z m 0 0" fill="#deddda"/>
-                    <path d="m 27 28 h 74 v 10 h -74 z m 0 0" fill="url(#b)"/>
-                    <path d="m 27 38 h 74 v 46 h -74 z m 0 0" fill="url(#c)"/>
-                    <path d="m 24 33 c 0 1.65625 -1.34375 3 -3 3 s -3 -1.34375 -3 -3 s 1.34375 -3 3 -3 s 3 1.34375 3 3 z m 0 0" fill="#bf5f00" fill-opacity="0.964567"/>
-                    <path d="m 18 40 h 6 v 12 h -6 z m 0 0" fill="#acacac" fill-opacity="0.984252"/>
-                    <path d="m 18 40 h 6 v 10 h -6 z m 0 0" fill="#d1d1d1" fill-opacity="0.984252"/>
-                    <path d="m 37 36 h 56 v 44 h -56 z m 0 0" fill="#deddda" fill-opacity="0.984252"/>
-                    <path d="m 37 34 h 56 c 1.105469 0 2 0.894531 2 2 s -0.894531 2 -2 2 h -56 c -1.105469 0 -2 -0.894531 -2 -2 s 0.894531 -2 2 -2 z m 0 0" fill-opacity="0.940945"/>
-                    <path d="m 37 36.859375 h 56 v 36.925781 l -14.125 14.214844 h -41.875 z m 0 0" fill="#9a9996" fill-opacity="0.984252"/>
-                    <path d="m 37 36 h 56 v 36.925781 l -14.125 14.214844 h -41.875 z m 0 0" fill="#f6f5f4" fill-opacity="0.984252"/>
-                    <g clip-path="url(#o)">
-                        <g clip-path="url(#p)">
-                            <path d="m 79 77.386719 v 9.351562 c 0 2.464844 2 4.464844 4.464844 4.464844 h 9.351562 c 2.464844 0 4.464844 -2 4.464844 -4.464844 v -9.351562 c 0 -2.464844 -2 -4.464844 -4.464844 -4.464844 h -9.351562 c -2.464844 0 -4.464844 2 -4.464844 4.464844 z m 0 0" fill="url(#f)"/>
-                        </g>
-                    </g>
-                    <path d="m 27 100 h 76 c 1.109375 0 2 0.890625 2 2 v 10 h -80 v -10 c 0 -1.109375 0.890625 -2 2 -2 z m 0 0" fill="#5e5c64" fill-opacity="0.940945"/>
-                    <path d="m 27 102 h 76 c 1.109375 0 2 0.890625 2 2 v 10 h -80 v -10 c 0 -1.109375 0.890625 -2 2 -2 z m 0 0" fill="#9a9996"/>
-                    <path d="m 13 106 v 2 c 0 4.433594 3.566406 8 8 8 h 4 v -2 h -4 c -4.433594 0 -8 -3.566406 -8 -8 z m 104 0 c 0 4.433594 -3.566406 8 -8 8 h -4 v 2 h 4 c 4.433594 0 8 -3.566406 8 -8 z m -92 6 v 2 h 80 v -2 z m 0 0" fill="#9e9c99" fill-opacity="0.366142"/>
-                    <path d="m 27 38 v 46 l 6 -46 z m 0 0" fill="#7e7c77" fill-opacity="0.11811"/>
-                    <path d="m 24 32 c 0 1.65625 -1.34375 3 -3 3 s -3 -1.34375 -3 -3 s 1.34375 -3 3 -3 s 3 1.34375 3 3 z m 0 0" fill="#ffa348" fill-opacity="0.964567"/>
-                    <use mask="url(#q)" transform="matrix(1 0 0 1 -8 -16)" xlink:href="#s"/>
-                    <path d="m 89.503906 31.144531 l 10.066406 10.066407 l -41.71875 41.71875 l -10.066406 -10.066407 z m 0 0" fill="#ffa348"/>
-                    <path d="m 88.246094 29.886719 l 7.550781 7.550781 l -41.71875 41.71875 l -7.550781 -7.550781 z m 0 0" fill="#ff7800"/>
-                    <path d="m 86.789062 28.429688 l 2.515626 2.515624 l -41.71875 41.71875 l -2.515626 -2.515624 z m 0 0" fill="#ffbe6f"/>
-                    <path d="m 121.898438 -0.101562 c -4.855469 0.921874 -11.730469 5.152343 -18.140626 11.558593 l -16.96875 16.972657 l 12.78125 12.78125 l 16.972657 -16.972657 c 6.40625 -6.40625 10.636719 -13.28125 11.558593 -18.136719 z m 0 0" fill="url(#j)"/>
-                    <path d="m 110.011719 13.882812 c -2.1875 -0.398437 -5.421875 0.988282 -8.167969 3.730469 l -11.871094 11.875 l -6.6875 6.6875 c -4.800781 4.800781 -9.234375 12.007813 -9.648437 13.042969 c -0.484375 1.207031 -0.449219 2.730469 0.953125 4.136719 c 1.40625 1.40625 2.917968 1.441406 4.136718 0.953125 c 1.035157 -0.414063 8.292969 -4.984375 13.042969 -9.648438 l 2.402344 -2.398437 l 16.160156 -16.160157 c 2.742188 -2.746093 4.128907 -5.976562 3.730469 -8.167968 c -0.742188 1.390625 -1.859375 2.902344 -3.308594 4.347656 l -13.996094 13.996094 l -5.089843 -5.089844 l 13.996093 -13.996094 c 1.445313 -1.445312 2.960938 -2.566406 4.347657 -3.308594 z m 0 0" fill="url(#k)"/>
-                    <path d="m 95.273438 36.914062 l -2.960938 2.960938 l -2.398438 2.402344 c -4.90625 5.101562 -11.855468 10.828125 -11.855468 10.828125 c 1.011718 -0.433594 8.167968 -5.101563 12.914062 -9.769531 l 2.402344 -2.402344 l 2.960938 -2.957032 z m 0 0" fill="#62a0ea"/>
-                    <path d="m 87.320312 26.835938 l 13.789063 13.789062 c 0.292969 0.292969 0.292969 0.769531 0 1.0625 s -0.769531 0.292969 -1.0625 0 l -13.789063 -13.789062 c -0.292968 -0.292969 -0.292968 -0.769532 0 -1.0625 c 0.292969 -0.289063 0.769532 -0.289063 1.0625 0 z m 0 0" fill="#3584e4"/>
-                    <path d="m 42.421875 89.765625 c -3 3 -6.382813 4.484375 -7.554687 3.3125 c -1.171876 -1.171875 0.3125 -4.554687 3.3125 -7.554687 c 3.003906 -3.003907 6.386718 -4.488282 7.558593 -3.316407 s -0.3125 4.554688 -3.316406 7.558594 z m 0 0" fill="url(#l)"/>
-                    <path d="m 45.269531 70.347656 l -7.851562 12.511719 l 7.835937 7.925781 l 12.597656 -7.855468 z m -6.039062 13.171875 l 5.449219 5.449219 c 0.347656 0.347656 0.449218 0.933594 0.097656 1.160156 c -0.886719 0.570313 -2.9375 1.539063 -2.9375 1.539063 c -0.25 0.128906 -0.539063 0.164062 -0.773438 -0.066407 l -4.546875 -4.550781 c -0.234375 -0.230469 -0.207031 -0.527343 -0.066406 -0.773437 l 1.617187 -2.859375 c 0.207032 -0.363281 0.8125 -0.25 1.160157 0.101562 z m 0 0" fill="url(#m)"/>
-                    <path d="m 43.332031 74.777344 l 9.867188 9.867187 c 0.394531 0.390625 0.476562 0.871094 0.128906 1.066407 l -7.710937 5.253906 c -0.308594 0.210937 -0.785157 0.160156 -1.171876 -0.226563 l -6.984374 -6.988281 c -0.386719 -0.386719 -0.4375 -0.859375 -0.230469 -1.167969 l 5.234375 -7.8125 c 0.125 -0.285156 0.558594 -0.304687 0.867187 0.007813 z m 0 0" fill="url(#n)"/>
-                </g>
-            </g>
-        </mask>
-        <mask id="w">
-            <g filter="url(#g)">
-                <rect fill-opacity="0.8" height="128" width="128"/>
-            </g>
-        </mask>
-        <linearGradient id="x" gradientTransform="matrix(0 0.37 -0.98462 0 295.38501 -30.360001)" gradientUnits="userSpaceOnUse" x1="300" x2="428" y1="235" y2="235">
-            <stop offset="0" stop-color="#f9f06b"/>
-            <stop offset="1" stop-color="#f5c211"/>
-        </linearGradient>
-        <clipPath id="y">
-            <rect height="128" width="128"/>
-        </clipPath>
-        <clipPath id="z">
-            <rect height="128" width="128"/>
-        </clipPath>
-    </defs>
-    <path d="m 21 16 c -4.433594 0 -8 3.566406 -8 8 v 84 c 0 4.433594 3.566406 8 8 8 h 4 v -4 h 80 v 4 h 4 c 4.433594 0 8 -3.566406 8 -8 v -84 c 0 -4.433594 -3.566406 -8 -8 -8 z m 0 0" fill="url(#a)"/>
-    <path d="m 21 12 h 88 c 4.417969 0 8 3.582031 8 8 v 68 c 0 4.417969 -3.582031 8 -8 8 h -88 c -4.417969 0 -8 -3.582031 -8 -8 v -68 c 0 -4.417969 3.582031 -8 8 -8 z m 0 0" fill="#deddda"/>
-    <path d="m 27 28 h 74 v 10 h -74 z m 0 0" fill="url(#b)"/>
-    <path d="m 27 38 h 74 v 46 h -74 z m 0 0" fill="url(#c)"/>
-    <path d="m 24 33 c 0 1.65625 -1.34375 3 -3 3 s -3 -1.34375 -3 -3 s 1.34375 -3 3 -3 s 3 1.34375 3 3 z m 0 0" fill="#bf5f00" fill-opacity="0.964567"/>
-    <g fill-opacity="0.984252">
-        <path d="m 18 40 h 6 v 12 h -6 z m 0 0" fill="#acacac"/>
-        <path d="m 18 40 h 6 v 10 h -6 z m 0 0" fill="#d1d1d1"/>
-        <path d="m 37 36 h 56 v 44 h -56 z m 0 0" fill="#deddda"/>
-    </g>
-    <path d="m 37 34 h 56 c 1.105469 0 2 0.894531 2 2 s -0.894531 2 -2 2 h -56 c -1.105469 0 -2 -0.894531 -2 -2 s 0.894531 -2 2 -2 z m 0 0" fill-opacity="0.940945"/>
-    <path d="m 37 36.859375 h 56 v 36.925781 l -14.125 14.214844 h -41.875 z m 0 0" fill="#9a9996" fill-opacity="0.984252"/>
-    <path d="m 37 36 h 56 v 36.925781 l -14.125 14.214844 h -41.875 z m 0 0" fill="#f6f5f4" fill-opacity="0.984252"/>
-    <g clip-path="url(#d)">
-        <g clip-path="url(#e)">
-            <path d="m 79 77.386719 v 9.351562 c 0 2.464844 2 4.464844 4.464844 4.464844 h 9.351562 c 2.464844 0 4.464844 -2 4.464844 -4.464844 v -9.351562 c 0 -2.464844 -2 -4.464844 -4.464844 -4.464844 h -9.351562 c -2.464844 0 -4.464844 2 -4.464844 4.464844 z m 0 0" fill="url(#f)"/>
-        </g>
-    </g>
-    <path d="m 27 100 h 76 c 1.109375 0 2 0.890625 2 2 v 10 h -80 v -10 c 0 -1.109375 0.890625 -2 2 -2 z m 0 0" fill="#5e5c64" fill-opacity="0.940945"/>
-    <path d="m 27 102 h 76 c 1.109375 0 2 0.890625 2 2 v 10 h -80 v -10 c 0 -1.109375 0.890625 -2 2 -2 z m 0 0" fill="#9a9996"/>
-    <path d="m 13 106 v 2 c 0 4.433594 3.566406 8 8 8 h 4 v -2 h -4 c -4.433594 0 -8 -3.566406 -8 -8 z m 104 0 c 0 4.433594 -3.566406 8 -8 8 h -4 v 2 h 4 c 4.433594 0 8 -3.566406 8 -8 z m -92 6 v 2 h 80 v -2 z m 0 0" fill="#9e9c99" fill-opacity="0.366142"/>
-    <path d="m 27 38 v 46 l 6 -46 z m 0 0" fill="#7e7c77" fill-opacity="0.11811"/>
-    <path d="m 24 32 c 0 1.65625 -1.34375 3 -3 3 s -3 -1.34375 -3 -3 s 1.34375 -3 3 -3 s 3 1.34375 3 3 z m 0 0" fill="#ffa348" fill-opacity="0.964567"/>
-    <use mask="url(#h)" transform="matrix(1 0 0 1 -8 -16)" xlink:href="#s"/>
-    <path d="m 89.503906 31.144531 l 10.066406 10.066407 l -41.71875 41.71875 l -10.066406 -10.066407 z m 0 0" fill="#ffa348"/>
-    <path d="m 88.246094 29.886719 l 7.550781 7.550781 l -41.71875 41.71875 l -7.550781 -7.550781 z m 0 0" fill="#ff7800"/>
-    <path d="m 86.789062 28.429688 l 2.515626 2.515624 l -41.71875 41.71875 l -2.515626 -2.515624 z m 0 0" fill="#ffbe6f"/>
-    <path d="m 121.898438 -0.101562 c -4.855469 0.921874 -11.730469 5.152343 -18.140626 11.558593 l -16.96875 16.972657 l 12.78125 12.78125 l 16.972657 -16.972657 c 6.40625 -6.40625 10.636719 -13.28125 11.558593 -18.136719 z m 0 0" fill="url(#j)"/>
-    <path d="m 110.011719 13.882812 c -2.1875 -0.398437 -5.421875 0.988282 -8.167969 3.730469 l -11.871094 11.875 l -6.6875 6.6875 c -4.800781 4.800781 -9.234375 12.007813 -9.648437 13.042969 c -0.484375 1.207031 -0.449219 2.730469 0.953125 4.136719 c 1.40625 1.40625 2.917968 1.441406 4.136718 0.953125 c 1.035157 -0.414063 8.292969 -4.984375 13.042969 -9.648438 l 2.402344 -2.398437 l 16.160156 -16.160157 c 2.742188 -2.746093 4.128907 -5.976562 3.730469 -8.167968 c -0.742188 1.390625 -1.859375 2.902344 -3.308594 4.347656 l -13.996094 13.996094 l -5.089843 -5.089844 l 13.996093 -13.996094 c 1.445313 -1.445312 2.960938 -2.566406 4.347657 -3.308594 z m 0 0" fill="url(#k)"/>
-    <path d="m 95.273438 36.914062 l -2.960938 2.960938 l -2.398438 2.402344 c -4.90625 5.101562 -11.855468 10.828125 -11.855468 10.828125 c 1.011718 -0.433594 8.167968 -5.101563 12.914062 -9.769531 l 2.402344 -2.402344 l 2.960938 -2.957032 z m 0 0" fill="#62a0ea"/>
-    <path d="m 87.320312 26.835938 l 13.789063 13.789062 c 0.292969 0.292969 0.292969 0.769531 0 1.0625 s -0.769531 0.292969 -1.0625 0 l -13.789063 -13.789062 c -0.292968 -0.292969 -0.292968 -0.769532 0 -1.0625 c 0.292969 -0.289063 0.769532 -0.289063 1.0625 0 z m 0 0" fill="#3584e4"/>
-    <path d="m 42.421875 89.765625 c -3 3 -6.382813 4.484375 -7.554687 3.3125 c -1.171876 -1.171875 0.3125 -4.554687 3.3125 -7.554687 c 3.003906 -3.003907 6.386718 -4.488282 7.558593 -3.316407 s -0.3125 4.554688 -3.316406 7.558594 z m 0 0" fill="url(#l)"/>
-    <path d="m 45.269531 70.347656 l -7.851562 12.511719 l 7.835937 7.925781 l 12.597656 -7.855468 z m -6.039062 13.171875 l 5.449219 5.449219 c 0.347656 0.347656 0.449218 0.933594 0.097656 1.160156 c -0.886719 0.570313 -2.9375 1.539063 -2.9375 1.539063 c -0.25 0.128906 -0.539063 0.164062 -0.773438 -0.066407 l -4.546875 -4.550781 c -0.234375 -0.230469 -0.207031 -0.527343 -0.066406 -0.773437 l 1.617187 -2.859375 c 0.207032 -0.363281 0.8125 -0.25 1.160157 0.101562 z m 0 0" fill="url(#m)"/>
-    <path d="m 43.332031 74.777344 l 9.867188 9.867187 c 0.394531 0.390625 0.476562 0.871094 0.128906 1.066407 l -7.710937 5.253906 c -0.308594 0.210937 -0.785157 0.160156 -1.171876 -0.226563 l -6.984374 -6.988281 c -0.386719 -0.386719 -0.4375 -0.859375 -0.230469 -1.167969 l 5.234375 -7.8125 c 0.125 -0.285156 0.558594 -0.304687 0.867187 0.007813 z m 0 0" fill="url(#n)"/>
-    <g clip-path="url(#z)" mask="url(#v)">
-        <g clip-path="url(#y)" mask="url(#w)">
-            <path d="m 128 80.640625 v 47.359375 h -128 v -47.359375 z m 0 0" fill="url(#x)"/>
-            <path d="m 13.308594 80.640625 l 47.355468 47.359375 h 21.214844 l -47.359375 -47.359375 z m 42.421875 0 l 47.363281 47.359375 h 21.214844 l -47.363282 -47.359375 z m 42.429687 0 l 29.839844 29.839844 v -21.210938 l -8.628906 -8.628906 z m -98.160156 7.90625 v 21.214844 l 18.238281 18.238281 h 21.214844 z m 0 0"/>
-        </g>
-    </g>
-</svg>

demos/print-editor/data/scalable/apps/org.gtk.PrintEditor4.svg

@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg height="128px" viewBox="0 0 128 128" width="128px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <linearGradient id="a" gradientTransform="matrix(0.232143 0 0 0.328947 -7.567033 263.82666)" gradientUnits="userSpaceOnUse" x1="88.595886" x2="536.595886" y1="-449.394012" y2="-449.394012">
-        <stop offset="0" stop-color="#acabae"/>
-        <stop offset="0.0384615" stop-color="#deddda"/>
-        <stop offset="0.0768555" stop-color="#c0bfbc"/>
-        <stop offset="0.923077" stop-color="#c0bfbc"/>
-        <stop offset="0.961538" stop-color="#deddda"/>
-        <stop offset="1" stop-color="#9a9996"/>
-    </linearGradient>
-    <linearGradient id="b" gradientUnits="userSpaceOnUse" x1="26.999876" x2="100.999876" y1="32.999688" y2="32.999688">
-        <stop offset="0" stop-color="#7e7c77"/>
-        <stop offset="0.3" stop-color="#9a9996"/>
-        <stop offset="1" stop-color="#9a9996"/>
-    </linearGradient>
-    <linearGradient id="c" gradientUnits="userSpaceOnUse" x1="67.467916" x2="67.467916" y1="83.999688" y2="36.782906">
-        <stop offset="0" stop-color="#deddda"/>
-        <stop offset="1" stop-color="#c0bfbc"/>
-    </linearGradient>
-    <clipPath id="d">
-        <path d="m 79 72 h 15 v 16 h -15 z m 0 0"/>
-    </clipPath>
-    <clipPath id="e">
-        <path d="m 93.21875 72.921875 l -14.21875 14.21875 h -4.0625 v -18.28125 h 18.28125 z m 0 0"/>
-    </clipPath>
-    <linearGradient id="f" gradientTransform="matrix(0 0.126951 0.126951 0 76.460862 36.359884)" gradientUnits="userSpaceOnUse" x1="344" x2="340" y1="76" y2="72">
-        <stop offset="0" stop-color="#d5d3cf"/>
-        <stop offset="1" stop-color="#ffffff"/>
-    </linearGradient>
-    <filter id="g" height="100%" width="100%" x="0%" y="0%">
-        <feColorMatrix in="SourceGraphic" type="matrix" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
-    </filter>
-    <mask id="h">
-        <g filter="url(#g)">
-            <rect fill-opacity="0.396" height="128" width="128"/>
-        </g>
-    </mask>
-    <clipPath id="i">
-        <rect height="152" width="192"/>
-    </clipPath>
-    <linearGradient id="j" gradientUnits="userSpaceOnUse">
-        <stop offset="0" stop-color="#1c71d8"/>
-        <stop offset="0.323117" stop-color="#62a0ea"/>
-        <stop offset="0.59387" stop-color="#1b5aa6"/>
-        <stop offset="1" stop-color="#1c71d8"/>
-    </linearGradient>
-    <linearGradient id="k" gradientTransform="matrix(1.597748 1.597748 -1.06066 1.06066 -56.853041 -543.720139)" x1="224.504562" x2="231.453873" xlink:href="#j" y1="282.5" y2="282.5"/>
-    <radialGradient id="l" cx="227.599915" cy="201.029724" gradientTransform="matrix(4.072817 4.073078 -5.940048 5.939073 373.883117 -2098.049112)" gradientUnits="userSpaceOnUse" r="2.5">
-        <stop offset="0" stop-color="#93bdf1"/>
-        <stop offset="1" stop-color="#1a5fb4"/>
-    </radialGradient>
-    <linearGradient id="m" gradientTransform="matrix(2.121328 2.121328 -2.174353 2.174353 181.766074 -1021.145947)" gradientUnits="userSpaceOnUse" x1="226.90625" x2="228.86203" y1="288.75" y2="288.767151">
-        <stop offset="0" stop-color="#77767b"/>
-        <stop offset="0.443872" stop-color="#f6f5f4"/>
-        <stop offset="1" stop-color="#5e5c64"/>
-    </linearGradient>
-    <linearGradient id="n" gradientTransform="matrix(1.258421 1.258421 -1.06066 1.06066 57.381892 -503.024312)" gradientUnits="userSpaceOnUse" x1="223.1875" x2="233.0625" y1="278" y2="278">
-        <stop offset="0" stop-color="#ffa348"/>
-        <stop offset="0.265823" stop-color="#ffd7af"/>
-        <stop offset="0.734177" stop-color="#ff8d1c"/>
-        <stop offset="1" stop-color="#ffa348"/>
-    </linearGradient>
-    <linearGradient id="o" gradientTransform="matrix(1.573027 1.573027 -1.06066 1.06066 -14.348129 -574.754333)" x1="224.504562" x2="231.453873" xlink:href="#j" y1="282.5" y2="282.5"/>
-    <path d="m 21 16 c -4.433594 0 -8 3.566406 -8 8 v 84 c 0 4.433594 3.566406 8 8 8 h 4 v -4 h 80 v 4 h 4 c 4.433594 0 8 -3.566406 8 -8 v -84 c 0 -4.433594 -3.566406 -8 -8 -8 z m 0 0" fill="url(#a)"/>
-    <path d="m 21 12 h 88 c 4.417969 0 8 3.582031 8 8 v 68 c 0 4.417969 -3.582031 8 -8 8 h -88 c -4.417969 0 -8 -3.582031 -8 -8 v -68 c 0 -4.417969 3.582031 -8 8 -8 z m 0 0" fill="#deddda"/>
-    <path d="m 27 28 h 74 v 10 h -74 z m 0 0" fill="url(#b)"/>
-    <path d="m 27 38 h 74 v 46 h -74 z m 0 0" fill="url(#c)"/>
-    <path d="m 24 33 c 0 1.65625 -1.34375 3 -3 3 s -3 -1.34375 -3 -3 s 1.34375 -3 3 -3 s 3 1.34375 3 3 z m 0 0" fill="#bf5f00" fill-opacity="0.964567"/>
-    <g fill-opacity="0.984252">
-        <path d="m 18 40 h 6 v 12 h -6 z m 0 0" fill="#acacac"/>
-        <path d="m 18 40 h 6 v 10 h -6 z m 0 0" fill="#d1d1d1"/>
-        <path d="m 37 36 h 56 v 44 h -56 z m 0 0" fill="#deddda"/>
-    </g>
-    <path d="m 37 34 h 56 c 1.105469 0 2 0.894531 2 2 s -0.894531 2 -2 2 h -56 c -1.105469 0 -2 -0.894531 -2 -2 s 0.894531 -2 2 -2 z m 0 0" fill-opacity="0.940945"/>
-    <path d="m 37 36.859375 h 56 v 36.925781 l -14.125 14.214844 h -41.875 z m 0 0" fill="#9a9996" fill-opacity="0.984252"/>
-    <path d="m 37 36 h 56 v 36.925781 l -14.125 14.214844 h -41.875 z m 0 0" fill="#f6f5f4" fill-opacity="0.984252"/>
-    <g clip-path="url(#d)">
-        <g clip-path="url(#e)">
-            <path d="m 79 77.386719 v 9.351562 c 0 2.464844 2 4.464844 4.464844 4.464844 h 9.351562 c 2.464844 0 4.464844 -2 4.464844 -4.464844 v -9.351562 c 0 -2.464844 -2 -4.464844 -4.464844 -4.464844 h -9.351562 c -2.464844 0 -4.464844 2 -4.464844 4.464844 z m 0 0" fill="url(#f)"/>
-        </g>
-    </g>
-    <path d="m 27 100 h 76 c 1.109375 0 2 0.890625 2 2 v 10 h -80 v -10 c 0 -1.109375 0.890625 -2 2 -2 z m 0 0" fill="#5e5c64" fill-opacity="0.940945"/>
-    <path d="m 27 102 h 76 c 1.109375 0 2 0.890625 2 2 v 10 h -80 v -10 c 0 -1.109375 0.890625 -2 2 -2 z m 0 0" fill="#9a9996"/>
-    <path d="m 13 106 v 2 c 0 4.433594 3.566406 8 8 8 h 4 v -2 h -4 c -4.433594 0 -8 -3.566406 -8 -8 z m 104 0 c 0 4.433594 -3.566406 8 -8 8 h -4 v 2 h 4 c 4.433594 0 8 -3.566406 8 -8 z m -92 6 v 2 h 80 v -2 z m 0 0" fill="#9e9c99" fill-opacity="0.366142"/>
-    <path d="m 27 38 v 46 l 6 -46 z m 0 0" fill="#7e7c77" fill-opacity="0.11811"/>
-    <path d="m 24 32 c 0 1.65625 -1.34375 3 -3 3 s -3 -1.34375 -3 -3 s 1.34375 -3 3 -3 s 3 1.34375 3 3 z m 0 0" fill="#ffa348" fill-opacity="0.964567"/>
-    <g clip-path="url(#i)" mask="url(#h)" transform="matrix(1 0 0 1 -8 -16)">
-        <path d="m 29 112 c -4.433594 0 -8 -3.566406 -8 -8 v -2 c 0 4.433594 3.566406 8 8 8 h 88 c 4.433594 0 8 -3.566406 8 -8 v 2 c 0 4.433594 -3.566406 8 -8 8 z m 0 0" fill="#f6f5f4"/>
-    </g>
-    <path d="m 89.503906 31.144531 l 10.066406 10.066407 l -41.71875 41.71875 l -10.066406 -10.066407 z m 0 0" fill="#ffa348"/>
-    <path d="m 88.246094 29.886719 l 7.550781 7.550781 l -41.71875 41.71875 l -7.550781 -7.550781 z m 0 0" fill="#ff7800"/>
-    <path d="m 86.789062 28.429688 l 2.515626 2.515624 l -41.71875 41.71875 l -2.515626 -2.515624 z m 0 0" fill="#ffbe6f"/>
-    <path d="m 121.898438 -0.101562 c -4.855469 0.921874 -11.730469 5.152343 -18.140626 11.558593 l -16.96875 16.972657 l 12.78125 12.78125 l 16.972657 -16.972657 c 6.40625 -6.40625 10.636719 -13.28125 11.558593 -18.136719 z m 0 0" fill="url(#k)"/>
-    <path d="m 110.011719 13.882812 c -2.1875 -0.398437 -5.421875 0.988282 -8.167969 3.730469 l -11.871094 11.875 l -6.6875 6.6875 c -4.800781 4.800781 -9.234375 12.007813 -9.648437 13.042969 c -0.484375 1.207031 -0.449219 2.730469 0.953125 4.136719 c 1.40625 1.40625 2.917968 1.441406 4.136718 0.953125 c 1.035157 -0.414063 8.292969 -4.984375 13.042969 -9.648438 l 2.402344 -2.398437 l 16.160156 -16.160157 c 2.742188 -2.746093 4.128907 -5.976562 3.730469 -8.167968 c -0.742188 1.390625 -1.859375 2.902344 -3.308594 4.347656 l -13.996094 13.996094 l -5.089843 -5.089844 l 13.996093 -13.996094 c 1.445313 -1.445312 2.960938 -2.566406 4.347657 -3.308594 z m 0 0" fill="url(#l)"/>
-    <path d="m 95.273438 36.914062 l -2.960938 2.960938 l -2.398438 2.402344 c -4.90625 5.101562 -11.855468 10.828125 -11.855468 10.828125 c 1.011718 -0.433594 8.167968 -5.101563 12.914062 -9.769531 l 2.402344 -2.402344 l 2.960938 -2.957032 z m 0 0" fill="#62a0ea"/>
-    <path d="m 87.320312 26.835938 l 13.789063 13.789062 c 0.292969 0.292969 0.292969 0.769531 0 1.0625 s -0.769531 0.292969 -1.0625 0 l -13.789063 -13.789062 c -0.292968 -0.292969 -0.292968 -0.769532 0 -1.0625 c 0.292969 -0.289063 0.769532 -0.289063 1.0625 0 z m 0 0" fill="#3584e4"/>
-    <path d="m 42.421875 89.765625 c -3 3 -6.382813 4.484375 -7.554687 3.3125 c -1.171876 -1.171875 0.3125 -4.554687 3.3125 -7.554687 c 3.003906 -3.003907 6.386718 -4.488282 7.558593 -3.316407 s -0.3125 4.554688 -3.316406 7.558594 z m 0 0" fill="url(#m)"/>
-    <path d="m 45.269531 70.347656 l -7.851562 12.511719 l 7.835937 7.925781 l 12.597656 -7.855468 z m -6.039062 13.171875 l 5.449219 5.449219 c 0.347656 0.347656 0.449218 0.933594 0.097656 1.160156 c -0.886719 0.570313 -2.9375 1.539063 -2.9375 1.539063 c -0.25 0.128906 -0.539063 0.164062 -0.773438 -0.066407 l -4.546875 -4.550781 c -0.234375 -0.230469 -0.207031 -0.527343 -0.066406 -0.773437 l 1.617187 -2.859375 c 0.207032 -0.363281 0.8125 -0.25 1.160157 0.101562 z m 0 0" fill="url(#n)"/>
-    <path d="m 43.332031 74.777344 l 9.867188 9.867187 c 0.394531 0.390625 0.476562 0.871094 0.128906 1.066407 l -7.710937 5.253906 c -0.308594 0.210937 -0.785157 0.160156 -1.171876 -0.226563 l -6.984374 -6.988281 c -0.386719 -0.386719 -0.4375 -0.859375 -0.230469 -1.167969 l 5.234375 -7.8125 c 0.125 -0.285156 0.558594 -0.304687 0.867187 0.007813 z m 0 0" fill="url(#o)"/>
-</svg>

demos/print-editor/data/symbolic/apps/org.gtk.PrintEditor4-symbolic.svg

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg height="16px" viewBox="0 0 16 16" width="16px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <filter id="a" height="100%" width="100%" x="0%" y="0%">
-        <feColorMatrix in="SourceGraphic" type="matrix" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
-    </filter>
-    <mask id="b">
-        <g filter="url(#a)">
-            <rect fill-opacity="0.396" height="16" width="16"/>
-        </g>
-    </mask>
-    <clipPath id="c">
-        <rect height="152" width="192"/>
-    </clipPath>
-    <g clip-path="url(#c)" mask="url(#b)" transform="matrix(1 0 0 1 -168 -16)">
-        <path d="m 29 112 c -4.433594 0 -8 -3.566406 -8 -8 v -2 c 0 4.433594 3.566406 8 8 8 h 88 c 4.433594 0 8 -3.566406 8 -8 v 2 c 0 4.433594 -3.566406 8 -8 8 z m 0 0" fill="#f6f5f4"/>
-    </g>
-    <g fill="#2e3436">
-        <path d="m 4 2 v 2 h 5.585938 l 2 -2 z m -2 3 c -0.5 0 -1 0.5 -1 1 v 4 c 0 0.5 0.5 1 1 1 h 1 v -2 h 2 c 0 -0.265625 0.105469 -0.519531 0.292969 -0.707031 l 3.292969 -3.292969 z m 11.414062 0 l -4 4 h 3.585938 v 2 h 1 c 0.5 0 1 -0.5 1 -1 v -4 c 0 -0.5 -0.5 -1 -1 -1 z m -9.414062 5 v 5 h 8 v -5 h -3.585938 l -0.707031 0.707031 c -0.1875 0.1875 -0.441406 0.292969 -0.707031 0.292969 h -1 c -0.550781 0 -1 -0.449219 -1 -1 z m 0 0"/>
-        <path d="m 6 10 h 1 l 9 -9 l -1 -1 l -9 9 z m 0 0"/>
-    </g>
-</svg>

demos/print-editor/meson.build

@@ -1,23 +1,7 @@
-executable('gtk4-print-editor',
+executable('print-editor',
            ['print-editor.c'],
            c_args: common_cflags,
            dependencies: libgtk_dep,
            include_directories: confinc,
            gui_app: true,
-           link_args: extra_demo_ldflags,
-           install: true)
-
-# desktop file
-install_data('org.gtk.PrintEditor4.desktop', install_dir: gtk_applicationsdir)
-
-# appdata
-install_data('org.gtk.PrintEditor4.appdata.xml', install_dir: gtk_appdatadir)
-
-# icons
-icontheme_dir = join_paths(gtk_datadir, 'icons/hicolor')
-
-foreach size: ['scalable', 'symbolic']
-  install_subdir('data/' + size,
-    install_dir: icontheme_dir
-  )
-endforeach
+           link_args: extra_demo_ldflags)

demos/print-editor/org.gtk.PrintEditor4.appdata.xml

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component type="desktop">
-  <id>org.gtk.PrintEditor4.desktop</id>
-  <metadata_license>CC0-1.0</metadata_license>
-  <project_license>LGPL-2.0+</project_license>
-  <name>GTK Print Editor</name>
-  <summary>Program to demonstrate GTK printing</summary>
-  <description>
-    <p>
-      GTK Print Editor is a simple editor to demonstrate GTK printing.
-    </p>
-  </description>
-  <screenshots>
-    <screenshot>
-      <image>https://static.gnome.org/appdata/gtk4-print-editor/gtk-print-editor1.png</image>
-      <caption>Print 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>
-  <releases>
-    <release version="3.99.0" date="2020">
-      <description>
-        <p>A new developers snapshot towards GTK 4.0.</p>
-      </description>
-    </release>
-  </releases>
-</component>

demos/print-editor/org.gtk.PrintEditor4.desktop

@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=Print Editor
-Comment=A simple editor demonstrating GTK printing
-Exec=gtk4-print-editor %f
-Icon=org.gtk.PrintEditor4.Devel
-Terminal=false
-Type=Application
-StartupNotify=true
-Categories=Development;GTK;
-NoDisplay=true

demos/print-editor/print-editor.c

@@ -23,7 +23,7 @@ update_title (GtkWindow *window)
   else
     basename = g_file_get_basename (filename);
 
-  title = g_strdup_printf ("GTK Print Editor — %s", basename);
+  title = g_strdup_printf ("Simple Editor with printing - %s", basename);
   g_free (basename);
 
   gtk_window_set_title (window, title);
@@ -592,54 +592,18 @@ activate_about (GSimpleAction *action,
                 GVariant      *parameter,
                 gpointer       user_data)
 {
-  char *version;
-  GString *sysinfo;
-  char *setting;
-  char **backends;
-  int i;
-
-  sysinfo = g_string_new ("System libraries\n");
-  g_string_append_printf (sysinfo, "\tGLib\t%d.%d.%d\n",
-                          glib_major_version,
-                          glib_minor_version,
-                          glib_micro_version);
-  g_string_append_printf (sysinfo, "\tPango\t%s\n",
-                          pango_version_string ());
-  g_string_append_printf (sysinfo, "\tGTK\t%d.%d.%d\n",
-                          gtk_get_major_version (),
-                          gtk_get_minor_version (),
-                          gtk_get_micro_version ());
-
-  g_string_append (sysinfo, "\nPrint backends\n");
-
-  g_object_get (gtk_settings_get_default (), "gtk-print-backends", &setting, NULL);
-  backends = g_strsplit (setting, ",", -1);
-  for (i = 0; backends[i]; i++)
-    g_string_append_printf (sysinfo, "\t%s\n", backends[i]);
-  g_strfreev (backends);
-  g_free (setting);
-
-  version = g_strdup_printf ("%s\nRunning against GTK %d.%d.%d",
-                             PACKAGE_VERSION,
-                             gtk_get_major_version (),
-                             gtk_get_minor_version (),
-                             gtk_get_micro_version ());
-
+  const gchar *authors[] = {
+    "Alexander Larsson",
+    NULL
+  };
   gtk_show_about_dialog (GTK_WINDOW (main_window),
-                         "program-name", "GTK Print Editor",
-                         "version", version,
+                         "name", "Print Test Editor",
+                         "logo-icon-name", "text-editor-symbolic",
+                         "version", PACKAGE_VERSION,
                          "copyright", "© 2006-2020 Red Hat, Inc",
-                         "license-type", GTK_LICENSE_LGPL_2_1,
-                         "website", "http://www.gtk.org",
-                         "comments", "Program to demonstrate GTK printing",
-                         "authors", (const char *[]){ "Alexander Larsson", NULL },
-                         "logo-icon-name", "org.gtk.PrintEditor4.Devel",
-                         "title", "About GTK Print Editor",
-                         "system-information", sysinfo->str,
+                         "comments", "Program to demonstrate GTK printing.",
+                         "authors", authors,
                          NULL);
-
-  g_string_free (sysinfo, TRUE);
-  g_free (version);
 }
 
 static void
@@ -679,6 +643,23 @@ static const gchar ui_info[] =
   "<interface>"
   "  <menu id='menubar'>"
   "    <submenu>"
+  "      <attribute name='label'>_Application</attribute>"
+  "      <section>"
+  "        <item>"
+  "          <attribute name='label'>_About</attribute>"
+  "          <attribute name='action'>app.about</attribute>"
+  "          <attribute name='accel'>&lt;Primary&gt;a</attribute>"
+  "        </item>"
+  "      </section>"
+  "      <section>"
+  "        <item>"
+  "          <attribute name='label'>_Quit</attribute>"
+  "          <attribute name='action'>app.quit</attribute>"
+  "          <attribute name='accel'>&lt;Primary&gt;q</attribute>"
+  "        </item>"
+  "      </section>"
+  "    </submenu>"
+  "    <submenu>"
   "      <attribute name='label'>_File</attribute>"
   "      <section>"
   "        <item>"
@@ -715,23 +696,6 @@ static const gchar ui_info[] =
   "          <attribute name='action'>app.print</attribute>"
   "        </item>"
   "      </section>"
-  "      <section>"
-  "        <item>"
-  "          <attribute name='label'>_Quit</attribute>"
-  "          <attribute name='action'>app.quit</attribute>"
-  "          <attribute name='accel'>&lt;Primary&gt;q</attribute>"
-  "        </item>"
-  "      </section>"
-  "    </submenu>"
-  "    <submenu>"
-  "      <attribute name='label'>_Help</attribute>"
-  "      <section>"
-  "        <item>"
-  "          <attribute name='label'>_About Print Editor</attribute>"
-  "          <attribute name='action'>app.about</attribute>"
-  "          <attribute name='accel'>&lt;Primary&gt;a</attribute>"
-  "        </item>"
-  "      </section>"
   "    </submenu>"
   "  </menu>"
   "</interface>";
@@ -752,6 +716,25 @@ mark_set_callback (GtkTextBuffer     *text_buffer,
   update_statusbar ();
 }
 
+static gint
+command_line (GApplication            *application,
+              GApplicationCommandLine *command_line)
+{
+  int argc;
+  char **argv;
+
+  argv = g_application_command_line_get_arguments (command_line, &argc);
+
+  if (argc == 2)
+    {
+      GFile *file = g_file_new_for_commandline_arg (argv[1]);
+      load_file (file);
+      g_object_unref (file);
+    }
+
+  return 0;
+}
+
 static void
 startup (GApplication *app)
 {
@@ -781,13 +764,11 @@ activate (GApplication *app)
   gtk_application_window_set_show_menubar (GTK_APPLICATION_WINDOW (main_window), TRUE);
   update_title (GTK_WINDOW (main_window));
 
-  gtk_widget_add_css_class (main_window, "devel");
-
   box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
   gtk_window_set_child (GTK_WINDOW (main_window), box);
 
   /* Create document  */
-  sw = gtk_scrolled_window_new ();
+  sw = gtk_scrolled_window_new (NULL, NULL);
 
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                   GTK_POLICY_AUTOMATIC,
@@ -828,20 +809,6 @@ activate (GApplication *app)
   gtk_widget_show (main_window);
 }
 
-static void
-open (GApplication  *application,
-      GFile        **files,
-      int            n_files,
-      const char    *hint)
-{
-  if (n_files > 1)
-    g_warning ("Can only open a single file");
-
-  activate (application);
-
-  load_file (files[0]);
-}
-
 int
 main (int argc, char **argv)
 {
@@ -865,7 +832,7 @@ main (int argc, char **argv)
     g_clear_error (&error);
   }
 
-  app = gtk_application_new ("org.gtk.PrintEditor4", G_APPLICATION_HANDLES_OPEN);
+  app = gtk_application_new ("org.gtk.PrintEditor", 0);
 
   g_action_map_add_action_entries (G_ACTION_MAP (app),
                                    app_entries, G_N_ELEMENTS (app_entries),
@@ -873,7 +840,7 @@ main (int argc, char **argv)
 
   g_signal_connect (app, "startup", G_CALLBACK (startup), NULL);
   g_signal_connect (app, "activate", G_CALLBACK (activate), NULL);
-  g_signal_connect (app, "open", G_CALLBACK (open), NULL);
+  g_signal_connect (app, "command-line", G_CALLBACK (command_line), NULL);
 
   g_application_run (G_APPLICATION (app), argc, argv);
 

demos/widget-factory/widget-factory.c

@@ -408,8 +408,6 @@ activate_print (GSimpleAction *action,
   g_signal_connect (op, "draw-page", G_CALLBACK (print_operation_page), window);
   g_signal_connect (op, "done", G_CALLBACK (print_operation_done), NULL);
 
-  gtk_print_operation_set_embed_page_setup (op, TRUE);
-
   res = gtk_print_operation_run (op, GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG, window, NULL);
 
   if (res == GTK_PRINT_OPERATION_RESULT_IN_PROGRESS)

demos/widget-factory/widget-factory.ui

@@ -436,6 +436,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
     <property name="title">GTK Widget Factory</property>
     <child type="titlebar">
       <object class="GtkHeaderBar" id="headerbar1">
+        <property name="show-title-buttons">1</property>
         <child type="title">
           <object class="GtkStackSwitcher" id="stack_switcher">
             <property name="stack">toplevel_stack</property>

docs/reference/gdk/gdk4-sections.txt

@@ -207,6 +207,8 @@ GdkModifierType
 GDK_MODIFIER_MASK
 
 <SUBSECTION>
+gdk_surface_get_support_multidevice
+gdk_surface_set_support_multidevice
 gdk_surface_get_device_cursor
 gdk_surface_set_device_cursor
 
@@ -357,7 +359,7 @@ gdk_device_get_product_id
 gdk_device_get_source
 gdk_device_get_axis_use
 gdk_device_get_associated_device
-gdk_device_list_physical_devices
+gdk_device_list_slave_devices
 gdk_device_get_device_type
 gdk_device_get_display
 gdk_device_get_has_cursor
@@ -378,6 +380,9 @@ gdk_device_get_state
 gdk_device_get_surface_at_position
 GdkTimeCoord
 gdk_device_get_axis
+gdk_device_get_axis_names
+gdk_device_get_axis_value
+gdk_device_get_last_event_surface
 
 <SUBSECTION>
 gdk_device_tool_get_serial
@@ -438,7 +443,8 @@ gdk_seat_get_display
 gdk_seat_get_capabilities
 gdk_seat_get_pointer
 gdk_seat_get_keyboard
-gdk_seat_get_physical_devices
+gdk_seat_get_slaves
+gdk_seat_get_master_pointers
 
 <SUBSECTION Standard>
 GDK_SEAT
@@ -482,7 +488,6 @@ gdk_event_get_source_device
 gdk_event_get_device_tool
 gdk_event_get_time
 gdk_event_get_display
-gdk_event_get_seat
 GdkEventSequence
 gdk_event_get_event_sequence
 gdk_event_get_modifier_state

docs/reference/gtk/getting_started.md

@@ -1423,6 +1423,7 @@ the search bar below the header bar.
     <property name="default-height">400</property>
     <child type="titlebar">
       <object class="GtkHeaderBar" id="header">
+        <property name="show-title-buttons">1</property>
         <child type="title">
           <object class="GtkStackSwitcher" id="tabs">
             <property name="stack">stack</property>
@@ -1536,6 +1537,7 @@ GtkMenuButton, GtkRevealer and GtkListBox.
     <property name="default-height">400</property>
     <child type="titlebar">
       <object class="GtkHeaderBar" id="header">
+        <property name="show-title-buttons">1</property>
         <child type="title">
           <object class="GtkStackSwitcher" id="tabs">
             <property name="stack">stack</property>