feat: Reorganize preferences and improve wording

GradienceTeam · May 26, 2023 · b4795ca · b4795ca
1 parent 95755f9
commit b4795ca
Showing 1 changed file with 10 additions and 17 deletions.
diff --git a/data/ui/preferences_window.blp b/data/ui/preferences_window.blp
@@ -12,11 +12,11 @@ template GradiencePreferencesWindow : Adw.PreferencesWindow {
     icon-name: "applications-system-symbolic";
 
     Adw.PreferencesGroup flatpak_group {
-      title: _("GTK 4 Flatpak Applications");
+      title: _("Flatpak Applications");
 
       Adw.ActionRow {
-        title: _("Allow GTK 4 Flatpak Applications Theming");
-        subtitle: _("Override Flatpak permissions for current user to allow GTK 4 Flatpak applications to access custom themes.");
+        title: _("Allow GTK 4 Theming");
+        subtitle: _("Override Flatpak permissions for current user to allow GTK 4 Flatpak apps to access custom themes.");
         activatable-widget: gtk4_user_theming_switch;
         Gtk.Switch gtk4_user_theming_switch {
           valign: center;
@@ -25,22 +25,17 @@ template GradiencePreferencesWindow : Adw.PreferencesWindow {
 
       Adw.ActionRow {
         visible: false;
-        title: _("Allow GTK 4 Flatpak Applications Theming (System)");
-        subtitle: _("Override Flatpak permissions for all users to allow GTK 4 Flatpak applications to access custom themes. (Requires root access)");
+        title: _("Allow GTK 4 Theming (System)");
+        subtitle: _("Override Flatpak permissions for all users to allow GTK 4 Flatpak apps to access custom themes. (Requires root access)");
         activatable-widget: gtk4_global_theming_switch;
         Gtk.Switch gtk4_global_theming_switch {
           valign: center;
         }
       }
-    }
-
-    Adw.PreferencesGroup gtk3_flatpak_group {
-      title: _("GTK 3 Flatpak Applications");
-      description: _("Remember to install adw-gtk3 theme (as a Flatpak package) in order to get custom presets working in GTK 3 Flatpak applications.");
 
       Adw.ActionRow {
-        title: _("Allow GTK 3 Flatpak theming");
-        subtitle: _("Override Flatpak permissions for current user to allow GTK 3 Flatpak applications to access adw-gtk3 theme.");
+        title: _("Allow GTK 3 Theming");
+        subtitle: _("Override Flatpak permissions for current user to allow GTK 3 Flatpak apps to access adw-gtk3 theme.");
         activatable-widget: gtk3_user_theming_switch;
         Gtk.Switch gtk3_user_theming_switch {
           valign: center;
@@ -49,8 +44,8 @@ template GradiencePreferencesWindow : Adw.PreferencesWindow {
 
       Adw.ActionRow {
         visible: false;
-        title: _("GTK 3 Flatpak Applications (System)");
-        subtitle: _("Override Flatpak permissions for all users to allow GTK 3 Flatpak applications to access adw-gtk3 theme. (Requires root access)");
+        title: _("Allow GTK 3 Theming (System)");
+        subtitle: _("Override Flatpak permissions for all users to allow GTK 3 Flatpak apps to access adw-gtk3 theme. (Requires root access)");
         activatable-widget: gtk3_global_theming_switch;
         Gtk.Switch gtk3_global_theming_switch {
           valign: center;
@@ -61,11 +56,9 @@ template GradiencePreferencesWindow : Adw.PreferencesWindow {
     Adw.PreferencesGroup jsdeliver_group {
 
       title: _("Preset Fetching");
-      description: _("Configure options related to preset fetching");
       Adw.ActionRow jsdeliver_row {
         title: _("Use alternative server for downloading presets");
-        subtitle: _("JSDeliver will be used instead of directly fetching presets from GitHub");
-        activatable-widget: jsdeliver_switch;
+        subtitle: _("JSDeliver will be used instead of direct preset fetching from GitHub");
         Gtk.Switch jsdeliver_switch {
           valign: center;
         }