From 186e6bfc9bea52d4580badfd1a932934b7768370 Mon Sep 17 00:00:00 2001 From: Ahmil Jilani Date: Wed, 18 Jan 2012 00:43:00 -0500 Subject: [PATCH] 2.4.5 --- SuperDuperMacro/SuperDuperMacro.toc | 2 +- SuperDuperMacro/SuperDuperMacro_Frames.lua | 4 +-- SuperDuperMacro/SuperDuperMacro_Interface.lua | 44 ++++++++++++------------- SuperDuperMacro/sdm Readme.txt | 6 +++- 4 files changed, 30 insertions(+), 26 deletions(-) diff --git a/SuperDuperMacro/SuperDuperMacro.toc b/SuperDuperMacro/SuperDuperMacro.toc index 5903e22..8243302 100644 --- a/SuperDuperMacro/SuperDuperMacro.toc +++ b/SuperDuperMacro/SuperDuperMacro.toc @@ -2,7 +2,7 @@ ## Title : Super Duper Macro ## Notes: Enables creation of incredibly long macros. ## Author: hypehuman -## Version: 2.4.4 +## Version: 2.4.5 ## SavedVariables: sdm_version, sdm_listFilters, sdm_iconSize, sdm_mainContents, sdm_macros SuperDuperMacro_Core.lua SuperDuperMacro_Interface.lua diff --git a/SuperDuperMacro/SuperDuperMacro_Frames.lua b/SuperDuperMacro/SuperDuperMacro_Frames.lua index 36acbf5..a89d051 100644 --- a/SuperDuperMacro/SuperDuperMacro_Frames.lua +++ b/SuperDuperMacro/SuperDuperMacro_Frames.lua @@ -334,8 +334,8 @@ sdm_newButton:SetPoint("LEFT", sdm_iconSizeSlider, "RIGHT", 20,0) f = CreateFrame("Frame", "sdm_changeIconFrame", sdm_mainFrame, UIParent) f:Hide() f:SetToplevel(true) -f:SetSize(297,350) -f:SetPoint("CENTER", 70,0) +f:SetSize(293,60) +f:SetPoint("TOP", 70,-100) f:SetBackdrop({ bgFile = "Interface\\DialogFrame\\UI-DialogBox-Background", edgeFile = "Interface\\DialogFrame\\UI-DialogBox-Border", diff --git a/SuperDuperMacro/SuperDuperMacro_Interface.lua b/SuperDuperMacro/SuperDuperMacro_Interface.lua index e262a62..6516b1b 100644 --- a/SuperDuperMacro/SuperDuperMacro_Interface.lua +++ b/SuperDuperMacro/SuperDuperMacro_Interface.lua @@ -431,20 +431,20 @@ function sdm_UpdateList() _,texture = GetMacroInfo(sdm_GetMacroIndex(mTab.ID)) else texture = "INTERFACE\\ICONS\\"..mTab.icon - end + end if texture then listItem.icon:SetTexture(texture) listItem.icon:SetWidth(sdm_iconSize) - listItem.icon:SetHeight(sdm_iconSize) + listItem.icon:SetHeight(sdm_iconSize) end listItem.slotIcon:SetWidth(sdm_iconSize*64/36) listItem.slotIcon:SetHeight(sdm_iconSize*64/36) if mTab.type=="b" and sdm_UsedByThisChar(mTab) then - listItem:SetScript("OnDragStart", function(self, event, ...) + listItem:SetScript("OnDragStart", function(self, event, ...) if not InCombatLockdown() then - PickupMacro(sdm_GetMacroIndex(sdm_macros[self.index].ID)) - else - print(sdm_printPrefix.."You cannot pick up macros during combat.") + PickupMacro(sdm_GetMacroIndex(sdm_macros[self.index].ID)) + else + print(sdm_printPrefix.."You cannot pick up macros during combat.") end end) else @@ -604,15 +604,15 @@ function sdm_GetColor(type, plainString)--if inputString is passed, it will retu end end -function sdm_OnShow_changeIconFrame(f) - if not sdm_macroUILoaded then - MacroFrame_LoadUI() - MacroPopupFrame:Show() - else - RefreshPlayerSpellIconInfo() -- You gotta do this, or there will be lots of errors! +function sdm_OnShow_changeIconFrame(f) + if not sdm_macroUILoaded then + MacroFrame_LoadUI() + MacroPopupFrame:Show() + else + RefreshPlayerSpellIconInfo() -- You gotta do this, or there will be lots of errors! end local mTab = sdm_macros[sdm_currentEdit] - -- NYI: here would be a good place to select the current icon and scroll to that place in the list + MacroPopupFrame.selectedIcon = nil -- NYI: here would be a good place to select the current icon and scroll to that place in the list f.prevonshow=MacroPopupFrame:GetScript("OnShow") MacroPopupFrame:SetScript("OnShow", MacroPopupFrame_Update) f.prevonenter=MacroPopupEditBox:GetScript("OnEnterPressed") @@ -626,10 +626,10 @@ function sdm_OnShow_changeIconFrame(f) f.prevpoints={} for i=1,MacroPopupFrame:GetNumPoints() do f.prevpoints[i]={MacroPopupFrame:GetPoint(i)} - end + end MacroPopupFrame:ClearAllPoints() --MacroPopupFrame:SetParent(f) - MacroPopupFrame:SetPoint("BOTTOM", f) + MacroPopupFrame:SetPoint("TOP", f, "BOTTOM", 0,15) MacroPopupFrame:Show() _,_,_,_,f.fontstring = MacroPopupFrame:GetRegions() f.fontstring:SetText(" Different name on button:") @@ -675,16 +675,16 @@ function sdm_OnHide_changeIconFrame(f) MacroPopupFrame:Hide() MacroPopupFrame_buttonTextCheckBox:Hide() end - -function sdm_GetSelectedIcon() - return GetSpellorMacroIconInfo(MacroPopupFrame.selectedIcon) -end + +function sdm_GetSelectedIcon() + return GetSpellorMacroIconInfo(MacroPopupFrame.selectedIcon) +end function sdm_ChangeIconOkayed() local mTab = sdm_macros[sdm_currentEdit] local nameInputted = sdm_changeNameInput:GetText() - local iconInputted = sdm_GetSelectedIcon() - if (not nameInputted) or nameInputted=="" or (mTab.type~="c" and not iconInputted) then + local iconInputted = sdm_GetSelectedIcon() or mTab.icon + if (not nameInputted) or nameInputted=="" then return end if (mTab.type=="b" or mTab.type=="f") and sdm_ContainsIllegalChars(nameInputted, true) then return end @@ -705,7 +705,7 @@ function sdm_ChangeIconOkayed() mTab.buttonName=nil end if mTab.type~="c" then - mTab.icon = iconInputted + mTab.icon = iconInputted end sdm_changeIconFrame:Hide() if sdm_UsedByThisChar(mTab) and (mTab.type=="b" or mTab.type=="f") then diff --git a/SuperDuperMacro/sdm Readme.txt b/SuperDuperMacro/sdm Readme.txt index 8250639..ddac7fb 100644 --- a/SuperDuperMacro/sdm Readme.txt +++ b/SuperDuperMacro/sdm Readme.txt @@ -1,5 +1,5 @@ Super Duper Macro -version 2.4.4 +version 2.4.5 by hypehuman Check for updates at http://www.wowinterface.com/downloads/info10496 @@ -23,6 +23,10 @@ Special thanks to: Change Log +2.4.5 (1/17/12) +¥ÊFixed a bug that caused the "Change Name/Icon" window to sometimes be unresponsive +¥ÊNow the "Change Name/Icon" always deselects the icon when it opens so that you don't accidentally change the icon of one of your macros + 2.4.4 (12/17/11) ¥ÊFixed a bug where the button on the macro frame that opens SDM would sometimes appear in the wrong place. -- 1.7.9.5