diff --git a/actionBar/Prototype.lua b/ActionBar.lua similarity index 96% rename from actionBar/Prototype.lua rename to ActionBar.lua index 5d9a1e1..4a21bae 100644 --- a/actionBar/Prototype.lua +++ b/ActionBar.lua @@ -2,7 +2,6 @@ local ButtonBar = Bartender4.ButtonBar.prototype local ActionBar = setmetatable({}, {__index = ButtonBar}) Bartender4.ActionBar = ActionBar -local module = Bartender4:GetModule("ActionBars") --[[=================================================================================== ActionBar Prototype @@ -65,7 +64,7 @@ function ActionBar:UpdateButtons(numbuttons) self:UpdateButtonLayout() self:SetGrid() if updateBindings and self.id == "1" then - module:ReassignBindings() + self.module:ReassignBindings() end end @@ -99,7 +98,7 @@ end function ActionBar:SetEnabled(state) if not state then - module:DisableBar(self.id) + self.module:DisableBar(self.id) end end diff --git a/actionBar/States.lua b/ActionBarStates.lua similarity index 100% rename from actionBar/States.lua rename to ActionBarStates.lua diff --git a/actionBar/ActionBars.lua b/ActionBars.lua similarity index 100% rename from actionBar/ActionBars.lua rename to ActionBars.lua diff --git a/buttonPrototypes/ActionButton.lua b/ActionButton.lua similarity index 100% rename from buttonPrototypes/ActionButton.lua rename to ActionButton.lua diff --git a/specialBars/BagBar.lua b/BagBar.lua similarity index 100% rename from specialBars/BagBar.lua rename to BagBar.lua diff --git a/barPrototype/Prototype.lua b/Bar.lua similarity index 100% rename from barPrototype/Prototype.lua rename to Bar.lua diff --git a/Bartender4.toc b/Bartender4.toc index 79ad6dc..dfc0bc4 100644 --- a/Bartender4.toc +++ b/Bartender4.toc @@ -15,13 +15,22 @@ locale\locale.xml ## Core ## Bartender4.lua -Options.lua ## Prototypes ## -barPrototype\Bar.xml -buttonBarPrototype\ButtonBar.xml -buttonPrototypes\Buttons.xml +Bar.lua +ButtonBar.lua +ActionBar.lua + +## Buttons ## +ActionButton.lua +PetButton.lua ## Modules ## -actionBar\ActionBars.xml -specialBars\SpecialBars.xml +ActionBars.lua +BagBar.lua +PetBar.lua +StanceBar.lua +MicroMenu.lua + +## Options ## +Options\Options.xml diff --git a/buttonBarPrototype/Prototype.lua b/ButtonBar.lua similarity index 100% rename from buttonBarPrototype/Prototype.lua rename to ButtonBar.lua diff --git a/specialBars/MicroMenu.lua b/MicroMenu.lua similarity index 100% rename from specialBars/MicroMenu.lua rename to MicroMenu.lua diff --git a/actionBar/Options.lua b/Options/ActionBar.lua similarity index 100% rename from actionBar/Options.lua rename to Options/ActionBar.lua diff --git a/actionBar/StatesOptions.lua b/Options/ActionBarStates.lua similarity index 100% rename from actionBar/StatesOptions.lua rename to Options/ActionBarStates.lua diff --git a/specialBars/BagBarOptions.lua b/Options/BagBar.lua similarity index 100% rename from specialBars/BagBarOptions.lua rename to Options/BagBar.lua diff --git a/barPrototype/Options.lua b/Options/Bar.lua similarity index 100% rename from barPrototype/Options.lua rename to Options/Bar.lua diff --git a/buttonBarPrototype/Options.lua b/Options/ButtonBar.lua similarity index 100% rename from buttonBarPrototype/Options.lua rename to Options/ButtonBar.lua diff --git a/specialBars/MicroMenuOptions.lua b/Options/MicroMenu.lua similarity index 100% rename from specialBars/MicroMenuOptions.lua rename to Options/MicroMenu.lua diff --git a/Options.lua b/Options/Options.lua similarity index 100% rename from Options.lua rename to Options/Options.lua diff --git a/specialBars/SpecialBars.xml b/Options/Options.xml similarity index 66% rename from specialBars/SpecialBars.xml rename to Options/Options.xml index 1354bef..ebe06f2 100644 --- a/specialBars/SpecialBars.xml +++ b/Options/Options.xml @@ -1,11 +1,13 @@ +