From 1d417bc84c5a554c5209562b9e65e689c88515a7 Mon Sep 17 00:00:00 2001 From: Ahmil Jilani Date: Thu, 16 Oct 2014 17:40:09 -0400 Subject: [PATCH 1/4] fixing comment typo --- SuperDuperMacro/SuperDuperMacro_Frames.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SuperDuperMacro/SuperDuperMacro_Frames.lua b/SuperDuperMacro/SuperDuperMacro_Frames.lua index a89d051..e8add7e 100644 --- a/SuperDuperMacro/SuperDuperMacro_Frames.lua +++ b/SuperDuperMacro/SuperDuperMacro_Frames.lua @@ -736,7 +736,7 @@ function sdm_CreateDefaultMacroFrameButtons() f:SetScript("OnClick", sdm_UpgradeButtonClicked) sdm_SetTooltip(f, "Turn the selected macro into a Super Duper Macro, allowing you to make it longer") - -- The following three frames are only showed when SDM's "Change Name/Icon" button is clicked. Clicking this button hijack's the default MacroPopupFrame and modifies it to our needs. + -- The following three frames are only showed when SDM's "Change Name/Icon" button is clicked. Clicking this button hijacks the default MacroPopupFrame and modifies it to our needs. -- Create the "Different name on button" checkbox f = CreateFrame("CheckButton", "$parent_buttonTextCheckBox", MacroPopupFrame, "UICheckButtonTemplate") -- 1.7.9.5 From ad7b66e9920e08a125d4cc3fe4bf828da78edd15 Mon Sep 17 00:00:00 2001 From: Ahmil Jilani Date: Thu, 16 Oct 2014 18:12:36 -0400 Subject: [PATCH 2/4] Different name on button icon is now clickable again --- SuperDuperMacro/SuperDuperMacro_Frames.lua | 8 +++++++- SuperDuperMacro/SuperDuperMacro_Interface.lua | 5 +++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/SuperDuperMacro/SuperDuperMacro_Frames.lua b/SuperDuperMacro/SuperDuperMacro_Frames.lua index e8add7e..8fb03ba 100644 --- a/SuperDuperMacro/SuperDuperMacro_Frames.lua +++ b/SuperDuperMacro/SuperDuperMacro_Frames.lua @@ -133,7 +133,13 @@ f:SetText("Change Name/Icon") f:SetWidth(140) f:SetHeight(22) f:SetPoint("RIGHT", sdm_usageButton, "LEFT") -f:SetScript("OnClick", function() sdm_changeIconFrame:Show() end) +f:SetScript("OnClick", function() + if MacroPopupFrame ~= nil and MacroPopupFrame:IsShown() then + print(sdm_printPrefix.."The change macro name/icon frame is already open.") + else + sdm_changeIconFrame:Show() + end +end) sdm_AddToExclusiveGroup(f, "centerwindows", true) f = CreateFrame("Button", "sdm_saveAsButton", sdm_mainFrame, "UIPanelButtonTemplate") diff --git a/SuperDuperMacro/SuperDuperMacro_Interface.lua b/SuperDuperMacro/SuperDuperMacro_Interface.lua index 5a93080..7727c77 100644 --- a/SuperDuperMacro/SuperDuperMacro_Interface.lua +++ b/SuperDuperMacro/SuperDuperMacro_Interface.lua @@ -628,7 +628,8 @@ function sdm_OnShow_changeIconFrame(f) f.prevpoints[i]={MacroPopupFrame:GetPoint(i)} end MacroPopupFrame:ClearAllPoints() - --MacroPopupFrame:SetParent(f) + f.prevParent = MacroPopupFrame:GetParent() + MacroPopupFrame:SetParent(f) MacroPopupFrame:SetPoint("TOP", f, "BOTTOM", 0,15) MacroPopupFrame:Show() _,_,_,_,f.fontstring = MacroPopupFrame:GetRegions() @@ -661,7 +662,7 @@ function sdm_OnHide_changeIconFrame(f) MacroPopupEditBox:SetAutoFocus(true) MacroPopupFrame.mode=f.prevmode MacroPopupFrame:ClearAllPoints() - --MacroPopupFrame:SetParent(UIParent) + MacroPopupFrame:SetParent(f.prevParent) for _,point in ipairs(f.prevpoints) do MacroPopupFrame:SetPoint(point[1], point[2], point[3], point[4], point[5]) end -- 1.7.9.5 From 622eb23b78b5c20e3be6c490fda1f0af8e5e6256 Mon Sep 17 00:00:00 2001 From: Ahmil Jilani Date: Thu, 16 Oct 2014 18:25:03 -0400 Subject: [PATCH 3/4] Dealing with the fact that GetChecked now returns a boolean instead of a 1nil. Fixes Expand/Collapse All button and Different Name on Button checkbox --- SuperDuperMacro/SuperDuperMacro_Frames.lua | 2 +- SuperDuperMacro/SuperDuperMacro_Interface.lua | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/SuperDuperMacro/SuperDuperMacro_Frames.lua b/SuperDuperMacro/SuperDuperMacro_Frames.lua index 8fb03ba..92be6cf 100644 --- a/SuperDuperMacro/SuperDuperMacro_Frames.lua +++ b/SuperDuperMacro/SuperDuperMacro_Frames.lua @@ -750,7 +750,7 @@ function sdm_CreateDefaultMacroFrameButtons() f:SetHeight(20) f:SetPoint("TOPLEFT", 25, -18) f:SetScript("OnClick", function() - sdm_buttonTextCheckBoxClicked(MacroPopupFrame_buttonTextCheckBox:GetChecked()==1) + sdm_buttonTextCheckBoxClicked(MacroPopupFrame_buttonTextCheckBox:GetChecked()) end) f:Hide() diff --git a/SuperDuperMacro/SuperDuperMacro_Interface.lua b/SuperDuperMacro/SuperDuperMacro_Interface.lua index 7727c77..93d2f82 100644 --- a/SuperDuperMacro/SuperDuperMacro_Interface.lua +++ b/SuperDuperMacro/SuperDuperMacro_Interface.lua @@ -697,7 +697,7 @@ function sdm_ChangeIconOkayed() local oldIcon = mTab.icon mTab.name = nameInputted sdm_ChangeContainer(mTab, mTab.container) --place the item in itself. This is so that it gets re-sorted. - if MacroPopupFrame_buttonTextCheckBox:GetChecked()==1 then + if MacroPopupFrame_buttonTextCheckBox:GetChecked() then mTab.buttonName = MacroPopupEditBox:GetText() if mTab.buttonName=="" then mTab.buttonName=" " @@ -738,7 +738,7 @@ function sdm_buttonTextCheckBoxClicked(checked) end function sdm_CollapseAllButtonClicked(self) - local allOpenOrClosed = self:GetChecked()==nil + local allOpenOrClosed = not self:GetChecked() for _,v in ipairs(sdm_macros) do if v.type=="c" then v.open = allOpenOrClosed -- 1.7.9.5 From 7c2214376b01da5507983a5f9fe100bfab4770a2 Mon Sep 17 00:00:00 2001 From: Ahmil Jilani Date: Thu, 16 Oct 2014 22:03:54 -0400 Subject: [PATCH 4/4] readme and toc --- SuperDuperMacro/SuperDuperMacro.toc | 2 +- SuperDuperMacro/sdm Readme.txt | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/SuperDuperMacro/SuperDuperMacro.toc b/SuperDuperMacro/SuperDuperMacro.toc index 977cee6..87edfd3 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.6 +## Version: 2.6.1 ## SavedVariables: sdm_version, sdm_listFilters, sdm_iconSize, sdm_mainContents, sdm_macros SuperDuperMacro_Core.lua SuperDuperMacro_Interface.lua diff --git a/SuperDuperMacro/sdm Readme.txt b/SuperDuperMacro/sdm Readme.txt index 2bd5e66..551e12c 100644 --- a/SuperDuperMacro/sdm Readme.txt +++ b/SuperDuperMacro/sdm Readme.txt @@ -1,5 +1,5 @@ Super Duper Macro -version 2.6 +version 2.6.1 by hypehuman Check for updates at http://www.wowinterface.com/downloads/info10496 @@ -23,6 +23,9 @@ Special thanks to: Change Log +2.6.1 (10/16/14) +¥ÊFixes "Different name on button" and "Expand/collapse all folders" + 2.6 (10/16/14) ¥ÊFixes character-specific macros, which broke when Warlords gave us more global macros. -- 1.7.9.5