[gtkmm-documentation] Update the Building applications chapter

From: Kjell Ahlstedt <kjellahl src gnome org>
To: commits-list gnome org
Cc:
Subject: [gtkmm-documentation] Update the Building applications chapter
Date: Tue, 14 Jul 2020 15:14:07 +0000 (UTC)
commit e1fd8f3f828e8c2cc3beb11602305bd8931df1be
Author: Kjell Ahlstedt <kjellahlstedt gmail com>
Date:   Tue Jul 14 17:11:24 2020 +0200

    Update the Building applications chapter
    
    Update similarly to the description in docs/reference/gtk/getting_started.md
    in the GTK module. Update the figures.

 docs/tutorial/C/figures/buildapp_app_menu.png      | Bin 55254 -> 0 bytes
 docs/tutorial/C/figures/buildapp_header_bar.png    | Bin 68463 -> 69528 bytes
 docs/tutorial/C/figures/buildapp_menu.png          | Bin 0 -> 84674 bytes
 docs/tutorial/C/figures/buildapp_opening_files.png | Bin 63590 -> 74205 bytes
 .../C/figures/buildapp_populating_window.png       | Bin 9582 -> 6162 bytes
 docs/tutorial/C/figures/buildapp_pref_dialog.png   | Bin 9481 -> 9146 bytes
 docs/tutorial/C/figures/buildapp_properties.png    | Bin 68552 -> 76793 bytes
 docs/tutorial/C/figures/buildapp_search_bar.png    | Bin 62742 -> 62801 bytes
 docs/tutorial/C/figures/buildapp_side_bar.png      | Bin 93714 -> 104267 bytes
 docs/tutorial/C/figures/buildapp_trivial_app.png   | Bin 5928 -> 3283 bytes
 docs/tutorial/C/index-in.docbook                   | 110 ++++++++++++---------
 docs/tutorial/Makefile.am                          |   2 +-
 docs/tutorial/meson.build                          |   2 +-
 examples/book/buildapp/step2/window.ui             |   9 --
 examples/book/buildapp/step3/window.ui             |   1 -
 examples/book/buildapp/step4/gears_menu.ui         |   2 +-
 examples/book/buildapp/step4/window.ui             |   1 -
 examples/book/buildapp/step5/gears_menu.ui         |   2 +-
 examples/book/buildapp/step5/prefs.ui              |  11 +--
 examples/book/buildapp/step6/gears_menu.ui         |   2 +-
 examples/book/buildapp/step6/prefs.ui              |  11 +--
 examples/book/buildapp/step6/window.ui             |   1 -
 examples/book/buildapp/step7/gears_menu.ui         |   2 +-
 examples/book/buildapp/step7/prefs.ui              |  11 +--
 examples/book/buildapp/step7/window.ui             |   2 -
 examples/book/buildapp/step8/gears_menu.ui         |   2 +-
 examples/book/buildapp/step8/prefs.ui              |  11 +--
 examples/book/buildapp/step8/window.ui             |   2 -
 examples/book/buildapp/step9/gears_menu.ui         |   2 +-
 examples/book/buildapp/step9/prefs.ui              |  11 +--
 examples/book/buildapp/step9/window.ui             |   2 -
 31 files changed, 94 insertions(+), 105 deletions(-)
