wow/ouroloot: gui.lua comparison

comparison gui.lua @ 65:69fd720f853e

Add display_bcast_from option.

author	Farmbuyer of US-Kilrogg <farmbuyer@gmail.com>
date	Fri, 27 Apr 2012 09:12:45 +0000
parents	1cbaa1ce8253
children	c01875b275ca

comparison

equal deleted inserted replaced

-:359d0159d6ca
+:69fd720f853e
 				self.loot_clean = nil
 				pprint('_f_o_e_d', "index",i,"somehow still in loop past",#g_loot,"bailing")
 				return
 			end
+			local display_bcast_from = OuroLootSV_opts.display_bcast_from
 			-- XXX FIXME a major weakness here is that we're constantly replacing
 			-- what's already been created.  Lots of garbage.  Trying to detect what
 			-- actually needs to be replaced is even worse.  We'll live with
 			-- garbage for now.
 			if e.kind == 'loot' then
 						e.disposition = k
 						--e.extratext = nil, not feasible
 						break
 					end
 				end end
-				local ex = eoi_st_lootrow_col3_colortable[e.disposition or ""].text
+				local ex = e.disposition or ""
-				if e.bcast_from and e.extratext then
+				ex = eoi_st_lootrow_col3_colortable[ex].text
+				if e.bcast_from and display_bcast_from and e.extratext then
 					ex = e.extratext .. " (from " .. e.bcast_from .. ")"
-				elseif e.bcast_from then
+				elseif e.bcast_from and display_bcast_from then
-					ex = "(from " .. e.bcast_from .. ")"
+					ex = ex .. " (from " .. e.bcast_from .. ")"
 				elseif e.extratext then
 					ex = e.extratext
 				end
 				e.cols[3].value = ex
 end
 -- Tab 6:  Options / Advanced
 do
+	-- Local ref to OuroLootSV_opts, which may be reassigned after load.
+	-- So instead this is updated when the tab is displayed.
+	local opts
 	local function mkoption (opt, label, width, desc, opt_func)
 		local w = mkbutton("CheckBoxSmallLabel", nil, "", desc)
 		w:SetRelativeWidth(width)
 		w:SetType("checkbox")
 		w:SetLabel(label)
 		if opt then
-			w:SetValue(OuroLootSV_opts[opt])
+			w:SetValue(opts[opt])
 			w:SetCallback("OnValueChanged", opt_func or (function(_w,event,value)
-				OuroLootSV_opts[opt] = value
+				opts[opt] = value
 			end))
 		end
 		return w
 	end
 		end)
 		container:AddChild(speedbump)
 	end
 	tabs_OnGroupSelected["opt"] = function(container,specials)
+		opts = OuroLootSV_opts
 		--container:SetLayout("List")
 		container:SetLayout("Fill")
 		local scroll, grp, w
 		scroll = GUI:Create("ScrollFrame")
 		grp:AddChild(w)
 		-- LOD plugins in all cases
 		w = mkoption('display_disabled_LODs', "Include disabled plugins", 0.49,
 			[[Show loadable plugins even if they've been disabled (and offer to enable them).  Relog to take effect.]])
+		grp:AddChild(w)
+		-- showing the "(from Rebroadcasterdude)" in the notes column
+		w = mkoption('display_bcast_from', "Show rebroadcasting player", 0.49,
+			[[Include "(from Player_Name)" in the Notes column for loot that was broadcast to you.]],
+			function(_w,_e,value)
+				opts.display_bcast_from = value
+				addon.loot_clean = nil
+			end)
 		grp:AddChild(w)
 		-- possible keybindings
 		do
 			local pair = GUI:Create("SimpleGroup")
 			pair:SetLayout("Flow")
 			pair:SetRelativeWidth(0.95)
 			local editbox, checkbox
-			editbox = mkbutton("EditBox", nil, OuroLootSV_opts.keybinding_text,
+			editbox = mkbutton("EditBox", nil, opts.keybinding_text,
 				[[Keybinding text format is fragile!  Relog to take effect.]])
 			editbox:SetRelativeWidth(0.5)
 			editbox:SetLabel("Keybinding text")
 			editbox:SetCallback("OnEnterPressed", function(_w,event,value)
-				OuroLootSV_opts.keybinding_text = value
+				opts.keybinding_text = value
 			end)
-			editbox:SetDisabled(not OuroLootSV_opts.keybinding)
+			editbox:SetDisabled(not opts.keybinding)
 			checkbox = mkoption('keybinding', "Register keybinding", 0.5,
 				[[Register a keybinding to toggle the loot display.  Relog to take effect.]],
 				function (_w,_,value)
-					OuroLootSV_opts.keybinding = value
+					opts.keybinding = value
-					editbox:SetDisabled(not OuroLootSV_opts.keybinding)
+					editbox:SetDisabled(not opts.keybinding)
 				end)
 			pair:AddChild(checkbox)
 			pair:AddChild(editbox)
 			grp:AddChild(pair)
 		end
 		do
 			local list = {}
 			local current
 			for k,v in ipairs(addon.bossmods) do
 				list[k] = v.n
-				if v.n == OuroLootSV_opts.bossmod then
+				if v.n == opts.bossmod then
 					current = k
 				end
 			end
 			w = mkbutton("Dropdown", nil, "", [[Which 'boss mod' to use.]])
 			w:SetRelativeWidth(0.2)
 			w:SetLabel("Boss Mod:")
 			w:SetList(list)
 			w:SetValue(current)
 			w:SetCallback("OnValueChanged", function(_w,event,choice)
-				OuroLootSV_opts.bossmod = list[choice]
+				opts.bossmod = list[choice]
 			end)
 			grp:AddChild(w)
 		end
 		-- item filter
 		w:SetHeight(20)
 		grp:AddChild(w)
 		do
 			local list = {}
 			local cache_warn, cache_warned = false, false
-			for id in pairs(OuroLootSV_opts.itemfilter) do
+			for id in pairs(opts.itemfilter) do
 				local iname, _, iquality = GetItemInfo(id)
 				if iname then
 					list[id] = ITEM_QUALITY_COLORS[iquality].hex .. iname .. "|r"
 				else
 					cache_warn = true
 				if not iname then
 					return addon:Print("Error:  %s is not a valid item name/link!", text)
 				end
 				local id = tonumber(ilink:match("item:(%d+)"))
 				list[id] = ITEM_QUALITY_COLORS[iquality].hex .. iname .. "|r"
-				OuroLootSV_opts.itemfilter[id] = true
+				opts.itemfilter[id] = true
 				addon:Print("Now filtering out", ilink)
 			end)
 			w:SetCallback("OnListItemClicked", function(_w, _, key_id, val_name)
 				--local ilink = select(2,GetItemInfo(key_id))
-				OuroLootSV_opts.itemfilter[tonumber(key_id)] = nil
+				opts.itemfilter[tonumber(key_id)] = nil
 				--addon:Print("No longer filtering out", ilink)
 				addon:Print("No longer filtering out", val_name)
 			end)
 			w:SetCallback("OnDropdownShown", function()
 				if cache_warn and not cache_warned then

Mercurial > wow > ouroloot

comparison gui.lua @ 65:69fd720f853e