[gnome-control-center] wwan: Port to use AdwPreferencesPage



commit 14181fbbbd2447f806b0a55d36b0e22e58fd3e50
Author: Mohammed Sadiq <sadiq sadiqpk org>
Date:   Mon Jan 10 09:24:51 2022 +0530

    wwan: Port to use AdwPreferencesPage
    
    And adapt to changes.
    
    This helps avoid using widgets like AdwClamp as it will be
    handled by AdwPreferencesPage and AdwPreferencesGroup.

 panels/wwan/cc-wwan-details-dialog.ui | 493 ++++++++++++++++------------------
 panels/wwan/cc-wwan-device-page.ui    | 248 +++++++----------
 panels/wwan/cc-wwan-mode-dialog.ui    |  25 +-
 3 files changed, 344 insertions(+), 422 deletions(-)
---
diff --git a/panels/wwan/cc-wwan-details-dialog.ui b/panels/wwan/cc-wwan-details-dialog.ui
index 1deac26b0..79ae481c7 100644
--- a/panels/wwan/cc-wwan-details-dialog.ui
+++ b/panels/wwan/cc-wwan-details-dialog.ui
@@ -9,289 +9,266 @@
     <property name="modal">True</property>
 
     <child>
-      <object class="GtkBox">
-        <property name="width-request">340</property>
-        <property name="height-request">360</property>
-        <child>
-          <object class="AdwClamp">
-            <property name="margin-top">32</property>
-            <property name="margin-bottom">32</property>
-            <property name="margin-start">18</property>
-            <property name="margin-end">18</property>
+      <object class="AdwPreferencesPage">
 
+        <child>
+          <object class="AdwPreferencesGroup">
+            <property name="title" translatable="yes">Modem Status</property>
             <child>
-              <object class="GtkBox">
-                <property name="orientation">vertical</property>
+              <object class="GtkGrid">
+                <property name="row-spacing">9</property>
+                <property name="column-spacing">6</property>
 
-                <!-- Modem Status Title -->
+                <!-- Carrier -->
                 <child>
-                  <object class="GtkLabel">
-                    <property name="margin-bottom">12</property>
-                    <property name="label" translatable="yes">Modem Status</property>
+                  <object class="GtkLabel" id="carrier_label">
+                    <property name="label" translatable="yes">Carrier</property>
+                    <property name="xalign">1.0</property>
+                    <style>
+                      <class name="dim-label"/>
+                    </style>
+                    <layout>
+                      <property name="column">0</property>
+                      <property name="row">0</property>
+                    </layout>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="operator_name">
                     <property name="xalign">0.0</property>
-                    <attributes>
-                      <attribute name="weight" value="bold"/>
-                    </attributes>
+                    <layout>
+                      <property name="column">1</property>
+                      <property name="row">0</property>
+                    </layout>
                   </object>
                 </child>
 
-                <!-- Modem Status Content -->
+                <!-- Network Type -->
                 <child>
-                  <object class="GtkGrid">
-                    <property name="row-spacing">9</property>
-                    <property name="column-spacing">6</property>
-                    <property name="margin-bottom">24</property>
-
-                    <!-- Carrier -->
-                    <child>
-                      <object class="GtkLabel">
-                        <property name="label" translatable="yes">Carrier</property>
-                        <property name="xalign">1.0</property>
-                        <style>
-                          <class name="dim-label"/>
-                        </style>
-                        <layout>
-                          <property name="column">0</property>
-                          <property name="row">0</property>
-                        </layout>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="operator_name">
-                        <property name="xalign">0.0</property>
-                        <layout>
-                          <property name="column">1</property>
-                          <property name="row">0</property>
-                        </layout>
-                      </object>
-                    </child>
-
-                    <!-- Network Type -->
-                    <child>
-                      <object class="GtkLabel">
-                        <property name="label" translatable="yes">Network Type</property>
-                        <property name="xalign">1.0</property>
-                        <style>
-                          <class name="dim-label"/>
-                        </style>
-                        <layout>
-                          <property name="column">0</property>
-                          <property name="row">1</property>
-                        </layout>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="network_type">
-                        <property name="xalign">0.0</property>
-                        <layout>
-                          <property name="column">1</property>
-                          <property name="row">1</property>
-                        </layout>
-                      </object>
-                    </child>
+                  <object class="GtkLabel">
+                    <property name="label" translatable="yes">Network Type</property>
+                    <property name="xalign">1.0</property>
+                    <style>
+                      <class name="dim-label"/>
+                    </style>
+                    <layout>
+                      <property name="column">0</property>
+                      <property name="row">1</property>
+                    </layout>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="network_type">
+                    <property name="xalign">0.0</property>
+                    <layout>
+                      <property name="column">1</property>
+                      <property name="row">1</property>
+                    </layout>
+                  </object>
+                </child>
 
