Skip to content

Commit 33ddea7

Browse files
committed
Merge branch 'development'
2 parents 2147cc0 + 994b611 commit 33ddea7

File tree

7 files changed

+16
-39
lines changed

7 files changed

+16
-39
lines changed

CHANGELOG.md

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
11
### Changes ###
22

3-
* Added Mything Dungeon Ports to the LocPanel Port Menu
4-
* Small install fixes
5-
* Updated my Minimap Button Code. YES, IT IS DIFFERNT; NO, YOU CANT CHANGE IT BACK!!!
6-
* Code Optimization
7-
* TBC: Added some TBC items to AutoButtons: THX modblaze
8-
* Also changed the defaults for AutoButtons
9-
* Some Skin updates
10-
* Added an Tooltip line to show the Covenant
11-
* Added quick Buttons to the Talent Window to switch Specc and more
3+
* Fixed little typos in the Mail Module

CHANGELOG.txt

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,2 @@
1-
[b][color=orange]v5.08[/color], xx.06.2022[/b][list]
2-
[*]Added Mything Dungeon Ports to the LocPanel Port Menu
3-
[*]Small install fixes
4-
[*]Updated my Minimap Button Code. YES, IT IS DIFFERNT; NO, YOU CANT CHANGE IT BACK!!!
5-
[*]Code Optimization
6-
[*]TBC: Added some TBC items to AutoButtons: THX modblaze
7-
[*]Also changed the defaults for AutoButtons
8-
[*]Some Skin updates
9-
[*]Added an Tooltip line to show the Covenant
10-
[*]Added quick Buttons to the Talent Window to switch Specc and more[/list]
1+
[b][color=orange]v5.08[/color], 20.06.2022[/b][list]
2+
[*]Fixed little typos in the Mail Module[/list]

ElvUI_MerathilisUI/Core/General/Changelog.lua

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,7 @@ local DISABLED_FONT_COLOR = DISABLED_FONT_COLOR
1212

1313
local ChangeLogData = {
1414
"Changes:",
15-
"• Added Mything Dungeon Ports to the LocPanel Port Menu",
16-
"• Small install fixes",
17-
"• Updated my Minimap Button Code. YES, IT IS DIFFERNT; NO, YOU CANT CHANGE IT BACK!!!",
18-
"• Code Optimization",
19-
"• TBC: Added some TBC items to AutoButtons: THX modblaze",
20-
"• Also changed the defaults for AutoButtons",
21-
"• Some Skin updates",
22-
"• Added an Tooltip line to show the Covenant",
23-
"• Added quick Buttons to the Talent Window to switch Specc and more",
15+
"• Fixed little typos in the Mail Module",
2416

2517
" ",
2618
"Notes:",

ElvUI_MerathilisUI/Core/Modules/Mail/Mail.lua

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
local MER, F, E, L, V, P, G = unpack(select(2, ...))
22
local module = MER:GetModule('MER_Mail')
3-
local S = E:GetModule('Skins')
3+
local S = MER:GetModule('MER_Skins')
4+
local ES = E:GetModule('Skins')
45

56
-- Credits: WindTools :)
67
local _G = _G
@@ -122,7 +123,7 @@ function module:ConstructFrame()
122123
frame:Point("BOTTOMRIGHT", _G.MailFrame, "BOTTOMRIGHT", 152, 1)
123124
frame:CreateBackdrop("Transparent")
124125
frame.backdrop:Styling()
125-
module:CreateShadow(frame)
126+
S:CreateShadow(frame)
126127
frame:EnableMouse(true)
127128

128129
self.frame = frame
@@ -219,7 +220,7 @@ function module:ConstructNameButtons()
219220

220221
button:SetText("")
221222
button:RegisterForClicks("LeftButtonDown", "RightButtonDown")
222-
S:HandleButton(button)
223+
ES:HandleButton(button)
223224

