feat: Improve wording in preferences

GradienceTeam · Jan 10, 2024 · 878bb3f · 878bb3f
1 parent dd127e8
commit 878bb3f
Show file tree

Hide file tree

Showing 10 changed files with 55 additions and 32 deletions.
diff --git a/data/ui/custom_css_group.blp b/data/ui/custom_css_group.blp
@@ -2,8 +2,8 @@ using Gtk 4.0;
 using Adw 1;
 
 template $GradienceCustomCSSGroup : Adw.PreferencesGroup {
-  title: _("Custom CSS");
-  description: _("Changing this may break some programs. Libadwaita allows applications to hardcode values like padding and margins, and using custom CSS may cause unintended breakage.");
+  title: _("Custom Styles");
+  description: _("Changing this may break some programs. Libadwaita allows applications to hardcode values like padding and margins, and using custom styles may cause unintended breakage.");
 
   [header-suffix]
   DropDown app_type_dropdown {

diff --git a/data/ui/explore_preset_row.blp b/data/ui/explore_preset_row.blp
@@ -31,7 +31,7 @@ template $GradienceExplorePresetRow : Adw.ActionRow {
     Button download_button {
       valign: center;
       icon-name: "folder-download-symbolic";
-      tooltip-text: _("Download Only");
+      tooltip-text: _("Download");
       clicked => $on_download_button_clicked();
 
       styles [

diff --git a/data/ui/monet_theming_group.blp b/data/ui/monet_theming_group.blp
@@ -3,7 +3,7 @@ using Adw 1;
 
 template $GradienceMonetThemingGroup : Adw.PreferencesGroup {
   title: _("Monet Engine");
-  description: _("Monet Engine generates a Material You color palette from an image.");
+  description: _("Generates a Material Design 3 palette by extracting colors of an image.");
 
   Adw.ExpanderRow monet-theming-expander {
     title: _("Monet Engine Options");

diff --git a/data/ui/preferences_window.blp b/data/ui/preferences_window.blp
@@ -15,8 +15,8 @@ template $GradiencePreferencesWindow : Adw.PreferencesWindow {
       title: _("Flatpak Applications");
 
       Adw.ActionRow {
-        title: _("Allow GTK 4 Theming");
-        subtitle: _("Override Flatpak permissions for current user to allow GTK 4 Flatpak apps to access custom themes.");
+        title: _("Theme sandboxed GTK 4 apps");
+        subtitle: _("Allow GTK 4 Flatpak apps of current user to access custom themes");
         activatable-widget: gtk4_user_theming_switch;
         Gtk.Switch gtk4_user_theming_switch {
           valign: center;
@@ -25,17 +25,17 @@ template $GradiencePreferencesWindow : Adw.PreferencesWindow {
 
       Adw.ActionRow {
         visible: false;
-        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)");
+        title: _("Theme sandboxed GTK 4 apps (System)");
+        subtitle: _("Allow GTK 4 Flatpak apps of all users to access custom themes (Authentication required)");
         activatable-widget: gtk4_global_theming_switch;
         Gtk.Switch gtk4_global_theming_switch {
           valign: center;
         }
       }
 
       Adw.ActionRow {
-        title: _("Allow GTK 3 Theming");
-        subtitle: _("Override Flatpak permissions for current user to allow GTK 3 Flatpak apps to access adw-gtk3 theme.");
+        title: _("Theme sandboxed GTK 3 apps");
+        subtitle: _("Allow GTK 3 Flatpak apps of current user to access adw-gtk3 theme");
         activatable-widget: gtk3_user_theming_switch;
         Gtk.Switch gtk3_user_theming_switch {
           valign: center;
@@ -44,8 +44,8 @@ template $GradiencePreferencesWindow : Adw.PreferencesWindow {
 
       Adw.ActionRow {
         visible: false;
-        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)");
+        title: _("Theme sandboxed GTK 3 apps (System)");
+        subtitle: _("Allow GTK 3 Flatpak apps of all users to access adw-gtk3 theme (Authentication required)");
         activatable-widget: gtk3_global_theming_switch;
         Gtk.Switch gtk3_global_theming_switch {
           valign: center;
@@ -57,8 +57,8 @@ template $GradiencePreferencesWindow : Adw.PreferencesWindow {
 
       title: _("Preset Fetching");
       Adw.ActionRow jsdelivr_row {
-        title: _("Use an alternative server for downloading presets");
-        subtitle: _("JSDelivr will be used instead of direct preset fetching from GitHub");
+        title: _("Use an alternative server for fetching presets");
+        subtitle: _("Use JSDelivr instead of directly fetching presets from GitHub");
         activatable-widget: jsdelivr_switch;
         Gtk.Switch jsdelivr_switch {
           valign: center;
@@ -102,7 +102,7 @@ template $GradiencePreferencesWindow : Adw.PreferencesWindow {
 
       Adw.ActionRow {
         title: _("Shell Engine");
-        subtitle: _("Shell Engine generates a custom GNOME Shell theme based on a currently chosen preset.");
+        subtitle: _("Generates GNOME Shell theme based on current preset");
         activatable-widget: gnome_shell_engine_switch;
         Switch gnome_shell_engine_switch {
           valign: center;
@@ -111,7 +111,7 @@ template $GradiencePreferencesWindow : Adw.PreferencesWindow {
 
       Adw.ActionRow {
         title: _("Monet Engine");
-        subtitle: _("Monet Engine generates a Material Design 3 palette by extracting the image's colors.");
+        subtitle: _("Generates a Material Design 3 palette by extracting colors of an image");
         activatable-widget: monet_engine_switch;
         Switch monet_engine_switch {
           valign: center;
@@ -120,3 +120,4 @@ template $GradiencePreferencesWindow : Adw.PreferencesWindow {
     }
   }
 }
+
diff --git a/data/ui/preset_row.blp b/data/ui/preset_row.blp
@@ -201,3 +201,4 @@ template $GradiencePresetRow : Adw.ExpanderRow {
 	//	}
 	//}
 }
+
diff --git a/data/ui/presets_manager_window.blp b/data/ui/presets_manager_window.blp
@@ -185,3 +185,4 @@ Gtk.FileFilter json_filter {
   name: _("JSON file (*.json)");
   mime-types ["application/json"]
 }
+
diff --git a/data/ui/reset_preset_group.blp b/data/ui/reset_preset_group.blp
@@ -2,11 +2,11 @@ using Gtk 4.0;
 using Adw 1;
 
 template $GradienceResetPresetGroup : Adw.PreferencesGroup {
-  title: _("Reset and Restore Presets");
-  description: _("Reset a currently applied preset or restore the previous one.");
+  title: _("Reset and Restore Theming");
+  description: _("Reset theming to default or restore previously applied preset.");
 
   Adw.ActionRow {
-    title: _("Libadwaita and GTK 4 Applications");
+    title: _("GTK 4/Libadwaita Apps");
 
     Button restore_libadw_button {
       valign: center;
@@ -26,7 +26,7 @@ template $GradienceResetPresetGroup : Adw.PreferencesGroup {
   }
 
   Adw.ActionRow {
-    title: _("GTK 3 Applications");
+    title: _("GTK 3 Apps");
 
     Button restore_gtk3_button {
       valign: center;

diff --git a/data/ui/shell_prefs_window.blp b/data/ui/shell_prefs_window.blp
@@ -10,8 +10,7 @@ template $GradienceShellPrefsWindow : Adw.PreferencesWindow {
 
   Adw.PreferencesPage {
     Adw.PreferencesGroup custom-colors-group {
-      title: _("Custom Shell Colors");
-      description: _("Customize Shell theme colors.");
+      title: _("Shell theme colors");
     }
   }
 }
diff --git a/data/ui/shell_theming_group.blp b/data/ui/shell_theming_group.blp
@@ -1,9 +1,20 @@
 using Gtk 4.0;
 using Adw 1;
 
-template $GradienceShellThemingGroup : Adw.PreferencesGroup {
+template $GradienceShellThemingGroup: Adw.PreferencesGroup {
   title: _("Shell Engine");
-  description: _("Shell Engine generates a custom GNOME Shell theme based on the currently selected preset.\nWARNING: Extensions that modify the Shell stylesheet may cause issues with themes.");
+  description: _("Generates GNOME Shell theme based on current preset.\nWARNING: Extensions that modify the Shell stylesheet may cause issues with themes.");
+
+  // TODO: Fix the warning being under shell-theming-expander
+  Label {
+    label: "Warning: Extensions that modify the Shell stylesheet may cause issues with themes";
+    halign: start;
+
+    styles [
+      "dim-label",
+      "warning"
+    ]
+  }
 
   Adw.ExpanderRow shell-theming-expander {
     title: _("Shell Engine Options");
@@ -16,7 +27,10 @@ template $GradienceShellThemingGroup : Adw.PreferencesGroup {
       label: _("Apply");
       tooltip-text: _("Apply Shell theme");
       clicked => $on_apply_button_clicked();
-      styles ["suggested-action"]
+
+      styles [
+        "suggested-action"
+      ]
     }
 
     Adw.ActionRow custom-colors-row {
@@ -47,7 +61,10 @@ Adw.ActionRow other-options-row {
     //tooltip-text: _("Restore Previous Theme");
     tooltip-text: _("Currently unavailable");
     clicked => $on_restore_button_clicked();
-    styles ["flat"]
+
+    styles [
+      "flat"
+    ]
   }
 
   [suffix]
@@ -56,6 +73,10 @@ Adw.ActionRow other-options-row {
     label: _("Reset Theme");
     tooltip-text: _("Reset applied theme");
     clicked => $on_reset_theme_clicked();
-    styles ["destructive-action"]
+
+    styles [
+      "destructive-action"
+    ]
   }
 }
+
diff --git a/data/ui/welcome_window.blp b/data/ui/welcome_window.blp
@@ -68,18 +68,18 @@ template $GradienceWelcomeWindow: Adw.Window {
                         Adw.StatusPage page_release {
                             icon-name: "software-update-available-symbolic";
                             title: _("What's new in 0.8.0");
-                            description: _("In this release, we added GNOME Shell theming support and reworked how Gradience works internally.");
+                            description: _("In this release, we added GNOME Shell theming support and reworked how Gradience works internally");
                         }
 
                         Adw.StatusPage page_agreement {
                             vexpand: true;
                             hexpand: true;
                             icon-name: "dialog-warning-symbolic";
                             title: _("Warning");
-                            description: _("Changing the color scheme can negatively affect contrast and readability. Proceed with caution. Please do not report theming-related issues to app developers.");
+                            description: _("Changing the color scheme can negatively affect contrast and readability. Proceed with caution. Please do not report theming-related issues to app developers");
 
                             Gtk.Button btn_agree {
-                                styles ["suggested-action", "pill"]
+                                styles ["destructive-action", "pill"]
                                 label: _("Agree and Continue");
                                 use-underline: true;
                                 halign: center;
@@ -90,8 +90,8 @@ template $GradienceWelcomeWindow: Adw.Window {
                             vexpand: true;
                             hexpand: true;
                             icon-name: "larger-brush-symbolic";
-                            title: _("Customize Adwaita Theme");
-                            description: _("Change colors of windows, buttons, lists and more, with advanced features like adding custom CSS.");
+                            title: _("Customize Adwaita");
+                            description: _("Change colors of windows, buttons, lists and more, with advanced features like adding custom styles");
 
                             Gtk.Button btn_close {
                                 styles ["suggested-action", "pill"]