lothar.buchholz/Grichelde
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Version 0.7.0-beta

Browse Source 
- order buttons

- use numeric LogLevel over booleans
- exact case option reversed (again)
- smart case handling if replacement is longer than match

- Deletion of all mappings
This commit is contained in:
Lothar Buchholz
2020-06-06 14:33:06 +02:00
parent a29f6486fe
commit cb2c995a82
11 changed files with 564 additions and 357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

367
GricheldeOptions.lua
View File

@@ -2,8 +2,8 @@
local _G = _G
local Grichelde = _G.Grichelde
local nilOrEmpty, pairs, tSize, unpack, find, join, toString, toNumber
= Grichelde.functions.nilOrEmpty, Grichelde.functions.pairs, Grichelde.functions.tSize, Grichelde.functions.unpack, Grichelde.functions.find, Grichelde.functions.join, Grichelde.functions.toString, Grichelde.functions.toNumber
local nilOrEmpty, pairs, find, match, toString, toNumber
= Grichelde.functions.nilOrEmpty, Grichelde.functions.pairs, Grichelde.functions.find, Grichelde.functions.match, Grichelde.functions.toString, Grichelde.functions.toNumber
function Grichelde:CreateOptionsUI()
return {
@@ -29,71 +29,81 @@ function Grichelde:CreateOptionsUI()
name = self.L.Options_Channels_Group_Name,
desc = self:Format(self.L.Options_Channels_Group_Desc, self.L.AddonName),
args = {
say = {
order = 0,
type = "toggle",
name = self.L.Options_Channels_ChannelSay_Name,
desc = self:Format(self.L.Options_Channels_ChannelSay_Desc, self.L.AddonName),
},
emote = {
header = {
order = 1,
type = "toggle",
name = self.L.Options_Channels_ChannelEmote_Name,
desc = self:Format(self.L.Options_Channels_ChannelEmote_Desc, self.L.AddonName),
type = "description",
name = self.L.Options_Channels_Header
},
yell = {
spacer = {
order = 2,
type = "toggle",
name = self.L.Options_Channels_ChannelYell_Name,
desc = self:Format(self.L.Options_Channels_ChannelYell_Desc, self.L.AddonName),
type = "header",
name = ""
},
party = {
order = 3,
type = "toggle",
name = self.L.Options_Channels_ChannelParty_Name,
desc = self:Format(self.L.Options_Channels_ChannelParty_Desc, self.L.AddonName),
},
guild = {
order = 4,
type = "toggle",
name = self.L.Options_Channels_ChannelGuild_Name,
desc = self:Format(self.L.Options_Channels_ChannelGuild_Desc, self.L.AddonName),
},
officer = {
order = 5,
type = "toggle",
name = self.L.Options_Channels_ChannelOfficer_Name,
desc = self:Format(self.L.Options_Channels_ChannelOfficer_Desc, self.L.AddonName),
},
raid = {
order = 6,
type = "toggle",
name = self.L.Options_Channels_ChannelRaid_Name,
desc = self:Format(self.L.Options_Channels_ChannelRaid_Desc, self.L.AddonName),
},
raidWarning = {
order = 7,
type = "toggle",
name = self.L.Options_Channels_ChannelRaidWarning_Name,
desc = self:Format(self.L.Options_Channels_ChannelRaidWarning_Desc, self.L.AddonName),
},
instance = {
order = 8,
type = "toggle",
name = self.L.Options_Channels_ChannelInstance_Name,
desc = self:Format(self.L.Options_Channels_ChannelInstance_Desc, self.L.AddonName),
},
battleground = {
order = 9,
type = "toggle",
name = self.L.Options_Channels_ChannelBattleground_Name,
desc = self:Format(self.L.Options_Channels_ChannelBattleground_Desc, self.L.AddonName),
},
whisper = {
say = {
order = 10,
type = "toggle",
name = self.L.Options_Channels_ChannelWhisper_Name,
desc = self:Format(self.L.Options_Channels_ChannelWhisper_Desc, self.L.AddonName),
name = self.L.Options_Channel_Say_Name,
desc = self:Format(self.L.Options_Channel_Say_Desc, self.L.AddonName),
},
emote = {
order = 11,
type = "toggle",
name = self.L.Options_Channel_Emote_Name,
desc = self:Format(self.L.Options_Channel_Emote_Desc, self.L.AddonName),
},
yell = {
order = 12,
type = "toggle",
name = self.L.Options_Channel_Yell_Name,
desc = self:Format(self.L.Options_Channel_Yell_Desc, self.L.AddonName),
},
party = {
order = 13,
type = "toggle",
name = self.L.Options_Channel_Party_Name,
desc = self:Format(self.L.Options_Channel_Party_Desc, self.L.AddonName),
},
guild = {
order = 14,
type = "toggle",
name = self.L.Options_Channel_Guild_Name,
desc = self:Format(self.L.Options_Channel_Guild_Desc, self.L.AddonName),
},
officer = {
order = 15,
type = "toggle",
name = self.L.Options_Channel_Officer_Name,
desc = self:Format(self.L.Options_Channel_Officer_Desc, self.L.AddonName),
},
raid = {
order = 16,
type = "toggle",
name = self.L.Options_Channel_Raid_Name,
desc = self:Format(self.L.Options_Channel_Raid_Desc, self.L.AddonName),
},
raidWarning = {
order = 17,
type = "toggle",
name = self.L.Options_Channel_RaidWarning_Name,
desc = self:Format(self.L.Options_Channel_RaidWarning_Desc, self.L.AddonName),
},
instance = {
order = 18,
type = "toggle",
name = self.L.Options_Channel_Instance_Name,
desc = self:Format(self.L.Options_Channel_Instance_Desc, self.L.AddonName),
},
battleground = {
order = 19,
type = "toggle",
name = self.L.Options_Channel_Battleground_Name,
desc = self:Format(self.L.Options_Channel_Battleground_Desc, self.L.AddonName),
},
whisper = {
order = 20,
type = "toggle",
name = self.L.Options_Channel_Whisper_Name,
desc = self:Format(self.L.Options_Channel_Whisper_Desc, self.L.AddonName),
},
}
},
@@ -110,7 +120,7 @@ function Grichelde:CreateOptionsUI()
confirm = false,
name = self.L.Options_Replacements_Add_Name,
desc = self.L.Options_Replacements_Add_Desc,
func = function(info) self:AddReplacement(info) end
func = function(info) self:AddEmptyMapping(info) end
},
deleteAll = {
order = 1,
@@ -119,55 +129,89 @@ function Grichelde:CreateOptionsUI()
confirmText = self.L.Options_Replacements_DeleteAll_ConfirmText,
name = self.L.Options_Replacements_DeleteAll_Name,
desc = self.L.Options_Replacements_DeleteAll_Desc,
func = function(info) self:DeleteAllReplacements(info) end
}
func = function(info) self:DeleteAllMappings(info) end
},
header = {
order = 3,
type = "description",
name = self.L.Options_Replacements_Header
},
spacer = {
order = 4,
type = "header",
name = ""
},
}
}
}
}
end
function Grichelde:CreateReplacement(offset)
function Grichelde:CreateMapping(offset)
return {
order = offset or 9999,
type = "group",
name = function(info) return self:MappingName(info) end,
desc = self.L.Options_Replacement_Group_Desc,
desc = self.L.Options_Mapping_Group_Desc,
childGroups = "tree",
args = {
searchText = {
order = 0,
type = "input",
name = self.L.Options_Replacement_SearchText_Name,
desc = self.L.Options_Replacement_SearchText_Desc,
name = self.L.Options_Mapping_SearchText_Name,
desc = self.L.Options_Mapping_SearchText_Desc,
},
replaceText = {
order = 1,
type = "input",
name = self.L.Options_Replacement_ReplaceText_Name,
desc = self.L.Options_Replacement_ReplaceText_Desc,
name = self.L.Options_Mapping_ReplaceText_Name,
desc = self.L.Options_Mapping_ReplaceText_Desc,
},
ignoreCase = {
exactCase = {
order = 2,
type = "toggle",
name = self.L.Options_Replacement_IgnoreCase_Name,
desc = self.L.Options_Replacement_IgnoreCase_Desc,
name = self.L.Options_Mapping_ExactCase_Name,
desc = self.L.Options_Mapping_ExactCase_Desc,
width = "full",
},
consolidate = {
order = 3,
type = "toggle",
name = self.L.Options_Replacement_Consolidate_Name,
desc = self.L.Options_Replacement_Consolidate_Desc,
width = 2
name = self.L.Options_Mapping_Consolidate_Name,
desc = self.L.Options_Mapping_Consolidate_Desc,
width = "full"
},
moveUp = {
order = 10,
type = "execute",
name = self.L.Options_Mapping_MoveUp_Name,
desc = self.L.Options_Mapping_MoveUp_Desc,
width = 0.25,
func = function(info) self:MoveUp(info) end
},
moveDown = {
order = 11,
type = "execute",
name = self.L.Options_Mapping_MoveDown_Name,
desc = self.L.Options_Mapping_MoveDown_Desc,
width = 0.25,
func = function(info) self:MoveDown(info) end
},
spacer = {
order = 18,
type = "description",
name = "",
width = 1,
},
delete = {
order = 4,
order = 19,
type = "execute",
confirm = true,
confirmText = self.L.Options_Replacements_Delete_ConfirmText,
name = self.L.Options_Replacement_Delete_Name,
desc = self.L.Options_Replacement_Delete_Desc,
func = function(info) self:DeleteReplacement(info) end
confirmText = self.L.Options_Mapping_Delete_ConfirmText,
name = self.L.Options_Mapping_Delete_Name,
desc = self.L.Options_Mapping_Delete_Desc,
width = 0.5,
func = function(info) self:DeleteMapping(info) end
},
}
}
@@ -195,17 +239,14 @@ function Grichelde:IsDisabled(info)
end
function Grichelde:MappingName(info)
local option = self.db.profile
local path = 1
while (path <= #info) do
option = option[info[path]]
path = path + 1
end
-- self:TracePrint("MappingName : info")
-- self:TracePrint(info)
local option = self.db.profile.replacements[info[2]]
if nilOrEmpty(option.searchText) and nilOrEmpty(option.replaceText) then
return self.L.Options_Replacement_EmptyMapping
return self.L.Options_Mapping_EmptyMapping
else
return self:Format(self.L.Options_Replacement_Group_Name, option.searchText or "", option.replaceText or "")
return self:Format(self.L.Options_Mapping_Group_Name, option.searchText or "", option.replaceText or "")
end
end
@@ -225,7 +266,7 @@ function Grichelde:RefreshOptions(event)
self:DebugPrint("Refreshing Profile %s on options change: %s", self.db:GetCurrentProfile(), event)
end
self.db.profile.replacements = self:ReorderReplacements(self.db.profile.replacements)
self:ReorderReplacements()
self:RefreshReplacements(self.db.profile.replacements)
end
@@ -246,62 +287,144 @@ function Grichelde:RefreshReplacements(replacementsTable)
for replName, _ in pairs(replacementsTable or {}) do
local _, replNumber = self:SplitOnFirstMatch(replName, "_")
replacements[replName] = self:CreateReplacement(toNumber(replNumber))
replacements[replName] = self:CreateMapping(toNumber(replNumber))
end
self:TracePrint("RefreshReplacements : UI options:")
self:TracePrint(replacements)
-- self:TracePrint("RefreshReplacements : UI options:")
-- self:TracePrint(replacements)
self.dialog:ConfigTableChanged(nil, self.name)
end
function Grichelde:AddReplacement()
local replacements = self.db.profile.replacements
self:DebugPrint("AddReplacements : old DB entries:")
function Grichelde:AddEmptyMapping()
local replacements = self.db.profile.replacements or {}
self:DebugPrint("AddEmptyMapping : old DB entries:")
self:DebugPrint(replacements)
local maxRepl = tSize(replacements)
local newMapping = "replacement_" .. maxRepl
self:DebugPrint("AddReplacement : new replacement key:", newMapping)
local maxRepl = Grichelde.MAPPING_OFFSET
for replName, _ in pairs(replacements) do
local num = match(replName, "^replacement_(%d+)")
if num and maxRepl < toNumber(num) then
maxRepl = toNumber(num)
end
end
-- setting replacements[newMapping] = {} will deactivate defaults
replacements[newMapping].order = maxRepl
self:DebugPrint("AddReplacements : new DB entries:")
local newMapping = "replacement_" .. toString(maxRepl + 1)
self:DebugPrint("AddEmptyMapping : new mapping key:", newMapping)
-- do NOT set self.db.profile.replacements = {} it will break defaults
replacements[newMapping].order = toString(maxRepl + 1) -- will be reordered anyway
self:DebugPrint("AddEmptyMapping : new DB entries:")
self:DebugPrint(replacements)
--self.db.profile.replacements = replacements
self:RefreshOptions("AddReplacement " .. newMapping)
self:RefreshOptions("AddEmptyMapping " .. newMapping)
self.dialog:SelectGroup(self.name, "replacements", newMapping)
end
function Grichelde:DeleteReplacement(info)
self:DebugPrint("DeleteReplacement")
local option = self.db.profile
local path = 1
while (path < #info - 1) do
option = option[info[path]]
--self:DebugPrint(option)
path = path + 1
function Grichelde:MoveUp(info)
self:TracePrint("MoveUp : info")
for i = 0, #info do
self:TracePrint("%d = %s", i, info[i])
end
local optionPath = join(".", unpack(info, 1, #info))
self:DebugPrint("delete option \"%s\": %s", optionPath, toString(option[info[path]]))
option[info[path]] = nil
self:RefreshOptions("DeleteReplacement " .. info[path])
local replacements = self.db.profile.replacements or {}
local currentName = info[2]
local _, replNumber = self:SplitOnFirstMatch(info[path], "_")
self:DebugPrint("MoveUp : \"%s\"", currentName)
self:DebugPrint(replacements[currentName])
local _, replNumber = self:SplitOnFirstMatch(currentName, "_")
local currentOrder = toNumber(replNumber)
-- if not on top
if currentOrder ~= Grichelde.MAPPING_OFFSET then
local swapName = "replacement_" .. toString(currentOrder - 1)
-- swap ordering
self:DebugPrint("swap with option %s", swapName)
replacements[swapName].order = currentOrder
replacements[currentName].order = currentOrder - 1
self:RefreshOptions("MoveUp " .. currentName)
self:DebugPrint("MoveUp : refresh focus on %s", swapName)
self.dialog:SelectGroup(self.name, "replacements", swapName)
else
self:DebugPrint("MoveUp : already on top")
end
end
function Grichelde:MoveDown(info)
self:TracePrint("MoveDown : info")
for i = 0, #info do
self:TracePrint("%d = %s", i, info[i])
end
local replacements = self.db.profile.replacements or {}
local currentName = info[2]
self:DebugPrint("MoveDown : \"%s\"", currentName)
self:DebugPrint(replacements[currentName])
local _, replNumber = self:SplitOnFirstMatch(currentName, "_")
local currentOrder = toNumber(replNumber)
local maxRepl = Grichelde.MAPPING_OFFSET
for replName, _ in pairs(replacements) do
local num = match(replName, "^replacement_(%d+)")
if num and maxRepl < toNumber(num) then
maxRepl = toNumber(num)
end
end
-- if not last element
self:DebugPrint("MoveDown : maxRepl: %d", maxRepl)
if currentOrder < maxRepl then
local swapName = "replacement_" .. toString(currentOrder + 1)
-- swap ordering
self:DebugPrint("swap with option %s", swapName)
replacements[swapName].order = currentOrder
replacements[currentName].order = currentOrder + 1
self:RefreshOptions("MoveDown " .. currentName)
self:DebugPrint("MoveDown : refresh focus on %s", swapName)
self.dialog:SelectGroup(self.name, "replacements", swapName)
else
self:DebugPrint("MoveDown : already at bottom")
end
end
function Grichelde:DeleteMapping(info)
self:TracePrint("DeleteMapping : info")
for i = 0, #info do
self:TracePrint("%d = %s", i, info[i])
end
local currentName = info[2]
self:DebugPrint("delete option: %s", currentName)
self.db.profile.replacements[currentName] = nil
self:RefreshOptions("DeleteMapping " .. currentName)
local _, replNumber = self:SplitOnFirstMatch(currentName, "_")
local newMapping = "replacement_" .. toNumber(replNumber - 1)
self.dialog:SelectGroup(self.name, "replacements", newMapping)
end
function Grichelde:DeleteAllReplacements()
self:DebugPrint("DeleteAllReplacements : ")
function Grichelde:DeleteAllMappings()
self:DebugPrint("DeleteAllMappings")
--self.db.profile.replacements = {}
-- do NOT set self.db.profile.replacements = {} it will break defaults
for replName, _ in pairs(self.db.profile.replacements or {}) do
self.db.profile.replacements[replName] = nil
end
self:AddReplacement()
self:AddEmptyMapping()
self:RefreshOptions("DeleteAllReplacements")
self:RefreshOptions("DeleteAllMappings")
end