Quantcast

merging yesterdays changes

failcoder [08-06-15 - 03:49]
merging yesterdays changes
Filename
SVUI_!Core/system/layout.lua
SVUI_!Core/system/media.lua
SVUI_Chat/Loader.lua
SVUI_Chat/SVUI_Chat.lua
diff --git a/SVUI_!Core/system/layout.lua b/SVUI_!Core/system/layout.lua
index cb39515..2ba8388 100644
--- a/SVUI_!Core/system/layout.lua
+++ b/SVUI_!Core/system/layout.lua
@@ -1257,7 +1257,7 @@ local function InitializeMovables()
 	        bottom = 0,
 	    },
 	});
-	CLOAKED_BG:SetBackdropColor(0,0,0,0.5);
+	CLOAKED_BG:SetBackdropColor(0,0,0,0.15);

 	Layout.Anchors = SV.db.LAYOUT or {}
 	--Layout:SetPanelColor("yellow")
diff --git a/SVUI_!Core/system/media.lua b/SVUI_!Core/system/media.lua
index d5dcb1f..768df22 100644
--- a/SVUI_!Core/system/media.lua
+++ b/SVUI_!Core/system/media.lua
@@ -119,6 +119,7 @@ LSM:Register("statusbar", "SVUI GlowBar", [[Interface\AddOns\SVUI_!Core\assets\s
 LSM:Register("statusbar", "SVUI LazerBar", [[Interface\AddOns\SVUI_!Core\assets\statusbars\LAZER]])

 LSM:Register("sound", "Whisper Alert", [[Interface\AddOns\SVUI_!Core\assets\sounds\whisper.mp3]])
+LSM:Register("sound", "Mention Alert", [[Interface\AddOns\SVUI_!Core\assets\sounds\whisper.mp3]])
 LSM:Register("sound", "Toasty", [[Interface\AddOns\SVUI_!Core\assets\sounds\toasty.mp3]])

 LSM:Register("font", "SVUI Default Font", [[Interface\AddOns\SVUI_!Core\assets\fonts\Default.ttf]],LSM.LOCALE_BIT_ruRU+LSM.LOCALE_BIT_western)
diff --git a/SVUI_Chat/Loader.lua b/SVUI_Chat/Loader.lua
index 01af1da..64c03b5 100644
--- a/SVUI_Chat/Loader.lua
+++ b/SVUI_Chat/Loader.lua
@@ -46,7 +46,7 @@ SV.defaults[Schema] = {
 	["smileys"] = true,
 	["shortChannels"] = true,
 	["hideRealms"] = false,
-	["secretWordTone"] = "None",
+	["mention"] = "Mention Alert",
 	["psst"] = "Whisper Alert",
 	["noWipe"] = false,
 	["timeStampFormat"] = "NONE",
@@ -170,13 +170,22 @@ function MOD:LoadOptions()
 						values = AceGUIWidgetLSMlists.sound,
 						set = function(a,b) MOD:ChangeDBVar(b,a[#a]) end
 					},
-					spacer2 = {
+					mention = {
 						order = 12,
+						type = "select",
+						dialogControl = "LSM30_Sound",
+						name = L["Mention Alert"],
+						disabled = function()return not SV.db[Schema].mention end,
+						values = AceGUIWidgetLSMlists.sound,
+						set = function(a,b) MOD:ChangeDBVar(b,a[#a]) end
+					},
+					spacer2 = {
+						order = 13,
 						type = "description",
 						name = ""
 					},
 					throttleInterval = {
-						order = 13,
+						order = 14,
 						type = "range",
 						name = L["Spam Interval"],
 						desc = L["Prevent the same messages from displaying in chat more than once within this set amount of seconds, set to zero to disable."],
diff --git a/SVUI_Chat/SVUI_Chat.lua b/SVUI_Chat/SVUI_Chat.lua
index 8d453e8..e32ec27 100644
--- a/SVUI_Chat/SVUI_Chat.lua
+++ b/SVUI_Chat/SVUI_Chat.lua
@@ -133,6 +133,7 @@ local CHANNEL_STRINGS 		= {
 	[L["WorldDefense"]] 	= L["WorldDefense"],
 }
 local INTERNAL_TABLES = { 'channelList', 'zoneChannelList', 'messageTypeList' };
+local SECRET_SOUND = [[Interface\AddOns\SVUI_!Core\assets\sounds\whisper.mp3]];
 local WHISPER_SOUND = [[Interface\AddOns\SVUI_!Core\assets\sounds\whisper.mp3]];

 local GENERAL_LINK_PATTERN = "[^%:]+";
@@ -425,7 +426,7 @@ do
 		end

 		if(message:find(PLAYERNAME_MATCH) and (not InCombatLockdown())) then
-			PlaySoundFile([[sound\doodad\be_scryingorb_explode.ogg]], "Master")
+			PlaySoundFile(SECRET_SOUND, "Master")
 		end

 		return SVUI_ParseMessage(self, event, message, author, ...)
@@ -1614,6 +1615,7 @@ function MOD:UpdateLocals()
 	CHAT_ABBREV = SV.db.Chat.shortChannels;
 	CHAT_FADING = SV.db.Chat.fade;
 	WHISPER_SOUND = LSM:Fetch("sound", SV.db.Chat.psst);
+	SECRET_SOUND = LSM:Fetch("sound", SV.db.Chat.mention);
 	TIME_STAMP_MASK = SV.db.Chat.timeStampFormat;
 	HIDE_REALM = SV.db.Chat.hideRealms;
 	if(CHAT_THROTTLE and CHAT_THROTTLE == 0) then