diff --git a/ElvUI_SLE/dev/options.lua b/ElvUI_SLE/dev/options.lua index 5a335b7..1a2ca3d 100755 --- a/ElvUI_SLE/dev/options.lua +++ b/ElvUI_SLE/dev/options.lua @@ -94,11 +94,12 @@ if SLE:Auth() then end) local function configTable() - E.Options.args.sle.args.developer = { + E.Options.args.sle.args.options.args.developer = { order = 999, type = 'group', name = "Developer", - childGroups = 'tree', + --childGroups = 'tree', + childGroups = 'tab', args = { header = { order = 1, @@ -328,7 +329,7 @@ if SLE:Auth() then }, } for i = 1, 40 do - E.Options.args.sle.args.developer.args.userList.args.userList.args[tostring(i)] = { + E.Options.args.sle.args.options.args.developer.args.userList.args.userList.args[tostring(i)] = { type = 'description', order = i, name = function() diff --git a/ElvUI_SLE/modules/autorelease/options.lua b/ElvUI_SLE/modules/autorelease/options.lua index b799854..c647e7a 100755 --- a/ElvUI_SLE/modules/autorelease/options.lua +++ b/ElvUI_SLE/modules/autorelease/options.lua @@ -1,13 +1,25 @@ local E, L, V, P, G, _ = unpack(ElvUI); --Inport: Engine, Locales, PrivateDB, ProfileDB, GlobalDB, Localize Underscore local function configTable() --Main options group -E.Options.args.sle.args.general.args.pvpautorelease = { - order = 2, - type = "toggle", - name = L["PvP Auto Release"], - 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 +E.Options.args.sle.args.options.args.general.args.pvpautorelease = { + type = "group", + name = L["PvP Auto Release"], + order = 4, + args = { + header = { + order = 1, + type = "header", + name = L["PvP Auto Release"], + }, + enable = { + order = 2, + 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 + }, + }, } end diff --git a/ElvUI_SLE/modules/backgrounds/options.lua b/ElvUI_SLE/modules/backgrounds/options.lua index ee8f7ad..c7acd5a 100755 --- a/ElvUI_SLE/modules/backgrounds/options.lua +++ b/ElvUI_SLE/modules/backgrounds/options.lua @@ -13,8 +13,9 @@ local drop = { E.Options.args.sle.args.backgrounds = { type = "group", name = L["Backgrounds"], - order = 10, - childGroups = "select", + 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 75458b4..c7d71b6 100755 --- a/ElvUI_SLE/modules/characterframe/options.lua +++ b/ElvUI_SLE/modules/characterframe/options.lua @@ -5,8 +5,9 @@ local function configTable() E.Options.args.sle.args.characterframeoptions = { type = 'group', name = L["Armory Mode"], - order = 3, - childGroups = 'select', + order = 6, + --childGroups = 'select', + childGroups = 'tab', args = { intro = { order = -1, @@ -20,6 +21,7 @@ local function configTable() order = 2, type = 'group', name = L['Character Frame'], + --childGroups = 'tab', args = { header = { order = 1, @@ -43,7 +45,7 @@ local function configTable() type = "group", name = L["Decoration"], order = 55, - guiInline = true, + --guiInline = true, disabled = function() return not E.private.sle.characterframeoptions.enable end, args = { normalgradient = { @@ -108,7 +110,7 @@ local function configTable() type = "group", name = STAT_AVERAGE_ITEM_LEVEL, order = 66, - guiInline = true, + -- guiInline = true, disabled = function() return not E.private.sle.characterframeoptions.enable end, args = { show = { @@ -166,7 +168,7 @@ local function configTable() type = "group", name = DURABILITY, order = 77, - guiInline = true, + -- guiInline = true, disabled = function() return not E.private.sle.characterframeoptions.enable end, args = { show = { @@ -223,7 +225,7 @@ local function configTable() type = "group", name = L["Enchanting"], order = 88, - guiInline = true, + -- guiInline = true, disabled = function() return not E.private.sle.characterframeoptions.enable end, args = { show = { @@ -306,7 +308,7 @@ local function configTable() type = "group", name = L["Gem Sockets"], order = 99, - guiInline = true, + -- guiInline = true, disabled = function() return not E.private.sle.characterframeoptions.enable end, args = { show = { diff --git a/ElvUI_SLE/modules/chat/options.lua b/ElvUI_SLE/modules/chat/options.lua index e785021..5eabb06 100755 --- a/ElvUI_SLE/modules/chat/options.lua +++ b/ElvUI_SLE/modules/chat/options.lua @@ -1,32 +1,24 @@ local E, L, V, P, G, _ = unpack(ElvUI); --Inport: Engine, Locales, PrivateDB, ProfileDB, GlobalDB, Localize Underscore local function configTable() -E.Options.args.sle.args.chat = { - order = 11, +E.Options.args.sle.args.options.args.general.args.chat = { + order = 7, type = "group", name = L["Chat"], args = { header = { order = 1, type = "header", - name = L["Chat Options"], + name = L["Chat"], }, - general = { + editboxhistory = { order = 2, - type = "group", - name = L["General"], - guiInline = true, - args = { - editboxhistory = { - order = 2, - type = "range", - name = L["Chat Editbox History"], - desc = L["Amount of messages to save. Set to 0 to disable."], - min = 0, max = 20, step = 1, - get = function(info) return E.db.chat.editboxhistory end, - set = function(info, value) E.db.chat.editboxhistory = value; end, - }, - }, + type = "range", + name = L["Chat Editbox History"], + desc = L["Amount of messages to save. Set to 0 to disable."], + min = 0, max = 20, step = 1, + get = function(info) return E.db.chat.editboxhistory end, + set = function(info, value) E.db.chat.editboxhistory = value; end, }, }, } diff --git a/ElvUI_SLE/modules/datatexts/options.lua b/ElvUI_SLE/modules/datatexts/options.lua index 7f70371..7166c15 100755 --- a/ElvUI_SLE/modules/datatexts/options.lua +++ b/ElvUI_SLE/modules/datatexts/options.lua @@ -25,54 +25,62 @@ local chatT = { E.Options.args.sle.args.datatext = { type = "group", name = L["Panels & Dashboard"], - order = 1, - childGroups = "select", + order = 10, + --childGroups = "select", + childGroups = "tab", args = { - header = { + panels = { + type = "group", + name = L["Panels & Dashboard"], order = 1, - type = "header", - name = L["Additional Datatext Panels"], - }, - intro = { - order = 2, - type = "description", - name = L["DP_DESC"] - }, - Reset = { - order = 3, - type = 'execute', - name = L['Restore Defaults'], - desc = L["Reset these options to defaults"], - func = function() E:GetModule('SLE'):Reset(nil, nil, true) end, - }, - spacer = { - order = 4, - type = 'description', - name = "", - }, - dashboard = { - order = 5, - type = "toggle", - name = L["Dashboard"], - desc = L["Show/Hide dashboard."], - get = function(info) return E.db.sle.datatext.dashboard.enable end, - set = function(info, value) E.db.sle.datatext.dashboard.enable = value; DTP:DashboardShow() end - }, - width = { - order = 6, - type = "range", - name = L["Dashboard Panels Width"], - desc = L["Sets size of dashboard panels."], - disabled = function() return not E.db.sle.datatext.dashboard.enable end, - min = 75, max = 200, step = 1, - get = function(info) return E.db.sle.datatext.dashboard.width end, - set = function(info, value) E.db.sle.datatext.dashboard.width = value; DTP:DashWidth() end, + args = { + header = { + order = 1, + type = "header", + name = L["Additional Datatext Panels"], + }, + intro = { + order = 2, + type = "description", + name = L["DP_DESC"] + }, + Reset = { + order = 3, + type = 'execute', + name = L['Restore Defaults'], + desc = L["Reset these options to defaults"], + func = function() E:GetModule('SLE'):Reset(nil, nil, true) end, + }, + spacer = { + order = 4, + type = 'description', + name = "", + }, + dashboard = { + order = 5, + type = "toggle", + name = L["Dashboard"], + desc = L["Show/Hide dashboard."], + get = function(info) return E.db.sle.datatext.dashboard.enable end, + set = function(info, value) E.db.sle.datatext.dashboard.enable = value; DTP:DashboardShow() end + }, + width = { + order = 6, + type = "range", + name = L["Dashboard Panels Width"], + desc = L["Sets size of dashboard panels."], + disabled = function() return not E.db.sle.datatext.dashboard.enable end, + min = 75, max = 200, step = 1, + get = function(info) return E.db.sle.datatext.dashboard.width end, + set = function(info, value) E.db.sle.datatext.dashboard.width = value; DTP:DashWidth() end, + }, + }, }, }, } for k,v in pairs(drop) do -E.Options.args.sle.args.datatext.args[v[1]] = { +E.Options.args.sle.args.datatext.args.panels.args[v[1]] = { order = v[2], type = "group", name = L[k], @@ -123,7 +131,7 @@ E.Options.args.sle.args.datatext.args[v[1]] = { end for k,v in pairs(chatT) do -E.Options.args.sle.args.datatext.args[v[1]] = { +E.Options.args.sle.args.datatext.args.panels.args[v[1]] = { order = v[2], type = "group", name = L[k], @@ -160,11 +168,11 @@ E.Options.args.sle.args.datatext.args[v[1]] = { } end -E.Options.args.sle.args.sldatatext = { +E.Options.args.sle.args.datatext.args.sldatatext = { type = "group", name = L["S&L Datatexts"], order = 2, - childGroups = "select", + --childGroups = "select", args = { header = { order = 1, diff --git a/ElvUI_SLE/modules/equipmanager/options.lua b/ElvUI_SLE/modules/equipmanager/options.lua index dcaed72..6f261fb 100755 --- a/ElvUI_SLE/modules/equipmanager/options.lua +++ b/ElvUI_SLE/modules/equipmanager/options.lua @@ -18,9 +18,9 @@ end local function configTable() -E.Options.args.sle.args.equipmanager = { +E.Options.args.sle.args.options.args.equipmanager = { type = 'group', - order = 13, + order = 7, name = L['Equipment Manager'], args = { header = { diff --git a/ElvUI_SLE/modules/exprepbar/options.lua b/ElvUI_SLE/modules/exprepbar/options.lua index c95b80f..6e1d469 100755 --- a/ElvUI_SLE/modules/exprepbar/options.lua +++ b/ElvUI_SLE/modules/exprepbar/options.lua @@ -3,35 +3,40 @@ local M = E:GetModule('Misc') local function configTable() --Options for Exp/Rep text -E.Options.args.sle.args.exprep = { +E.Options.args.sle.args.options.args.general.args.exprep = { type = "group", name = L["Xp-Rep Text"], order = 6, - guiInline = true, + --guiInline = true, args = { + header = { + order = 1, + type = "header", + name = L["Xp-Rep Text"], + }, explong = { - order = 1, - type = "toggle", - name = L["Full value on Exp Bar"], - desc = L["Changes the way text is shown on exp bar."], - get = function(info) return E.db.sle.exprep.explong end, - set = function(info, value) E.db.sle.exprep.explong = value; M:UpdateExperience() end + order = 2, + type = "toggle", + name = L["Full value on Exp Bar"], + desc = L["Changes the way text is shown on exp bar."], + get = function(info) return E.db.sle.exprep.explong end, + set = function(info, value) E.db.sle.exprep.explong = value; M:UpdateExperience() end }, replong = { - order = 2, - type = "toggle", - name = L["Full value on Rep Bar"], - desc = L["Changes the way text is shown on rep bar."], - get = function(info) return E.db.sle.exprep.replong end, - set = function(info, value) E.db.sle.exprep.replong = value; M:UpdateReputation() end + order = 3, + type = "toggle", + name = L["Full value on Rep Bar"], + desc = L["Changes the way text is shown on rep bar."], + get = function(info) return E.db.sle.exprep.replong end, + set = function(info, value) E.db.sle.exprep.replong = value; M:UpdateReputation() end }, autotrackrep = { - order = 3, - type = "toggle", - name = L["Auto Track Reputation"], - desc = L["Automatically sets reputation tracking to the most recent reputation change."], - get = function(info) return E.private.sle.exprep.autotrack end, - set = function(info, value) E.private.sle.exprep.autotrack = value; end + order = 4, + type = "toggle", + name = L["Auto Track Reputation"], + desc = L["Automatically sets reputation tracking to the most recent reputation change."], + get = function(info) return E.private.sle.exprep.autotrack end, + set = function(info, value) E.private.sle.exprep.autotrack = value; end }, }, } diff --git a/ElvUI_SLE/modules/farm/options.lua b/ElvUI_SLE/modules/farm/options.lua index 45da4c8..deaddb8 100755 --- a/ElvUI_SLE/modules/farm/options.lua +++ b/ElvUI_SLE/modules/farm/options.lua @@ -2,9 +2,9 @@ local F = E:GetModule('Farm') local function configTable() -E.Options.args.sle.args.farm = { +E.Options.args.sle.args.options.args.farm = { type = 'group', - order = 14, + order = 8, name = L['Farm'], args = { header = { diff --git a/ElvUI_SLE/modules/loot/options.lua b/ElvUI_SLE/modules/loot/options.lua index c84d166..d2430c3 100755 --- a/ElvUI_SLE/modules/loot/options.lua +++ b/ElvUI_SLE/modules/loot/options.lua @@ -3,8 +3,8 @@ local LT = E:GetModule('Loot') local function configTable() --Main options group -E.Options.args.sle.args.loot = { - order = 80, +E.Options.args.sle.args.options.args.loot = { + order = 9, type = "group", name = L['Loot Announcer'], args = { diff --git a/ElvUI_SLE/modules/marks/options.lua b/ElvUI_SLE/modules/marks/options.lua index d0c086a..3590141 100755 --- a/ElvUI_SLE/modules/marks/options.lua +++ b/ElvUI_SLE/modules/marks/options.lua @@ -5,159 +5,167 @@ local function configTable() --Main options group E.Options.args.sle.args.marks = { - order = 90, + order = 10, type = "group", name = L["Raid Marks"], + childGroups = 'tab', args = { - marksheader = { + marks = { order = 1, - type = "header", + type = "group", name = L["Raid Marks"], - }, - enabled = { - order = 2, - type = "toggle", - name = L["Enable"], - desc = L["Show/Hide raid marks."], - get = function(info) return E.db.sle.marks.enabled end, - set = function(info, value) E.db.sle.marks.enabled = value; RM:UpdateVisibility() end - }, - backdrop = { - order = 3, - type = "toggle", - name = L["Backdrop"], - disabled = function() return not E.db.sle.marks.enabled end, - get = function(info) return E.db.sle.marks.backdrop end, - set = function(info, value) E.db.sle.marks.backdrop = value; RM: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.marks.enabled end, - func = function() E:GetModule('SLE'):Reset(nil, nil, nil, nil, true) end, - }, - spacer = { - order = 5, - type = 'description', - name = "", - }, - showinside = { - order = 6, - type = "toggle", - name = L["Show only in instances"], - desc = L["Selecting this option will have the Raid Markers appear only while in a raid or dungeon."], - disabled = function() return not E.db.sle.marks.enabled end, - get = function(info) return E.db.sle.marks.showinside end, - set = function(info, value) E.db.sle.marks.showinside = value; RM:UpdateVisibility() end - }, - size = { - order = 7, - type = "range", - name = L['Size'], - desc = L["Sets size of buttons"], - disabled = function() return not E.db.sle.marks.enabled end, - min = 15, max = 30, step = 1, - get = function(info) return E.db.sle.marks.size end, - set = function(info, value) E.db.sle.marks.size = value; RM:FrameButtonsGrowth(); RM:FrameButtonsSize() end, - }, - growth = { - order = 8, - type = "select", - name = L["Direction"], - desc = L["Change the direction of buttons growth from the skull marker"], - disabled = function() return not E.db.sle.marks.enabled end, - get = function(info) return E.db.sle.marks.growth end, - set = function(info, value) E.db.sle.marks.growth = value; RM:FrameButtonsGrowth() end, - values = { - ['RIGHT'] = L["Right"], - ['LEFT'] = L["Left"], - ['UP'] = L["Up"], - ['DOWN'] = L["Down"], + args = { + marksheader = { + order = 1, + type = "header", + name = L["Raid Marks"], + }, + enabled = { + order = 2, + type = "toggle", + name = L["Enable"], + desc = L["Show/Hide raid marks."], + get = function(info) return E.db.sle.marks.enabled end, + set = function(info, value) E.db.sle.marks.enabled = value; RM:UpdateVisibility() end + }, + backdrop = { + order = 3, + type = "toggle", + name = L["Backdrop"], + disabled = function() return not E.db.sle.marks.enabled end, + get = function(info) return E.db.sle.marks.backdrop end, + set = function(info, value) E.db.sle.marks.backdrop = value; RM: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.marks.enabled end, + func = function() E:GetModule('SLE'):Reset(nil, nil, nil, nil, true) end, + }, + spacer = { + order = 5, + type = 'description', + name = "", + }, + showinside = { + order = 6, + type = "toggle", + name = L["Show only in instances"], + desc = L["Selecting this option will have the Raid Markers appear only while in a raid or dungeon."], + disabled = function() return not E.db.sle.marks.enabled end, + get = function(info) return E.db.sle.marks.showinside end, + set = function(info, value) E.db.sle.marks.showinside = value; RM:UpdateVisibility() end + }, + size = { + order = 7, + type = "range", + name = L['Size'], + desc = L["Sets size of buttons"], + disabled = function() return not E.db.sle.marks.enabled end, + min = 15, max = 30, step = 1, + get = function(info) return E.db.sle.marks.size end, + set = function(info, value) E.db.sle.marks.size = value; RM:FrameButtonsGrowth(); RM:FrameButtonsSize() end, + }, + growth = { + order = 8, + type = "select", + name = L["Direction"], + desc = L["Change the direction of buttons growth from the skull marker"], + disabled = function() return not E.db.sle.marks.enabled end, + get = function(info) return E.db.sle.marks.growth end, + set = function(info, value) E.db.sle.marks.growth = value; RM:FrameButtonsGrowth() end, + values = { + ['RIGHT'] = L["Right"], + ['LEFT'] = L["Left"], + ['UP'] = L["Up"], + ['DOWN'] = L["Down"], + }, + }, }, }, - }, -} -E.Options.args.sle.args.flares = { - order = 90, - type = "group", - name = L["Raid Flares"], - args = { - header = { - order = 1, - type = "header", - name = L["Raid Flares"], - }, - enabled = { + flares = { order = 2, - type = "toggle", - name = L["Enable"], - desc = L["Show/Hide Raid Flares."], - get = function(info) return E.db.sle.flares.enabled end, - set = function(info, value) E.db.sle.flares.enabled = value; RF:UpdateVisibility() end - }, - backdrop = { - order = 3, - type = "toggle", - name = L["Backdrop"], - disabled = function() return not E.db.sle.flares.enabled end, - 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', - name = "", - }, - showinside = { - order = 6, - type = "toggle", - name = L["Show only in instances"], - desc = L["Selecting this option will have the Raid Flares appear only while in a raid or dungeon."], - disabled = function() return not E.db.sle.flares.enabled end, - get = function(info) return E.db.sle.flares.showinside end, - set = function(info, value) E.db.sle.flares.showinside = value; RF:UpdateVisibility() end - }, - tooltips = { - order = 7, - type = "toggle", - name = L["Show Tooltip"], - disabled = function() return not E.db.sle.flares.enabled end, - get = function(info) return E.db.sle.flares.tooltips end, - set = function(info, value) E.db.sle.flares.tooltips = value; end - }, - size = { - order = 8, - type = "range", - name = L['Size'], - desc = L["Sets size of buttons"], - disabled = function() return not E.db.sle.flares.enabled end, - min = 15, max = 30, step = 1, - get = function(info) return E.db.sle.flares.size end, - set = function(info, value) E.db.sle.flares.size = value; RF:FrameButtonsGrowth(); RF:FrameButtonsSize() end, - }, - growth = { - order = 9, - type = "select", - name = L["Direction"], - desc = L["Change the direction of buttons growth from the square marker"], - disabled = function() return not E.db.sle.flares.enabled end, - get = function(info) return E.db.sle.flares.growth end, - set = function(info, value) E.db.sle.flares.growth = value; RF:FrameButtonsGrowth() end, - values = { - ['RIGHT'] = L["Right"], - ['LEFT'] = L["Left"], - ['UP'] = L["Up"], - ['DOWN'] = L["Down"], + type = "group", + name = L["Raid Flares"], + args = { + header = { + order = 1, + type = "header", + name = L["Raid Flares"], + }, + enabled = { + order = 2, + type = "toggle", + name = L["Enable"], + desc = L["Show/Hide Raid Flares."], + get = function(info) return E.db.sle.flares.enabled end, + set = function(info, value) E.db.sle.flares.enabled = value; RF:UpdateVisibility() end + }, + backdrop = { + order = 3, + type = "toggle", + name = L["Backdrop"], + disabled = function() return not E.db.sle.flares.enabled end, + 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', + name = "", + }, + showinside = { + order = 6, + type = "toggle", + name = L["Show only in instances"], + desc = L["Selecting this option will have the Raid Flares appear only while in a raid or dungeon."], + disabled = function() return not E.db.sle.flares.enabled end, + get = function(info) return E.db.sle.flares.showinside end, + set = function(info, value) E.db.sle.flares.showinside = value; RF:UpdateVisibility() end + }, + tooltips = { + order = 7, + type = "toggle", + name = L["Show Tooltip"], + disabled = function() return not E.db.sle.flares.enabled end, + get = function(info) return E.db.sle.flares.tooltips end, + set = function(info, value) E.db.sle.flares.tooltips = value; end + }, + size = { + order = 8, + type = "range", + name = L['Size'], + desc = L["Sets size of buttons"], + disabled = function() return not E.db.sle.flares.enabled end, + min = 15, max = 30, step = 1, + get = function(info) return E.db.sle.flares.size end, + set = function(info, value) E.db.sle.flares.size = value; RF:FrameButtonsGrowth(); RF:FrameButtonsSize() end, + }, + growth = { + order = 9, + type = "select", + name = L["Direction"], + desc = L["Change the direction of buttons growth from the square marker"], + disabled = function() return not E.db.sle.flares.enabled end, + get = function(info) return E.db.sle.flares.growth end, + set = function(info, value) E.db.sle.flares.growth = value; RF:FrameButtonsGrowth() end, + values = { + ['RIGHT'] = L["Right"], + ['LEFT'] = L["Left"], + ['UP'] = L["Up"], + ['DOWN'] = L["Down"], + }, + }, }, }, }, diff --git a/ElvUI_SLE/modules/nameplates/options.lua b/ElvUI_SLE/modules/nameplates/options.lua index 8b7f1e6..bfb41ae 100644 --- a/ElvUI_SLE/modules/nameplates/options.lua +++ b/ElvUI_SLE/modules/nameplates/options.lua @@ -2,7 +2,7 @@ local E, L, V, P, G = unpack(ElvUI); local NP = E:GetModule('NamePlates') local function configTable() - E.Options.args.sle.args.nameplate = { + E.Options.args.sle.args.options.args.general.args.nameplate = { type = "group", name = L["NamePlates"], order = 82, diff --git a/ElvUI_SLE/modules/options.lua b/ElvUI_SLE/modules/options.lua index 886797d..d1641e3 100755 --- a/ElvUI_SLE/modules/options.lua +++ b/ElvUI_SLE/modules/options.lua @@ -35,43 +35,72 @@ E.Options.args.sle = { type = "description", name = L["SLE_DESC"], }, - Reset = { - order = 4, - type = 'execute', - name = L["Reset All"], - desc = L["Reset all Shadow & Light options and movers to their defaults"], - func = function() SLE:Reset(true) end, - }, - general = { - order = 5, - type = "group", - name = L["General"], - guiInline = true, - args = { - }, - }, - lootwindow = { - order = 6, + options = { + order = 1, type = "group", - name = L["Loot History"], - guiInline = true, + childGroups = 'tab', + name = SETTINGS, args = { - window = { + intro = { order = 1, - type = "toggle", - name = L["Auto hide"], - desc = L["Automaticaly hide Blizzard loot histroy frame when leaving the instance."], - get = function(info) return E.db.sle.lootwin end, - set = function(info, value) E.db.sle.lootwin = value; SLE:LootShow() end + type = "description", + name = "Below you can see option groups presented by |cff1784d1Shadow & Light|r.", + --name = L["SLE_DESC"], }, - alpha = { + general = { order = 2, - type = "range", - name = L['Alpha'], - desc = L["Sets alpha of loot histroy frame."], - min = 0.2, max = 1, step = 0.1, - get = function(info) return E.db.sle.lootalpha end, - set = function(info, value) E.db.sle.lootalpha = value; SLE:LootShow() end, + type = "group", + name = L["General"], + --guiInline = true, + args = { + Reset = { + order = 1, + 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, + type = 'description', + name = "", + }, + space2 = { + order = 3, + type = 'description', + name = "", + }, + lootwindow = { + order = 5, + type = "group", + name = L["Loot History"], + --guiInline = true, + args = { + header = { + order = 1, + type = "header", + name = L["Loot History"], + }, + window = { + order = 2, + type = "toggle", + name = L["Auto hide"], + desc = L["Automaticaly hide Blizzard loot histroy frame when leaving the instance."], + get = function(info) return E.db.sle.lootwin end, + set = function(info, value) E.db.sle.lootwin = value; SLE:LootShow() end + }, + alpha = { + order = 3, + type = "range", + name = L['Alpha'], + desc = L["Sets alpha of loot histroy frame."], + min = 0.2, max = 1, step = 0.1, + get = function(info) return E.db.sle.lootalpha end, + set = function(info, value) E.db.sle.lootalpha = value; SLE:LootShow() end, + }, + }, + }, + }, }, }, }, diff --git a/ElvUI_SLE/modules/tooltip/options.lua b/ElvUI_SLE/modules/tooltip/options.lua index 1179fba..d8d7bab 100644 --- a/ElvUI_SLE/modules/tooltip/options.lua +++ b/ElvUI_SLE/modules/tooltip/options.lua @@ -2,7 +2,7 @@ local E, L, V, P, G = unpack(ElvUI); local function configTable() --if not E.Options.args.sle.args.tooltip then E.Options.args.sle.args.tooltip = {} end - E.Options.args.sle.args.tooltip = { + E.Options.args.sle.args.options.args.general.args.tooltip = { order = 95, type = "group", get = function(info) return E.db.tooltip[ info[#info] ] end, diff --git a/ElvUI_SLE/modules/uibuttons/options.lua b/ElvUI_SLE/modules/uibuttons/options.lua index d4a9331..382173e 100755 --- a/ElvUI_SLE/modules/uibuttons/options.lua +++ b/ElvUI_SLE/modules/uibuttons/options.lua @@ -3,7 +3,7 @@ local UB = E:GetModule('UIButtons') local function configTable() --UI Buttons -E.Options.args.sle.args.uibuttons = { +E.Options.args.sle.args.options.args.general.args.uibuttons = { type = "group", name = L["UI Buttons"], order = 99, @@ -11,6 +11,11 @@ E.Options.args.sle.args.uibuttons = { header = { order = 1, type = "header", + name = L["UI Buttons"], + }, + intro = { + order = 2, + type = "description", name = L["Additional menu with useful buttons"], }, enabled = { @@ -21,52 +26,57 @@ E.Options.args.sle.args.uibuttons = { get = function(info) return E.db.sle.uibuttons.enable end, set = function(info, value) E.db.sle.uibuttons.enable = value; UB:Start() end }, - options = { - type = "group", - name = L["General"], + space1 = { order = 4, - guiInline = true, + type = 'description', + name = "", + }, + space2 = { + order = 5, + type = 'description', + name = "", + }, + size = { + order = 6, + type = "range", + name = L['Size'], + desc = L["Sets size of buttons"], + min = 12, max = 25, step = 1, + disabled = function() return not E.db.sle.uibuttons.enable end, + get = function(info) return E.db.sle.uibuttons.size end, + set = function(info, value) E.db.sle.uibuttons.size = value; UB:FrameSize() end, + }, + spacing = { + order = 7, + type = "range", + name = L['Button Spacing'], + desc = L['The spacing between buttons.'], + min = 1, max = 10, step = 1, disabled = function() return not E.db.sle.uibuttons.enable end, - args = { - size = { - order = 1, - type = "range", - name = L['Size'], - desc = L["Sets size of buttons"], - min = 12, max = 25, step = 1, - get = function(info) return E.db.sle.uibuttons.size end, - set = function(info, value) E.db.sle.uibuttons.size = value; UB:FrameSize() end, - }, - spacing = { - order = 2, - type = "range", - name = L['Button Spacing'], - desc = L['The spacing between buttons.'], - min = 1, max = 10, step = 1, - get = function(info) return E.db.sle.uibuttons.spacing end, - set = function(info, value) E.db.sle.uibuttons.spacing = value; UB:Positioning(); UB:FrameSize(); UB:MoverSize() end, - }, - mouse = { - order = 3, - type = "toggle", - name = L["Mouse over"], - desc = L["Show on mouse over."], - get = function(info) return E.db.sle.uibuttons.mouse end, - set = function(info, value) E.db.sle.uibuttons.mouse = value; end - }, - position = { - order = 10, - name = L["Buttons position"], - desc = L["Layout for UI buttons."], - type = "select", - values = { - ["uib_hor"] = L['Horizontal'], - ["uib_vert"] = L['Vertical'], - }, - get = function(info) return E.db.sle.uibuttons.position end, - set = function(info, value) E.db.sle.uibuttons.position = value; UB:Positioning(); UB:MoverSize() end, - }, + get = function(info) return E.db.sle.uibuttons.spacing end, + set = function(info, value) E.db.sle.uibuttons.spacing = value; UB:Positioning(); UB:FrameSize(); UB:MoverSize() end, + }, + mouse = { + order = 8, + type = "toggle", + name = L["Mouse over"], + desc = L["Show on mouse over."], + disabled = function() return not E.db.sle.uibuttons.enable end, + get = function(info) return E.db.sle.uibuttons.mouse end, + set = function(info, value) E.db.sle.uibuttons.mouse = value; end + }, + position = { + order = 10, + name = L["Buttons position"], + desc = L["Layout for UI buttons."], + type = "select", + values = { + ["uib_hor"] = L['Horizontal'], + ["uib_vert"] = L['Vertical'], }, + disabled = function() return not E.db.sle.uibuttons.enable end, + get = function(info) return E.db.sle.uibuttons.position end, + set = function(info, value) E.db.sle.uibuttons.position = value; UB:Positioning(); UB:MoverSize() end, }, }, } diff --git a/ElvUI_SLE/modules/unitframes/options.lua b/ElvUI_SLE/modules/unitframes/options.lua index 54a975a..57befb1 100755 --- a/ElvUI_SLE/modules/unitframes/options.lua +++ b/ElvUI_SLE/modules/unitframes/options.lua @@ -16,7 +16,7 @@ local positionValues = { NONE = L['Hide'] }; -E.Options.args.sle.args.unitframes = { +E.Options.args.sle.args.options.args.general.args.unitframes = { type = "group", name = L["UnitFrames"], order = 100, @@ -59,7 +59,7 @@ E.Options.args.sle.args.unitframes = { } if E.myclass == "DRUID" or E.myclass == "WARLOCK" then -E.Options.args.sle.args.unitframes.args.druid = { +E.Options.args.sle.args.options.args.general.args.unitframes.args.druid = { order = 7, type = 'group', name = L["Classbar Energy"], diff --git a/ElvUI_SLE/modules/vehicle/options.lua b/ElvUI_SLE/modules/vehicle/options.lua index 79ec9ba..5dddfa5 100755 --- a/ElvUI_SLE/modules/vehicle/options.lua +++ b/ElvUI_SLE/modules/vehicle/options.lua @@ -1,16 +1,21 @@ local E, L, V, P, G, _ = unpack(ElvUI); --Inport: Engine, Locales, PrivateDB, ProfileDB, GlobalDB, Localize Underscore local function configTable() - E.Options.args.sle.args.vehicle = { + E.Options.args.sle.args.options.args.general.args.vehicle = { type = "group", name = L["Enhanced Vehicle Bar"], - desc = L["Use the enhanced vehicle bar based on work by Azilroka"], order = 84, args = { - enable = { + header = { order = 1, + type = "header", + name = L["Enhanced Vehicle Bar"], + }, + enable = { + order = 2, 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, },