Skip to content

Commit

Permalink
integrate:
Browse files Browse the repository at this point in the history 
- adding some nice fading effect on control panel buttons
(user request: #13)
  • Loading branch information
@sinaris
sinaris committed Sep 14, 2012
1 parent 047c6ce commit 095a244
Show file tree
Hide file tree
Showing 12 changed files with 71 additions and 20 deletions.
3 changes: 2 additions & 1 deletion AsphyxiaUI/Locales/Chinese.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,8 @@ L.Faq_CONTENT_TEXT_FIELD_9_6 = ""

if( TukuiConfigUILocalization ) then
TukuiConfigUILocalization.global = "AsphyxiaUI"
TukuiConfigUILocalization.globalunitframelayout = "Unitframe layout (asphyxia, asphyxia2, asphyxia3 or asphyxia4)"
TukuiConfigUILocalization.globalunitframelayout = "Unitframe layout (asphyxia, asphyxia2, asphyxia3, asphyxia4 or asphyxia5)"
TukuiConfigUILocalization.globalhovercp = "Enable hover buttons on control panel"

TukuiConfigUILocalization.databars = "Databars"
TukuiConfigUILocalization.databarsenable = "Enable databars"
Expand Down
3 changes: 2 additions & 1 deletion AsphyxiaUI/Locales/English.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,8 @@ L.Faq_CONTENT_TEXT_FIELD_9_6 = ""

if( TukuiConfigUILocalization ) then
TukuiConfigUILocalization.global = "AsphyxiaUI"
TukuiConfigUILocalization.globalunitframelayout = "Unitframe layout (asphyxia, asphyxia2, asphyxia3 or asphyxia4)"
TukuiConfigUILocalization.globalunitframelayout = "Unitframe layout (asphyxia, asphyxia2, asphyxia3, asphyxia4 or asphyxia5)"
TukuiConfigUILocalization.globalhovercp = "Enable hover buttons on control panel"

TukuiConfigUILocalization.databars = "Databars"
TukuiConfigUILocalization.databarsenable = "Enable databars"
Expand Down
3 changes: 2 additions & 1 deletion AsphyxiaUI/Locales/French.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,8 @@ L.Faq_CONTENT_TEXT_FIELD_9_6 = ""

if( TukuiConfigUILocalization ) then
TukuiConfigUILocalization.global = "AsphyxiaUI"
TukuiConfigUILocalization.globalunitframelayout = "Unitframe layout (asphyxia, asphyxia2, asphyxia3 or asphyxia4)"
TukuiConfigUILocalization.globalunitframelayout = "Unitframe layout (asphyxia, asphyxia2, asphyxia3, asphyxia4 or asphyxia5)"
TukuiConfigUILocalization.globalhovercp = "Enable hover buttons on control panel"

TukuiConfigUILocalization.databars = "Databars"
TukuiConfigUILocalization.databarsenable = "Enable databars"
Expand Down
3 changes: 2 additions & 1 deletion AsphyxiaUI/Locales/German.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,8 @@ L.Faq_CONTENT_TEXT_FIELD_9_6 = ""

if( TukuiConfigUILocalization ) then
TukuiConfigUILocalization.global = "AsphyxiaUI"
TukuiConfigUILocalization.globalunitframelayout = "Unitframe layout (asphyxia, asphyxia2, asphyxia3 or asphyxia4)"
TukuiConfigUILocalization.globalunitframelayout = "Unitframe layout (asphyxia, asphyxia2, asphyxia3, asphyxia4 or asphyxia5)"
TukuiConfigUILocalization.globalhovercp = "Enable hover buttons on control panel"

TukuiConfigUILocalization.databars = "Databars"
TukuiConfigUILocalization.databarsenable = "Enable databars"
Expand Down
3 changes: 2 additions & 1 deletion AsphyxiaUI/Locales/Korean.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,8 @@ L.Faq_CONTENT_TEXT_FIELD_9_6 = ""

if( TukuiConfigUILocalization ) then
TukuiConfigUILocalization.global = "AsphyxiaUI"
TukuiConfigUILocalization.globalunitframelayout = "Unitframe layout (asphyxia, asphyxia2, asphyxia3 or asphyxia4)"
TukuiConfigUILocalization.globalunitframelayout = "Unitframe layout (asphyxia, asphyxia2, asphyxia3, asphyxia4 or asphyxia5)"
TukuiConfigUILocalization.globalhovercp = "Enable hover buttons on control panel"

TukuiConfigUILocalization.databars = "Databars"
TukuiConfigUILocalization.databarsenable = "Enable databars"
Expand Down
3 changes: 2 additions & 1 deletion AsphyxiaUI/Locales/Portuguese.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,8 @@ L.Faq_CONTENT_TEXT_FIELD_9_6 = ""

if( TukuiConfigUILocalization ) then
TukuiConfigUILocalization.global = "AsphyxiaUI"
TukuiConfigUILocalization.globalunitframelayout = "Unitframe layout (asphyxia, asphyxia2, asphyxia3 or asphyxia4)"
TukuiConfigUILocalization.globalunitframelayout = "Unitframe layout (asphyxia, asphyxia2, asphyxia3, asphyxia4 or asphyxia5)"
TukuiConfigUILocalization.globalhovercp = "Enable hover buttons on control panel"

TukuiConfigUILocalization.databars = "Databars"
TukuiConfigUILocalization.databarsenable = "Enable databars"
Expand Down
3 changes: 2 additions & 1 deletion AsphyxiaUI/Locales/Russian.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,8 @@ L.Faq_CONTENT_TEXT_FIELD_9_6 = ""

if( TukuiConfigUILocalization ) then
TukuiConfigUILocalization.global = "AsphyxiaUI"
TukuiConfigUILocalization.globalunitframelayout = "Unitframe layout (asphyxia, asphyxia2, asphyxia3 or asphyxia4)"
TukuiConfigUILocalization.globalunitframelayout = "Unitframe layout (asphyxia, asphyxia2, asphyxia3, asphyxia4 or asphyxia5)"
TukuiConfigUILocalization.globalhovercp = "Enable hover buttons on control panel"

TukuiConfigUILocalization.databars = "Databars"
TukuiConfigUILocalization.databarsenable = "Enable databars"
Expand Down
3 changes: 2 additions & 1 deletion AsphyxiaUI/Locales/Spanish.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,8 @@ L.Faq_CONTENT_TEXT_FIELD_9_6 = ""

if( TukuiConfigUILocalization ) then
TukuiConfigUILocalization.global = "AsphyxiaUI"
TukuiConfigUILocalization.globalunitframelayout = "Unitframe layout (asphyxia, asphyxia2, asphyxia3 or asphyxia4)"
TukuiConfigUILocalization.globalunitframelayout = "Unitframe layout (asphyxia, asphyxia2, asphyxia3, asphyxia4 or asphyxia5)"
TukuiConfigUILocalization.globalhovercp = "Enable hover buttons on control panel"

TukuiConfigUILocalization.databars = "Databars"
TukuiConfigUILocalization.databarsenable = "Enable databars"
Expand Down
3 changes: 2 additions & 1 deletion AsphyxiaUI/Locales/Taiwan.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,8 @@ L.Faq_CONTENT_TEXT_FIELD_9_6 = ""

if( TukuiConfigUILocalization ) then
TukuiConfigUILocalization.global = "AsphyxiaUI"
TukuiConfigUILocalization.globalunitframelayout = "Unitframe layout (asphyxia, asphyxia2, asphyxia3 or asphyxia4)"
TukuiConfigUILocalization.globalunitframelayout = "Unitframe layout (asphyxia, asphyxia2, asphyxia3, asphyxia4 or asphyxia5)"
TukuiConfigUILocalization.globalhovercp = "Enable hover buttons on control panel"

TukuiConfigUILocalization.databars = "Databars"
TukuiConfigUILocalization.databarsenable = "Enable databars"
Expand Down
42 changes: 35 additions & 7 deletions AsphyxiaUI/Modules/Panels/Asphyxia/AsphyxiaUI.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,9 +140,9 @@ AsphyxiaUIInfoCenterRight:SetFrameStrata( "BACKGROUND" )
AsphyxiaUIInfoCenterRight:CreateOverlay( AsphyxiaUIInfoCenterRight )

local AsphyxiaUIInfoCenterToggleButton = CreateFrame( "Frame", "AsphyxiaUIInfoCenterToggleButton", TukuiChatBackgroundRight )
AsphyxiaUIInfoCenterToggleButton:Size(30,15)
AsphyxiaUIInfoCenterToggleButton:SetPoint("TOPRIGHT", TukuiChatBackgroundRight, "TOPRIGHT", -5, -68)
AsphyxiaUIInfoCenterToggleButton:SetTemplate("Default")
AsphyxiaUIInfoCenterToggleButton:Size( 30, 15 )
AsphyxiaUIInfoCenterToggleButton:SetPoint( "TOPRIGHT", TukuiChatBackgroundRight, "TOPRIGHT", -5, -68 )
AsphyxiaUIInfoCenterToggleButton:SetTemplate( "Default" )
AsphyxiaUIInfoCenterToggleButton:SetAlpha( 0 )
AsphyxiaUIInfoCenterToggleButton:SetFrameStrata( "MEDIUM" )
AsphyxiaUIInfoCenterToggleButton:SetFrameLevel( 10 )
Expand Down Expand Up @@ -194,8 +194,22 @@ AsphyxiaUIResetUIButton:CreateShadow( "Default" )
AsphyxiaUIResetUIButton:CreateOverlay( AsphyxiaUIResetUIButton )
AsphyxiaUIResetUIButton:SetAttribute( "type", "macro" )
AsphyxiaUIResetUIButton:SetAttribute( "macrotext", "/resetui" )
AsphyxiaUIResetUIButton:HookScript( "OnEnter", S.SetModifiedBackdrop )
AsphyxiaUIResetUIButton:HookScript( "OnLeave", S.SetOriginalBackdrop )

if( C["global"]["hovercp"] == true ) then
AsphyxiaUIResetUIButton:SetAlpha( 0 )
AsphyxiaUIResetUIButton:EnableMouse( true )
AsphyxiaUIResetUIButton:SetScript( "OnEnter", function()
if( InCombatLockdown() ) then return end
AsphyxiaUIResetUIButton:FadeIn()
end )

AsphyxiaUIResetUIButton:SetScript( "OnLeave", function()
AsphyxiaUIResetUIButton:FadeOut()
end )
else
AsphyxiaUIResetUIButton:HookScript( "OnEnter", S.SetModifiedBackdrop )
AsphyxiaUIResetUIButton:HookScript( "OnLeave", S.SetOriginalBackdrop )
end

AsphyxiaUIResetUIButton.Text = S.SetFontString( AsphyxiaUIResetUIButton, unpack( S.FontTemplate.ButtonsResetUIBtn.BuildFont ) )
AsphyxiaUIResetUIButton.Text:Point( "CENTER", AsphyxiaUIResetUIButton, "CENTER", 0, 0 )
Expand All @@ -213,8 +227,22 @@ AsphyxiaUIReloadUIButton:CreateShadow( "Default" )
AsphyxiaUIReloadUIButton:CreateOverlay( AsphyxiaUIReloadUIButton )
AsphyxiaUIReloadUIButton:SetAttribute( "type", "macro" )
AsphyxiaUIReloadUIButton:SetAttribute( "macrotext", "/rl" )
AsphyxiaUIReloadUIButton:HookScript( "OnEnter", S.SetModifiedBackdrop )
AsphyxiaUIReloadUIButton:HookScript( "OnLeave", S.SetOriginalBackdrop )

if( C["global"]["hovercp"] == true ) then
AsphyxiaUIReloadUIButton:SetAlpha( 0 )
AsphyxiaUIReloadUIButton:EnableMouse( true )
AsphyxiaUIReloadUIButton:SetScript( "OnEnter", function()
if( InCombatLockdown() ) then return end
AsphyxiaUIReloadUIButton:FadeIn()
end )

AsphyxiaUIReloadUIButton:SetScript( "OnLeave", function()
AsphyxiaUIReloadUIButton:FadeOut()
end )
else
AsphyxiaUIReloadUIButton:HookScript( "OnEnter", S.SetModifiedBackdrop )
AsphyxiaUIReloadUIButton:HookScript( "OnLeave", S.SetOriginalBackdrop )
end

AsphyxiaUIReloadUIButton.Text = S.SetFontString( AsphyxiaUIReloadUIButton, unpack( S.FontTemplate.ButtonsReloadUIBtn.BuildFont ) )
AsphyxiaUIReloadUIButton.Text:Point( "CENTER", AsphyxiaUIReloadUIButton, "CENTER", 0, 0 )
Expand Down
21 changes: 17 additions & 4 deletions AsphyxiaUI/Modules/Panels/Asphyxia/AsphyxiaUI_ControlPanel.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,12 +149,25 @@ AsphyxiaUIControlPanelButton:SetFrameStrata( "LOW" )
AsphyxiaUIControlPanelButton:CreateShadow( "Default" )
AsphyxiaUIControlPanelButton:CreateOverlay( AsphyxiaUIControlPanelButton )

if( C["global"]["hovercp"] == true ) then
AsphyxiaUIControlPanelButton:SetAlpha( 0 )
AsphyxiaUIControlPanelButton:EnableMouse( true )
AsphyxiaUIControlPanelButton:SetScript( "OnEnter", function()
if( InCombatLockdown() ) then return end
AsphyxiaUIControlPanelButton:FadeIn()
end )

AsphyxiaUIControlPanelButton:SetScript( "OnLeave", function()
AsphyxiaUIControlPanelButton:FadeOut()
end )
else
AsphyxiaUIControlPanelButton:HookScript( "OnEnter", S.SetModifiedBackdrop )
AsphyxiaUIControlPanelButton:HookScript( "OnLeave", S.SetOriginalBackdrop )
end

AsphyxiaUIControlPanelButton.Text = S.SetFontString( AsphyxiaUIControlPanelButton, unpack( S.FontTemplate.ButtonsDefault.BuildFont ) )
AsphyxiaUIControlPanelButton.Text:Point( "CENTER", AsphyxiaUIControlPanelButton, "CENTER", 0, 0 )
AsphyxiaUIControlPanelButton.Text:SetText( S.RGBToHex( unpack( C["media"].datatextcolor2 ) ) .. "Control Panel" )

AsphyxiaUIControlPanelButton:HookScript( "OnEnter", S.SetModifiedBackdrop )
AsphyxiaUIControlPanelButton:HookScript( "OnLeave", S.SetOriginalBackdrop )
AsphyxiaUIControlPanelButton.Text:SetText( S.RGBToHex( unpack( C["media"]["datatextcolor2"] ) ) .. "Control Panel" )

AsphyxiaUIControlPanelButton:SetScript( "OnMouseDown", function( self )
if( InCombatLockdown() ) then print( ERR_NOT_IN_COMBAT ) return end
Expand Down
1 change: 1 addition & 0 deletions AsphyxiaUI_Config/Config/Config.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ C["global"] = {
["globalstyle"] = "asphyxia", -- can be switch to: asphyxia, duffed, vethek, sinaris
["unitframelayout"] = "asphyxia",
["fonttemplate"] = "pixel",
["hovercp"] = false,
}

C["unitframes"] = {
Expand Down

0 comments on commit 095a244

Please sign in to comment.