[Feature] Profile options

Annotations.lua

@@ -43,6 +43,8 @@
 ---@field SetSelected function
 ---@field SetFont function
 ---@field button button
+---@field ClearSelected function
+---@field GetSelected function
 
 ---@class CellColorPicker: Frame, BackdropTemplate
 ---@field SetColor function

Cell_UnitFrames.toc

@@ -34,8 +34,9 @@ Core/SlashCommands.lua
 
 Menu/Builder.lua
 Menu/AuraFilterList.lua
-Menu/MenuFrame.lua
 Menu/Menu.lua
+Menu/GeneralTab.lua
+Menu/UnitFramesTab.lua
 
 Widgets/Common.lua
 

Core/Init.lua

@@ -30,5 +30,6 @@ CUF.Builder = {}
 ---@field testMode boolean
 ---@field isMenuOpen boolean
 ---@field isRetail boolean
+---@field selectedTab string
 CUF.vars = {}
 CUF.unitButtons = {}

Core/OnLoad.lua

@@ -20,7 +20,7 @@ local function OnCellInitialUpdateLayout(_layout)
 
     -- Hide Blizzard Unit Frames
     for _, unit in pairs(CUF.constants.UNIT) do
-        if CUF.DB.SelectedLayoutTable()[unit].enabled then
+        if CUF.DB.CurrentLayoutTable()[unit].enabled then
             CUF:HideBlizzardUnitFrame(unit)
         end
     end
@@ -52,7 +52,7 @@ local function OnCellInitialUpdateLayout(_layout)
         function(kind) CUF:Fire("UpdateAppearance", kind) end)
 
     -- Init widgets
-    CUF:Fire("UpdateWidget", CUF.vars.selectedLayout)
+    CUF:Fire("UpdateWidget", CUF.DB.GetMasterLayout())
 
     Cell:UnregisterCallback("UpdateLayout", "CUF_Initial_UpdateLayout")
 end

Data/DBUtil.lua

@@ -13,6 +13,13 @@ DB.PropsToOnlyInit = {
     whitelist = true,
 }
 
+-- Copy ALL settings from one layout to another
+---@param from string
+---@param to string
+function DB.CopyFullLayout(from, to)
+    CellDB.layouts[to].CUFUnits = CUF.Util:CopyDeep(DB.GetLayoutTable(from))
+end
+
 -- Make sure that we have an active CellDB and that it has all the UnitLayouts we need
 ---@return false? noCellDB If CellDB is not present
 function DB.VerifyDB()
@@ -38,4 +45,28 @@ function DB.VerifyDB()
             end
         end
     end
+
+    -- Make sure that we have a valid master layout
+    DB.VerifyMasterLayout()
+end
+
+function DB.VerifyMasterLayout()
+    local masterLayout = DB.GetMasterLayout(true)
+    if masterLayout == "CUFLayoutMasterNone" then return end
+
+    local masterLayoutIsValid = false
+
+    for layoutName, _ in pairs(CellDB.layouts) do
+        if layoutName == masterLayout then
+            masterLayoutIsValid = true
+        end
+    end
+
+    if not masterLayoutIsValid then
+        CUF:Warn("Master layout is not valid, setting to default")
+        DB.SetMasterLayout("default")
+    end
 end
+
+CUF:RegisterCallback("UpdateLayout", "CUF_VerifyMasterLayout", DB.VerifyMasterLayout)
+CUF:RegisterCallback("LoadPageDB", "CUF_VerifyMasterLayout", DB.VerifyMasterLayout)

Data/Database.lua

@@ -5,7 +5,7 @@ local CUF = select(2, ...)
 local DB = CUF.DB
 
 -----------------------------------------
--- Getters
+-- MARK: Layout Getters
 -----------------------------------------
 
 -- Returns CUF UnitLayoutTable from CellDB
@@ -34,45 +34,78 @@ function DB.SelectedLayoutTable()
     return DB.GetLayoutTable(CUF.vars.selectedLayout)
 end
 
--- Returns active layout table
----@return UnitLayoutTable
-function DB.CurrentLayoutTable()
-    return DB.GetLayoutTable(Cell.vars.currentLayout)
-end
-
 ---@param unit Unit?
----@param layout string?
 ---@return WidgetTables
