restructuring, preparing for new changes

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
 

Bartender4.toc

@@ -15,13 +15,22 @@ locale\locale.xml
 
 ## Core ##
 Bartender4.lua
-Options.lua
 
 ## Prototypes ##
-barPrototype\Bar.xml
+Bar.lua
-buttonBarPrototype\ButtonBar.xml
+ButtonBar.lua
-buttonPrototypes\Buttons.xml
+ActionBar.lua
+
+## Buttons ##
+ActionButton.lua
+PetButton.lua
 
 ## Modules ##
-actionBar\ActionBars.xml
+ActionBars.lua
-specialBars\SpecialBars.xml
+BagBar.lua
+PetBar.lua
+StanceBar.lua
+MicroMenu.lua
+
+## Options ##
+Options\Options.xml

Options/Options.xml

@@ -1,11 +1,13 @@
 <Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
 ..\FrameXML\UI.xsd">
+	<Script file="Options.lua"/>
+	
+	<Script file="Bar.lua"/>
+	<Script file="ButtonBar.lua"/>
+	
+	<Script file="ActionBar.lua"/>
 	<Script file="BagBar.lua"/>
-	<Script file="BagBarOptions.lua"/>
 	<Script file="MicroMenu.lua"/>
-	<Script file="MicroMenuOptions.lua"/>
 	<Script file="PetBar.lua"/>
-	<Script file="PetBarOptions.lua"/>
 	<Script file="StanceBar.lua"/>
-	<Script file="StanceBarOptions.lua"/>
 </Ui>

actionBar/ActionBars.xml

@@ -1,8 +0,0 @@
-<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
-..\FrameXML\UI.xsd">
-	<Script file="ActionBars.lua"/>
-	<Script file="Prototype.lua"/>
-	<Script file="States.lua"/>
-	<Script file="StatesOptions.lua"/>
-	<Script file="Options.lua"/>
-</Ui>

barPrototype/Bar.xml

@@ -1,5 +0,0 @@
-<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
-..\FrameXML\UI.xsd">
-	<Script file="Prototype.lua"/>
-	<Script file="Options.lua"/>
-</Ui>

buttonBarPrototype/ButtonBar.xml

@@ -1,5 +0,0 @@
-<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
-..\FrameXML\UI.xsd">
-	<Script file="Prototype.lua"/>
-	<Script file="Options.lua"/>
-</Ui>

buttonPrototypes/Buttons.xml

@@ -1,5 +0,0 @@
-<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
-..\FrameXML\UI.xsd">
-	<Script file="ActionButton.lua"/>
-	<Script file="PetButton.lua"/>
-</Ui>

locale/Babelfish.lua

@@ -10,27 +10,28 @@ local locale = {
 	"ruRU"
 }
 local files = {
+	"ActionBar.lua",
+	"ActionBars.lua",
+	"ActionBarStates.lua",
+	"ActionButton.lua",
+	"BagBar.lua",
+	"Bar.lua",
 	"Bartender4.lua",
-	"Options.lua",
+	"ButtonBar.lua",
-	"actionBar/Prototype.lua",
+	"MicroMenu.lua",
-	"actionBar/Options.lua",
+	"PetBar.lua",
-	"actionBar/ActionBars.lua",
+	"PetButton.lua",
-	"actionBar/States.lua",
+	"StanceBar.lua",
-	"actionBar/StatesOptions.lua",
+	--
-	"barPrototype/Prototype.lua",
+	"Options/ActionBar.lua",
-	"barPrototype/Options.lua",
+	"Options/ActionBarStates.lua",
-	"buttonBarPrototype/Prototype.lua",
+	"Options/BagBar.lua",
-	"buttonBarPrototype/Options.lua",
+	"Options/Bar.lua",
-	"buttonPrototypes/ActionButton.lua",
+	"Options/ButtonBar.lua",
-	"buttonPrototypes/PetButton.lua",
+	"Options/MicroMenu.lua",
-	"specialBars/BagBar.lua",
+	"Options/PetBar.lua",
-	"specialBars/BagBarOptions.lua",
+	"Options/StanceBar.lua",
-	"specialBars/MicroMenu.lua",
+	"Options/Options.lua",
-	"specialBars/MicroMenuOptions.lua",
-	"specialBars/PetBar.lua",
-	"specialBars/PetBarOptions.lua",
-	"specialBars/StanceBar.lua",
-	"specialBars/StanceBarOptions.lua",
 }
 
 local strings = {}