From ca7ba700472d1187479cf05298196a78670d941f Mon Sep 17 00:00:00 2001
From: Georges Basile Stavracas Neto <georges.stavracas@gmail.com>
Date: Fri, 21 Jan 2022 11:42:00 -0300
Subject: [PATCH 01/10] notifications: Add go-next-symbolic icon to rows

As per design feedback.

See https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/1587
---
 panels/notifications/cc-notifications-panel.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/panels/notifications/cc-notifications-panel.c b/panels/notifications/cc-notifications-panel.c
index 61d13c6a69..0e0faab45e 100644
--- a/panels/notifications/cc-notifications-panel.c
+++ b/panels/notifications/cc-notifications-panel.c
@@ -260,6 +260,9 @@ add_application (CcNotificationsPanel *panel,
                                 NULL);
   adw_action_row_add_suffix (ADW_ACTION_ROW (row), w);
 
+  w = gtk_image_new_from_icon_name ("go-next-symbolic");
+  adw_action_row_add_suffix (ADW_ACTION_ROW (row), w);
+
   g_hash_table_add (panel->known_applications, g_strdup (app->canonical_app_id));
 }
 
-- 
GitLab


From f23d876dc287a0c53fcb9b01159fcd854e5213bb Mon Sep 17 00:00:00 2001
From: Georges Basile Stavracas Neto <georges.stavracas@gmail.com>
Date: Fri, 21 Jan 2022 11:47:24 -0300
Subject: [PATCH 02/10] notifications: Adjust style of notifications dialog

Add margins around it, make the titlebar flat.

See https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/1587
---
 .../cc-app-notifications-dialog.ui             | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/panels/notifications/cc-app-notifications-dialog.ui b/panels/notifications/cc-app-notifications-dialog.ui
index 9af4a3a630..9f6217f5b9 100644
--- a/panels/notifications/cc-app-notifications-dialog.ui
+++ b/panels/notifications/cc-app-notifications-dialog.ui
@@ -1,17 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <template class="CcAppNotificationsDialog" parent="GtkDialog">
-    <property name="width_request">360</property>
+    <property name="width_request">350</property>
+    <property name="resizable">False</property>
     <property name="modal">True</property>
+    <child type="titlebar">
+      <object class="GtkHeaderBar">
+        <property name="show-title-buttons">True</property>
+        <style>
+          <class name="flat" />
+        </style>
+      </object>
+    </child>
     <child>
       <object class="GtkBox">
         <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
+        <property name="margin-top">12</property>
+        <property name="margin-bottom">36</property>
+        <property name="margin-start">36</property>
+        <property name="margin-end">36</property>
         <child>
           <object class="GtkListBox" id="main_listbox">
             <property name="selection_mode">none</property>
             <property name="show-separators">True</property>
             <property name="activate_on_single_click">False</property>
+            <style>
+              <class name="boxed-list" />
+            </style>
             <child>
               <object class="GtkListBoxRow">
                 <property name="width_request">100</property>
-- 
GitLab


From 0831e41fb0c6fd580177a3d449f60709432eb5b4 Mon Sep 17 00:00:00 2001
From: Georges Basile Stavracas Neto <georges.stavracas@gmail.com>
Date: Fri, 21 Jan 2022 12:10:48 -0300
Subject: [PATCH 03/10] notifications: Use AdwActionRow in the dialog

Reduces code and makes it more consistent with other panels.
---
 .../cc-app-notifications-dialog.c             |   2 -
 .../cc-app-notifications-dialog.ui            | 252 ++++--------------
 2 files changed, 53 insertions(+), 201 deletions(-)

