[gnome-control-center] region: Add description label and use icon for options button

[Georges Basile Stavracas Neto <gbsneto src gnome org>]

commit 623a62a7f91881e98bc4c5688d26f60482bdeee0
Author: Robert Ancell <robert ancell canonical com>
Date:   Fri Sep 7 12:39:51 2018 +1200

    region: Add description label and use icon for options button
    
    As per design:
    https://wiki.gnome.org/Design/SystemSettings/RegionAndLanguage

 panels/region/region.ui | 74 ++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 55 insertions(+), 19 deletions(-)
---
diff --git a/panels/region/region.ui b/panels/region/region.ui
index d3af5be75..f9e98647b 100644
--- a/panels/region/region.ui
+++ b/panels/region/region.ui
@@ -174,35 +174,71 @@
                 <property name="orientation">vertical</property>
                 <property name="hexpand">True</property>
                 <child>
-                  <object class="GtkBox" id="input_heading_row">
+                  <object class="GtkBox">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
+                    <property name="spacing">6</property>
                     <property name="margin_bottom">12</property>
                     <child>
-                      <object class="GtkLabel" id="input_heading">
+                      <object class="GtkBox">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="margin_start">2</property>
-                        <property name="margin_end">2</property>
-                        <property name="xalign">0</property>
-                        <property name="hexpand">True</property>
-                        <property name="label" translatable="yes">Input Sources</property>
-                        <attributes>
-                          <attribute name="weight" value="bold"/>
-                        </attributes>
-                        <accessibility>
-                          <relation target="input_list" type="label-for"/>
-                        </accessibility>
+                        <property name="orientation">vertical</property>
+                        <property name="spacing">6</property>
+                        <child>
+                          <object class="GtkLabel" id="input_heading">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="halign">start</property>
+                            <property name="label" translatable="yes">Input Sources</property>
+                            <attributes>
+                              <attribute name="weight" value="bold"/>
+                            </attributes>
+                            <accessibility>
+                              <relation target="input_list" type="label-for"/>
+                            </accessibility>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkLabel">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="xalign">0</property>
+                            <property name="label" translatable="yes">Choose keyboard layouts or input 
methods.</property>
+                            <style>
+                              <class name="dim-label"/>
+                            </style>
+                          </object>
+                        </child>
                       </object>
                     </child>
                     <child>
-                      <object class="GtkMenuButton" id="options_button">
-                        <property name="label" translatable="yes">_Options</property>
+                      <object class="GtkAspectFrame">
                         <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="popover">options_popover</property>
+                        <property name="can_focus">False</property>
+                        <property name="label_xalign">0</property>
+                        <property name="shadow_type">none</property>
+                        <property name="obey_child">False</property>
+                        <property name="xalign">1.0</property>
+                        <property name="hexpand">True</property>
+                        <child>
+                          <object class="GtkMenuButton" id="options_button">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">True</property>
+                            <property name="popover">options_popover</property>
+                            <child>
+                              <object class="GtkImage">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="icon_name">emblem-system-symbolic</property>
+                              </object>
+                            </child>
+                            <style>
+                              <class name="image-button"/>
+                            </style>
+                          </object>
+                        </child>
                       </object>
                     </child>
                   </object>