[seahorse] pgp: fixup the titlebar.

[Niels De Graef <nielsdg src gnome org>]

commit b0c74f5e770cce705d350a93517be85209066e88
Author: Niels De Graef <nielsdegraef gmail com>
Date:   Sat Aug 11 19:02:57 2018 +0200

    pgp: fixup the titlebar.
    
    * Put the buttons in the titlebar to be more consistent with the
    GenerateSelect dialog.
    * Make sure we have a title. Again, I know this breaks string freeze,
    but it's better than no title at all.

 pgp/seahorse-pgp-generate.ui | 85 ++++++++++++++++----------------------------
 1 file changed, 31 insertions(+), 54 deletions(-)
---
diff --git a/pgp/seahorse-pgp-generate.ui b/pgp/seahorse-pgp-generate.ui
index 57335788..f8a3c58b 100644
--- a/pgp/seahorse-pgp-generate.ui
+++ b/pgp/seahorse-pgp-generate.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.0"/>
+  <requires lib="gtk+" version="3.22"/>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="lower">512</property>
     <property name="upper">8192</property>
@@ -8,10 +8,6 @@
     <property name="step_increment">512</property>
     <property name="page_increment">1</property>
   </object>
-  <object class="GtkImage" id="create-image">
-    <property name="can_focus">False</property>
-    <property name="stock">gtk-ok</property>
-  </object>
   <object class="GtkListStore" id="model1">
     <columns>
       <!-- column-name gchararray -->
@@ -24,7 +20,9 @@
     </data>
   </object>
   <object class="GtkDialog" id="pgp-generate">
+    <property name="title" translatable="yes">New PGP key</property>
     <property name="visible">True</property>
+    <property name="use_header_bar">1</property>
     <property name="can_focus">False</property>
     <property name="border_width">5</property>
     <property name="resizable">False</property>
@@ -38,55 +36,6 @@
         <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">2</property>
-        <child internal-child="action_area">
-          <object class="GtkButtonBox" id="dialog-action_area1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="cancelbutton1">
-                <property name="label">gtk-cancel</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_action_appearance">False</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="ok">
-                <property name="label" translatable="yes">C_reate</property>
-                <property name="visible">True</property>
-                <property name="sensitive">False</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="has_default">True</property>
-                <property name="receives_default">False</property>
-                <property name="tooltip_text" translatable="yes">Generate a new key</property>
-                <property name="use_action_appearance">False</property>
-                <property name="image">create-image</property>
-                <property name="use_underline">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">2</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
         <child>
           <object class="GtkHBox" id="hbox2">
             <property name="visible">True</property>
@@ -429,6 +378,34 @@
         </child>
       </object>
     </child>
+    <child type="action">
+      <object class="GtkButton" id="cancelbutton1">
+        <property name="label">gtk-cancel</property>
+        <property name="visible">True</property>
+        <property name="can_focus">True</property>
+        <property name="can_default">True</property>
+        <property name="receives_default">False</property>
+        <property name="use_action_appearance">False</property>
+        <property name="use_stock">True</property>
+      </object>
+    </child>
+    <child type="action">
+      <object class="GtkButton" id="ok">
+        <property name="label" translatable="yes">C_reate</property>
+        <property name="visible">True</property>
+        <property name="sensitive">False</property>
+        <property name="can_focus">True</property>
+        <property name="can_default">True</property>
+        <property name="has_default">True</property>
+        <property name="receives_default">False</property>
+        <property name="tooltip_text" translatable="yes">Generate a new key</property>
+        <property name="use_action_appearance">False</property>
+        <property name="use_underline">True</property>
+        <style>
+          <class name="suggested-action"/>
+        </style>
+      </object>
+    </child>
     <action-widgets>
       <action-widget response="-6">cancelbutton1</action-widget>
       <action-widget response="-5">ok</action-widget>