[gnome-games/wip/exalm/ui: 4/5] ui: Prefer 'frame' style class over GtkFrame

[Alexander Mikhaylenko <alexm src gnome org>]

commit c047621d30f4e07d4c274fa9decbe5555f0fcb38
Author: Alexander Mikhaylenko <exalm7659 gmail com>
Date:   Thu May 30 15:12:05 2019 +0500

    ui: Prefer 'frame' style class over GtkFrame

 data/ui/preferences-page-backup-restore.ui         | 110 ++++++++++-----------
 data/ui/preferences-page-controllers.ui            |  30 +++---
 data/ui/preferences-page-platforms.ui              |  15 ++-
 data/ui/preferences-page-video.ui                  |  15 ++-
 .../data/ui/nintendo-ds-layout-switcher.ui         |   1 +
 src/ui/preferences-page-controllers.vala           |   4 +-
 6 files changed, 78 insertions(+), 97 deletions(-)
---
diff --git a/data/ui/preferences-page-backup-restore.ui b/data/ui/preferences-page-backup-restore.ui
index 1ca99ead..8be29912 100644
--- a/data/ui/preferences-page-backup-restore.ui
+++ b/data/ui/preferences-page-backup-restore.ui
@@ -15,45 +15,42 @@
       </object>
     </child>
     <child>
-      <object class="GtkFrame">
+      <object class="GtkListBox">
         <property name="visible">True</property>
-        <property name="shadow-type">in</property>
+        <property name="selection-mode">none</property>
+        <style>
+          <class name="frame"/>
+        </style>
         <child>
-          <object class="GtkListBox">
+          <object class="GtkListBoxRow">
             <property name="visible">True</property>
-            <property name="selection-mode">none</property>
             <child>
-              <object class="GtkListBoxRow">
+              <object class="GtkBox">
                 <property name="visible">True</property>
+                <property name="valign">center</property>
+                <property name="margin">6</property>
+                <property name="spacing">6</property>
                 <child>
-                  <object class="GtkBox">
+                  <object class="GtkLabel">
                     <property name="visible">True</property>
-                    <property name="valign">center</property>
-                    <property name="margin">6</property>
-                    <property name="spacing">6</property>
-                    <child>
-                      <object class="GtkLabel">
-                        <property name="visible">True</property>
-                        <property name="xalign">0</property>
-                        <property name="expand">True</property>
-                        <property name="label" translatable="yes">Back up save data</property>
-                        <property name="ellipsize">end</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkButton">
-                        <property name="visible">True</property>
-                        <property name="can-focus">True</property>
-                        <property name="use-underline">True</property>
-                        <property name="label" translatable="yes">_Back Up</property>
-                        <signal name="clicked" handler="on_backup_clicked"/>
-                      </object>
-                    </child>
+                    <property name="xalign">0</property>
+                    <property name="expand">True</property>
+                    <property name="label" translatable="yes">Back up save data</property>
+                    <property name="ellipsize">end</property>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkButton">
+                    <property name="visible">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="use-underline">True</property>
+                    <property name="label" translatable="yes">_Back Up</property>
+                    <signal name="clicked" handler="on_backup_clicked"/>
                   </object>
                 </child>
               </object>
             </child>
-         </object>
+          </object>
         </child>
       </object>
     </child>
@@ -70,43 +67,40 @@
       </object>
     </child>
     <child>
-       <object class="GtkFrame">
+      <object class="GtkListBox">
         <property name="visible">True</property>
-        <property name="shadow-type">in</property>
+        <property name="selection-mode">none</property>
+        <style>
+          <class name="frame"/>
+        </style>
         <child>
-          <object class="GtkListBox">
+          <object class="GtkListBoxRow">
             <property name="visible">True</property>
-            <property name="selection-mode">none</property>
             <child>
-              <object class="GtkListBoxRow">
+              <object class="GtkBox">
                 <property name="visible">True</property>
+                <property name="valign">center</property>
+                <property name="margin">6</property>
+                <property name="spacing">6</property>
+                <child>
+                  <object class="GtkLabel">
+                    <property name="visible">True</property>
+                    <property name="xalign">0</property>
+                    <property name="expand">True</property>
+                    <property name="label" translatable="yes">Restore save data</property>
+                    <property name="ellipsize">end</property>
+                  </object>
+                </child>
                 <child>
-                  <object class="GtkBox">
+                  <object class="GtkButton">
                     <property name="visible">True</property>
-                    <property name="valign">center</property>
-                    <property name="margin">6</property>
-                    <property name="spacing">6</property>
-                    <child>
-                      <object class="GtkLabel">
-                        <property name="visible">True</property>
-                        <property name="xalign">0</property>
-                        <property name="expand">True</property>
-                        <property name="label" translatable="yes">Restore save data</property>
-                        <property name="ellipsize">end</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkButton">
-                        <property name="visible">True</property>
-                        <property name="can-focus">True</property>
-                        <property name="use-underline">True</property>
-                        <property name="label" translatable="yes">_Restore</property>
-                        <signal name="clicked" handler="on_restore_clicked"/>
-                        <style>
-                          <class name="destructive-action"/>
-                        </style>
-                      </object>
-                    </child>
+                    <property name="can-focus">True</property>
+                    <property name="use-underline">True</property>
+                    <property name="label" translatable="yes">_Restore</property>
+                    <signal name="clicked" handler="on_restore_clicked"/>
+                    <style>
+                      <class name="destructive-action"/>
+                    </style>
                   </object>
                 </child>
               </object>
