Commit af1979c5 authored by Simpy's avatar Simpy 🐹
Browse files

make diffing to beta easier

parent b0d17da6
......@@ -2,9 +2,9 @@ local E, L, V, P, G = unpack(select(2, ...)); --Import: Engine, Locales, Private
local _G = _G
local tinsert = tinsert
local CreateFrame = CreateFrame
local ToggleFrame = ToggleFrame
local GetCursorPosition = GetCursorPosition
local CreateFrame = CreateFrame
local PADDING = 10
local BUTTON_HEIGHT = 16
......
......@@ -35,7 +35,7 @@ local GUILD_EVENT_LOG = GUILD_EVENT_LOG
-- GLOBALS: ElvUIInstallFrame
local CURRENT_PAGE = 0
local MAX_PAGE = 10
local MAX_PAGE = 9
local PLAYER_NAME = format('%s-%s', E.myname, E:ShortenRealm(E.myrealm))
local ELV_TOONS = {
......@@ -571,22 +571,6 @@ function E:SetPage(PageNum)
end)
InstallOption2Button:SetText(L["New Profile"])
elseif PageNum == 5 then
f.SubTitle:SetText(L["Private Settings Setup"])
f.Desc1:SetText(L["Please click the button below to setup your Private Settings."])
f.Desc2:SetText(L["These settings controls the modules on and off functionality."])
InstallOption1Button:Show()
InstallOption1Button:SetScript('OnClick', function()
E.charSettings:SetProfile('Default')
E:NextPage()
end)
InstallOption1Button:SetText(L["Shared Profile"])
InstallOption2Button:Show()
InstallOption2Button:SetScript('OnClick', function()
E.charSettings:SetProfile(E.mynameRealm)
E:NextPage()
end)
InstallOption2Button:SetText(L["New Profile"])
elseif PageNum == 6 then
f.SubTitle:SetText(L["Theme Setup"])
f.Desc1:SetText(L["Choose a theme layout you wish to use for your initial setup."])
f.Desc2:SetText(L["You can always change fonts and colors of any element of ElvUI from the in-game configuration."])
......@@ -600,7 +584,7 @@ function E:SetPage(PageNum)
InstallOption3Button:Show()
InstallOption3Button:SetScript('OnClick', function() E:SetupTheme('class') end)
InstallOption3Button:SetText(CLASS)
elseif PageNum == 7 then
elseif PageNum == 6 then
f.SubTitle:SetText(_G.UISCALE)
f.Desc1:SetFormattedText(L["Adjust the UI Scale to fit your screen, press the autoscale button to set the UI Scale automatically."])
InstallSlider:Show()
......@@ -637,7 +621,7 @@ function E:SetPage(PageNum)
InstallOption2Button:SetText(L["Preview"])
f.Desc3:SetText(L["Importance: |cffFF3333High|r"])
elseif PageNum == 8 then
elseif PageNum == 7 then
f.SubTitle:SetText(L["Layout"])
f.Desc1:SetText(L["You can now choose what layout you wish to use based on your combat role."])
f.Desc2:SetText(L["This will change the layout of your unitframes and actionbars."])
......@@ -651,7 +635,7 @@ function E:SetPage(PageNum)
InstallOption3Button:Show()
InstallOption3Button:SetScript('OnClick', function() E.db.layoutSet = nil; E:SetupLayout('dpsCaster') end)
InstallOption3Button:SetText(L["Caster DPS"])
elseif PageNum == 9 then
elseif PageNum == 8 then
f.SubTitle:SetText(L["Auras"])
f.Desc1:SetText(L["Select the type of aura system you want to use with ElvUI's unitframes. Set to Aura Bar & Icons to use both aura bars and icons, set to icons only to only see icons."])
f.Desc2:SetText(L["If you have an icon or aurabar that you don't want to display simply hold down shift and right click the icon for it to disapear."])
......@@ -662,7 +646,7 @@ function E:SetPage(PageNum)
InstallOption2Button:Show()
InstallOption2Button:SetScript('OnClick', function() E:SetupAuras() end)
InstallOption2Button:SetText(L["Icons Only"])
elseif PageNum == 10 then
elseif PageNum == 9 then
f.SubTitle:SetText(L["Installation Complete"])
f.Desc1:SetText(L["You are now finished with the installation process. If you are in need of technical support please visit us at http://www.tukui.org."])
f.Desc2:SetText(L["Please click the button below so you can setup variables and ReloadUI."])
......
......@@ -2,6 +2,7 @@ local E, L, V, P, G = unpack(select(2, ...)); --Import: Engine, Locales, Private
local wipe, sort, unpack = wipe, sort, unpack
local next, pairs, tinsert = next, pairs, tinsert
local CreateFrame = CreateFrame
local GetAddOnInfo = GetAddOnInfo
local GetCVar = GetCVar
......
......@@ -1031,9 +1031,9 @@ end
ElvUF.Tags.Events['title'] = 'UNIT_NAME_UPDATE INSTANCE_ENCOUNTER_ENGAGE_UNIT'
ElvUF.Tags.Methods['title'] = function(unit)
if UnitIsPlayer(unit) then
if UnitIsPlayer(unit) then
return GetTitleName(GetCurrentTitle())
end
end
end
ElvUF.Tags.Events['quest:title'] = 'QUEST_LOG_UPDATE'
......
......@@ -2,7 +2,6 @@ local E, L, V, P, G = unpack(select(2, ...)); --Import: Engine, Locales, Private
local Skins = E:GetModule('Skins')
local _G = _G
local CreateFrame = CreateFrame
local DISABLE = DISABLE
local HIDE = HIDE
......
......@@ -3,16 +3,16 @@ Copyright (c) 2015-2017, Hendrik "nevcairiel" Leppkes <h.leppkes@gmail.com>
All rights reserved.
Redistribution and use in source and binary forms, with or without
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright notice,
* Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
* Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
* Neither the name of the developer nor the names of its contributors
may be used to endorse or promote products derived from this software without
* Neither the name of the developer nor the names of its contributors
may be used to endorse or promote products derived from this software without
specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
......
......@@ -198,3 +198,4 @@ AddMedia('logo','FoxWarlock')
AddMedia('logo','FoxWarrior')
AddMedia('logo','DeathlyHallows')
AddMedia('logo','GoldShield')
AddMedia('logo','Gem')
......@@ -3,7 +3,6 @@ local AB = E:GetModule('ActionBars')
local _G = _G
local unpack = unpack
local CreateFrame = CreateFrame
local GetActionCooldown = GetActionCooldown
local HasExtraActionBar = HasExtraActionBar
......
......@@ -5,7 +5,6 @@ local _G = _G
local pairs = pairs
local assert = assert
local unpack = unpack
local CreateFrame = CreateFrame
local C_StorePublic_IsEnabled = C_StorePublic.IsEnabled
local UpdateMicroButtonsParent = UpdateMicroButtonsParent
......
......@@ -5,7 +5,6 @@ local _G = _G
local ceil = ceil
local unpack = unpack
local format, strfind = format, strfind
local CooldownFrame_Set = CooldownFrame_Set
local CreateFrame = CreateFrame
local GetBindingKey = GetBindingKey
......
......@@ -5,7 +5,6 @@ local LSM = E.Libs.LSM
local _G = _G
local floor, format, tinsert = floor, format, tinsert
local select, unpack, strmatch = select, unpack, strmatch
local CreateFrame = CreateFrame
local GetInventoryItemQuality = GetInventoryItemQuality
local GetInventoryItemTexture = GetInventoryItemTexture
......
......@@ -5,7 +5,6 @@ local _G = _G
local ipairs = ipairs
local unpack = unpack
local tinsert = tinsert
local CreateFrame = CreateFrame
local GetBagSlotFlag = GetBagSlotFlag
local RegisterStateDriver = RegisterStateDriver
......
......@@ -4,9 +4,7 @@ local B = E:GetModule('Blizzard')
local _G = _G
local floor = floor
local format = format
local CreateFrame = CreateFrame
local hooksecurefunc = hooksecurefunc
local UnitPowerMax = UnitPowerMax
local UnitPower = UnitPower
local GetUnitPowerBarInfo = GetUnitPowerBarInfo
......
......@@ -9,7 +9,6 @@ local S = E:GetModule('Skins')
local _G = _G
local strlen, strjoin, gsub = strlen, strjoin, gsub
local tonumber, floor, strsub, wipe = tonumber, floor, strsub, wipe
local CreateFrame = CreateFrame
local IsAddOnLoaded = IsAddOnLoaded
local IsControlKeyDown = IsControlKeyDown
......
......@@ -2,8 +2,8 @@ local E, L, V, P, G = unpack(select(2, ...)); --Import: Engine, Locales, Private
local B = E:GetModule('Blizzard')
local _G = _G
local CreateFrame = CreateFrame
local hooksecurefunc = hooksecurefunc
local CreateFrame = CreateFrame
local Holder
local function Reanchor(frame, _, anchor)
......
......@@ -3,7 +3,6 @@ local B = E:GetModule('Blizzard')
local _G = _G
local min = min
local CreateFrame = CreateFrame
local GetScreenHeight = GetScreenHeight
local GetInstanceInfo = GetInstanceInfo
......
......@@ -3,7 +3,6 @@ local B = E:GetModule('Blizzard')
local _G = _G
local select, unpack, pairs = select, unpack, pairs
local CreateFrame = CreateFrame
local function SkinIt(bar)
......
......@@ -214,6 +214,7 @@ do --this can save some main file locals
local Clover = E:TextureString(E.Media.ChatLogos.Clover,x)
local GoldShield = E:TextureString(E.Media.ChatLogos.GoldShield,x)
local DeathlyH = E:TextureString(E.Media.ChatLogos.DeathlyHallows,x)
local Gem = E:TextureString(E.Media.ChatLogos.Gem,x)
--[[ Simpys Thing: new icon color every message, in order then reversed back, repeating of course
local a, b, c = 0, false, {ElvRed, ElvOrange, ElvYellow, ElvGreen, ElvBlue, ElvPurple, ElvPink}
......@@ -398,6 +399,10 @@ do --this can save some main file locals
["Vidiä-WyrmrestAccord"] = DeathlyH,
-- Quickhanz (Nihilist's absolute bestie)
["Zandahanz-Area52"] = GoldShield,
-- AcidWeb
["Livarax-BurningLegion"] = Gem,
["Filevandrel-BurningLegion"] = Gem,
["Akavaya-BurningLegion"] = Gem,
}
end
......@@ -767,12 +772,7 @@ end
local function colorizeLine(text, r, g, b)
local hexCode = E:RGBToHex(r, g, b)
local hexReplacement = format("|r%s", hexCode)
text = gsub(text, "|r", hexReplacement) --If the message contains color strings then we need to add message color hex code after every "|r"
text = format("%s%s|r", hexCode, text) --Add message color
return text
return format("%s%s|r", hexCode, text)
end
local copyLines = {}
......
......@@ -591,20 +591,24 @@ function DT:GetMenuListCategory(category)
end
end
function DT:SortMenuList(list)
for _, menu in pairs(list) do
if menu.menuList then
DT:SortMenuList(menu.menuList)
end
end
sort(list, function(a, b)
do
local function menuSort(a, b)
if a.order and b.order then
return a.order < b.order
end
return a.text < b.text
end)
end
function DT:SortMenuList(list)
for _, menu in pairs(list) do
if menu.menuList then
DT:SortMenuList(menu.menuList)
end
end
sort(list, menuSort)
end
end
function DT:HyperDT()
......@@ -711,7 +715,9 @@ function DT:Initialize()
return dt and (DT.db.panels[dt.parentName] and DT.db.panels[dt.parentName][dt.pointIndex] == value)
end
TT:HookScript(DT.tooltip, 'OnShow', 'SetStyle')
if E.private.skins.blizzard.enable and E.private.skins.blizzard.tooltip then
TT:HookScript(DT.tooltip, 'OnShow', 'SetStyle')
end
-- Ignore header font size on DatatextTooltip
local font = E.Libs.LSM:Fetch('font', E.db.tooltip.font)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment