Implementation of Empty Bags Slot Visibility Control

config/localization/cn.lua

@@ -48,6 +48,7 @@ L.Layer = '层级'
 L.BagBreak = '背包分散'
 L.ReverseBags = '反向背包排列'
 L.ReverseSlots = '反向物品排列'
+L.HideEmptySlot = '隐藏空槽'
 
 L.Color = '背景颜色'
 L.BorderColor = '边框颜色'

config/localization/de.lua

@@ -35,6 +35,7 @@ L.Layer = 'Ebene'
 L.BagBreak = 'Trennen der Taschen aktivieren'
 L.ReverseBags = 'Taschen umkehren'
 L.ReverseSlots = 'Slots umkehren'
+L.HideEmptySlot = 'Leere Plätze verbergen'
 
 L.Color = 'Farbe des Fensters'
 L.BorderColor = 'Farbe des Fensterrands'

config/localization/en.lua

@@ -52,6 +52,7 @@ L.BagBreak = 'Bag Break'
 L.ByType = 'By Type'
 L.ReverseBags = 'Reverse Bag Order'
 L.ReverseSlots = 'Reverse Slot Order'
+L.HideEmptySlot = 'Hide empty slots'
 
 L.Color = 'Background Color'
 L.BorderColor = 'Border Color'

config/localization/es.lua

@@ -48,6 +48,7 @@ L.Layer = 'Capa'
 L.BagBreak = 'Espacio entre bolsas'
 L.ReverseBags = 'Invertir bolsas'
 L.ReverseSlots = 'Invertir ranuras'
+L.HideEmptySlot = 'Ocultar espacios vacíos'
 
 L.Color = 'Color de fondo'
 L.BorderColor = 'Color de borde'

config/localization/fr.lua

@@ -47,6 +47,7 @@ L.Layer = 'Couche'
 L.BagBreak = 'Séparation entre les sacs'
 L.ReverseBags = 'Inverser ordre des sacs'
 L.ReverseSlots = 'Inverser ordre de tri'
+L.HideEmptySlot = 'Cacher les emplacements vides'
 
 L.Color = 'Couleur de la fenêtre'
 L.BorderColor = 'Couleur de bordure'

config/localization/it.lua

@@ -46,6 +46,7 @@ L.Layer = 'Livello'
 L.BagBreak = 'Separazione tra Borse'
 L.ReverseBags = 'Inverti le Borse'
 L.ReverseSlots = 'Inverti gli Scomparti'
+L.HideEmptySlot = 'Nascondi gli spazi vuoti'
 
 L.Color = 'Colore della Finestra'
 L.BorderColor = 'Colore del Bordo'

config/localization/ko.lua

@@ -46,6 +46,7 @@ L.Layer = '레이어'
 L.BagBreak = '가방 별로 구분하여 표시'
 L.ReverseBags = '가방 순서 반대로'
 L.ReverseSlots = '칸 순서 반대로'
+L.HideEmptySlot = '빈 슬롯 숨기기'
 
 L.Color = '배경 색상'
 L.BorderColor = '테두리 색상'

config/localization/nl.lua

@@ -49,6 +49,7 @@ L.Layer = 'Laag'
 L.BagBreak = 'Tas Onderbreken'
 L.ReverseBags = 'Omgekeerde Tasvolgorde'
 L.ReverseSlots = 'Omgekeerde Slotvolgorde'
+L.HideEmptySlot = 'Verberg lege plaatsen'
 
 L.Color = 'Achtergrondkleur'
 L.BorderColor = 'Randkleur'

config/localization/pt.lua

@@ -44,6 +44,8 @@ L.Layer = 'Camada'
 L.BagBreak = 'Quebras entre Sacos'
 L.ReverseBags = 'Inverter Sacos'
 L.ReverseSlots = 'Inverter Itens'
+L.HideEmptySlot = 'Ocultar espaços vazios'
+
 L.Color = 'Cor de Fundo'
 L.BorderColor = 'Cor do Bordo'
 L.Strata = 'Camada'

config/localization/ru.lua

@@ -45,6 +45,7 @@ L.Layer = 'Слой'
 L.BagBreak = 'Каждая сумка с новой строки'
 L.ReverseBags = 'Обратный порядок сумок'
 L.ReverseSlots = 'Обратный порядок ячеек'
