[gnome-software: 80/110] More dialog adjustments

[Philip Withnall <pwithnall src gnome org>]

commit 4c7e9d2c36eb4e3034c86835a2c6552701b30540
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date:   Thu Aug 26 00:35:59 2021 -0300

    More dialog adjustments

 src/gs-app-details-page.ui           |  6 ++++--
 src/gs-app-version-history-dialog.ui |  2 +-
 src/gs-first-run-dialog.ui           |  3 ---
 src/gs-info-window.ui                | 13 ++++++-----
 src/gs-metered-data-dialog.ui        |  2 --
 src/gs-repos-dialog.ui               | 12 ++++++-----
 src/gs-review-dialog.ui              | 42 ++++++++++++++++--------------------
 src/gs-shell.ui                      |  2 +-
 src/gs-update-dialog.ui              |  8 +++----
 9 files changed, 42 insertions(+), 48 deletions(-)
---
diff --git a/src/gs-app-details-page.ui b/src/gs-app-details-page.ui
index d3304384f..3295b53a4 100644
--- a/src/gs-app-details-page.ui
+++ b/src/gs-app-details-page.ui
@@ -6,12 +6,14 @@
 
     <child>
       <object class="AdwHeaderBar" id="header_bar">
-        <property name="show_close_button">True</property>
         <property name="visible">True</property>
+        <property name="valign">start</property>
+        <property name="show_start_title_buttons">True</property>
+        <property name="show_end_title_buttons">True</property>
         <property name="title-widget">
           <object class="AdwWindowTitle" id="window_title" />
         </property>
-        <child>
+        <child type="start">
           <object class="GtkButton" id="back_button">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
diff --git a/src/gs-app-version-history-dialog.ui b/src/gs-app-version-history-dialog.ui
index 11932f23e..b64358f08 100644
--- a/src/gs-app-version-history-dialog.ui
+++ b/src/gs-app-version-history-dialog.ui
@@ -12,7 +12,7 @@
     <child internal-child="headerbar">
       <object class="AdwHeaderBar"/>
     </child>
-    <child internal-child="vbox">
+    <child internal-child="content_area">
       <object class="GtkBox">
         <property name="visible">True</property>
         <property name="orientation">vertical</property>
diff --git a/src/gs-first-run-dialog.ui b/src/gs-first-run-dialog.ui
index ab693bc94..a3295da11 100644
--- a/src/gs-first-run-dialog.ui
+++ b/src/gs-first-run-dialog.ui
@@ -4,14 +4,11 @@
   <requires lib="gtk+" version="3.12"/>
   <template class="GsFirstRunDialog" parent="AdwWindow">
     <property name="modal">True</property>
-    <property name="window_position">center</property>
     <property name="destroy_with_parent">True</property>
     <property name="icon_name">dialog-information</property>
     <property name="title" translatable="yes">Welcome</property>
-    <property name="type_hint">dialog</property>
     <property name="default-width">640</property>
     <property name="default-height">576</property>
-    <property name="skip_taskbar_hint">True</property>
     <style>
       <class name="toolbox"/>
     </style>
diff --git a/src/gs-info-window.ui b/src/gs-info-window.ui
index a679d664e..6b2187905 100644
--- a/src/gs-info-window.ui
+++ b/src/gs-info-window.ui
@@ -3,10 +3,8 @@
   <requires lib="gtk+" version="3.10"/>
   <template class="GsInfoWindow" parent="AdwWindow">
     <property name="modal">True</property>
-    <property name="window_position">center</property>
     <property name="destroy_with_parent">True</property>
     <property name="icon_name">dialog-information</property>
-    <property name="type_hint">dialog</property>
     <property name="default-width">640</property>
     <property name="default-height">576</property>
     <style>
@@ -18,9 +16,14 @@
         <property name="visible">True</property>
         <child type="overlay">
           <object class="AdwHeaderBar">
-            <property name="show_close_button">True</property>
-            <property name="visible">True</property>
-            <property name="valign">start</property>
+            <property name="show_start_title_buttons">True</property>
+            <property name="show_end_title_buttons">True</property>
+           <property name="valign">start</property>
+            <property name="title-widget">
+              <object class="AdwWindowTitle">
+                <property name="visible">False</property>
+              </object>
+            </property>
           </object>
         </child>
       </object>
diff --git a/src/gs-metered-data-dialog.ui b/src/gs-metered-data-dialog.ui
index 73605e76f..8e9624a7d 100644
--- a/src/gs-metered-data-dialog.ui
+++ b/src/gs-metered-data-dialog.ui
@@ -6,8 +6,6 @@
     <property name="modal">True</property>
     <property name="destroy-with-parent">True</property>
     <property name="resizable">False</property>
-    <property name="type-hint">dialog</property>
-    <property name="skip-taskbar-hint">True</property>
     <property name="use-header-bar">1</property>
     <child internal-child="headerbar">
       <object class="GtkHeaderBar">
