WoWInterface SVN Torta

Compare Revisions

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

Rev 22 → Rev 23

trunk/Torta/UIManager.lua
1,16 → 1,16
local mainWindow = TortaParentFrame;
local startPage = TortaParentFrameStartPage;
local mainPage = TortaParentFrameMainPage;
local explorerWindow = TortaParentFrameMainPageExplorerSubWindow;
local explorerScrollBar = TortaParentFrameMainPageExplorerSubWindowScrollBar;
local mainWindow = TortaParentFrame;
local startPage = TortaParentFrameStartPage;
local mainPage = TortaParentFrameMainPage;
local explorerWindow = TortaParentFrameMainPageExplorerSubWindow;
local explorerScrollBar = TortaParentFrameMainPageExplorerSubWindowScrollBar;
local EXPLORER_LISTBUTTON_HEIGHT = 16;
local clDisplayWindow = TortaParentFrameMainPageDisplaySubWindow;
local clScrollBar = TortaParentFrameMainPageDisplaySubWindowScrollBar;
local noLoadedListText = TortaParentFrameMainPageDisplaySubWindowNoLoadedListText;
local clTopButton = TortaParentFrameMainPageDisplaySubWindowTaskButton1;
local taskEditor = TortaParentFrameMainPageTaskEditorSubWindow;
local taskBar = TortaParentFrameMainPageTaskbar;
local editTaskEB = TortaParentFrameMainPageTaskEditorSubWindowEditBox;
local clDisplayWindow = TortaParentFrameMainPageDisplaySubWindow;
local clScrollBar = TortaParentFrameMainPageDisplaySubWindowScrollBar;
local noLoadedListText = TortaParentFrameMainPageDisplaySubWindowNoLoadedListText;
local clTopButton = TortaParentFrameMainPageDisplaySubWindowTaskButton1;
local taskEditor = TortaParentFrameMainPageTaskEditorSubWindow;
local taskBar = TortaParentFrameMainPageTaskbar;
local editTaskEB = TortaParentFrameMainPageTaskEditorSubWindowEditBox;
 
local cl3HeaderText = TortaParentFrameMainPageDisplaySubWindowHeaderText;
 
187,7 → 187,7
local button = (self.clRecycleBin[id] or CreateFrame(
"Button",
nil,
explorerWindow,
clDisplayWindow,
"TortaChecklistTaskButton"));
button:ClearAllPoints();
button:SetPoint("TOPLEFT", self.clListButtons[id - 1], "BOTTOMLEFT");
224,7 → 224,8
lineplusoffset = line + FauxScrollFrame_GetOffset(clScrollBar);
button = self.clListButtons[line];
if lineplusoffset <= #self.data.text then
button.text:SetText("|cffffd000" .. lineplusoffset .. ".)|r " .. self.data.text[lineplusoffset]);
-- button.text:SetText("|cffffd000" .. lineplusoffset .. ".)|r " .. self.data.text[lineplusoffset]);
button.text:SetFormattedText("|cffffd000%i.)|r %s", lineplusoffset, self.data.text[lineplusoffset]);
button.check:SetChecked(self.data.stat[lineplusoffset]);
button:SetID(lineplusoffset);
 
249,9 → 250,23
end
 
 
function Torta.gui:OnManageDialogShow()
if Torta.cl3:IsEditTaskDialogOpen() then
taskEditor:Hide();
end
clDisplayWindow:Hide();
end
 
function Torta.gui:OnManageDialogHide()
if Torta.cl3:IsEditTaskDialogOpen() then
taskEditor:Show();
end
clDisplayWindow:Show();
end
 
FauxScrollFrame_SetOffset(explorerScrollBar, 0);
FauxScrollFrame_SetOffset(clScrollBar, 0);
 