---
diff --git a/docs/tutorial/C/figures/buildapp_header_bar.png b/docs/tutorial/C/figures/buildapp_header_bar.png
index 442e4a6d..ebd00749 100644
Binary files a/docs/tutorial/C/figures/buildapp_header_bar.png and 
b/docs/tutorial/C/figures/buildapp_header_bar.png differ
diff --git a/docs/tutorial/C/figures/buildapp_menu.png b/docs/tutorial/C/figures/buildapp_menu.png
new file mode 100644
index 00000000..bc77d370
Binary files /dev/null and b/docs/tutorial/C/figures/buildapp_menu.png differ
diff --git a/docs/tutorial/C/figures/buildapp_opening_files.png 
b/docs/tutorial/C/figures/buildapp_opening_files.png
index a420094b..324eb9bb 100644
Binary files a/docs/tutorial/C/figures/buildapp_opening_files.png and 
b/docs/tutorial/C/figures/buildapp_opening_files.png differ
diff --git a/docs/tutorial/C/figures/buildapp_populating_window.png 
b/docs/tutorial/C/figures/buildapp_populating_window.png
index c2ee1c47..21c45c97 100644
Binary files a/docs/tutorial/C/figures/buildapp_populating_window.png and 
b/docs/tutorial/C/figures/buildapp_populating_window.png differ
diff --git a/docs/tutorial/C/figures/buildapp_pref_dialog.png 
b/docs/tutorial/C/figures/buildapp_pref_dialog.png
index d4363f3c..1c1ea8e1 100644
Binary files a/docs/tutorial/C/figures/buildapp_pref_dialog.png and 
b/docs/tutorial/C/figures/buildapp_pref_dialog.png differ
diff --git a/docs/tutorial/C/figures/buildapp_properties.png b/docs/tutorial/C/figures/buildapp_properties.png
index 6737fd6c..feeb66de 100644
Binary files a/docs/tutorial/C/figures/buildapp_properties.png and 
b/docs/tutorial/C/figures/buildapp_properties.png differ
diff --git a/docs/tutorial/C/figures/buildapp_search_bar.png b/docs/tutorial/C/figures/buildapp_search_bar.png
index 5d4e4710..68cd7f66 100644
Binary files a/docs/tutorial/C/figures/buildapp_search_bar.png and 
b/docs/tutorial/C/figures/buildapp_search_bar.png differ
diff --git a/docs/tutorial/C/figures/buildapp_side_bar.png b/docs/tutorial/C/figures/buildapp_side_bar.png
index a46c75b2..72ea88be 100644
Binary files a/docs/tutorial/C/figures/buildapp_side_bar.png and 
b/docs/tutorial/C/figures/buildapp_side_bar.png differ
diff --git a/docs/tutorial/C/figures/buildapp_trivial_app.png 
b/docs/tutorial/C/figures/buildapp_trivial_app.png
index 3d9667ea..d13f5400 100644
Binary files a/docs/tutorial/C/figures/buildapp_trivial_app.png and 
b/docs/tutorial/C/figures/buildapp_trivial_app.png differ
diff --git a/docs/tutorial/C/index-in.docbook b/docs/tutorial/C/index-in.docbook
index a303d643..f9c06f33 100644
--- a/docs/tutorial/C/index-in.docbook
+++ b/docs/tutorial/C/index-in.docbook
@@ -7475,8 +7475,8 @@ not called on the child widgets.
 
 <para>
 This chapter is similar to the &quot;Building applications&quot; chapter in the
-<ulink url="https://developer.gnome.org/gtk4/unstable/";>GTK+ 4 Reference Manual</ulink>.
-The same application is built, but &gtkmm; is used instead of <application>GTK+</application>.
+<ulink url="https://developer.gnome.org/gtk4/unstable/";>GTK4 Reference Manual</ulink>.
+The same application is built, but &gtkmm; is used instead of <application>GTK</application>.
 </para>
 <para>
 An application consists of a number of files:
@@ -7516,7 +7516,7 @@ An application consists of a number of files:
 &gtkmm; includes application support that is built on top of <classname>Gio::Application</classname>.
 In this chapter we'll build a simple application by starting from scratch, adding more
 and more pieces over time. Along the way, we'll learn about <classname>Gtk::Application</classname>,
-<classname>Gtk::Builder</classname>, resources, application menus, settings,
+<classname>Gtk::Builder</classname>, resources, menus, settings,
 <classname>Gtk::HeaderBar</classname>, <classname>Gtk::Stack</classname>,
 <classname>Gtk::SearchBar</classname>, <classname>Gtk::ListBox</classname>, and more.
 </para>
