panels: Switch to CcPanel content

Start porting panels to the new panel format. This commit
temporarily makes panels have two titlebar, which will be
fixed soon.

32 files changed, 44 insertions, 77 deletions

diff --git a/panels/applications/cc-applications-panel.ui b/panels/applications/cc-applications-panel.ui
index 2ff6a7db1..7316de7fc 100644
--- a/panels/applications/cc-applications-panel.ui
+++ b/panels/applications/cc-applications-panel.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <template class="CcApplicationsPanel" parent="CcPanel">
-    <child>
+    <child type="content">
       <object class="GtkScrolledWindow" id="main_scroll">
         <property name="hscrollbar-policy">never</property>
         <child>
diff --git a/panels/background/cc-background-panel.ui b/panels/background/cc-background-panel.ui
index 5e512b58f..93f7ab0ed 100644
--- a/panels/background/cc-background-panel.ui
+++ b/panels/background/cc-background-panel.ui
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <template class="CcBackgroundPanel" parent="CcPanel">
-    <child>
+    <child type="content">
       <object class="GtkScrolledWindow">
         <property name="hexpand">True</property>
         <property name="vexpand">True</property>
diff --git a/panels/bluetooth/cc-bluetooth-panel.ui b/panels/bluetooth/cc-bluetooth-panel.ui
index 98648e63a..0b98de458 100644
--- a/panels/bluetooth/cc-bluetooth-panel.ui
+++ b/panels/bluetooth/cc-bluetooth-panel.ui
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <template class="CcBluetoothPanel" parent="CcPanel">
-    <child>
+    <child type="content">
       <object class="GtkStack" id="stack">
         <child>
           <object class="AdwStatusPage" id="no_devices_page">
diff --git a/panels/camera/cc-camera-panel.ui b/panels/camera/cc-camera-panel.ui
index c46bebb73..e4c6d897d 100644
--- a/panels/camera/cc-camera-panel.ui
+++ b/panels/camera/cc-camera-panel.ui
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
-  <requires lib="gtk+" version="3.14"/>
   <template class="CcCameraPanel" parent="CcPanel">
-    <child>
+    <child type="content">
       <object class="GtkStack" id="stack">
 
         <!-- Empty page -->
diff --git a/panels/color/cc-color-panel.ui b/panels/color/cc-color-panel.ui
index 17ddcd015..5f7c3fb1f 100644
--- a/panels/color/cc-color-panel.ui
+++ b/panels/color/cc-color-panel.ui
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkAssistant" id="assistant_calib">
     <property name="title" translatable="yes">Screen Calibration</property>
     <property name="resizable">False</property>
@@ -403,7 +402,7 @@
     </action-widgets>
   </object>
   <template class="CcColorPanel" parent="CcPanel">
-    <child>
+    <child type="content">
       <object class="GtkScrolledWindow" id="dialog_scroll">
         <child>
           <object class="AdwClamp">
diff --git a/panels/datetime/cc-datetime-panel.ui b/panels/datetime/cc-datetime-panel.ui
index 9497c0c12..44e4e2203 100644
--- a/panels/datetime/cc-datetime-panel.ui
+++ b/panels/datetime/cc-datetime-panel.ui
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.10 -->
   <object class="GtkLockButton" id="lock_button">
   </object>
   <object class="GtkListStore" id="city_liststore">
@@ -298,7 +297,7 @@
     </child>
   </object>
   <template class="CcDateTimePanel" parent="CcPanel">
-    <child>
+    <child type="content">
       <object class="AdwPreferencesPage">
         <child>
           <object class="AdwPreferencesGroup">