-function DB.GetAllWidgetTables(unit, layout)
-    return DB.GetUnit(layout or CUF.vars.selectedLayout, unit or CUF.vars.selectedUnit).widgets
+function DB.GetSelectedWidgetTables(unit)
+    return DB.GetUnit(CUF.vars.selectedLayout, unit or CUF.vars.selectedUnit).widgets
 end
 
 ---@param which WIDGET_KIND
 ---@param unit Unit?
----@param layout string?
 ---@return WidgetTable
-function DB.GetWidgetTable(which, unit, layout)
-    return DB.GetAllWidgetTables(unit, layout)[which]
+function DB.GetSelectedWidgetTable(which, unit)
+    return DB.GetSelectedWidgetTables(unit)[which]
 end
 
 ---@param which "buffs"|"debuffs"
 ---@param kind "blacklist"|"whitelist"
 ---@param unit Unit?
----@param layout string?
 ---@return table
-function DB.GetAuraFilter(which, kind, unit, layout)
-    return DB.GetAllWidgetTables(unit, layout)[which].filter[kind]
+function DB.GetAuraFilter(which, kind, unit)
+    return DB.GetSelectedWidgetTables(unit)[which].filter[kind]
+end
+
+-- Returns active layout table
+---@return UnitLayoutTable
+function DB.CurrentLayoutTable()
+    return DB.GetLayoutTable(DB.GetMasterLayout())
+end
+
+---@param unit Unit
+---@return WidgetTables
+function DB.GetCurrentWidgetTables(unit)
+    return DB.CurrentLayoutTable()[unit].widgets
+end
+
+---@param which WIDGET_KIND
+---@param unit Unit
+---@return WidgetTable
+function DB.GetCurrentWidgetTable(which, unit)
+    return DB.GetCurrentWidgetTables(unit)[which]
 end
 
 -----------------------------------------
--- Setters
+-- MARK: Layout Setters
 -----------------------------------------
 
 ---@param which "buffs"|"debuffs"
 ---@param kind "blacklist"|"whitelist"
 ---@param value table
 ---@param unit Unit?
----@param layout string?
-function DB.SetAuraFilter(which, kind, value, unit, layout)
-    DB.GetAllWidgetTables(unit, layout)[which].filter[kind] = value
+function DB.SetAuraFilter(which, kind, value, unit)
+    DB.GetSelectedWidgetTables(unit)[which].filter[kind] = value
+end
+
+-----------------------------------------
+-- MARK: General Getters
+-----------------------------------------
+
+---@param rawValue boolean?
+---@return string
+function DB.GetMasterLayout(rawValue)
+    local layout = CUF_DB.masterLayout
+    if layout == "CUFLayoutMasterNone" and not rawValue then
+        return Cell.vars.currentLayout
+    end
+
+    return CUF_DB.masterLayout
+end
+
+-----------------------------------------
+-- MARK: General Setters
+-----------------------------------------
+
+---@param layout string
+function DB.SetMasterLayout(layout)
+    CUF_DB.masterLayout = layout
 end

Debug/Debug.lua

@@ -18,7 +18,7 @@ function Debug:InitDebugWindow()
     self.window:AddVar(
         "selectedLayoutTable", function() CUF:DevAdd(CUF.DB.SelectedLayoutTable(), "selectedLayoutTable") end)
     self.window:AddVar("selectedWidgetTable",
-        function() CUF:DevAdd(CUF.DB.GetAllWidgetTables(), "selectedWidgetTable") end)
+        function() CUF:DevAdd(CUF.DB.GetSelectedWidgetTables(), "selectedWidgetTable") end)
     self.window:AddVar("CUF.vars", function() CUF:DevAdd(CUF.vars, "CUF.vars") end)
     self.window:AddVar("CUF_DB", function() CUF:DevAdd(CUF_DB, "CUF_DB") end)
     self.window:AddVar("Buttons", function() CUF:DevAdd(CUF.unitButtons, "unitButtons") end)

Locales/enUS.lua

@@ -5,6 +5,26 @@ local CUF = select(2, ...)
 local L = Cell.L
 CUF.L = L
 