-                    <!-- Signal Strength -->
-                    <child>
-                      <object class="GtkLabel">
-                        <property name="label" translatable="yes">Signal Strength</property>
-                        <property name="xalign">1.0</property>
-                        <style>
-                          <class name="dim-label"/>
-                        </style>
-                        <layout>
-                          <property name="column">0</property>
-                          <property name="row">2</property>
-                        </layout>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="signal_strength">
-                        <property name="xalign">0.0</property>
-                        <layout>
-                          <property name="column">1</property>
-                          <property name="row">2</property>
-                        </layout>
-                      </object>
-                    </child>
+                <!-- Signal Strength -->
+                <child>
+                  <object class="GtkLabel">
+                    <property name="label" translatable="yes">Signal Strength</property>
+                    <property name="xalign">1.0</property>
+                    <style>
+                      <class name="dim-label"/>
+                    </style>
+                    <layout>
+                      <property name="column">0</property>
+                      <property name="row">2</property>
+                    </layout>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="signal_strength">
+                    <property name="xalign">0.0</property>
+                    <layout>
+                      <property name="column">1</property>
+                      <property name="row">2</property>
+                    </layout>
+                  </object>
+                </child>
 
-                    <!-- Network Status -->
-                    <child>
-                      <object class="GtkLabel">
-                        <property name="label" translatable="yes">Network Status</property>
-                        <property name="xalign">1.0</property>
-                        <style>
-                          <class name="dim-label"/>
-                        </style>
-                        <layout>
-                          <property name="column">0</property>
-                          <property name="row">3</property>
-                        </layout>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="network_status">
-                        <property name="xalign">0.0</property>
-                        <layout>
-                          <property name="column">1</property>
-                          <property name="row">3</property>
-                        </layout>
-                      </object>
-                    </child>
+                <!-- Network Status -->
+                <child>
+                  <object class="GtkLabel">
+                    <property name="label" translatable="yes">Network Status</property>
+                    <property name="xalign">1.0</property>
+                    <style>
+                      <class name="dim-label"/>
+                    </style>
+                    <layout>
+                      <property name="column">0</property>
+                      <property name="row">3</property>
+                    </layout>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="network_status">
+                    <property name="xalign">0.0</property>
+                    <layout>
+                      <property name="column">1</property>
+                      <property name="row">3</property>
+                    </layout>
+                  </object>
+                </child>
 
-                    <!-- Own Numbers -->
-                    <child>
-                      <object class="GtkLabel">
-                        <property name="visible" bind-source="own_numbers" bind-flags="sync-create"/>
-                        <property name="label" translatable="yes">Own Number</property>
-                        <property name="xalign">1.0</property>
-                        <style>
-                          <class name="dim-label"/>
-                        </style>
-                        <layout>
-                          <property name="column">0</property>
-                          <property name="row">4</property>
-                        </layout>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="own_numbers">
-                        <property name="xalign">0.0</property>
-                        <layout>
-                          <property name="column">1</property>
-                          <property name="row">4</property>
-                        </layout>
-                      </object>
-                    </child>
+                <!-- Own Numbers -->
+                <child>
+                  <object class="GtkLabel">
+                    <property name="visible" bind-source="own_numbers" bind-flags="sync-create"/>
+                    <property name="label" translatable="yes">Own Number</property>
+                    <property name="xalign">1.0</property>
+                    <style>
+                      <class name="dim-label"/>
+                    </style>
+                    <layout>
+                      <property name="column">0</property>
+                      <property name="row">4</property>
+                    </layout>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="own_numbers">
+                    <property name="xalign">0.0</property>
+                    <layout>
+                      <property name="column">1</property>
+                      <property name="row">4</property>
+                    </layout>
+                  </object>
+                </child>
 