diff --git a/panels/default-apps/cc-default-apps-panel.ui b/panels/default-apps/cc-default-apps-panel.ui
index 8b5b3a2ab..ac8db762a 100644
--- a/panels/default-apps/cc-default-apps-panel.ui
+++ b/panels/default-apps/cc-default-apps-panel.ui
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <template class="CcDefaultAppsPanel" parent="CcPanel">
-    <property name="hexpand">True</property>
-    <property name="vexpand">True</property>
-    <property name="margin_top">32</property>
-    <property name="margin_bottom">32</property>
-    <property name="margin_start">24</property>
-    <property name="margin_end">24</property>
-    <child>
+    <child type="content">
       <object class="GtkBox">
+        <property name="hexpand">True</property>
+        <property name="vexpand">True</property>
+        <property name="margin_top">32</property>
+        <property name="margin_bottom">32</property>
+        <property name="margin_start">24</property>
+        <property name="margin_end">24</property>
         <property name="halign">center</property>
         <property name="valign">start</property>
         <property name="spacing">10</property>
diff --git a/panels/diagnostics/cc-diagnostics-panel.ui b/panels/diagnostics/cc-diagnostics-panel.ui
index 92ed32eb6..97b6c27a4 100644
--- a/panels/diagnostics/cc-diagnostics-panel.ui
+++ b/panels/diagnostics/cc-diagnostics-panel.ui
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
-  <requires lib="gtk+" version="3.14"/>
   <template class="CcDiagnosticsPanel" parent="CcPanel">
-    <child>
+    <child type="content">
       <object class="GtkScrolledWindow">
         <property name="hscrollbar-policy">never</property>
         <child>
diff --git a/panels/display/cc-display-panel.ui b/panels/display/cc-display-panel.ui
index 751517479..ac733f724 100644
--- a/panels/display/cc-display-panel.ui
+++ b/panels/display/cc-display-panel.ui
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.0 -->
 <interface>
   <template class="CcDisplayPanel" parent="CcPanel">
 
@@ -16,7 +15,7 @@
       </object>
     </child>
 
-    <child>
+    <child type="content">
       <object class="AdwLeaflet" id="leaflet">
         <property name="can-unfold">False</property>
         <signal name="notify::visible-child-name" handler="on_stack_visible_child_name_changed_cb" object="CcDisplayPanel" swapped="no" />
diff --git a/panels/info-overview/cc-info-overview-panel.ui b/panels/info-overview/cc-info-overview-panel.ui
index 49a3b130a..369e2dac7 100644
--- a/panels/info-overview/cc-info-overview-panel.ui
+++ b/panels/info-overview/cc-info-overview-panel.ui
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <template class="CcInfoOverviewPanel" parent="CcPanel">
-    <child>
+    <child type="content">
       <object class="AdwPreferencesPage">
         <child>
           <object class="AdwPreferencesGroup">
diff --git a/panels/keyboard/cc-keyboard-panel.ui b/panels/keyboard/cc-keyboard-panel.ui
index 76e7e3a6d..e2e5889a7 100644
--- a/panels/keyboard/cc-keyboard-panel.ui
+++ b/panels/keyboard/cc-keyboard-panel.ui
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkAdjustment" id="cursor_blink_time_adjustment">
     <property name="lower">100</property>
     <property name="upper">2500</property>
@@ -11,7 +10,7 @@
   <template class="CcKeyboardPanel" parent="CcPanel">
     <property name="hexpand">True</property>
     <property name="vexpand">True</property>
-    <child>
+    <child type="content">
       <object class="GtkScrolledWindow">
         <property name="hexpand">True</property>
         <property name="vexpand">True</property>
diff --git a/panels/location/cc-location-panel.ui b/panels/location/cc-location-panel.ui
index 19090d79c..fdcd6101d 100644
--- a/panels/location/cc-location-panel.ui
+++ b/panels/location/cc-location-panel.ui
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
-  <requires lib="gtk+" version="3.14"/>
   <template class="CcLocationPanel" parent="CcPanel">
-    <child>
+    <child type="content">
       <object class="GtkStack" id="stack">
 
         <child>
