wow/ouroloot: gui.lua comparison

comparison gui.lua @ 84:c87bf3e756f3

Properly handle dropdown menus for the History tab now, initially with delete-item and delete-player entries. Some code cleanup and notes for future work.

author	Farmbuyer of US-Kilrogg <farmbuyer@gmail.com>
date	Thu, 21 Jun 2012 02:17:26 +0000
parents	940e53dd18c3
children	703bbe61d12d

comparison

equal deleted inserted replaced

-:940e53dd18c3
+:c87bf3e756f3
 ------ Constants
 local eoi_st_rowheight			= 20
 local eoi_st_displayed_rows		= math.floor(416/eoi_st_rowheight)
 local eoi_st_textured_item_format = "|T%s:"..(eoi_st_rowheight-2).."|t %s[%s]|r%s"
+-- This can get indexed by kind/reason/etc, and will default to lib-st's
+-- default "blank" background at runtime.
 local eoi_st_otherrow_bgcolortable = {
 	wipe	= { ["r"] = 0.3, ["g"] = 0.3, ["b"] = 0.3},
 	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"]
---eoi_st_otherrow_bgcolortable["realm"] = eoi_st_otherrow_bgcolortable["time"]
 local eoi_st_otherrow_bgcolortable_default
 local eoi_st_lootrow_col3_colortable = {
 	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" },
 do
 	local text_gen_funcs, specials_gen_funcs = {}, {}
 	local accumulator = {}
 	-- Can do clever things by passing other halting points as zero
-	function addon:zero_printed_fenceposts(zero)
+	function addon:zero_printed_fenceposts (zero)
 		for t in pairs(text_gen_funcs) do
 			g_loot.printed[t] = zero or g_loot.printed[t] or 0
 		end
 	end
 		text_gen_funcs[text_type] = generator
 		specials_gen_funcs[text_type] = opt_specgen
 		dirty_tabs = true
 	end
-	-- Called by tabs_generated_text_OGS
+	-- These two called by tabs_generated_text_OGS
+	-- tabs_OnGroupSelected_func will catch propagated errors
 	function _generate_text (text_type)
 		local f = text_gen_funcs[text_type]
 		if not f then
 			error(("Generator called for unregistered text type '%s'."):format(text_type))
 		end
 		-- 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  -- 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
 		return ret
 	end
 	function _populate_text_specials (editbox, specials, mkb, text_type)
 		local f = specials_gen_funcs[text_type]
 		if not f then return end
-		pcall (f, text_type, editbox, specials, mkb)
+		local ok,ret = pcall (f, text_type, editbox, specials, mkb)
+		if not ok then
+			error(("ERROR:  special widget creation for '%s' failed:  %s"):format(text_type, ret))
+		end
 	end
 	-- LOD tab has been clicked on.
 	local function _handle_LOD (tabs_container,specials,tabtitle)
 		-- "tabtitle" here is the name in _taborder, not the colorized string
 FIXME just move this functionality to a per-entry function and call it once
 in _addlootentry.  --actually no, then the columnar data won't be updated once
 the backend data is changed on the fly.
 ]]
 do
-	local grammar = { -- not worth making a mt for this
-		[2] = "nd",
-		[3] = "rd",
-	}
 	function addon:_fill_out_eoi_data (opt_starting_index)
 		if #g_loot < 1 then
 			--pprint('_f_o_e_d', "#g_loot<1")
 			self.loot_clean = nil
 			opt_starting_index = nil
 				e.duration = e.duration or 0 -- can occasionally miss getting set
 				if e.reason == 'kill' then
 					if e.attempts == 1 then
 						v = "one-shot"
 					else
-						v = ("kill on %d%s attempt"):format(e.attempts or 0, grammar[e.attempts] or "th")
+						v = ("kill on %d%s attempt"):format(e.attempts or 0,
+							e.attempts==2 and "nd" or e.attempts==3 and "rd" or "th")
 					end
 					v = ("%s (%d:%.2d)"):format(v, math.floor(e.duration/60), math.floor(e.duration%60))
 				elseif e.reason == 'wipe' then
 					v = ("wipe (%d:%.2d)"):format(math.floor(e.duration/60), math.floor(e.duration%60))
 				end
 			col1.value = player.name   -- may spiffy this up in future
 			for li,unique in ipairs(player.unique) do
 				local col2 = new()
 				col2.OLi   = li
