Commit 02e1a539 authored by Merathilis's avatar Merathilis

Merge branch 'development'

parents 0e93c72c d95f8008
[b][color=orange]v4.32[/color], 15.09.2019[/b][list]
[*]Fixed EncounterJournal Tab backdrop.
[*]Fixed AutoButton Usable Button color options.
[*]Added an own Minimap Difficulty Indicator => Text.
[*]Added combat hide option for Minimap Buttons.
[*]Added own Durability DataText = > MUI Durability
[*]Added new Style Panels under my existing Panels.
[*]Code cleanup, you dont need to apply twice the install step for ActionBars/UnitFrames.[/list]
[b][color=orange]v4.31[/color], 06.09.2019[/b][list]
[*]Removed my own ProgressBar. Was a good idea, but nah.
[*]Remove transparent options for Bags/ActionBars. Now in ElvUI.
......@@ -6,7 +16,8 @@
[*]Updated some Skins.
[*]Code cleanup. And hopefully fix some nil errors.
[*]Added back TradeSkillTabs.
[*]Added FPS and Latency to my MicroButton Time Tooltip.
[*]Added FPS and Latency to my MicroButton Time Tooltip.[/list]
[b][color=orange]v4.30[/color], 19.08.2019[/b][list]
[*]More code cleanup.
......@@ -15,6 +26,7 @@
[*]Added option to change the Paragon Bar Color and Text Style.
[*]Added a notification for Paragon Rewards.[/list]
[b][color=orange]v4.29[/color], 18.08.2019[/b][list]
[*]Code Cleanup.
[*]Fixed an error in Notifications.
......@@ -29,6 +41,7 @@
[*]Layout Updates. See inGame changelog info!!
[*]Added an own ProgressBar over the Minimap.[/list]
[b][color=orange]v4.28[/color], 05.08.2019[/b][list]
[*]Added Pawn Skin, needs AddOnSkins to work.
[*]Adjust some install settings.
......
** v4.32 15.09.2019**
* Fixed EncounterJournal Tab backdrop.
* Fixed AutoButton Usable Button color options.
* Added an own Minimap Difficulty Indicator => Text.
* Added combat hide option for Minimap Buttons.
* Added own Durability DataText = > MUI Durability
* Added new Style Panels under my existing Panels.
* Code cleanup, you dont need to apply twice the install step for ActionBars/UnitFrames.
** v4.31 06.09.2019**
* Removed my own ProgressBar. Was a good idea, but nah.
* Remove transparent options for Bags/ActionBars. Now in ElvUI.
......@@ -8,6 +18,7 @@
* Added back TradeSkillTabs.
* Added FPS and Latency to my MicroButton Time Tooltip.
** v4.30 19.08.2019**
* More code cleanup.
* Fixed an issue, which can happen with BenikUI FlightMode.
......@@ -15,6 +26,7 @@
* Added option to change the Paragon Bar Color and Text Style.
* Added a notification for Paragon Rewards.
** v4.29 18.08.2019**
* Code Cleanup.
* Fixed an error in Notifications.
......@@ -29,12 +41,14 @@
* Layout Updates. See inGame changelog info!!
* Added an own ProgressBar over the Minimap.
** v4.28 05.08.2019**
* Added Pawn Skin, needs AddOnSkins to work.
* Adjust some install settings.
* Added a Paragon Reputation feature.
* Finally fixed a db error if AAP + HandyNotes are enabled. Big thanks to NihilisticPandemonium <3
** v4.27 29.07.2019**
* Update some skins.
* Update Azerite Armor Tooltip.
......
## Interface: 80200
## Author: Merathilis
## Version: 4.31
## Version: 4.32
## Title: |cFF00c0faElvUI|r |cffff7d0aMerathilisUI|r
## Notes: A decorative edit for ElvUI + additional features.
## Notes-deDE: Eine dekorative Erweiterung für ElvUI + einige zusätzliche Funktionen.
......@@ -11,7 +11,7 @@
## OptionalDeps: SharedMedia, AddOnSkins, BigWigs, ls_Toasts
## X-Credits: Benik, Blazeflack, Azilroka, Simpy, NihilisticPandemonium, Darth Predator, fgprodigal, siweia, Solor, Elv & all AddOn Authors who inspired me.
## X-ElvVersion: 11.22
## X-Curse-Packaged-Version: 4.31
## X-Curse-Packaged-Version: 4.32
## X-Curse-Project-Name: MerathilisUI
## X-Curse-Project-ID: merathilis-ui
## X-Tukui-ProjectID: 1
......
......@@ -17,14 +17,12 @@ local DISABLED_FONT_COLOR = DISABLED_FONT_COLOR
local ChangeLogData = {
"Changes:",
"• Removed my own ProgressBar. Was a good idea, but nah",
"• Remove transparent options for Bags/ActionBars. Now in ElvUI",
"• Enhance AutoButtons",
"• Hide the progress Tooltip if Raider.IO is loaded",
"• Updated some Skins",
"• Code cleanup. And hopefully fix some nil errors",
"• Added back TradeSkillTabs",
"• Added FPS and Latency to my MicroButton Time Tooltip",
"• Fixed EncounterJournal Tab backdrop",
"• Fixed AutoButton Usable Button color options",
"• Added an own Minimap Difficulty Indicator => Text",
"• Added combat hide option for Minimap Buttons",
"• Added own Durability DataText = > MUI Durability",
"• Added new Style Panels under my existing Panels",
-- "• ''",
" ",
"Notes:",
......
......@@ -31,15 +31,6 @@ function MER:DasOptions()
E:ToggleOptionsUI(); LibStub("AceConfigDialog-3.0-ElvUI"):SelectGroup("ElvUI", "mui")
end
function MER:SetMoverPosition(mover, point, anchor, secondaryPoint, x, y)
if not _G[mover] then return end
local frame = _G[mover]
frame:ClearAllPoints()
frame:SetPoint(point, anchor, secondaryPoint, x, y)
E:SaveMoverPosition(mover)
end
function MER:LoadCommands()
self:RegisterChatCommand("mui", "DasOptions")
end
......
......@@ -40,6 +40,7 @@ MER.WoWBuild = select(2, GetBuildInfo()) MER.WoWBuild = tonumber(MER.WoWBuild)
MER_NORMAL_QUEST_DISPLAY = "|cffffffff%s|r"
MER_TRIVIAL_QUEST_DISPLAY = TRIVIAL_QUEST_DISPLAY:gsub("000000", "ffffff")
--Info Color RGB: 0, 191/255, 250/255
MER.InfoColor = "|cff70C0F5"
MER.GreyColor = "|cffB5B5B5"
MER.RedColor = "|cffff2735"
......@@ -575,6 +576,18 @@ function MER:ReskinRole(self, role)
end
end
function MER:CreateGradientFrame(frame, w, h, o, r, g, b, a1, a2)
assert(frame, "doesn't exist!")
frame:SetSize(w, h)
frame:SetFrameStrata("BACKGROUND")
local gf = frame:CreateTexture(nil, "BACKGROUND")
gf:SetAllPoints()
gf:SetTexture(E.media.normTex)
gf:SetGradientAlpha(o, r, g, b, a1, r, g, b, a2)
end
local function Styling(f, useStripes, useGradient, useShadow, shadowOverlayWidth, shadowOverlayHeight, shadowOverlayAlpha)
assert(f, "doesn't exist!")
local frameName = f.GetName and f:GetName()
......
This diff is collapsed.
......@@ -9,6 +9,7 @@ local LO = E:GetModule("Layout")
--Cache global variables
--Lua functions
local _G = _G
local unpack = unpack
--WoW API / Variables
local CreateFrame = CreateFrame
local InCombatLockdown = InCombatLockdown
......@@ -21,6 +22,7 @@ local hooksecurefunc = hooksecurefunc
-- GLOBALS: RightChatTab, RightChatPanel, ChatTab_Datatext_Panel
local PANEL_HEIGHT = 19;
local r, g, b = unpack(E.media.rgbvaluecolor)
function MERL:LoadLayout()
--Create extra panels
......@@ -86,28 +88,13 @@ function MERL:ChangeLayout()
E:CreateMover(mUIMiddleDTPanel, "mUIMiddleDTPanelMover", L["MerathilisUI Middle DataText"], nil, nil, nil, 'ALL,SOLO,MERATHILISUI', nil, 'mui,modules,datatexts')
end
local function ChatMenu_OnEnter(self)
if GameTooltip:IsForbidden() then return end
GameTooltip:SetOwner(self, 'ANCHOR_TOPLEFT', 0, 4)
GameTooltip:ClearLines()
GameTooltip:AddDoubleLine(L["Left Click:"], L["Toggle Chat Menu"], 1, 1, 1)
GameTooltip:Show()
end
local function ChatMenu_OnLeave(self)
if GameTooltip:IsForbidden() then return end
GameTooltip:Hide()
end
function MERL:CreateChatButtons()
if E.db.mui.chat.chatButton ~= true or E.private.chat.enable ~= true then return end
local panelBackdrop = E.db.chat.panelBackdrop
local ChatButton = CreateFrame("Frame", "mUIChatButton", _G["LeftChatPanel"].backdrop)
ChatButton:ClearAllPoints()
ChatButton:Point("TOPLEFT", 4, -5)
ChatButton:SetPoint("TOPLEFT", _G["LeftChatPanel"].backdrop, "TOPLEFT", 4, -8)
ChatButton:Size(13, 13)
if E.db.chat.panelBackdrop == "HIDEBOTH" or E.db.chat.panelBackdrop == "LEFT" then
ChatButton:SetAlpha(0)
......@@ -358,6 +345,46 @@ function MERL:CreatePanels()
MerathilisUIButton2:SetScript("OnLeave", ChatPanels_OnLeave)
end
function MERL:CreateStylePanels()
if E.db.mui.general.panels ~= true then return end
-- Style Background for RaidBuffReminder / Raid Manager
local TopLeftStylePanel = CreateFrame("Frame", nil, E.UIParent)
TopLeftStylePanel:SetPoint("TOPLEFT", E.UIParent, "TOPLEFT", 10, -14)
MER:CreateGradientFrame(TopLeftStylePanel, _G.LeftChatPanel:GetWidth(), 36, "Horizontal", 0, 0, 0, .5, 0)
local TopLeftStylePanel1 = CreateFrame("Frame", nil, TopLeftStylePanel)
TopLeftStylePanel1:SetPoint("TOP", TopLeftStylePanel, "BOTTOM")
MER:CreateGradientFrame(TopLeftStylePanel1, _G.LeftChatPanel:GetWidth(), E.mult, "Horizontal", r, g, b, .7, 0)
-- Style for the BuffFrame
local TopRightStylePanel = CreateFrame("Frame", nil, E.UIParent)
TopRightStylePanel:SetPoint("TOPRIGHT", E.UIParent, "TOPRIGHT", -10, -14)
MER:CreateGradientFrame(TopRightStylePanel, _G.LeftChatPanel:GetWidth(), 36, "Horizontal", 0, 0, 0, 0, .5)
local TopRightStylePanel1 = CreateFrame("Frame", nil, TopRightStylePanel)
TopRightStylePanel1:SetPoint("TOP", TopRightStylePanel, "BOTTOM")
MER:CreateGradientFrame(TopRightStylePanel1, _G.LeftChatPanel:GetWidth(), E.mult, "Horizontal", r, g, b, .7, 0)
-- Style under the left chat.
local BottomLeftStylePanel = CreateFrame("Frame", nil, E.UIParent)
BottomLeftStylePanel:SetPoint("BOTTOMLEFT", E.UIParent, "BOTTOMLEFT", 10, 16)
MER:CreateGradientFrame(BottomLeftStylePanel, _G.LeftChatPanel:GetWidth(), 28, "Horizontal", 0, 0, 0, .5, 0)
local BottomLeftStylePanel1 = CreateFrame("Frame", nil, BottomLeftStylePanel)
BottomLeftStylePanel1:SetPoint("BOTTOM", BottomLeftStylePanel, "TOP")
MER:CreateGradientFrame(BottomLeftStylePanel1, _G.LeftChatPanel:GetWidth(), E.mult, "Horizontal", r, g, b, .7, 0)
-- Style under the right chat.
local BottomRightStylePanel = CreateFrame("Frame", nil, E.UIParent)
BottomRightStylePanel:SetPoint("BOTTOMRIGHT", E.UIParent, "BOTTOMRIGHT", -10, 16)
MER:CreateGradientFrame(BottomRightStylePanel, _G.LeftChatPanel:GetWidth(), 28, "Horizontal", 0, 0, 0, 0, .5)
local BottomRightStylePanel1 = CreateFrame("Frame", nil, BottomRightStylePanel)
BottomRightStylePanel1:SetPoint("BOTTOM", BottomRightStylePanel, "TOP")
MER:CreateGradientFrame(BottomRightStylePanel1, _G.LeftChatPanel:GetWidth(), E.mult, "Horizontal", r, g, b, .7, 0)
end
function MERL:regEvents()
self:ToggleChatPanel()
self:MiddleDatatextLayout()
......@@ -383,6 +410,7 @@ end
function MERL:Initialize()
self:CreatePanels()
self:CreateStylePanels()
self:ChangeLayout()
self:regEvents()
self:CreateChatButtons()
......
......@@ -55,7 +55,7 @@ L["Chat Item Level"] = true
L["Shows the slot and item level in the chat"] = "Zeigt den Ausrüstungplatz und das Item Level im Chat an."
L["Expand the chat"] = "Chat erweitern"
L["Chat Menu"] = "Chat Menu"
L["Create a chat button to increase the chat size and chat menu button."] = "Erstellt eine Chat Taste um den Chat zu erweitern und eine Chat Menu Taste."
L["Create a chat button to increase the chat size. |cffFF0000WARNING:|r If this option is enabled, the chat will be forced to a fixed size."] = "Erstellt eine Chat Taste um den Chat zu erweitern. |cffFF0000WARNUNG:|r wenn du diese Option aktivierst, bleibt der Chat in einer festen Höhe."
L["Hide Player Brackets"] = "Verstecke Spieler Klammern"
L["Removes brackets around the person who posts a chat message."] = "Entfernt die Klammern um die Spielernamen im Chat."
L["ChatBar"] = "Chatleiste"
......@@ -194,6 +194,7 @@ L["Middle Datatext Panel"] = "Mittlere Infotextleiste"
L["Right Click"] = "Rechtsklick"
L["Toggle ActionBar"] = "Aktionsleisten ausblenden"
L["Toggle Middle DT"] = "Mittleren Infotext ausblenden"
L["Dura."] = "Haltb."
-- DataBars
L["DataBars"] = "Informationsleisten"
......@@ -201,7 +202,7 @@ L["Add some stylish buttons at the bottom of the DataBars"] = "Fügt unten an de
L["Style DataBars"] = "Informationsleisten Stil"
-- Actionbars
L["Specialisation Bar"] = "Spezialisierungsleiste"
L["Specialization Bar"] = "Spezialisierungsleiste"
L["EquipSet Bar"] = "Ausrüstungsleiste"
L["Clean Boss Button"] = "Geskinnte Boss Taste"
L["Auto Buttons"] = "Auto Tasten"
......@@ -504,9 +505,9 @@ L["This part of the installation process will apply changes to ElvUI Plugins"] =
L["This step changes a few World of Warcraft default options. These options are tailored to the needs of the author of %s and are not necessary for this edit to function."] = "Dieser Schritt ändert ein paar World of Warcraft Standard-Optionen. Diese Optionen sind zugeschnitten für die Anforderungen des Authors von %s und sind nicht notwendig damit dieses AddOn funktioniert."
L["Please click the button below to apply the new layout."] = "Bitte drücke die Taste unten, um das neue Layout anzuwenden."
L["Please click the button below to setup your chat windows."] = "Bitte klick auf die Taste unten, um das Chatfenster einzustellen."
L["Please click the button below |cff07D400twice|r to setup your actionbars."] = "Bitte drücke |cff07D400doppelt|r auf die Taste unten, um die Aktionsleisten einzustellen."
L["Please click the button below to setup your actionbars."] = "Bitte drücke auf die Taste unten, um die Aktionsleisten einzustellen."
L["Please click the button below to setup your datatexts."] = "Bitte drücke die Taste unten, um die Infotexte einzustellen."
L["Please click the button below |cff07D400twice|r to setup your Unitframes."] = "Bitte drücke |cff07D400doppelt|r die Taste unten, um die Einheitenfenster einzustellen."
L["Please click the button below to setup your Unitframes."] = "Bitte drücke die Taste unten, um die Einheitenfenster einzustellen."
L["Please click the button below to setup the ElvUI AddOns. For other Addon profiles please go in my Options - Skins/AddOns"] = "Bitte drücke die Taste unten, um die ElvUI AddOns einzustellen. Für andere AddOn Profile, gehe bitte in meine Einstellungen - Skins/AddOns"
L["DataTexts"] = "Infotexte"
L["Setup Datatexts"] = "Infotexte einstellen"
......
......@@ -56,7 +56,7 @@ L["Chat Item Level"] = true
L["Shows the slot and item level in the chat"] = true
L["Expand the chat"] = true
L["Chat Menu"] = true
L["Create a chat button to increase the chat size and chat menu button."] = true
L["Create a chat button to increase the chat size. |cffFF0000WARNING:|r If this option is enabled, the chat will be forced to a fixed size."] = true
L["Hide Player Brackets"] = true
L["Removes brackets around the person who posts a chat message."] = true
L["Hide Chat Side Panel"] = true
......@@ -197,6 +197,7 @@ L["Middle Datatext Panel"] = true
L["Right Click"] = true
L["Toggle ActionBar"] = true
L["Toggle Middle DT"] = true
L["Dura."] = true
-- DataBars
L["DataBars"] = true
......@@ -204,7 +205,7 @@ L["Add some stylish buttons at the bottom of the DataBars"] = true
L["Style DataBars"] = true
-- Actionbars
L["Specialisation Bar"] = true
L["Specialization Bar"] = true
L["EquipSet Bar"] = true
L["Clean Boss Button"] = true
L["Auto Buttons"] = true
......@@ -508,9 +509,9 @@ L["This part of the installation process will apply changes to ElvUI Plugins"] =
L["This step changes a few World of Warcraft default options. These options are tailored to the needs of the author of %s and are not necessary for this edit to function."] = true
L["Please click the button below to apply the new layout."] = true
L["Please click the button below to setup your chat windows."] = true
L["Please click the button below |cff07D400twice|r to setup your actionbars."] = true
L["Please click the button below to setup your actionbars."] = true
L["Please click the button below to setup your datatexts."] = true
L["Please click the button below |cff07D400twice|r to setup your Unitframes."] = true
L["Please click the button below to setup your Unitframes."] = true
L["Please click the button below to setup the ElvUI AddOns. For other Addon profiles please go in my Options - Skins/AddOns"] = true
L["DataTexts"] = true
L["Setup Datatexts"] = true
......
......@@ -55,7 +55,7 @@ L["Chat Item Level"] = true
L["Shows the slot and item level in the chat"] = true
L["Expand the chat"] = true
L["Chat Menu"] = true
L["Create a chat button to increase the chat size and chat menu button."] = true
L["Create a chat button to increase the chat size. |cffFF0000WARNING:|r If this option is enabled, the chat will be forced to a fixed size."] = true
L["Hide Player Brackets"] = true
L["Removes brackets around the person who posts a chat message."] = true
L["Hide Chat Side Panel"] = true
......@@ -196,6 +196,7 @@ L["Middle Datatext Panel"] = true
L["Right Click"] = true
L["Toggle ActionBar"] = true
L["Toggle Middle DT"] = true
L["Dura."] = true
-- DataBars
L["DataBars"] = true
......@@ -203,7 +204,7 @@ L["Add some stylish buttons at the bottom of the DataBars"] = true
L["Style DataBars"] = true
-- Actionbars
L["Specialisation Bar"] = true
L["Specialization Bar"] = true
L["EquipSet Bar"] = true
L["Clean Boss Button"] = true
L["Auto Buttons"] = true
......@@ -506,9 +507,9 @@ L["This part of the installation process will apply changes to ElvUI Plugins"] =
L["This step changes a few World of Warcraft default options. These options are tailored to the needs of the author of %s and are not necessary for this edit to function."] = true
L["Please click the button below to apply the new layout."] = true
L["Please click the button below to setup your chat windows."] = true
L["Please click the button below |cff07D400twice|r to setup your actionbars."] = true
L["Please click the button below to setup your actionbars."] = true
L["Please click the button below to setup your datatexts."] = true
L["Please click the button below |cff07D400twice|r to setup your Unitframes."] = true
L["Please click the button below to setup your Unitframes."] = true
L["Please click the button below to setup the ElvUI AddOns. For other Addon profiles please go in my Options - Skins/AddOns"] = true
L["DataTexts"] = true
L["Setup Datatexts"] = true
......
......@@ -55,7 +55,7 @@ L["Chat Item Level"] = true
L["Shows the slot and item level in the chat"] = true
L["Expand the chat"] = true
L["Chat Menu"] = true
L["Create a chat button to increase the chat size and chat menu button."] = true
L["Create a chat button to increase the chat size. |cffFF0000WARNING:|r If this option is enabled, the chat will be forced to a fixed size."] = true
L["Hide Player Brackets"] = true
L["Removes brackets around the person who posts a chat message."] = true
L["Hide Chat Side Panel"] = true
......@@ -196,6 +196,7 @@ L["Middle Datatext Panel"] = true
L["Right Click"] = true
L["Toggle ActionBar"] = true
L["Toggle Middle DT"] = true
L["Dura."] = true
-- DataBars
L["DataBars"] = true
......@@ -203,7 +204,7 @@ L["Add some stylish buttons at the bottom of the DataBars"] = true
L["Style DataBars"] = true
-- Actionbars
L["Specialisation Bar"] = true
L["Specialization Bar"] = true
L["EquipSet Bar"] = true
L["Clean Boss Button"] = true
L["Auto Buttons"] = true
......@@ -506,9 +507,9 @@ L["This part of the installation process will apply changes to ElvUI Plugins"] =
L["This step changes a few World of Warcraft default options. These options are tailored to the needs of the author of %s and are not necessary for this edit to function."] = true
L["Please click the button below to apply the new layout."] = true
L["Please click the button below to setup your chat windows."] = true
L["Please click the button below |cff07D400twice|r to setup your actionbars."] = true
L["Please click the button below to setup your actionbars."] = true
L["Please click the button below to setup your datatexts."] = true
L["Please click the button below |cff07D400twice|r to setup your Unitframes."] = true
L["Please click the button below to setup your Unitframes."] = true
L["Please click the button below to setup the ElvUI AddOns. For other Addon profiles please go in my Options - Skins/AddOns"] = true
L["DataTexts"] = true
L["Setup Chat"] = true
......
......@@ -55,7 +55,7 @@ L["Chat Item Level"] = true
L["Shows the slot and item level in the chat"] = true
L["Expand the chat"] = true
L["Chat Menu"] = true
L["Create a chat button to increase the chat size and chat menu button."] = true
L["Create a chat button to increase the chat size. |cffFF0000WARNING:|r If this option is enabled, the chat will be forced to a fixed size."] = true
L["Hide Player Brackets"] = true
L["Removes brackets around the person who posts a chat message."] = true
L["Hide Community Chat"] = true
......@@ -192,6 +192,7 @@ L["Middle Datatext Panel"] = true
L["Right Click"] = true
L["Toggle ActionBar"] = true
L["Toggle Middle DT"] = true
L["Dura."] = true
-- DataBars
L["DataBars"] = true
......@@ -199,7 +200,7 @@ L["Add some stylish buttons at the bottom of the DataBars"] = true
L["Style DataBars"] = true
-- Actionbars
L["Specialisation Bar"] = true
L["Specialization Bar"] = true
L["EquipSet Bar"] = true
L["Clean Boss Button"] = true
L["Auto Buttons"] = true
......@@ -502,9 +503,9 @@ L["This part of the installation process will apply changes to ElvUI Plugins"] =
L["This step changes a few World of Warcraft default options. These options are tailored to the needs of the author of %s and are not necessary for this edit to function."] = true
L["Please click the button below to apply the new layout."] = true
L["Please click the button below to setup your chat windows."] = true
L["Please click the button below |cff07D400twice|r to setup your actionbars."] = true
L["Please click the button below to setup your actionbars."] = true
L["Please click the button below to setup your datatexts."] = true
L["Please click the button below |cff07D400twice|r to setup your Unitframes."] = true
L["Please click the button below to setup your Unitframes."] = true
L["Please click the button below to setup the ElvUI AddOns. For other Addon profiles please go in my Options - Skins/AddOns"] = true
L["DataTexts"] = true
L["Setup Chat"] = true
......
......@@ -55,7 +55,7 @@ L["Chat Item Level"] = true
L["Shows the slot and item level in the chat"] = true
L["Expand the chat"] = true
L["Chat Menu"] = true
L["Create a chat button to increase the chat size and chat menu button."] = true
L["Create a chat button to increase the chat size. |cffFF0000WARNING:|r If this option is enabled, the chat will be forced to a fixed size."] = true
L["Hide Player Brackets"] = true
L["Removes brackets around the person who posts a chat message."] = true
L["ChatBar"] = true
......@@ -194,6 +194,7 @@ L["Middle Datatext Panel"] = true
L["Right Click"] = true
L["Toggle ActionBar"] = true
L["Toggle Middle DT"] = true
L["Dura."] = true
-- DataBars
L["DataBars"] = true
......@@ -201,7 +202,7 @@ L["Add some stylish buttons at the bottom of the DataBars"] = true
L["Style DataBars"] = true
-- Actionbars
L["Specialisation Bar"] = true
L["Specialization Bar"] = true
L["EquipSet Bar"] = true
L["Clean Boss Button"] = true
L["Auto Buttons"] = true
......@@ -504,9 +505,9 @@ L["This part of the installation process will apply changes to ElvUI Plugins"] =
L["This step changes a few World of Warcraft default options. These options are tailored to the needs of the author of %s and are not necessary for this edit to function."] = true
L["Please click the button below to apply the new layout."] = true
L["Please click the button below to setup your chat windows."] = true
L["Please click the button below |cff07D400twice|r to setup your actionbars."] = true
L["Please click the button below to setup your actionbars."] = true
L["Please click the button below to setup your datatexts."] = true
L["Please click the button below |cff07D400twice|r to setup your Unitframes."] = true
L["Please click the button below to setup your Unitframes."] = true
L["Please click the button below to setup the ElvUI AddOns. For other Addon profiles please go in my Options - Skins/AddOns"] = true
L["DataTexts"] = true
L["Setup Chat"] = true
......
......@@ -41,10 +41,10 @@ L["Show the associated equipment sets for the items in your bags (or bank)."] =
L["CHAT_AFK"] = "[AFK]"
L["CHAT_DND"] = "[DND]"
L["BACK"] = "后退"
L["has come |cff298F00online|r."] = "来了 |cff298F00在线|r." -- Guild Message
L["has gone |cffff0000offline|r."] = "走了 |cffff0000离线|r." -- Guild Message
L[" has come |cff298F00online|r."] = "来了 |cff298F00在线|r." -- Battle.Net Message
L[" has gone |cffff0000offline|r."] = "走了 |cffff0000离线|r." -- Battle.Net Message
L["has come |cff298F00online|r."] = "|cff298F00上线|r." -- Guild Message
L["has gone |cffff0000offline|r."] = "|cffff0000离线|r." -- Guild Message
L[" has come |cff298F00online|r."] = "|cff298F00上线|r." -- Battle.Net Message
L[" has gone |cffff0000offline|r."] = "|cffff0000离线|r." -- Battle.Net Message
L["|cFF00c0failvl|r: %d"] = true
L["|CFF1EFF00%s|r |CFFFF0000Sold.|r"] = "|CFF1EFF00%s|r |CFFFF0000出售.|r"
L["Requires level: %d - %d"] = "需要等级: %d - %d"
......@@ -55,7 +55,7 @@ L["Chat Item Level"] = "聊天物品等级"
L["Shows the slot and item level in the chat"] = "显示聊天中的插槽和物品等级"
L["Expand the chat"] = "展开聊天框"
L["Chat Menu"] = "聊天菜单"
L["Create a chat button to increase the chat size and chat menu button."] = "创建聊天按钮以增加聊天大小和聊天菜单按钮."
L["Create a chat button to increase the chat size. |cffFF0000WARNING:|r If this option is enabled, the chat will be forced to a fixed size."] = true
L["Hide Player Brackets"] = "隐藏玩家括号"
L["Removes brackets around the person who posts a chat message."] = "删除聊天框中玩家名字两边的括号."
L["Hide Community Chat"] = "隐藏社区聊天"
......@@ -194,6 +194,7 @@ L["Middle Datatext Panel"] = "中间的信息面板"
L["Right Click"] = true
L["Toggle ActionBar"] = true
L["Toggle Middle DT"] = true
L["Dura."] = true
-- DataBars
L["DataBars"] = "数据条"
......@@ -201,7 +202,7 @@ L["Add some stylish buttons at the bottom of the DataBars"] = "在数据条底
L["Style DataBars"] = "样式数据条"
-- Actionbars
L["Specialisation Bar"] = "专业条"
L["Specialization Bar"] = "专业条"
L["EquipSet Bar"] = "套装管理条"
L["Clean Boss Button"] = true
L["Auto Buttons"] = "自动按钮"
......@@ -504,9 +505,9 @@ L["This part of the installation process will apply changes to ElvUI Plugins"] =
L["This step changes a few World of Warcraft default options. These options are tailored to the needs of the author of %s and are not necessary for this edit to function."] = "此步骤更改了一些魔兽世界的默认选项.这些选项是根据%s作者的需求量身定制的,并不是此配置功能所必需的(一些cvar的修改)"
L["Please click the button below to apply the new layout."] = "请单击下面的按钮以应用新布局."
L["Please click the button below to setup your chat windows."] = "请单击下面的按钮设置聊天窗口."
L["Please click the button below |cff07D400twice|r to setup your actionbars."] = "请点击下面的按钮|cff07D400两次|r来设置你的动作条."
L["Please click the button below to setup your actionbars."] = true
L["Please click the button below to setup your datatexts."] = "请单击下面的按钮来设置数据文本."
L["Please click the button below |cff07D400twice|r to setup your Unitframes."] = "请点击下面的按钮|cff07D400两次|r来设置你的单位框体."
L["Please click the button below to setup your Unitframes."] = true
L["Please click the button below to setup the ElvUI AddOns. For other Addon profiles please go in my Options - Skins/AddOns"] = "请单击下面的按钮以设置ElvUI AddOns.对于其他Addon配置文件,请进入我的选项 - 皮肤/插件"
L["DataTexts"] = "数据文本"
L["Setup Datatexts"] = "设置数据文本"
......
......@@ -55,7 +55,7 @@ L["Chat Item Level"] = true
L["Shows the slot and item level in the chat"] = true
L["Expand the chat"] = true
L["Chat Menu"] = true
L["Create a chat button to increase the chat size and chat menu button."] = true
L["Create a chat button to increase the chat size. |cffFF0000WARNING:|r If this option is enabled, the chat will be forced to a fixed size."] = true
L["Hide Player Brackets"] = true
L["Removes brackets around the person who posts a chat message."] = true
L["Hide Community Chat"] = true
......@@ -194,6 +194,7 @@ L["Middle Datatext Panel"] = true
L["Right Click"] = true
L["Toggle ActionBar"] = true
L["Toggle Middle DT"] = true
L["Dura."] = true
-- DataBars
L["DataBars"] = true
......@@ -201,7 +202,7 @@ L["Add some stylish buttons at the bottom of the DataBars"] = true
L["Style DataBars"] = true
-- Actionbars
L["Specialisation Bar"] = true
L["Specialization Bar"] = true
L["EquipSet Bar"] = true
L["Clean Boss Button"] = true
L["Auto Buttons"] = true
......@@ -504,9 +505,9 @@ L["This part of the installation process will apply changes to ElvUI Plugins"] =
L["This step changes a few World of Warcraft default options. These options are tailored to the needs of the author of %s and are not necessary for this edit to function."] = true
L["Please click the button below to apply the new layout."] = true
L["Please click the button below to setup your chat windows."] = true
L["Please click the button below |cff07D400twice|r to setup your actionbars."] = true
L["Please click the button below to setup your actionbars."] = true
L["Please click the button below to setup your datatexts."] = true
L["Please click the button below |cff07D400twice|r to setup your Unitframes."] = true
L["Please click the button below to setup your Unitframes."] = true
L["Please click the button below to setup the ElvUI AddOns. For other Addon profiles please go in my Options - Skins/AddOns"] = true
L["DataTexts"] = true
L["Setup Chat"] = true
......
......@@ -48,12 +48,11 @@ local GetSavedInstanceInfo = GetSavedInstanceInfo
local GetNumSavedWorldBosses = GetNumSavedWorldBosses
local GetSavedWorldBossInfo = GetSavedWorldBossInfo
local RequestRaidInfo = RequestRaidInfo
local RegisterStateDriver = RegisterStateDriver
local UnregisterStateDriver = UnregisterStateDriver
local SecondsToTime = SecondsToTime
local GameTooltip = GameTooltip
local UnitLevel = UnitLevel
local InCombatLockdown = InCombatLockdown
--Global variables that we don't cache, list them here for the mikk's Find Globals script
-- GLOBALS:
local microBar
......@@ -202,24 +201,9 @@ local bfaZoneTime = {
["US"] = 1546769340, -- CN+16
}
local legionTime = {
4,2,3,1,
2,4,1,3,
4,3,1,2,
1,2,4,3,
4,3,1,2,
3,2,1,4,
1,4,3,2,
3,4,2,1,
4,1,2,3,
2,3,4,1,
4,3,1,2,
1,2,4,3,
}
-- Check Invasion Status
local invIndex = {
[1] = {title = L["Legion Invasion"], duration = 66600, maps = {630, 641, 650, 634}, timeTable = legionTime, baseTime = legionZoneTime[region] or legionZoneTime["EU"]},
[1] = {title = L["Legion Invasion"], duration = 66600, maps = {630, 641, 650, 634}, timeTable = {}, baseTime = legionZoneTime[region] or legionZoneTime["EU"]},
[2] = {title = L["Faction Assault"], duration = 68400, maps = {862, 863, 864, 896, 942, 895}, timeTable = {4, 1, 6, 2, 5, 3}, baseTime = bfaZoneTime[region] or bfaZoneTime["EU"]},
}
......@@ -945,25 +929,18 @@ function module:Toggle()
if module.db.enable then
microBar:Show()
E:EnableMover(microBar.mover:GetName())
if module.db.hideInCombat then
RegisterStateDriver(microBar, 'visibility', '[combat] hide;show')
end
else
microBar:Hide()
E:DisableMover(microBar.mover:GetName())
UnregisterStateDriver(microBar, 'visibility')
end
module:UNIT_AURA(nil, "player")
end
function module:PLAYER_REGEN_DISABLED()
if module.db.hideInCombat == true then
microBar:SetAlpha(0)
end
end
function module:PLAYER_REGEN_ENABLED()
if module.db.enable then
microBar:SetAlpha(1)
end
end
function module:UNIT_AURA(_, unit)
if unit ~= "player" then
return
......@@ -997,8 +974,6 @@ function module:Initialize()
self:ForUpdateAll()
self:RegisterEvent("PLAYER_REGEN_DISABLED")
self:RegisterEvent("PLAYER_REGEN_ENABLED")
self:RegisterEvent("UNIT_AURA")
end
......
......@@ -33,7 +33,7 @@ local function abTable()
specBar = {
order = 3,
type = "group",
name = MER:cOption(L["Specialisation Bar"]),
name = MER:cOption(L["Specialization Bar"]),
guiInline = true,
disabled = function() return not E.private.actionbar.enable end,
get = function(info) return E.db.mui.actionbars.specBar[ info[#info] ] end,
......@@ -427,7 +427,7 @@ local function abTable()
end,
set = function(info, r, g, b, a)
E.db.mui.actionbars.autoButtons.usableAutoButtons[info[#info]] = {}
local t = E.db.mui.actionbars.autoButtons.usableButtons[info[#info]]
local t = E.db.mui.actionbars.autoButtons.usableAutoButtons[info[#info]]
t.r, t.g, t.b, t.a = r, g, b, a
MER:GetModule("AutoButtons"):UpdateAutoButton()
end,
......
......@@ -23,7 +23,7 @@ local function ChatTable()
order = 2,
type = "toggle",
name = L["Chat Menu"],
desc = L["Create a chat button to increase the chat size and chat menu button."],
desc = L["Create a chat button to increase the chat size. |cffFF0000WARNING:|r If this option is enabled, the chat will be forced to a fixed size."],
},
hidePlayerBrackets = {
order = 3,
......
......@@ -23,4 +23,4 @@ local function databarsTable()
},
}
end
tinsert(MER.Config, databarsTable)
--tinsert(MER.Config, databarsTable)
local MER, E, L, V, P, G = unpack(select(2, ...))
local DT = E:GetModule('DataTexts')
--Lua functions
local _G = _G
local select = select
local format, gsub = string.format, string.gsub
local floor, modf = math.floor, math.modf
local tsort = table.sort
--WoW API / Variables
local CreateFrame = CreateFrame
local GetAverageItemLevel = GetAverageItemLevel
local GetInventoryItemTexture = GetInventoryItemTexture
local GetInventoryItemDurability = GetInventoryItemDurability
local GetInventoryItemLink = GetInventoryItemLink