# HG changeset patch # User Flick # Date 1289845819 28800 # Node ID 55af1ebbec65d0d138713b1572e951076cab854c # Parent 576c50e51fc5c4c7298620bebabfb11a78f622ba Remove silly 'close this window when you open the other one' checkboxes diff -r 576c50e51fc5 -r 55af1ebbec65 Editor.lua --- a/Editor.lua Mon Nov 15 10:22:45 2010 -0800 +++ b/Editor.lua Mon Nov 15 10:30:19 2010 -0800 @@ -52,37 +52,24 @@ type = "execute", name = L["Global Config"], desc = L["Opens ReAction global configuration settings panel"], - func = function() - if ReAction.db.profile.editorCloseOnLaunch then - self:Close() - end - ReAction:ShowOptions() - end, + func = function() ReAction:ShowOptions(); self:Close() end, order = 1 }, - closeThis = { - type = "toggle", - name = L["Close Editor"], - desc = L["Close the Bar Editor when opening the ReAction global Interface Options"], - get = function() return ReAction.db.profile.editorCloseOnLaunch end, - set = function(info, val) ReAction.db.profile.editorCloseOnLaunch = val end, - order = 2, - }, hdr = { type = "header", name = "", - order = 3, + order = 2, }, desc = { type = "description", name = L["Use the mouse to arrange and resize the bars on screen. Tooltips on bars indicate additional functionality."], width = "double", - order = 4, + order = 3, }, _new = { type = "group", name = L["New Bar..."], - order = 5, + order = 4, args = { desc = { type = "description", diff -r 576c50e51fc5 -r 55af1ebbec65 Options.lua --- a/Options.lua Mon Nov 15 10:22:45 2010 -0800 +++ b/Options.lua Mon Nov 15 10:30:19 2010 -0800 @@ -65,22 +65,12 @@ func = "OptionShowEditor", order = 5, }, - _closeThis = { - type = "toggle", - name = L["Close on Launch"], - desc = L["Close the Interface Options window when launching the ReAction Bar Editor"], - get = "OptionGetCloseThis", - set = "OptionSetCloseThis", - order = 6, - cmdHidden = true, - dropdownHidden = true, - }, keybind = { type = "execute", name = L["Key Bindings"], desc = L["Show the keybinding dialogue"], func = "OptionLaunchKeybindMode", - order = 7, + order = 6, }, skipProfileWarning = { type = "toggle", @@ -89,7 +79,7 @@ get = "OptionGetSkipKeybindWarning", set = "OptionSetSkipKeybindWarning", width = "double", - order = 8, + order = 7, }, } }, @@ -172,19 +162,7 @@ function ReAction:OptionShowEditor() self:ShowEditor() - if self.db.profile.closeOptionsOnEditorLaunch then - InterfaceOptionsFrame:Hide() - end -end - - -function ReAction:OptionGetCloseThis() - return self.db.profile.closeOptionsOnEditorLaunch -end - - -function ReAction:OptionSetCloseThis(info,val) - self.db.profile.closeOptionsOnEditorLaunch = val + InterfaceOptionsFrame:Hide() end diff -r 576c50e51fc5 -r 55af1ebbec65 ReAction.lua --- a/ReAction.lua Mon Nov 15 10:22:45 2010 -0800 +++ b/ReAction.lua Mon Nov 15 10:30:19 2010 -0800 @@ -121,8 +121,6 @@ profile = { bars = { }, defaultBar = { }, - closeOptionsOnEditorLaunch = true, - editorCloseOnLaunch = true, } }, true -- use global 'Default' (locale-specific)