wow/ouroloot: gui.lua comparison

comparison gui.lua @ 16:5ee4edd24c13

- new blizz methods for editboxes in dialog popups - initial code for dropdowns in history (not active yet) - hovering and shift-clicking to link out of history - proper confirmations for history rewriting - options checkboxes more grid-like - saved texts get a scrollbar instead of expanding indefinitely (duh) - rearranged savedvars a bit (and added transition code) - stores raider join/leave times and "demographic" info, all for MLEQDKP - minor bugfixes and tweaks

author	Farmbuyer of US-Kilrogg <farmbuyer@gmail.com>
date	Thu, 25 Aug 2011 00:45:31 +0000
parents	952c3ac0e783
children	d929c40cdb09

comparison

equal deleted inserted replaced

-:d8fee518ce5d
+:5ee4edd24c13
 ------ Popup dialogs
 ]]
 ------ Constants
 local eoi_st_rowheight			= 20
-local eoi_st_displayed_rows		= math.floor(366/eoi_st_rowheight)
+local eoi_st_displayed_rows		= math.floor(416/eoi_st_rowheight) --math.floor(366/eoi_st_rowheight)
 local eoi_st_textured_item_format = "|T%s:"..(eoi_st_rowheight-2).."|t %s[%s]|r%s"
 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},
 				local v
 				if e.reason == 'kill' then
 					if e.attempts == 1 then
 						v = "one-shot"
 					else
-						v = ("kill on %d%s attempt"):format(e.attempts, grammar[e.attempts] or "th")
+						v = ("kill on %d%s attempt"):format(e.attempts or 0, grammar[e.attempts] 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
 				local dotcols = new (col1, col2, col3)
 				local st_entry = new()
 				st_entry.kind = 'history'
 				st_entry.OLwho = player.name
 				st_entry.cols = dotcols
+				st_entry.itemlink = ilink  -- for onenter and onclick
 				tinsert (st, st_entry)
 			end
 		end
 		--print("finished history loop, #st ==", #st)
 	[CLOSE] = function() CloseDropDownMenus() end,
 	df_INSERT = function(rowi,text)
 		local which = (text == 'loot') and "OUROL_EOI_INSERT_LOOT" or "OUROL_EOI_INSERT"
 		local dialog = StaticPopup_Show(which,text)
-		dialog.wideEditBox:SetScript("OnTextChanged",StaticPopup_EditBoxOnTextChanged)
+		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)
 		addon:Print("Removed %s.",
 			gone.itemlink or gone.bosskill or gone.startday.text)
+	end,
+	["Delete this history event"] = function(rowi)
+		--local gone = tremove(g_loot,rowi)
+		--addon:Print("Removed %s.",
+			--gone.itemlink or gone.bosskill or gone.startday.text)
 	end,
 	-- if kind is boss, also need to stop at new timestamp
 	["Delete remaining entries for this day"] = function(rowi,kind)
 		local fencepost
 	end,
 	df_REASSIGN = function(rowi,to_whom)
 		g_loot[rowi].person = to_whom
 		g_loot[rowi].person_class = select(2,UnitClass(to_whom))
+		-- FIXME also update history
 		CloseDropDownMenus()  -- also need to close parent menu
 	end,
 	["Enter name..."] = function(rowi)
 		local dialog = StaticPopup_Show "OUROL_REASSIGN_ENTER"
 		dialog.data = {index=rowi, display=_d}
 		"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
 	}, dropdownfuncs)
+local hist_dropdown = gen_easymenu_table(
+	{{
+		-- this is the dropdown title, text filled in on the fly
+		notClickable = true,
+		notCheckable = true,
+	}},
+	{
+		"Delete this history event|Permanent, no going back!",
+		--"Delete remaining entries for this boss%boss|Erases everything from here down until a new boss/day",
+		"--",
+		CLOSE
+	}, dropdownfuncs)
 --[[ quoted verbatim from lib-st docs:
 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 :) )
 local function eoi_st_OnEnter (rowFrame, cellFrame, data, cols, row, realrow, column, table, button, ...)
 	if (row == nil) or (realrow == nil) then return end  -- mouseover column header
 	local e = data[realrow]
 	local kind = e.kind
-	if kind == 'loot' and column == 1 then
+	if (kind == 'loot' and column == 1) or (kind == 'history' and column == 2) then
-		GameTooltip:SetOwner (cellFrame, "ANCHOR_RIGHT", -20, 0)
+		if e.itemlink then
-		GameTooltip:SetHyperlink (e.itemlink)
+			GameTooltip:SetOwner (cellFrame, "ANCHOR_RIGHT", -20, 0)
+			GameTooltip:SetHyperlink (e.itemlink)
+		end
 	elseif kind == 'loot' and column == 2 then
 		GameTooltip:SetOwner (cellFrame, "ANCHOR_BOTTOMRIGHT", -50, 5)
 		GameTooltip:ClearLines()
 		GameTooltip:AddLine(e.person.." Loot:")
 	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 kind == 'loot' and column == 1 then
