2.6.1

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

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")
@@ -736,15 +742,15 @@ 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")
 	f:SetWidth(20)
 	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()
 

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
@@ -696,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=" "
@@ -737,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

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.