diff --git a/panels/lock/cc-lock-panel.ui b/panels/lock/cc-lock-panel.ui
index 18a784b8f..31521e367 100644
--- a/panels/lock/cc-lock-panel.ui
+++ b/panels/lock/cc-lock-panel.ui
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <template class="CcLockPanel" parent="CcPanel">
-    <child>
+    <child type="content">
       <object class="GtkScrolledWindow">
         <property name="hscrollbar-policy">never</property>
         <child>
diff --git a/panels/microphone/cc-microphone-panel.ui b/panels/microphone/cc-microphone-panel.ui
index 569dd88e1..3fa41fe42 100644
--- a/panels/microphone/cc-microphone-panel.ui
+++ b/panels/microphone/cc-microphone-panel.ui
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
-  <requires lib="gtk+" version="3.14"/>
   <template class="CcMicrophonePanel" parent="CcPanel">
-    <child>
+    <child type="content">
       <object class="GtkStack" id="stack">
 
         <child>
diff --git a/panels/mouse/cc-mouse-panel.ui b/panels/mouse/cc-mouse-panel.ui
index 18cec305b..dc1f95d64 100644
--- a/panels/mouse/cc-mouse-panel.ui
+++ b/panels/mouse/cc-mouse-panel.ui
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <template class="CcMousePanel" parent="CcPanel">
-    <child>
+    <child type="content">
       <object class="GtkStack" id="stack">
         <child>
           <object class="AdwPreferencesPage" id="preferences">
diff --git a/panels/multitasking/cc-multitasking-panel.ui b/panels/multitasking/cc-multitasking-panel.ui
index 38f3c1618..b2138fcd5 100644
--- a/panels/multitasking/cc-multitasking-panel.ui
+++ b/panels/multitasking/cc-multitasking-panel.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <template class="CcMultitaskingPanel" parent="CcPanel">
-    <child>
+    <child type="content">
       <object class="AdwPreferencesPage">
 
         <child>
diff --git a/panels/network/cc-network-panel.ui b/panels/network/cc-network-panel.ui
index 91c5f77a8..a3647fdde 100644
--- a/panels/network/cc-network-panel.ui
+++ b/panels/network/cc-network-panel.ui
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <template class="CcNetworkPanel" parent="CcPanel">
 
-    <child>
+    <child type="content">
       <object class="GtkScrolledWindow">
         <property name="hscrollbar_policy">never</property>
         <child>
diff --git a/panels/network/cc-wifi-panel.ui b/panels/network/cc-wifi-panel.ui
index 335fadaa1..9722c5a07 100644
--- a/panels/network/cc-wifi-panel.ui
+++ b/panels/network/cc-wifi-panel.ui
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.20"/>
   <template class="CcWifiPanel" parent="CcPanel">
 
-    <child>
+    <child type="content">
       <object class="GtkScrolledWindow">
         <property name="hscrollbar-policy">never</property>
         <child>
diff --git a/panels/notifications/cc-notifications-panel.ui b/panels/notifications/cc-notifications-panel.ui
index 90c279f8f..4d99ce208 100644
--- a/panels/notifications/cc-notifications-panel.ui
+++ b/panels/notifications/cc-notifications-panel.ui
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
   <template class="CcNotificationsPanel" parent="CcPanel">
-    <child>
+    <child type="content">
       <object class="AdwPreferencesPage">
         <child>
           <object class="AdwPreferencesGroup">
diff --git a/panels/online-accounts/cc-online-accounts-panel.ui b/panels/online-accounts/cc-online-accounts-panel.ui
index a248db96d..7afcd0579 100644
--- a/panels/online-accounts/cc-online-accounts-panel.ui
+++ b/panels/online-accounts/cc-online-accounts-panel.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <template class="CcGoaPanel" parent="CcPanel">
-    <child>
+    <child type="content">
       <object class="GtkOverlay">
         <child type="overlay">
           <object class="GtkRevealer" id="notification_revealer">
