diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 1637d3d..9e0dc88 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -3,8 +3,9 @@ - + + @@ -58,8 +59,8 @@ @@ -70,8 +71,8 @@ - - + + @@ -80,8 +81,8 @@ - - + + @@ -100,7 +101,7 @@ - + @@ -120,18 +121,28 @@ - + - + - - + + + + + + + + + + + + @@ -140,28 +151,18 @@ - - + + - - - - - - - - - - - + - - + + @@ -185,12 +186,12 @@ @@ -226,6 +227,7 @@ + @@ -247,7 +249,6 @@ - @@ -279,19 +280,6 @@ @@ -420,6 +421,86 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -476,58 +557,66 @@ - - - - - - - - - + - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + - - + + + + + + + + + + diff --git a/buy.xml b/buy.xml index c662710..75c8e12 100644 --- a/buy.xml +++ b/buy.xml @@ -117,13 +117,14 @@ - + + this:SetBackdropBorderColor(0.4, 0.4, 0.4) this:RegisterForDrag('LeftButton') @@ -133,99 +134,58 @@ this:StopMovingOrSizing() - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - + - + + + + this:SetBackdropBorderColor(0.4, 0.4, 0.4) + this:SetBackdropColor(0.15, 0.15, 0.15) + + - + - + @@ -251,344 +211,353 @@ - + + + + + + + + + + + this:SetBackdropBorderColor(0.4, 0.4, 0.4) + this:SetBackdropColor(0.15, 0.15, 0.15) + getglobal(this:GetName().."Title"):SetText('Filters') + + - - - - - - - - - - this:SetBackdropBorderColor(0.4, 0.4, 0.4) - getglobal(this:GetName().."Title"):SetText('Filters') - - - - - - - - UIDropDownMenu_SetWidth(140) - UIDropDownMenu_Initialize(this, AuxBuyModeDropDown_Initialize) - UIDropDownMenu_SetSelectedValue(this, 1) - - - UIDropDownMenu_Initialize(this, AuxBuyModeDropDown_Initialize) - - - - - - - - - - - - - - - - - - - - - - - - this.completor = Aux.completion.completor(this) - - - this.completor.suggest() - - - if IsShiftKeyDown() then - this.completor.previous() - else - this.completor.next() - end - - - this.completor.close() - this:ClearFocus() - Aux.buy.SearchButton_onclick() - - - if this.completor.open() then - this.completor.close() - else - this:ClearFocus() - end - - - - - - - - - - - - - - - - - - - - - - - - - - - - UIDropDownMenu_SetWidth(140) - UIDropDownMenu_Initialize(this, AuxBuyCategoryDropDown_Initialize) - - - UIDropDownMenu_Initialize(this, AuxBuyCategoryDropDown_Initialize) - - - - - - - - - UIDropDownMenu_SetWidth(140) - UIDropDownMenu_Initialize(this, AuxBuyQualityDropDown_Initialize) - - - UIDropDownMenu_Initialize(this, AuxBuyQualityDropDown_Initialize) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - this:ClearFocus() - - - - - - - - - - - this:ClearFocus() - - - - - - - - - - - - - - - - - - - - - - - - - - - - AuxBuyTooltipButton_OnClick(this) - - - - - - - - UIDropDownMenu_Initialize(this, AuxBuyTooltipDropDown_Initialize) - - - - - - - - - - - - - - - - - - - - - this:EnableMouse(false) - this:SetAlpha(0.5) - - - this:ClearFocus() - - - - - - - - - - - - - - - - AuxBuyPageEditBox:EnableMouse(not this:GetChecked()) - AuxBuyPageEditBox:SetAlpha(this:GetChecked() and 0.5 or 1) - AuxBuyPageEditBox:ClearFocus() - - - - + + + + + + + + + + + + + + + + + + getglobal(this:GetName()..'Label'):SetText('Name') + this.completor = Aux.completion.completor(this) + + + this.completor.suggest() + + + if IsShiftKeyDown() then + this.completor.previous() + else + this.completor.next() + end + + + this.completor.close() + this:ClearFocus() + Aux.buy.SearchButton_onclick() + + + if this.completor.open() then + this.completor.close() + else + this:ClearFocus() + end + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + UIDropDownMenu_SetWidth(140) + UIDropDownMenu_Initialize(this, AuxBuyCategoryDropDown_Initialize) + + + UIDropDownMenu_Initialize(this, AuxBuyCategoryDropDown_Initialize) + + + + + + + + + UIDropDownMenu_SetWidth(140) + UIDropDownMenu_Initialize(this, AuxBuyQualityDropDown_Initialize) + + + UIDropDownMenu_Initialize(this, AuxBuyQualityDropDown_Initialize) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + this:ClearFocus() + + + + + + + + + + + this:ClearFocus() + + + + + + + + + + + + + + + + + + + + getglobal(this:GetName()..'Label'):SetText('Tooltip') + this:SetWidth(110) + + + AuxBuyTooltipButton_OnClick(this) + + + + + + + + UIDropDownMenu_Initialize(this, AuxBuyTooltipDropDown_Initialize) + + + + + + + + + + + + + + + + + + + + + this:EnableMouse(false) + this:SetAlpha(0.5) + + + this:ClearFocus() + + + + + + + + + + + + + + + + AuxBuyPageEditBox:EnableMouse(not this:GetChecked()) + AuxBuyPageEditBox:SetAlpha(this:GetChecked() and 0.5 or 1) + AuxBuyPageEditBox:ClearFocus() + + + + @@ -597,6 +566,7 @@ this:SetBackdropBorderColor(0.4, 0.4, 0.4) + this:SetBackdropColor(0.15, 0.15, 0.15) getglobal(this:GetName().."Title"):SetText('Search Results') @@ -647,7 +617,7 @@ - + @@ -703,17 +673,17 @@ - + - + - + SmallMoneyFrame_OnLoad() @@ -730,7 +700,7 @@ - - + + + diff --git a/core.xml b/core.xml index d21c3cd..58bc26e 100644 --- a/core.xml +++ b/core.xml @@ -30,26 +30,38 @@ - + - - - - - - + + + + + + this:SetBackdropBorderColor(0.4, 0.4, 0.4) - + this:SetBackdropColor(0.15, 0.15, 0.15) - + + + + + + + + + + + + + diff --git a/info.lua b/info.lua index 93505e1..34b24a9 100644 --- a/info.lua +++ b/info.lua @@ -159,6 +159,11 @@ function item_id(hyperlink) return tonumber(id_string) end +function parse_hyperlink(hyperlink) + local _, _, item_id, enchant_id, suffix_id, unique_id, name = strfind(hyperlink, '|Hitem:(%d+):(%d+):(%d+):(%d+)|h[[]([^]]+)[]]|h') + return tonumber(item_id) or 0, tonumber(suffix_id) or 0, tonumber(enchant_id) or 0, tonumber(unique_id) or 0, name +end + function hyperlink_item(hyperlink) local name, itemstring, quality, level, type, subtype, max_stack = GetItemInfo(item_id(hyperlink)) return {