-                    <!-- Device Details Title -->
-                    <child>
-                      <object class="GtkLabel">
-                        <property name="margin-bottom">12</property>
-                        <property name="label" translatable="yes">Device Details</property>
-                        <property name="xalign">0.0</property>
-                        <attributes>
-                          <attribute name="weight" value="bold"/>
-                        </attributes>
-                        <layout>
-                          <property name="column">0</property>
-                          <property name="row">5</property>
-                          <property name="column-span">2</property>
-                        </layout>
-                      </object>
-                    </child>
+              </object>
+            </child>
+          </object>
+        </child>
 
-                    <!-- Device Details Content -->
-                    <!-- Manufacturer -->
-                    <child>
-                      <object class="GtkLabel">
-                        <property name="label" translatable="yes">Manufacturer</property>
-                        <property name="xalign">1.0</property>
-                        <style>
-                          <class name="dim-label"/>
-                        </style>
-                        <layout>
-                          <property name="column">0</property>
-                          <property name="row">6</property>
-                        </layout>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="manufacturer">
-                        <property name="xalign">0.0</property>
-                        <layout>
-                          <property name="column">1</property>
-                          <property name="row">6</property>
-                        </layout>
-                      </object>
-                    </child>
+        <!-- Device Details Content -->
+        <child>
+          <object class="AdwPreferencesGroup">
+            <property name="title" translatable="yes">Device Details</property>
+            <child>
+              <object class="GtkGrid">
+                <property name="row-spacing">9</property>
+                <property name="column-spacing">6</property>
 
-                    <!-- Model -->
-                    <child>
-                      <object class="GtkLabel">
-                        <property name="label" translatable="yes">Model</property>
-                        <property name="xalign">1.0</property>
-                        <style>
-                          <class name="dim-label"/>
-                        </style>
-                        <layout>
-                          <property name="column">0</property>
-                          <property name="row">7</property>
-                        </layout>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="device_model">
-                        <property name="xalign">0.0</property>
-                        <property name="selectable">True</property>
-                        <property name="ellipsize">end</property>
-                        <layout>
-                          <property name="column">1</property>
-                          <property name="row">7</property>
-                        </layout>
-                      </object>
-                    </child>
+                <!-- Manufacturer -->
+                <child>
+                  <object class="GtkLabel">
+                    <property name="label" translatable="yes">Manufacturer</property>
+                    <property name="xalign">1.0</property>
+                    <style>
+                      <class name="dim-label"/>
+                    </style>
+                    <layout>
+                      <property name="column">0</property>
+                      <property name="row">0</property>
+                    </layout>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="manufacturer">
+                    <property name="xalign">0.0</property>
+                    <layout>
+                      <property name="column">1</property>
+                      <property name="row">0</property>
+                    </layout>
+                  </object>
+                </child>
 