+				col2.OLu   = unique
 				local col3 = new()
 				col3.value = player.when[unique]
 				local id = player.id[unique]
 				local itexture = GetItemIcon(id)
 						ITEM_QUALITY_COLORS[ITEM_QUALITY_COMMON].hex, 'UNKNOWN - REDISPLAY LATER', "")
 					cache_okay = false
 				end
 				col2.value = textured
+				-- To facilitate sharing lib-st routines between EOI and this
+				-- one, we do some of the same fields:  'kind' and 'itemlink'.
+				-- These aren't used outside of the GUI.  These become our data
+				-- table arguments to the lib-st routines (thus 'e' locals).
 				local dotcols = new (col1, col2, col3)
 				local st_entry = new()
-				st_entry.kind = 'history'
+				st_entry.kind = 'hist'
 				st_entry.OLwho = player.name
 				st_entry.cols = dotcols
 				st_entry.itemlink = ilink  -- for onenter and onclick
 				tinsert (st, st_entry)
 			end
 _tabtexts = {
 	["eoi"] = {title=[[Loot]], desc=[[Observed loot, plus boss kills and other events of interest]]},
 	["hist"] = {title=[[History]], desc=[[A short semi-permanent record]]},
 	["help"] = {title=[[Help]], desc=[[Instructions, reminders, and tips for non-obvious features]]},
 	["opt"] = {title=[[Options]], desc=[[Options for fine-tuning behavior]]},
-	--["adv"] = {title=[[Advanced]], desc=[[Debugging and testing]]},
 }
---if addon.author_debug then
 _taborder = { "eoi", "hist", "help", "opt" }
---else _taborder = { "eoi", "help", "opt" } end
 do
 	local next_insertion_position = 2   -- position in _taborder
 	local removed, saved_offset
 	end
 	dirty_tabs = nil
 end
 --[[
-Dropdown menu handling
+Dropdown menu handling; this has grown in ungainly directions.
 ]]
 -- forward decls
 local eoi_editcell
 local dropdownfuncs
 		return setmetatable(t, ddf_mt)
 	end
 end
 local function dropdownmenu_handler (ddbutton, subfunc, arg)
-	local i = _d and _d.GetUserData and _d:GetUserData("DD loot index")
+	local i = _d and _d.GetUserData and _d:GetUserData("DD index")
 	if i then
 		subfunc(i,arg)
-		_d:GetUserData("eoiST"):OuroLoot_Refresh(i)
+		_d:GetUserData("which ST"):OuroLoot_Refresh(i)
 	end
 end
 local function gen_easymenu_table (initial, list, funcs)
 	for _,tag in ipairs(list) do
 		dialog.editBox:SetScript("OnTextChanged",StaticPopup_EditBoxOnTextChanged)
 		dialog.data = {rowindex=rowi, display=_d, kind=text}
 	end,
 	df_DELETE = function(rowi)
-		local gone = tremove(g_loot,rowi)
+		local gone = tremove (g_loot, rowi)
 		addon:Print("Removed %s.",
 			gone.itemlink or gone.bossname or gone.startday.text)
 		if gone.kind == 'loot' and IsShiftKeyDown() then
-			addon:_delHistoryEntry (rowi, gone)
+			local okay,err = addon:_delHistoryEntry (gone)
+			if okay then
+				addon:Print("Removed history entry %s from '%s'.",
+					gone.itemlink, gone.person)
+			else
+				addon:Print(err)
+			end
 		end
 	end,
 	["Delete remaining entries for this day"] = function(rowi,kind)
 		-- if kind is boss, also need to stop at new timestamp
 		-- the fillout function called automatically will start too far down the list
 		_d:GetUserData("eoiST"):OuroLoot_Refresh()
 	end,
 	["Edit note"] = function(rowi)
