Add some basic default options

* Default Options for Glows are missing
* Options dialog needs a lot of work
* Default Options need to be applied to
  * templates
  * imports

WeakAuras/AuraEnvironment.lua

@@ -357,7 +357,6 @@ local FakeWeakAurasMixin = {
     GetDisplayButton = true,
     Import = true,
     NewDisplayButton = true,
-    OpenTriggerTemplate = true,
     OpenCodeReview = true,
     PickDisplay = true,
     SetMoverSizer = true,
@@ -368,7 +367,6 @@ local FakeWeakAurasMixin = {
     UpdateGroupOrders = true,
     UpdateThumbnail = true,
     validate = true,
-    getDefaultGlow = true,
   },
   blockedTables = {
     AuraWarnings = true,

WeakAuras/DefaultOptions.lua

@@ -1,4 +1,80 @@
---[[ Manual override for the default font and font size until proper options are built ]]
+local AddonName, Private = ...
 
-WeakAuras.defaultFont = "Friz Quadrata TT"
-WeakAuras.defaultFontSize = 12
+-- TODO copied from BuffTrigger2
+local function GetOrCreateSubTable(base, next, ...)
+  if not next then
+    return base
+  end
+
+  base[next] = base[next] or {}
+  return GetOrCreateSubTable(base[next], ...)
+end
+
+local function GetSubTable(base, next, ...)
+  if not base then
+    return nil
+  end
+
+  if not next then
+    return base
+  end
+
+  return GetSubTable(base[next], ...)
+end
+
+function Private.SetDefault(namespace, key, property, type, value)
+  if WeakAurasSaved then
+    local base = GetOrCreateSubTable(WeakAurasSaved, namespace, key, property)
+    if type ~= nil then
+      base.type = type
+    end
+    if value ~= nil then
+      base.value = value
+    end
+    Private.callbacks:Fire("DefaultsChanged")
+  end
+end
+
+function Private.GetDefault(namespace, key, property, default)
+  if WeakAurasSaved then
+    local base = GetSubTable(WeakAurasSaved, namespace, key, property)
+    if base then
+      return base.type, base.value
+    else
+      return nil, default
+    end
+  end
+end
+
+function Private.ApplyDefaults(data, action, mapping)
+  for defaultPath, settingsPath in pairs(mapping) do
+    local namespace, key, property = defaultPath[1], defaultPath[2], defaultPath[3]
+    local savedApplyType, value = Private.GetDefault(namespace, key, property, nil)
+
+    local apply = false
+    -- TODO template ?
+    if action == "import" then
+      apply = savedApplyType == 2 or savedApplyType == 3
+    elseif action == "new" then
+      apply = savedApplyType == 1 or savedApplyType == 3
+    elseif action == "validate" then
+      -- Nothing to do, validation can be done without user templates
+    end
+
+    if apply then
+      local tablePath
+      local property
+      if type(settingsPath) == "table" then
+        tablePath = CopyTable(settingsPath)
+        tablePath[#tablePath] = nil
+        property = settingsPath[#settingsPath]
+      else
+        tablePath ={}
+        property = settingsPath
+      end
+
+      local settingsBase = GetOrCreateSubTable(data, unpack(tablePath))
+      settingsBase[property] = value
+    end
+  end
+end

WeakAuras/RegionTypes/AuraBar.lua

@@ -5,7 +5,7 @@ local SharedMedia = LibStub("LibSharedMedia-3.0");
 local L = WeakAuras.L;
 
 -- Default settings
-local default = {
+local pristineDefault = {
   icon = false,
   desaturate = false,
   iconSource = -1,
@@ -43,8 +43,9 @@ local default = {
   }
 };
 
-WeakAuras.regionPrototype.AddAdjustedDurationToDefault(default);
-WeakAuras.regionPrototype.AddAlphaToDefault(default);
+WeakAuras.regionPrototype.AddAdjustedDurationToDefault(pristineDefault);
+WeakAuras.regionPrototype.AddAlphaToDefault(pristineDefault);
+
 
 local screenWidth, screenHeight = math.ceil(GetScreenWidth() / 20) * 20, math.ceil(GetScreenHeight() / 20) * 20;
 
@@ -137,7 +138,23 @@ local properties = {
   },
 };
 
-WeakAuras.regionPrototype.AddProperties(properties, default);
+WeakAuras.regionPrototype.AddProperties(properties, pristineDefault);
+
+local mappings = {
+  normal = {
+    base = pristineDefault,
+    map = {
+      [{'region', 'aurabar', 'icon'}] = "icon",
+      [{'region', 'aurabar', 'texture'}] = "texture",
+    }
+  }
+}
+
+local defaultsCache = Private.CreateDefaultsCache(mappings)
+
+local function default(action)
+  return defaultsCache:GetDefault(action, "normal")
+end
 
 local function GetProperties(data)
   local overlayInfo = Private.GetOverlayInfo(data);
@@ -1379,4 +1396,4 @@ local function subModify(parent, region)
   region.parent = parent
 end
 
-WeakAuras.RegisterSubRegionType("aurabar_bar", L["Foreground"], subSupports, subCreate, subModify, noop, noop, {}, nil, {}, false);
+WeakAuras.RegisterSubRegionType("aurabar_bar", L["Foreground"], subSupports, subCreate, subModify, noop, noop, noop, nil, {}, false);

WeakAuras/RegionTypes/DefaultsCache.lua

@@ -0,0 +1,114 @@
+if not WeakAuras.IsCorrectVersion() then return end
+local AddonName, Private = ...
+
+-- TODO copied from BuffTrigger2
+local function GetOrCreateSubTable(base, next, ...)
+  if not next then
+    return base
+  end
+
+  base[next] = base[next] or {}
+  return GetOrCreateSubTable(base[next], ...)
+end
+
+local function GetSubTable(base, next, ...)
+  if not base then
+    return nil
+  end
+
+  if not next then
+    return base
+  end
+
+  return GetSubTable(base[next], ...)
+end
+
+local function ApplyDefaults(data, action, mapping)
+  for defaultPath, settingsPath in pairs(mapping) do
+    local namespace, key, property = defaultPath[1], defaultPath[2], defaultPath[3]
+    local savedApplyType, value = Private.GetDefault(namespace, key, property, nil)
+
+    local apply = false
+    -- TODO template ?
+    if action == "import" then
+      apply = savedApplyType == 2 or savedApplyType == 3
+    elseif action == "new" then
+      apply = savedApplyType == 1 or savedApplyType == 3
+    elseif action == "validate" then
+      -- Nothing to do, validation can be done without user templates
+    end
+
+    if apply then
+      local tablePath
+      local property
+      if type(settingsPath) == "table" then
+        tablePath = CopyTable(settingsPath)
+        tablePath[#tablePath] = nil
+        property = settingsPath[#settingsPath]
+      else
+        tablePath ={}
+        property = settingsPath
+      end
+
+      local settingsBase = GetOrCreateSubTable(data, unpack(tablePath))
+      if type(value) == "table" then
+        settingsBase[property] = CopyTable(value)
+      else
+        settingsBase[property] = value
+      end
+    end
+  end
+end
+
+local funcs = {
+  ClearCache = function(self)
+    wipe(self.defaults)
+  end,
+  GetDefault = function(self, action, key)
+    if not self.mappings[key] then
+      error("DefaultsCache:GetDefault called with a wrong key: " .. key, 1)
+      return nil
+    end
+
+    if not action then
+      error("DefaultsCache:GetDefault no action", 1)
+    end
+
+    if not self.defaults[action] or not self.defaults[action][key] then
+      self.defaults[action] = self.defaults[action] or {}
+
+      local mapping = self.mappings[key]
+      local defaults = CopyTable(mapping.base)
+      ApplyDefaults(defaults, action, mapping.map)
+
+      self.defaults[action][key] = defaults
+    end
+
+    return self.defaults[action][key]
+  end,
+  AddDefault = function(self, key, mapping)
+    if not mapping.base or not mapping.map then
+      error("DefaultsCache: mapping has incorrect format, key: " .. key, 1)
+    end
+    self.mappings[key] = mapping
+  end
+}
+
+local function CreateDefaultsCache(mappings)
+  local cache = {}
+  cache.mappings = {}
+  cache.defaults = {}
+
+  for k, func in pairs(funcs) do
+    cache[k] = func
+  end
+
+  for key, mapping in pairs(mappings) do
+    cache:AddDefault(key, mapping)
+  end
+
+  Private.callbacks:RegisterCallback("DefaultsChanged", function() cache:ClearCache() end)
+  return cache
+end
+
+Private.CreateDefaultsCache = CreateDefaultsCache

WeakAuras/RegionTypes/DynamicGroup.lua

@@ -4,7 +4,7 @@ local AddonName, Private = ...
 local WeakAuras = WeakAuras
 local SharedMedia = LibStub("LibSharedMedia-3.0")
 
-local default = {
+local pristineDefault = {
   controlledChildren = {},
   border = false,
   borderColor = {0, 0, 0, 1},
@@ -40,6 +40,10 @@ local default = {
   columnSpace = 1
 }
 
+local function default()
+  return pristineDefault
+end
+
 local controlPointFunctions = {
   ["SetAnchorPoint"] = function(self, point, relativeFrame, relativePoint, offsetX, offsetY)
     self:ClearAllPoints();

WeakAuras/RegionTypes/Group.lua

@@ -4,7 +4,7 @@ local AddonName, Private = ...
 local SharedMedia = LibStub("LibSharedMedia-3.0");
 
 -- Default settings
-local default = {
+local pristineDefault = {
   controlledChildren = {},
   anchorPoint = "CENTER",
   anchorFrameType = "SCREEN",
@@ -20,7 +20,11 @@ local default = {
   borderSize = 2,
   borderBackdrop = "Blizzard Tooltip",
   scale = 1,
-};
+}
+
+local function default()
+  return pristineDefault
+end
 
 -- Called when first creating a new region/display
 local function create(parent)

WeakAuras/RegionTypes/Icon.lua

@@ -11,7 +11,7 @@ end
 -- WoW API
 local _G = _G
 
-local default = {
+local pristineDefault = {
   icon = true,
   desaturate = false,
   iconSource = -1,
@@ -34,7 +34,7 @@ local default = {
   subRegions = {}
 };
 
-WeakAuras.regionPrototype.AddAlphaToDefault(default);
+WeakAuras.regionPrototype.AddAlphaToDefault(pristineDefault);
 
 local screenWidth, screenHeight = math.ceil(GetScreenWidth() / 20) * 20, math.ceil(GetScreenHeight() / 20) * 20;
 
@@ -105,7 +105,24 @@ local properties = {
   }
 };
 
-WeakAuras.regionPrototype.AddProperties(properties, default);
+WeakAuras.regionPrototype.AddProperties(properties, pristineDefault);
+
+local mappings = {
+  normal = {
+    base = pristineDefault,
+    map = {
+      [{'region', 'icon', 'zoom'}] = "zoom",
+      [{'region', 'icon', 'cooldown'}] = "cooldown",
+      [{'region', 'icon', 'cooldownTextDisabled'}] = "cooldownTextDisabled",
+    }
+  },
+}
+
+local defaultsCache = Private.CreateDefaultsCache(mappings)
+
+local function default(action)
+  return defaultsCache:GetDefault(action, "normal")
+end
 
 local function GetProperties(data)
   local result = CopyTable(properties)

WeakAuras/RegionTypes/Model.lua

@@ -5,7 +5,7 @@ local SharedMedia = LibStub("LibSharedMedia-3.0");
 local L = WeakAuras.L;
 
 -- Default settings
-local default = {
+local pristineDefault = {
   model_path = "spells/arcanepower_state_chest.m2", -- arthas is not a thing on classic
   model_fileId = "122968", -- Creature/Arthaslichking/arthaslichking.m2
   modelIsUnit = false,
@@ -66,7 +66,11 @@ local properties = {
   },
 }
 
-WeakAuras.regionPrototype.AddProperties(properties, default);
+WeakAuras.regionPrototype.AddProperties(properties, pristineDefault);
+
+local function default()
+  return pristineDefault
+end
 
 local function GetProperties(data)
   return properties;