diff --git a/SVUI_!Core/system/funstuff.lua b/SVUI_!Core/system/funstuff.lua index 6d3ca5e..67cd97e 100644 --- a/SVUI_!Core/system/funstuff.lua +++ b/SVUI_!Core/system/funstuff.lua @@ -319,6 +319,7 @@ function SV.Drunk:PartysOver() end function SV.Drunk:LetsParty() + if(not SV.db.FunStuff.drunk) then return end --GetNekkid() self.PartyMode = true SetCVar("Sound_MusicVolume", 100) diff --git a/SVUI_!Options/SVUI_!Options.lua b/SVUI_!Options/SVUI_!Options.lua index 12e852f..79d70da 100644 --- a/SVUI_!Options/SVUI_!Options.lua +++ b/SVUI_!Options/SVUI_!Options.lua @@ -1,7 +1,7 @@ --[[ ########################################################## S V U I By: Munglunch -########################################################## +########################################################## LOCALIZED LUA FUNCTIONS ########################################################## ]]-- @@ -29,8 +29,8 @@ local wipe = _G.wipe; --[[ TABLE METHODS ]]-- local tsort = table.sort; local IsAddOnLoaded = _G.IsAddOnLoaded; ---[[ -########################################################## +--[[ +########################################################## GET ADDON DATA ########################################################## ]]-- @@ -108,8 +108,8 @@ local function GetLiveDockletsB() end return t; end ---[[ -########################################################## +--[[ +########################################################## INIT OPTIONS ########################################################## ]]-- @@ -146,7 +146,7 @@ local function RefreshProfileOptions() optionGroup.importdesc = { order = 4, type = "description", - name = function() + name = function() if(SVUILib:CheckDualProfile()) then return "\n" .. L["Can not Save, Copy or Change while dual spec swapping is enabled"] else @@ -168,9 +168,9 @@ local function RefreshProfileOptions() order = 6, get = false, set = function(key, value) SVUILib:CloneDatabase(value) SV:SavedPopup() RefreshProfileOptions() end, - disabled = function() - local t = SVUILib:CheckDualProfile() - return t + disabled = function() + local t = SVUILib:CheckDualProfile() + return t end, } optionGroup.copy = { @@ -180,8 +180,8 @@ local function RefreshProfileOptions() order = 7, get = function() return currentProfile end, set = function(key, value) SV:CopyProfile(value) SV:SavedPopup() RefreshProfileOptions() end, - disabled = function() - local t = SVUILib:CheckProfiles() + disabled = function() + local t = SVUILib:CheckProfiles() return (not t) end, values = SVUILib:GetProfiles(), @@ -193,9 +193,9 @@ local function RefreshProfileOptions() order = 8, get = function() return currentProfile end, set = function(key, value) SV:LinkProfile(value) SV:SavedPopup() RefreshProfileOptions() end, - disabled = function() - local t = SVUILib:CheckProfiles() - return ((not t) or SVUILib:CheckDualProfile()) + disabled = function() + local t = SVUILib:CheckProfiles() + return ((not t) or SVUILib:CheckDualProfile()) end, values = SVUILib:GetProfiles(), width = 'fill', @@ -257,7 +257,7 @@ local function GetUserFilterList() for filter in pairs(SV.db.Filters.Custom) do userFilterTable[filter] = filter end - return userFilterTable + return userFilterTable end local function GetAllFilterList() @@ -273,21 +273,21 @@ local function GetAllFilterList() for filter in pairs(SV.db.Filters.Custom) do allFilterTable[filter] = filter end - return allFilterTable + return allFilterTable end function SVUIOptions:SetFilterOptions(filterType, selectedSpell) local FILTER CURRENT_FILTER_TYPE = filterType - if(SV.db.Filters.Custom[filterType]) then - FILTER = SV.db.Filters.Custom[filterType] + if(SV.db.Filters.Custom[filterType]) then + FILTER = SV.db.Filters.Custom[filterType] else FILTER = SV.db.Filters[filterType] end if((not filterType) or (filterType == "") or (not FILTER)) then SV.Options.args.Filters.args.filterGroup = nil; SV.Options.args.Filters.args.spellGroup = nil; - return + return end if(not self.FilterOptionGroups[filterType]) then self.FilterOptionGroups[filterType] = self.FilterOptionGroups['_NEW'](filterType); @@ -323,7 +323,7 @@ local generalFonts = { order = 3, name = "Combat", desc = "Scrolling combat text font." - }, + }, ["alert"] = { order = 4, name = "Alerts", @@ -408,87 +408,87 @@ local miscFonts = { }; SV.Options.args.primary = { - type = "group", - order = 1, - name = L["Main"], - get = function(j) return SV.db[j[#j]] end, - set = function(j, value) SV.db[j[#j]] = value end, + type = "group", + order = 1, + name = L["Main"], + get = function(j) return SV.db[j[#j]] end, + set = function(j, value) SV.db[j[#j]] = value end, args = { introGroup1 = { - order = 1, - name = "", - type = "description", - width = "full", - image = function() return SV.SplashImage, 256, 128 end, - }, + order = 1, + name = "", + type = "description", + width = "full", + image = function() return SV.SplashImage, 256, 128 end, + }, introGroup2 = { - order = 2, - name = L["Here are a few basic quick-change options to possibly save you some time."], - type = "description", - width = "full", - fontSize = "large", + order = 2, + name = L["Here are a few basic quick-change options to possibly save you some time."], + type = "description", + width = "full", + fontSize = "large", }, quickGroup1 = { - order = 3, - name = "", - type = "group", - width = "full", - guiInline = true, + order = 3, + name = "", + type = "group", + width = "full", + guiInline = true, args = { Install = { - order = 1, - width = "full", - type = "execute", - name = L["Install"], - desc = L["Run the installation process."], + order = 1, + width = "full", + type = "execute", + name = L["Install"], + desc = L["Run the installation process."], func = function() SV.Setup:Install() SV:ToggleConfig() end }, Themes = { - order = 2, - width = "full", - type = "execute", - name = L["Themes"], - desc = L["Select an available theme."], + order = 2, + width = "full", + type = "execute", + name = L["Themes"], + desc = L["Select an available theme."], func = function() SV.Setup:SelectTheme() SV:ToggleConfig() end }, ToggleAnchors = { - order = 3, - width = "full", - type = "execute", - name = L["Move Frames"], - desc = L["Unlock various elements of the UI to be repositioned."], + order = 3, + width = "full", + type = "execute", + name = L["Move Frames"], + desc = L["Unlock various elements of the UI to be repositioned."], func = function() SV:MoveAnchors() end }, ResetMoveables = { - order = 4, - width = "full", - type = "execute", - name = L["Reset SVUI Anchors"], - desc = L["Reset all movable frames to their original positions."], + order = 4, + width = "full", + type = "execute", + name = L["Reset SVUI Anchors"], + desc = L["Reset all movable frames to their original positions."], func = function() SV:StaticPopup_Show("RESETLAYOUT_CHECK") end }, ResetDraggables = { - order = 5, - width = "full", - type = "execute", - name = L["Reset Blizzard Anchors"], - desc = L["Reset all draggable Blizzard frames to their original positions."], + order = 5, + width = "full", + type = "execute", + name = L["Reset Blizzard Anchors"], + desc = L["Reset all draggable Blizzard frames to their original positions."], func = function() SV:StaticPopup_Show("RESETBLIZZARD_CHECK") end }, - }, - }, + }, + }, } } SV.Options.args.Core = { - type = "group", - order = 2, - name = L['General Options'], - childGroups = "tab", - get = function(key) return SV.db[key[#key]] end, - set = function(key, value) SV.db[key[#key]] = value end, + type = "group", + order = 2, + name = L['General Options'], + childGroups = "tab", + get = function(key) return SV.db[key[#key]] end, + set = function(key, value) SV.db[key[#key]] = value end, args = { mostCommon = { - type = "group", + type = "group", order = 1, name = "Most Common", guiInline = true, @@ -511,15 +511,15 @@ SV.Options.args.Core = { cooldownText = { order = 3, type = "toggle", - name = L['Cooldown Text'], - desc = L["Display cooldown text on anything with the cooldown spiral."], - get = function(j)return SV.db.general.cooldown end, + name = L['Cooldown Text'], + desc = L["Display cooldown text on anything with the cooldown spiral."], + get = function(j)return SV.db.general.cooldown end, set = function(j,value)SV.db.general.cooldown = value; SV:StaticPopup_Show("RL_CLIENT")end }, texture = { - order = 4, - type = "group", - name = L["Textures"], + order = 4, + type = "group", + name = L["Textures"], guiInline = true, get = function(key) return SV.media.shared.background[key[#key]].file @@ -542,13 +542,13 @@ SV.Options.args.Core = { order = 1, name = L["Secondary Texture"], values = AceGUIWidgetLSMlists.background - } + } } - }, + }, colors = { - order = 5, - type = "group", - name = L["Colors"], + order = 5, + type = "group", + name = L["Colors"], guiInline = true, args = { customClassColor = { @@ -567,7 +567,7 @@ SV.Options.args.Core = { hasAlpha = true, get = function(key) local color = SV.media.color.default - return color[1],color[2],color[3],color[4] + return color[1],color[2],color[3],color[4] end, set = function(key, rValue, gValue, bValue, aValue) SV.media.color.default = {rValue, gValue, bValue, aValue} @@ -582,7 +582,7 @@ SV.Options.args.Core = { hasAlpha = true, get = function(key) local color = SV.media.color.special - return color[1],color[2],color[3],color[4] + return color[1],color[2],color[3],color[4] end, set = function(key, rValue, gValue, bValue, aValue) SV.media.color.special = {rValue, gValue, bValue, aValue} @@ -643,29 +643,37 @@ SV.Options.args.Core = { } }, Extras = { - type = "group", + type = "group", order = 2, name = "Extras", guiInline = true, - get = function(a)return SV.db["Extras"][a[#a]]end, - set = function(a,b)SV:ChangeDBVar(b,a[#a]); end, + get = function(a)return SV.db["Extras"][a[#a]]end, + set = function(a,b)SV:ChangeDBVar(b,a[#a]); end, args = { common = { - order = 1, - type = "group", - name = L["General"], - guiInline = true, + order = 1, + type = "group", + name = L["General"], + guiInline = true, args = { - woot = { + threatbar = { order = 1, type = 'toggle', + name = L["Threat Thermometer"], + desc = L["Enable/disable the custom SVUI threat meter"], + get = function(j)return SV.db["Extras"].threatbar end, + set = function(j,value)SV.db["Extras"].threatbar = value; SV:StaticPopup_Show("RL_CLIENT") end + }, + woot = { + order = 2, + type = 'toggle', name = L["Say Thanks"], - desc = L["Thank someone when they cast specific spells on you. Typically resurrections"], + desc = L["Thank someone when they cast specific spells on you. Typically resurrections"], get = function(j)return SV.db["Extras"].woot end, set = function(j,value)SV.db["Extras"].woot = value;SV:ToggleReactions()end }, pvpinterrupt = { - order = 2, + order = 3, type = 'toggle', name = L["Report PVP Actions"], desc = L["Announce your interrupts, as well as when you have been sapped!"], @@ -673,7 +681,7 @@ SV.Options.args.Core = { set = function(j,value)SV.db["Extras"].pvpinterrupt = value;SV:ToggleReactions()end }, lookwhaticando = { - order = 3, + order = 4, type = 'toggle', name = L["Report Spells"], desc = L["Announce various helpful spells cast by players in your party/raid"], @@ -681,7 +689,7 @@ SV.Options.args.Core = { set = function(j,value)SV.db["Extras"].lookwhaticando = value;SV:ToggleReactions()end }, sharingiscaring = { - order = 4, + order = 5, type = 'toggle', name = L["Report Shareables"], desc = L["Announce when someone in your party/raid has laid a feast or repair bot"], @@ -689,7 +697,7 @@ SV.Options.args.Core = { set = function(j,value)SV.db["Extras"].sharingiscaring = value;SV:ToggleReactions()end }, reactionChat = { - order = 5, + order = 6, type = 'toggle', name = L["Report in Chat"], desc = L["Announcements will be sent to group chat channels"], @@ -697,7 +705,7 @@ SV.Options.args.Core = { set = function(j,value)SV.db["Extras"].reactionChat = value;SV:ToggleReactions()end }, reactionEmote = { - order = 6, + order = 7, type = 'toggle', name = L["Auto Emotes"], desc = L["Some announcements are accompanied by player emotes."], @@ -705,22 +713,22 @@ SV.Options.args.Core = { set = function(j,value)SV.db["Extras"].reactionEmote = value;SV:ToggleReactions()end }, } - }, + }, automations = { - order = 2, - type = "group", - name = L["General"], - guiInline = true, + order = 2, + type = "group", + name = L["Automations"], + guiInline = true, args = { intro = { - order = 1, - type = "description", + order = 1, + type = "description", name = L["Adjust the behavior of the many automations."] }, automationGroup1 = { - order = 2, - type = "group", - guiInline = true, + order = 2, + type = "group", + guiInline = true, name = L["Task Minions"], desc = L['Minions that can make certain tasks easier by handling them automatically.'], args = { @@ -796,9 +804,9 @@ SV.Options.args.Core = { } }, automationGroup2 = { - order = 3, - type = "group", - guiInline = true, + order = 3, + type = "group", + guiInline = true, name = L["Quest Minions"], desc = L['Minions that can make questing easier by automatically accepting/completing quests.'], args = { @@ -842,17 +850,24 @@ SV.Options.args.Core = { set = function(j,value)SV.db["Extras"].autopvpquests = value end }, } - }, + }, } }, FunStuff = { type = "group", order = 12, name = L["Fun Stuff"], - guiInline = true, + guiInline = true, args = { - comix = { + drunk = { order = 1, + type = 'toggle', + name = L["Drunk Mode"], + get = function(j)return SV.db.FunStuff.drunk end, + set = function(j,value) SV.db.FunStuff.drunk = value; SV.Drunk:Toggle() end, + }, + comix = { + order = 2, type = 'select', name = L["Comic Popups"], get = function(j)return SV.db.FunStuff.comix end, @@ -864,7 +879,7 @@ SV.Options.args.Core = { } }, afk = { - order = 2, + order = 3, type = 'select', name = L["AFK Screen"], get = function(j)return SV.db.FunStuff.afk end, @@ -876,7 +891,7 @@ SV.Options.args.Core = { } }, gamemenu = { - order = 3, + order = 4, type = 'select', name = L["Game Menu"], get = function(j)return SV.db.FunStuff.gamemenu end, @@ -902,12 +917,12 @@ SV.Options.args.Core = { intro={ order = 1, type = 'description', - name = function() - if(GetNumEquipmentSets()==0) then + name = function() + if(GetNumEquipmentSets()==0) then return ("%s\n|cffFF0000Must create an equipment set to use some of these features|r"):format(L["EQUIPMENT_DESC"]) - else - return L["EQUIPMENT_DESC"] - end + else + return L["EQUIPMENT_DESC"] + end end }, specialization = { @@ -923,10 +938,10 @@ SV.Options.args.Core = { name = L["Enable"], desc = L["Enable/Disable the specialization switch."], get = function(key) - return SV.db.Gear.specialization.enable + return SV.db.Gear.specialization.enable end, - set = function(key, value) - SV.db.Gear.specialization.enable = value + set = function(key, value) + SV.db.Gear.specialization.enable = value end }, primary = { @@ -935,18 +950,18 @@ SV.Options.args.Core = { name = L["Primary Talent"], desc = L["Choose the equipment set to use for your primary specialization."], disabled = function() - return not SV.db.Gear.specialization.enable + return not SV.db.Gear.specialization.enable end, values = function() local h = {["none"] = L["No Change"]} - for i = 1, GetNumEquipmentSets()do + for i = 1, GetNumEquipmentSets()do local name = GetEquipmentSetInfo(i) if name then - h[name] = name - end - end + h[name] = name + end + end tsort(h, sortingFunction) - return h + return h end }, secondary = { @@ -955,14 +970,14 @@ SV.Options.args.Core = { name = L["Secondary Talent"], desc = L["Choose the equipment set to use for your secondary specialization."], disabled = function() return not SV.db.Gear.specialization.enable end, - values = function() + values = function() local h = {["none"] = L["No Change"]} - for i = 1, GetNumEquipmentSets()do + for i = 1, GetNumEquipmentSets()do local name = GetEquipmentSetInfo(i) - if name then h[name] = name end - end + if name then h[name] = name end + end tsort(h, sortingFunction) - return h + return h end } } @@ -990,12 +1005,12 @@ SV.Options.args.Core = { disabled = function()return not SV.db.Gear.battleground.enable end, values = function() local h = {["none"] = L["No Change"]} - for i = 1,GetNumEquipmentSets()do + for i = 1,GetNumEquipmentSets()do local name = GetEquipmentSetInfo(i) - if name then h[name] = name end - end + if name then h[name] = name end + end tsort(h, sortingFunction) - return h + return h end } } @@ -1072,8 +1087,8 @@ SV.Options.args.Core = { } }, errors = { - order = 4, - type = "group", + order = 4, + type = "group", name = L["Error Handling"], guiInline = true, args = { @@ -1095,13 +1110,13 @@ SV.Options.args.Core = { set = function(key,value)SV.db.general.hideErrorFrame = value; SV:UpdateErrorFilters() end }, filterGroup = { - order = 3, - type = "group", - guiInline = true, + order = 3, + type = "group", + guiInline = true, name = L["Filters"], disabled = function() return not SV.db.general.filterErrors end, args = {} - }, + }, } }, } @@ -1114,9 +1129,9 @@ SV.Options.args.Screen = { set = function(a,b) SV.db.screen[a[#a]] = b; end, args = { commonGroup = { - order = 1, - type = 'group', - name = L['Basic Options'], + order = 1, + type = 'group', + name = L['Basic Options'], guiInline = true, args = { autoScale = { @@ -1125,12 +1140,12 @@ SV.Options.args.Screen = { desc = L["Automatically scale the User Interface based on your screen resolution"], type = "toggle", get = function(j)return SV.db.screen.autoScale end, - set = function(j,value) + set = function(j,value) SV.db.screen.autoScale = value; if(value) then SV.db.screen.scaleAdjust = 0.64; end - SV:StaticPopup_Show("RL_CLIENT") + SV:StaticPopup_Show("RL_CLIENT") end }, multiMonitor = { @@ -1144,9 +1159,9 @@ SV.Options.args.Screen = { } }, advancedGroup = { - order = 2, - type = 'group', - name = L['Advanced Options'], + order = 2, + type = 'group', + name = L['Advanced Options'], guiInline = true, args = { advanced = { @@ -1157,7 +1172,7 @@ SV.Options.args.Screen = { get = function(j)return SV.db.screen.advanced end, set = function(j,value) SV.db.screen.advanced = value; SV:StaticPopup_Show("RL_CLIENT"); end }, - forcedWidth = { + forcedWidth = { order = 2, name = L["Forced Width"], desc = function() return L["Setting your resolution height here will bypass all evaluated measurements. Current: "] .. SV.db.screen.forcedWidth; end, @@ -1166,9 +1181,9 @@ SV.Options.args.Screen = { get = function(key) return SV.db.screen.forcedWidth end, set = function(key, value) local w = tonumber(value); - if(not w) then + if(not w) then SV:AddonMessage(L["Value must be a number"]) - elseif(w < 800) then + elseif(w < 800) then SV:AddonMessage(L["Less than 800 is not allowed"]) else SV.db.screen.forcedWidth = w; @@ -1176,7 +1191,7 @@ SV.Options.args.Screen = { end end }, - forcedHeight = { + forcedHeight = { order = 3, name = L["Forced Height"], desc = function() return L["Setting your resolution height here will bypass all evaluated measurements. Current: "] .. SV.db.screen.forcedHeight; end, @@ -1185,9 +1200,9 @@ SV.Options.args.Screen = { get = function(key) return SV.db.screen.forcedHeight end, set = function(key, value) local h = tonumber(value); - if(not h) then + if(not h) then SV:AddonMessage(L["Value must be a number"]) - elseif(h < 600) then + elseif(h < 600) then SV:AddonMessage(L["Less than 600 is not allowed"]) else SV.db.screen.forcedHeight = h; @@ -1206,12 +1221,12 @@ SV.Options.args.Screen = { step = 0.01, disabled = function() return not SV.db.screen.advanced end, get = function(j)return SV.db.screen.scaleAdjust end, - set = function(j,value) - SV.db.screen.scaleAdjust = value; + set = function(j,value) + SV.db.screen.scaleAdjust = value; if(value ~= 0.64) then SV.db.screen.autoScale = false; end - SV:StaticPopup_Show("RL_CLIENT") + SV:StaticPopup_Show("RL_CLIENT") end }, } @@ -1219,16 +1234,16 @@ SV.Options.args.Screen = { } } SV.Options.args.Fonts = { - order = 4, - type = "group", + order = 4, + type = "group", name = L['Fonts'], - childGroups = "tab", + childGroups = "tab", args = { fontGroup = { - order = 1, - type = 'group', - name = L['Font Options'], - childGroups = "tree", + order = 1, + type = 'group', + name = L['Font Options'], + childGroups = "tree", args = {} } } @@ -1236,11 +1251,11 @@ SV.Options.args.Fonts = { SV.Options.args.Dock = { type = "group", order = 5, - name = SV.Dock.TitleID, + name = SV.Dock.TitleID, args = { intro = { - order = 1, - type = "description", + order = 1, + type = "description", name = "Configure the various frame docks around the screen" }, generalGroup = { @@ -1248,11 +1263,11 @@ SV.Options.args.Dock = { type = "group", name = "General", guiInline = true, - get = function(key)return SV.db.Dock[key[#key]];end, + get = function(key)return SV.db.Dock[key[#key]];end, set = function(key,value) SV.Dock:ChangeDBVar(value,key[#key]); SV.Dock:Refresh() - end, + end, args = { bottomPanel = { order = 1, @@ -1271,19 +1286,19 @@ SV.Options.args.Dock = { set = function(key,value)SV.Dock:ChangeDBVar(value,key[#key]);SV.Dock:TopBorderVisibility()end }, buttonSize = { - order = 3, - type = "range", - name = L["Dock Button Size"], - desc = L["PANEL_DESC"], - min = 20, - max = 80, + order = 3, + type = "range", + name = L["Dock Button Size"], + desc = L["PANEL_DESC"], + min = 20, + max = 80, step = 1, width = "full", - get = function()return SV.db.Dock.buttonSize;end, + get = function()return SV.db.Dock.buttonSize;end, set = function(key,value) SV.Dock:ChangeDBVar(value,key[#key]); SV.Dock:Refresh() - end, + end, }, }, }, @@ -1292,90 +1307,90 @@ SV.Options.args.Dock = { type = "group", name = "Reports (Data Texts)", guiInline = true, - get = function(key)return SV.db.Reports[key[#key]];end, + get = function(key)return SV.db.Reports[key[#key]];end, set = function(key,value) SV.Reports:ChangeDBVar(value,key[#key]); - end, + end, args = { time24 = { - order = 1, - type = "toggle", - name = L["24-Hour Time"], + order = 1, + type = "toggle", + name = L["24-Hour Time"], desc = L["Toggle 24-hour mode for the time datatext."], - }, + }, localtime = { - order = 2, - type = "toggle", - name = L["Local Time"], + order = 2, + type = "toggle", + name = L["Local Time"], desc = L["If not set to true then the server time will be displayed instead."] - }, + }, battleground = { - order = 3, - type = "toggle", - name = L["Battleground Texts"], + order = 3, + type = "toggle", + name = L["Battleground Texts"], desc = L["When inside a battleground display personal scoreboard information on the main datatext bars."] - }, + }, backdrop = { - order = 4, - name = "Data Backgrounds", - desc = L["Display background textures on docked data texts"], + order = 4, + name = "Data Backgrounds", + desc = L["Display background textures on docked data texts"], type = "toggle", set = function(key, value) SV.Reports:ChangeDBVar(value, key[#key]); SV.Reports:UpdateAllReports() end, }, shortGold = { - order = 5, - type = "toggle", - name = L["Shortened Gold Text"], + order = 5, + type = "toggle", + name = L["Shortened Gold Text"], }, spacer1 = { - order = 6, - name = "", - type = "description", - width = "full", + order = 6, + name = "", + type = "description", + width = "full", }, dockCenterWidth = { order = 7, type = 'range', name = L['Stat Panel Width'], - desc = L["PANEL_DESC"], - min = 400, - max = 1800, + desc = L["PANEL_DESC"], + min = 400, + max = 1800, step = 1, width = "full", - get = function()return SV.db.Dock.dockCenterWidth; end, + get = function()return SV.db.Dock.dockCenterWidth; end, set = function(key,value) SV.Dock:ChangeDBVar(value,key[#key]); SV.Dock:Refresh() - end, + end, }, spacer2 = { - order = 8, - name = "", - type = "description", - width = "full", + order = 8, + name = "", + type = "description", + width = "full", }, buttonSize = { - order = 9, - type = "range", - name = L["Dock Button Size"], - desc = L["PANEL_DESC"], - min = 20, - max = 80, + order = 9, + type = "range", + name = L["Dock Button Size"], + desc = L["PANEL_DESC"], + min = 20, + max = 80, step = 1, width = "full", - get = function()return SV.db.Dock.buttonSize;end, + get = function()return SV.db.Dock.buttonSize;end, set = function(key,value) SV.Dock:ChangeDBVar(value,key[#key]); SV.Dock:Refresh() - end, + end, }, } }, leftDockGroup = { - order = 3, - type = "group", - name = L["Left Dock"], - guiInline = true, + order = 3, + type = "group", + name = L["Left Dock"], + guiInline = true, args = { leftDockBackdrop = { order = 1, @@ -1389,15 +1404,15 @@ SV.Options.args.Dock = { end }, dockLeftHeight = { - order = 2, - type = "range", - name = L["Left Dock Height"], - desc = L["PANEL_DESC"], - min = 150, - max = 600, + order = 2, + type = "range", + name = L["Left Dock Height"], + desc = L["PANEL_DESC"], + min = 150, + max = 600, step = 1, width = "full", - get = function()return SV.db.Dock.dockLeftHeight;end, + get = function()return SV.db.Dock.dockLeftHeight;end, set = function(key,value) SV.Dock:ChangeDBVar(value,key[#key]); SV.Dock:Refresh() @@ -1405,18 +1420,18 @@ SV.Options.args.Dock = { SV.Chat:UpdateLocals() SV.Chat:RefreshChatFrames(true) end - end, + end, }, dockLeftWidth = { - order = 3, - type = "range", - name = L["Left Dock Width"], - desc = L["PANEL_DESC"], - min = 150, - max = 700, + order = 3, + type = "range", + name = L["Left Dock Width"], + desc = L["PANEL_DESC"], + min = 150, + max = 700, step = 1, width = "full", - get = function()return SV.db.Dock.dockLeftWidth;end, + get = function()return SV.db.Dock.dockLeftWidth;end, set = function(key,value) SV.Dock:ChangeDBVar(value,key[#key]); SV.Dock:Refresh() @@ -1429,10 +1444,10 @@ SV.Options.args.Dock = { } }, rightDockGroup = { - order = 4, - type = "group", - name = L["Right Dock"], - guiInline = true, + order = 4, + type = "group", + name = L["Right Dock"], + guiInline = true, args = { rightDockBackdrop = { order = 1, @@ -1446,15 +1461,15 @@ SV.Options.args.Dock = { end }, dockRightHeight = { - order = 2, - type = "range", - name = L["Right Dock Height"], - desc = L["PANEL_DESC"], - min = 150, - max = 600, + order = 2, + type = "range", + name = L["Right Dock Height"], + desc = L["PANEL_DESC"], + min = 150, + max = 600, step = 1, width = "full", - get = function()return SV.db.Dock.dockRightHeight;end, + get = function()return SV.db.Dock.dockRightHeight;end, set = function(key,value) SV.Dock:ChangeDBVar(value,key[#key]); SV.Dock:Refresh() @@ -1462,18 +1477,18 @@ SV.Options.args.Dock = { SV.Chat:UpdateLocals() SV.Chat:RefreshChatFrames(true) end - end, + end, }, dockRightWidth = { - order = 3, - type = "range", - name = L["Right Dock Width"], - desc = L["PANEL_DESC"], - min = 150, - max = 700, + order = 3, + type = "range", + name = L["Right Dock Width"], + desc = L["PANEL_DESC"], + min = 150, + max = 700, step = 1, width = "full", - get = function()return SV.db.Dock.dockRightWidth;end, + get = function()return SV.db.Dock.dockRightWidth;end, set = function(key,value) SV.Dock:ChangeDBVar(value,key[#key]); SV.Dock:Refresh() @@ -1493,8 +1508,8 @@ SV.Options.args.Dock = { }, toolsGroup = { order = 5, - type = "group", - name = L["Dock Tools"], + type = "group", + name = L["Dock Tools"], guiInline = true, get = function(key) return SV.db.Dock.dockTools[key[#key]] end, set = function(key,value) SV.Dock:ChangeDBVar(value, key[#key], "dockTools"); SV:StaticPopup_Show("RL_CLIENT"); end, @@ -1569,37 +1584,37 @@ SV.Options.args.Dock = { }, reportGroup1 = { order = 6, - type = "group", - name = L["Bottom Stats: Left"], - guiInline = true, + type = "group", + name = L["Bottom Stats: Left"], + guiInline = true, args = {} }, reportGroup2 = { order = 7, - type = "group", - name = L["Bottom Stats: Right"], - guiInline = true, + type = "group", + name = L["Bottom Stats: Right"], + guiInline = true, args = {} }, reportGroup3 = { order = 8, - type = "group", - name = L["Top Stats: Left"], - guiInline = true, + type = "group", + name = L["Top Stats: Left"], + guiInline = true, args = {} }, reportGroup4 = { order = 9, - type = "group", - name = L["Top Stats: Right"], - guiInline = true, + type = "group", + name = L["Top Stats: Right"], + guiInline = true, args = {} }, AddonDocklets = { order = 10, - type = "group", - name = L["Docked Addons"], - guiInline = true, + type = "group", + name = L["Docked Addons"], + guiInline = true, args = { DockletMain = { type = "select", @@ -1615,7 +1630,7 @@ SV.Options.args.Dock = { order = 2, name = "Secondary Docklet", desc = "Select another addon", - --disabled = function() return (SV.private.Docks.Embed1 == "None") end, + --disabled = function() return (SV.private.Docks.Embed1 == "None") end, values = function() return GetLiveDockletsB() end, get = function() return SV.private.Docks.Embed2 end, set = function(a,value) SV.private.Docks.Embed2 = value; if(SV.Skins) then SV.Skins:RegisterAddonDocklets() end end, @@ -1653,8 +1668,8 @@ end for panelIndex, panelPositions in pairs(SV.db.REPORT_SLOTS) do local panelName = 'reportGroup' .. panelIndex; local optionTable = SV.Options.args.Dock.args; - if(optionTable[panelName] and type(panelPositions) == "table") then - for i = 1, #panelPositions do + if(optionTable[panelName] and type(panelPositions) == "table") then + for i = 1, #panelPositions do local slotName = 'Slot' .. i; optionTable[panelName].args[slotName] = { order = i, @@ -1664,8 +1679,8 @@ for panelIndex, panelPositions in pairs(SV.db.REPORT_SLOTS) do get = function(key) return SV.db.REPORT_SLOTS[panelIndex][i] end, set = function(key, value) SV.db.REPORT_SLOTS[panelIndex][i] = value; SV.Reports:UpdateAllReports() end } - end - end + end + end end SV:GenerateFontOptionGroup("General", 1, "The most commonly used fonts. Changing these will require reloading the UI.", generalFonts) @@ -1679,8 +1694,8 @@ RefreshProfileOptions() SVUIOptions.FilterOptionGroups['_NEW'] = function(filterType) return function() local RESULT, FILTER - if(SV.db.Filters.Custom[filterType]) then - FILTER = SV.db.Filters.Custom[filterType] + if(SV.db.Filters.Custom[filterType]) then + FILTER = SV.db.Filters.Custom[filterType] else FILTER = SV.db.Filters[filterType] end @@ -1699,23 +1714,23 @@ SVUIOptions.FilterOptionGroups['_NEW'] = function(filterType) get = function(key) return "" end, set = function(key, value) local spellID = tonumber(value); - if(not spellID) then + if(not spellID) then SV:AddonMessage(L["Value must be a number"]) - elseif(not GetSpellInfo(spellID)) then + elseif(not GetSpellInfo(spellID)) then SV:AddonMessage(L["Not valid spell id"]) - elseif(not FILTER[value]) then + elseif(not FILTER[value]) then FILTER[value] = {['enable'] = true, ['id'] = spellID, ['priority'] = 0} SVUIOptions:SetFilterOptions(filterType) SV.Events:Trigger("AURA_FILTER_OPTIONS_CHANGED"); - end + end end }, - removeSpell = { + removeSpell = { order = 2, name = L["Remove Spell"], desc = L["Remove a spell from the filter."], type = "select", - disabled = function() + disabled = function() local EMPTY = true; for g in pairs(FILTER) do EMPTY = false; @@ -1732,7 +1747,7 @@ SVUIOptions.FilterOptionGroups['_NEW'] = function(filterType) end end end - return tempFilterTable + return tempFilterTable end, get = function(key) return "" end, set = function(key, value) @@ -1740,8 +1755,8 @@ SVUIOptions.FilterOptionGroups['_NEW'] = function(filterType) if(FILTER[value].isDefault) then FILTER[value].enable = false; SV:AddonMessage(L["You may not remove a spell from a default filter that is not customly added. Setting spell to false instead."]) - else - FILTER[value] = nil + else + FILTER[value] = nil end end SVUIOptions:SetFilterOptions(filterType) @@ -1758,28 +1773,28 @@ end; SVUIOptions.FilterOptionSpells['_NEW'] = function(filterType) return function() local RESULT, FILTER - if(SV.db.Filters.Custom[filterType]) then - FILTER = SV.db.Filters.Custom[filterType] + if(SV.db.Filters.Custom[filterType]) then + FILTER = SV.db.Filters.Custom[filterType] else FILTER = SV.db.Filters[filterType] end if(FILTER) then RESULT = { - type = "group", - name = filterType .. " - " .. L["Spells"], - order = 5, - guiInline = true, + type = "group", + name = filterType .. " - " .. L["Spells"], + order = 5, + guiInline = true, args = {} }; for id, filterData in pairs(FILTER) do local auraName = GetSpellInfo(filterData.id) if(auraName) then RESULT.args[auraName] = { - name = auraName, - type = "toggle", + name = auraName, + type = "toggle", get = function() - return FILTER[id].enable - end, + return FILTER[id].enable + end, set = function(key, value) FILTER[id].enable = value; SV.Events:Trigger("AURA_FILTER_OPTIONS_CHANGED"); @@ -1793,16 +1808,16 @@ SVUIOptions.FilterOptionSpells['_NEW'] = function(filterType) end; end; -SV.Options.args.Filters.args.createFilter = { +SV.Options.args.Filters.args.createFilter = { order = 1, name = L["Create Filter"], desc = L["Create a custom filter."], type = "input", get = function(key) return "" end, set = function(key, value) - if(not value or (value and value == '')) then + if(not value or (value and value == '')) then SV:AddonMessage(L["Not a usable filter name"]) - elseif(SV.db.Filters.Custom[value]) then + elseif(SV.db.Filters.Custom[value]) then SV:AddonMessage(L["Filter already exists"]) else SV.db.Filters.Custom[value] = {}; @@ -1819,7 +1834,7 @@ SV.Options.args.Filters.args.deleteFilter = { get = function(key) return "" end, set = function(key, value) SV.db.Filters.Custom[value] = nil; - SV.Options.args.Filters.args.filterGroup = nil + SV.Options.args.Filters.args.filterGroup = nil end, values = GetUserFilterList() }; @@ -1833,4 +1848,4 @@ SV.Options.args.Filters.args.selectFilter = { values = GetAllFilterList() }; -SV.OptionsLoaded = true; \ No newline at end of file +SV.OptionsLoaded = true;