-		eoi_editcell (rowi, _d:GetUserData("DD loot cell"))
+		eoi_editcell (rowi, _d:GetUserData("DD cell"))
 	end,
 	df_REASSIGN = function(rowi,to_whom)
 		addon:reassign_loot ("local", rowi, to_whom)
 		CloseDropDownMenus()  -- also need to close parent menu
 		notClickable = true,
 		notCheckable = true,
 	}},
 	{
 		"Rebroadcast this day%time|Broadcasts everything from here down until a new day.",
-		"Delete remaining entries for this day%time|Erases everything from here down until a new day.\n\nHold down the Shift key to also delete the players' corresponding History entry.",
+		"Delete remaining entries for this day%time|Erases everything from here down until a new day.\n\nHold down the Shift key to also delete the corresponding entries from player History.",
 		"Insert new loot entry%loot|Inserts new loot above this one, prompting you for information.",
 		"Insert new boss kill event%boss|Inserts new event above this one, prompting you for information.",
 		CLOSE
 	}, eoi_dropdownfuncs)
 local eoi_loot_dropdown = gen_easymenu_table(
 		"Mark as offspec%offspec",
 		"Mark as guild vault%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 player's corresponding History entry.",
+		"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 players' corresponding History entry.",
+		"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.",
 		"Insert new loot entry%loot|Inserts new loot above this one, prompting you for information.",
 		"Insert new boss kill event%boss|Inserts new event above this one, prompting you for information.",
 		"Edit note|Same as double-clicking in the notes column.",
 		"--",
 		CLOSE
 	}},
 	{
 		"Change from 'wipe' to 'kill'|Also collapses previous wipe entries.", -- KILLWIPE
 		"Rebroadcast this boss%boss|Broadcasts the kill event and all subsequent loot until next boss.",
 		"Delete this boss event|Permanent, no going back!",
-		"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 player's corresponding History entry.",
+		"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.",
 		"Insert new loot entry%loot|Inserts new loot above this one, prompting you for information.",
 		"Insert new boss kill event%boss|Inserts new event above this one, prompting you for information.",
 		"--",
 		CLOSE
 	}, eoi_dropdownfuncs)
---[[ quoted verbatim from lib-st docs:
+--[[ quoted verbatim from lib-st docs (table->stable for obvious reasons):
 rowFrame This is the UI Frame table for the row.
 cellFrame This is the UI Frame table for the cell in the row.
 data This is the data table supplied to the scrolling table (in case you lost it :) )
 cols This is the cols table supplied to the scrolling table (again, in case you lost it :) )
 row This is the number of the UI row that the event was triggered for.<br/> ex. If your scrolling table only shows ten rows, this number will be a number between 1 and 10.
 realrow This is the exact row index (after sorting and filtering) in the data table of what data is displayed in the row you triggered the event in. (NOT the UI row!)
 column This is the index of which column the event was triggered in.
-table This is a reference to the scrollingtable table.
+stable This is a reference to the scrollingtable table.
 ...  Any arguments generated by the '''NORMAL''' Blizzard event triggered by the frame are passed as is.
 ]]
-local function eoi_st_OnEnter (rowFrame, cellFrame, data, cols, row, realrow, column, table, button, ...)
+local function eoi_st_OnEnter (rowFrame, cellFrame, data, cols, row, realrow, column, stable, motion)
 	if (row == nil) or (realrow == nil) then return end  -- mouseover column header
 	local e = data[realrow]
 	local kind = e.kind
 	local tt = GameTooltip   -- can this be hoisted? does GT ever get securely replaced?
-	if _do_debugging_tooltip and column == 1 and kind~='history' then -- FIXME history
+	if _do_debugging_tooltip and column == 1 and kind ~= 'hist' then
 		_build_debugging_tooltip (cellFrame, realrow)
 	end
-	if (kind == 'loot' and column == 1) or (kind == 'history' and column == 2) then
+	if (kind == 'loot' and column == 1) or (kind == 'hist' and column == 2) then
 		tt:SetOwner (cellFrame, "ANCHOR_RIGHT", -20, 0)
 		if e.cache_miss then
 			tt:ClearLines()
 			tt:AddLine("Missing Cache Data")
 			tt:AddLine([[Wait a few seconds, then type]], 0.8, 0.8, 0.8, 1)
 	end
 	return false  -- continue with default highlighting behavior
 end
-local function eoi_st_OnLeave (rowFrame, cellFrame, data, cols, row, realrow, column, table, button, ...)
+local function eoi_st_OnLeave (rowFrame, cellFrame, data, cols, row, realrow, column, stable, motion)
 	GameTooltip:Hide()
 	_hide_debugging_tooltip()
 	if row and realrow and data[realrow].kind ~= 'loot' then