224225
button:SetScript("OnClick", function(self, mouseButton)
225226
if mouseButton == "LeftButton" then
@@ -254,8 +255,8 @@ function module:ConstructPageController()
254255
local pagePrevButton = CreateFrame("Button", "MER_MailPagePrevButton", self.frame, "SecureActionButtonTemplate")
255256
pagePrevButton:Size(14)
256257
SetButtonTexture(pagePrevButton, E.Media.Textures.ArrowUp)
257-
pagePrevButton.normalTex:SetRotation(S.ArrowRotation.left)
258-
pagePrevButton.hoverTex:SetRotation(S.ArrowRotation.left)
258+
pagePrevButton.normalTex:SetRotation(ES.ArrowRotation.left)
259+
pagePrevButton.hoverTex:SetRotation(ES.ArrowRotation.left)
259260
pagePrevButton:Point("BOTTOMLEFT", self.frame, "BOTTOMLEFT", 8, 8)
260261
pagePrevButton:RegisterForClicks("AnyUp")
261262

@@ -269,8 +270,8 @@ function module:ConstructPageController()
269270
local pageNextButton = CreateFrame("Button", "MER_MailPageNextButton", self.frame, "SecureActionButtonTemplate")
270271
pageNextButton:Size(14)
271272
SetButtonTexture(pageNextButton, E.Media.Textures.ArrowUp)
272-
pageNextButton.normalTex:SetRotation(S.ArrowRotation.right)
273-
pageNextButton.hoverTex:SetRotation(S.ArrowRotation.right)
273+
pageNextButton.normalTex:SetRotation(ES.ArrowRotation.right)
274+
pageNextButton.hoverTex:SetRotation(ES.ArrowRotation.right)
274275
pageNextButton:Point("BOTTOMRIGHT", self.frame, "BOTTOMRIGHT", -8, 8)
275276
pageNextButton:RegisterForClicks("AnyUp")
276277

@@ -296,7 +297,7 @@ function module:ConstructPageController()
296297
end
297298
end)
298299

299-
S:HandleSliderFrame(slider)
300+
ES:HandleSliderFrame(slider)
300301

301302
local pageIndicater = slider:CreateFontString(nil, "ARTWORK", "GameFontHighlightSmall")
302303
pageIndicater:Point("BOTTOM", slider, "TOP", 0, 6)

ElvUI_MerathilisUI/ElvUI_MerathilisUI.toc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
## Interface-Classic: 11402
33
## Interface-BCC: 20504
44
## Author: Merathilis
5-
## Version: 5.08
5+
## Version: 5.09
66
## Title: |cFF1784d1ElvUI|r |cffffffffMerathilis|r|cffff7d0aUI|r
77
## Notes: A decorative edit for ElvUI + additional features.
88
## Notes-deDE: Eine dekorative Erweiterung für ElvUI + einige zusätzliche Funktionen.

ElvUI_MerathilisUI/ElvUI_MerathilisUI_Classic.toc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
## Interface: 11402
22
## Author: Merathilis
3-
## Version: 5.08
3+
## Version: 5.09
44
## Title: |cFF1784d1ElvUI|r |cffffffffMerathilis|r|cffff7d0aUI|r
55
## Notes: A decorative edit for ElvUI + additional features.
66
## Notes-deDE: Eine dekorative Erweiterung für ElvUI + einige zusätzliche Funktionen.

ElvUI_MerathilisUI/ElvUI_MerathilisUI_TBC.toc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
## Interface: 20504
22
## Author: Merathilis
3-
## Version: 5.08
3+
## Version: 5.09
44
## Title: |cFF1784d1ElvUI|r |cffffffffMerathilis|r|cffff7d0aUI|r
55
## Notes: A decorative edit for ElvUI + additional features.
66
## Notes-deDE: Eine dekorative Erweiterung für ElvUI + einige zusätzliche Funktionen.

0 commit comments

Comments
 (0)