mainWindow:SetMinResize(610, 450);
mainWindow:SetMinResize(820, 450);
PanelTemplates_SetNumTabs(mainWindow, 3);
Torta.gui:OnTabClicked(1);
\ No newline at end of file
trunk/Torta/Windows/DisplayWindow.xml
98,15 → 98,26
</Layer>
</Layers>
<Frames>
<Button name="$parentEnterButton" inherits="UIPanelButtonTemplate" text="Enter">
<Button name="$parentCloseButton" inherits="UIPanelButtonTemplate" text="Close">
<Size x="100" y="23"/>
<Anchors>
<Anchor point="BOTTOMRIGHT">
<Offset x="-3" y="3"/>
<Anchor point="BOTTOMLEFT">
<Offset x="5" y="5"/>
</Anchor>
</Anchors>
<Scripts>
<OnClick>
Torta.cl3:HideTaskEditor();
</OnClick>
</Scripts>
</Button>
<Button name="$parentEnterButton" inherits="UIPanelButtonTemplate" text="Enter">
<Size x="100" y="23"/>
<Anchors>
<Anchor point="LEFT" relativeTo="$parentCloseButton" relativePoint="RIGHT"/>
</Anchors>
<Scripts>
<OnClick>
Torta.cl3:ModifyOpenTask(getglobal(self:GetParent():GetName() .. "EditBox"):GetText());
getglobal(self:GetParent():GetName() .. "EditBox"):ClearFocus();
Torta.gui:UpdateCLScrollBar();
trunk/Torta/Windows/Templates.xml
37,10 → 37,10
<Color r="0.8"/>
<Anchors>
<Anchor point="TOPLEFT">
<Offset x="5" y="-5"/>
<Offset x="4" y="-5"/>
</Anchor>
<Anchor point="BOTTOMRIGHT" relativePoint="TOPRIGHT">
<Offset x="-5" y="-20"/>
<Offset x="-4" y="-20"/>
</Anchor>
</Anchors>
</Texture>
trunk/Torta/Windows/TortaParentFrame.xml
1,18 → 1,13
<!-- UI.xml -->
<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
..\FrameXML\UI.xsd">
 
 
<!-- The main window -->
<Frame name="TortaParentFrame" inherits="TortaTooltipStyleFrameTemplate" parent="UIParent" hidden="true" movable="true" resizable="true">
 
<Size x="800" y="415"/>
<Anchors>
<Anchor point="CENTER"/>
</Anchors>
 
<Frames>
<!-- Purpose: Shields the main window from clicks, making the user focus on a dialog box -->
<Frame name="TortaClickBlocker" setAllPoints="true" frameStrata="TOOLTIP" enableMouse="true" hidden="true"/>
<Button name="$parentDragAreaHeaderButton" enableMouse="true">
<Anchors>
<Anchor point="TOPLEFT">
trunk/Torta/Windows/Taskbar.xml
20,16 → 20,46
</Anchors>
<Scripts>
<OnClick>
Torta.gui:ToggleWindow(TortaManageListsDialog);
if not TortaManageDialog:IsVisible() then
TortaManageDialog:Show();
else
TortaManageDialog:Hide();
end
</OnClick>
</Scripts>
</Button>
<Button name="$parentShareButton" inherits="UIPanelButtonTemplate" text="Share">
<Button name="$parentShareButton" inherits="UIPanelButtonTemplate" text="Share Stuff!">
<Size x="100" y="22"/>
<Anchors>
<Anchor point="LEFT" relativeTo="$parentManageButton" relativePoint="RIGHT"/>
</Anchors>
</Button>
<Button name="$parentUncheckAllButton" inherits="UIPanelButtonTemplate" text="Uncheck All">
<Size x="100" y="22"/>
<Anchors>
<Anchor point="LEFT" relativeTo="$parentShareButton" relativePoint="RIGHT">
<Offset x="5"/>
</Anchor>
</Anchors>
</Button>
<Button name="$parentCheckAllButton" inherits="UIPanelButtonTemplate" text="Check All">
<Size x="100" y="22"/>
<Anchors>
<Anchor point="LEFT" relativeTo="$parentUncheckAllButton" relativePoint="RIGHT"/>
</Anchors>
</Button>
<Button name="$parentAddTaskButton" inherits="UIPanelButtonTemplate" text="Add A Task">
<Size x="100" y="22"/>
<Anchors>
<Anchor point="LEFT" relativeTo="$parentCheckAllButton" relativePoint="RIGHT"/>
</Anchors>
</Button>
<Button name="$parentRemoveTaskButton" inherits="UIPanelButtonTemplate" text="Remove Task">
<Size x="100" y="22"/>
<Anchors>
<Anchor point="LEFT" relativeTo="$parentAddTaskButton" relativePoint="RIGHT"/>
</Anchors>
</Button>
<Button name="$parentCloseButton" inherits="UIPanelButtonTemplate" text="Close">
<Size x="100" y="22"/>
<Anchors>
43,6 → 73,19
</OnClick>
</Scripts>
</Button>
<Button name="$parentStatsButton" text="Stats Button">
<NormalFont style="GameFontNormal"/>
<Size y="22"/>
<Anchors>
<Anchor point="LEFT" relativeTo="$parentRemoveTaskButton" relativePoint="RIGHT"/>
<Anchor point="RIGHT" relativeTo="$parentCloseButton" relativePoint="LEFT"/>
</Anchors>
<Scripts>
<OnClick>
 
