Hide Ubuntu Pro settings, these are blocked on backend changes

2 files changed, 47 insertions, 12 deletions

diff --git a/data/gtkbuilder/main.ui b/data/gtkbuilder/main.ui
index 8454b30..c8128c3 100644
--- a/data/gtkbuilder/main.ui
+++ b/data/gtkbuilder/main.ui
@@ -1242,7 +1242,7 @@
                 <property name="spacing">12</property>
                 <child>
                   <object class="GtkLabel">
-                    <property name="visible">True</property>
+                    <property name="visible">False</property>
                     <property name="label" translatable="yes">&lt;b&gt;Settings&lt;/b&gt;</property>
                     <property name="use_markup">True</property>
                     <property name="wrap">True</property>
@@ -1265,7 +1265,7 @@
                         </child>
                         <child>
                           <object class="GtkLabel">
-                            <property name="visible">True</property>
+                            <property name="visible">False</property>
                             <property name="label" translatable="yes">This machine is not covered by an Ubuntu Pro subscription. Receive security updates for over 30,000 Ubuntu packages, on up to 3 machines free for personal use: &lt;a href="https://ubuntu.com/advantage"&gt;More information&lt;/a&gt;.</property>
                             <property name="use_markup">True</property>
                             <property name="wrap">True</property>
@@ -1273,6 +1273,16 @@
                             <property name="xalign">0</property>
                           </object>
                         </child>
+                        <child>
+                          <object class="GtkLabel">
+                            <property name="visible">True</property>
+                            <property name="label" translatable="yes">This machine is not covered by an Ubuntu Advantage subscription.</property>
+                            <property name="use_markup">True</property>
+                            <property name="wrap">True</property>
+                            <property name="max-width-chars">90</property>
+                            <property name="xalign">0</property>
+                          </object>
+                        </child>
                       </object>
                     </child>
                     <child>
@@ -1287,18 +1297,25 @@
                         </child>
                         <child>
                           <object class="GtkLabel">
-                            <property name="visible">True</property>
+                            <property name="visible">False</property>
                             <property name="label" translatable="yes">Ubuntu Pro subscription attached.</property>
                             <property name="xalign">0</property>
                           </object>
                         </child>
+                        <child>
+                          <object class="GtkLabel">
+                            <property name="visible">True</property>
+                            <property name="label" translatable="yes">Ubuntu Advantage subscription attached.</property>
+                            <property name="xalign">0</property>
+                          </object>
+                        </child>
                       </object>
                     </child>
                   </object>
                 </child>
                 <child>
                   <object class="GtkLabel">
-                    <property name="visible">True</property>
+                    <property name="visible">False</property>
                     <property name="can_focus">False</property>
                     <property name="label" translatable="yes">&lt;b&gt;Services&lt;/b&gt;</property>
                     <property name="use_markup">True</property>
@@ -1314,13 +1331,13 @@
                     <property name="sensitive">False</property>
                     <child>
                       <object class="GtkSwitch" id="switch_ua_esm">
-                        <property name="visible">True</property>
+                        <property name="visible">False</property>
                         <property name="valign">start</property>
                       </object>
                     </child>
                     <child>
                       <object class="GtkBox">
-                        <property name="visible">True</property>
+                        <property name="visible">False</property>
                         <property name="orientation">vertical</property>
                         <property name="spacing">6</property>
                         <child>
@@ -1395,7 +1412,7 @@
                 </child>
                 <child>
                   <object class="GtkLabel">
-                    <property name="visible">True</property>
+                    <property name="visible">False</property>
                     <property name="label" translatable="yes">&lt;b&gt;Compliance &amp;amp; Hardening&lt;/b&gt;</property>
                     <property name="use_markup">True</property>
                     <property name="xalign">0</property>
@@ -1403,7 +1420,7 @@
                 </child>
                 <child>
                   <object class="GtkLabel">
-                    <property name="visible">True</property>
+                    <property name="visible">False</property>
                     <property name="label" translatable="yes">Please read the documentation and only enable these settings if you specifically require these certifications.</property>
                     <property name="wrap">True</property>
                     <property name="xalign">0</property>
@@ -1411,7 +1428,7 @@
                 </child>
                 <child>
                   <object class="GtkFrame">
-                    <property name="visible">True</property>
+                    <property name="visible">False</property>
                     <child>
                       <object class="GtkBox">
                       <property name="visible">True</property>
@@ -1584,10 +1601,22 @@
               </packing>
             </child>
             <child type="tab">
-              <object class="GtkLabel">
+              <object class="GtkBox">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label">Ubuntu Pro</property>
+                <child>
+                  <object class="GtkLabel">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label">Livepatch</property>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkLabel">
+                    <property name="visible">False</property>
+                    <property name="can_focus">False</property>
+                    <property name="label">Ubuntu Pro</property>
+                  </object>
+                </child>
               </object>
               <packing>
                 <property name="position">6</property>
diff --git a/debian/changelog b/debian/changelog
index c8354a9..2a5d1e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+software-properties (0.99.21) UNRELEASED; urgency=medium
+
+  * Remove Ubuntu Pro settings (LP: #1965993)
+
+ -- Robert Ancell <robert.ancell@canonical.com>  Wed, 23 Mar 2022 12:11:31 +1300
+
 software-properties (0.99.20) jammy; urgency=medium
 
   [ Alberto Milone ]