Bluewhale/ElvUIModernized
1
0
Fork 0
mirror of https://github.com/Bluewhale1337/ElvUIModernized.git synced 2026-07-27 08:24:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into auras-work

Browse Source
This commit is contained in:
Logan Payton
2018-05-17 00:23:59 -04:00
parent 97c5248058 d52da42f77
commit 8a588f956d
65 changed files with 958 additions and 1102 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElvUI/Core/install.lua
+46 -58
View File
@@ -34,9 +34,8 @@ local MAX_PAGE = 8
local function FCF_ResetChatWindows()
ChatFrame1:ClearAllPoints()
ChatFrame1:SetPoint("BOTTOMLEFT", "UIParent", "BOTTOMLEFT", 32, 95)
ChatFrame1:SetWidth(430)
ChatFrame1:SetHeight(120)
E:Point(ChatFrame1, "BOTTOMLEFT", "UIParent", "BOTTOMLEFT", 32, 95)
E:Size(ChatFrame1, 430, 120)
ChatFrame1.isInitialized = 0
FCF_SetButtonSide(ChatFrame1, "left")
FCF_SetChatWindowFontSize(ChatFrame1, 14)
@@ -119,10 +118,10 @@ local function SetupChat()
-- move general bottom left
if i == 1 then
frame:ClearAllPoints()
frame:SetPoint("BOTTOMLEFT", LeftChatToggleButton, "TOPLEFT", 1, 3)
E:Point(frame, "BOTTOMLEFT", LeftChatToggleButton, "TOPLEFT", 1, 3)
elseif i == 3 then
frame:ClearAllPoints()
frame:SetPoint("BOTTOMLEFT", RightChatDataPanel, "TOPLEFT", 1, 3)
E:Point(frame, "BOTTOMLEFT", RightChatDataPanel, "TOPLEFT", 1, 3)
end
FCF_StopDragging(frame)
@@ -710,8 +709,7 @@ local function ResetAll()
ElvUIInstallFrame.Desc1:SetText("")
ElvUIInstallFrame.Desc2:SetText("")
ElvUIInstallFrame.Desc3:SetText("")
ElvUIInstallFrame:SetWidth(550)
ElvUIInstallFrame:SetHeight(400)
E:Size(ElvUIInstallFrame, 550, 400)
end
local function SetPage(PageNum)
@@ -830,8 +828,7 @@ local function SetPage(PageNum)
InstallOption1Button:Show()
InstallOption1Button:SetScript("OnClick", InstallComplete)
InstallOption1Button:SetText(L["Finished"])
ElvUIInstallFrame:SetWidth(550)
ElvUIInstallFrame:SetHeight(350)
E:Size(ElvUIInstallFrame, 550, 350)
end
end
@@ -853,9 +850,8 @@ end
function E:Install()
if not InstallStepComplete then
local imsg = CreateFrame("Frame", "InstallStepComplete", E.UIParent)
imsg:SetWidth(418)
imsg:SetHeight(72)
imsg:SetPoint("TOP", 0, -190)
E:Size(imsg, 418, 72)
E:Point(imsg, "TOP", 0, -190)
imsg:Hide()
imsg:SetScript("OnShow", function()
if this.message then
@@ -873,7 +869,7 @@ function E:Install()
imsg.text = imsg:CreateFontString(nil, "OVERLAY")
E:FontTemplate(imsg.text, E["media"].normFont, 32, "OUTLINE")
imsg.text:SetPoint("BOTTOM", 0, 16)
E:Point(imsg.text, "BOTTOM", 0, 16)
imsg.text:SetTextColor(1, 0.82, 0)
imsg.text:SetJustifyH("CENTER")
end
@@ -881,23 +877,21 @@ function E:Install()
if not ElvUIInstallFrame then
local f = CreateFrame("Button", "ElvUIInstallFrame", E.UIParent)
f.SetPage = SetPage
f:SetWidth(550)
f:SetHeight(400)
E:Size(f, 550, 400)
E:SetTemplate(f, "Transparent")
f:SetPoint("CENTER", 0, 0)
E:Point(f, "CENTER", 0, 0)
f:SetFrameStrata("TOOLTIP")
f.Title = f:CreateFontString(nil, "OVERLAY")
E:FontTemplate(f.Title, nil, 17, nil)
f.Title:SetPoint("TOP", 0, -5)
E:Point(f.Title, "TOP", 0, -5)
f.Title:SetText(L["ElvUI Installation"])
f.Next = CreateFrame("Button", "InstallNextButton", f, "UIPanelButtonTemplate")
E:StripTextures(f.Next)
E:SetTemplate(f.Next, "Default", true)
f.Next:SetWidth(110)
f.Next:SetHeight(25)
f.Next:SetPoint("BOTTOMRIGHT", -5, 5)
E:Size(f.Next, 110, 25)
E:Point(f.Next, "BOTTOMRIGHT", -5, 5)
f.Next:SetText(CONTINUE)
f.Next:Disable()
f.Next:SetScript("OnClick", NextPage)
@@ -906,9 +900,8 @@ function E:Install()
f.Prev = CreateFrame("Button", "InstallPrevButton", f, "UIPanelButtonTemplate")
E:StripTextures(f.Prev)
E:SetTemplate(f.Prev, "Default", true)
f.Prev:SetWidth(110)
f.Prev:SetHeight(25)
f.Prev:SetPoint("BOTTOMLEFT", 5, 5)
E:Size(f.Prev, 110, 25)
E:Point(f.Prev, "BOTTOMLEFT", 5, 5)
f.Prev:SetText(PREV)
f.Prev:Disable()
f.Prev:SetScript("OnClick", PreviousPage)
@@ -920,8 +913,8 @@ function E:Install()
f.Status:SetStatusBarTexture(E["media"].normTex)
E:RegisterStatusBar(f.Status)
f.Status:SetMinMaxValues(0, MAX_PAGE)
f.Status:SetPoint("TOPLEFT", f.Prev, "TOPRIGHT", 6, -2)
f.Status:SetPoint("BOTTOMRIGHT", f.Next, "BOTTOMLEFT", -6, 2)
E:Point(f.Status, "TOPLEFT", f.Prev, "TOPRIGHT", 6, -2)
E:Point(f.Status, "BOTTOMRIGHT", f.Next, "BOTTOMLEFT", -6, 2)
f.Status.anim = CreateAnimationGroup(f.Status)
f.Status.anim.progress = f.Status.anim:CreateAnimation("Progress")
@@ -930,90 +923,85 @@ function E:Install()
f.Status.text = f.Status:CreateFontString(nil, "OVERLAY")
E:FontTemplate(f.Status.text)
f.Status.text:SetPoint("CENTER", 0, 0)
E:Point(f.Status.text, "CENTER", 0, 0)
f.Status.text:SetText(format("%d / %d", CURRENT_PAGE, MAX_PAGE))
f.Option1 = CreateFrame("Button", "InstallOption1Button", f, "UIPanelButtonTemplate")
E:StripTextures(f.Option1)
f.Option1:SetWidth(160)
f.Option1:SetHeight(30)
f.Option1:SetPoint("BOTTOM", 0, 45)
E:Size(f.Option1, 160, 30)
E:Point(f.Option1, "BOTTOM", 0, 45)
f.Option1:SetText("")
f.Option1:Hide()
E.Skins:HandleButton(f.Option1, true)
f.Option2 = CreateFrame("Button", "InstallOption2Button", f, "UIPanelButtonTemplate")
E:StripTextures(f.Option2)
f.Option2:SetWidth(110)
f.Option2:SetHeight(30)
f.Option2:SetPoint("BOTTOMLEFT", f, "BOTTOM", 4, 45)
E:Size(f.Option2, 110, 30)
E:Point(f.Option2, "BOTTOMLEFT", f, "BOTTOM", 4, 45)
f.Option2:SetText("")
f.Option2:Hide()
f.Option2:SetScript("OnShow", function() f.Option1:SetWidth(110) f.Option1:ClearAllPoints() f.Option1:SetPoint("BOTTOMRIGHT", f, "BOTTOM", -4, 45) end)
f.Option2:SetScript("OnHide", function() f.Option1:SetWidth(160) f.Option1:ClearAllPoints() f.Option1:SetPoint("BOTTOM", 0, 45) end)
f.Option2:SetScript("OnShow", function() E:Width(f.Option1, 110) f.Option1:ClearAllPoints() E:Point(f.Option1, "BOTTOMRIGHT", f, "BOTTOM", -4, 45) end)
f.Option2:SetScript("OnHide", function() E:Width(f.Option1, 160) f.Option1:ClearAllPoints() E:Point(f.Option1, "BOTTOM", 0, 45) end)
E.Skins:HandleButton(f.Option2, true)
f.Option3 = CreateFrame("Button", "InstallOption3Button", f, "UIPanelButtonTemplate")
E:StripTextures(f.Option3)
f.Option3:SetWidth(110)
f.Option3:SetHeight(30)
f.Option3:SetPoint("LEFT", f.Option2, "RIGHT", 4, 0)
E:Size(f.Option3, 110, 30)
E:Point(f.Option3, "LEFT", f.Option2, "RIGHT", 4, 0)
f.Option3:SetText("")
f.Option3:Hide()
f.Option3:SetScript("OnShow", function() f.Option1:SetWidth(100) f.Option1:ClearAllPoints() f.Option1:SetPoint("RIGHT", f.Option2, "LEFT", -4, 0) f.Option2:SetWidth(100) f.Option2:ClearAllPoints() f.Option2:SetPoint("BOTTOM", f, "BOTTOM", 0, 45) end)
f.Option3:SetScript("OnHide", function() f.Option1:SetWidth(160) f.Option1:ClearAllPoints() f.Option1:SetPoint("BOTTOM", 0, 45) f.Option2:SetWidth(110) f.Option2:ClearAllPoints() f.Option2:SetPoint("BOTTOMLEFT", f, "BOTTOM", 4, 45) end)
f.Option3:SetScript("OnShow", function() E:Width(f.Option1, 100) f.Option1:ClearAllPoints() E:Point(f.Option1, "RIGHT", f.Option2, "LEFT", -4, 0) E:Width(f.Option2, 100) f.Option2:ClearAllPoints() E:Point(f.Option2, "BOTTOM", f, "BOTTOM", 0, 45) end)
f.Option3:SetScript("OnHide", function() E:Width(f.Option1, 160) f.Option1:ClearAllPoints() E:Point(f.Option1, "BOTTOM", 0, 45) E:Width(f.Option2, 110) f.Option2:ClearAllPoints() E:Point(f.Option2, "BOTTOMLEFT", f, "BOTTOM", 4, 45) end)
E.Skins:HandleButton(f.Option3, true)
f.Option4 = CreateFrame("Button", "InstallOption4Button", f, "UIPanelButtonTemplate")
E:StripTextures(f.Option4)
f.Option4:SetWidth(110)
f.Option4:SetHeight(30)
f.Option4:SetPoint("LEFT", f.Option3, "RIGHT", 4, 0)
E:Size(f.Option4, 110, 30)
E:Point(f.Option4, "LEFT", f.Option3, "RIGHT", 4, 0)
f.Option4:SetText("")
f.Option4:Hide()
f.Option4:SetScript("OnShow", function()
f.Option1:SetWidth(100)
f.Option2:SetWidth(100)
E:Width(f.Option1, 100)
E:Width(f.Option2, 100)
f.Option1:ClearAllPoints()
f.Option1:SetPoint("RIGHT", f.Option2, "LEFT", -4, 0)
E:Point(f.Option1, "RIGHT", f.Option2, "LEFT", -4, 0)
f.Option2:ClearAllPoints()
f.Option2:SetPoint("BOTTOMRIGHT", f, "BOTTOM", -4, 45)
E:Point(f.Option2, "BOTTOMRIGHT", f, "BOTTOM", -4, 45)
end)
f.Option4:SetScript("OnHide", function() f.Option1:SetWidth(160) f.Option1:ClearAllPoints() f.Option1:SetPoint("BOTTOM", 0, 45) f.Option2:SetWidth(110) f.Option2:ClearAllPoints() f.Option2:SetPoint("BOTTOMLEFT", f, "BOTTOM", 4, 45) end)
f.Option4:SetScript("OnHide", function() E:Width(f.Option1, 160) f.Option1:ClearAllPoints() E:Point(f.Option1, "BOTTOM", 0, 45) E:Width(f.Option2, 110) f.Option2:ClearAllPoints() E:Point(f.Option2, "BOTTOMLEFT", f, "BOTTOM", 4, 45) end)
E.Skins:HandleButton(f.Option4, true)
f.SubTitle = f:CreateFontString(nil, "OVERLAY")
E:FontTemplate(f.SubTitle, nil, 15, nil)
f.SubTitle:SetPoint("TOP", 0, -40)
E:Point(f.SubTitle, "TOP", 0, -40)
f.Desc1 = f:CreateFontString(nil, "OVERLAY")
E:FontTemplate(f.Desc1)
f.Desc1:SetPoint("TOPLEFT", 20, -75)
f.Desc1:SetWidth(f:GetWidth() - 40)
E:Point(f.Desc1, "TOPLEFT", 20, -75)
E:Width(f.Desc1, f:GetWidth() - 40)
f.Desc2 = f:CreateFontString(nil, "OVERLAY")
E:FontTemplate(f.Desc2)
f.Desc2:SetPoint("TOPLEFT", 20, -125)
f.Desc2:SetWidth(f:GetWidth() - 40)
E:Point(f.Desc2, "TOPLEFT", 20, -125)
E:Width(f.Desc2, f:GetWidth() - 40)
f.Desc3 = f:CreateFontString(nil, "OVERLAY")
E:FontTemplate(f.Desc3)
f.Desc3:SetPoint("TOPLEFT", 20, -175)
f.Desc3:SetWidth(f:GetWidth() - 40)
E:Point(f.Desc3, "TOPLEFT", 20, -175)
E:Width(f.Desc3, f:GetWidth() - 40)
local close = CreateFrame("Button", "InstallCloseButton", f, "UIPanelCloseButton")
close:SetPoint("TOPRIGHT", f, "TOPRIGHT")
E:Point(close, "TOPRIGHT", f, "TOPRIGHT")
close:SetScript("OnClick", function()
f:Hide()
end)
E.Skins:HandleCloseButton(close)
f.tutorialImage = f:CreateTexture("InstallTutorialImage", "OVERLAY")
f.tutorialImage:SetWidth(256)
f.tutorialImage:SetHeight(128)
E:Size(f.tutorialImage, 256, 128)
f.tutorialImage:SetTexture("Interface\\AddOns\\ElvUI\\media\\textures\\logo.tga")
f.tutorialImage:SetPoint("BOTTOM", 0, 70)
E:Point(f.tutorialImage, "BOTTOM", 0, 70)
end