+L.HideEmptySlot = 'Скрыть пустые слоты'
 
 L.Color = 'Цвет фона окна'
 L.BorderColor = 'Цвет границы окна'

config/localization/tw.lua

@@ -37,6 +37,7 @@ L.Layer = '階層'
 L.BagBreak = '根據背包顯示'
 L.ReverseBags = '反轉背包順序'
 L.ReverseSlots = '反轉槽位順序'
+L.HideEmptySlot = '隱藏空槽'
 
 L.Color = '背景顏色'
 L.BorderColor = '邊框顏色'

config/panels/frame.lua

@@ -85,7 +85,7 @@ function Frames:Populate()
       self:AddChoice{arg = 'bagBreak', {key = 0, text = NONE}, {key = 1, text = L.ByType}, {key = 2, text = ALWAYS}}
       self:AddPercentage('itemScale', 20, 200)
       self:AddSlider('spacing', -15, 15)
-  
+
       if Config.columns then
         self:AddSlider('columns', 1, 50)
       end

core/api/settings.lua

@@ -24,6 +24,10 @@ local FrameDefaults = {
 	hiddenBags = {}, lockedSlots = {},
 	itemScale = Addon.ItemScale or 1,
 	spacing = 2, bagBreak = 0,
+
+	hiddenRules = {contain = true},
+	hiddenBags = {},
+	hiddenBagsSlots = {},
 
 	brokerObject = ADDON .. 'Launcher',
 	rules = AsArray({
@@ -110,7 +114,7 @@ function Settings:OnEnable()
 	for realm, owners in pairs(Addon.sets.profiles) do
 		for id, profile in pairs(owners) do
 			self:SetDefaults(profile, ProfileDefaults)
-			
+
 			for frame, options in pairs(profile) do
 				if type(options) == 'table' and options.bagBreak == true then
 					options.bagBreak = 2

core/classes/bag.lua

@@ -139,19 +139,24 @@ end
 function Bag:OnClick(button)
 	if button == 'RightButton' then
 		self:ShowFilters()
-	elseif (self.owned and not CursorHasItem()) or self:IsCached() then
-		self:Toggle()
-	elseif CursorHasItem() then
-		if self.slot then
-			PutItemInBag(self.slot)
-		else
-			PutItemInBackpack()
+	elseif button == 'MiddleButton'then
+		if (self.owned and not CursorHasItem()) or self:IsCached() then
+			self:ToggleEmptySlots()
 		end
 	else
-		self:Purchase()
+		if (self.owned and not CursorHasItem()) or self:IsCached() then
+			self:Toggle()
+		elseif CursorHasItem() then
+			if self.slot then
+				PutItemInBag(self.slot)
+			else
+				PutItemInBackpack()
+			end
+			self:Purchase()
+		end
 	end
-
 	self:UpdateToggle()
+
 end
 
 function Bag:OnDrag()
@@ -190,6 +195,16 @@ function Bag:Toggle()
 	self:SetFocus(true)
 end
 
+function Bag:ToggleEmptySlots()
+	local profile = self:GetProfile()
+	local emptySlots = profile.hiddenBagsSlots
+	local slot = profile.exclusiveReagent and not emptySlots[REAGENTBANK_CONTAINER] and REAGENTBANK_CONTAINER or self:GetID()
+	emptySlots[slot] = not emptySlots[slot]
+	self:SendFrameSignal('FILTERS_CHANGED')
+	self:SetFocus(true)
+
+end
+
 function Bag:ShowFilters()
 	if self:GetID() >= BACKPACK_CONTAINER and not self:IsCached() and ContainerFrame1FilterDropDown then
 		ContainerFrame1FilterDropDown:SetParent(self)
@@ -296,6 +311,7 @@ function Bag:UpdateTooltip()
 	-- instructions
 	if self.owned then
 		GameTooltip:AddLine((self:GetChecked() and L.TipHideBag or L.TipShowBag):format(L.Click))
+		GameTooltip:AddLine((self.frame:IsShowingEmptySlots(bag)and L.TipHideEmptySlots or L.TipShowEmptySlots):format(L.MiddleClickPhrase))
 	elseif not self:IsCached() then
 		GameTooltip:AddLine(L.TipPurchaseBag:format(L.Click))
 		SetTooltipMoney(GameTooltip, bag == REAGENTBANK_CONTAINER and GetReagentBankCost() or GetBankSlotCost())

core/classes/frameBase.lua

@@ -98,6 +98,10 @@ function Frame:IsShowingBag(bag)
 	return not self:GetProfile().hiddenBags[bag]
 end
 
+function Frame:IsShowingEmptySlots(bag)
+	return not self:GetProfile().hiddenBagsSlots[bag]
+end
+
 function Frame:IsShowingItem(bag, slot)
 	local info = self:GetItemInfo(bag, slot)
 	local rule = Addon.Rules:Get(self.subrule or self.rule)
@@ -107,6 +111,9 @@ function Frame:IsShowingItem(bag, slot)
 			return
 		end
 	end
+	if not self:IsShowingEmptySlots(bag) and info.itemID == nil then
+		return
+	end
 
 	return self:IsShowingQuality(info.quality)
 end

core/localization/cn.lua

@@ -31,7 +31,8 @@ L.SelectCharacter = '选择角色'
 L.ConfirmDelete = '确定要删除 %s 的缓存数据？'
 
 --interactions
-L.Click = '点击'
+L.Click = '左键点击'
+L.MiddleClickPhrase = '中键点击'
 L.Drag = '<拖动>'
 L.LeftClick = '<左击>'
 L.RightClick = '<右击>'
@@ -56,6 +57,8 @@ L.TipWithdraw = '%s取出（%s剩余）。'
 L.TipFrameToggle = '%s切换其他窗口。'
 L.TipHideBag = '%s隐藏此背包。'
 L.TipHideBags = '%s隐藏背包显示。'
+L.TipHideEmptySlots = '%s 以隐藏空的插槽。'
+L.TipShowEmptySlots = '%s 以显示空的插槽。'
 L.TipHideSearch = '%s停止搜索。'
 L.TipMove = '%s移动。'
 L.TipPurchaseBag = '%s购买此银行空位。'

core/localization/en.lua

@@ -26,7 +26,8 @@ L.TitleBank = '%s\'s Bank'
 L.TitleVault = '%s\'s Void Storage'
 
 --interactions
-L.Click = 'Click'
+L.Click = 'Left Click'
+L.MiddleClickPhrase = 'Middle Click'
 L.Drag = '<Drag>'
 L.LeftClick = '<Left-Click>'
 L.RightClick = '<Right-Click>'
@@ -56,6 +57,8 @@ L.TipPurchaseBag = '%s to purchase this bank slot.'
 L.TipResetPlayer = '%s to return to the current character.'
 L.TipShowBag = '%s to show this bag.'
 L.TipShowBags = '%s to show the bags display.'
+L.TipHideEmptySlots = '%s to hide empty slots.'
+L.TipShowEmptySlots = '%s to show empty slots.'
 L.TipShowBank = '%s to toggle your bank.'
 L.TipShowInventory = '%s to toggle your inventory.'
 L.TipShowOptions = '%s to open the options menu.'

core/localization/es.lua

@@ -31,7 +31,8 @@ L.SelectCharacter = 'Seleccionar personaje'
 L.ConfirmDelete = '¿Estás seguro de querer eliminar los datos guardados de %s?'
 
 --interactions
-L.Click = 'Clic'
+L.Click = 'Clic izquierdo'
+L.MiddleClickPhrase = 'Clic medio'
 L.Drag = '<Arrastrar>'
 L.LeftClick = '<Clic Izquierdo>'
 L.RightClick = '<Clic Derecho>'
@@ -55,6 +56,8 @@ L.TipWithdraw = '%s para retirar (%s restantes).'
 L.TipFrameToggle = '%s para mostrar otras ventanas.'
 L.TipHideBag = '%s para ocultar esta bolsa.'
 L.TipHideBags = '%s para ocultar las bolsas.'
+L.TipHideEmptySlots = '%s para ocultar las ranuras vacías.'
+L.TipShowEmptySlots = '%s para mostrar las ranuras vacías.'
 L.TipHideSearch = '%s para dejar de buscar.'
 L.TipMove = '%s para mover.'
 L.TipPurchaseBag = '%s para comprar esta ranura.'

core/localization/fr.lua

@@ -31,7 +31,8 @@ L.SelectCharacter = 'Choisir Personnage'
 L.ConfirmDelete = 'Etes-vous sur de vouloir supprimer le cache de %s ?'
 
 --interactions
-L.Click = 'Cliquez'
+L.Click = 'Cliquez gauche'
+L.MiddleClickPhrase = 'Cliquez millieu'
 L.Drag = '<Saisir>'
 L.LeftClick = '<Clic Gauche>'
 L.RightClick = '<Clic Droit>'
@@ -61,6 +62,8 @@ L.PurchaseBag = '%s pour acheter cet emplacement de sac.'
 L.TipResetPlayer = '%s pour retourner sur le personnage actuel.'
 L.TipShowBag = '%s pour afficher ce sac.'
 L.TipShowBags = '%s pour afficher la fenêtre de vos sacs.'
+L.TipHideEmptySlots = '%s pour cacher les emplacements vides.'
+L.TipShowEmptySlots = '%s pour afficher les emplacements vides.'
 L.TipShowBank = '%s pour afficher/cacher votre banque.'
 L.TipShowInventory = '%s pour afficher/cacher votre inventaire.'
 L.TipShowOptions = '%s pour ouvrir le menu des options.'

core/localization/it.lua

@@ -31,7 +31,8 @@ L.SelectCharacter = 'Seleziona Personaggio'
 L.ConfirmDelete = 'Sei sicuro di voler eliminare i dati di %s presenti nella cache?'
 
 --interactions
-L.Click = 'Clicca'
+L.Click = 'Clic sinistro'
+L.MiddleClickPhrase = 'Clic centrale'
 L.Drag = '<Trascina>'
 L.LeftClick = '<Clic Sinistro>'
 L.RightClick = '<Clic Destro>'
@@ -56,6 +57,8 @@ L.TipWithdraw = '%s per prelevare (%s rimanenti).'
 L.TipFrameToggle = "per attivare un'altra finestra."
 L.TipHideBag = '%s per nascondere questa borsa.'
 L.TipHideBags = '%s per nascondere il riquadro delle borse.'
+L.TipHideEmptySlots = '%s per nascondere gli slot vuoti.'
+L.TipShowEmptySlots = '%s per mostrare gli slot vuoti.'
 L.TipHideSearch = '%s per nascondere la barra di ricerca.'
 L.TipMove = '%s per muovere.'
 L.PurchaseBag = '%s per comprare questo spazio di Banca.'

core/localization/ko.lua

@@ -31,7 +31,8 @@ L.SelectCharacter = '캐릭터 선택'
 L.ConfirmDelete = '%s의 캐시된 데이터를 삭제하시겠습니까?'
 
 --interactions
-L.Click = '클릭'
+L.Click = '왼쪽 클릭'
+L.MiddleClickPhrase = '가운데 클릭'
 L.Drag = '<드래그>'
 L.LeftClick = '<좌-클릭>'
 L.RightClick = '<우-클릭>'
@@ -62,6 +63,8 @@ L.TipPurchaseBag = '은행 슬롯을 구매하려면 %s'
 L.TipResetPlayer = '현재 캐릭터로 돌아가려면 %s'
 L.TipShowBag = '가방을 보려면 %s'
 L.TipShowBags = '가방을 표시하려면 %s'
+L.TipHideEmptySlots = '%s 빈 슬롯 숨기기.'
+L.TipShowEmptySlots = '%s 빈 슬롯 보이기.'
 L.TipShowBank = '은행을 보려면 %s'
 L.TipShowInventory = '소지품을 보려면 %s'
 L.TipShowOptions = '설정 메뉴를 열려면 %s'

core/localization/nl.lua

@@ -31,7 +31,8 @@ L.SelectCharacter = 'Selecteer Personage'
 L.ConfirmDelete = 'Weet je zeker dat je de cachegegevens van %s wilt verwijderen?'
 
 --interactions
-L.Click = 'Klik'
+L.Click = 'Linkerklik'
+L.MiddleClickPhrase = 'Middenklik'
 L.Drag = '<Slepen>'
 L.LeftClick = '<Linkermuisklik>'
 L.RightClick = '<Rechtermuisklik>'
@@ -62,6 +63,8 @@ L.TipPurchaseBag = '%s om deze bankplaats te kopen.'
 L.TipResetPlayer = '%s om terug te keren naar het huidige personage.'
 L.TipShowBag = '%s om deze tas te tonen.'
 L.TipShowBags = '%s om het tassenscherm te tonen.'
+L.TipHideEmptySlots = '%s om lege slots te verbergen.'
+L.TipShowEmptySlots = '%s om lege slots te tonen.'
 L.TipShowBank = '%s om je bank te wisselen.'
 L.TipShowInventory = '%s om je inventaris te wisselen.'
 L.TipShowOptions = '%s om het optiemenu te openen.'

core/localization/pt.lua

@@ -31,7 +31,8 @@ L.SelectCharacter = 'Selecionar Personagem'
 L.ConfirmDelete = 'Tem certeza de que deseja apagar os dados em cache de %s?'
 
 --interactions
-L.Click = 'Click'
+L.Click = 'Clique esquerdo'
+L.MiddleClickPhrase = 'Clique do meio'
 L.Drag = '<Arraste>'
 L.LeftClick = '<Clique Esquerdo>'
 L.RightClick = '<Clique Direito>'
@@ -55,6 +56,8 @@ L.TipWithdraw = '%s para retirar (%s restantes).'
 L.TipFrameToggle = '%s para alternar outras janelas.'
 L.TipHideBag = '%s para esconder o saco.'
 L.TipHideBags = '%s para esconder os sacos.'
+L.TipHideEmptySlots = '%s para ocultar os slots vazios.'
+L.TipShowEmptySlots = '%s para mostrar os slots vazios.'
 L.TipHideSearch = '%s para esconder o campo de pesquisa.'
 L.TipMove = '%s para mover.'
 L.TipPurchaseBag = '%s para comprar uma ranhura no banco.'

core/localization/ru.lua

@@ -31,7 +31,8 @@ L.SelectCharacter = 'Выберите персонажа'
 L.ConfirmDelete = 'Удалить кэшированные данные %s?'
 
 --interactions
-L.Click = 'Клик'
+L.Click = 'Левый клик'
+L.MiddleClickPhrase = 'Средний клик'
 L.Drag = '<Двигать>'
 L.LeftClick = '<Левый клик>'
 L.RightClick = '<Правый клик>'
@@ -62,6 +63,8 @@ L.TipPurchaseBag = '%s — приобрести банковскую ячейк
 L.TipResetPlayer = '%s — вернуться к текущему персонажу.'
 L.TipShowBag = '%s — показать эту сумку.'
 L.TipShowBags = '%s — показать область сумок.'
+L.TipHideEmptySlots = '%s чтобы скрыть пустые слоты.'
+L.TipShowEmptySlots = '%s чтобы показать пустые слоты.'
 L.TipShowBank = '%s — переключить банк.'
 L.TipShowInventory = '%s — переключить инвентарь.'
 L.TipShowOptions = '%s — открыть настройки.'

core/localization/tw.lua

@@ -25,7 +25,8 @@ L.TitleBags = '%s的背包'
 L.TitleBank = '%s的銀行'
 L.TitleVault = '%s的虛空倉庫'
 --interactions
-L.Click = '點擊'
+L.Click = '左鍵點擊'
+L.MiddleClickPhrase = '中鍵點擊'
 L.Drag = '<拖動>'
 L.LeftClick = '<右鍵點擊>'
 L.RightClick = '<右鍵點擊>'
@@ -47,6 +48,8 @@ L.TipManageBank = '管理銀行'
 L.PurchaseBag = '點擊購買銀行槽。'
 L.TipShowBag = '點擊顯示背包。'
 L.TipShowBags = '<左鍵點擊>顯示背包顯示。'
+L.TipHideEmptySlots = '%s 以隱藏空的插槽。'
+L.TipShowEmptySlots = '%s 以顯示空的插槽。'
 L.TipShowMenu = '<右鍵點擊>設定視窗。'
 L.TipShowFrameConfig = '開啟設定視窗。'
 L.TipDoubleClickSearch = '<拖動>移動。\n<右鍵點擊>設定。\n<兩次點擊>搜尋。'