-                    <!-- Firmware version -->
-                    <child>
-                      <object class="GtkLabel">
-                        <property name="label" translatable="yes">Firmware Version</property>
-                        <property name="xalign">1.0</property>
-                        <style>
-                          <class name="dim-label"/>
-                        </style>
-                        <layout>
-                          <property name="column">0</property>
-                          <property name="row">8</property>
-                        </layout>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="firmware_version">
-                        <property name="selectable">True</property>
-                        <property name="xalign">0.0</property>
-                        <property name="ellipsize">end</property>
-                        <property name="wrap">True</property>
-                        <layout>
-                          <property name="column">1</property>
-                          <property name="row">8</property>
-                        </layout>
-                      </object>
-                    </child>
+                <!-- Model -->
+                <child>
+                  <object class="GtkLabel">
+                    <property name="label" translatable="yes">Model</property>
+                    <property name="xalign">1.0</property>
+                    <style>
+                      <class name="dim-label"/>
+                    </style>
+                    <layout>
+                      <property name="column">0</property>
+                      <property name="row">1</property>
+                    </layout>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="device_model">
+                    <property name="xalign">0.0</property>
+                    <property name="selectable">True</property>
+                    <property name="ellipsize">end</property>
+                    <layout>
+                      <property name="column">1</property>
+                      <property name="row">1</property>
+                    </layout>
+                  </object>
+                </child>
 
-                    <!-- IMEI/ICCID -->
-                    <child>
-                      <object class="GtkLabel" id="identifier_label">
-                        <property name="label" translatable="yes">IMEI</property>
-                        <property name="xalign">1.0</property>
-                        <style>
-                          <class name="dim-label"/>
-                        </style>
-                        <layout>
-                          <property name="column">0</property>
-                          <property name="row">9</property>
-                        </layout>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="device_identifier">
-                        <property name="selectable">True</property>
-                        <property name="xalign">0.0</property>
-                        <layout>
-                          <property name="column">1</property>
-                          <property name="row">9</property>
-                        </layout>
-                      </object>
-                    </child>
+                <!-- Firmware version -->
+                <child>
+                  <object class="GtkLabel" id="firmware_label">
+                    <property name="label" translatable="yes">Firmware Version</property>
+                    <property name="xalign">1.0</property>
+                    <style>
+                      <class name="dim-label"/>
+                    </style>
+                    <layout>
+                      <property name="column">0</property>
+                      <property name="row">2</property>
+                    </layout>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="firmware_version">
+                    <property name="selectable">True</property>
+                    <property name="xalign">0.0</property>
+                    <property name="ellipsize">end</property>
+                    <property name="wrap">True</property>
+                    <layout>
+                      <property name="column">1</property>
+                      <property name="row">2</property>
+                    </layout>
+                  </object>
+                </child>
 
+                <!-- IMEI/ICCID -->
+                <child>
+                  <object class="GtkLabel" id="identifier_label">
+                    <property name="label" translatable="yes">IMEI</property>
+                    <property name="xalign">1.0</property>
+                    <style>
+                      <class name="dim-label"/>
+                    </style>
+                    <layout>
+                      <property name="column">0</property>
+                      <property name="row">3</property>
+                    </layout>
                   </object>
                 </child>
+                <child>
+                  <object class="GtkLabel" id="device_identifier">
+                    <property name="selectable">True</property>
+                    <property name="xalign">0.0</property>
+                    <layout>
+                      <property name="column">1</property>
+                      <property name="row">3</property>
+                    </layout>
+                  </object>
+                </child>
+
               </object>
             </child>
-
-          </object> <!-- ./AdwClamp -->
+          </object>
         </child>
       </object>
     </child>
 
   </template>
+  <object class="GtkSizeGroup">
+    <property name="mode">horizontal</property>
+    <widgets>
+      <widget name="carrier_label"/>
+      <widget name="firmware_label"/>
+    </widgets>
+  </object>
 </interface>
diff --git a/panels/wwan/cc-wwan-device-page.ui b/panels/wwan/cc-wwan-device-page.ui
index 6efec36f8..98999204f 100644
--- a/panels/wwan/cc-wwan-device-page.ui
+++ b/panels/wwan/cc-wwan-device-page.ui
@@ -12,39 +12,11 @@
           <object class="GtkStackPage">
             <property name="name">no-sim-view</property>
             <property name="child">
-              <object class="GtkBox">
+              <object class="AdwStatusPage">
                 <property name="hexpand">True</property>