+	if IsModifiedClick("CHATLINK") and
+	   ((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
 	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
 				return addon:redisplay()
 			end)
 			specials:AddChild(b)
 			b = mkbutton('hist_clear', "Clear Realm History",
-				[[No confirmation!  |cffff1010Erases absolutely all> history entries from the displayed realm.]])
+				[[|cffff1010Erases absolutely all> history entries from the displayed realm.]])
 			b:SetFullWidth(true)
 			b:SetCallback("OnClick", function (_b)
-				reset_current_realm(addon.history.realm)
+				local dialog = StaticPopup_Show("OUROL_HIST_CLEAR", addon.history.realm)
-				addon:Print("Stimpy, you eeediot, you've pushed the history erase button!")
+				dialog.data = addon
-				return addon:redisplay()
+				dialog.data2 = function(_addon)
+					reset_current_realm(_addon.history.realm)
+				end
 			end)
 			specials:AddChild(b)
 			b = mkbutton('hist_clear_all', "Clear All History",
-				[[No confirmation!  |cffff1010Erases absolutely all> history entries from ALL realms.]])
+				[[|cffff1010Erases absolutely all> history entries from ALL realms.]])
 			b:SetFullWidth(true)
 			b:SetCallback("OnClick", function (_b)
-				addon.history_all = {}
+				local dialog = StaticPopup_Show("OUROL_HIST_CLEAR", "ALL realms")
-				reset_current_realm()
+				dialog.data = addon
-				addon:Print("Stimpy, you eeediot, you've pushed the history erase button!")
+				dialog.data2 = function(_addon)
-				return addon:redisplay()
+					_addon.history_all = {}
+					reset_current_realm()
+				end
 			end)
 			specials:AddChild(b)
 			b = mkbutton('hist_clear_old', "Clear Older",
 				[[Preserves only the latest loot entry for each player on the displayed realm, removing all earlier ones.]])
 			b:SetFullWidth(true)
 			b:SetCallback("OnClick", function (_b)
-				addon:preen_history(addon.history.realm)
+				local dialog = StaticPopup_Show("OUROL_HIST_PREEN", addon.history.realm)
-				addon:Print("All loot prior to the most recent entries has been erased.")
+				dialog.data = addon
-				addon.hist_clean = nil
+				dialog.data2 = function(_addon)
-				histST:OuroLoot_Refresh()
+					_addon:preen_history(_addon.history.realm)
-				return addon:redisplay()
+					_addon.hist_clean = nil
+					histST:OuroLoot_Refresh()
+				end
 			end)
 			specials:AddChild(b)
 		end
 		return tabs_OnGroupSelected["hist"](container,specials)
 	end
 		-- The relative width fields used to be done to take up less vertical space, but
 		-- that turned out to look messy.  Now they're just a straight line for the most part.
 		-- reminder popup