diff --git a/panels/notifications/cc-app-notifications-dialog.c b/panels/notifications/cc-app-notifications-dialog.c
index 7a3db6578a..851ddc481e 100644
--- a/panels/notifications/cc-app-notifications-dialog.c
+++ b/panels/notifications/cc-app-notifications-dialog.c
@@ -55,7 +55,6 @@ struct _CcAppNotificationsDialog {
   gchar               *app_id;
   GDBusProxy          *perm_store;
 
-  GtkWidget           *main_listbox;
   GtkWidget           *notifications_switch;
   GtkWidget           *sound_alerts_switch;
   GtkWidget           *notification_banners_switch;
@@ -354,7 +353,6 @@ cc_app_notifications_dialog_class_init (CcAppNotificationsDialogClass *klass)
 
   gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/notifications/cc-app-notifications-dialog.ui");
 
-  gtk_widget_class_bind_template_child (widget_class, CcAppNotificationsDialog, main_listbox);
   gtk_widget_class_bind_template_child (widget_class, CcAppNotificationsDialog, notifications_switch);
   gtk_widget_class_bind_template_child (widget_class, CcAppNotificationsDialog, sound_alerts_switch);
   gtk_widget_class_bind_template_child (widget_class, CcAppNotificationsDialog, notification_banners_switch);
diff --git a/panels/notifications/cc-app-notifications-dialog.ui b/panels/notifications/cc-app-notifications-dialog.ui
index 9f6217f5b9..dfc7d4a26c 100644
--- a/panels/notifications/cc-app-notifications-dialog.ui
+++ b/panels/notifications/cc-app-notifications-dialog.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <template class="CcAppNotificationsDialog" parent="GtkDialog">
-    <property name="width_request">350</property>
+    <property name="default-width">550</property>
     <property name="resizable">False</property>
     <property name="modal">True</property>
     <child type="titlebar">
@@ -13,237 +13,91 @@
       </object>
     </child>
     <child>
-      <object class="GtkBox">
-        <property name="can_focus">False</property>
-        <property name="orientation">vertical</property>
-        <property name="margin-top">12</property>
-        <property name="margin-bottom">36</property>
-        <property name="margin-start">36</property>
-        <property name="margin-end">36</property>
+      <object class="AdwPreferencesPage">
         <child>
-          <object class="GtkListBox" id="main_listbox">
-            <property name="selection_mode">none</property>
-            <property name="show-separators">True</property>
-            <property name="activate_on_single_click">False</property>
-            <style>
-              <class name="boxed-list" />
-            </style>
+          <object class="AdwPreferencesGroup">
             <child>
-              <object class="GtkListBoxRow">
-                <property name="width_request">100</property>
-                <property name="activatable">False</property>
-                <property name="selectable">False</property>
+              <object class="AdwActionRow">
+                <property name="use-underline">True</property>
+                <property name="title" translatable="yes" context="notifications" comments="This is the per application switch for message tray usage.">_Notifications</property>
+                <property name="activatable-widget">notifications_switch</property>
                 <child>
-                  <object class="GtkBox">
-                    <property name="margin_start">15</property>
-                    <property name="margin_end">15</property>
-                    <property name="margin_top">12</property>
-                    <property name="margin_bottom">12</property>
-                    <child>
-                      <object class="GtkLabel">
-                        <property name="hexpand">True</property>
-                        <property name="vexpand">True</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes" context="notifications" comments="This is the per application switch for message tray usage.">_Notifications</property>
-                        <property name="use_underline">True</property>
-                        <property name="mnemonic_widget">notifications_switch</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkSwitch" id="notifications_switch">
-                        <property name="halign">end</property>
-                        <property name="valign">center</property>
-                        <property name="active">True</property>
-                        <signal name="notify::active" handler="notifications_switch_state_set_cb" swapped="no"/>
-                      </object>
-                    </child>
+                  <object class="GtkSwitch" id="notifications_switch">
+                    <property name="halign">end</property>
+                    <property name="valign">center</property>
+                    <property name="active">True</property>
+                    <signal name="notify::active" handler="notifications_switch_state_set_cb" swapped="no"/>
                   </object>
                 </child>
               </object>
             </child>
             <child>
-              <object class="GtkListBoxRow">
-                <property name="width_request">100</property>
-                <property name="activatable">False</property>
-                <property name="selectable">False</property>
+              <object class="AdwActionRow">
+                <property name="use-underline">True</property>
+                <property name="title" translatable="yes" context="notifications" comments="This is the setting to configure sounds associated with notifications.">Sound _Alerts</property>
+                <property name="activatable-widget">sound_alerts_switch</property>
                 <child>
-                  <object class="GtkBox">
-                    <property name="margin_start">15</property>
-                    <property name="margin_end">15</property>
-                    <property name="margin_top">12</property>
-                    <property name="margin_bottom">12</property>
-                    <child>
-                      <object class="GtkLabel">
-                        <property name="hexpand">True</property>
-                        <property name="vexpand">True</property>
-                        <property name="xalign">0</property>
-                        <property name="margin_end">15</property>
-                        <property name="label" translatable="yes" context="notifications" comments="This is the setting to configure sounds associated with notifications.">Sound _Alerts</property>
-                        <property name="use_underline">True</property>
-                        <property name="mnemonic_widget">sound_alerts_switch</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkSwitch" id="sound_alerts_switch">
-                        <property name="halign">end</property>
-                        <property name="valign">center</property>
-                        <signal name="notify::active" handler="sound_alerts_switch_state_set_cb" swapped="no"/>
-                      </object>
-                    </child>
+                  <object class="GtkSwitch" id="sound_alerts_switch">
+                    <property name="halign">end</property>
+                    <property name="valign">center</property>
+                    <signal name="notify::active" handler="sound_alerts_switch_state_set_cb" swapped="no"/>
                   </object>
                 </child>
               </object>
             </child>
             <child>
-              <object class="GtkListBoxRow">
-                <property name="width_request">100</property>
-                <property name="activatable">False</property>
-                <property name="selectable">False</property>
+              <object class="AdwActionRow">
+                <property name="use-underline">True</property>
+                <property name="title" translatable="yes" context="notifications">Notification _Popups</property>
+                <property name="subtitle" translatable="yes">Notifications will continue to appear in the notification list when popups are disabled.</property>
+                <property name="activatable-widget">notification_banners_switch</property>
                 <child>
-                  <object class="GtkBox">
-                    <property name="margin_start">15</property>
-                    <property name="margin_end">15</property>
-                    <property name="margin_top">12</property>
-                    <property name="margin_bottom">12</property>
-                    <child>
-                      <object class="GtkBox">
-                        <property name="orientation">vertical</property>
-                        <child>
-                          <object class="GtkLabel">
-                            <property name="hexpand">True</property>
-                            <property name="vexpand">True</property>
-                            <property name="xalign">0</property>
-                            <property name="margin_end">15</property>
-                            <property name="label" translatable="yes" context="notifications">Notification _Popups</property>
-                            <property name="use_underline">True</property>
-                            <property name="mnemonic_widget">notification_banners_switch</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkLabel">
-                            <property name="max-width-chars">42</property>
-                            <property name="wrap-mode">word</property>
-                            <property name="label" translatable="yes">Notifications will continue to appear in the notification list when popups are disabled.</property>
-                            <property name="wrap">True</property>
-                            <property name="lines">-1</property>
-                            <property name="xalign">0</property>
-                            <style>
-                              <class name="dim-label"/>
-                            </style>
-                            <attributes>
-                              <attribute name="scale" value="0.83"/>
-                            </attributes>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkSwitch" id="notification_banners_switch">
-                        <property name="halign">end</property>
-                        <property name="valign">center</property>
-                        <signal name="notify::active" handler="notification_banners_switch_state_set_cb" swapped="no"/>
-                      </object>
-                    </child>
+                  <object class="GtkSwitch" id="notification_banners_switch">
+                    <property name="halign">end</property>
+                    <property name="valign">center</property>
+                    <signal name="notify::active" handler="notification_banners_switch_state_set_cb" swapped="no"/>
                   </object>
                 </child>
               </object>
             </child>
             <child>
-              <object class="GtkListBoxRow">
-                <property name="width_request">100</property>
-                <property name="activatable">False</property>
-                <property name="selectable">False</property>
+              <object class="AdwActionRow">
+                <property name="use-underline">True</property>
+                <property name="title" translatable="yes" context="notifications" comments="Popups here refers to message tray notifications in the middle of the screen.">Show Message _Content in Popups</property>
+                <property name="activatable-widget">notification_banners_content_switch</property>
                 <child>
-                  <object class="GtkBox">
-                    <property name="margin_start">15</property>
-                    <property name="margin_end">15</property>
-                    <property name="margin_top">12</property>
-                    <property name="margin_bottom">12</property>
-                    <child>
-                      <object class="GtkLabel">
-                        <property name="visible">True</property>
-                        <property name="hexpand">True</property>
-                        <property name="vexpand">True</property>
-                        <property name="xalign">0</property>
-                        <property name="margin_end">15</property>
-                        <property name="label" translatable="yes" context="notifications" comments="Popups here refers to message tray notifications in the middle of the screen.">Show Message _Content in Popups</property>
-                        <property name="use_underline">True</property>
-                        <property name="mnemonic_widget">notification_banners_content_switch</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkSwitch" id="notification_banners_content_switch">
-                        <property name="halign">end</property>
-                        <property name="valign">center</property>
-                        <signal name="notify::active" handler="notification_banners_content_switch_state_set_cb" swapped="no"/>
-                      </object>
-                    </child>
+                  <object class="GtkSwitch" id="notification_banners_content_switch">
+                    <property name="halign">end</property>
+                    <property name="valign">center</property>
+                    <signal name="notify::active" handler="notification_banners_content_switch_state_set_cb" swapped="no"/>
                   </object>
                 </child>
               </object>
             </child>
             <child>
-              <object class="GtkListBoxRow">
-                <property name="width_request">100</property>
-                <property name="activatable">False</property>
-                <property name="selectable">False</property>
+              <object class="AdwActionRow">
+                <property name="use-underline">True</property>
+                <property name="title" translatable="yes" context="notifications">_Lock Screen Notifications</property>
+                <property name="activatable-widget">lock_screen_notifications_switch</property>
                 <child>
-                  <object class="GtkBox">
-                    <property name="margin_start">15</property>
-                    <property name="margin_end">15</property>
-                    <property name="margin_top">12</property>
-                    <property name="margin_bottom">12</property>
-                    <child>
-                      <object class="GtkLabel">
-                        <property name="hexpand">True</property>
-                        <property name="vexpand">True</property>
-                        <property name="xalign">0</property>
-                        <property name="margin_end">15</property>
-                        <property name="label" translatable="yes" context="notifications">_Lock Screen Notifications</property>
-                        <property name="use_underline">True</property>
-                        <property name="mnemonic_widget">lock_screen_notifications_switch</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkSwitch" id="lock_screen_notifications_switch">
-                        <property name="halign">end</property>
-                        <property name="valign">center</property>
-                        <signal name="notify::active" handler="lock_screen_notifications_switch_state_set_cb" swapped="no"/>
-                      </object>
-                    </child>
+                  <object class="GtkSwitch" id="lock_screen_notifications_switch">
+                    <property name="halign">end</property>
+                    <property name="valign">center</property>
+                    <signal name="notify::active" handler="lock_screen_notifications_switch_state_set_cb" swapped="no"/>
                   </object>
                 </child>
               </object>
             </child>
             <child>
-              <object class="GtkListBoxRow">
-                <property name="width_request">100</property>
-                <property name="activatable">False</property>
-                <property name="selectable">False</property>
+              <object class="AdwActionRow">
+                <property name="use-underline">True</property>
+                <property name="title" translatable="yes" context="notifications">Show Message C_ontent on Lock Screen</property>
+                <property name="activatable-widget">lock_screen_content_switch</property>
                 <child>
-                  <object class="GtkBox">
-                    <property name="margin_start">15</property>
-                    <property name="margin_end">15</property>
-                    <property name="margin_top">12</property>
-                    <property name="margin_bottom">12</property>
-                    <child>
-                      <object class="GtkLabel">
-                        <property name="hexpand">True</property>
-                        <property name="vexpand">True</property>
-                        <property name="xalign">0</property>
-                        <property name="margin_end">15</property>
-                        <property name="label" translatable="yes" context="notifications">Show Message C_ontent on Lock Screen</property>
-                        <property name="use_underline">True</property>
-                        <property name="mnemonic_widget">lock_screen_content_switch</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkSwitch" id="lock_screen_content_switch">
-                        <property name="halign">end</property>
-                        <property name="valign">center</property>
-                        <signal name="notify::active" handler="lock_screen_content_switch_state_set_cb" swapped="no"/>
-                      </object>
-                    </child>
+                  <object class="GtkSwitch" id="lock_screen_content_switch">
+                    <property name="halign">end</property>
+                    <property name="valign">center</property>
+                    <signal name="notify::active" handler="lock_screen_content_switch_state_set_cb" swapped="no"/>
                   </object>
                 </child>
               </object>
-- 
GitLab


From 1ef843583d8f827450a85e95a557f8bfc741bd41 Mon Sep 17 00:00:00 2001
From: Georges Basile Stavracas Neto <georges.stavracas@gmail.com>
Date: Fri, 21 Jan 2022 12:14:20 -0300
Subject: [PATCH 04/10] sound: Add boxed list around system volume

See https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/1587
---
 panels/sound/cc-sound-panel.ui | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/panels/sound/cc-sound-panel.ui b/panels/sound/cc-sound-panel.ui
index e20071b085..dadf96a40f 100644
--- a/panels/sound/cc-sound-panel.ui
+++ b/panels/sound/cc-sound-panel.ui
@@ -7,7 +7,16 @@
           <object class="AdwPreferencesGroup">
             <property name="title" translatable="yes">System Volume</property>
             <child>
-              <object class="CcVolumeSlider" id="output_volume_slider" />
+              <object class="AdwPreferencesRow">
+                <child>
+                  <object class="CcVolumeSlider" id="output_volume_slider">
+                    <property name="margin-top">12</property>
+                    <property name="margin-bottom">12</property>
+                    <property name="margin-start">12</property>
+                    <property name="margin-end">12</property>
+                  </object>
+                </child>
+              </object>
             </child>
           </object>
         </child>
-- 
GitLab


From 07e3f5c3f39736e7e369d0de2a013bb561fe089b Mon Sep 17 00:00:00 2001
From: Georges Basile Stavracas Neto <georges.stavracas@gmail.com>
Date: Fri, 21 Jan 2022 12:16:31 -0300
Subject: [PATCH 05/10] power: Add go-next-symbolic icon to automatic suspend
 row

See https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/1587
---
 panels/power/cc-power-panel.ui | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/panels/power/cc-power-panel.ui b/panels/power/cc-power-panel.ui
index a637fdd3fc..19ac1403af 100644
--- a/panels/power/cc-power-panel.ui
+++ b/panels/power/cc-power-panel.ui
@@ -181,6 +181,12 @@
                     <signal name="mnemonic-activate" handler="automatic_suspend_label_mnemonic_activate_cb" object="CcPowerPanel" swapped="yes"/>
                   </object>
                 </child>
+                <child>
+                  <object class="GtkImage">
+                    <property name="valign">center</property>
+                    <property name="icon-name">go-next-symbolic</property>
+                  </object>
+                </child>
               </object>
             </child>
           </object>
-- 
GitLab


From bc686f7b1417f6bb2079cf3421d86477d7d68bc7 Mon Sep 17 00:00:00 2001
From: Georges Basile Stavracas Neto <georges.stavracas@gmail.com>
Date: Fri, 21 Jan 2022 12:21:10 -0300
Subject: [PATCH 06/10] accessibility: Add go-next-symbolic icon to various
 rows

See https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/1587
---
 panels/universal-access/cc-ua-panel.ui | 42 ++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/panels/universal-access/cc-ua-panel.ui b/panels/universal-access/cc-ua-panel.ui
index 425a6f2033..fb01d98e62 100644
--- a/panels/universal-access/cc-ua-panel.ui
+++ b/panels/universal-access/cc-ua-panel.ui
@@ -103,6 +103,12 @@
                     <property name="xalign">1</property>
                   </object>
                 </child>
+                <child type="suffix">
+                  <object class="GtkImage">
+                    <property name="valign">center</property>
+                    <property name="icon-name">go-next-symbolic</property>
+                  </object>
+                </child>
               </object>
             </child>
             <child>
@@ -117,6 +123,12 @@
                     <property name="xalign">1</property>
                   </object>
                 </child>
+                <child type="suffix">
+                  <object class="GtkImage">
+                    <property name="valign">center</property>
+                    <property name="icon-name">go-next-symbolic</property>
+                  </object>
+                </child>
               </object>
             </child>
           </object>
@@ -136,6 +148,12 @@
                     <property name="xalign">1</property>
                   </object>
                 </child>
+                <child type="suffix">
+                  <object class="GtkImage">
+                    <property name="valign">center</property>
+                    <property name="icon-name">go-next-symbolic</property>
+                  </object>
+                </child>
               </object>
             </child>
           </object>
@@ -167,6 +185,12 @@
                     <property name="xalign">1</property>
                   </object>
                 </child>
+                <child type="suffix">
+                  <object class="GtkImage">
+                    <property name="valign">center</property>
+                    <property name="icon-name">go-next-symbolic</property>
+                  </object>
+                </child>
               </object>
             </child>
             <child>
@@ -181,6 +205,12 @@
                     <property name="xalign">1</property>
                   </object>
                 </child>
+                <child type="suffix">
+                  <object class="GtkImage">
+                    <property name="valign">center</property>
+                    <property name="icon-name">go-next-symbolic</property>
+                  </object>
+                </child>
               </object>
             </child>
             <child>
@@ -195,6 +225,12 @@
                     <property name="xalign">1</property>
                   </object>
                 </child>
+                <child type="suffix">
+                  <object class="GtkImage">
+                    <property name="valign">center</property>
+                    <property name="icon-name">go-next-symbolic</property>
+                  </object>
+                </child>
               </object>
             </child>
           </object>
@@ -238,6 +274,12 @@
                     <property name="xalign">1</property>
                   </object>
                 </child>
+                <child type="suffix">
+                  <object class="GtkImage">
+                    <property name="valign">center</property>
+                    <property name="icon-name">go-next-symbolic</property>
+                  </object>
+                </child>
               </object>
             </child>
             <child>
-- 
GitLab


From 2e73952d28ec36b2e89ea9ecbbd4856348fc6276 Mon Sep 17 00:00:00 2001
From: Georges Basile Stavracas Neto <georges.stavracas@gmail.com>
Date: Fri, 21 Jan 2022 12:31:50 -0300
Subject: [PATCH 07/10] datetime: Add go-next-symbolic to dialog rows

See https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/1587
---
 panels/datetime/cc-datetime-panel.ui | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/panels/datetime/cc-datetime-panel.ui b/panels/datetime/cc-datetime-panel.ui
index ec671e2478..fcb2fc5345 100644
--- a/panels/datetime/cc-datetime-panel.ui
+++ b/panels/datetime/cc-datetime-panel.ui
@@ -331,6 +331,12 @@
                     <property name="label">20 June 2012, 6:45 AM</property>
                   </object>
                 </child>
+                <child>
+                  <object class="GtkImage">
+                    <property name="valign">center</property>
+                    <property name="icon-name">go-next-symbolic</property>
+                  </object>
+                </child>
               </object>
             </child>
           </object>
@@ -363,6 +369,12 @@
                     <property name="label">GMT+1 (London, United Kingdom)</property>
                   </object>
                 </child>
+                <child>
+                  <object class="GtkImage">
+                    <property name="valign">center</property>
+                    <property name="icon-name">go-next-symbolic</property>
+                  </object>
+                </child>
               </object>
             </child>
           </object>
-- 
GitLab


From fbee78874f4d1219db9965a23422f932e7e7823a Mon Sep 17 00:00:00 2001
From: Georges Basile Stavracas Neto <georges.stavracas@gmail.com>
Date: Fri, 21 Jan 2022 12:35:41 -0300
Subject: [PATCH 08/10] region: Add go-next-symbolic to rows

See https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/1587
---
 panels/region/cc-region-panel.ui | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/panels/region/cc-region-panel.ui b/panels/region/cc-region-panel.ui
index 19a77ac0c1..e801495ada 100644
--- a/panels/region/cc-region-panel.ui
+++ b/panels/region/cc-region-panel.ui
@@ -99,6 +99,12 @@
                                     <property name="margin_top">8</property>
                                   </object>
                                 </child>
+                                <child>
+                                  <object class="GtkImage">
+                                    <property name="valign">center</property>
+                                    <property name="icon-name">go-next-symbolic</property>
+                                  </object>
+                                </child>
                               </object>
                             </child>
                             <child>
@@ -197,6 +203,12 @@
                                 <property name="margin_top">8</property>
                               </object>
                             </child>
+                            <child>
+                              <object class="GtkImage">
+                                <property name="valign">center</property>
+                                <property name="icon-name">go-next-symbolic</property>
+                              </object>
+                            </child>
                           </object>
                         </child>
                       </object>
-- 
GitLab


From 17c25a18d2ec0758bfc32bf559dfab137634d975 Mon Sep 17 00:00:00 2001
From: Georges Basile Stavracas Neto <georges.stavracas@gmail.com>
Date: Fri, 21 Jan 2022 12:36:06 -0300
Subject: [PATCH 09/10] region: Hide login label by default

A regression from the GTK4 port.
---
 panels/region/cc-region-panel.ui | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/panels/region/cc-region-panel.ui b/panels/region/cc-region-panel.ui
index e801495ada..7f654e2d63 100644
--- a/panels/region/cc-region-panel.ui
+++ b/panels/region/cc-region-panel.ui
@@ -217,14 +217,15 @@
                 </child>
                 <child>
                   <object class="GtkLabel" id="login_label">
-                   <property name="valign">end</property>
-                   <property name="vexpand">True</property>
-                   <property name="hexpand">True</property>
-                   <property name="label" translatable="yes">Login settings are used by all users when logging into the system</property>
-                   <property name="margin_bottom">12</property>
-                   <style>
-                     <class name="dim-label"/>
-                   </style>
+                    <property name="visible">False</property>
+                    <property name="valign">end</property>
+                    <property name="vexpand">True</property>
+                    <property name="hexpand">True</property>
+                    <property name="label" translatable="yes">Login settings are used by all users when logging into the system</property>
+                    <property name="margin_bottom">12</property>
+                    <style>
+                      <class name="dim-label"/>
+                    </style>
                   </object>
                 </child>
               </object>
-- 
GitLab


From 4cd8c05e0a7c5daf10a4425ad10c59c89f297b7f Mon Sep 17 00:00:00 2001
From: Georges Basile Stavracas Neto <georges.stavracas@gmail.com>
Date: Fri, 21 Jan 2022 12:39:41 -0300
Subject: [PATCH 10/10] region: Remove title buttons from format chooser dialog

A regression from the GTK4 port.

See https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/1587
---
 panels/region/cc-format-chooser.ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/panels/region/cc-format-chooser.ui b/panels/region/cc-format-chooser.ui
index 4a15de9e01..5dfe44c956 100644
--- a/panels/region/cc-format-chooser.ui
+++ b/panels/region/cc-format-chooser.ui
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <template class="CcFormatChooser" parent="GtkDialog">
     <property name="title" translatable="yes">Formats</property>
     <property name="modal">True</property>
@@ -10,6 +9,7 @@
     <!-- Titlebar -->
     <child type="titlebar">
       <object class="GtkHeaderBar" id="title_bar">
+        <property name="show-title-buttons">False</property>
 
         <child>
           <object class="GtkStack" id="title_buttons">
-- 
GitLab