fixed some bugs and cleaned up the code a bit

This commit is contained in:
Manuel Simon Hirsig
2015-09-07 02:02:57 +02:00
parent 338a8ef113
commit 2d1a6f6ac3
4 changed files with 540 additions and 399 deletions
+2 -2
View File
@@ -14,7 +14,7 @@
<Layers> <Layers>
<Layer level="BACKGROUND"> <Layer level="BACKGROUND">
<FontString name="AuctionatorAuthorText" inherits="GameFontDisableSmall" justifyH="LEFT" justifyV="TOP" text="Author: Zirco; Vanilla adaptation by Nimeral"> <FontString name="AuctionatorAuthorText" inherits="GameFontDisableSmall" justifyH="LEFT" justifyV="TOP">
<Anchors> <Anchors>
<Anchor point="BOTTOMLEFT"> <Anchor point="BOTTOMLEFT">
<Offset><AbsDimension x="30" y="20"/></Offset> <Offset><AbsDimension x="30" y="20"/></Offset>
@@ -40,7 +40,7 @@
<Anchors><Anchor point="BOTTOMRIGHT"><Offset><AbsDimension x="-20" y="15"/></Offset></Anchor></Anchors> <Anchors><Anchor point="BOTTOMRIGHT"><Offset><AbsDimension x="-20" y="15"/></Offset></Anchor></Anchors>
<Scripts> <Scripts>
<OnClick> <OnClick>
AuctionatorDescriptionFrame:Hide(); AuctionatorDescriptionFrame:Hide()
</OnClick> </OnClick>
</Scripts> </Scripts>
</Button> </Button>
+494 -353
View File
File diff suppressed because it is too large Load Diff
+31 -31
View File
@@ -6,22 +6,22 @@
<Frame name="Auctionator_core"> <Frame name="Auctionator_core">
<Scripts> <Scripts>
<OnLoad> <OnLoad>
this:RegisterEvent("VARIABLES_LOADED"); this:RegisterEvent("VARIABLES_LOADED")
this:RegisterEvent("ADDON_LOADED"); this:RegisterEvent("ADDON_LOADED")
this:RegisterEvent("AUCTION_ITEM_LIST_UPDATE"); this:RegisterEvent("AUCTION_ITEM_LIST_UPDATE")
this:RegisterEvent("AUCTION_OWNED_LIST_UPDATE"); this:RegisterEvent("AUCTION_OWNED_LIST_UPDATE")
this:RegisterEvent("AUCTION_HOUSE_SHOW"); this:RegisterEvent("AUCTION_HOUSE_SHOW")
this:RegisterEvent("AUCTION_HOUSE_CLOSED"); this:RegisterEvent("AUCTION_HOUSE_CLOSED")
this:RegisterEvent("NEW_AUCTION_UPDATE"); this:RegisterEvent("NEW_AUCTION_UPDATE")
self = {}; self = {}
self.TimeOfLastUpdate = GetTime(); self.TimeOfLastUpdate = GetTime()
</OnLoad> </OnLoad>
<OnUpdate> <OnUpdate>
Auctionator_OnUpdate(self); Auctionator_OnUpdate(self)
</OnUpdate> </OnUpdate>
<OnEvent> <OnEvent>
Auctionator_EventHandler(); Auctionator_EventHandler()
</OnEvent> </OnEvent>
</Scripts> </Scripts>
</Frame> </Frame>
@@ -38,8 +38,8 @@
<Anchors><Anchor point="RIGHT"><Offset><AbsDimension x="0" y="0"/></Offset></Anchor></Anchors> <Anchors><Anchor point="RIGHT"><Offset><AbsDimension x="0" y="0"/></Offset></Anchor></Anchors>
<Scripts> <Scripts>
<OnLoad> <OnLoad>
SmallMoneyFrame_OnLoad(); SmallMoneyFrame_OnLoad()
MoneyFrame_SetType("STATIC"); MoneyFrame_SetType("STATIC")
</OnLoad> </OnLoad>
</Scripts> </Scripts>
</Frame> </Frame>
@@ -77,7 +77,7 @@
</HighlightTexture> </HighlightTexture>
<Scripts> <Scripts>
<OnClick> <OnClick>
Auctionator_EntryOnClick(); Auctionator_EntryOnClick()
</OnClick> </OnClick>
</Scripts> </Scripts>
</Button> </Button>
@@ -176,29 +176,29 @@
<Scripts> <Scripts>
<OnLoad> <OnLoad>
this:RegisterEvent("NEW_AUCTION_UPDATE"); this:RegisterEvent("NEW_AUCTION_UPDATE")
this:RegisterForDrag("LeftButton"); this:RegisterForDrag("LeftButton")
</OnLoad> </OnLoad>
<OnEvent> <OnEvent>
if ( event == "NEW_AUCTION_UPDATE") then if event == "NEW_AUCTION_UPDATE" then
Auctionator_Hilite1:Hide(); Auctionator_Hilite1:Hide()
end end
</OnEvent> </OnEvent>
<OnClick> <OnClick>
ClickAuctionSellItemButton(); ClickAuctionSellItemButton()
ClearCursor(); ClearCursor()
AuctionsFrameAuctions_ValidateAuction(); AuctionsFrameAuctions_ValidateAuction()
</OnClick> </OnClick>
<OnReceiveDrag> <OnReceiveDrag>
ClickAuctionSellItemButton(); ClickAuctionSellItemButton()
ClearCursor(); ClearCursor()
AuctionsFrameAuctions_ValidateAuction(); AuctionsFrameAuctions_ValidateAuction()
</OnReceiveDrag> </OnReceiveDrag>
<OnEnter> <OnEnter>
Auctionator_Hilite1:Show(); Auctionator_Hilite1:Show()
</OnEnter> </OnEnter>
<OnLeave> <OnLeave>
Auctionator_Hilite1:Hide(); Auctionator_Hilite1:Hide()
</OnLeave> </OnLeave>
</Scripts> </Scripts>
@@ -247,7 +247,7 @@
<Frame name="Auctionator_RecommendPerStack_Price" inherits="SmallMoneyFrameTemplate"> <Frame name="Auctionator_RecommendPerStack_Price" inherits="SmallMoneyFrameTemplate">
<Size><AbsDimension x="120" y="16" /></Size> <Size><AbsDimension x="120" y="16" /></Size>
<Anchors><Anchor point="RIGHT"><Offset><AbsDimension x="0" y="0"/></Offset></Anchor></Anchors> <Anchors><Anchor point="RIGHT"><Offset><AbsDimension x="0" y="0"/></Offset></Anchor></Anchors>
<Scripts><OnLoad>AuctionatorMoneyFrame_OnLoad();</OnLoad></Scripts> <Scripts><OnLoad>AuctionatorMoneyFrame_OnLoad()</OnLoad></Scripts>
</Frame> </Frame>
</Frames> </Frames>
</Frame> </Frame>
@@ -263,7 +263,7 @@
<Frame name="Auctionator_RecommendPerItem_Price" inherits="SmallMoneyFrameTemplate"> <Frame name="Auctionator_RecommendPerItem_Price" inherits="SmallMoneyFrameTemplate">
<Size><AbsDimension x="120" y="16" /></Size> <Size><AbsDimension x="120" y="16" /></Size>
<Anchors><Anchor point="RIGHT"><Offset><AbsDimension x="0" y="0"/></Offset></Anchor></Anchors> <Anchors><Anchor point="RIGHT"><Offset><AbsDimension x="0" y="0"/></Offset></Anchor></Anchors>
<Scripts><OnLoad>AuctionatorMoneyFrame_OnLoad();</OnLoad></Scripts> <Scripts><OnLoad>AuctionatorMoneyFrame_OnLoad()</OnLoad></Scripts>
</Frame> </Frame>
</Frames> </Frames>
</Frame> </Frame>
@@ -274,10 +274,10 @@
<Scripts> <Scripts>
<OnVerticalScroll> <OnVerticalScroll>
FauxScrollFrame_OnVerticalScroll(16, Auctionator_ScrollbarUpdate); FauxScrollFrame_OnVerticalScroll(16, Auctionator_ScrollbarUpdate);
</OnVerticalScroll> </OnVerticalScroll>
<OnShow> <OnShow>
<!--Auctionator_ScrollbarUpdate();--> <!--Auctionator_ScrollbarUpdate()-->
</OnShow> </OnShow>
</Scripts> </Scripts>
</ScrollFrame> </ScrollFrame>
@@ -305,7 +305,7 @@
<Anchors><Anchor point="BOTTOMRIGHT"><Offset><AbsDimension x="-87" y="-38"/></Offset></Anchor></Anchors> <Anchors><Anchor point="BOTTOMRIGHT"><Offset><AbsDimension x="-87" y="-38"/></Offset></Anchor></Anchors>
<Scripts> <Scripts>
<OnClick> <OnClick>
Auctionator_RefreshButtonOnClick(); Auctionator_RefreshButtonOnClick()
</OnClick> </OnClick>
</Scripts> </Scripts>
</Button> </Button>
+13 -13
View File
@@ -19,7 +19,7 @@
<Anchors><Anchor point="BOTTOMRIGHT"><Offset><AbsDimension x="-20" y="0"/></Offset></Anchor></Anchors> <Anchors><Anchor point="BOTTOMRIGHT"><Offset><AbsDimension x="-20" y="0"/></Offset></Anchor></Anchors>
<Scripts> <Scripts>
<OnClick> <OnClick>
Auctionator_ShowOptionsFrame(); Auctionator_ShowOptionsFrame()
</OnClick> </OnClick>
</Scripts> </Scripts>
</Button> </Button>
@@ -96,7 +96,7 @@
<HighlightFont inherits="GameFontHighlightSmall"/> <HighlightFont inherits="GameFontHighlightSmall"/>
<Scripts> <Scripts>
<OnClick> <OnClick>
AuctionatorDescriptionFrame:Show(); Auctionator_ShowDescriptionFrame()
</OnClick> </OnClick>
</Scripts> </Scripts>
</Button> </Button>
@@ -126,10 +126,10 @@
<Scripts> <Scripts>
<OnEnter> <OnEnter>
Auctionator_ShowTooltip_EnableAlt(); Auctionator_ShowTooltip_EnableAlt()
</OnEnter> </OnEnter>
<OnLeave> <OnLeave>
GameTooltip:Hide(); GameTooltip:Hide()
</OnLeave> </OnLeave>
</Scripts> </Scripts>
@@ -150,10 +150,10 @@
</Layers> </Layers>
<Scripts> <Scripts>
<OnEnter> <OnEnter>
Auctionator_ShowTooltip_EnableAlt(); Auctionator_ShowTooltip_EnableAlt()
</OnEnter> </OnEnter>
<OnLeave> <OnLeave>
GameTooltip:Hide(); GameTooltip:Hide()
</OnLeave> </OnLeave>
</Scripts> </Scripts>
</CheckButton> </CheckButton>
@@ -171,10 +171,10 @@
<Scripts> <Scripts>
<OnEnter> <OnEnter>
Auctionator_ShowTooltip_OpenFirst(); Auctionator_ShowTooltip_OpenFirst()
</OnEnter> </OnEnter>
<OnLeave> <OnLeave>
GameTooltip:Hide(); GameTooltip:Hide()
</OnLeave> </OnLeave>
</Scripts> </Scripts>
@@ -194,10 +194,10 @@
</Layers> </Layers>
<Scripts> <Scripts>
<OnEnter> <OnEnter>
Auctionator_ShowTooltip_OpenFirst(); Auctionator_ShowTooltip_OpenFirst()
</OnEnter> </OnEnter>
<OnLeave> <OnLeave>
GameTooltip:Hide(); GameTooltip:Hide()
</OnLeave> </OnLeave>
</Scripts> </Scripts>
</CheckButton> </CheckButton>
@@ -222,7 +222,7 @@
<Anchors><Anchor point="BOTTOMRIGHT"><Offset><AbsDimension x="-20" y="15"/></Offset></Anchor></Anchors> <Anchors><Anchor point="BOTTOMRIGHT"><Offset><AbsDimension x="-20" y="15"/></Offset></Anchor></Anchors>
<Scripts> <Scripts>
<OnClick> <OnClick>
AuctionatorOptionsFrame:Hide(); AuctionatorOptionsFrame:Hide()
</OnClick> </OnClick>
</Scripts> </Scripts>
</Button> </Button>
@@ -232,8 +232,8 @@
<Anchors><Anchor point="RIGHT" relativePoint="LEFT" relativeTo="AuctionatorOptionsButton_Cancel"><Offset><AbsDimension x="-3" y="0"/></Offset></Anchor></Anchors> <Anchors><Anchor point="RIGHT" relativePoint="LEFT" relativeTo="AuctionatorOptionsButton_Cancel"><Offset><AbsDimension x="-3" y="0"/></Offset></Anchor></Anchors>
<Scripts> <Scripts>
<OnClick> <OnClick>
AuctionatorOptionsSave(); AuctionatorOptionsSave()
AuctionatorOptionsFrame:Hide(); AuctionatorOptionsFrame:Hide()
</OnClick> </OnClick>
</Scripts> </Scripts>
</Button> </Button>