-		table:SetHighLightColor (rowFrame, eoi_st_otherrow_bgcolortable[data[realrow].reason or data[realrow].kind])
+		stable:SetHighLightColor (rowFrame, eoi_st_otherrow_bgcolortable[data[realrow].reason or data[realrow].kind])
 		return true   -- do not do anything further
 	else
 		--setstatus("")
 		return false  -- continue with default un-highlighting behavior
 	end
 end
-local function eoi_st_OnClick (rowFrame, cellFrame, data, cols, row, realrow, column, stable, button, ...)
+local function eoi_st_OnClick (rowFrame, cellFrame, data, cols, row, realrow, column, stable, button, down)
 	if (row == nil) or (realrow == nil) then return true end  -- click column header, suppress reordering
 	local e = data[realrow]
 	local kind = e.kind
 	-- Check for shift-clicking a loot line
-	if IsModifiedClick("CHATLINK") and
+	if IsModifiedClick("CHATLINK") and kind == 'loot' and column == 1
-	   ((kind == 'loot' and column == 1) or (kind == 'history' and column == 2))
 	then
 		ChatEdit_InsertLink (e.itemlink)
 		return true  -- do not do anything further
 	end
 	-- Remaining actions are all right-click
 	if button ~= "RightButton" then return true end
-	_d:SetUserData("DD loot index", realrow)
+	_d:SetUserData("DD index", realrow)
 	if kind == 'loot' and (column == 1 or column == 3) then
-		_d:SetUserData("DD loot cell", cellFrame)
+		_d:SetUserData("DD cell", cellFrame)
 		eoi_loot_dropdown[1].text = e.itemlink
 		EasyMenu (eoi_loot_dropdown, dropdownmenuframe, cellFrame, 0, 0, "MENU")
 	elseif kind == 'loot' and column == 2 then
 		eoi_player_dropdown[1].text = e.person
 	elseif kind == 'time' then
 		eoi_time_dropdown[1].text = e.startday.text
 		EasyMenu (eoi_time_dropdown, dropdownmenuframe, cellFrame, 0, 0, "MENU")
-	elseif kind == 'history' then  -- XXX need to move this into new onclick handler
-		_d:SetUserData("DD loot cell", cellFrame)
-		hist_dropdown[1].text = e.itemlink
-		EasyMenu (hist_dropdown, dropdownmenuframe, cellFrame, 0, 0, "MENU")
 	end
 	return true  -- do not do anything further
 end
 	box.frame:SetFrameLevel(cell_frame:GetFrameLevel()+1)
 	box.frame:Show()
 	setstatus("Press Enter or click Okay to accept changes, or press Escape to cancel them.")
 end
-local function eoi_st_OnDoubleClick (rowFrame, cellFrame, data, cols, row, realrow, column, stable, button, ...)
+local function eoi_st_OnDoubleClick (rowFrame, cellFrame, data, cols, row, realrow, column, stable, button)
 	if (row == nil) or (realrow == nil) then return true end  -- they clicked on column header, suppress reordering
 	local e = data[realrow]
 	local kind = e.kind
-	--_d:SetUserData("DD loot index", realrow)
+	--_d:SetUserData("DD index", realrow)
 	if kind == 'loot' and column == 3 and button == "LeftButton" then
 		eoi_editcell (realrow, cellFrame)
 	end
 	return true  -- do not do anything further
 end
 -- Used for EOI column 2 and Hist column 1.  Both are player name columns.
-local function eoi_st_col2_DoCellUpdate (rowFrame, cellFrame, data, cols, row, realrow, column, fShow, stable, ...)
+local function eoi_st_col2_DoCellUpdate (rowFrame, cellFrame, data, cols, row, realrow, column, fShow, stable)
 	if not fShow then
 		cellFrame.text:SetText("")
 		if cellFrame.icontexture then
 			cellFrame.icontexture:Hide()
 		end
 	end
 	--if e.kind ~= 'loot' then
 		stable:SetHighLightColor (rowFrame, eoi_st_otherrow_bgcolortable[e.reason or e.kind or ""])
 	--else