@@ -7526,9 +7526,11 @@ The full, buildable sources for these examples can be found in the
 <filename>examples/book/buildapp</filename> directory of the
 <application>gtkmm-documentation</application> source distribution, or online in the
 <ulink url="&url_examples_base;buildapp"><application>gtkmm-documentation</application>
-git repository</ulink>. You can build each example separately by using make with the
-<filename>Makefile.example</filename> file. For more information, see the
-<filename>README</filename> included in the <filename>buildapp</filename> directory.
+git repository</ulink>. You can build each example separately by using <command>meson</command>
+and <command>ninja</command> with the <filename>meson.build</filename> file or by using
+<command>make</command> with the <filename>Makefile.example</filename> file. For more
+information, see the <filename>README</filename> included in the <filename>buildapp</filename>
+directory.
 </para>
 
 <sect1 id="sec-buildapp-trivial-app">
@@ -7600,10 +7602,8 @@ In this step, we use a <classname>Gtk::Builder</classname> instance to associate
 </para>
 
 <para>
-Our simple ui file puts a <classname>Gtk::HeaderBar</classname> on top of a
-<classname>Gtk::Stack</classname> widget. The header bar contains a
-<classname>Gtk::StackSwitcher</classname>, which is a standalone widget to show a row
-of 'tabs' for the pages of a <classname>Gtk::Stack</classname>. 
+Our simple ui file gives the window a title, and puts a <classname>Gtk::Stack</classname>
+widget as the main content.
 </para>
 
 <para>
@@ -7627,7 +7627,9 @@ into the application together with the other source files. To do so, we use the
 <application>glib-compile-resources</application> utility:
 <screen>$ glib-compile-resources --target=resources.c --generate-source exampleapp.gresource.xml</screen>
 The <link linkend="sec-gio-resource">Gio::Resource and glib-compile-resources</link>
-section contains more information about resource files.
+section contains more information about resource files. If you build with Meson,
+use the <function>compile_resources()</function> function in Meson's 
+<ulink url="https://mesonbuild.com/Gnome-module.html";>GNOME module</ulink>.
 </para>
 
 <para>
@@ -7666,9 +7668,15 @@ that we then add as a page to the stack.
 </para>
 
 <para>
-Note that we do not have to touch the stack switcher at all. It gets all its information
-from the stack that it belongs to. Here, we are passing the label to show for each file
-as the last argument to the <methodname>Gtk::Stack::add()</methodname> method.
+Lastly, we add a <classname>Gtk::StackSwitcher</classname> to the titlebar area
+in the ui file, and we tell it to display information about our stack.
+</para>
+
+<para>
+The stack switcher gets all its information it needs to display tabs from
+the stack that it belongs to. Here, we are passing the label to show for
+each file as the last argument to the <methodname>Gtk::Stack::add()</methodname>
+method.
 </para>
 
 <para>
@@ -7686,30 +7694,28 @@ Our application is beginning to take shape:
 
 </sect1>
 
-<sect1 id="sec-buildapp-app-menu">
-<title>An application menu</title>
+<sect1 id="sec-buildapp-menu">
+<title>A menu</title>
 
 <para>
-An application menu is shown by GNOME shell at the top of the screen. It is meant
-to collect infrequently used actions that affect the whole application.
-The application menu is shown either at the top of the screen, or at the top of
-the application's window, depending on which desktop shell you use.
+The menu is shown at the right side of the headerbar. It is meant to collect
+infrequently used actions that affect the whole application.
 </para>
 
 <para>
-Just like the application window, we specify our application menu in a ui file,
-and add it as a resource to our binary.
+Just like the application window, we specify our menu in a ui file, and add it
+as a resource to our binary.
 </para>
 
 <para>
-To associate the app menu with the application, we have to call
-<methodname>Gtk::Application::set_app_menu()</methodname>. Since app menus work by
-activating <classname>Gio::Action</classname>s, we also have to add a suitable set of
-actions to our application.
+To make the menu appear, we have to load the ui file and associate the
+resulting menu model with the menu button that we've added to the headerbar.
+Since menus work by activating <classname>Gio::Action</classname>s, we also
+have to add a suitable set of actions to our application.
 </para>
 
 <para>
