WoWInterface SVN Torta

Compare Revisions

  • This comparison shows the changes necessary to convert path 
    /
    from Rev 23 to Rev 24
    ↔ Reverse comparison
  •

Rev 23 → Rev 24

trunk/Torta/DataHandler.lua
135,7 → 135,6
local evtFrame = CreateFrame("Frame");
evtFrame:RegisterEvent("VARIABLES_LOADED");
evtFrame:SetScript("OnEvent", function(frame, event)
print("Torta DB inited!");
Torta.db = LibStub("AceDB-3.0"):New("TortaDB", defaults);
Torta:OnInitialize();
end)
\ No newline at end of file
trunk/Torta/UIManager.lua
10,7 → 10,7
local clTopButton = TortaParentFrameMainPageDisplaySubWindowTaskButton1;
local taskEditor = TortaParentFrameMainPageTaskEditorSubWindow;
local taskBar = TortaParentFrameMainPageTaskbar;
local editTaskEB = TortaParentFrameMainPageTaskEditorSubWindowEditBox;
local editTaskEB = TortaParentFrameMainPageTaskEditorSubWindowScrollFrameEditBox;
 
local cl3HeaderText = TortaParentFrameMainPageDisplaySubWindowHeaderText;
 
trunk/Torta/Windows/DisplayWindow.xml
40,11 → 40,6
<Scripts>
<OnLoad>
FauxScrollFrame_SetOffset(self, 0);
local origSetValue = self.SetValue;
self.SetValue = function(self, value, ...)
if not value then print("value is nil!"); print(debugstack()); end
origSetValue(self, value, ...);
end
</OnLoad>
<OnVerticalScroll>
FauxScrollFrame_OnVerticalScroll(self, offset, 32, Torta.gui.UpdateCLScrollBar);
95,14 → 90,22
<Anchor point="RIGHT" relativeTo="$parentHeaderTexture"/>
</Anchors>
</FontString>
<FontString name="$parentHelpText" inherits="GameFontHighlight" justifyH="LEFT" text="|cffffd000Note|r: Only the first three lines of text will be displayed.">
<Anchors>
<Anchor point="BOTTOMLEFT">
<Offset x="6" y="9"/>
</Anchor>
<Anchor point="BOTTOMRIGHT"/>
</Anchors>
</FontString>
</Layer>
</Layers>
<Frames>
<Button name="$parentCloseButton" inherits="UIPanelButtonTemplate" text="Close">
<Size x="100" y="23"/>
<Button name="$parentCloseButton" inherits="UIPanelButtonTemplate" text="Close Task Editor">
<Size x="125" y="23"/>
<Anchors>
<Anchor point="BOTTOMLEFT">
<Offset x="5" y="5"/>
<Anchor point="BOTTOMRIGHT">
<Offset x="-5" y="5"/>
</Anchor>
</Anchors>
<Scripts>
111,23 → 114,24
</OnClick>
</Scripts>
</Button>
<Button name="$parentEnterButton" inherits="UIPanelButtonTemplate" text="Enter">
<Size x="100" y="23"/>
<Button name="$parentEnterButton" inherits="UIPanelButtonTemplate" text="Save Task Text">
<Size x="125" y="23"/>
<Anchors>
<Anchor point="LEFT" relativeTo="$parentCloseButton" relativePoint="RIGHT"/>
<Anchor point="RIGHT" relativeTo="$parentCloseButton" relativePoint="LEFT"/>
</Anchors>
<Scripts>
<OnClick>
Torta.cl3:ModifyOpenTask(getglobal(self:GetParent():GetName() .. "EditBox"):GetText());
getglobal(self:GetParent():GetName() .. "EditBox"):ClearFocus();
Torta.cl3:ModifyOpenTask(Torta.gui.elements.editTaskEB:GetText());
Torta.gui.elements.editTaskEB:ClearFocus();
Torta.gui:UpdateCLScrollBar();
</OnClick>
</Scripts>
</Button>
<EditBox name="$parentEditBox" multiLine="true" autoFocus="false">
<!--
<EditBox name="$parentEditBox" multiLine="true" autoFocus="false" letters="300">
<Anchors>
<Anchor point="TOPLEFT" relativeTo="$parentHeaderText" relativePoint="BOTTOMLEFT"/>
<Anchor point="BOTTOMRIGHT" relativeTo="$parentEnterButton" relativePoint="TOPRIGHT"/>
<Anchor point="BOTTOMRIGHT"/>
</Anchors>
<Scripts>
<OnEscapePressed>
144,6 → 148,65
</Scripts>
<FontString inherits="GameFontHighlight" setAllPoints="true"/>
</EditBox>
-->
<ScrollFrame name="$parentScrollFrame" inherits="UIPanelScrollFrameTemplate" enableMouse="true">
<Scripts>
<OnMouseDown>
Torta.gui.elements.editTaskEB:SetFocus();
</OnMouseDown>
</Scripts>
<Anchors>
<Anchor point="TOPLEFT" relativeTo="$parentHeaderText" relativePoint="BOTTOMLEFT"/>
<Anchor point="BOTTOMRIGHT">
<Offset x="-27" y="30"/>
</Anchor>
</Anchors>
<Layers>
<Layer level="BACKDROP">
<Texture>
<Color a="0.25"/>
<Anchors>
<Anchor point="TOPLEFT" relativePoint="TOPRIGHT">
<Offset x="6"/>
</Anchor>
<Anchor point="BOTTOMRIGHT" relativePoint="BOTTOMRIGHT">
<Offset x="22"/>
</Anchor>
</Anchors>
</Texture>
</Layer>
</Layers>
<ScrollChild>
<EditBox name="$parentEditBox" multiLine="true" autoFocus="false">
<Size x="300" y="32"/>
<Anchors>
<Anchor point="TOPLEFT"/>
<Anchor point="TOPRIGHT"/>
</Anchors>
<Scripts>
<OnUpdate>
self:SetWidth(self:GetParent():GetWidth() - 5);
ScrollingEdit_OnUpdate(self, elapsed, getglobal(self:GetParent()));
</OnUpdate>
<OnCursorChanged>
ScrollingEdit_OnCursorChanged(self, x, y, w, h)
</OnCursorChanged>
<OnEscapePressed>
self:ClearFocus();
if IsShiftKeyDown() then
Torta.cl3:ModifyOpenTask( getglobal( self:GetParent():GetName() .. "EditBox" ):GetText() );
Torta.gui:UpdateCLScrollBar();
end
</OnEscapePressed>
<OnEnterPressed>
self:ClearFocus();
print("Moo!");
</OnEnterPressed>
</Scripts>
<FontString inherits="GameFontHighlight" setAllPoints="true"/>
</EditBox>
</ScrollChild>
</ScrollFrame>
</Frames>
</Frame>
</Ui>
\ No newline at end of file
trunk/Torta/Windows/Templates.xml
34,7 → 34,7
<Texture name="$parentHeaderTexture" file="Interface\AddOns\Torta\Media\Gloss" alphaMode="BLEND">
<!--<Color r="0.375" g="0.375" b="0.375"/>-->
<!-- <Color r="0.333" g="0.576" b=".87"/> -->
<Color r="0.8"/>
<Color r="0.8" a="0.8"/>
<Anchors>
<Anchor point="TOPLEFT">
<Offset x="4" y="-5"/>