</OnClick>
</Scripts>
</Button>
</Frames>
<!-- END OF TASKBAR BUTTONS -->
</Frame>
trunk/Torta/Windows/ManageDialog.xml
1,18 → 1,16
<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
..\FrameXML\UI.xsd">
<Frame name="TortaManageListsDialog" inherits="TortaSubWindowTemplate" parent="UIParent" frameStrata="TOOLTIP" hidden="true">
<Size x="512" y="400"/>
<Frame name="TortaManageDialog" inherits="TortaSubWindowTemplate" parent="TortaParentFrameMainPage" hidden="true">
<Anchors>
<Anchor point="CENTER" relativeTo="TortaParentFrame"/>
<Anchor point="TOPLEFT" relativeTo="$parentExplorerSubWindow" relativePoint="TOPRIGHT"/>
<Anchor point="BOTTOMRIGHT" relativeTo="$parentTaskbar" relativePoint="TOPRIGHT"/>
</Anchors>
<Scripts>
<OnShow>
TortaClickBlocker:Show();
UIFrameFadeOut(TortaParentFrame, 0.27, TortaParentFrame:GetAlpha(), 0.7);
Torta.gui:OnManageDialogShow();
</OnShow>
<OnHide>
TortaClickBlocker:Hide();
UIFrameFadeIn(TortaParentFrame, 0.27, TortaParentFrame:GetAlpha(), 1);
Torta.gui:OnManageDialogHide();
</OnHide>
</Scripts>
<Layers>
37,13 → 35,13
<Button name="$parentCloseButton" inherits="UIPanelButtonTemplate" text="Close">
<Size x="100" y="22"/>
<Anchors>
<Anchor point="BOTTOMRIGHT">
<Offset x="-5" y="5"/>
<Anchor point="BOTTOM">
<Offset y="7"/>
</Anchor>
</Anchors>
<Scripts>
<OnClick>
Torta.gui:ToggleWindow(self:GetParent());
self:GetParent():Hide();
</OnClick>
</Scripts>
</Button>
trunk/Torta/CL3.lua
20,7 → 20,6
gui.data = nil;
 
widgets.cl3HeaderText:SetText("Torta Checklist");
gui:UpdateCLScrollBar();
Torta.db.profile.cfg.loadedList = false;
self.openTask = nil;
else
31,8 → 30,8
widgets.cl3HeaderText:SetText(lists[listID].meta.listName);
Torta.db.profile.cfg.loadedList = listID;
self.openTask = nil;
gui:UpdateCLScrollBar();
end
gui:UpdateCLScrollBar();
gui:UpdateExplorerScrollBar();
end
 
52,6 → 51,11
end
 
 
function Checklist3:IsEditTaskDialogOpen()
return not not self.openTask;
end
 
 
function Checklist3:ModifyOpenTask(newText)
assert(type(self.openTask) == "number");
local profile = Torta.db.profile;
64,6 → 68,7
dispWnd:SetPoint(unpack(displayWindowPoints));
dispWnd:SetPoint("BOTTOMRIGHT", widgets.taskBar, "TOPRIGHT");
tEditor:Hide();
self.openTask = nil;
end
 
 
75,3 → 80,12
getglobal(tEditor:GetName() .. "HeaderText"):SetText("Task Editor: " .. (taskID or "|cffff0000No task ID|r"))
end
 
 
function Checklist3:UncheckAll()
 
end
 
function Checklist3:CheckAll()
 
end