-                <property name="vexpand">True</property>
-                <property name="halign">center</property>
-                <property name="valign">center</property>
-                <property name="orientation">vertical</property>
-                <property name="margin-bottom">64</property>
-                <child>
-                  <object class="GtkImage">
-                    <property name="icon-name">auth-sim-missing</property>
-                    <property name="pixel-size">192</property>
-                    <property name="margin-bottom">18</property>
-                    <style>
-                      <class name="dim-label"/>
-                    </style>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="wrap">True</property>
-                    <property name="label" translatable="yes">No SIM</property>
-                    <attributes>
-                      <attribute name="weight" value="bold"></attribute>
-                      <attribute name="scale" value="1.2"></attribute>
-                    </attributes>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="wrap">True</property>
-                    <property name="label" translatable="yes">Insert a SIM card to use this modem</property>
-                  </object>
-                </child>
+                <property name="icon-name">auth-sim-missing</property>
+                <property name="title" translatable="yes">No SIM</property>
+                <property name="description" translatable="yes">Insert a SIM card to use this 
modem</property>
               </object>
             </property>
           </object>
@@ -55,36 +27,13 @@
           <object class="GtkStackPage">
             <property name="name">sim-lock-view</property>
             <property name="child">
-              <object class="GtkBox">
+              <object class="AdwStatusPage">
                 <property name="hexpand">True</property>
-                <property name="vexpand">True</property>
-                <property name="halign">center</property>
-                <property name="valign">center</property>
-                <property name="orientation">vertical</property>
-                <property name="margin-bottom">64</property>
-                <child>
-                  <object class="GtkImage">
-                    <property name="icon-name">auth-sim-locked</property>
-                    <property name="pixel-size">192</property>
-                    <property name="margin-bottom">18</property>
-                    <style>
-                      <class name="dim-label"/>
-                    </style>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="wrap">True</property>
-                    <property name="label" translatable="yes">SIM Locked</property>
-                    <property name="margin-bottom">32</property>
-                    <attributes>
-                      <attribute name="weight" value="bold"></attribute>
-                      <attribute name="scale" value="1.2"></attribute>
-                    </attributes>
-                  </object>
-                </child>
+                <property name="icon-name">auth-sim-locked</property>
+                <property name="title" translatable="yes">SIM Locked</property>
                 <child>
                   <object class="GtkButton" id="unlock_button">
+                    <property name="halign">center</property>
                     <property name="use-underline">True</property>
                     <property name="label" translatable="yes">_Unlock</property>
                     <signal name="clicked" handler="wwan_device_unlock_clicked_cb" swapped="yes"/>
@@ -107,46 +56,41 @@
                 <property name="margin-top">18</property>
                 <property name="orientation">vertical</property>
 
-                <!-- Network Settings Title -->
                 <child>
-                  <object class="GtkLabel">
-                    <property name="label" translatable="yes">Network</property>
-                    <property name="xalign">0.0</property>
-                    <property name="margin-bottom">12</property>
-                    <attributes>
-                      <attribute name="weight" value="bold"></attribute>
-                    </attributes>
-                  </object>
-                </child>
-
-                <!-- Internet settings -->
-                <child>
-                  <object class="GtkListBox" id="data_settings_list">
+                  <object class="AdwPreferencesGroup">
+                    <property name="title" translatable="yes">Network</property>
                     <property name="margin-bottom">32</property>
-                    <property name="selection-mode">none</property>
-                    <style>
-                      <class name="boxed-list"/>
-                    </style>
 
-                    <!-- Enable/Disable Data -->
+                    <!-- Internet settings -->
                     <child>
