Merged GNOME 44 settings with main group

stuarthayhurst · Aug 13, 2023 · f25480f · f25480f
1 parent 5a8fe05
commit f25480f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 84 deletions.
diff --git a/extension/prefs.js b/extension/prefs.js
@@ -46,12 +46,6 @@ var PrefsPages = class PrefsPages {
         quickSubtitleSettingsRow.set_sensitive(true);
       }
     }
-
-    //Grey out GNOME 44+ settings on earlier versions
-    if (ShellVersion < 44) {
-      let settingsArea = this._builder.get_object('gnome-44-settings-area');
-      settingsArea.set_sensitive(false);
-    }
   }
 
   _createPreferences() {

diff --git a/extension/ui/gtk3/prefs.ui b/extension/ui/gtk3/prefs.ui
@@ -208,54 +208,18 @@
                     </child>
                   </object>
                 </child>
-                <style>
-                  <class name="frame"/>
-                </style>
-              </object>
-              <packing>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-        </child>
-        <child>
-          <object class="GtkBox" id="gnome-44-settings-area">
-            <property name="visible">1</property>
-            <property name="orientation">vertical</property>
-            <child>
-              <object class="GtkBox">
-                <property name="visible">1</property>
-                <property name="margin-top">12</property>
-                <property name="orientation">vertical</property>
                 <child>
-                  <object class="GtkBox">
+                  <object class="GtkListBoxRow">
                     <property name="visible">1</property>
-                    <property name="margin-start">2</property>
-                    <property name="margin-top">4</property>
-                    <property name="margin-bottom">6</property>
-                    <property name="orientation">vertical</property>
+                    <property name="can-focus">1</property>
+                    <property name="activatable">0</property>
                     <child>
-                      <object class="GtkLabel">
+                      <object class="GtkSeparator">
                         <property name="visible">1</property>
-                        <property name="label" translatable="yes">GNOME 44+ settings</property>
-                        <property name="xalign">0</property>
-                        <attributes>
-                          <attribute name="weight" value="bold"/>
-                          <attribute name="scale" value="1"/>
-                        </attributes>
                       </object>
                     </child>
                   </object>
-                  <packing>
-                    <property name="position">1</property>
-                  </packing>
                 </child>
-              </object>
-            </child>
-            <child>
-              <object class="GtkListBox" id="gnome-44-settings">
-                <property name="visible">1</property>
-                <property name="selection-mode">none</property>
                 <child>
                   <object class="GtkListBoxRow" id="use-quick-subtitle-setting">
                     <property name="visible">1</property>
@@ -310,9 +274,6 @@
               </packing>
             </child>
           </object>
-          <packing>
-            <property name="position">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="donate-box">
@@ -334,7 +295,7 @@
             </child>
           </object>
           <packing>
-            <property name="position">2</property>
+            <property name="position">1</property>
           </packing>
         </child>
       </object>

diff --git a/extension/ui/gtk4/prefs.ui b/extension/ui/gtk4/prefs.ui
@@ -161,43 +161,15 @@
                     </property>
                   </object>
                 </child>
-                <style>
-                  <class name="frame"/>
-                </style>
-              </object>
-            </child>
-          </object>
-        </child>
-        <child>
-          <object class="GtkBox" id="gnome-44-settings-area">
-            <property name="orientation">vertical</property>
-            <child>
-              <object class="GtkBox">
-                <property name="margin-top">12</property>
-                <property name="orientation">vertical</property>
                 <child>
-                  <object class="GtkBox">
-                    <property name="margin-start">2</property>
-                    <property name="margin-top">4</property>
-                    <property name="margin-bottom">6</property>
-                    <property name="orientation">vertical</property>
-                    <child>
-                      <object class="GtkLabel">
-                        <property name="label" translatable="1">GNOME 44+ settings</property>
-                        <property name="xalign">0</property>
-                        <attributes>
-                          <attribute name="weight" value="bold"></attribute>
-                          <attribute name="scale" value="1"></attribute>
-                        </attributes>
-                      </object>
-                    </child>
+                  <object class="GtkListBoxRow">
+                    <property name="focusable">1</property>
+                    <property name="activatable">0</property>
+                    <property name="child">
+                      <object class="GtkSeparator"/>
+                    </property>
                   </object>
                 </child>
-              </object>
-            </child>
-            <child>
-              <object class="GtkListBox" id="gnome-44-settings">
-                <property name="selection-mode">none</property>
                 <child>
                   <object class="GtkListBoxRow" id="use-quick-subtitle-setting">
                     <property name="focusable">1</property>