-	--	table:SetHighLightColor (rowFrame, table:GetDefaultHighlightBlank())
+	--	stable:SetHighLightColor (rowFrame, table:GetDefaultHighlightBlank())
 	--end
 end
 local eoi_st_cols = {
 	{  -- col 1
 	-- Now set up the future drawing function...
 	tabs_OnGroupSelected["eoi"] = function(container,specials)
 		local st_widget = GUI:Create("lib-st")
 		local st = _d:GetUserData("eoiST")
+		_d:SetUserData("which ST",st)
 		-- This is actually required each time
 		_d:SetUserData ("player filter clear", player_filter_all)
 		_d:SetUserData ("player filter by name", player_filter_by_name)
 -- Tab 4:  History
 -- Much of the implementation here follows a similar desgin for the first
 -- tab's handling of ST objects.  We will even reuse its controlling tables
 -- when feasible.
 local histST, hist_dropdownfuncs
+local hist_normal_status =
+	[[Click on a row to view all history for that player only.  (Click column headers to re-sort.)]]
+local hist_name_status =
+	[[Right-click on any row to return to normal history display.]]
+local history_filter_by_recent = function (st, e)
+	if e.kind ~= 'hist' then return true end
+	return e.cols[2].OLi == 1
+end
+local history_filter_who
+local history_filter_by_name = function (st, e)
+	if e.kind ~= 'hist' then return true end
+	return e.OLwho == history_filter_who
+end
 hist_dropdownfuncs = dropdownfuncs{
-	["Delete this loot history"] = function(rowi)
+	["Delete this loot event from history"] = function(rowi)
-		--local gone = tremove(g_loot,rowi)
+		local h = _d:GetUserData("DD history entry")
-		--addon:Print("Removed %s.",
+		local okay,err = addon:_delHistoryEntry (h.cols[2].OLu, h.itemlink)
-			--gone.itemlink or gone.bossname or gone.startday.text)
+		if okay then
+			addon:Print("Removed history entry %s from '%s'.",
+				h.itemlink, h.OLwho)
+		else
+			addon:Print(err)
+		end
+	end,
+	["Delete this player's entire loot history"] = function(rowi)
+		local h = _d:GetUserData("DD history entry")
+		local name = h.OLwho
+		local player_i = addon.history.byname[name]
+		local gone = tremove (addon.history, player_i)
+		assert(gone.name == name)
+		addon:_build_history_names()
+		addon:Print("Removed player '%s' from history (%d total entries).",
+			name, #gone.unique)
 	end,
 }
-local hist_dropdown = gen_easymenu_table(
+local hist_general_dropdown = gen_easymenu_table(
+	{{
+		-- this is the dropdown title, text filled in on the fly
+		isTitle = true,
+		notClickable = true,
+		notCheckable = true,
+	}},
+	{
+		"Delete this player's entire loot history|Permanent, no going back!",
+		"--",
+		CLOSE
+	}, hist_dropdownfuncs)
+local hist_specific_dropdown = gen_easymenu_table(
 	{{
 		-- this is the dropdown title, text filled in on the fly
 		notClickable = true,
 		notCheckable = true,
 	}},
 	{
-		"Delete this loot history|Permanent, no going back!",
+		"Delete this loot event from history|Permanent, no going back!",
-		--"Delete remaining entries for this boss%boss|Erases everything from here down until a new boss/day",
 		"--",
 		CLOSE
 	}, hist_dropdownfuncs)
+-- Loot column
+--[[
+local function hist_st_col2_DoCellUpdate (rowFrame, cellFrame, data, cols, row, realrow, column, fShow, stable)
+end]]
+-- Formatted timestamp column
+local function hist_st_col3_DoCellUpdate (rowFrame, cellFrame, data, cols, row, realrow, column, fShow, stable)
+	if not fShow then
+		cellFrame.text:SetText("")
+		return
+	end
+	local h = data[realrow]
+	local cell = h.cols[column]
+	cellFrame.text:SetText(cell.value)
+	cellFrame.text:SetTextColor(1,1,1,1)
+	--stable:SetHighLightColor (rowFrame, eoi_st_otherrow_bgcolortable[h.kind])
+	stable:SetHighLightColor (rowFrame, eoi_st_otherrow_bgcolortable_default)
+end
+local function hist_st_OnClick (rowFrame, cellFrame, data, cols, row, realrow, column, stable, button, down)
+	if (row == nil) or (realrow == nil) then return false end  -- click column header, do default resorting
+	local h = data[realrow]
+	assert(h.kind=='hist')
+	-- Four button combinations we need to care about:
+	-- Shift-left pastes loot
+	if IsModifiedClick("CHATLINK") and column == 2 then
+		ChatEdit_InsertLink (h.itemlink)
+		return true  -- do not do anything further
+	end
+	_d:SetUserData("DD index", realrow)
+	_d:SetUserData("DD history entry", h)
+	-- The rest depends on whether we're filtering (focused in on a specific
+	-- player) or not.
+	if history_filter_who then
+		-- Shift-right opens a menu
+		if IsShiftKeyDown() and button == "RightButton" then
+			hist_specific_dropdown[1].text = h.itemlink
+			EasyMenu (hist_specific_dropdown, dropdownmenuframe, cellFrame, 0, 0, "MENU")
+		-- Right goes back to normal mode
+		elseif button == "RightButton" then
+			history_filter_who = nil
+			stable:SetFilter(history_filter_by_recent)
+			setstatus(hist_normal_status)
+		end
+	else  -- not focused
+		-- Shift-right opens a menu
+		if IsShiftKeyDown() and button == "RightButton" then
+			hist_general_dropdown[1].text = h.OLwho
+			EasyMenu (hist_general_dropdown, dropdownmenuframe, cellFrame, 0, 0, "MENU")
+		-- Left focuses on a specific player
+		elseif button == "LeftButton" then
+			history_filter_who = h.OLwho
+			stable:SetFilter(history_filter_by_name)
+			setstatus(hist_name_status)
+		end
+	end
+	return true  -- do not do anything further
+end
+--[[
+local function hist_st_OnDoubleClick (rowFrame, cellFrame, data, cols, row, realrow, column, stable, button)
+	if (row == nil) or (realrow == nil) then return true end  -- they clicked on column header, suppress reordering
+	local h = data[realrow]
+	assert(h.kind=='hist')
+	return true  -- do not do anything further
+end]]
 local hist_st_cols = {
 	{  -- col 1
 		name	= "Player",
 		width	= 130,
 		DoCellUpdate = eoi_st_col2_DoCellUpdate,
 	},
 	{  -- col 2
 		name	= "Most Recent Loot",
 		width	= 250,
-		DoCellUpdate = hist_st_col2_DoCellUpdate,
+		--DoCellUpdate = hist_st_col2_DoCellUpdate,
 	},
 	{  -- col 3
 		name	= "When",
 		width	= 250,
 		DoCellUpdate = hist_st_col3_DoCellUpdate,
 		defaultsort = "asc",
 		sort = "asc",
 		sortnext = 1,
 	},
 }
-local hist_normal_status =
-	[[Click on a row to view all history for that player only.  (Click column headers to re-sort.)]]
-local hist_name_status =
-	[[Right-click on any row to return to normal history display.]]
-local history_filter_by_recent = function (st, e)
-	if e.kind ~= 'history' then return true end
-	return e.cols[2].OLi == 1
-end
-local history_filter_who
-local history_filter_by_name = function (st, e)
-	if e.kind ~= 'history' then return true end
-	return e.OLwho == history_filter_who
-end
--- Loot column
-local function hist_st_col2_DoCellUpdate (rowFrame, cellFrame, data, cols, row, realrow, column, fShow, stable, ...)
-	print("col2 DCU", realrow)
-end
--- Formatted timestamp column
-local function hist_st_col3_DoCellUpdate (rowFrame, cellFrame, data, cols, row, realrow, column, fShow, stable, ...)
-	print("col3 DCU", realrow)
-	if not fShow then
-		cellFrame.text:SetText("")
-		return
-	end
-	local d = data[realrow]
-	local cell = d.cols[column]
-	cellFrame.text:SetText(cell.value)
-	cellFrame.text:SetTextColor(1,1,1,1)
-	--if d.kind ~= 'loot' then
-		stable:SetHighLightColor (rowFrame, eoi_st_otherrow_bgcolortable[d.kind])
-	--else
-	--	table:SetHighLightColor (rowFrame, table:GetDefaultHighlightBlank())
-	--end
-end
-local function hist_st_OnClick (rowFrame, cellFrame, data, cols, row, realrow, column, stable, button, ...)
-	if (row == nil) or (realrow == nil) then return false end  -- click column header, do default resorting
-	local h = data[realrow]
-	local kind = h.kind
-	if history_filter_who and button == "RightButton" then  -- now filtering and wanting not to
-		history_filter_who = nil
-		stable:SetFilter(history_filter_by_recent)
-		setstatus(hist_normal_status)
-	elseif (not history_filter_who) and button == "LeftButton" then  -- not filtering and wanting to
-		history_filter_who = h.OLwho
-		stable:SetFilter(history_filter_by_name)
-		setstatus(hist_name_status)
-	end
-	return true  -- do not do anything further
-end
---[[
-local function hist_st_OnDoubleClick (rowFrame, cellFrame, data, cols, row, realrow, column, stable, button, ...)
-	if (row == nil) or (realrow == nil) then return true end  -- they clicked on column header, suppress reordering
-	local h = data[realrow]
-	local kind = h.kind
-	return true  -- do not do anything further
-end]]
 -- Tab 4:  History (implementation)
 tabs_OnGroupSelected["hist"] = function(container,specials)
 	histST = LibStub("ScrollingTable"):CreateST(hist_st_cols,eoi_st_displayed_rows,eoi_st_rowheight)
 	_d:SetUserData("histST",histST)
 	end
 	tabs_OnGroupSelected["hist"] = function(container,specials)
 		local st_widget = GUI:Create("lib-st")
 		-- don't need _d:GetUserData("histST") here, as it's already a local
+		_d:SetUserData("which ST",histST)
 		histST:OuroLoot_Refresh()
 		st_widget:WrapST(histST)
 		st_widget.head_offset = 15
 		st_widget.tail_offset = 0
 		container:SetLayout("Fill")
 			editbox:SetDisabled(not opts.chatty_on_remote_changes)
 			chatgroup:AddChild(editbox)
 			w = mkbutton("Chat Frame Numbers",
 				[[Print each chat window number in its own frame, for easy reference in the editing field.]])
 			w:SetFullWidth(true)
-			--w:SetDisabled(not opts.chatty_on_remote_changes)
 			w:SetCallback("OnClick", function()
 				for i = 1, NUM_CHAT_WINDOWS do
 					local cf = _G['ChatFrame'..i]
 					if not cf then break end
 					addon:CFPrint (cf, "This is frame number |cffff0000%d|r.", i)
 	-- This probably causes taint... hm.
 	local prev_fade_time = UIDROPDOWNMENU_SHOW_TIME
 	UIDROPDOWNMENU_SHOW_TIME = 4
 	if dirty_tabs then
-		self:gui_init (g_loot, g_uniques)  -- pointers known to be good by now
+		-- pointers known to be good by now, pass them back in
+		self:gui_init (g_loot, g_uniques)
 		self:zero_printed_fenceposts()
 	end
 	local display = GUI:Create("Frame")
 	if _d then
 StaticPopupDialogs["OUROL_REASSIGN_ENTER"] = flib.StaticPopup{
 	text = "Enter the player name:",
 	button1 = ACCEPT,
 	button2 = CANCEL,
 	hasEditBox = true,
-	--[[ XXX needed?
-	OnShow = function(dialog)
-		dialog.editBox:SetText("")
-		dialog.editBox:SetFocus()
-	end,]]
 	OnAccept = function(dialog, data)
 		local name = dialog.usertext --editBox:GetText()
 		addon:reassign_loot ("local", data.index, name)
 		data.display:GetUserData("eoiST"):OuroLoot_Refresh(data.index)
 	end,
 	text = "Enter a name for the loot collection:",
 	button1 = ACCEPT,
 	button2 = CANCEL,
 	hasEditBox = true,
 	maxLetters = 30,
-	--[[ XXX
-	OnShow = function(dialog)
-		dialog.editBox:SetText("")
-		dialog.editBox:SetFocus()
-	end,]]
 	OnAccept = function(dialog)--, data)
 		local name = dialog.usertext --editBox:GetText()
 		addon:save_saveas(name)
 		addon:BuildMainDisplay()
 	end,
 	OnCancel = function(dialog)--, data, reason)
 		addon:BuildMainDisplay()
 	end,
-	--[[XXX
-	EditBoxOnEnterPressed = function(editbox)
-		local dialog = editbox:GetParent()
-		StaticPopupDialogs["OUROL_SAVE_SAVEAS"].OnAccept (dialog, dialog.data)
-		dialog:Hide()
-	end,]]
 }
 -- Workaround this bug:  http://us.battle.net/wow/en/forum/topic/3278901991
 if true then

Mercurial > wow > ouroloot

comparison gui.lua @ 84:c87bf3e756f3