From cc7fa7252749ab2695cf6208fde44fd985c8b816 Mon Sep 17 00:00:00 2001
From: Manuel Simon Hirsig <simon.hirsig@gmail.com>
Date: Wed, 3 Feb 2016 12:47:29 +0100
Subject: [PATCH] swapped bid and buyout button

---
 info.lua         | 10 +++++-----
 search_frame.lua | 26 +++++++++++++-------------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/info.lua b/info.lua
index 09be260..ac330b1 100644
--- a/info.lua
+++ b/info.lua
@@ -20,12 +20,12 @@ function public.inventory_index(slot)
         INVTYPE_FINGER = {11, 12},
         INVTYPE_TRINKET = {13, 14},
         INVTYPE_CLOAK = {15},
-        INVTYPE_2HWEAPON = {16},
-        INVTYPE_WEAPONMAINHAND = {16},
+        INVTYPE_2HWEAPON = {16, 17},
+        INVTYPE_WEAPONMAINHAND = {16, 17},
         INVTYPE_WEAPON = {16, 17},
-        INVTYPE_WEAPONOFFHAND = {17},
-        INVTYPE_HOLDABLE = {17},
-        INVTYPE_SHIELD = {17},
+        INVTYPE_WEAPONOFFHAND = {16, 17},
+        INVTYPE_HOLDABLE = {16, 17},
+        INVTYPE_SHIELD = {16, 17},
         INVTYPE_RANGED = {18},
         INVTYPE_RANGEDRIGHT = {18},
         INVTYPE_TABARD = {19},
diff --git a/search_frame.lua b/search_frame.lua
index d5a89fa..30d5922 100644
--- a/search_frame.lua
+++ b/search_frame.lua
@@ -263,23 +263,23 @@ function public.on_load()
         private.status_bar = status_bar
     end
     do
-        local btn = Aux.gui.button(AuxFilterSearchFrame, 16)
+    local btn = Aux.gui.button(AuxFilterSearchFrameResults, 16)
         btn:SetPoint('TOPLEFT', private.status_bar, 'TOPRIGHT', 5, 0)
         btn:SetWidth(80)
         btn:SetHeight(24)
-        btn:SetText('Buyout')
-        btn:Disable()
-        RESULTS.buyout_button = btn
-    end
-    do
-        local btn = Aux.gui.button(AuxFilterSearchFrameResults, 16)
-        btn:SetPoint('TOPLEFT', RESULTS.buyout_button, 'TOPRIGHT', 5, 0)
-        btn:SetWidth(80)
-        btn:SetHeight(24)
         btn:SetText('Bid')
         btn:Disable()
         private.bid_button = btn
     end
+    do
+        local btn = Aux.gui.button(AuxFilterSearchFrame, 16)
+        btn:SetPoint('TOPLEFT', private.bid_button, 'TOPRIGHT', 5, 0)
+        btn:SetWidth(80)
+        btn:SetHeight(24)
+        btn:SetText('Buyout')
+        btn:Disable()
+        RESULTS.buyout_button = btn
+    end
     do
         local btn1 = Aux.gui.button(AuxFilterSearchFrameFilter, 16)
         btn1:SetPoint('TOPLEFT', private.status_bar, 'TOPRIGHT', 5, 0)
@@ -773,7 +773,7 @@ function public.start_search()
             on_page_loaded = function(page, total_pages)
                 current_page = page + 1
                 current_total_pages = total_pages
-                private.status_bar:update_status(100 * (current_page - 1) / current_total_pages, 100 * (current_query - 1) / getn(queries)) -- TODO
+                private.status_bar:update_status(100 * (current_query - 1) / getn(queries), 100 * (current_page - 1) / current_total_pages) -- TODO
                 private.status_bar:set_text(format('Scanning %d / %d (Page %d / %d)', current_query, getn(queries), current_page, current_total_pages))
             end,
             on_page_scanned = function()
@@ -782,10 +782,10 @@ function public.start_search()
             on_start_query = function(query_index)
                 current_query = query_index
                 if current_page then
-                    private.status_bar:update_status(100 * (current_page - 1) / current_total_pages, 100 * (current_query - 1) / getn(queries)) -- TODO
+                    private.status_bar:update_status(100 * (current_query - 1) / getn(queries), 100 * (current_page - 1) / current_total_pages) -- TODO
                     private.status_bar:set_text(format('Scanning %d / %d (Page %d / %d)', current_query, getn(queries), current_page, current_total_pages))
                 else
-                    private.status_bar:update_status(0, 100 * (current_query - 1) / getn(queries)) -- TODO
+                    private.status_bar:update_status(100 * (current_query - 1) / getn(queries), 0) -- TODO
                     private.status_bar:set_text(format('Scanning %d / %d', current_query, getn(queries)))
                 end
             end,