diff --git a/ElvUI_SLE/ElvUI_SLE.lua b/ElvUI_SLE/ElvUI_SLE.lua index a2848b6..79a52ea 100755 --- a/ElvUI_SLE/ElvUI_SLE.lua +++ b/ElvUI_SLE/ElvUI_SLE.lua @@ -185,7 +185,7 @@ end function SLE:Initialize() --Showing warning message about too old versions of ElvUI - if tonumber(E.version) < 6.55 then + if tonumber(E.version) < 6.998 then E:StaticPopup_Show("VERSION_MISMATCH") end EP:RegisterPlugin(addon,SLE.GetOptions) diff --git a/ElvUI_SLE/dev/options.lua b/ElvUI_SLE/dev/options.lua index 2f9a8cc..e0e3eec 100755 --- a/ElvUI_SLE/dev/options.lua +++ b/ElvUI_SLE/dev/options.lua @@ -98,7 +98,6 @@ if SLE:Auth() then order = 999, type = 'group', name = "Developer", - --childGroups = 'tree', childGroups = 'tab', args = { header = { diff --git a/ElvUI_SLE/modules/autorelease/options.lua b/ElvUI_SLE/modules/autorelease/options.lua index c647e7a..2c0bbd6 100755 --- a/ElvUI_SLE/modules/autorelease/options.lua +++ b/ElvUI_SLE/modules/autorelease/options.lua @@ -4,18 +4,22 @@ local function configTable() E.Options.args.sle.args.options.args.general.args.pvpautorelease = { type = "group", name = L["PvP Auto Release"], - order = 4, + order = 5, args = { header = { order = 1, type = "header", name = L["PvP Auto Release"], }, - enable = { + intro = { order = 2, + type = "description", + name = L["Automatically release body when killed inside a battleground."], + }, + enable = { + order = 3, type = "toggle", name = L["Enable"], - desc = L["Automatically release body when killed inside a battleground."], get = function(info) return E.db.sle.pvpautorelease end, set = function(info, value) E.db.sle.pvpautorelease = value; end }, diff --git a/ElvUI_SLE/modules/backgrounds/options.lua b/ElvUI_SLE/modules/backgrounds/options.lua index 2de7e92..e79896c 100755 --- a/ElvUI_SLE/modules/backgrounds/options.lua +++ b/ElvUI_SLE/modules/backgrounds/options.lua @@ -14,8 +14,6 @@ E.Options.args.sle.args.datatext.args.backgrounds = { type = "group", name = L["Backgrounds"], order = 3, - --childGroups = "select", - --childGroups = 'tab', args = { header = { order = 1, diff --git a/ElvUI_SLE/modules/characterframe/options.lua b/ElvUI_SLE/modules/characterframe/options.lua index c7d71b6..223b7d6 100755 --- a/ElvUI_SLE/modules/characterframe/options.lua +++ b/ElvUI_SLE/modules/characterframe/options.lua @@ -6,7 +6,6 @@ local function configTable() type = 'group', name = L["Armory Mode"], order = 6, - --childGroups = 'select', childGroups = 'tab', args = { intro = { @@ -14,14 +13,10 @@ local function configTable() type = 'description', name = L['Test Description'], }, - --type = "group", - --name = L["Character Frame"], - --order = 12, characterframe = { order = 2, type = 'group', name = L['Character Frame'], - --childGroups = 'tab', args = { header = { order = 1, @@ -45,7 +40,6 @@ local function configTable() type = "group", name = L["Decoration"], order = 55, - --guiInline = true, disabled = function() return not E.private.sle.characterframeoptions.enable end, args = { normalgradient = { @@ -110,7 +104,6 @@ local function configTable() type = "group", name = STAT_AVERAGE_ITEM_LEVEL, order = 66, - -- guiInline = true, disabled = function() return not E.private.sle.characterframeoptions.enable end, args = { show = { @@ -168,7 +161,6 @@ local function configTable() type = "group", name = DURABILITY, order = 77, - -- guiInline = true, disabled = function() return not E.private.sle.characterframeoptions.enable end, args = { show = { @@ -225,7 +217,6 @@ local function configTable() type = "group", name = L["Enchanting"], order = 88, - -- guiInline = true, disabled = function() return not E.private.sle.characterframeoptions.enable end, args = { show = { @@ -308,7 +299,6 @@ local function configTable() type = "group", name = L["Gem Sockets"], order = 99, - -- guiInline = true, disabled = function() return not E.private.sle.characterframeoptions.enable end, args = { show = { diff --git a/ElvUI_SLE/modules/datatexts/options.lua b/ElvUI_SLE/modules/datatexts/options.lua index a77ee7c..d749a43 100755 --- a/ElvUI_SLE/modules/datatexts/options.lua +++ b/ElvUI_SLE/modules/datatexts/options.lua @@ -26,7 +26,6 @@ E.Options.args.sle.args.datatext = { type = "group", name = L["Panels & Dashboard"], order = 10, - --childGroups = "select", childGroups = "tab", args = { panels = { @@ -172,7 +171,6 @@ E.Options.args.sle.args.datatext.args.sldatatext = { type = "group", name = L["S&L Datatexts"], order = 2, - --childGroups = "select", args = { header = { order = 1, diff --git a/ElvUI_SLE/modules/exprepbar/options.lua b/ElvUI_SLE/modules/exprepbar/options.lua index 6e1d469..c4181bb 100755 --- a/ElvUI_SLE/modules/exprepbar/options.lua +++ b/ElvUI_SLE/modules/exprepbar/options.lua @@ -7,7 +7,6 @@ E.Options.args.sle.args.options.args.general.args.exprep = { type = "group", name = L["Xp-Rep Text"], order = 6, - --guiInline = true, args = { header = { order = 1, diff --git a/ElvUI_SLE/modules/marks/options.lua b/ElvUI_SLE/modules/marks/options.lua index 4425894..9a15de0 100755 --- a/ElvUI_SLE/modules/marks/options.lua +++ b/ElvUI_SLE/modules/marks/options.lua @@ -5,13 +5,17 @@ local function configTable() --Main options group E.Options.args.sle.args.options.args.marks = { - order = 10, + order = 4, type = "group", name = L["Raid Marks"], - --childGroups = 'tab', args = { - marks = { + intro = { order = 1, + type = 'description', + name = L['Options for panels providing fast access to raid markers and flares.'], + }, + marks = { + order = 2, type = "group", name = L["Raid Marks"], args = { @@ -86,7 +90,7 @@ E.Options.args.sle.args.options.args.marks = { }, }, flares = { - order = 2, + order = 3, type = "group", name = L["Raid Flares"], args = { @@ -111,14 +115,6 @@ E.Options.args.sle.args.options.args.marks = { get = function(info) return E.db.sle.flares.backdrop end, set = function(info, value) E.db.sle.flares.backdrop = value; RF:Backdrop() end }, - --Reset = { - --order = 4, - --type = 'execute', - --name = L['Restore Defaults'], - --desc = L["Reset these options to defaults"], - --disabled = function() return not E.db.sle.flares.enabled end, - --func = function() E:GetModule('SLE'):Reset(nil, nil, nil, nil, true) end, - --}, spacer = { order = 5, type = 'description', diff --git a/ElvUI_SLE/modules/minimap/options.lua b/ElvUI_SLE/modules/minimap/options.lua index b48dd12..f975cf1 100755 --- a/ElvUI_SLE/modules/minimap/options.lua +++ b/ElvUI_SLE/modules/minimap/options.lua @@ -4,7 +4,7 @@ local function configTable() E.Options.args.sle.args.options.args.minimap = { type = "group", name = MINIMAP_LABEL, - order = 81, + order = 3, args = { header = { order = 1, diff --git a/ElvUI_SLE/modules/options.lua b/ElvUI_SLE/modules/options.lua index d1641e3..4f60876 100755 --- a/ElvUI_SLE/modules/options.lua +++ b/ElvUI_SLE/modules/options.lua @@ -44,45 +44,52 @@ E.Options.args.sle = { intro = { order = 1, type = "description", - name = "Below you can see option groups presented by |cff1784d1Shadow & Light|r.", - --name = L["SLE_DESC"], + name = L["Below you can see option groups presented by |cff1784d1Shadow & Light|r."], }, general = { order = 2, type = "group", name = L["General"], - --guiInline = true, args = { - Reset = { + intro = { order = 1, + type = "description", + name = L["General options of |cff1784d1Shadow & Light|r."], + }, + Reset = { + order = 2, type = 'execute', name = L["Reset All"], desc = L["Reset all Shadow & Light options and movers to their defaults"], func = function() SLE:Reset(true) end, }, space1 = { - order = 2, + order = 3, type = 'description', name = "", }, space2 = { - order = 3, + order = 4, type = 'description', name = "", }, lootwindow = { - order = 5, + order = 6, type = "group", name = L["Loot History"], - --guiInline = true, args = { header = { order = 1, type = "header", name = L["Loot History"], }, - window = { + info = { order = 2, + type = "description", + name = L["Options to tweak Loot History window behaviour."], + }, + window = { + order = 3, type = "toggle", name = L["Auto hide"], desc = L["Automaticaly hide Blizzard loot histroy frame when leaving the instance."], @@ -90,7 +97,7 @@ E.Options.args.sle = { set = function(info, value) E.db.sle.lootwin = value; SLE:LootShow() end }, alpha = { - order = 3, + order = 4, type = "range", name = L['Alpha'], desc = L["Sets alpha of loot histroy frame."], diff --git a/ElvUI_SLE/modules/vehicle/options.lua b/ElvUI_SLE/modules/vehicle/options.lua index 5dddfa5..20e61a4 100755 --- a/ElvUI_SLE/modules/vehicle/options.lua +++ b/ElvUI_SLE/modules/vehicle/options.lua @@ -11,11 +11,15 @@ local function configTable() type = "header", name = L["Enhanced Vehicle Bar"], }, - enable = { + info = { order = 2, + type = "description", + name = L["Use the enhanced vehicle bar based on work by Azilroka"], + }, + enable = { + order = 3, type = "toggle", name = L["Enable"], - desc = L["Use the enhanced vehicle bar based on work by Azilroka"], get = function(info) return E.private.sle.vehicle.enable end, set = function(info, value) E.private.sle.vehicle.enable = value; E:StaticPopup_Show("PRIVATE_RL") end, },