Adds option for blank slots to appear before bag slots

.github/FUNDING.yml

@@ -0,0 +1 @@
+patreon: jaliborc

.gitmodules

@@ -10,3 +10,15 @@
 [submodule "libs/CustomSearch-1.0"]
 	path = libs/CustomSearch-1.0
 	url = https://github.com/Jaliborc/CustomSearch-1.0.git
+[submodule "libs/Poncho-2.0"]
+	path = libs/Poncho-2.0
+	url = https://github.com/Jaliborc/Poncho-2.0.git
+[submodule "libs/Sushi-3.1"]
+	path = libs/Sushi-3.1
+	url = https://github.com/Jaliborc/Sushi-3.1.git
+[submodule "libs/WildAddon-1.0"]
+	path = libs/WildAddon-1.0
+	url = https://github.com/Jaliborc/WildAddon-1.0.git
+[submodule "libs/MutexDelay-1.0"]
+	path = libs/MutexDelay-1.0
+	url = https://github.com/Jaliborc/MutexDelay-1.0.git

Readme.md

@@ -5,6 +5,7 @@ Wildpants includes:
 * Core useful functionality (frame display management, settings setup, custom item events,...)
 * Classes to generate shared UI compoments (item buttons, money display, sort button,...)
 * Common features (tooltip counts, item rulesets, flash find,...)
+* _Load on demand_ configuration menus to control all the aforementioned features
 
 ## For Developers
 Are you a developer? Wildpants provides a rich API for developing plugins or addons that interact with _Bagnon_ or _Combuctor_:

core/settings.lua → Wildpants.lua

@@ -1,13 +1,15 @@
 --[[
-	settings.lua
-		Methods for initializing and sharing settings between characters
+	Wildpants.lua
+		Starts the addon and its settings
 --]]
 
 local ADDON, Addon = ...
-local SETS = ADDON .. '_Sets'
-local CURRENT_VERSION = GetAddOnMetadata(ADDON, 'Version')
+local Addon = LibStub('WildAddon-1.0'):NewAddon(ADDON, Addon, 'LibItemCache-2.0')
+Addon.IsRetail = WOW_PROJECT_ID == WOW_PROJECT_MAINLINE
+Addon.Version = GetAddOnMetadata(ADDON, 'Version')
+
 local L = LibStub('AceLocale-3.0'):GetLocale(ADDON)
-local Cache = LibStub('LibItemCache-2.0')
+local SETS = ADDON .. '_Sets'
 
 local function AsArray(table)
 	return setmetatable(table, {__metatable = 1})
@@ -35,23 +37,23 @@ local FrameDefaults = {
 	money = true, broker = true,
 	bagToggle = true, sort = true, search = true, options = true,
 
-	strata = 'HIGH',
-	scale = 1, alpha = 1,
+	strata = 'HIGH', alpha = 1,
+	scale = Addon.FrameScale or 1,
 	color = {0, 0, 0, 0.5},
 	x = 0, y = 0,
 
 	itemScale = Addon.ItemScale or 1,
 	spacing = 2,
 
-	brokerObject = ADDON .. 'Launcher',
+	brokerObject = Addon.Name .. 'Launcher',
 	hiddenRules = {contain = true},
 	hiddenBags = {},
 
 	rules = AsArray({
-		'all', 'all/all', 'all/normal', 'all/trade', 'all/reagent',
-		'equip', 'equip/all', 'equip/armor', 'equip/weapon', 'equip/trinket',
-		'use', 'use/all', 'use/consume', 'use/enhance',
-		'trade', 'trade/all', 'trade/goods', 'trade/gem', 'trade/glyph', 'trade/recipe',
+		'all', 'all/normal', 'all/trade', 'all/reagent', 'all/keys', 'all/quiver',
+		'equip', 'equip/armor', 'equip/weapon', 'equip/trinket',
+		'use', 'use/consume', 'use/enhance',
+		'trade', 'trade/goods', 'trade/gem', 'trade/glyph', 'trade/recipe',
 		'quest', 'misc',
 	}),
 }
