From 1d46f55be45e227e43ded562d62f4f19e4bc041e Mon Sep 17 00:00:00 2001
From: Philip Withnall <withnall@endlessm.com>
Date: Wed, 26 Feb 2020 10:59:39 +0000
Subject: [PATCH 1/3] restrict-applications-dialog: Remove the Save button

Add a close button instead, as the dialogue is instant-apply.

See https://developer.gnome.org/hig/stable/dialogs.html.en#instant-and-explicit-apply

Signed-off-by: Philip Withnall <withnall@endlessm.com>

Helps: #11
---
 libmalcontent-ui/restrict-applications-dialog.ui | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/libmalcontent-ui/restrict-applications-dialog.ui b/libmalcontent-ui/restrict-applications-dialog.ui
index b0ebf15..e7244ba 100644
--- a/libmalcontent-ui/restrict-applications-dialog.ui
+++ b/libmalcontent-ui/restrict-applications-dialog.ui
@@ -10,7 +10,7 @@
     <child internal-child="headerbar">
       <object class="GtkHeaderBar">
         <property name="title" translatable="yes">Restrict Applications</property>
-        <property name="show-close-button">False</property>
+        <property name="show-close-button">True</property>
       </object>
     </child>
     <child internal-child="vbox">
@@ -46,16 +46,5 @@
         </child>
       </object>
     </child>
-    <child type="action">
-      <object class="GtkButton" id="button_save">
-        <property name="can-default">True</property>
-        <property name="visible">True</property>
-        <property name="label" translatable="yes">_Save</property>
-        <property name="use-underline">True</property>
-      </object>
-    </child>
-    <action-widgets>
-      <action-widget response="apply" default="true">button_save</action-widget>
-    </action-widgets>
   </template>
 </interface>

From 3f3e86bcbbb3e21de83cbdbefbf5f03042a58951 Mon Sep 17 00:00:00 2001
From: Philip Withnall <withnall@endlessm.com>
Date: Wed, 26 Feb 2020 11:00:28 +0000
Subject: [PATCH 2/3] user-controls: More minor wording tweaks

Signed-off-by: Philip Withnall <withnall@endlessm.com>

Helps: #11
---
 libmalcontent-ui/user-controls.c  | 4 ++--
 libmalcontent-ui/user-controls.ui | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/libmalcontent-ui/user-controls.c b/libmalcontent-ui/user-controls.c
index a4ff30d..e7fee0b 100644
--- a/libmalcontent-ui/user-controls.c
+++ b/libmalcontent-ui/user-controls.c
@@ -486,7 +486,7 @@ update_labels_from_name (MctUserControls *self)
   g_autofree gchar *l = NULL;
 
   /* Translators: The placeholder is a user’s display name. */
-  l = g_strdup_printf (_("Prevents %s from running web browsers. Note that limited web content may still be available in other applications."), self->user_display_name);
+  l = g_strdup_printf (_("Prevents %s from running web browsers. Limited web content may still be available in other applications."), self->user_display_name);
   gtk_label_set_label (self->restrict_web_browsers_description, l);
   g_clear_pointer (&l, g_free);
 
@@ -501,7 +501,7 @@ update_labels_from_name (MctUserControls *self)
   g_clear_pointer (&l, g_free);
 
   /* Translators: The placeholder is a user’s display name. */
-  l = g_strdup_printf (_("Prevents %s’s application installations from being available to all users."), self->user_display_name);
+  l = g_strdup_printf (_("Applications installed by %s will not appear for other users."), self->user_display_name);
   gtk_label_set_label (self->restrict_system_installation_description, l);
   g_clear_pointer (&l, g_free);
 }
diff --git a/libmalcontent-ui/user-controls.ui b/libmalcontent-ui/user-controls.ui
index 703ab66..8138469 100644
--- a/libmalcontent-ui/user-controls.ui
+++ b/libmalcontent-ui/user-controls.ui
@@ -86,7 +86,7 @@
                         <property name="wrap">True</property>
                         <property name="xalign">0</property>
                         <!-- Set dynamically from user-controls.c: -->
-                        <property name="label">Prevents {username} from running web browsers. Note that limited web content may still be available in other applications.</property>
+                        <property name="label">Prevents {username} from running web browsers. Limited web content may still be available in other applications.</property>
                         <attributes>
                           <attribute name="scale" value="0.88"/>
                         </attributes>
@@ -384,7 +384,7 @@
                         <property name="wrap">True</property>
                         <property name="xalign">0</property>
                         <!-- Set dynamically from user-controls.c: -->
-                        <property name="label">Prevents {username}’s application installations from being available to all users.</property>
+                        <property name="label">Applications installed by {username} will not appear for other users.</property>
                         <attributes>
                           <attribute name="scale" value="0.88"/>
                         </attributes>
@@ -469,7 +469,7 @@
                         <property name="ellipsize">none</property>
                         <property name="wrap">True</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Restricts application installation to those suitable for certain ages or above.</property>
+                        <property name="label" translatable="yes">Restricts browsing or installation of applications to applications suitable for certain ages or above.</property>
                         <attributes>
                           <attribute name="scale" value="0.88"/>
                         </attributes>

From 82ecf170794c68a7edf3ca0affca2e5ecff1cbec Mon Sep 17 00:00:00 2001
From: Philip Withnall <withnall@endlessm.com>
Date: Wed, 26 Feb 2020 11:00:41 +0000
Subject: [PATCH 3/3] user-controls: Left-align the OARS drop-down text
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Make it look more and more like a combo box. This widget really should
have been a combo box to begin with. We’re eventually going to end up
re-implementing a combo box from first principles at this rate.

Signed-off-by: Philip Withnall <withnall@endlessm.com>

Helps: #11
---
 libmalcontent-ui/user-controls.ui | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libmalcontent-ui/user-controls.ui b/libmalcontent-ui/user-controls.ui
index 8138469..40706cf 100644
--- a/libmalcontent-ui/user-controls.ui
+++ b/libmalcontent-ui/user-controls.ui
@@ -501,7 +501,8 @@
                                 <property name="visible">True</property>
                                 <property name="label"></property>
                                 <property name="expand">True</property>
-                                <property name="halign">center</property>
+                                <property name="halign">start</property>
+                                <property name="xalign">0.0</property>
                               </object>
                             </child>
                             <child>