-		w = mkoption ('popup_on_join', "Show reminder popup", 0.95,
+		w = mkoption ('popup_on_join', "Show reminder popup", 0.49,
 			[[When joining a raid and not already tracking, display a dialog asking for instructions.]])
 		grp:AddChild(w)
 		-- toggle scroll-to-bottom on first tab
-		w = mkoption('scroll_to_bottom', "Scroll to bottom when opening display", 0.95,
+		w = mkoption('scroll_to_bottom', "Scroll to bottom when opening display", 0.49,
 			[[Scroll to the bottom of the loot window (most recent entries) when displaying the GUI.]])
 		grp:AddChild(w)
 		-- /loot option
-		w = mkoption('register_slashloot', "Register /loot slash command on login", 0.95,
+		w = mkoption('register_slashloot', "Register /loot slash command on login", 0.49,
 			[[Register "/loot" as a slash command in addition to the normal "/ouroloot".  Relog to take effect.]])
 		grp:AddChild(w)
 		-- chatty mode
-		w = mkoption('chatty_on_kill', "Be chatty on boss kill", 0.95,
+		w = mkoption('chatty_on_kill', "Be chatty on boss kill", 0.49,
 			[[Print something to chat output when DBM tells Ouro Loot about a successful boss kill.]])
 		grp:AddChild(w)
 		-- less noise in main panel
-		w = mkoption('no_tracking_wipes', "Do not track wipes", 0.95,
+		w = mkoption('no_tracking_wipes', "Do not track wipes", 0.49,
 			[[Do not add 'wipe' entries on the main loot grid, or generate any text for them.]])
 		grp:AddChild(w)
 		-- cutesy abbrevs
-		w = mkoption('snarky_boss', "Use snarky boss names", 0.95,
+		w = mkoption('snarky_boss', "Use snarky boss names", 0.49,
 			[[Irreverent replacement names for boss events.]])
 		grp:AddChild(w)
 		-- possible keybindings
 		do
 	_d = display
 	self.display = display
 	display:SetTitle("Ouro Loot")
 	display:SetStatusText(self.status_text)
 	display:SetLayout("Flow")
-	display:SetStatusTable{width=900}
+	display:SetStatusTable{width=900,height=550}   -- default height is 500
 	-- prevent resizing, also see ace3 tickets 80 and 214
 	-- grrrr, no longer works after frame rewrite
 	--[[
 	display.sizer_se:SetScript("OnMouseDown",nil)
 	display.sizer_se:SetScript("OnMouseUp",nil)
 	end)
 	control:AddChild(b)
 	b = GUI:Create("Spacer")
 	b:SetFullWidth(true)
-	b:SetHeight(15)
+	b:SetHeight(10)
 	control:AddChild(b)
 	--[[
 	--- Saved Texts ---
 	 [ Save Current As... ]
 		StaticPopup_Show "OUROL_SAVE_SAVEAS"
 		_d:Hide()
 	end)
 	control:AddChild(b)
-	local saved = self:check_saved_table(--[[silent_on_empty=]]true)
+	do
-	if saved then for i,s in ipairs(saved) do
+		local scontainer = GUI:Create("SimpleGroup")
-		local il = GUI:Create("InteractiveLabel")
+		scontainer:SetFullWidth(true)
-		il:SetFullWidth(true)
+		scontainer:SetFullHeight(false)
-		il:SetText(s.name)
+		scontainer:SetAutoAdjustHeight(false)
-		il:SetUserData("num",i)
+		scontainer:SetHeight(40)  -- no relative height available anymore
-		il:SetHighlight(1,1,1,0.4)
+		scontainer:SetLayout("Fill")
-		local str = ("%s    %d entries     %s"):format(s.date,s.count,s.name)
+		local scroll = GUI:Create("ScrollFrame")
-		il:SetCallback("OnEnter", function() setstatus(str) end)
+		scroll:SetLayout("List")
-		il:SetCallback("OnLeave", statusy_OnLeave)
+		local saved = self:check_saved_table(--[[silent_on_empty=]]true)
-		il:SetCallback("OnClick", function(_il)
+		if saved then for i,s in ipairs(saved) do
-			local prev = _d:GetUserData("saved selection")
+			local il = GUI:Create("InteractiveLabel")
-			if prev then
+			il:SetFullWidth(true)
-				prev.highlight:Hide()
+			il:SetText(s.name)
-				prev:SetColor()
+			il:SetUserData("num",i)
-			end
+			il:SetHighlight(1,1,1,0.4)
-			_il:SetColor(0,1,0)
+			local str = ("%s    %d entries     %s"):format(s.date,s.count,s.name)
-			_il.highlight:Show()
+			il:SetCallback("OnEnter", function() setstatus(str) end)
-			_d:SetUserData("saved selection",_il)
+			il:SetCallback("OnLeave", statusy_OnLeave)
-			_d:GetUserData("Load"):SetDisabled(false)
+			il:SetCallback("OnClick", function(_il)
-			_d:GetUserData("Delete"):SetDisabled(false)
+				local prev = _d:GetUserData("saved selection")
-		end)
+				if prev then
-		control:AddChild(il)
+					prev.highlight:Hide()
-	end end
+					prev:SetColor()
+				end
+				_il:SetColor(0,1,0)
+				_il.highlight:Show()
+				_d:SetUserData("saved selection",_il)
+				_d:GetUserData("Load"):SetDisabled(false)
+				_d:GetUserData("Delete"):SetDisabled(false)
+			end)
+			scroll:AddChild(il)
+		end end
+		scontainer:AddChild(scroll)
+		control:AddChild(scontainer)
+	end
 	b = mkbutton("Load",
 		[[Load previously saved text.  +REPLACES> all current loot information!]])
 	b:SetRelativeWidth(0.5)
 	b:SetCallback("OnClick", function()
 	b:SetDisabled(true)
 	control:AddChild(b)
 	b = GUI:Create("Spacer")
 	b:SetFullWidth(true)
-	b:SetHeight(15)
+	b:SetHeight(10)
 	control:AddChild(b)
 	-- Other stuff on right-hand side
 	local tab_specials = GUI:Create("SimpleGroup")
 	tab_specials:SetLayout("Flow")
 		dialog.data = nil   -- free up memory
 		addon:Print("Inserted %s %s (entry %d).", data.kind, data.name, data.rowindex)
 		return
 	end
-	local text = dialog.wideEditBox:GetText()
+	local text = dialog.editBox:GetText()
 	-- second click
 	if data.name and text then
 		data.instance = text
 		data.all_done = true
 	-- first click
 	if text then
 		data.name = text
 		local getinstance = StaticPopup_Show("OUROL_EOI_INSERT","instance")
 		getinstance.data = data
-		getinstance.wideEditBox:SetText(addon.instance_tag())
+		getinstance.editBox:SetText(addon.instance_tag())
 		-- This suppresses auto-hide (which would case the getinstance dialog
 		-- to go away), but only when mouse clicking.  OnEnter is on its own.
 		return true
 	end
 end
 		dialog.data = nil
 		addon:Print("Inserted %s %s (entry %d).", data.kind, data.name, data.rowindex)
 		return
 	end
-	local text = dialog.wideEditBox:GetText():trim()
+	local text = dialog.editBox:GetText():trim()
 	-- third click
 	if data.name and data.recipient and text then
 		data.notes = (text ~= "<none>") and text or nil
 		data.all_done = true
 	-- second click
 	if data.name and text then
 		data.recipient = text
 		local getnotes = StaticPopup_Show("OUROL_EOI_INSERT","notes")
 		getnotes.data = data
-		getnotes.wideEditBox:SetText("<none>")
+		getnotes.editBox:SetText("<none>")
-		getnotes.wideEditBox:HighlightText()
+		getnotes.editBox:HighlightText()
 		return true
 	end
 	-- first click
 	if text then
 		data.name = text
 		dialog:Hide()  -- technically a "different" one about to be shown
 		local getrecipient = StaticPopup_Show("OUROL_EOI_INSERT","recipient")
 		getrecipient.data = data
-		getrecipient.wideEditBox:SetText("")
+		getrecipient.editBox:SetText("")
 		return true
 	end
 end
 local function eoi_st_insert_OnAccept (dialog, data)
 	end
 end
 StaticPopupDialogs["OUROL_CLEAR"] = flib.StaticPopup{
 	text = "Clear current loot information and text?",
-	button1 = ACCEPT,
+	button1 = YES,
-	button2 = CANCEL,
+	button2 = NO,
 	OnAccept = function (dialog, addon)
 		addon:Clear(--[[verbose_p=]]true)
+	end,
+}
+StaticPopupDialogs["OUROL_HIST_CLEAR"] = flib.StaticPopup{
+	text = "Erase all history entries from %s?",
+	button1 = YES,
+	button2 = NO,
+	OnAccept = function (dialog, addon, data2)
+		data2(addon)
+		addon:Print("Stimpy, you eeediot, you've pushed the history erase button!")
+		addon:redisplay()
+	end,
+}
+StaticPopupDialogs["OUROL_HIST_PREEN"] = flib.StaticPopup{
+	text = "Erase all but the latest entry for players on %s?",
+	button1 = YES,
+	button2 = NO,
+	OnAccept = function (dialog, addon, data2)
+		data2(addon)
+		addon:Print("All loot prior to the most recent entries has been erased.")
+		addon:redisplay()
 	end,
 }
 StaticPopupDialogs["OUROL_REMIND"] = flib.StaticPopup{
 	text = "Do you wish to activate Ouro Loot?\n\n(Hit the Escape key to close this window without clicking)",
 	local t = flib.StaticPopup{
 		text = "Enter name of new %s, then click Next or press Enter:",
 		button1 = "Next >",
 		button2 = CANCEL,
 		hasEditBox = true,
-		hasWideEditBox = true,
+		editBoxWidth = 350,
 		maxLetters = 50,
 		noCancelOnReuse = true,
 		--[[ XXX still needed?
 		OnShow = function(dialog)
 			dialog.wideEditBox:SetText("")
 	StaticPopupDialogs["OUROL_EOI_INSERT_LOOT"] = setmetatable(OEIL,OEIL)
 	hooksecurefunc("ChatEdit_InsertLink", function (link,...)
 		local dialogname = StaticPopup_Visible "OUROL_EOI_INSERT_LOOT"
 		if dialogname then
-			_G[dialogname.."WideEditBox"]:SetText(link)
+			_G[dialogname.."EditBox"]:SetText(link)
 			return true
 		end
 	end)
 end
 	end,]]
 	OnAccept = function(dialog, data)
 		local name = dialog.usertext --editBox:GetText()
 		g_loot[data.index].person = name
 		g_loot[data.index].person_class = select(2,UnitClass(name))
+		-- FIXME also update history
 		addon:Print("Reassigned entry %d to '%s'.", data.index, name)
 		data.display:GetUserData("eoiST"):OuroLoot_Refresh(data.index)
 	end,
 }

Mercurial > wow > ouroloot

comparison gui.lua @ 16:5ee4edd24c13