+-- Tabs
+L.unitFramesTab = "Unit Frames"
+L.generalTab = "General"
+
+L.MasterLayout = "Master Layout"
+L.CUFLayoutMasterNone = "|cffffb5c5None|r"
+L.MasterLayoutTooltip = [[The layout to use for |cFFFFD700Cell UnitFrames|r.
+
+Selecting a specific layout will always use that layout
+regardless of |cFFFFD700Cell|r Auto Switch settings.
+
+Selecting |cffffb5c5None|r will Auto Switch to use the
+currently active layout in |cFFFFD700Cell|r.]]
+
+L.CopyLayoutFrom = "Copy Layout From"
+L.CopyFromTooltip = [[|cFFFF0000This will overwrite all settings in the current layout!|r
+
+Copy settings from another layout]]
+L.CopyFromPopUp = "Copy settings from |cFFFFD700%s|r to |cFFFFD700%s|r?"
+
 -- Units
 L.targettarget = "TargetTarget"
 L.player = "Player"

Menu/Builder.lua

@@ -63,7 +63,7 @@ Builder.MenuOptions = {
 ---@field pageName string
 ---@field options table<MenuOptions>
 
----@param settingsFrame MenuFrame.settingsFrame
+---@param settingsFrame UnitsFramesTab.settingsFrame
 ---@param widgetName WIDGET_KIND
 ---@param ... MenuOptions
 ---@return WidgetMenuPage
@@ -185,7 +185,7 @@ end
 ---@param optionPath string
 ---@param newValue any
 local function HandleWidgetOption(widgetName, optionPath, newValue)
-    local widgetTable = DB.GetWidgetTable(widgetName)
+    local widgetTable = DB.GetSelectedWidgetTable(widgetName)
 
     local function traversePath(tbl, pathParts, value)
         for i = 1, #pathParts - 1 do
@@ -617,7 +617,7 @@ function Builder:CreateTextColorOptions(parent, widgetName, includePowerType)
 
     f.dropdown.Set_DB = function(...)
         HandleWidgetOption(...)
-        if DB.GetWidgetTable(widgetName).color.type == const.ColorType.CUSTOM then
+        if DB.GetSelectedWidgetTable(widgetName).color.type == const.ColorType.CUSTOM then
             f.colorPicker:Show()
         else
             f.colorPicker:Hide()
@@ -631,7 +631,7 @@ function Builder:CreateTextColorOptions(parent, widgetName, includePowerType)
 
     local function LoadPageDB()
         f.colorPicker:SetColor(unpack(HandleWidgetOption(widgetName, "color.rgb")))
-        if DB.GetWidgetTable(widgetName).color.type == const.ColorType.CUSTOM then
+        if DB.GetSelectedWidgetTable(widgetName).color.type == const.ColorType.CUSTOM then
             f.colorPicker:Show()
         else
             f.colorPicker:Hide()
@@ -1186,16 +1186,16 @@ function Builder:CreateAuraFontOptions(parent, widgetName, kind)
     self:AnchorBelow(f.fontOptions.shadowCB, f.fontOptions.outlineDropdown)
 
     f.colorPicker = Cell:CreateColorPicker(f, L["Color"], false, function(r, g, b, a)
-        DB.GetWidgetTable(widgetName).font[kind].rgb[1] = r
-        DB.GetWidgetTable(widgetName).font[kind].rgb[2] = g
-        DB.GetWidgetTable(widgetName).font[kind].rgb[3] = b
+        DB.GetSelectedWidgetTable(widgetName).font[kind].rgb[1] = r
+        DB.GetSelectedWidgetTable(widgetName).font[kind].rgb[2] = g
+        DB.GetSelectedWidgetTable(widgetName).font[kind].rgb[3] = b
     end)
     self:AnchorBelow(f.colorPicker, f.fontOptions.sizeSlider)
 
     local function LoadPageDB()
-        f.colorPicker:SetColor(DB.GetWidgetTable(widgetName).font[kind].rgb[1],
-            DB.GetWidgetTable(widgetName).font[kind].rgb[2],
-            DB.GetWidgetTable(widgetName).font[kind].rgb[3])
+        f.colorPicker:SetColor(DB.GetSelectedWidgetTable(widgetName).font[kind].rgb[1],
+            DB.GetSelectedWidgetTable(widgetName).font[kind].rgb[2],
+            DB.GetSelectedWidgetTable(widgetName).font[kind].rgb[3])
     end
     Handler:RegisterOption(LoadPageDB, widgetName, "CheckBox")