diff --git a/panels/power/cc-power-panel.ui b/panels/power/cc-power-panel.ui
index b531fc879..a637fdd3f 100644
--- a/panels/power/cc-power-panel.ui
+++ b/panels/power/cc-power-panel.ui
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkListStore" id="time_liststore">
     <columns>
       <!-- column-name name -->
@@ -52,7 +51,7 @@
     </data>
   </object>
   <template class="CcPowerPanel" parent="CcPanel">
-    <child>
+    <child type="content">
       <object class="AdwPreferencesPage">
         <child>
           <object class="AdwPreferencesGroup" id="battery_section">
diff --git a/panels/printers/cc-printers-panel.c b/panels/printers/cc-printers-panel.c
index 84f87f21c..0ae9a5cdd 100644
--- a/panels/printers/cc-printers-panel.c
+++ b/panels/printers/cc-printers-panel.c
@@ -1317,5 +1317,5 @@ Please check your installation");
                       self);
 
   pp_cups_connection_test_async (self->cups, cc_panel_get_cancellable (CC_PANEL (self)), connection_test_cb, self);
-  adw_bin_set_child (ADW_BIN (self), top_widget);
+  cc_panel_set_content (CC_PANEL (self), top_widget);
 }
diff --git a/panels/region/cc-region-panel.ui b/panels/region/cc-region-panel.ui
index bb7720a24..19a77ac0c 100644
--- a/panels/region/cc-region-panel.ui
+++ b/panels/region/cc-region-panel.ui
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <template class="CcRegionPanel" parent="CcPanel">
 
-    <child>
+    <child type="content">
       <object class="GtkScrolledWindow">
         <property name="hscrollbar-policy">never</property>
         <child>
diff --git a/panels/removable-media/cc-removable-media-panel.ui b/panels/removable-media/cc-removable-media-panel.ui
index 8ed43d5f3..899956ee9 100644
--- a/panels/removable-media/cc-removable-media-panel.ui
+++ b/panels/removable-media/cc-removable-media-panel.ui
@@ -2,16 +2,16 @@
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
   <template class="CcRemovableMediaPanel" parent="CcPanel">
-    <property name="hexpand">True</property>
-    <property name="vexpand">True</property>
-    <property name="margin_top">32</property>
-    <property name="margin_bottom">32</property>
-    <property name="margin_start">24</property>
-    <property name="margin_end">24</property>
-    <child>
+    <child type="content">
       <object class="AdwClamp">
         <child>
           <object class="GtkBox">
+            <property name="hexpand">True</property>
+            <property name="vexpand">True</property>
+            <property name="margin_top">32</property>
+            <property name="margin_bottom">32</property>
+            <property name="margin_start">24</property>
+            <property name="margin_end">24</property>
             <property name="spacing">18</property>
             <property name="orientation">vertical</property>
             <child>
diff --git a/panels/search/cc-search-panel.ui b/panels/search/cc-search-panel.ui
index 9199904e4..df07154c3 100644
--- a/panels/search/cc-search-panel.ui
+++ b/panels/search/cc-search-panel.ui
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <template class="CcSearchPanel" parent="CcPanel">
     <property name="visible">True</property>
 
-    <child>
+    <child type="content">
       <object class="GtkScrolledWindow" id="search_vbox">
         <property name="visible">True</property>
         <property name="hscrollbar_policy">never</property>
diff --git a/panels/sharing/cc-sharing-panel.ui b/panels/sharing/cc-sharing-panel.ui
index 4fe90a03d..a8a957fc0 100644
--- a/panels/sharing/cc-sharing-panel.ui
+++ b/panels/sharing/cc-sharing-panel.ui
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
-  <requires lib="gtk+" version="3.10"/>
   <template class="CcSharingPanel" parent="CcPanel">
