initial impl of Renaming, Copying, and Deleting Loadouts, will update for clean up and other comments

Author: Peechey

src/Classes/ConfigSetListControl.lua

@@ -10,15 +10,19 @@ local m_max = math.max
 local ConfigSetListClass = newClass("ConfigSetListControl", "ListControl", function(self, anchor, rect, configTab)
 	self.ListControl(anchor, rect, 16, "VERTICAL", true, configTab.configSetOrderList)
 	self.configTab = configTab
-	self.controls.copy = new("ButtonControl", {"BOTTOMLEFT",self,"TOP"}, {2, -4, 60, 18}, "Copy", function()
-		local configSet = configTab.configSets[self.selValue]
+	self.controls.copy = new("ButtonControl", {"BOTTOMLEFT",self,"TOP"}, {2, -4, 60, 18}, "Copy", function(id) -- id is for Loadouts using copy.onClick()
+		local configSet = configTab.configSets[id or self.selValue]
 		local newConfigSet = copyTable(configSet)
 		newConfigSet.id = 1
 		while configTab.configSets[newConfigSet.id] do
 			newConfigSet.id = newConfigSet.id + 1
 		end
 		configTab.configSets[newConfigSet.id] = newConfigSet
-		self:RenameSet(newConfigSet, true)
+		if not id then
+			self:RenameSet(newConfigSet, true)
+		else
+			return newConfigSet
+		end
 	end)
 	self.controls.copy.enabled = function()
 		return self.selValue ~= nil
@@ -103,6 +107,23 @@ function ConfigSetListClass:OnSelDelete(index, configSetId)
 	end
 end
 
+-- bypass confirmation popup, used by Loadouts
+function ConfigSetListClass:DeleteById(index, configSetId, sync)
+	if #self.list > 1 then
+		t_remove(self.list, index)
+		self.configTab.configSets[configSetId] = nil
+		self.selIndex = nil
+		self.selValue = nil
+		if configSetId == self.configTab.activeConfigSetId then
+			self.configTab:SetActiveConfigSet(self.list[m_max(1, index - 1)])
+		end
+		self.configTab:AddUndoState()
+		if sync then
+			self.configTab.build:SyncLoadouts()
+		end
+	end
+end
+
 function ConfigSetListClass:OnSelKeyDown(index, configSetId, key)
 	if key == "F2" then
 		self:RenameSet(self.configTab.configSets[configSetId])

src/Classes/ItemSetListControl.lua

@@ -11,14 +11,18 @@ local s_format = string.format
 local ItemSetListClass = newClass("ItemSetListControl", "ListControl", function(self, anchor, rect, itemsTab)
 	self.ListControl(anchor, rect, 16, "VERTICAL", true, itemsTab.itemSetOrderList)
 	self.itemsTab = itemsTab
-	self.controls.copy = new("ButtonControl", {"BOTTOMLEFT",self,"TOP"}, {2, -4, 60, 18}, "Copy", function()
-		local newSet = copyTable(itemsTab.itemSets[self.selValue])
+	self.controls.copy = new("ButtonControl", {"BOTTOMLEFT",self,"TOP"}, {2, -4, 60, 18}, "Copy", function(id) -- id is for Loadouts using copy.onClick()
+		local newSet = copyTable(itemsTab.itemSets[id or self.selValue])
 		newSet.id = 1
 		while itemsTab.itemSets[newSet.id] do
 			newSet.id = newSet.id + 1
 		end
 		itemsTab.itemSets[newSet.id] = newSet
-		self:RenameSet(newSet, true)
+		if not id then
+			self:RenameSet(newSet, true)
+		else
+			return newSet
+		end
 	end)
 	self.controls.copy.enabled = function()
 		return self.selValue ~= nil
@@ -118,6 +122,7 @@ end
 
 function ItemSetListClass:OnSelDelete(index, itemSetId)
 	local itemSet = self.itemsTab.itemSets[itemSetId]
+	--ConPrintf("OnSelDelete, itemSet = "..itemSet.title or "Default"..", index = "..index..", itemSetId = "..itemSetId)
 	if #self.list > 1 then
 		main:OpenConfirmPopup("Delete Item Set", "Are you sure you want to delete '"..(itemSet.title or "Default").."'?\nThis will not delete any items used by the set.", "Delete", function()
 			t_remove(self.list, index)
@@ -133,6 +138,25 @@ function ItemSetListClass:OnSelDelete(index, itemSetId)
 	end
 end
 
+-- bypass confirmation popup, used by Loadouts
+function ItemSetListClass:DeleteById(index, itemSetId, sync)
+	local itemSet = self.itemsTab.itemSets[itemSetId]
+	--ConPrintf("DeleteById, itemSet = "..itemSet.title or "Default"..", index = "..index..", itemSetId = "..itemSetId)
+	if #self.list > 1 then
+		t_remove(self.list, index)
+		self.itemsTab.itemSets[itemSetId] = nil
+		self.selIndex = nil
+		self.selValue = nil
+		if itemSetId == self.itemsTab.activeItemSetId then
+			self.itemsTab:SetActiveItemSet(self.list[m_max(1, index - 1)])
+		end
+		self.itemsTab:AddUndoState()
+		if sync then
+			self.itemsTab.build:SyncLoadouts()
+		end
+	end
+end
+
 function ItemSetListClass:OnSelKeyDown(index, itemSetId, key)
 	local itemSet = self.itemsTab.itemSets[itemSetId]
 	if key == "F2" then

src/Classes/PassiveSpecListControl.lua

@@ -10,13 +10,18 @@ local m_max = math.max
 local PassiveSpecListClass = newClass("PassiveSpecListControl", "ListControl", function(self, anchor, rect, treeTab)
 	self.ListControl(anchor, rect, 16, "VERTICAL", true, treeTab.specList)
 	self.treeTab = treeTab
-	self.controls.copy = new("ButtonControl", {"BOTTOMLEFT",self,"TOP"}, {2, -4, 60, 18}, "Copy", function()
-		local newSpec = new("PassiveSpec", treeTab.build, self.selValue.treeVersion)
-		newSpec.title = self.selValue.title
-		newSpec.jewels = copyTable(self.selValue.jewels)
-		newSpec:RestoreUndoState(self.selValue:CreateUndoState())
+	self.controls.copy = new("ButtonControl", {"BOTTOMLEFT",self,"TOP"}, {2, -4, 60, 18}, "Copy", function(spec) -- spec is for Loadouts using copy.onClick()
+		local selValue = spec or self.selValue
+		local newSpec = new("PassiveSpec", treeTab.build, selValue.treeVersion)
+		newSpec.title = selValue.title
+		newSpec.jewels = copyTable(selValue.jewels)
+		newSpec:RestoreUndoState(selValue:CreateUndoState())
 		newSpec:BuildClusterJewelGraphs()
-		self:RenameSpec(newSpec, "Copy Tree", true)
+		if not spec then
+			self:RenameSpec(newSpec, "Copy Tree", true)
+		else
+			return newSpec
+		end
 	end)
 	self.controls.copy.enabled = function()
 		return self.selValue ~= nil
@@ -110,6 +115,25 @@ function PassiveSpecListClass:OnSelDelete(index, spec)
 	end
 end
 
+-- bypass confirmation popup, used by Loadouts
+function PassiveSpecListClass:DeleteByIndex(index, sync)
+	if #self.list > 1 then
+		t_remove(self.list, index)
+		self.selIndex = nil
+		self.selValue = nil
+		if index == self.treeTab.activeSpec then
+			self.treeTab:SetActiveSpec(1)
+		else
+			self.treeTab.activeSpec = isValueInArray(self.list, self.treeTab.build.spec)
+		end
+		self.treeTab.modFlag = true
+		self:UpdateItemsTabPassiveTreeDropdown()
+		if sync then
+			self.treeTab.build:SyncLoadouts()
+		end
+	end
+end
+
 function PassiveSpecListClass:OnSelKeyDown(index, spec, key)
 	if key == "F2" then
 		self:RenameSpec(spec, "Rename Tree")

src/Classes/SkillSetListControl.lua

@@ -11,8 +11,8 @@ local s_format = string.format
 local SkillSetListClass = newClass("SkillSetListControl", "ListControl", function(self, anchor, rect, skillsTab)
 	self.ListControl(anchor, rect, 16, "VERTICAL", true, skillsTab.skillSetOrderList)
 	self.skillsTab = skillsTab
-	self.controls.copy = new("ButtonControl", {"BOTTOMLEFT",self,"TOP"}, {2, -4, 60, 18}, "Copy", function()
-		local skillSet = skillsTab.skillSets[self.selValue]
+	self.controls.copy = new("ButtonControl", {"BOTTOMLEFT",self,"TOP"}, {2, -4, 60, 18}, "Copy", function(id) -- id is for Loadouts using copy.onClick()
+		local skillSet = skillsTab.skillSets[id or self.selValue]
 		local newSkillSet = copyTable(skillSet, true)
 		newSkillSet.socketGroupList = { }
 		for socketGroupIndex, socketGroup in pairs(skillSet.socketGroupList) do
@@ -28,7 +28,11 @@ local SkillSetListClass = newClass("SkillSetListControl", "ListControl", functio
 			newSkillSet.id = newSkillSet.id + 1
 		end
 		skillsTab.skillSets[newSkillSet.id] = newSkillSet
-		self:RenameSet(newSkillSet, true)
+		if not id then
+			self:RenameSet(newSkillSet, true)
+		else
+			return newSkillSet
+		end
 	end)
 	self.controls.copy.enabled = function()
 		return self.selValue ~= nil
@@ -113,6 +117,23 @@ function SkillSetListClass:OnSelDelete(index, skillSetId)
 	end
 end
 
+-- bypass confirmation popup, used by Loadouts
+function SkillSetListClass:DeleteById(index, skillSetId, sync)
+	if #self.list > 1 then
+		t_remove(self.list, index)
+		self.skillsTab.skillSets[skillSetId] = nil
+		self.selIndex = nil
+		self.selValue = nil
+		if skillSetId == self.skillsTab.activeSkillSetId then
+			self.skillsTab:SetActiveSkillSet(self.list[m_max(1, index - 1)])
+		end
+		self.skillsTab:AddUndoState()
+		if sync then
+			self.skillsTab.build:SyncLoadouts()
+		end
+	end
+end
+
 function SkillSetListClass:OnSelKeyDown(index, skillSetId, key)
 	if key == "F2" then
 		self:RenameSet(self.skillsTab.skillSets[skillSetId])