better looking log

This commit is contained in:
Manuel Simon Hirsig
2015-10-20 02:41:48 +02:00
parent 1b9da9c1ad
commit 9bf0895491
3 changed files with 89 additions and 149 deletions
+61 -54
View File
@@ -2,9 +2,8 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="3c1af1d3-ae57-470d-8daa-a9295703c6fc" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/buy.lua" afterPath="$PROJECT_DIR$/buy.lua" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/core.lua" afterPath="$PROJECT_DIR$/core.lua" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/util.lua" afterPath="$PROJECT_DIR$/util.lua" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/core.xml" afterPath="$PROJECT_DIR$/core.xml" />
</list>
<ignored path="Aux-Addon.iws" />
<ignored path=".idea/workspace.xml" />
@@ -70,8 +69,18 @@
<file leaf-file-name="core.lua" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/core.lua">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="2349" max-vertical-offset="8789">
<caret line="151" column="70" selection-start-line="151" selection-start-column="70" selection-end-line="151" selection-end-column="70" />
<state vertical-scroll-proportion="-7.392857" vertical-offset="5114" max-vertical-offset="8942">
<caret line="313" column="50" selection-start-line="313" selection-start-column="50" selection-end-line="313" selection-end-column="50" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="scan.lua" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/scan.lua">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-3.0516667" vertical-offset="1831" max-vertical-offset="2737">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
@@ -80,17 +89,17 @@
<file leaf-file-name="buy.lua" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/buy.lua">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-13.892858" vertical-offset="1447" max-vertical-offset="15895">
<state vertical-scroll-proportion="0.6785714" vertical-offset="1855" max-vertical-offset="15895">
<caret line="108" column="27" selection-start-line="108" selection-start-column="27" selection-end-line="108" selection-end-column="27" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="util.lua" pinned="false" current="true" current-in-tab="true">
<file leaf-file-name="util.lua" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/util.lua">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.82167834" vertical-offset="3780" max-vertical-offset="4420">
<state vertical-scroll-proportion="-137.21428" vertical-offset="408" max-vertical-offset="4420">
<caret line="250" column="11" selection-start-line="250" selection-start-column="11" selection-end-line="250" selection-end-column="11" />
<folding />
</state>
@@ -117,16 +126,6 @@
</provider>
</entry>
</file>
<file leaf-file-name="stack.lua" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/stack.lua">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-11.678572" vertical-offset="2155" max-vertical-offset="3485">
<caret line="146" column="20" selection-start-line="146" selection-start-column="20" selection-end-line="146" selection-end-column="20" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="sell.xml" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/sell.xml">
<provider selected="true" editor-type-id="text-editor">
@@ -140,8 +139,8 @@
<file leaf-file-name="buy.xml" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/buy.xml">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="3814" max-vertical-offset="7973">
<caret line="210" column="41" selection-start-line="210" selection-start-column="41" selection-end-line="210" selection-end-column="41" />
<state vertical-scroll-proportion="0.0" vertical-offset="6120" max-vertical-offset="7973">
<caret line="378" column="37" selection-start-line="378" selection-start-column="37" selection-end-line="378" selection-end-column="37" />
<folding />
</state>
</provider>
@@ -150,8 +149,8 @@
<file leaf-file-name="core.xml" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/core.xml">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="2193" max-vertical-offset="3434">
<caret line="170" column="69" selection-start-line="170" selection-start-column="69" selection-end-line="170" selection-end-column="69" />
<state vertical-scroll-proportion="0.0" vertical-offset="153" max-vertical-offset="2142">
<caret line="18" column="44" selection-start-line="18" selection-start-column="33" selection-end-line="18" selection-end-column="44" />
<folding />
</state>
</provider>
@@ -183,13 +182,13 @@
<option value="$PROJECT_DIR$/list.lua" />
<option value="$PROJECT_DIR$/stack.lua" />
<option value="$PROJECT_DIR$/info.lua" />
<option value="$PROJECT_DIR$/core.xml" />
<option value="$PROJECT_DIR$/buy.xml" />
<option value="$PROJECT_DIR$/sell.lua" />
<option value="$PROJECT_DIR$/sell.xml" />
<option value="$PROJECT_DIR$/core.lua" />
<option value="$PROJECT_DIR$/buy.lua" />
<option value="$PROJECT_DIR$/util.lua" />
<option value="$PROJECT_DIR$/core.xml" />
<option value="$PROJECT_DIR$/core.lua" />
</list>
</option>
</component>
@@ -371,7 +370,7 @@
<servers />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1066" extended-state="6" />
<frame x="-8" y="-8" width="1936" height="1066" extended-state="7" />
<editor active="true" />
<layout>
<window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
@@ -427,14 +426,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/core.xml">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="2193" max-vertical-offset="3434">
<caret line="170" column="69" selection-start-line="170" selection-start-column="69" selection-end-line="170" selection-end-column="69" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/stack.lua">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-11.678572" vertical-offset="2155" max-vertical-offset="3485">
@@ -443,14 +434,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/buy.xml">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="3253" max-vertical-offset="7973">
<caret line="210" column="41" selection-start-line="210" selection-start-column="41" selection-end-line="210" selection-end-column="41" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sell.xml">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="7670" max-vertical-offset="9588">
@@ -459,14 +442,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/core.lua">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="2349" max-vertical-offset="8789">
<caret line="151" column="70" selection-start-line="151" selection-start-column="70" selection-end-line="151" selection-end-column="70" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sell.lua">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="2863" max-vertical-offset="10336">
@@ -483,6 +458,22 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/util.lua">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-137.21428" vertical-offset="408" max-vertical-offset="4420">
<caret line="250" column="11" selection-start-line="250" selection-start-column="11" selection-end-line="250" selection-end-column="11" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/buy.lua">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.6785714" vertical-offset="1855" max-vertical-offset="15895">
<caret line="108" column="27" selection-start-line="108" selection-start-column="27" selection-end-line="108" selection-end-column="27" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/list.lua">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="1007" max-vertical-offset="4743">
@@ -491,18 +482,34 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/buy.lua">
<entry file="file://$PROJECT_DIR$/buy.xml">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-13.892858" vertical-offset="1447" max-vertical-offset="15895">
<caret line="108" column="27" selection-start-line="108" selection-start-column="27" selection-end-line="108" selection-end-column="27" />
<state vertical-scroll-proportion="0.0" vertical-offset="6120" max-vertical-offset="7973">
<caret line="378" column="37" selection-start-line="378" selection-start-column="37" selection-end-line="378" selection-end-column="37" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/util.lua">
<entry file="file://$PROJECT_DIR$/core.xml">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.82167834" vertical-offset="3780" max-vertical-offset="4420">
<caret line="250" column="11" selection-start-line="250" selection-start-column="11" selection-end-line="250" selection-end-column="11" />
<state vertical-scroll-proportion="0.0" vertical-offset="153" max-vertical-offset="2142">
<caret line="18" column="44" selection-start-line="18" selection-start-column="33" selection-end-line="18" selection-end-column="44" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/core.lua">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-7.392857" vertical-offset="5114" max-vertical-offset="8942">
<caret line="313" column="50" selection-start-line="313" selection-start-column="50" selection-end-line="313" selection-end-column="50" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/scan.lua">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-3.0516667" vertical-offset="1831" max-vertical-offset="2737">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
+10 -1
View File
@@ -98,7 +98,16 @@ function Aux_OnAddonLoaded()
end
end
function Aux.log_scroll(direction)
if direction == 1 then
this:ScrollUp()
elseif direction == -1 then
this:ScrollDown()
end
end
function Aux.log_frame_load()
this:EnableMouseWheel()
this.flashTimer = 0
end
@@ -302,7 +311,7 @@ function Aux_AddPanels()
buyFrame:SetParent("AuctionFrame")
buyFrame:SetPoint("TOPLEFT", "AuctionFrame", "TOPLEFT")
AuxLogFrame:SetParent(buyFrame)
AuxLogFrame:SetPoint('TOP', buyFrame, 100, -38)
AuxLogFrame:SetPoint('TOP', buyFrame, 100, -43)
relevel(buyFrame)
buyFrame:Hide()
-- AuxLogFrame:SetFrameLevel(buyFrame:GetFrameLevel() + 1)
+18 -94
View File
@@ -17,21 +17,21 @@
</Frame>
<ScrollingMessageFrame name="AuxLogFrame" hidden="false">
<Size><AbsDimension x="300" y="60"/></Size>
<Size><AbsDimension x="400" y="45"/></Size>
<Layers>
<Layer level="BACKGROUND">
<Texture name="$parentLeft" file="Interface\AuctionFrame\UI-AuctionItemNameFrame">
<Texture name="$parentLeft" file="Interface\AuctionFrame\UI-AuctionItemNameFrame" hidden="true">
<Size><AbsDimension x="10" y="60"/></Size>
<Anchors><Anchor point="LEFT"><Offset><AbsDimension x="-3" y="-4"/></Offset></Anchor></Anchors>
<TexCoords left="0" right="0.078125" top="0" bottom="1.0"/>
</Texture>
<Texture name="$parentRight" file="Interface\AuctionFrame\UI-AuctionItemNameFrame">
<Texture name="$parentRight" file="Interface\AuctionFrame\UI-AuctionItemNameFrame" hidden="true">
<Size><AbsDimension x="10" y="60"/></Size>
<Anchors><Anchor point="RIGHT"><Offset><AbsDimension x="0" y="-4"/></Offset></Anchor>
</Anchors>
<TexCoords left="0.75" right="0.828125" top="0" bottom="1.0"/>
</Texture>
<Texture file="Interface\AuctionFrame\UI-AuctionItemNameFrame">
<Texture name="$parentMiddle" file="Interface\AuctionFrame\UI-AuctionItemNameFrame" hidden="true">
<Size><AbsDimension x="10" y="60"/></Size>
<Anchors>
<Anchor point="LEFT" relativeTo="$parentLeft" relativePoint="RIGHT"><Offset><AbsDimension x="0" y="0"/></Offset></Anchor>
@@ -41,95 +41,6 @@
</Texture>
</Layer>
</Layers>
<Frames>
<Button name="$parentBottomButton">
<Size>
<AbsDimension x="22" y="22"/>
</Size>
<Anchors>
<Anchor point="BOTTOMRIGHT" relativePoint="BOTTOMLEFT">
<Offset>
<AbsDimension x="-3" y="-4"/>
</Offset>
</Anchor>
</Anchors>
<Layers>
<Layer level="OVERLAY">
<Texture name="$parentFlash" file="Interface\ChatFrame\UI-ChatIcon-BlinkHilight" hidden="true"/>
</Layer>
</Layers>
<Scripts>
<OnClick>
PlaySound("igChatBottom");
this:GetParent():ScrollToBottom();
</OnClick>
</Scripts>
<NormalTexture file="Interface\ChatFrame\UI-ChatIcon-ScrollEnd-Up"/>
<PushedTexture file="Interface\ChatFrame\UI-ChatIcon-ScrollEnd-Down"/>
<DisabledTexture file="Interface\ChatFrame\UI-ChatIcon-ScrollEnd-Disabled"/>
<HighlightTexture file="Interface\Buttons\UI-Common-MouseHilight" alphaMode="ADD"/>
</Button>
<Button name="$parentDownButton">
<Size>
<AbsDimension x="22" y="22"/>
</Size>
<Anchors>
<Anchor point="BOTTOM" relativeTo="$parentBottomButton" relativePoint="TOP">
<Offset>
<AbsDimension x="0" y="0"/>
</Offset>
</Anchor>
</Anchors>
<Scripts>
<OnLoad>
MessageFrameScrollButton_OnLoad();
</OnLoad>
<OnUpdate>
MessageFrameScrollButton_OnUpdate(arg1);
</OnUpdate>
<OnClick>
if ( this:GetButtonState() == "PUSHED" ) then
this.clickDelay = MESSAGE_SCROLLBUTTON_INITIAL_DELAY;
else
PlaySound("igChatScrollDown");
this:GetParent():ScrollDown();
end
</OnClick>
</Scripts>
<NormalTexture file="Interface\ChatFrame\UI-ChatIcon-ScrollDown-Up"/>
<PushedTexture file="Interface\ChatFrame\UI-ChatIcon-ScrollDown-Down"/>
<DisabledTexture file="Interface\ChatFrame\UI-ChatIcon-ScrollDown-Disabled"/>
<HighlightTexture file="Interface\Buttons\UI-Common-MouseHilight" alphaMode="ADD"/>
</Button>
<Button name="$parentUpButton">
<Size>
<AbsDimension x="22" y="22"/>
</Size>
<Anchors>
<Anchor point="BOTTOM" relativeTo="$parentDownButton" relativePoint="TOP"/>
</Anchors>
<Scripts>
<OnLoad>
MessageFrameScrollButton_OnLoad();
</OnLoad>
<OnUpdate>
MessageFrameScrollButton_OnUpdate(arg1);
</OnUpdate>
<OnClick>
if ( this:GetButtonState() == "PUSHED" ) then
this.clickDelay = MESSAGE_SCROLLBUTTON_INITIAL_DELAY;
else
PlaySound("igChatScrollUp");
this:GetParent():ScrollUp();
end
</OnClick>
</Scripts>
<NormalTexture file="Interface\ChatFrame\UI-ChatIcon-ScrollUp-Up"/>
<PushedTexture file="Interface\ChatFrame\UI-ChatIcon-ScrollUp-Down"/>
<DisabledTexture file="Interface\ChatFrame\UI-ChatIcon-ScrollUp-Disabled"/>
<HighlightTexture file="Interface\Buttons\UI-Common-MouseHilight" alphaMode="ADD"/>
</Button>
</Frames>
<Scripts>
<OnLoad>
Aux.log_frame_load()
@@ -137,14 +48,27 @@
<OnUpdate>
Aux.log_frame_update(arg1)
</OnUpdate>
<OnEnter>
getglobal(this:GetName()..'Left'):Show()
getglobal(this:GetName()..'Right'):Show()
getglobal(this:GetName()..'Middle'):Show()
</OnEnter>
<OnLeave>
getglobal(this:GetName()..'Left'):Hide()
getglobal(this:GetName()..'Right'):Hide()
getglobal(this:GetName()..'Middle'):Hide()
</OnLeave>
<OnHyperlinkClick>
ChatFrame_OnHyperlinkShow(arg1)
</OnHyperlinkClick>
<OnHyperlinkLeave>
ChatFrame_OnHyperlinkHide()
</OnHyperlinkLeave>
<OnMouseWheel>
Aux.log_scroll(arg1)
</OnMouseWheel>
</Scripts>
<FontString inherits="ChatFontNormal" justifyH="LEFT"/>
<FontString inherits="ChatFontNormal" justifyH="CENTER"/>
</ScrollingMessageFrame>
<Slider name="AuxSliderTemplate" orientation="HORIZONTAL" virtual="true" enableMouse="true">
<Size>