diff --git a/data/ui/preferences-page-controllers.ui b/data/ui/preferences-page-controllers.ui
index 939b996a..b5721e5d 100644
--- a/data/ui/preferences-page-controllers.ui
+++ b/data/ui/preferences-page-controllers.ui
@@ -14,16 +14,13 @@
       </object>
     </child>
     <child>
-      <object class="GtkFrame" id="gamepads_frame">
+      <object class="GtkListBox" id="gamepads_list_box">
         <property name="visible">True</property>
-        <property name="shadow-type">in</property>
-        <child>
-          <object class="GtkListBox" id="gamepads_list_box">
-            <property name="visible">True</property>
-            <property name="selection-mode">none</property>
-            <signal name="row-activated" handler="gamepads_list_box_row_activated"/>
-          </object>
-        </child>
+        <property name="selection-mode">none</property>
+        <signal name="row-activated" handler="gamepads_list_box_row_activated"/>
+        <style>
+          <class name="frame"/>
+        </style>
       </object>
     </child>
     <child>
@@ -37,16 +34,13 @@
       </object>
     </child>
     <child>
-      <object class="GtkFrame">
+      <object class="GtkListBox" id="keyboard_list_box">
         <property name="visible">True</property>
-        <property name="shadow-type">in</property>
-        <child>
-          <object class="GtkListBox" id="keyboard_list_box">
-            <property name="visible">True</property>
-            <property name="selection-mode">none</property>
-            <signal name="row-activated" handler="keyboard_list_box_row_activated"/>
-          </object>
-        </child>
+        <property name="selection-mode">none</property>
+        <signal name="row-activated" handler="keyboard_list_box_row_activated"/>
+        <style>
+          <class name="frame"/>
+        </style>
       </object>
     </child>
   </template>
diff --git a/data/ui/preferences-page-platforms.ui b/data/ui/preferences-page-platforms.ui
index 43ea93b2..90c259c0 100644
--- a/data/ui/preferences-page-platforms.ui
+++ b/data/ui/preferences-page-platforms.ui
@@ -4,16 +4,13 @@
   <template class="GamesPreferencesPagePlatforms" parent="GamesPreferencesPage">
     <property name="visible">True</property>
     <child>
-      <object class="GtkFrame">
+      <object class="GtkListBox" id="list_box">
+        <property name="selection-mode">none</property>
         <property name="visible">true</property>
-        <property name="shadow-type">in</property>
-        <child>
-          <object class="GtkListBox" id="list_box">
-            <property name="selection-mode">none</property>
-            <property name="visible">true</property>
-            <signal name="row-activated" handler="on_row_activated"/>
-          </object>
-        </child>
+        <signal name="row-activated" handler="on_row_activated"/>
+        <style>
+          <class name="frame"/>
+        </style>
       </object>
     </child>
   </template>
diff --git a/data/ui/preferences-page-video.ui b/data/ui/preferences-page-video.ui
index 6559d6a1..5a272964 100644
--- a/data/ui/preferences-page-video.ui
+++ b/data/ui/preferences-page-video.ui
@@ -14,16 +14,13 @@
       </object>
     </child>
     <child>
-      <object class="GtkFrame">
+      <object class="GtkListBox" id="filter_list_box">
         <property name="visible">True</property>
-        <property name="shadow-type">in</property>
-        <child>
-          <object class="GtkListBox" id="filter_list_box">
-            <property name="visible">True</property>
-            <property name="selection-mode">none</property>
-            <signal name="row-activated" handler="filter_list_box_row_activated"/>
-          </object>
-        </child>
+        <property name="selection-mode">none</property>
+        <signal name="row-activated" handler="filter_list_box_row_activated"/>
+        <style>
+          <class name="frame"/>
+        </style>
       </object>
     </child>
   </template>
diff --git a/plugins/nintendo-ds/data/ui/nintendo-ds-layout-switcher.ui 
b/plugins/nintendo-ds/data/ui/nintendo-ds-layout-switcher.ui
index 502314d6..95f9dfab 100644
--- a/plugins/nintendo-ds/data/ui/nintendo-ds-layout-switcher.ui
+++ b/plugins/nintendo-ds/data/ui/nintendo-ds-layout-switcher.ui
@@ -64,6 +64,7 @@
       <object class="GtkFrame">
         <property name="visible">True</property>
         <property name="margin">6</property>
+        <property name="shadow-type">in</property>
         <child>
           <object class="GtkListBox" id="list_box">
             <property name="visible">True</property>
diff --git a/src/ui/preferences-page-controllers.vala b/src/ui/preferences-page-controllers.vala
index 7af5afc2..36528bff 100644
--- a/src/ui/preferences-page-controllers.vala
+++ b/src/ui/preferences-page-controllers.vala
@@ -5,8 +5,6 @@ private class Games.PreferencesPageControllers : PreferencesPage {
        [GtkChild]
        private Gtk.Label gamepads_label;
        [GtkChild]
-       private Gtk.Frame gamepads_frame;
-       [GtkChild]
        private Gtk.ListBox gamepads_list_box;
        [GtkChild]
        private Gtk.ListBox keyboard_list_box;
@@ -42,7 +40,7 @@ private class Games.PreferencesPageControllers : PreferencesPage {
                        gamepads_list_box.add (box);
                }
                gamepads_label.visible = i > 0;
-               gamepads_frame.visible = i > 0;
+               gamepads_list_box.visible = i > 0;
        }
 
        private void clear_gamepad_list () {