diff --git a/src/gs-repos-dialog.ui b/src/gs-repos-dialog.ui
index 768baaa94..4b65e8e5c 100644
--- a/src/gs-repos-dialog.ui
+++ b/src/gs-repos-dialog.ui
@@ -3,12 +3,9 @@
   <requires lib="gtk+" version="3.10"/>
   <template class="GsReposDialog" parent="AdwWindow">
     <property name="modal">True</property>
-    <property name="window_position">center</property>
     <property name="destroy_with_parent">True</property>
     <property name="icon_name">dialog-information</property>
-    <property name="skip_taskbar_hint">True</property>
     <property name="title" translatable="yes">Software Repositories</property>
-    <property name="type_hint">dialog</property>
     <property name="default-width">640</property>
     <property name="default-height">576</property>
 
@@ -19,9 +16,14 @@
         <property name="width-request">360</property>
         <child>
           <object class="AdwHeaderBar">
-            <property name="show_close_button">True</property>
+            <property name="show_start_title_buttons">True</property>
+            <property name="show_end_title_buttons">True</property>
             <property name="visible">True</property>
-            <property name="title" bind-source="GsReposDialog" bind-property="title" 
bind-flags="sync-create"/>
+            <property name="title-widget">
+              <object class="AdwWindowTitle">
+                <property name="title" bind-source="GsReposDialog" bind-property="title" 
bind-flags="sync-create"/>
+              </object>
+            </property>
           </object>
         </child>
         <child>
diff --git a/src/gs-review-dialog.ui b/src/gs-review-dialog.ui
index 28271f719..acb51ac20 100644
--- a/src/gs-review-dialog.ui
+++ b/src/gs-review-dialog.ui
@@ -12,33 +12,27 @@
     <property name="default_width">600</property>
     <property name="default_height">300</property>
     <property name="destroy_with_parent">True</property>
-    <property name="type_hint">dialog</property>
     <property name="use_header_bar">1</property>
-    <child internal-child="headerbar">
-      <object class="GtkHeaderBar">
-        <property name="show_close_button">False</property>
-        <child>
-          <object class="GtkButton" id="cancel_button">
-            <property name="label" translatable="yes">_Cancel</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-            <property name="use_underline">True</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkButton" id="post_button">
-            <property name="label" translatable="yes" comments="Translators: A button to publish the 
user&apos;s opinion about the app.">_Post</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-            <property name="use_underline">True</property>
-            <property name="sensitive">False</property>
-          </object>
-        </child>
+    <child type="action">
+      <object class="GtkButton" id="cancel_button">
+        <property name="label" translatable="yes">_Cancel</property>
+        <property name="visible">True</property>
+        <property name="can_focus">True</property>
+        <property name="receives_default">True</property>
+        <property name="use_underline">True</property>
+      </object>
+    </child>
+    <child type="action">
+      <object class="GtkButton" id="post_button">
+        <property name="label" translatable="yes" comments="Translators: A button to publish the user&apos;s 
opinion about the app.">_Post</property>
+        <property name="visible">True</property>
+        <property name="can_focus">True</property>
+        <property name="receives_default">True</property>
+        <property name="use_underline">True</property>
+        <property name="sensitive">False</property>
       </object>
     </child>
-    <child internal-child="vbox">
+    <child internal-child="content_area">
       <object class="GtkBox" id="dialog-vbox">
         <property name="margin_start">40</property>
         <property name="margin_end">40</property>
diff --git a/src/gs-shell.ui b/src/gs-shell.ui
index 9110287ca..8c1ab66ea 100644
--- a/src/gs-shell.ui
+++ b/src/gs-shell.ui
@@ -543,7 +543,7 @@
                 <child type="overlay">
                   <object class="GtkHeaderBar">
                     <property name="visible">True</property>
-                    <property name="show_close_button">True</property>
+                    <property name="show_title_buttons">True</property>
                     <property name="valign">start</property>
                   </object>
                 </child>
diff --git a/src/gs-update-dialog.ui b/src/gs-update-dialog.ui
index 17238b317..07dd766a4 100644
--- a/src/gs-update-dialog.ui
+++ b/src/gs-update-dialog.ui
@@ -3,12 +3,9 @@
   <requires lib="gtk+" version="3.10"/>
   <template class="GsUpdateDialog" parent="AdwWindow">
     <property name="modal">True</property>
-    <property name="window_position">center</property>
     <property name="destroy_with_parent">True</property>
     <property name="icon_name">dialog-information</property>
-    <property name="skip_taskbar_hint">True</property>
     <property name="title" translatable="yes">Software Repositories</property>
-    <property name="type_hint">dialog</property>
     <property name="default-width">640</property>
     <property name="default-height">576</property>
 
@@ -40,8 +37,9 @@
             <property name="orientation">vertical</property>
             <child>
               <object class="AdwHeaderBar">
-                <property name="show_close_button">True</property>
-                <property name="visible">True</property>
+                <property name="valign">start</property>
+                <property name="show_start_title_buttons">True</property>
+                <property name="show_end_title_buttons">True</property>
                 <property name="title-widget">
                   <object class="AdwWindowTitle" id="window_title">
                     <property name="title" bind-source="GsUpdateDialog" bind-property="title" 
bind-flags="sync-create"/>