Dusk/aux-addon-ClassicAPI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more progress on the new filter tab, removed views

Browse Source
This commit is contained in:
Manuel Simon Hirsig
2016-01-29 23:23:47 +01:00
parent 473a66d3cc
commit 006b7a0582
12 changed files with 207 additions and 656 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Aux-AddOn.toc
+1 -1
View File
@@ -1,7 +1,7 @@
## Interface: 11200
## Title: Aux
## Notes: A lightweight addon designed to help manage auctions
## SavedVariablesPerCharacter: aux_recently_searched, aux_recent_searches, aux_favorite_searches, aux_view, AUX_AUCTION_DURATION
## SavedVariablesPerCharacter: aux_recently_searched, aux_recent_searches, aux_favorite_searches, aux_bid, aux_view, AUX_AUCTION_DURATION
## SavedVariables: aux_database, aux_auctionable_items
slash.lua
auctions_frame.lua
+1 -19
View File
@@ -97,25 +97,7 @@ function public.on_load()
cell.text:SetText(datum.aux_quantity)
end,
},
{
title = 'Left',
width = 30,
comparator = function(row1, row2) return Aux.util.compare(row1.duration, row2.duration, Aux.util.GT) end,
cell_initializer = Aux.sheet.default_cell_initializer('CENTER'),
cell_setter = function(cell, datum)
local text
if datum.duration == 1 then
text = '30m'
elseif datum.duration == 2 then
text = '2h'
elseif datum.duration == 3 then
text = '8h'
elseif datum.duration == 4 then
text = '24h'
end
cell.text:SetText(text)
end,
},
Aux.listing_util.duration_column(function(entry) return entry.duration end),
{
title = 'Current Bid',
width = 80,
bids_frame.lua
+1 -19
View File
@@ -110,25 +110,7 @@ function public.on_load()
cell.text:SetText(auction.status)
end,
},
{
title = 'Left',
width = 30,
comparator = function(row1, row2) return Aux.util.compare(row1.duration, row2.duration, Aux.util.GT) end,
cell_initializer = Aux.sheet.default_cell_initializer('CENTER'),
cell_setter = function(cell, datum)
local text
if datum.duration == 1 then
text = '30m'
elseif datum.duration == 2 then
text = '2h'
elseif datum.duration == 3 then
text = '8h'
elseif datum.duration == 4 then
text = '24h'
end
cell.text:SetText(text)
end,
},
Aux.listing_util.duration_column(function(entry) return entry.duration end),
Aux.listing_util.owner_column(function(datum) return datum.owner end),
Aux.listing_util.money_column('Your Bid', function(entry) return entry.your_bid end),
Aux.listing_util.money_column('Bid', function(entry) return entry.bid_price end),
completion.lua
+5 -3
View File
@@ -165,7 +165,7 @@ function public.completor(edit_box)
return self
end
function public.selector(edit_box)
function public.selector(edit_box, on_click)
local self = {}
local suggestions = {}
@@ -183,7 +183,9 @@ function public.selector(edit_box)
notCheckable = true,
func = function()
index = this.value
AuxItemSearchFrameItemItemInputBox:ClearFocus()
if on_click then
on_click()
end
end,
}
end
@@ -233,7 +235,7 @@ function public.selector(edit_box)
suggestions = {}
else
suggestions = generate_suggestions(input)
UIDropDownMenu_Initialize(AuxCompletionDropDown, function() fill_dropdown() end)
UIDropDownMenu_Initialize(AuxCompletionDropDown, fill_dropdown)
end
index = 1
filter_search_frame.lua
+98 -304
View File
@@ -30,6 +30,7 @@ function private.update_tab(tab)
private.search_results_button:LockHighlight()
elseif tab == SAVED then
AuxFilterSearchFrameSaved:Show()
private.saved_searches_button:LockHighlight()
elseif tab == FILTER then
AuxFilterSearchFrameFilters:Show()
private.new_filter_button:LockHighlight()
@@ -40,7 +41,7 @@ function private.add_filter()
local old_filter_string = private.search_box:GetText()
old_filter_string = Aux.util.trim(old_filter_string)
if not string.sub(old_filter_string, strlen(old_filter_string), strlen(old_filter_string)) == ';' then
if strlen(old_filter_string) > 0 and not strfind(old_filter_string, ';$') then
old_filter_string = old_filter_string..';'
end
@@ -86,7 +87,7 @@ end
function public.on_open()
private.update_search_listings()
private.update_tab(RESULTS)
private.update_tab(SAVED)
-- private.tab_group:set_tab(aux_view)
Aux.filter_search_frame.set_view(aux_view)
end
@@ -94,15 +95,23 @@ end
function public.on_load()
private.recent_searches_config = {
plain = true,
frame = AuxFilterSearchFrameSavedFavoriteListing,
frame = AuxFilterSearchFrameSavedRecentListing,
on_row_click = function (sheet, row_index)
PlaySound('igMainMenuOptionCheckBoxOn')
local data_index = row_index + FauxScrollFrame_GetOffset(sheet.scroll_frame)
-- sheet.data[data_index]
PlaySound('igMainMenuOptionCheckBoxOn')
if arg1 == 'LeftButton' then
private.search_box:SetText(sheet.data[data_index])
if not IsShiftKeyDown() then
public.start_search()
end
elseif arg1 == 'RightButton' then
tinsert(aux_favorite_searches, sheet.data[data_index])
private.update_search_listings()
end
end,
columns = {
{
width = 300,
width = 900,
comparator = function(filter_string1, filter_string2) return Aux.util.compare(filter_string1, filter_string2, Aux.util.LT) end,
cell_initializer = Aux.sheet.default_cell_initializer('LEFT'),
cell_setter = function(cell, filter_string)
@@ -114,15 +123,23 @@ function public.on_load()
}
private.favorite_searches_config = {
plain = true,
frame = AuxFilterSearchFrameSavedRecentListing,
frame = AuxFilterSearchFrameSavedFavoriteListing,
on_row_click = function (sheet, row_index)
PlaySound('igMainMenuOptionCheckBoxOn')
local data_index = row_index + FauxScrollFrame_GetOffset(sheet.scroll_frame)
-- sheet.data[data_index]
PlaySound('igMainMenuOptionCheckBoxOn')
if arg1 == 'LeftButton' then
private.search_box:SetText(sheet.data[data_index])
if not IsShiftKeyDown() then
public.start_search()
end
elseif arg1 == 'RightButton' then
tremove(aux_favorite_searches, Aux.util.index_of(sheet.data[data_index], aux_favorite_searches))
private.update_search_listings()
end
end,
columns = {
{
width = 300,
width = 900,
comparator = function(filter_string1, filter_string2) return Aux.util.compare(filter_string1, filter_string2, Aux.util.LT) end,
cell_initializer = Aux.sheet.default_cell_initializer('LEFT'),
cell_setter = function(cell, filter_string)
@@ -130,7 +147,7 @@ function public.on_load()
end,
},
},
sort_order = {},
sort_order = {{ column = 1, order = 'ascending' }},
}
private.views = {
[Aux.view.BUYOUT] = {
@@ -214,7 +231,9 @@ function public.on_load()
cell.text:SetText(group[1].aux_quantity)
end,
},
Aux.listing_util.money_column('Bid', function(group) return group[1].bid_price end),
Aux.listing_util.money_column('Buy', function(group) return group[1].buyout_price end),
Aux.listing_util.money_column('Bid/ea', function(group) return group[1].unit_bid_price end),
Aux.listing_util.money_column('Buy/ea', function(group) return group[1].unit_buyout_price end),
{
title = 'Avail',
@@ -225,212 +244,13 @@ function public.on_load()
cell.text:SetText(getn(Aux.util.filter(group, function(auction) return not auction.gone end)))
end,
},
Aux.listing_util.percentage_market_column(function(group) return group[1].item_key end, function(group) return group[1].unit_buyout_price end),
},
sort_order = {{column = 1, order = 'ascending' }, {column = 4, order = 'ascending'}},
},
[Aux.view.BID] = {
frame = AuxFilterSearchFrameResultsBidListing,
on_row_click = function(sheet, row_index)
local data_index = row_index + FauxScrollFrame_GetOffset(sheet.scroll_frame)
private.on_row_click(sheet.data[data_index])
end,
on_row_enter = function(sheet, row_index)
Aux.info.set_tooltip(sheet.rows[row_index].itemstring, sheet.rows[row_index].EnhTooltip_info, this, 'ANCHOR_RIGHT', 0, 0)
end,
on_row_leave = function(sheet, row_index)
AuxTooltip:Hide()
ResetCursor()
end,
on_row_update = function(sheet, row_index)
if IsControlKeyDown() then
ShowInspectCursor()
elseif IsAltKeyDown() then
SetCursor('BUY_CURSOR')
else
ResetCursor()
end
end,
selected = function(datum)
return datum == selected_auction
end,
row_setter = function(row, datum)
row:SetAlpha(datum.gone and 0.3 or 1)
row.itemstring = Aux.info.itemstring(datum.item_id, datum.suffix_id, datum.unique_id, datum.enchant_id)
row.EnhTooltip_info = datum.EnhTooltip_info
end,
columns = {
{
title = 'Auction Item',
width = 280,
comparator = function(row1, row2) return Aux.util.compare(row1.tooltip[1][1].text, row2.tooltip[1][1].text, Aux.util.GT) end,
cell_initializer = function(cell)
local icon = CreateFrame('Button', nil, cell)
icon:EnableMouse(false)
local icon_texture = icon:CreateTexture(nil, 'BORDER')
icon_texture:SetAllPoints(icon)
icon.icon_texture = icon_texture
local normal_texture = icon:CreateTexture(nil)
normal_texture:SetPoint('CENTER', 0, 0)
normal_texture:SetWidth(22)
normal_texture:SetHeight(22)
normal_texture:SetTexture('Interface\\Buttons\\UI-Quickslot2')
icon:SetNormalTexture(normal_texture)
icon:SetPoint('LEFT', cell)
icon:SetWidth(12)
icon:SetHeight(12)
local text = cell:CreateFontString(nil, 'OVERLAY', 'GameFontHighlightSmall')
text:SetPoint('LEFT', icon, 'RIGHT', 1, 0)
text:SetPoint('TOPRIGHT', cell)
text:SetPoint('BOTTOMRIGHT', cell)
text:SetJustifyV('TOP')
text:SetJustifyH('LEFT')
text:SetTextColor(0.8, 0.8, 0.8)
cell.text = text
cell.icon = icon
end,
cell_setter = function(cell, datum)
cell.icon.icon_texture:SetTexture(Aux.info.item(datum.item_id).texture)
if not datum.usable then
cell.icon.icon_texture:SetVertexColor(1.0, 0.1, 0.1)
else
cell.icon.icon_texture:SetVertexColor(1.0, 1.0, 1.0)
end
cell.text:SetText('['..datum.tooltip[1][1].text..']')
local color = ITEM_QUALITY_COLORS[datum.quality]
cell.text:SetTextColor(color.r, color.g, color.b)
end,
},
{
title = 'Qty',
width = 25,
comparator = function(row1, row2) return Aux.util.compare(row1.aux_quantity, row2.aux_quantity, Aux.util.LT) end,
cell_initializer = Aux.sheet.default_cell_initializer('RIGHT'),
cell_setter = function(cell, datum)
cell.text:SetText(datum.aux_quantity)
end,
},
Aux.listing_util.money_column('Bid', function(entry) return entry.bid_price end),
Aux.listing_util.money_column('Bid/ea', function(entry) return entry.unit_bid_price end),
{
title = 'Status',
width = 70,
comparator = function(auction1, auction2) return Aux.util.compare(auction1.status, auction2.status, Aux.util.GT) end,
cell_initializer = Aux.sheet.default_cell_initializer('CENTER'),
cell_setter = function(cell, auction)
cell.text:SetText(auction.status)
end,
},
{
title = 'Left',
width = 30,
comparator = function(row1, row2) return Aux.util.compare(row1.duration, row2.duration, Aux.util.GT) end,
cell_initializer = Aux.sheet.default_cell_initializer('CENTER'),
cell_setter = function(cell, datum)
local text
if datum.duration == 1 then
text = '30m'
elseif datum.duration == 2 then
text = '2h'
elseif datum.duration == 3 then
text = '8h'
elseif datum.duration == 4 then
text = '24h'
end
cell.text:SetText(text)
end,
},
{
title = 'Page',
width = 40,
comparator = function(row1, row2) return Aux.util.compare(row1.page, row2.page, Aux.util.LT) end,
cell_initializer = Aux.sheet.default_cell_initializer('RIGHT'),
cell_setter = function(cell, datum)
cell.text:SetText(datum.page)
end,
},
},
sort_order = {{column = 1, order = 'ascending' }, {column = 4, order = 'ascending' }, {column = 6, order = 'ascending'}},
},
[Aux.view.FULL] = {
frame = AuxFilterSearchFrameResultsFullListing,
on_row_click = function(sheet, row_index)
local data_index = row_index + FauxScrollFrame_GetOffset(sheet.scroll_frame)
private.on_row_click(sheet.data[data_index])
end,
on_row_enter = function(sheet, row_index)
Aux.info.set_tooltip(sheet.rows[row_index].itemstring, sheet.rows[row_index].EnhTooltip_info, this, 'ANCHOR_RIGHT', 0, 0)
end,
on_row_leave = function(sheet, row_index)
AuxTooltip:Hide()
ResetCursor()
end,
on_row_update = function(sheet, row_index)
if IsControlKeyDown() then
ShowInspectCursor()
elseif IsAltKeyDown() then
SetCursor('BUY_CURSOR')
else
ResetCursor()
end
end,
selected = function(datum)
return datum == selected_auction
end,
row_setter = function(row, datum)
row:SetAlpha(datum.gone and 0.3 or 1)
row.itemstring = Aux.info.itemstring(datum.item_id, datum.suffix_id, datum.unique_id, datum.enchant_id)
row.EnhTooltip_info = datum.EnhTooltip_info
end,
columns = {
{
title = 'Auction Item',
width = 280,
comparator = function(row1, row2) return Aux.util.compare(row1.tooltip[1][1].text, row2.tooltip[1][1].text, Aux.util.GT) end,
cell_initializer = function(cell)
local icon = CreateFrame('Button', nil, cell)
icon:EnableMouse(false)
local icon_texture = icon:CreateTexture(nil, 'BORDER')
icon_texture:SetAllPoints(icon)
icon.icon_texture = icon_texture
local normal_texture = icon:CreateTexture(nil)
normal_texture:SetPoint('CENTER', 0, 0)
normal_texture:SetWidth(22)
normal_texture:SetHeight(22)
normal_texture:SetTexture('Interface\\Buttons\\UI-Quickslot2')
icon:SetNormalTexture(normal_texture)
icon:SetPoint('LEFT', cell)
icon:SetWidth(12)
icon:SetHeight(12)
local text = cell:CreateFontString(nil, 'OVERLAY', 'GameFontHighlightSmall')
text:SetPoint('LEFT', icon, "RIGHT", 1, 0)
text:SetPoint('TOPRIGHT', cell)
text:SetPoint('BOTTOMRIGHT', cell)
text:SetJustifyV('TOP')
text:SetJustifyH('LEFT')
text:SetTextColor(0.8, 0.8, 0.8)
cell.text = text
cell.icon = icon
end,
cell_setter = function(cell, datum)
cell.icon.icon_texture:SetTexture(Aux.info.item(datum.item_id).texture)
if not datum.usable then
cell.icon.icon_texture:SetVertexColor(1.0, 0.1, 0.1)
else
cell.icon.icon_texture:SetVertexColor(1.0, 1.0, 1.0)
end
cell.text:SetText('['..datum.tooltip[1][1].text..']')
local color = ITEM_QUALITY_COLORS[datum.quality]
cell.text:SetTextColor(color.r, color.g, color.b)
end,
},
{
title = 'Lvl',
width = 25,
comparator = function(row1, row2) return Aux.util.compare(row1.level, row2.level, Aux.util.GT) end,
comparator = function(group1, group2) return Aux.util.compare(group1[1].level, group2[1].level, Aux.util.GT) end,
cell_initializer = Aux.sheet.default_cell_initializer('RIGHT'),
cell_setter = function(cell, datum)
local level = max(1, datum.level)
cell_setter = function(cell, group)
local level = max(1, group[1].level)
local text
if level > UnitLevel('player') then
text = RED_FONT_COLOR_CODE..level..FONT_COLOR_CODE_CLOSE
@@ -440,51 +260,20 @@ function public.on_load()
cell.text:SetText(text)
end,
},
{
title = 'Qty',
width = 25,
comparator = function(row1, row2) return Aux.util.compare(row1.aux_quantity, row2.aux_quantity, Aux.util.LT) end,
cell_initializer = Aux.sheet.default_cell_initializer('RIGHT'),
cell_setter = function(cell, datum)
cell.text:SetText(datum.aux_quantity)
end,
},
Aux.listing_util.money_column('Bid', function(entry) return entry.bid_price end),
Aux.listing_util.money_column('Buy', function(entry) return entry.buyout_price end),
Aux.listing_util.money_column('Bid/ea', function(entry) return entry.unit_bid_price end),
Aux.listing_util.money_column('Buy/ea', function(entry) return entry.unit_buyout_price end),
{
title = 'Status',
width = 70,
comparator = function(auction1, auction2) return Aux.util.compare(auction1.status, auction2.status, Aux.util.GT) end,
comparator = function(group1, group2) return Aux.util.compare(group1[1].status, group2[1].status, Aux.util.GT) end,
cell_initializer = Aux.sheet.default_cell_initializer('CENTER'),
cell_setter = function(cell, auction)
cell.text:SetText(auction.status)
end,
},
{
title = 'Left',
width = 30,
comparator = function(row1, row2) return Aux.util.compare(row1.duration, row2.duration, Aux.util.GT) end,
cell_initializer = Aux.sheet.default_cell_initializer('CENTER'),
cell_setter = function(cell, datum)
local text
if datum.duration == 1 then
text = '30m'
elseif datum.duration == 2 then
text = '2h'
elseif datum.duration == 3 then
text = '8h'
elseif datum.duration == 4 then
text = '24h'
end
cell.text:SetText(text)
end,
},
Aux.listing_util.owner_column(function(datum) return datum.owner end),
Aux.listing_util.percentage_market_column(function(entry) return entry.item_key end, function(entry) return entry.unit_buyout_price end),
Aux.listing_util.duration_column(function(group) return group[1].duration end),
Aux.listing_util.owner_column(function(group) return group[1].owner end),
Aux.listing_util.percentage_market_column(function(group) return group[1].item_key end, function(group) return group[1].unit_buyout_price end),
},
sort_order = {{column = 1, order = 'ascending' }, {column = 7, order = 'ascending' }},
sort_order = {{ column = 1, order = 'ascending' }, { column = 4, order = 'ascending' }},
},
}
@@ -492,8 +281,6 @@ function public.on_load()
favorite_searches = Aux.sheet.create(private.favorite_searches_config),
recent_searches = Aux.sheet.create(private.recent_searches_config),
[Aux.view.BUYOUT] = Aux.sheet.create(private.views[Aux.view.BUYOUT]),
[Aux.view.BID] = Aux.sheet.create(private.views[Aux.view.BID]),
[Aux.view.FULL] = Aux.sheet.create(private.views[Aux.view.FULL]),
}
do
local btn = Aux.gui.button(AuxFilterSearchFrame, 22)
@@ -566,6 +353,47 @@ function public.on_load()
btn:SetScript('OnClick', function() private.update_tab(FILTER) end)
private.new_filter_button = btn
end
do
local editbox = Aux.gui.editbox(AuxFilterSearchFrameItemFilter)
local function add_item_filter(item_id)
local old_filter_string = private.search_box:GetText()
old_filter_string = Aux.util.trim(old_filter_string)
if strlen(old_filter_string) > 0 and not strfind(old_filter_string, ';$') then
old_filter_string = old_filter_string..';'
end
local item_info = Aux.static.item_info(item_id)
private.search_box:SetText(old_filter_string..item_info.name..'/exact')
editbox:SetText('')
end
editbox.selector = Aux.completion.selector(editbox, function()
add_item_filter(editbox.selector.selected_value())
end)
editbox:SetPoint('TOPLEFT', 5, -28)
editbox:SetWidth(250)
editbox:SetScript('OnTextChanged', function()
this.selector.suggest()
end)
editbox:SetScript('OnTabPressed', function()
if IsShiftKeyDown() then
this.selector.previous()
else
this.selector.next()
end
end)
editbox:SetScript('OnEnterPressed', function()
this.selector.close()
if this.selector.selected_value() then
add_item_filter(this.selector.selected_value())
-- this:ClearFocus()
end
end)
editbox:SetScript('OnEscapePressed', function()
this.selector.clear()
this:ClearFocus()
end)
end
do
local btn1 = Aux.gui.button(AuxFilterSearchFrameFilters, 16)
btn1:SetPoint('BOTTOMLEFT', 8, 15)
@@ -594,15 +422,6 @@ function public.on_load()
private.clear_filter()
end)
end
do
-- local tab_group = Aux.gui.tab_group(AuxFilterSearchFrameResults, 'TOP')
-- tab_group:create_tab('Buy')
-- tab_group:create_tab('Bid')
-- tab_group:create_tab('Full')
-- tab_group.on_select = Aux.filter_search_frame.set_view
-- private.tab_group = tab_group
-- tab_group.container:Hide()
end
do
local status_bar = Aux.gui.status_bar(AuxFilterSearchFrame)
status_bar:SetWidth(265)
@@ -633,7 +452,7 @@ function public.on_load()
do
local editbox = Aux.gui.editbox(AuxFilterSearchFrameFilters, '$parentNameInputBox')
editbox:SetPoint('TOPLEFT', 14, -20)
editbox:SetWidth(150)
editbox:SetWidth(250)
editbox:SetScript('OnTabPressed', function()
if IsShiftKeyDown() then
getglobal(this:GetParent():GetName()..'TooltipInputBox4'):SetFocus()
@@ -717,8 +536,8 @@ function public.on_load()
end
do
local editbox = Aux.gui.editbox(AuxFilterSearchFrameFilters, '$parentTooltipInputBox1')
editbox:SetPoint('TOPLEFT', 14, -177)
editbox:SetWidth(150)
editbox:SetPoint('TOPLEFT', 300, -20)
editbox:SetWidth(250)
editbox:SetScript('OnTabPressed', function()
if IsShiftKeyDown() then
getglobal(this:GetParent():GetName()..'MaxLevel'):SetFocus()
@@ -739,8 +558,8 @@ function public.on_load()
end
do
local editbox = Aux.gui.editbox(AuxFilterSearchFrameFilters, '$parentTooltipInputBox2')
editbox:SetPoint('TOPLEFT', 14, -198)
editbox:SetWidth(150)
editbox:SetPoint('TOPLEFT', AuxFilterSearchFrameFiltersTooltipInputBox1 , 'BOTTOMLEFT', 0, -3)
editbox:SetWidth(250)
editbox:SetScript('OnTabPressed', function()
if IsShiftKeyDown() then
getglobal(this:GetParent():GetName()..'TooltipInputBox1'):SetFocus()
@@ -758,8 +577,8 @@ function public.on_load()
end
do
local editbox = Aux.gui.editbox(AuxFilterSearchFrameFilters, '$parentTooltipInputBox3')
editbox:SetPoint('TOPLEFT', 14, -219)
editbox:SetWidth(150)
editbox:SetPoint('TOPLEFT', AuxFilterSearchFrameFiltersTooltipInputBox2 , 'BOTTOMLEFT', 0, -3)
editbox:SetWidth(250)
editbox:SetScript('OnTabPressed', function()
if IsShiftKeyDown() then
getglobal(this:GetParent():GetName()..'TooltipInputBox2'):SetFocus()
@@ -777,8 +596,8 @@ function public.on_load()
end
do
local editbox = Aux.gui.editbox(AuxFilterSearchFrameFilters, '$parentTooltipInputBox4')
editbox:SetPoint('TOPLEFT', 14, -240)
editbox:SetWidth(150)
editbox:SetPoint('TOPLEFT', AuxFilterSearchFrameFiltersTooltipInputBox3 , 'BOTTOMLEFT', 0, -3)
editbox:SetWidth(250)
editbox:SetScript('OnTabPressed', function()
if IsShiftKeyDown() then
getglobal(this:GetParent():GetName()..'TooltipInputBox3'):SetFocus()
@@ -794,29 +613,6 @@ function public.on_load()
this:ClearFocus()
end)
end
do
local editbox = Aux.gui.editbox(AuxFilterSearchFrameFilters, '$parentPageEditBox')
editbox:SetNumeric(true)
editbox:EnableMouse(false)
editbox:SetAlpha(0.5)
editbox:SetPoint('BOTTOMLEFT', 111, 15)
editbox:SetWidth(30)
editbox:SetScript('OnEnterPressed', function()
this:ClearFocus()
public.start_search()
end)
editbox:SetScript('OnEscapePressed', function()
this:ClearFocus()
end)
local label = Aux.gui.label(editbox, 13)
label:SetPoint('BOTTOMLEFT', editbox, 'TOPLEFT', -2, 1)
label:SetText('Page')
end
do
local label = Aux.gui.label(AuxFilterSearchFrameFiltersAllPagesCheckButton, 13)
label:SetPoint('BOTTOMLEFT', AuxFilterSearchFrameFiltersAllPagesCheckButton, 'TOPLEFT', 1, -3)
label:SetText('All')
end
-- TODO replace with real gui dropdown
-- CreateFrame('Frame', '$parentCategoryDropDown', AuxFilterSearchFrameFilters, 'UIDropDownMenuTemplate')
@@ -862,20 +658,17 @@ function private.update_listing()
if aux_view == Aux.view.BUYOUT then
AuxFilterSearchFrameResultsBuyListing:Show()
local buyout_auctions = auctions and Aux.util.filter(auctions, function(auction) return auction.owner ~= UnitName('player') and auction.buyout_price end) or {}
Aux.sheet.populate(private.listings[Aux.view.BUYOUT], auctions and Aux.util.group_by(buyout_auctions, function(a1, a2) return a1.item_id == a2.item_id and a1.suffix_id == a2.suffix_id and a1.enchant_id == a2.enchant_id and a1.aux_quantity == a2.aux_quantity and a1.buyout_price == a2.buyout_price end) or {})
Aux.sheet.populate(private.listings[Aux.view.BUYOUT], auctions and Aux.util.group_by(buyout_auctions, function(a1, a2)
return a1.item_id == a2.item_id
and a1.suffix_id == a2.suffix_id
and a1.enchant_id == a2.enchant_id
and a1.aux_quantity == a2.aux_quantity
and a1.buyout_price == a2.buyout_price
and a1.bid_price == a2.bid_price
and a1.owner == a2.owner
end) or {})
AuxFilterSearchFrameResults:SetWidth(AuxFilterSearchFrameResultsBuyListing:GetWidth() + 40)
AuxFrame:SetWidth(AuxFilterSearchFrameResults:GetWidth() + 15)
elseif aux_view == Aux.view.BID then
AuxFilterSearchFrameResultsBidListing:Show()
local bid_auctions = auctions and Aux.util.filter(auctions, function(auction) return auction.owner ~= UnitName('player') end) or {}
Aux.sheet.populate(private.listings[Aux.view.BID], bid_auctions)
AuxFilterSearchFrameResults:SetWidth(AuxFilterSearchFrameResultsBidListing:GetWidth() + 40)
AuxFrame:SetWidth(AuxFilterSearchFrameResults:GetWidth() + 15)
elseif aux_view == Aux.view.FULL then
AuxFilterSearchFrameResultsFullListing:Show()
Aux.sheet.populate(private.listings[Aux.view.FULL], auctions or {})
AuxFilterSearchFrameResults:SetWidth(AuxFilterSearchFrameResultsFullListing:GetWidth() + 40)
AuxFrame:SetWidth(AuxFilterSearchFrameResults:GetWidth() + 15)
end
end
@@ -891,6 +684,7 @@ function public.start_search()
while getn(aux_recent_searches) > 50 do
tremove(aux_recent_searches)
end
private.update_search_listings()
Aux.scan.abort(function()
filter_search_frame.xml
+14 -33
View File
@@ -13,19 +13,14 @@
<Frame name="AuxFilterSearchFrame" hidden="true" parent="AuxFrame" setAllPoints="true">
<Frames>
<Frame name="$parentFilters" inherits="AuxFrameBoxTemplate">
<Size><AbsDimension x="178" y="326"/></Size>
<Size><AbsDimension x="600" y="290"/></Size>
<Anchors><Anchor point="TOPLEFT"><Offset><AbsDimension x="5" y="-70"/></Offset></Anchor></Anchors>
<Scripts>
<OnLoad>
<!--getglobal(this:GetName().."Title"):SetText('Filters')-->
</OnLoad>
</Scripts>
<Frames>
<Frame name="$parentCategoryDropDown" inherits="UIDropDownMenuTemplate">
<Anchors><Anchor point="TOPLEFT"><Offset><AbsDimension x="14" y="-53" /></Offset></Anchor></Anchors>
<Scripts>
<OnLoad>
<!--UIDropDownMenu_SetWidth(100)-->
UIDropDownMenu_Initialize(this, AuxFilterSearchFrameFiltersCategoryDropDown_Initialize)
</OnLoad>
<OnShow>
@@ -38,7 +33,6 @@
<Anchors><Anchor point="TOPLEFT"><Offset><AbsDimension x="14" y="-93" /></Offset></Anchor></Anchors>
<Scripts>
<OnLoad>
<!--UIDropDownMenu_SetWidth(100)-->
UIDropDownMenu_Initialize(this, AuxFilterSearchFrameFiltersQualityDropDown_Initialize)
</OnLoad>
<OnShow>
@@ -50,19 +44,12 @@
<Size><AbsDimension x="22" y="22"/></Size>
<Anchors><Anchor point="TOPLEFT"><Offset><AbsDimension x="87" y="-136" /></Offset></Anchor></Anchors>
</CheckButton>
<CheckButton name="$parentAllPagesCheckButton" inherits="UICheckButtonTemplate" checked="true">
<Size><AbsDimension x="22" y="22"/></Size>
<Anchors><Anchor point="BOTTOMLEFT" ><Offset><AbsDimension x="144" y="15"/></Offset></Anchor></Anchors>
<Scripts>
<OnClick>
AuxFilterSearchFrameFiltersPageEditBox:EnableMouse(not this:GetChecked())
AuxFilterSearchFrameFiltersPageEditBox:SetAlpha(this:GetChecked() and 0.5 or 1)
AuxFilterSearchFrameFiltersPageEditBox:ClearFocus()
</OnClick>
</Scripts>
</CheckButton>
</Frames>
</Frame>
<Frame name="$parentItemFilter" inherits="AuxFrameBoxTemplate">
<Size><AbsDimension x="300" y="326"/></Size>
<Anchors><Anchor point="LEFT" relativePoint="RIGHT" relativeTo="$parentFilters"><Offset><AbsDimension x="5" y="0"/></Offset></Anchor></Anchors>
</Frame>
<Frame name="$parentResults" inherits="AuxFrameBoxTemplate">
<Size>
<AbsDimension x="655" y="300"/>
@@ -89,23 +76,17 @@
</Frame>
</Frames>
</Frame>
<Frame name="$parentSaved" inherits="AuxFrameBoxTemplate">
<Size>
<AbsDimension x="655" y="300"/>
</Size>
<Frame name="$parentSaved">
<Size><AbsDimension x="655" y="400"/></Size>
<Anchors><Anchor point="TOPLEFT"><Offset><AbsDimension x="3" y="-65"/></Offset></Anchor></Anchors>
<Frames>
<Frame name="$parentFavoriteListing" hidden="true">
<Anchors>
<Anchor point="TOPLEFT"><Offset><AbsDimension x="0" y="0"/></Offset></Anchor>
<Anchor point="BOTTOM"><Offset><AbsDimension x="0" y="0"/></Offset></Anchor>
</Anchors>
<Frame name="$parentRecentListing" inherits="AuxFrameBoxTemplate">
<Size><AbsDimension x="0" y="150"/></Size>
<Anchors><Anchor point="TOPLEFT"><Offset><AbsDimension x="0" y="0"/></Offset></Anchor></Anchors>
</Frame>
<Frame name="$parentRecentListing" hidden="true">
<Anchors>
<Anchor point="TOPLEFT" relativepoint="TOPRIGHT" relativeto="$parentFavoriteListing"><Offset><AbsDimension x="0" y="0"/></Offset></Anchor>
<Anchor point="BOTTOM"><Offset><AbsDimension x="0" y="0"/></Offset></Anchor>
</Anchors>
<Frame name="$parentFavoriteListing" inherits="AuxFrameBoxTemplate">
<Size><AbsDimension x="0" y="150"/></Size>
<Anchors><Anchor point="TOP" relativeTo="$parentRecentListing" relativePoint="BOTTOM"><Offset><AbsDimension x="0" y="0"/></Offset></Anchor></Anchors>
</Frame>
</Frames>
</Frame>
item_search_frame.lua
+43 -243
View File
@@ -32,7 +32,6 @@ function public.on_open()
if not private.item_id then
AuxItemSearchFrameItemRefreshButton:Disable()
end
private.tab_group:set_tab(aux_view)
end
function public.on_load()
@@ -129,8 +128,37 @@ function public.on_load()
cell.text:SetText(group[1].aux_quantity)
end,
},
Aux.listing_util.money_column('Bid', function(group) return group[1].bid_price end),
Aux.listing_util.money_column('Buy', function(group) return group[1].buyout_price end),
Aux.listing_util.money_column('Bid/ea', function(group) return group[1].unit_bid_price end),
Aux.listing_util.money_column('Buy/ea', function(group) return group[1].unit_buyout_price end),
{
title = 'Lvl',
width = 25,
comparator = function(group1, group2) return Aux.util.compare(group1[1].level, group2[1].level, Aux.util.GT) end,
cell_initializer = Aux.sheet.default_cell_initializer('RIGHT'),
cell_setter = function(cell, group)
local level = max(1, group[1].level)
local text
if level > UnitLevel('player') then
text = RED_FONT_COLOR_CODE..level..FONT_COLOR_CODE_CLOSE
else
text = level
end
cell.text:SetText(text)
end,
},
{
title = 'Status',
width = 70,
comparator = function(group1, group2) return Aux.util.compare(group1[1].status, group2[1].status, Aux.util.GT) end,
cell_initializer = Aux.sheet.default_cell_initializer('CENTER'),
cell_setter = function(cell, auction)
cell.text:SetText(auction.status)
end,
},
Aux.listing_util.duration_column(function(group) return group[1].duration end),
Aux.listing_util.owner_column(function(group) return group[1].owner end),
{
title = 'Avail',
width = 40,
@@ -144,197 +172,11 @@ function public.on_load()
},
sort_order = {{column = 3, order = 'ascending' }},
},
[Aux.view.BID] = {
frame = AuxItemSearchFrameAuctionsBidListing,
on_row_click = function(sheet, row_index)
local data_index = row_index + FauxScrollFrame_GetOffset(sheet.scroll_frame)
private.on_row_click(sheet.data[data_index])
end,
on_row_enter = function(sheet, row_index)
Aux.info.set_tooltip(sheet.rows[row_index].itemstring, sheet.rows[row_index].EnhTooltip_info, this, 'ANCHOR_RIGHT', 0, 0)
end,
on_row_leave = function(sheet, row_index)
AuxTooltip:Hide()
ResetCursor()
end,
on_row_update = function(sheet, row_index)
if IsControlKeyDown() then
ShowInspectCursor()
elseif IsAltKeyDown() then
SetCursor('BUY_CURSOR')
else
ResetCursor()
end
end,
selected = function(datum)
return datum == selected_auction
end,
row_setter = function(row, datum)
row:SetAlpha(datum.gone and 0.3 or 1)
row.itemstring = Aux.info.itemstring(datum.item_id, datum.suffix_id, datum.unique_id, datum.enchant_id)
row.EnhTooltip_info = datum.EnhTooltip_info
end,
columns = {
{
title = 'Qty',
width = 25,
comparator = function(row1, row2) return Aux.util.compare(row1.aux_quantity, row2.aux_quantity, Aux.util.LT) end,
cell_initializer = Aux.sheet.default_cell_initializer('RIGHT'),
cell_setter = function(cell, datum)
cell.text:SetText(datum.aux_quantity)
end,
},
Aux.listing_util.money_column('Bid', function(entry) return entry.bid_price end),
Aux.listing_util.money_column('Bid/ea', function(entry) return entry.unit_bid_price end),
{
title = 'Status',
width = 70,
comparator = function(auction1, auction2) return Aux.util.compare(auction1.status, auction2.status, Aux.util.GT) end,
cell_initializer = Aux.sheet.default_cell_initializer('CENTER'),
cell_setter = function(cell, auction)
cell.text:SetText(auction.status)
end,
},
{
title = 'Left',
width = 30,
comparator = function(row1, row2) return Aux.util.compare(row1.duration, row2.duration, Aux.util.GT) end,
cell_initializer = Aux.sheet.default_cell_initializer('CENTER'),
cell_setter = function(cell, datum)
local text
if datum.duration == 1 then
text = '30m'
elseif datum.duration == 2 then
text = '2h'
elseif datum.duration == 3 then
text = '8h'
elseif datum.duration == 4 then
text = '24h'
end
cell.text:SetText(text)
end,
},
{
title = 'Page',
width = 40,
comparator = function(row1, row2) return Aux.util.compare(row1.page, row2.page, Aux.util.LT) end,
cell_initializer = Aux.sheet.default_cell_initializer('RIGHT'),
cell_setter = function(cell, datum)
cell.text:SetText(datum.page)
end,
},
},
sort_order = {{column = 3, order = 'ascending'}, {column = 5, order = 'ascending'}},
},
[Aux.view.FULL] = {
frame = AuxItemSearchFrameAuctionsFullListing,
on_row_click = function (sheet, row_index)
local data_index = row_index + FauxScrollFrame_GetOffset(sheet.scroll_frame)
private.on_row_click(sheet.data[data_index])
end,
on_row_enter = function(sheet, row_index)
Aux.info.set_tooltip(sheet.rows[row_index].itemstring, sheet.rows[row_index].EnhTooltip_info, this, 'ANCHOR_RIGHT', 0, 0)
end,
on_row_leave = function(sheet, row_index)
AuxTooltip:Hide()
ResetCursor()
end,
on_row_update = function(sheet, row_index)
if IsControlKeyDown() then
ShowInspectCursor()
elseif IsAltKeyDown() then
SetCursor('BUY_CURSOR')
else
ResetCursor()
end
end,
selected = function(datum)
return datum == selected_auction
end,
row_setter = function(row, datum)
row:SetAlpha(datum.gone and 0.3 or 1)
row.itemstring = Aux.info.itemstring(datum.item_id, datum.suffix_id, datum.unique_id, datum.enchant_id)
row.EnhTooltip_info = datum.EnhTooltip_info
end,
columns = {
{
title = 'Qty',
width = 25,
comparator = function(row1, row2) return Aux.util.compare(row1.aux_quantity, row2.aux_quantity, Aux.util.LT) end,
cell_initializer = Aux.sheet.default_cell_initializer('RIGHT'),
cell_setter = function(cell, datum)
cell.text:SetText(datum.aux_quantity)
end,
},
Aux.listing_util.money_column('Bid', function(entry) return entry.bid_price end),
Aux.listing_util.money_column('Buy', function(entry) return entry.buyout_price end),
Aux.listing_util.money_column('Bid/ea', function(entry) return entry.unit_bid_price end),
Aux.listing_util.money_column('Buy/ea', function(entry) return entry.unit_buyout_price end),
{
title = 'Lvl',
width = 25,
comparator = function(row1, row2) return Aux.util.compare(row1.level, row2.level, Aux.util.GT) end,
cell_initializer = Aux.sheet.default_cell_initializer('RIGHT'),
cell_setter = function(cell, datum)
local level = max(1, datum.level)
local text
if level > UnitLevel('player') then
text = RED_FONT_COLOR_CODE..level..FONT_COLOR_CODE_CLOSE
else
text = level
end
cell.text:SetText(text)
end,
},
{
title = 'Status',
width = 70,
comparator = function(auction1, auction2) return Aux.util.compare(auction1.status, auction2.status, Aux.util.GT) end,
cell_initializer = Aux.sheet.default_cell_initializer('CENTER'),
cell_setter = function(cell, auction)
cell.text:SetText(auction.status)
end,
},
{
title = 'Left',
width = 30,
comparator = function(row1, row2) return Aux.util.compare(row1.duration, row2.duration, Aux.util.GT) end,
cell_initializer = Aux.sheet.default_cell_initializer('CENTER'),
cell_setter = function(cell, datum)
local text
if datum.duration == 1 then
text = '30m'
elseif datum.duration == 2 then
text = '2h'
elseif datum.duration == 3 then
text = '8h'
elseif datum.duration == 4 then
text = '24h'
end
cell.text:SetText(text)
end,
},
Aux.listing_util.owner_column(function(datum) return datum.owner end),
{
title = 'Page',
width = 40,
comparator = function(row1, row2) return Aux.util.compare(row1.page, row2.page, Aux.util.LT) end,
cell_initializer = Aux.sheet.default_cell_initializer('RIGHT'),
cell_setter = function(cell, datum)
cell.text:SetText(datum.page)
end,
},
Aux.listing_util.percentage_market_column(function(entry) return entry.item_key end, function(entry) return entry.unit_buyout_price end),
},
sort_order = {{column = 5, order = 'ascending'}},
},
}
private.listings = {
recently_searched = Aux.sheet.create(private.recently_searched_config),
[Aux.view.BUYOUT] = Aux.sheet.create(private.views[Aux.view.BUYOUT]),
[Aux.view.BID] = Aux.sheet.create(private.views[Aux.view.BID]),
[Aux.view.FULL] = Aux.sheet.create(private.views[Aux.view.FULL]),
}
do
local btn = Aux.gui.button(AuxItemSearchFrameItem, 16, '$parentRefreshButton')
@@ -353,17 +195,9 @@ function public.on_load()
btn:SetScript('OnClick', Aux.item_search_frame.stop_search)
btn:Hide()
end
do
local tab_group = Aux.gui.tab_group(AuxItemSearchFrameAuctions, 'TOP')
tab_group:create_tab('Buy')
tab_group:create_tab('Bid')
tab_group:create_tab('Full')
tab_group.on_select = Aux.item_search_frame.set_view
private.tab_group = tab_group
end
do
local editbox = Aux.gui.editbox(AuxItemSearchFrameItem, '$parentItemInputBox')
editbox.selector = Aux.completion.selector(editbox)
editbox.selector = Aux.completion.selector(editbox, function() AuxItemSearchFrameItemItemInputBox:ClearFocus() end)
editbox:SetPoint('TOP', 0, -28)
editbox:SetWidth(185)
editbox:SetScript('OnTextChanged', function()
@@ -424,29 +258,6 @@ function public.on_load()
btn:Disable()
private.bid_button = btn
end
do
local editbox = Aux.gui.editbox(AuxItemSearchFrameItem, '$parentPageEditBox')
editbox:SetNumeric(true)
editbox:EnableMouse(false)
editbox:SetAlpha(0.5)
editbox:SetPoint('BOTTOMLEFT', 111, 15)
editbox:SetWidth(30)
editbox:SetScript('OnEnterPressed', function()
this:ClearFocus()
Aux.filter_search_frame.start_search()
end)
editbox:SetScript('OnEscapePressed', function()
this:ClearFocus()
end)
local label = Aux.gui.label(editbox, 13)
label:SetPoint('BOTTOMLEFT', editbox, 'TOPLEFT', -2, 1)
label:SetText('Page')
end
do
local label = Aux.gui.label(AuxItemSearchFrameItemAllPagesCheckButton, 13)
label:SetPoint('BOTTOMLEFT', AuxItemSearchFrameItemAllPagesCheckButton, 'TOPLEFT', 1, -3)
label:SetText('All')
end
end
function public.stop_search()
@@ -463,30 +274,19 @@ function private.update_listing()
AuxItemSearchFrameAuctionsBidListing:Hide()
AuxItemSearchFrameAuctionsFullListing:Hide()
if aux_view == Aux.view.BUYOUT then
AuxItemSearchFrameAuctionsBuyListing:Show()
local buy_records = auctions and Aux.util.filter(auctions, function(auction) return auction.owner ~= UnitName('player') and auction.buyout_price end) or {}
Aux.sheet.populate(private.listings[Aux.view.BUYOUT], auctions and Aux.util.group_by(buy_records, function(a1, a2) return a1.item_id == a2.item_id and a1.suffix_id == a2.suffix_id and a1.enchant_id == a2.enchant_id and a1.aux_quantity == a2.aux_quantity and a1.buyout_price == a2.buyout_price end) or {})
AuxItemSearchFrameAuctions:SetWidth(AuxItemSearchFrameAuctionsBuyListing:GetWidth() + 40)
AuxFrame:SetWidth(AuxItemSearchFrameItem:GetWidth() + AuxItemSearchFrameAuctions:GetWidth() + 15)
elseif aux_view == Aux.view.BID then
AuxItemSearchFrameAuctionsBidListing:Show()
local bid_records = auctions and Aux.util.filter(auctions, function(auction) return auction.owner ~= UnitName('player') end) or {}
Aux.sheet.populate(private.listings[Aux.view.BID], bid_records)
AuxItemSearchFrameAuctions:SetWidth(AuxItemSearchFrameAuctionsBidListing:GetWidth() + 40)
AuxFrame:SetWidth(AuxItemSearchFrameItem:GetWidth() + AuxItemSearchFrameAuctions:GetWidth() + 15)
elseif aux_view == Aux.view.FULL then
AuxItemSearchFrameAuctionsFullListing:Show()
Aux.sheet.populate(private.listings[Aux.view.FULL], auctions or {})
AuxItemSearchFrameAuctions:SetWidth(AuxItemSearchFrameAuctionsFullListing:GetWidth() + 40)
AuxFrame:SetWidth(AuxItemSearchFrameItem:GetWidth() + AuxItemSearchFrameAuctions:GetWidth() + 15)
end
end
function public.set_view(view)
private.clear_selection()
aux_view = view
refresh = true
AuxItemSearchFrameAuctionsBuyListing:Show()
local buy_records = auctions and Aux.util.filter(auctions, function(auction) return auction.owner ~= UnitName('player') and auction.buyout_price end) or {}
Aux.sheet.populate(private.listings[Aux.view.BUYOUT], auctions and Aux.util.group_by(buy_records, function(a1, a2)
return a1.item_id == a2.item_id
and a1.suffix_id == a2.suffix_id
and a1.enchant_id == a2.enchant_id
and a1.aux_quantity == a2.aux_quantity
and a1.buyout_price == a2.buyout_price
and a1.bid_price == a2.bid_price
and a1.owner == a2.owner
end) or {})
AuxItemSearchFrameAuctions:SetWidth(AuxItemSearchFrameAuctionsBuyListing:GetWidth() + 40)
AuxFrame:SetWidth(AuxItemSearchFrameItem:GetWidth() + AuxItemSearchFrameAuctions:GetWidth() + 15)
end
function private.update_recently_searched()
item_search_frame.xml
-11
View File
@@ -35,17 +35,6 @@
</OnClick>
</scripts>
</Button>
<CheckButton name="$parentAllPagesCheckButton" inherits="UICheckButtonTemplate" checked="true">
<Size><AbsDimension x="22" y="22"/></Size>
<Anchors><Anchor point="BOTTOMLEFT" ><Offset><AbsDimension x="144" y="15"/></Offset></Anchor></Anchors>
<Scripts>
<OnClick>
AuxItemSearchFrameItemPageEditBox:EnableMouse(not this:GetChecked())
AuxItemSearchFrameItemPageEditBox:SetAlpha(this:GetChecked() and 0.5 or 1)
AuxItemSearchFrameItemPageEditBox:ClearFocus()
</OnClick>
</Scripts>
</CheckButton>
</Frames>
</Frame>
<Frame name="$parentRecentlySearched" inherits="AuxFrameBoxTemplate">
listing_util.lua
+25 -4
View File
@@ -1,15 +1,14 @@
local m = {}
Aux.listing_util = m
function m.money_column(name, getter)
function m.money_column(title, getter)
return {
title = name,
title = title,
width = 80,
comparator = function(datum1, datum2) return Aux.util.compare(getter(datum1), getter(datum2), Aux.util.GT) end,
cell_initializer = Aux.sheet.default_cell_initializer('RIGHT'),
cell_setter = function(cell, datum)
cell.text:SetText(getter(datum) and Aux.util.money_string(getter(datum)) or 'N/A')
-- group_alpha_setter(cell, getter(datum))
end,
}
end
@@ -31,7 +30,7 @@ function m.owner_column(getter)
end,
cell_initializer = Aux.sheet.default_cell_initializer('LEFT'),
cell_setter = function(cell, datum)
cell.text:SetText(getter(datum) == UnitName('player') and GREEN_FONT_COLOR_CODE..'You'..FONT_COLOR_CODE_CLOSE or getter(datum))
cell.text:SetText(getter(datum) == UnitName('player') and GREEN_FONT_COLOR_CODE..'You'..FONT_COLOR_CODE_CLOSE or getter(datum) or 'N/A')
end,
}
end
@@ -65,4 +64,26 @@ function m.percentage_market_column(item_key_getter, value_getter)
end
end,
}
end
function m.duration_column(getter)
return {
title = 'Left',
width = 30,
comparator = function(datum1, datum2) return Aux.util.compare(getter(datum1), getter(datum2), Aux.util.GT) end,
cell_initializer = Aux.sheet.default_cell_initializer('CENTER'),
cell_setter = function(cell, datum)
local text
if getter(datum) == 1 then
text = '30m'
elseif getter(datum) == 2 then
text = '2h'
elseif getter(datum) == 3 then
text = '8h'
elseif getter(datum) == 4 then
text = '24h'
end
cell.text:SetText(text)
end,
}
end
scan.lua
+14 -14
View File
@@ -84,12 +84,12 @@ end
function wait_for_owner_data(k)
local t0 = time()
return controller().wait(function()
if time() - t0 > 5 then -- we won't wait longer than 5 seconds
if time() - t0 > 10 then -- we won't wait longer than 10 seconds
return true
end
local count, _ = GetNumAuctionItems(state.params.type)
local count, _ = GetNumAuctionItems(current_query().type)
for i=1,count do
local auction_info = Aux.info.auction(i, state.params.type)
local auction_info = Aux.info.auction(i, current_query().type)
if auction_info and not auction_info.owner then
return false
end
@@ -203,17 +203,17 @@ function submit_query(k)
state.params.on_submit_query()
end
wait_for_results(function()
--wait_for_owner_data(function()
local _, total_count = GetNumAuctionItems(current_query().type)
state.total_pages = math.ceil(total_count / PAGE_SIZE)
if state.total_pages >= state.page + 1 then
wait_for_callback{state.params.on_page_loaded or Aux.util.pass, state.page, state.total_pages, function()
return k()
end}
else
return k()
end
-- end)
wait_for_owner_data(function()
local _, total_count = GetNumAuctionItems(current_query().type)
state.total_pages = math.ceil(total_count / PAGE_SIZE)
if state.total_pages >= state.page + 1 then
wait_for_callback{state.params.on_page_loaded or Aux.util.pass, state.page, state.total_pages, function()
return k()
end}
else
return k()
end
end)
end)
if current_query().type == 'bidder' then
GetBidderAuctionItems(state.page)
scan_util.lua
+3 -3
View File
@@ -12,7 +12,7 @@ function m.find(test, query, page, status_bar, on_failure, on_success)
local new_query = {
type = query.type,
validator = test,
validator = function(auction_info) return test(auction_info.index) end,
blizzard_query = query.blizzard_query,
next_page = function()
if getn(pages) == 1 then
@@ -21,11 +21,11 @@ function m.find(test, query, page, status_bar, on_failure, on_success)
local page = pages[1]
tremove(pages, 1)
return page
end
end,
}
Aux.scan.start{
queries = { query },
queries = { new_query },
on_read_auction = function(auction_info, ctrl)
if test(auction_info.index) then
ctrl.suspend()
sheet.lua
+2 -2
View File
@@ -13,7 +13,7 @@ MoneyTypeInfo['AUX_LIST'] = {
}
function public.render(sheet)
for i, column in ipairs(sheet.columns) do
local sort_info = sheet.sort_order[1]
@@ -32,7 +32,7 @@ function public.render(sheet)
sheet.labels[i].sort_texture:Hide()
end
end
FauxScrollFrame_Update(sheet.scroll_frame, getn(sheet.data), getn(sheet.rows), 16)
sheet.scroll_frame:Show()
local offset = FauxScrollFrame_GetOffset(sheet.scroll_frame)