wow/ouroloot: gui.lua comparison

comparison gui.lua @ 109:ce45011fab4c

- Test for errors during startup before trying to manipulate data. - Thin encapsulation around dispositions. Abstract everything except the insertion into GUI dropdowns (that comes next).

author	Farmbuyer of US-Kilrogg <farmbuyer@gmail.com>
date	Wed, 08 Aug 2012 14:43:26 -0400
parents	04ccd12c2a41
children	f93c1a93923b

comparison

equal deleted inserted replaced

-:04ccd12c2a41
+:ce45011fab4c
 	kill	= { ["r"] = 0.2, ["g"] = 0.2, ["b"] = 0.2},
 	time	= { ["r"] = 0x0/255, ["g"] = 0x0/255, ["b"] = 1, ["a"] = 0.3},
 }
 eoi_st_otherrow_bgcolortable[""] = eoi_st_otherrow_bgcolortable["kill"]
 local eoi_st_otherrow_bgcolortable_default
-local eoi_st_lootrow_col3_colortable = {
+local eoi_st_lootrow_col3_colortable = addon.disposition_colors
-	normal	= { text = "",            r = "ff", g = "ff", b = "ff" },
-	shard	= { text = "shard",       r = "a3", g = "35", b = "ee" },
-	offspec	= { text = "offspec",     r = "c6", g = "9b", b = "6d" },
-	gvault	= { text = "guild vault", r = "33", g = "ff", b = "99" },
-}
-for k,v in pairs(eoi_st_lootrow_col3_colortable) do
-	-- for chat output by core code
-	v.hex = "|cff" .. v.r .. v.g .. v.b
-	-- for lib-st
-	v.r = tonumber(v.r,16)/255
-	v.g = tonumber(v.g,16)/255
-	v.b = tonumber(v.b,16)/255
-	v.a = 1
-end
-addon.disposition_colors = eoi_st_lootrow_col3_colortable
 local function eoi_st_lootrow_col3_colortable_func (data, _, realrow)
-	local disp = data[realrow].disposition
+	return eoi_st_lootrow_col3_colortable[data[realrow].disposition]
-	return eoi_st_lootrow_col3_colortable[disp or 'normal']
 end
 local time_column1_used_mt = { __index = {
 	[2] = {value=""},
 	[3] = {value=""},
 } }
 	gui.markup = _markup  -- too useful to keep local
 end
 -- Working around this bug:
 -- http://forums.wowace.com/showpost.php?p=295202&postcount=31
-if false then  -- XXX no longer needed?
+if false then  -- XXX no longer needed?   test on mop beta
 	local function fix_frame_level (level, ...)
 		for i = 1, select("#", ...) do
 			local button = select(i, ...)
 			button:SetFrameLevel(level)
 		end
 					{value = textured},
 					{value = e.person},
 					{}
 				}
 				-- This is horrible. Must do better.
-				if e.extratext then for k,v in pairs(eoi_st_lootrow_col3_colortable) do
+				if e.extratext then
-					if v.text == e.extratext then
+					for disp,text in self:_iter_dispositions('from_notes_text') do
-						e.disposition = k ~= 'normal' and k or nil
+						if text == e.extratext then
-						--e.extratext = nil, not feasible
+							e.disposition = disp
-						break
+							break
+						end
 					end
-				end end
+				end
-				local ex = eoi_st_lootrow_col3_colortable[e.disposition or 'normal'].text
+				local ex = eoi_st_lootrow_col3_colortable[e.disposition].text
 				if e.bcast_from and display_bcast_from and e.extratext then
 					ex = e.extratext .. " (from " .. e.bcast_from .. ")"
 				elseif e.bcast_from and display_bcast_from then
 					ex = ex .. (e.disposition and " " or "")
 					     .. "(from " .. e.bcast_from .. ")"
 eoi_dropdownfuncs["Delete this loot event"] = eoi_dropdownfuncs.df_DELETE
 eoi_dropdownfuncs["Delete this boss event"] = eoi_dropdownfuncs.df_DELETE
 eoi_dropdownfuncs["Insert new loot entry"] = eoi_dropdownfuncs.df_INSERT
 eoi_dropdownfuncs["Insert new boss kill event"] = eoi_dropdownfuncs.df_INSERT
 eoi_dropdownfuncs["Mark as disenchanted"] = eoi_dropdownfuncs["Mark as normal"]
-eoi_dropdownfuncs["Mark as guild vault"] = eoi_dropdownfuncs["Mark as normal"]
+eoi_dropdownfuncs["Mark as ".._G.GUILD_BANK:lower()] = eoi_dropdownfuncs["Mark as normal"]
 eoi_dropdownfuncs["Mark as offspec"] = eoi_dropdownfuncs["Mark as normal"]
 eoi_dropdownfuncs["Delete remaining entries for this boss"] =
 	eoi_dropdownfuncs["Delete remaining entries for this day"]
 eoi_dropdownfuncs["Rebroadcast this day"] = eoi_dropdownfuncs["Rebroadcast this boss"]
 local eoi_time_dropdown = gen_easymenu_table(
 		notCheckable = true,
 	}},
 	{
 		"Mark as disenchanted%shard",
 		"Mark as offspec%offspec",
-		"Mark as guild vault%gvault",
+		"Mark as ".._G.GUILD_BANK:lower().."%gvault",
 		"Mark as normal|This is the default.  Selecting any 'Mark as <x>' action blanks out extra notes about who broadcast this entry, etc.",
 		"--",
 		"Rebroadcast this loot entry|Sends this loot event, including special notes, as if it just happened.",
 		"Delete this loot event|Permanent, no going back!\n\nHold down the Shift key to also delete the corresponding entry from player's History.",
 		"Delete remaining entries for this boss%boss|Erases everything from here down until a new boss/day.\n\nHold down the Shift key to also delete the corresponding entries from player History.",
 				notCheckable = true,
 			}
 		end
 		eoi_player_dropdown[2].menuList =
 			gen_easymenu_table (raiders, {"Enter name...",CLOSE}, eoi_dropdownfuncs)
-		if e.disposition == 'shard' or e.disposition == 'gvault' then
+		if not addon:_test_disposition (e.disposition, 'can_reassign') then
 			eoi_player_dropdown[2].disabled = true
 			eoi_player_dropdown[2].tooltipTitle = "Cannot Reassign"
 			eoi_player_dropdown[2].tooltipText = "You must first mark this item as 'normal' or 'offspec' before reassignment."
 		else
 			eoi_player_dropdown[2].disabled = nil
 			end
 		end
 	end
 end
+addon.FILES_LOADED = addon.FILES_LOADED + 1
 -- vim:noet

Mercurial > wow > ouroloot

comparison gui.lua @ 109:ce45011fab4c