From 5a5a3ce22f7310af888e9cf4b500a5ea19dbe2a0 Mon Sep 17 00:00:00 2001
From: fafaraway <farfaraway@live.jp>
Date: Fri, 23 Dec 2022 16:22:45 +0800
Subject: [PATCH] improvement: cleanup options

---
 src/gui/options.lua | 39 +++++++++++++++++++++------------------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/src/gui/options.lua b/src/gui/options.lua
index d66405ed..fcab58c3 100644
--- a/src/gui/options.lua
+++ b/src/gui/options.lua
@@ -354,6 +354,10 @@ local function UpdateScreenSaver()
     F:GetModule('ScreenSaver'):UpdateScreenSaver()
 end
 
+local function MuteAnnoyingSounds()
+    F:GetModule('Misc'):MuteAnnoyingSounds()
+end
+
 -- Infobar
 
 local function UpdateCombatPulse()
@@ -579,12 +583,11 @@ GUI.OptionsList = {
         {
             1,
             'General',
-            'FasterMovieSkip',
-            L['Faster Movie Skip'],
+            'MuteAnnoyingSounds',
+            L['Mute Annoying Sounds'],
             true,
             nil,
-            nil,
-            L['Allow space bar, escape key and enter key to cancel cinematic without confirmation.'],
+            MuteAnnoyingSounds,
         },
         {
             1,
@@ -626,6 +629,16 @@ GUI.OptionsList = {
             nil,
             L['Take screenshots automatically based on specific events.'],
         },
+        {
+            1,
+            'General',
+            'FasterMovieSkip',
+            L['Faster Movie Skip'],
+            nil,
+            nil,
+            nil,
+            L['Allow space bar, escape key and enter key to cancel cinematic without confirmation.'],
+        },
         {},
         {
             1,
@@ -1764,12 +1777,12 @@ GUI.OptionsList = {
         {
             1,
             'Unitframe',
-            'InvertedColorMode',
-            L['Inverted Color Mode'],
-            nil,
+            'HidePlayerTags',
+            L['Hide Player Tags'],
             nil,
             nil,
-            L['The health bar color and the background color are inverted.|nThe unitframe module is designed based on the Inverted Color Mode, which may cause some visual problems if disabled.'],
+            UpdateUnitTags,
+            L['Only show player tags on mouseover.'],
         },
         {
             1,
@@ -1840,16 +1853,6 @@ GUI.OptionsList = {
             UpdateClassPower,
             L['Show special resources of the class, such as Combo Points, Holy Power, Chi, Runes, etc.'],
         },
-        {
-            1,
-            'Unitframe',
-            'HidePlayerTags',
-            L['Hide Player Tags'],
-            nil,
-            nil,
-            UpdateUnitTags,
-            L['Only show player tags on mouseover.'],
-        },
         {},
         {
             1,