--- a/Options.lua	Tue Mar 20 21:03:57 2007 +0000
+++ b/Options.lua	Tue Mar 20 21:08:31 2007 +0000
@@ -17,6 +17,13 @@
       func = "Unlock",
     },
 
+    bindings = {
+      type = "execute",
+      name = "bindings",
+      desc = "Launches keybinding setup mode",
+      func = function() ReBinder:Enable() end,
+    },
+
     hideart = {
       type = "toggle",
       name = "hideart",
@@ -40,9 +47,9 @@
       set  = "ToggleActionID",
     },
 
-    reset = {
+    resetall = {
       type = "execute",
-      name = "reset",
+      name = "resetall",
       desc = "Resets to single bar in the default position",
       func = "ResetBars"
     },
@@ -62,21 +69,38 @@
 ReActionGlobalMenuOptions = {
   type="group",
   args={ 
-    lock = {
+    lockbars = {
       type = "toggle",
-      name = "Locked",
+      name = "Lock Bars",
       desc = "Locks action bars and disables rearrangement",
       get = function() return ReAction:IsLocked() end,
       set = function() ReAction:ToggleLocked() end,
+      order = 1,
+    },
+
+    lockbtns = {
+      type = "toggle",
+      name = "Lock Buttons",
+      desc = "Locks action bars and disables rearrangement",
+      get = function() return LOCK_ACTIONBAR == "1" end,
+      set = function() LOCK_ACTIONBAR = (LOCK_ACTIONBAR == "1" and "0" or "1") end,
       order = 2,
     },
 
+    bindings = {
+      type = "execute",
+      name = "Set Key Bindings",
+      desc = "Launches keybinding setup mode",
+      func = function() ReBinder:Enable() end,
+      order = 3,
+    },
+
     new = {
       type = "execute",
       name = "New Bar",
       desc = "Create a new bar with default settings",
       func = function() ReAction:NewBar() end,
-      order = 3
+      order = 4,
     },
     
     showid = {
@@ -85,7 +109,7 @@
       desc = "Show ActionIDs on buttons",
       get  = function() return ReAction:IsActionIDVisible() end,
       set  = function() ReAction:ToggleActionID() end,
-      order = 4
+      order = 5,
     },
 
     --[[
@@ -94,7 +118,7 @@
       name = "Re-sync Action IDs",
       desc = "Re-orders action IDs sequentially amongst bars",
       func = function() ReAction:ResyncActionIDs() end,
-      order = 5,
+      order = 6,
     },
     ]]
 
@@ -104,21 +128,22 @@
       desc = "Hide default Blizzard action bar artwork and XP bar",
       get  = function() return ReAction:IsArtHidden() end,
       set  = function() return ReAction:ToggleHideArt() end,
-      order = 6,
+      order = 7,
     },
     
+    --[[
     reset = {
       type = "execute",
       name = "Reset Bars",
       desc = "Resets to single bar in the default position",
       func = function() ReAction:ResetBars() end,
-      order = 7
+      order = 8,
     },
+   ]]
     
   }
 }
 
-
 function GenerateReActionBarOptions( bar )
   return {
     type = "group",
@@ -128,14 +153,14 @@
         type = "header",
         name = " ",
         desc = " ",
-        order = 8,
+        order = 9,
       },
       
       hdr1 = {
         type = "header",
         name = "Bar Options",
         des = "Bar Options",
-        order = 9,
+        order = 10,
       },
       
       --[[
@@ -145,7 +170,7 @@
         desc = "Hides the bar except when rearranging bars",
         get = function() return not bar:GetVisibility() end,
         set = function() bar:ToggleVisibility() end,
-        order = 10,
+        order = 11,
       },
       ]]
       
@@ -158,7 +183,7 @@
         min = 0,
         max = 100,
         step = 1,
-        order = 11
+        order = 12
       },
       
       delete = {
@@ -166,7 +191,7 @@
         name = "Delete Bar",
         desc = "Deletes the bar",
         func = function() ReAction:DeleteBar(bar.barID) end,
-        order = 12,
+        order = 13,
       },
     }
   }
@@ -184,7 +209,7 @@
 end
 
 local function getButtonConfig( bar, field )
-  if bar and config and btnConfig then
+  if bar and bar.config and bar.config.btnConfig then
     return bar.config.btnConfig[field]
   end
 end
@@ -209,14 +234,23 @@
         type = "header",
         name = "  ",
         desc = "  ",
-        order = 13,
+        order = 14,
       },
       
       hdr2 = {
         type = "header",
         name = "Button Options",
         desc = "Button Options",
-        order = 14,
+        order = 15,
+      },
+      
+      showgrid = {
+        type = "toggle",
+        name = "Always Show Buttons",
+        desc = "Show button placeholders when no action is assigned or on the cursor. Note that buttons are always shown when bars are unlocked.",
+        get  = function() return getButtonConfig(bar, "showGrid") end,
+        set  = function() toggleButtonConfig(bar, "showGrid") end,
+        order = 16,
       },
       
       colorkeys = {
@@ -225,7 +259,7 @@
         desc = "Enables/disables colorizing hotkeys by key modifier",
         get  = function() return getButtonConfig(bar, "keyBindColorCode") end,
         set  = function() toggleButtonConfig(bar, "keyBindColorCode", c) end,
-        order = 15,
+        order = 17,
       },
   
       keyloc = {
@@ -235,21 +269,11 @@
         get  = function() return getButtonConfig(bar, "keyBindLoc") end,
         set  = function(loc) setButtonConfig(bar, "keyBindLoc", loc) end,
         validate = { "TOP", "BOTTOM", "TOPLEFT", "TOPRIGHT", "BOTTOMLEFT", "BOTTOMRIGHT" },
-        order = 16,
+        order = 18,
       },
       
-      sep3 = {
-        type = "header",
-        name = "   ",
-        desc = "   ",
-        order = 17
-      },
     }    
   }
 end
 
 
-ReActionProfileMenuOptions = {
-  type = "group",
-  args = { }
-}