-    <child>
+    <child type="content">
       <object class="GtkScrolledWindow" id="sharing_panel">
         <property name="hscrollbar-policy">never</property>
         <child>
diff --git a/panels/sound/cc-sound-panel.ui b/panels/sound/cc-sound-panel.ui
index 7852f338a..e20071b08 100644
--- a/panels/sound/cc-sound-panel.ui
+++ b/panels/sound/cc-sound-panel.ui
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <template class="CcSoundPanel" parent="CcPanel">
-    <child>
+    <child type="content">
       <object class="AdwPreferencesPage">
         <child>
           <object class="AdwPreferencesGroup">
diff --git a/panels/thunderbolt/cc-bolt-panel.ui b/panels/thunderbolt/cc-bolt-panel.ui
index 5379fca77..9bb41156b 100644
--- a/panels/thunderbolt/cc-bolt-panel.ui
+++ b/panels/thunderbolt/cc-bolt-panel.ui
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.20"/>
-
   <template class="CcBoltPanel" parent="CcPanel">
 
-    <child>
+    <child type="content">
       <object class="GtkOverlay">
         <child type="overlay">
           <object class="GtkRevealer" id="notification_revealer">
diff --git a/panels/universal-access/cc-ua-panel.ui b/panels/universal-access/cc-ua-panel.ui
index f64203d26..425a6f203 100644
--- a/panels/universal-access/cc-ua-panel.ui
+++ b/panels/universal-access/cc-ua-panel.ui
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
 <interface>
-  <requires lib="gtk+" version="3.0"/>
   <object class="GtkAdjustment" id="double_click_delay_adjustment">
     <property name="lower">100</property>
     <property name="upper">1000</property>
@@ -9,9 +7,8 @@
     <property name="step_increment">100</property>
     <property name="page_increment">100</property>
   </object>
-  <!-- interface-requires gtk+ 3.0 -->
   <template class="CcUaPanel" parent="CcPanel">
-    <child>
+    <child type="content">
       <object class="AdwPreferencesPage">
         <child>
           <object class="AdwPreferencesGroup">
diff --git a/panels/usage/cc-usage-panel.ui b/panels/usage/cc-usage-panel.ui
index 26ac7be99..4feb89b60 100644
--- a/panels/usage/cc-usage-panel.ui
+++ b/panels/usage/cc-usage-panel.ui
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <template class="CcUsagePanel" parent="CcPanel">
-    <child>
+    <child type="content">
       <object class="GtkScrolledWindow">
         <property name="hscrollbar-policy">never</property>
         <child>
diff --git a/panels/wacom/cc-wacom-panel.c b/panels/wacom/cc-wacom-panel.c
index 8d1660810..22192244a 100644
--- a/panels/wacom/cc-wacom-panel.c
+++ b/panels/wacom/cc-wacom-panel.c
@@ -751,7 +751,7 @@ cc_wacom_panel_init (CcWacomPanel *self)
 	gtk_stack_switcher_set_stack (GTK_STACK_SWITCHER (self->switcher),
 				      GTK_STACK (self->stack));
 
-	adw_bin_set_child (ADW_BIN (self), GTK_WIDGET (self->stack));
+	cc_panel_set_content (CC_PANEL (self), GTK_WIDGET (self->stack));
 	gtk_widget_show (self->stack);
 
 	self->tablet_notebook = gtk_notebook_new ();
diff --git a/panels/wwan/cc-wwan-panel.ui b/panels/wwan/cc-wwan-panel.ui
index 5e34c514a..eb4cba107 100644
--- a/panels/wwan/cc-wwan-panel.ui
+++ b/panels/wwan/cc-wwan-panel.ui
@@ -3,7 +3,7 @@
   <requires lib="gtk" version="4.0"/>
   <template class="CcWwanPanel" parent="CcPanel">
 
-    <child>
+    <child type="content">
       <object class="GtkOverlay">
 
         <!-- Notification Revealer -->