-Both of these tasks are best done in the <methodname>on_startup()</methodname> default
+Adding the actions is best done in the <methodname>on_startup()</methodname> default
 signal handler, which is guaranteed to be called once for each primary application instance.
 </para>
 
@@ -7720,13 +7726,13 @@ is added with <methodname>Gtk::Application::set_accel_for_action()</methodname>.
 </para>
 
 <para>
-The application menu looks like this:
+The menu looks like this:
 </para>
 
-<figure id="figure-buildapp-app-menu">
-  <title>An application menu</title>
+<figure id="figure-buildapp-menu">
+  <title>A menu</title>
   <screenshot>
-    <graphic format="PNG" fileref="&url_figures_base;buildapp_app_menu.png"/>
+    <graphic format="PNG" fileref="&url_figures_base;buildapp_menu.png"/>
   </screenshot>
 </figure>
 
@@ -7754,6 +7760,8 @@ Before we can make use of this schema in our application, we need to compile it
 the binary form that <classname>Gio::Settings</classname> expects. GIO provides macros
 to do this in autotools-based projects. See the description of
 <ulink url="https://developer.gnome.org/gio/stable/GSettings.html";>GSettings</ulink>.
+Meson provides the <function>compile_schemas()</function> function in the
+<ulink url="https://mesonbuild.com/Gnome-module.html";>GNOME module</ulink>.
 </para>
 
 <para>
@@ -7841,7 +7849,7 @@ listens for text changes in the search entry, shown here without error handling.
   auto buffer = view->get_buffer();
   Gtk::TextIter match_start;
   Gtk::TextIter match_end;