-                      <object class="CcListRow" id="data_enable_row">
-                        <property name="use-underline">True</property>
-                        <property name="show-switch">True</property>
-                        <property name="title" translatable="yes">_Mobile Data</property>
-                        <property name="subtitle" translatable="yes">Access data using mobile 
network</property>
-                        <signal name="notify::active" handler="wwan_data_settings_changed_cb" swapped="yes"/>
-                      </object>
-                    </child>
+                      <object class="GtkListBox" id="data_settings_list">
+                        <property name="selection-mode">none</property>
+                        <style>
+                          <class name="boxed-list"/>
+                        </style>
+
+                        <!-- Enable/Disable Data -->
+                        <child>
+                          <object class="CcListRow" id="data_enable_row">
+                            <property name="use-underline">True</property>
+                            <property name="show-switch">True</property>
+                            <property name="title" translatable="yes">_Mobile Data</property>
+                            <property name="subtitle" translatable="yes">Access data using mobile 
network</property>
+                            <signal name="notify::active" handler="wwan_data_settings_changed_cb" 
swapped="yes"/>
+                          </object>
+                        </child>
+
+                        <!-- Data Roaming -->
+                        <child>
+                          <object class="CcListRow" id="data_roaming_row">
+                            <property name="use-underline">True</property>
+                            <property name="show-switch">True</property>
+                            <property name="title" translatable="yes">_Data Roaming</property>
+                            <property name="subtitle" translatable="yes">Use mobile data when 
roaming</property>
+                            <signal name="notify::active" handler="wwan_data_settings_changed_cb" 
swapped="yes"/>
+                          </object>
+                        </child>
 
-                    <!-- Data Roaming -->
-                    <child>
-                      <object class="CcListRow" id="data_roaming_row">
-                        <property name="use-underline">True</property>
-                        <property name="show-switch">True</property>
-                        <property name="title" translatable="yes">_Data Roaming</property>
-                        <property name="subtitle" translatable="yes">Use mobile data when roaming</property>
-                        <signal name="notify::active" handler="wwan_data_settings_changed_cb" swapped="yes"/>
                       </object>
                     </child>
 
@@ -155,80 +99,78 @@
 
                 <!-- Network Settings -->
                 <child>
-                  <object class="GtkListBox" id="network_settings_list">
+                  <object class="AdwPreferencesGroup">
                     <property name="margin-bottom">32</property>
-                    <property name="selection-mode">none</property>
-                    <signal name="row-activated" handler="wwan_network_settings_activated_cb" swapped="yes"/>
-                    <style>
-                      <class name="boxed-list"/>
-                    </style>
-                    <child>
-                      <object class="CcListRow" id="network_mode_row">
-                        <property name="use-underline">True</property>
-                        <property name="show-arrow">True</property>
-                        <property name="title" translatable="yes">_Network Mode</property>
-                      </object>
-                    </child>
                     <child>
-                      <object class="CcListRow" id="network_name_row">
-                        <property name="use-underline">True</property>
-                        <property name="show-arrow">True</property>
-                        <property name="title" translatable="yes">N_etwork</property>
+                      <object class="GtkListBox" id="network_settings_list">
+                        <property name="selection-mode">none</property>
+                        <signal name="row-activated" handler="wwan_network_settings_activated_cb" 
swapped="yes"/>
+                        <style>
+                          <class name="boxed-list"/>
+                        </style>
+                        <child>
+                          <object class="CcListRow" id="network_mode_row">
+                            <property name="use-underline">True</property>
+                            <property name="show-arrow">True</property>
+                            <property name="title" translatable="yes">_Network Mode</property>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="CcListRow" id="network_name_row">
+                            <property name="use-underline">True</property>
+                            <property name="show-arrow">True</property>
+                            <property name="title" translatable="yes">N_etwork</property>
+                          </object>
+                        </child>
                       </object>
                     </child>
-
                   </object>
                 </child>
 
-                <!-- Advanced Settings Title -->
-                <child>
-                  <object class="GtkLabel">
-                    <property name="label" translatable="yes">Advanced</property>
-                    <property name="xalign">0.0</property>
-                    <property name="margin-bottom">12</property>
-                    <attributes>
-                      <attribute name="weight" value="bold"></attribute>
-                    </attributes>
-                  </object>
-                </child>
                 <child>
