wow/ouroloot: gui.lua comparison

comparison gui.lua @ 76:124da015c4a2

- Some more debugging aids (logging error/assert, auto-enable of testing panel, reminder of GOP history mode) - Move (finally!) hypertext handling code out to each call site. - Fix some bugs in previous alpha code. - Initial-but-mostly-tested code to handle items that have a "unique" field which are in fact always the same (for example, elementium gem cluster). Still need to test the case in which a remote tracker sees them first. - The rest of the variable-cutoff history cleanup.

author	Farmbuyer of US-Kilrogg <farmbuyer@gmail.com>
date	Fri, 08 Jun 2012 08:05:37 +0000
parents	676fb79a4ae2
children	a07c9dd79f3a

comparison

equal deleted inserted replaced

-:676fb79a4ae2
+:124da015c4a2
 local g_loot			= nil
 local g_generated		= nil
 local window_title		= "Ouro Loot"
 local dirty_tabs		= nil
+local error				= addon.error
+local assert			= addon.assert
 local pairs, ipairs, tinsert, tremove, tostring, tonumber =
 	pairs, ipairs, table.insert, table.remove, tostring, tonumber
 local pprint, tabledump = addon.pprint, flib.tabledump
 local GetItemInfo, ITEM_QUALITY_COLORS = GetItemInfo, ITEM_QUALITY_COLORS
 		end
 		g_generated = g_generated or {}
 		g_loot[text_type] = g_loot[text_type] or ""
 		if g_loot.printed[text_type] >= #g_loot then return false end
-		assert(addon.loot_clean == #g_loot, tostring(addon.loot_clean) .. " ~= " .. #g_loot)
+		assert (addon.loot_clean == #g_loot,
+			tostring(addon.loot_clean) .. " ~= " .. #g_loot)
 		-- if glc is nil, #==0 test already returned
 		local ok,ret = pcall (f, text_type, g_loot, g_loot.printed[text_type], g_generated, accumulator)
 		if not ok then
 			error(("ERROR:  text generator '%s' failed:  %s"):format(text_type, ret))
-			return false
+			return false  -- why is this here again?
 		end
 		if ret then
 			g_loot.printed[text_type] = #g_loot
 			g_generated[text_type] = (g_generated[text_type] or "") .. table.concat(accumulator,'\n') .. '\n'
 		end
 		container:AddChild(grp)
 		GUI:ClearFocus()
 		container:SetScroll(1000)  -- scrollframe's max value
 	end
-	-- Initial lower panel function
+	-- Initial lower panel function (unless debug mode is on during load, which
-	local function adv_lower (container, specials)
+	-- means it was almost certainly hardcoded that way, which means it's
-		local spacer = GUI:Create("Spacer")
+	-- probably me testing).
-		spacer:SetFullWidth(true)
+	local adv_lower
-		spacer:SetHeight(5)
+	if addon.DEBUG_PRINT then
-		container:AddChild(spacer)
+		adv_lower = adv_real
-		local speedbump = GUI:Create("InteractiveLabel")
+	else
-		speedbump:SetFullWidth(true)
+		function adv_lower (container, specials)
-		speedbump:SetFontObject(GameFontHighlightLarge)
+			local spacer = GUI:Create("Spacer")
-		speedbump:SetImage("Interface\\DialogFrame\\DialogAlertIcon")
+			spacer:SetFullWidth(true)
-		speedbump:SetImageSize(50,50)
+			spacer:SetHeight(5)
-		speedbump:SetText("The debugging/testing settings on the rest of this panel can"
+			container:AddChild(spacer)
-			.." seriously bork up the addon if you make a mistake.  If you're okay"
+			local speedbump = GUI:Create("InteractiveLabel")
-			.." with the possibility of losing data, click this warning to load the panel.")
+			speedbump:SetFullWidth(true)
-		speedbump:SetCallback("OnClick", function (_sb)
+			speedbump:SetFontObject(GameFontHighlightLarge)
-			adv_lower = adv_real
+			speedbump:SetImage("Interface\\DialogFrame\\DialogAlertIcon")
-			return addon:redisplay()
+			speedbump:SetImageSize(50,50)
-			--return tabs_OnGroupSelected_func(container.parent,"OnGroupSelected","opt")
+			speedbump:SetText("The debugging/testing settings on the rest of this panel can seriously bork up the addon if you make a mistake.  If you're okay with the possibility of losing data, click this warning to load the panel.")
-		end)
+			speedbump:SetCallback("OnClick", function (_sb)
-		container:AddChild(speedbump)
+				adv_lower = adv_real
-		spacer = GUI:Create("Spacer")
+				return addon:redisplay()
-		spacer:SetFullWidth(true)
+				--return tabs_OnGroupSelected_func(container.parent,"OnGroupSelected","opt")
-		spacer:SetHeight(5)
+			end)
-		container:AddChild(spacer)
+			container:AddChild(speedbump)
+			spacer = GUI:Create("Spacer")
+			spacer:SetFullWidth(true)
+			spacer:SetHeight(5)
+			container:AddChild(spacer)
+		end
 	end
 	tabs_OnGroupSelected["opt"] = function(container,specials)
 		opts = OuroLootSV_opts
 	spec:ReleaseChildren()
 	local h = GUI:Create("Heading")
 	h:SetFullWidth(true)
 	h:SetText(_tabtexts[group].title)
 	spec:AddChild(h)
+	do
+		addon.sender_list.sort()
+		local fmt = "Received broadcast data from %d |4player:players;."
+		if addon.history_suppress then
+			-- this is the druid class color reworked into hex
+			fmt = fmt .. "  |cffff7d0aHistory recording suppressed.|r"
+		end
+		tabs.titletext:SetFormattedText (fmt, addon.sender_list.activeI)
+	end
 	return tabs_OnGroupSelected[group](tabs,spec,group)
 	--[====[
 	Unfortunately, :GetHeight() called on anything useful out of a TabGroup
 	returns the static default size (about 50 pixels) until the refresh
 	cycle *after* all the frames are shown.  Trying to fix it up after a
 	local titletext_orig_fo = tabs.titletext:GetFontObject()
 	tabs.titletext:SetFontObject(GameFontNormalSmall)
 	tabs:SetCallback("OnRelease", function(_tabs)
 		tabs.titletext:SetFontObject(titletext_orig_fo)
 	end)
-	do
-		self.sender_list.sort()
-		tabs.titletext:SetFormattedText("Received broadcast data from %d |4player:players;.",
-			self.sender_list.activeI)
-	end
 	tabs:SetRelativeWidth(0.99-rhs_width)
 	tabs:SetFullHeight(true)
 	tabs:SetTabs(tabgroup_tabs)
 	tabs:SetCallback("OnGroupSelected", tabs_OnGroupSelected_func)
 	tabs:SetCallback("OnTabEnter", function(_tabs,event,value,tab)
 		setstatus(_tabtexts[value].desc)
 	end)
 	tabs:SetCallback("OnTabLeave", statusy_OnLeave)
 	tabs:SetUserData("special buttons group",tab_specials)
-	tabs:SelectTab(opt_tabselect or "eoi")
+	tabs:SelectTab((opt_tabselect and #opt_tabselect>0)
+		and opt_tabselect or "eoi")
 	display:AddChildren (tabs, control)
 	display:ApplyStatus()
 	display:Show() -- without this, only appears every *other* function call

Mercurial > wow > ouroloot

comparison gui.lua @ 76:124da015c4a2