@@ -79,7 +81,7 @@ local ProfileDefaults = {
 	vault = SetDefaults({
 		borderColor = {1, 0, 0.98, 1},
 		point = 'LEFT',
-		columns = 8,
+		columns = 10,
 		x = 95
 	}, FrameDefaults),
 
@@ -91,37 +93,44 @@ local ProfileDefaults = {
 }
 
 
---[[ Settings ]]--
+--[[ Startup ]]--
+
+function Addon:OnEnable()
+  CreateFrame('Frame', nil, InterfaceOptionsFrame):SetScript('OnShow', function()
+    LoadAddOn(Addon.Name .. '_Config')
+  end)
 
-function Addon:StartupSettings()
 	_G[SETS] = SetDefaults(_G[SETS] or {}, {
-		version = CURRENT_VERSION,
+		version = Addon.Version,
 		global = SetDefaults({}, ProfileDefaults),
 		profiles = {},
 
 		resetPlayer = true,
-		displayBank = true, closeBank = true, displayAuction = true, displayGuild = true, displayMail = true, displayTrade = true, displayCraft = true,
+		displayBank = true, closeBank = true, displayAuction = true, displayGuild = true, displayMail = true, displayTrade = true, displayCraft = true, displayScrapping = true,
 		flashFind = true, tipCount = true, fading = true,
 
 		glowAlpha = 0.5,
 		glowQuality = true, glowNew = true, glowQuest = true, glowSets = true, glowUnusable = true,
 
 		emptySlots = true, colorSlots = true,
+		normalColor = {1, 1, 1},
+		keyColor = {1, .9, .19},
+		quiverColor = {1, .87, .68},
+		soulColor = {0.64, 0.39, 1},
+		reagentColor = {1, .87, .68},
 		leatherColor = {1, .6, .45},
 		enchantColor = {0.64, 0.83, 1},
 		inscribeColor = {.64, 1, .82},
 		engineerColor = {.68, .63, .25},
 		tackleColor = {0.42, 0.59, 1},
-		refrigeColor = {1, .5, .5},
+		fridgeColor = {1, .5, .5},
 		gemColor = {1, .65, .98},
 		mineColor = {1, .81, .38},
 		herbColor = {.5, 1, .5},
-		reagentColor = {1, .87, .68},
-		normalColor = {1, 1, 1},
 	})
 
 	self.sets = _G[SETS]
-	self:UpdateSettings()
+  self.sets.version = Addon.Version
 
 	for owner, profile in pairs(self.sets.profiles) do
 		SetDefaults(profile, ProfileDefaults)
@@ -130,30 +139,23 @@ function Addon:StartupSettings()
 	self.profile = self:GetProfile()
 end
 
-function Addon:UpdateSettings()
-	if self.sets.frames then
-		for frame, sets in pairs(self.sets.frames) do
-			self.sets.global[frame] = SetDefaults(sets, self.sets.global[frame])
-		end
-
-		self.sets.frames = nil
-	end
-
-	self.sets.players, self.sets.owners = nil
-	if self.sets.version ~= CURRENT_VERSION then
-		self.sets.version = CURRENT_VERSION
-		self:Print(format(L.Updated, self.sets.version))
-	end
-end
-
 
 --[[ Profiles ]]--
 
 function Addon:SetCurrentProfile(profile)
-	self.sets.profiles[Cache:GetOwnerID()] = profile and SetDefaults(profile, ProfileDefaults)
+	self.sets.profiles[self:GetOwnerID()] = profile and SetDefaults(profile, ProfileDefaults)
 	self.profile = self:GetProfile()
 end
 
 function Addon:GetProfile(owner)
-	return self.sets.profiles[Cache:GetOwnerID(owner)] or self.sets.global
+	return self.sets.profiles[self:GetOwnerID(owner)] or self.sets.global
+end
+
+
+--[[ Options ]]--
+
+function Addon:ShowOptions()
+	if LoadAddOn(ADDON .. '_Config') then
+		Addon.GeneralOptions:Open()
+	end
 end

Wildpants.xml

@@ -1,7 +1,9 @@
-<Ui xmlns="http://www.blizzard.com/wow/ui/">
+<Ui>
 	<Include file="libs\libs.xml"/>
-	<Include file="localization\localization.xml"/>
-	<Include file="core\core.xml"/>
-	<Include file="components\components.xml"/>
+	<Include file="localization\main\localization.xml"/>
+
+	<Script file="Wildpants.lua"/>
+	<Include file="api\api.xml"/>
+	<Include file="classes\classes.xml"/>
 	<Include file="features\features.xml"/>
 </Ui>

Wildpants_Config.xml

@@ -0,0 +1,4 @@
+<Ui>
+	<Include file="localization\config\localization.xml"/>
+	<Include file="config\config.xml"/>
+</Ui>

api/api.xml

@@ -0,0 +1,7 @@
+<Ui>
+	<Script file="owners.lua"/>
+	<Script file="events.lua"/>
+	<Script file="frames.lua"/>
+	<Script file="rules.lua"/>
+	<Script file="sorting.lua"/>
+</Ui>

core/events.lua → api/events.lua

@@ -1,6 +1,6 @@
 --[[
 	events.lua
-		Custom item events for better performance
+		Custom ace item events for better performance
 
 	BAG_UPDATE_SIZE
 	args: bag
@@ -9,32 +9,33 @@
 	BAG_UPDATE_CONTENT
 	args: bag
 		called when the items of a bag change
-
-	BANK_OPENED
-	args: none
-		called when the bank has opened and all of other events have been fired
-
 --]]
 
-local _, Addon = ...
-local Events = Addon:NewClass('Events')
+local ADDON, Addon = ...
+local Events = Addon:NewModule('Events')
 
 
 --[[ Events ]]--
 
-function Events:PLAYER_LOGIN()
+function Events:OnEnable()
+	self.firstVisit = true
+	self.sizes, self.types, self.queue = {}, {}, {}
+
+	if REAGENTBANK_CONTAINER then
+		self:RegisterEvent('PLAYERREAGENTBANKSLOTS_CHANGED')
+		self:RegisterEvent('REAGENTBANK_PURCHASED')
+	end
+
 	self:RegisterEvent('BAG_UPDATE')
+	self:RegisterEvent('BAG_UPDATE_DELAYED', 'UpdateBags')
 	self:RegisterEvent('PLAYERBANKSLOTS_CHANGED')
-	self:RegisterEvent('PLAYERREAGENTBANKSLOTS_CHANGED')
-	self:RegisterEvent('REAGENTBANK_PURCHASED')
-	self:RegisterEvent('BANKFRAME_OPENED')
+	self:RegisterMessage('CACHE_BANK_OPENED')
 	self:UpdateSize(BACKPACK_CONTAINER)
 	self:UpdateBags()
 end
 
 function Events:BAG_UPDATE(event, bag)
-	self:UpdateBags()
-	self:UpdateContent(bag)
+	self.queue[bag] = true
 end
 
 function Events:PLAYERBANKSLOTS_CHANGED()
@@ -50,15 +51,16 @@ function Events:REAGENTBANK_PURCHASED()
 	self:UpdateContent(REAGENTBANK_CONTAINER)
 end
 
-function Events:BANKFRAME_OPENED()
+function Events:CACHE_BANK_OPENED()
 	if self.firstVisit then
 		self.firstVisit = nil
 		self:UpdateSize(BANK_CONTAINER)
-		self:UpdateSize(REAGENTBANK_CONTAINER)
 		self:UpdateBankBags()
-	end
 
-	self:SendMessage('BANK_OPENED')
+		if REAGENTBANK_CONTAINER then
+			self:UpdateSize(REAGENTBANK_CONTAINER)
+		end
+	end
 end
 
 
@@ -70,10 +72,14 @@ function Events:UpdateBags()
 			self:UpdateType(bag)
 		end
 	end
+
+	for bag in pairs(self.queue) do
+		self:UpdateContent(bag)
+	end
 end
 
 function Events:UpdateBankBags()
-	for bag = 1, NUM_BAG_SLOTS + GetNumBankSlots() do
+	for bag = 1, NUM_BAG_SLOTS + NUM_BANKBAGSLOTS do
 		if not self:UpdateSize(bag) then
 			self:UpdateType(bag)
 		end
@@ -88,8 +94,8 @@ function Events:UpdateSize(bag)
 		local _, kind = GetContainerNumFreeSlots(bag)
 		self.types[bag] = kind
 		self.sizes[bag] = new
-
-		self:SendMessage('BAG_UPDATE_SIZE', bag)
+		self.queue[bag] = nil
+		self:SendSignal('BAG_UPDATE_SIZE', bag)
 		return true
 	end
 end
@@ -100,17 +106,11 @@ function Events:UpdateType(bag)
 
 	if old ~= new then
 		self.types[bag] = new
-		self:SendMessage('BAG_UPDATE_CONTENT', bag)
+		self:UpdateContent(bag)
 	end
 end
 
 function Events:UpdateContent(bag)
-	self:SendMessage('BAG_UPDATE_CONTENT', bag)
+	self.queue[bag] = nil
+	self:SendSignal('BAG_UPDATE_CONTENT', bag)
 end
-
-
---[[ Startup ]]--
-
-Events.firstVisit = true
-Events.sizes, Events.types = {}, {}
-Events:RegisterEvent('PLAYER_LOGIN')