-                  <object class="GtkListBox" id="advanced_settings_list">
-                    <property name="margin-bottom">32</property>
-                    <property name="selection-mode">none</property>
-                    <style>
-                      <class name="boxed-list"/>
-                    </style>
-                    <signal name="row-activated" handler="wwan_advanced_settings_activated_cb" 
swapped="yes"/>
-
-                    <!-- Accesss Point Settings -->
+                  <object class="AdwPreferencesGroup">
+                    <property name="title" translatable="yes">Advanced</property>
                     <child>
-                      <object class="CcListRow" id="apn_settings_row">
-                        <property name="use-underline">True</property>
-                        <property name="show-arrow">true</property>
-                        <property name="title" translatable="yes">_Access Point Names</property>
-                      </object>
-                    </child>
+                      <object class="GtkListBox" id="advanced_settings_list">
+                        <property name="selection-mode">none</property>
+                        <style>
+                          <class name="boxed-list"/>
+                        </style>
+                        <signal name="row-activated" handler="wwan_advanced_settings_activated_cb" 
swapped="yes"/>
 
-                    <!-- SIM Lock -->
-                    <child>
-                      <object class="CcListRow" id="sim_lock_row">
-                        <property name="use-underline">True</property>
-                        <property name="show-arrow">True</property>
-                        <property name="title" translatable="yes">_SIM Lock</property>
-                        <property name="subtitle" translatable="yes">Lock SIM with PIN</property>
-                      </object>
-                    </child>
+                        <!-- Accesss Point Settings -->
+                        <child>
+                          <object class="CcListRow" id="apn_settings_row">
+                            <property name="use-underline">True</property>
+                            <property name="show-arrow">true</property>
+                            <property name="title" translatable="yes">_Access Point Names</property>
+                          </object>
+                        </child>
+
+                        <!-- SIM Lock -->
+                        <child>
+                          <object class="CcListRow" id="sim_lock_row">
+                            <property name="use-underline">True</property>
+                            <property name="show-arrow">True</property>
+                            <property name="title" translatable="yes">_SIM Lock</property>
+                            <property name="subtitle" translatable="yes">Lock SIM with PIN</property>
+                          </object>
+                        </child>
+
+                        <!-- Modem Details -->
+                        <child>
+                          <object class="CcListRow" id="details_row">
+                            <property name="use-underline">True</property>
+                            <property name="show-arrow">True</property>
+                            <property name="title" translatable="yes">M_odem Details</property>
+                          </object>
+                        </child>
 
-                    <!-- Modem Details -->
-                    <child>
-                      <object class="CcListRow" id="details_row">
-                        <property name="use-underline">True</property>
-                        <property name="show-arrow">True</property>
-                        <property name="title" translatable="yes">M_odem Details</property>
                       </object>
                     </child>
                   </object>
                 </child>
+
               </object>
             </property>
           </object>
diff --git a/panels/wwan/cc-wwan-mode-dialog.ui b/panels/wwan/cc-wwan-mode-dialog.ui
index e03b5697f..4c350c8e0 100644
--- a/panels/wwan/cc-wwan-mode-dialog.ui
+++ b/panels/wwan/cc-wwan-mode-dialog.ui
@@ -9,17 +9,20 @@
     <property name="modal">True</property>
 
     <child>
-      <object class="GtkListBox" id="network_mode_list">
-        <property name="margin-start">12</property>
-        <property name="margin-end">12</property>
-        <property name="margin-top">18</property>
-        <property name="margin-bottom">18</property>
-        <property name="selection-mode">none</property>
-        <property name="hexpand">True</property>
-        <signal name="row-activated" handler="cc_wwan_mode_changed_cb" swapped="yes"/>
-        <style>
-          <class name="boxed-list"/>
-        </style>
+      <object class="AdwPreferencesPage">
+        <child>
+          <object class="AdwPreferencesGroup">
+            <child>
+              <object class="GtkListBox" id="network_mode_list">
+                <property name="selection-mode">none</property>
+                <signal name="row-activated" handler="cc_wwan_mode_changed_cb" swapped="yes"/>
+                <style>
+                  <class name="boxed-list"/>
+                </style>
+              </object>
+            </child>
+          </object>
+        </child>
       </object>
     </child>
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]