-  if (buffer->begin().forward_search(text, Gtk::TEXT_SEARCH_CASE_INSENSITIVE,
+  if (buffer->begin().forward_search(text, Gtk::TextSearchFlags::CASE_INSENSITIVE,
       match_start, match_end))
   {
     buffer->select_range(match_start, match_end);
@@ -7871,15 +7879,15 @@ With the search bar, our application now looks like this:
 
 <para>
 As another piece of functionality, we are adding a sidebar, which demonstrates
-<classname>Gtk::MenuButton</classname>, <classname>Gtk::Revealer</classname> and
-<classname>Gtk::ListBox</classname>. The new widgets are added in the <filename>window.ui</filename> file.
+<classname>Gtk::Revealer</classname> and <classname>Gtk::ListBox</classname>.
+The new widgets are added in the <filename>window.ui</filename> file.
 </para>
 
 <para>
-The code to populate the sidebar with buttons for the words found in each file is a
-little too involved to go into here. But we'll look at the code to add the gears menu.
-As expected by now, the gears menu is specified in a <classname>Gtk::Builder</classname>
-ui file, <filename>gears_menu.ui</filename>
+The code to populate the sidebar with buttons for the words found in each
+file is a little too involved to go into here. But we'll look at the code
+to add a checkbutton for the new feature to the menu. A menu item is added to
+the ui file <filename>gears_menu.ui</filename>.
 </para>
 
 <para>
@@ -7970,21 +7978,26 @@ This brings our example application to this appearance:
 <title>Header bar</title>
 
 <para>
-Our application already uses a <classname>Gtk::HeaderBar</classname>, but so far it still
-gets a 'normal' window titlebar on top of that. This is a bit redundant, and we will now
-tell &gtkmm; to use the header bar as replacement for the titlebar. To do so, we move
-it around to be a direct child of the window, and set its type to be <literal>titlebar</literal>.
-This is done in the <filename>window.ui</filename> file.
+Our application already uses a <classname>Gtk::HeaderBar</classname> instead of
+a 'normal' window titlebar. The header bar is a direct child of the window,
+and its type is <literal>titlebar</literal>. This is set in the
+<filename>window.ui</filename> file.
 </para>
 
 <para>
-A small extra bonus of using a header bar is that we get a fallback application menu
-button for free. We include an icon in the resource file, and set up this icon as the
-window icon. Then it is displayed in the menu button.
+Here we'll just make two small changes to the header bar. The <literal>decoration-layout</literal>
+property is set in the <filename>window.ui</filename> file, to show only the close
+button, and hide the minimize and maximize buttons. We also include an icon in the
+resource file, and set up this icon as the window icon.
+In <classname>ExampleAppWindow</classname>'s constructor:
+<programlisting><![CDATA[Gtk::IconTheme::get_for_display(get_display())->add_resource_path("/org/gtkmm/exampleapp");
+set_icon_name("exampleapp");
+]]>
+</programlisting>
 </para>
 
 <para>
-Here is how the application now looks, if the fallback menu is used:
+Here is how the application now looks:
 </para>
 
 <figure id="figure-buildapp-header-bar">
@@ -7997,8 +8010,7 @@ Here is how the application now looks, if the fallback menu is used:
 <para>
 The <filename>window.ui</filename> file sets a header bar title, but this title is not shown.
 That's because the stack switcher is a child of type <literal>title</literal>. The stack
-switcher becomes a custom title that hides the title label, as if it had been set with
-<methodname>Gtk::HeaderBar::set_custom_title()</methodname>.
+switcher becomes a custom title that hides the title label.
 </para>
 
 <para><ulink url="&url_examples_base;buildapp/step9">Source Code</ulink></para> <!-- Insert 
exampleapp.gresource.xml window.ui -->
diff --git a/docs/tutorial/Makefile.am b/docs/tutorial/Makefile.am
index 126d31dc..ad6cb207 100644
--- a/docs/tutorial/Makefile.am
+++ b/docs/tutorial/Makefile.am
@@ -29,7 +29,7 @@ HELP_MEDIA =                                  \
        figures/box_packing1.png                \
        figures/box_packing2.png                \
        figures/box_packing3.png                \
-       figures/buildapp_app_menu.png \
+       figures/buildapp_menu.png \
        figures/buildapp_header_bar.png \
        figures/buildapp_opening_files.png \
        figures/buildapp_populating_window.png \
diff --git a/docs/tutorial/meson.build b/docs/tutorial/meson.build
index a915116d..2565f1a8 100644
--- a/docs/tutorial/meson.build
+++ b/docs/tutorial/meson.build
@@ -35,7 +35,7 @@ tutorial_figurefiles = [
   'box_packing1.png',
   'box_packing2.png',
   'box_packing3.png',
-  'buildapp_app_menu.png',
+  'buildapp_menu.png',
   'buildapp_header_bar.png',
   'buildapp_opening_files.png',
   'buildapp_populating_window.png',
diff --git a/examples/book/buildapp/step2/window.ui b/examples/book/buildapp/step2/window.ui
index 39bd69e7..54177ae7 100644
--- a/examples/book/buildapp/step2/window.ui
+++ b/examples/book/buildapp/step2/window.ui
@@ -5,15 +5,6 @@
     <property name="default-width">600</property>
     <property name="default-height">400</property>
     <property name="hide-on-close">True</property>
-    <child type="titlebar">
-      <object class="GtkHeaderBar" id="header">
-        <child type="title">
-          <object class="GtkStackSwitcher" id="tabs">
-            <property name="stack">stack</property>
-          </object>
-        </child>
-      </object>
-    </child>
     <child>
       <object class="GtkBox" id="content_box">
         <property name="orientation">vertical</property>
diff --git a/examples/book/buildapp/step3/window.ui b/examples/book/buildapp/step3/window.ui
index 23792f01..39bd69e7 100644
--- a/examples/book/buildapp/step3/window.ui
+++ b/examples/book/buildapp/step3/window.ui
@@ -7,7 +7,6 @@
     <property name="hide-on-close">True</property>
     <child type="titlebar">
       <object class="GtkHeaderBar" id="header">
-        <property name="show-title-buttons">True</property>
         <child type="title">
           <object class="GtkStackSwitcher" id="tabs">
             <property name="stack">stack</property>
diff --git a/examples/book/buildapp/step4/gears_menu.ui b/examples/book/buildapp/step4/gears_menu.ui
index 46f42ba0..30e292ef 100644
--- a/examples/book/buildapp/step4/gears_menu.ui
+++ b/examples/book/buildapp/step4/gears_menu.ui
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <menu id="menu">
     <section>
diff --git a/examples/book/buildapp/step4/window.ui b/examples/book/buildapp/step4/window.ui
index 1bf8334c..54cd55ce 100644
--- a/examples/book/buildapp/step4/window.ui
+++ b/examples/book/buildapp/step4/window.ui
@@ -7,7 +7,6 @@
     <property name="hide-on-close">True</property>
     <child type="titlebar">
       <object class="GtkHeaderBar" id="header">
-        <property name="show-title-buttons">True</property>
         <child type="title">
           <object class="GtkStackSwitcher" id="tabs">
             <property name="stack">stack</property>
diff --git a/examples/book/buildapp/step5/gears_menu.ui b/examples/book/buildapp/step5/gears_menu.ui
index 46f42ba0..30e292ef 100644
--- a/examples/book/buildapp/step5/gears_menu.ui
+++ b/examples/book/buildapp/step5/gears_menu.ui
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <menu id="menu">
     <section>
diff --git a/examples/book/buildapp/step5/prefs.ui b/examples/book/buildapp/step5/prefs.ui
index e8aa1ea0..090551c5 100644
--- a/examples/book/buildapp/step5/prefs.ui
+++ b/examples/book/buildapp/step5/prefs.ui
@@ -4,17 +4,16 @@
     <property name="title" translatable="yes">Preferences</property>
     <property name="resizable">False</property>
     <property name="modal">True</property>
-    <property name="use-header-bar">1</property>
     <child internal-child="content_area">
       <object class="GtkBox" id="content_area">
         <child>
           <object class="GtkGrid" id="grid">
-            <property name="margin-start">6</property>
-            <property name="margin-end">6</property>
-            <property name="margin-top">6</property>
-            <property name="margin-bottom">6</property>
+            <property name="margin-start">12</property>
+            <property name="margin-end">12</property>
+            <property name="margin-top">12</property>
+            <property name="margin-bottom">12</property>
             <property name="row-spacing">12</property>
-            <property name="column-spacing">6</property>
+            <property name="column-spacing">12</property>
             <child>
               <object class="GtkLabel" id="fontlabel">
                 <property name="label">_Font:</property>
diff --git a/examples/book/buildapp/step6/gears_menu.ui b/examples/book/buildapp/step6/gears_menu.ui
index 46f42ba0..30e292ef 100644
--- a/examples/book/buildapp/step6/gears_menu.ui
+++ b/examples/book/buildapp/step6/gears_menu.ui
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <menu id="menu">
     <section>
diff --git a/examples/book/buildapp/step6/prefs.ui b/examples/book/buildapp/step6/prefs.ui
index e8aa1ea0..090551c5 100644
--- a/examples/book/buildapp/step6/prefs.ui
+++ b/examples/book/buildapp/step6/prefs.ui
@@ -4,17 +4,16 @@
     <property name="title" translatable="yes">Preferences</property>
     <property name="resizable">False</property>
     <property name="modal">True</property>
-    <property name="use-header-bar">1</property>
     <child internal-child="content_area">
       <object class="GtkBox" id="content_area">
         <child>
           <object class="GtkGrid" id="grid">
-            <property name="margin-start">6</property>
-            <property name="margin-end">6</property>
-            <property name="margin-top">6</property>
-            <property name="margin-bottom">6</property>
+            <property name="margin-start">12</property>
+            <property name="margin-end">12</property>
+            <property name="margin-top">12</property>
+            <property name="margin-bottom">12</property>
             <property name="row-spacing">12</property>
-            <property name="column-spacing">6</property>
+            <property name="column-spacing">12</property>
             <child>
               <object class="GtkLabel" id="fontlabel">
                 <property name="label">_Font:</property>
diff --git a/examples/book/buildapp/step6/window.ui b/examples/book/buildapp/step6/window.ui
index c99e281b..e3772a3d 100644
--- a/examples/book/buildapp/step6/window.ui
+++ b/examples/book/buildapp/step6/window.ui
@@ -7,7 +7,6 @@
     <property name="hide-on-close">True</property>
     <child type="titlebar">
       <object class="GtkHeaderBar" id="header">
-        <property name="show-title-buttons">True</property>
         <child type="title">
           <object class="GtkStackSwitcher" id="tabs">
             <property name="stack">stack</property>
diff --git a/examples/book/buildapp/step7/gears_menu.ui b/examples/book/buildapp/step7/gears_menu.ui
index abb4d04b..735a699a 100644
--- a/examples/book/buildapp/step7/gears_menu.ui
+++ b/examples/book/buildapp/step7/gears_menu.ui
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <menu id="menu">
     <section>
diff --git a/examples/book/buildapp/step7/prefs.ui b/examples/book/buildapp/step7/prefs.ui
index e8aa1ea0..090551c5 100644
--- a/examples/book/buildapp/step7/prefs.ui
+++ b/examples/book/buildapp/step7/prefs.ui
@@ -4,17 +4,16 @@
     <property name="title" translatable="yes">Preferences</property>
     <property name="resizable">False</property>
     <property name="modal">True</property>
-    <property name="use-header-bar">1</property>
     <child internal-child="content_area">
       <object class="GtkBox" id="content_area">
         <child>
           <object class="GtkGrid" id="grid">
-            <property name="margin-start">6</property>
-            <property name="margin-end">6</property>
-            <property name="margin-top">6</property>
-            <property name="margin-bottom">6</property>
+            <property name="margin-start">12</property>
+            <property name="margin-end">12</property>
+            <property name="margin-top">12</property>
+            <property name="margin-bottom">12</property>
             <property name="row-spacing">12</property>
-            <property name="column-spacing">6</property>
+            <property name="column-spacing">12</property>
             <child>
               <object class="GtkLabel" id="fontlabel">
                 <property name="label">_Font:</property>
diff --git a/examples/book/buildapp/step7/window.ui b/examples/book/buildapp/step7/window.ui
index 9c80d205..627b3b07 100644
--- a/examples/book/buildapp/step7/window.ui
+++ b/examples/book/buildapp/step7/window.ui
@@ -7,7 +7,6 @@
     <property name="hide-on-close">True</property>
     <child type="titlebar">
       <object class="GtkHeaderBar" id="header">
-        <property name="show-title-buttons">True</property>
         <child type="title">
           <object class="GtkStackSwitcher" id="tabs">
             <property name="stack">stack</property>
@@ -45,7 +44,6 @@
                 <child>
                  <object class="GtkScrolledWindow" id="sidebar-sw">
                    <property name="hscrollbar-policy">never</property>
-                   <property name="vscrollbar-policy">automatic</property>
                    <child>
                      <object class="GtkListBox" id="words">
                        <property name="selection-mode">none</property>
diff --git a/examples/book/buildapp/step8/gears_menu.ui b/examples/book/buildapp/step8/gears_menu.ui
index fe74f795..d16d93a8 100644
--- a/examples/book/buildapp/step8/gears_menu.ui
+++ b/examples/book/buildapp/step8/gears_menu.ui
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <menu id="menu">
     <section>
diff --git a/examples/book/buildapp/step8/prefs.ui b/examples/book/buildapp/step8/prefs.ui
index e8aa1ea0..090551c5 100644
--- a/examples/book/buildapp/step8/prefs.ui
+++ b/examples/book/buildapp/step8/prefs.ui
@@ -4,17 +4,16 @@
     <property name="title" translatable="yes">Preferences</property>
     <property name="resizable">False</property>
     <property name="modal">True</property>
-    <property name="use-header-bar">1</property>
     <child internal-child="content_area">
       <object class="GtkBox" id="content_area">
         <child>
           <object class="GtkGrid" id="grid">
-            <property name="margin-start">6</property>
-            <property name="margin-end">6</property>
-            <property name="margin-top">6</property>
-            <property name="margin-bottom">6</property>
+            <property name="margin-start">12</property>
+            <property name="margin-end">12</property>
+            <property name="margin-top">12</property>
+            <property name="margin-bottom">12</property>
             <property name="row-spacing">12</property>
-            <property name="column-spacing">6</property>
+            <property name="column-spacing">12</property>
             <child>
               <object class="GtkLabel" id="fontlabel">
                 <property name="label">_Font:</property>
diff --git a/examples/book/buildapp/step8/window.ui b/examples/book/buildapp/step8/window.ui
index 5232c64a..c65f5940 100644
--- a/examples/book/buildapp/step8/window.ui
+++ b/examples/book/buildapp/step8/window.ui
@@ -7,7 +7,6 @@
     <property name="hide-on-close">True</property>
     <child type="titlebar">
       <object class="GtkHeaderBar" id="header">
-        <property name="show-title-buttons">True</property>
         <child>
           <object class="GtkLabel" id="lines_label">
             <property name="visible">False</property>
@@ -56,7 +55,6 @@
                 <child>
                   <object class="GtkScrolledWindow" id="sidebar-sw">
                     <property name="hscrollbar-policy">never</property>
-                    <property name="vscrollbar-policy">automatic</property>
                     <child>
                       <object class="GtkListBox" id="words">
                         <property name="selection-mode">none</property>
diff --git a/examples/book/buildapp/step9/gears_menu.ui b/examples/book/buildapp/step9/gears_menu.ui
index fe74f795..d16d93a8 100644
--- a/examples/book/buildapp/step9/gears_menu.ui
+++ b/examples/book/buildapp/step9/gears_menu.ui
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <menu id="menu">
     <section>
diff --git a/examples/book/buildapp/step9/prefs.ui b/examples/book/buildapp/step9/prefs.ui
index e8aa1ea0..090551c5 100644
--- a/examples/book/buildapp/step9/prefs.ui
+++ b/examples/book/buildapp/step9/prefs.ui
@@ -4,17 +4,16 @@
     <property name="title" translatable="yes">Preferences</property>
     <property name="resizable">False</property>
     <property name="modal">True</property>
-    <property name="use-header-bar">1</property>
     <child internal-child="content_area">
       <object class="GtkBox" id="content_area">
         <child>
           <object class="GtkGrid" id="grid">
-            <property name="margin-start">6</property>
-            <property name="margin-end">6</property>
-            <property name="margin-top">6</property>
-            <property name="margin-bottom">6</property>
+            <property name="margin-start">12</property>
+            <property name="margin-end">12</property>
+            <property name="margin-top">12</property>
+            <property name="margin-bottom">12</property>
             <property name="row-spacing">12</property>
-            <property name="column-spacing">6</property>
+            <property name="column-spacing">12</property>
             <child>
               <object class="GtkLabel" id="fontlabel">
                 <property name="label">_Font:</property>
diff --git a/examples/book/buildapp/step9/window.ui b/examples/book/buildapp/step9/window.ui
index 60efd3e5..0cbd7a25 100644
--- a/examples/book/buildapp/step9/window.ui
+++ b/examples/book/buildapp/step9/window.ui
@@ -7,7 +7,6 @@
     <property name="hide-on-close">True</property>
     <child type="titlebar">
       <object class="GtkHeaderBar" id="header">
-        <property name="show-title-buttons">True</property>
         <property name="decoration-layout">icon:close</property>
         <child>
           <object class="GtkLabel" id="lines_label">
@@ -57,7 +56,6 @@
                 <child>
                   <object class="GtkScrolledWindow" id="sidebar-sw">
                     <property name="hscrollbar-policy">never</property>
-                    <property name="vscrollbar-policy">automatic</property>
                     <child>
                       <object class="GtkListBox" id="words">
                         <property name="selection-mode">none</property>
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]