some finishing touches for the full new ui release

manage_frame.lua

@@ -10,7 +10,7 @@ local BIDS, AUCTIONS = 1, 2
 public.bid_listing_config = {
     on_row_click = function(sheet, row_index, column_index)
         local data_index = row_index + FauxScrollFrame_GetOffset(sheet.scroll_frame)
-        AuxBuyEntry_OnClick(sheet.data[data_index])
+        public.on_bid_click(sheet.data[data_index])
     end,
 
     on_row_enter = function(sheet, row_index, column_index)
@@ -19,18 +19,19 @@ public.bid_listing_config = {
 
     on_row_leave = function(sheet, row_index, column_index)
         sheet.rows[row_index].highlight:SetAlpha(0)
+        ResetCursor()
     end,
+    on_row_update = function(sheet, row_index)
+        if IsControlKeyDown() then
+            ShowInspectCursor()
+        elseif IsAltKeyDown() then
+            SetCursor('BUY_CURSOR')
+        else
+            ResetCursor()
+        end
+    end,
+
     columns = {
-        {
-            title = 'Qty',
-            width = 23,
-            comparator = function(row1, row2) return Aux.util.compare(row1.stack_size, row2.stack_size, Aux.util.LT) end,
-            cell_initializer = Aux.sheet.default_cell_initializer('RIGHT'),
-            cell_setter = function(cell, datum)
-                cell.text:SetText(datum.stack_size)
-                private.auction_alpha_setter(cell, datum)
-            end,
-        },
         {
             title = 'Auction Item',
             width = 157,
@@ -50,8 +51,6 @@ public.bid_listing_config = {
                 icon:SetPoint('LEFT', cell)
                 icon:SetWidth(12)
                 icon:SetHeight(12)
-                icon:SetScript('OnEnter', function() Aux.info.set_game_tooltip(this, cell.tooltip, 'ANCHOR_CURSOR', cell.EnhTooltip_info) end)
-                icon:SetScript('OnLeave', function() AuxTooltip:Hide() end)
                 local text = cell:CreateFontString(nil, 'OVERLAY', 'GameFontHighlightSmall')
                 text:SetPoint("LEFT", icon, "RIGHT", 1, 0)
                 text:SetPoint('TOPRIGHT', cell)
@@ -63,9 +62,7 @@ public.bid_listing_config = {
                 cell.icon = icon
             end,
             cell_setter = function(cell, datum)
-                cell.tooltip = datum.tooltip
-                cell.EnhTooltip_info = datum.EnhTooltip_info
-                cell.icon.icon_texture:SetTexture(datum.texture)
+                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
@@ -77,6 +74,26 @@ public.bid_listing_config = {
                 private.auction_alpha_setter(cell, datum)
             end,
         },
+        {
+            title = 'Qty',
+            width = 25,
+            comparator = function(row1, row2) return Aux.util.compare(row1.stack_size, row2.stack_size, Aux.util.LT) end,
+            cell_initializer = Aux.sheet.default_cell_initializer('RIGHT'),
+            cell_setter = function(cell, datum)
+                cell.text:SetText(datum.aux_quantity)
+                private.auction_alpha_setter(cell, datum)
+            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)
+                private.auction_alpha_setter(cell, auction)
+            end,
+        },
         {
             title = 'Left',
             width = 30,
@@ -99,7 +116,7 @@ public.bid_listing_config = {
         },
         {
             title = 'Owner',
-            width = 70,
+            width = 90,
             comparator = function(row1, row2) return Aux.util.compare(row1.owner, row2.owner, Aux.util.GT) end,
             cell_initializer = Aux.sheet.default_cell_initializer('LEFT'),
             cell_setter = function(cell, datum)
@@ -108,18 +125,18 @@ public.bid_listing_config = {
             end,
         },
         {
-            title = 'Bid',
-            width = 70,
-            comparator = function(row1, row2) return Aux.util.compare(row1.bid, row2.bid, Aux.util.GT) end,
-            cell_initializer = Aux.sheet.default_cell_initializer('RIGHT'),
-            cell_setter = function(cell, datum)
-                cell.text:SetText(Aux.util.money_string(datum.bid))
-                private.auction_alpha_setter(cell, datum)
+            title = 'Your Bid',
+            width = 90,
+            comparator = function(auction1, auction2) return Aux.util.compare(auction1.current_bid, auction2.current_bid, Aux.util.GT) end,
+            cell_initializer = Aux.sheet.default_cell_initializer('CENTER'),
+            cell_setter = function(cell, auction)
+                cell.text:SetText(Aux.util.money_string(auction.current_bid))
+                private.auction_alpha_setter(cell, auction)
             end,
         },
         {
             title = 'Buy',
-            width = 70,
+            width = 90,
             comparator = function(row1, row2) return Aux.util.compare(row1.buyout_price, row2.buyout_price, Aux.util.GT) end,
             cell_initializer = Aux.sheet.default_cell_initializer('RIGHT'),
             cell_setter = function(cell, datum)
@@ -128,13 +145,13 @@ public.bid_listing_config = {
             end,
         },
     },
-    sort_order = {},
+    sort_order = {{ column = 1, order = 'ascending' }},
 }
 
 public.auction_listing_config = {
     on_row_click = function (sheet, row_index)
         local data_index = row_index + FauxScrollFrame_GetOffset(sheet.scroll_frame)
-        AuxBuyEntry_OnClick(sheet.data[data_index])
+        public.on_auction_click(sheet.data[data_index])
     end,
 
     on_row_enter = function (sheet, row_index)
@@ -145,16 +162,6 @@ public.auction_listing_config = {
         sheet.rows[row_index].highlight:SetAlpha(0)
     end,
     columns = {
-        {
-            title = 'Qty',
-            width = 23,
-            comparator = function(row1, row2) return Aux.util.compare(row1.stack_size, row2.stack_size, Aux.util.LT) end,
-            cell_initializer = Aux.sheet.default_cell_initializer('RIGHT'),
-            cell_setter = function(cell, datum)
-                cell.text:SetText(datum.stack_size)
-                private.auction_alpha_setter(cell, datum)
-            end,
-        },
         {
             title = 'Auction Item',
             width = 157,
@@ -174,8 +181,6 @@ public.auction_listing_config = {
                 icon:SetPoint('LEFT', cell)
                 icon:SetWidth(12)
                 icon:SetHeight(12)
-                icon:SetScript('OnEnter', function() Aux.info.set_game_tooltip(this, cell.tooltip, 'ANCHOR_CURSOR', cell.EnhTooltip_info) end)
-                icon:SetScript('OnLeave', function() AuxTooltip:Hide() end)
                 local text = cell:CreateFontString(nil, 'OVERLAY', 'GameFontHighlightSmall')
                 text:SetPoint("LEFT", icon, "RIGHT", 1, 0)
                 text:SetPoint('TOPRIGHT', cell)
@@ -187,9 +192,7 @@ public.auction_listing_config = {
                 cell.icon = icon
             end,
             cell_setter = function(cell, datum)
-                cell.tooltip = datum.tooltip
-                cell.EnhTooltip_info = datum.EnhTooltip_info
-                cell.icon.icon_texture:SetTexture(datum.texture)
+                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
@@ -201,6 +204,16 @@ public.auction_listing_config = {
                 private.auction_alpha_setter(cell, datum)
             end,
         },
+        {
+            title = 'Qty',
+            width = 25,
+            comparator = function(row1, row2) return Aux.util.compare(row1.stack_size, row2.stack_size, Aux.util.LT) end,
+            cell_initializer = Aux.sheet.default_cell_initializer('RIGHT'),
+            cell_setter = function(cell, datum)
+                cell.text:SetText(datum.aux_quantity)
+                private.auction_alpha_setter(cell, datum)
+            end,
+        },
         {
             title = 'Left',
             width = 30,
@@ -222,18 +235,28 @@ public.auction_listing_config = {
             end,
         },
         {
-            title = 'Bid',
-            width = 70,
-            comparator = function(row1, row2) return Aux.util.compare(row1.bid, row2.bid, Aux.util.GT) end,
-            cell_initializer = Aux.sheet.default_cell_initializer('RIGHT'),
-            cell_setter = function(cell, datum)
-                cell.text:SetText(Aux.util.money_string(datum.bid))
-                private.auction_alpha_setter(cell, datum)
+            title = 'Current Bid',
+            width = 90,
+            comparator = function(auction1, auction2) return Aux.util.compare(auction1.current_bid, auction2.current_bid, Aux.util.GT) end,
+            cell_initializer = Aux.sheet.default_cell_initializer('CENTER'),
+            cell_setter = function(cell, auction)
+                cell.text:SetText(auction.current_bid and Aux.util.money_string(auction.current_bid) or RED_FONT_COLOR_CODE..'No Bids'..FONT_COLOR_CODE_CLOSE)
+                private.auction_alpha_setter(cell, auction)
+            end,
+        },
+        {
+            title = 'Min Bid',
+            width = 90,
+            comparator = function(auction1, auction2) return Aux.util.compare(auction1.min_bid, auction2.min_bid, Aux.util.GT) end,
+            cell_initializer = Aux.sheet.default_cell_initializer('CENTER'),
+            cell_setter = function(cell, auction)
+                cell.text:SetText(Aux.util.money_string(auction.min_bid))
+                private.auction_alpha_setter(cell, auction)
             end,
         },
         {
             title = 'Buy',
-            width = 70,
+            width = 90,
             comparator = function(row1, row2) return Aux.util.compare(row1.buyout_price, row2.buyout_price, Aux.util.GT) end,
             cell_initializer = Aux.sheet.default_cell_initializer('RIGHT'),
             cell_setter = function(cell, datum)
@@ -242,7 +265,7 @@ public.auction_listing_config = {
             end,
         },
     },
-    sort_order = {},
+    sort_order = {{ column = 1, order = 'ascending' }},
 }
 
 function public.on_open()
@@ -272,8 +295,8 @@ function public.update_bid_records()
         on_page_loaded = function(page, total_pages)
 			Aux.log('Scanning bid page '..(page+1)..' out of '..total_pages..' ...')
         end,
-        on_read_auction = function(i)
-            private.create_bid_record(i)
+        on_read_auction = function(auction_info)
+            private.create_bid_record(auction_info)
         end,
         on_complete = function()
             Aux.log('Scan complete: '..getn(bid_records)..' bids found')
@@ -298,8 +321,8 @@ function public.update_auction_records()
         on_page_loaded = function(page, total_pages)
 			Aux.log('Scanning auction page '..(page+1)..' out of '..total_pages..' ...')
         end,
-        on_read_auction = function(i)
-            private.create_auction_record(i)
+        on_read_auction = function(auction_info)
+            private.create_auction_record(auction_info)
         end,
         on_complete = function()
             Aux.log('Scan complete: '..getn(auction_records)..' auctions found')
@@ -337,59 +360,218 @@ function public.update_listing()
     end
 end
 
-function private.create_record(auction_item)
+function private.create_record(auction_info)
+
+    local aux_quantity = auction_info.charges or auction_info.count
+    local bid = (auction_info.current_bid > 0 and auction_info.current_bid or auction_info.min_bid) + auction_info.min_increment
+    local buyout_price = auction_info.buyout_price > 0 and auction_info.buyout_price or nil
+    local buyout_price_per_unit = buyout_price and Aux_Round(auction_info.buyout_price / aux_quantity)
 
-    local stack_size = auction_item.charges or auction_item.count
-    local bid = (auction_item.current_bid > 0 and auction_item.current_bid or auction_item.min_bid) + auction_item.min_increment
-    local buyout_price = auction_item.buyout_price > 0 and auction_item.buyout_price or nil
-    local buyout_price_per_unit = buyout_price and Aux_Round(auction_item.buyout_price / stack_size)
     local status
-    if auction_item.current_bid == 0 then
-        status = 'No Bid'
-    elseif auction_item.high_bidder then
-        status = GREEN_FONT_COLOR_CODE..'Your Bid'..FONT_COLOR_CODE_CLOSE
+    if auction_info.high_bidder then
+        status = GREEN_FONT_COLOR_CODE..'High Bidder'..FONT_COLOR_CODE_CLOSE
     else
-        status = RED_FONT_COLOR_CODE..'Other Bidder'..FONT_COLOR_CODE_CLOSE
+        status = RED_FONT_COLOR_CODE..'Outbid'..FONT_COLOR_CODE_CLOSE
     end
 
     return {
-        key = auction_item.item_signature,
-        signature = Aux.auction_signature(auction_item.hyperlink, stack_size, bid, auction_item.buyout_price),
+        item_id = auction_info.item_id,
+        key = auction_info.item_signature,
+        signature = Aux.auction_signature(auction_info.hyperlink, aux_quantity, bid, auction_info.buyout_price),
 
-        name = auction_item.name,
-        level = auction_item.level,
-        texture = auction_item.texture,
-        tooltip = auction_item.tooltip,
-        stack_size = stack_size,
+        name = auction_info.name,
+        level = auction_info.level,
+        tooltip = auction_info.tooltip,
+        aux_quantity = aux_quantity,
         buyout_price = buyout_price,
         buyout_price_per_unit = buyout_price_per_unit,
-        quality = auction_item.quality,
-        hyperlink = auction_item.hyperlink,
-        itemstring = auction_item.itemstring,
+        quality = auction_info.quality,
+        hyperlink = auction_info.hyperlink,
+        itemstring = auction_info.itemstring,
         bid = bid,
-        bid_per_unit = Aux_Round(bid/stack_size),
-        owner = auction_item.owner,
-        duration = auction_item.duration,
-        usable = auction_item.usable,
-        high_bidder = auction_item.high_bidder,
+        bid_per_unit = Aux_Round(bid / aux_quantity),
+        owner = auction_info.owner,
+        duration = auction_info.duration,
+        usable = auction_info.usable,
+        high_bidder = auction_info.high_bidder,
+        current_bid = auction_info.current_bid > 0 and auction_info.current_bid or nil,
+        min_bid = auction_info.min_bid,
         status = status,
 
-        EnhTooltip_info = auction_item.EnhTooltip_info,
+        EnhTooltip_info = auction_info.EnhTooltip_info,
     }
 end
 
-function private.create_auction_record(index)
-    local auction_item = Aux.info.auction_item(index, 'owner')
-    if auction_item then
-        tinsert(auction_records, private.create_record(auction_item))
+function private.create_auction_record(auction_info)
+    tinsert(auction_records, private.create_record(auction_info))
+end
+
+function private.create_bid_record(auction_info)
+    tinsert(bid_records, private.create_record(auction_info))
+end
+
+function public.dialog_cancel()
+    Aux.log('Aborted.')
+    Aux.scan.abort()
+    AuxManageFrameListingDialog:Hide()
+    public.update_listing()
+end
+
+function private.find_auction(entry, action, express_mode)
+
+    if entry.gone then
+        Aux.log('Auction not available')
+        return
+    end
+
+    if action == 'buyout' and not entry.buyout_price then
+        Aux.log('Auction has no buyout price')
+        return
+    end
+
+    local amount
+    if action == 'buyout' then
+        amount = entry.buyout_price
+    elseif action == 'bid' then
+        amount = entry.bid
+    end
+
+    Aux.log('Processing '..action..' request for '..entry.hyperlink..' x '..entry.aux_quantity..' at '..Aux.util.money_string(amount)..' ...')
+
+    if not express_mode then
+        private.show_dialog(action, entry, amount)
+    end
+
+    PlaySound('igMainMenuOptionCheckBoxOn')
+
+    local found
+
+    Aux.scan.start{
+        type = action == 'cancel' and 'owner' or 'bidder',
+        page = entry.page,
+        on_read_auction = function(auction_info, ctrl)
+
+            local auction_record = private.create_record(auction_info)
+
+            if entry.signature == auction_record.signature then
+                ctrl.suspend()
+                found = true
+                Aux.log('Matching auction found.'..(express_mode and '' or ' Awaiting confirmation ...'))
+
+                if express_mode then
+                    if action == 'cancel' then
+                        CancelAuction(auction_info.index)
+                        entry.gone = true
+                        Aux.log('Canceled'..auction_record.hyperlink..' x '..auction_record.aux_quantity)
+                    elseif GetMoney() >= amount then
+                        PlaceAuctionBid('bidder', auction_info.index, amount)
+                        Aux.log((action == 'buyout' and 'Purchased ' or 'Bid on ')..auction_record.hyperlink..' x '..auction_record.aux_quantity..' at '..Aux.util.money_string(amount)..'.')
+                        entry.gone = true
+                    else
+                        Aux.log((action == 'buyout' and 'Purchase' or 'Bid')..' failed: Not enough money.')
+                    end
+                    Aux.scan.abort()
+                else
+                    public.dialog_action = function()
+                        if action == 'cancel' then
+                            CancelAuction(auction_info.index)
+                            entry.gone = true
+                            Aux.log('Canceled'..auction_record.hyperlink..' x '..auction_record.aux_quantity)
+                        elseif GetMoney() >= amount then
+                            PlaceAuctionBid('bidder', auction_info.index, action == 'bid' and MoneyInputFrame_GetCopper(AuxManageFrameListingDialogContentBid) or amount)
+                            Aux.log((action == 'buyout' and 'Purchased ' or 'Bid on ')..auction_record.hyperlink..' x '..auction_record.aux_quantity..' at '..Aux.util.money_string(amount)..'.')
+                            entry.gone = true
+                        else
+                            Aux.log('Not enough money.')
+                        end
+                        Aux.scan.abort()
+                        AuxManageFrameListingDialog:Hide()
+                        public.update_listing()
+                    end
+                    AuxManageFrameListingDialogContentActionButton:Enable()
+                end
+            end
+        end,
+        on_complete = function()
+            if not found then
+                Aux.log('No matching auction found. Removing entry from the cache.')
+                entry.gone = true
+                public.dialog_cancel()
+            end
+        end,
+        on_abort = function()
+            public.update_listing()
+        end,
+        next_page = function(page, total_pages)
+            if not page or page == entry.page then
+                return entry.page - 1
+            end
+        end,
+    }
+end
+
+function public.on_auction_click(auction_record)
+
+    local express_mode = IsAltKeyDown()
+
+    if IsControlKeyDown() then
+        DressUpItemLink(auction_record.hyperlink)
+    else
+        private.find_auction(auction_record, 'cancel', express_mode)
     end
 end
 
-function private.create_bid_record(index)
-    local auction_item = Aux.info.auction_item(index, 'bidder')
-    if auction_item then
-        tinsert(bid_records, private.create_record(auction_item))
+function public.on_bid_click(bid_record)
+
+    local express_mode = IsAltKeyDown()
+    local action = arg1 == 'LeftButton' and 'buyout' or 'bid'
+
+    if IsControlKeyDown() then
+        DressUpItemLink(bid_record.hyperlink)
+    else
+        private.find_auction(bid_record, action, express_mode)
     end
 end
 
+function private.show_dialog(action, entry, amount)
+    AuxManageFrameListingDialogContentItem.itemstring = Aux.info.itemstring(entry.item_id, entry.suffix_id, entry.unique_id, entry.enchant_id)
+    AuxManageFrameListingDialogContentItem.EnhTooltip_info = entry.EnhTooltip_info
+
+    AuxManageFrameListingDialogContentActionButton:Disable()
+    AuxManageFrameListingDialogContentItemIconTexture:SetTexture(Aux.info.item(entry.item_id).texture)
+    AuxManageFrameListingDialogContentItemName:SetText(entry.name)
+    local color = ITEM_QUALITY_COLORS[entry.quality]
+    AuxManageFrameListingDialogContentItemName:SetTextColor(color.r, color.g, color.b)
+
+    if entry.aux_quantity > 1 then
+        AuxManageFrameListingDialogContentItemCount:SetText(entry.aux_quantity);
+        AuxManageFrameListingDialogContentItemCount:Show()
+    else
+        AuxManageFrameListingDialogContentItemCount:Hide()
+    end
+
+    if action == 'buyout' then
+        AuxManageFrameListingDialogContentActionButton:SetText('Buy')
+        AuxManageFrameListingDialogContentCancelButton:SetText('Cancel')
+        MoneyFrame_Update('AuxManageFrameListingDialogContentBuyoutPrice', amount)
+        AuxManageFrameListingDialogContentBid:Hide()
+        AuxManageFrameListingDialogContentCancelLabel:Hide()
+        AuxManageFrameListingDialogContentBuyoutPrice:Show()
+    elseif action == 'bid' then
+        AuxManageFrameListingDialogContentActionButton:SetText('Bid')
+        AuxManageFrameListingDialogContentCancelButton:SetText('Cancel')
+        MoneyInputFrame_SetCopper(AuxManageFrameListingDialogContentBid, amount)
+        AuxManageFrameListingDialogContentBuyoutPrice:Hide()
+        AuxManageFrameListingDialogContentCancelLabel:Hide()
+        AuxManageFrameListingDialogContentBid:Show()
+    elseif action == 'cancel' then
+        AuxManageFrameListingDialogContentBid:Hide()
+        AuxManageFrameListingDialogContentBuyoutPrice:Hide()
+        AuxManageFrameListingDialogContentCancelLabel:Show()
+        AuxManageFrameListingDialogContentActionButton:SetText('Yes')
+        AuxManageFrameListingDialogContentCancelButton:SetText('No')
+    end
+    AuxManageFrameListingDialog:Show()
+end
+