Removed trailing spaces

This commit is contained in:
Hendrik Leppkes
2008-09-02 16:55:22 +02:00
parent e018043a97
commit c7c303ae3c
13 changed files with 37 additions and 37 deletions
+1 -1
View File
@@ -8,7 +8,7 @@ Bartender4.ActionBar = ActionBar
===================================================================================]]-- ===================================================================================]]--
local initialPosition local initialPosition
do do
-- Sets the Bar to its initial Position in the Center of the Screen -- Sets the Bar to its initial Position in the Center of the Screen
function initialPosition(bar) function initialPosition(bar)
bar:ClearSetPoint("CENTER", 0, -250 + (bar.id-1) * 38) bar:ClearSetPoint("CENTER", 0, -250 + (bar.id-1) * 38)
+4 -4
View File
@@ -55,7 +55,7 @@ local stancemap
function ActionBar:UpdateStates() function ActionBar:UpdateStates()
if not self.buttons then return end if not self.buttons then return end
self.statebutton = {} self.statebutton = {}
if not stancemap and DefaultStanceMap[playerclass] then if not stancemap and DefaultStanceMap[playerclass] then
stancemap = DefaultStanceMap[playerclass] stancemap = DefaultStanceMap[playerclass]
end end
@@ -78,7 +78,7 @@ function ActionBar:UpdateStates()
for _,v in pairs(modifiers) do for _,v in pairs(modifiers) do
local page = self:GetStateOption(v) local page = self:GetStateOption(v)
if page and page ~= 0 then if page and page ~= 0 then
table_insert(statedriver, fmt("[modifier:%s]%s", v, page)) table_insert(statedriver, fmt("[modifier:%s]%s", v, page))
end end
end end
@@ -136,7 +136,7 @@ end
function ActionBar:GetStanceState(stance) function ActionBar:GetStanceState(stance)
local stanceconfig = self.config.states.stance[playerclass] local stanceconfig = self.config.states.stance[playerclass]
if type(stance) == "table" then if type(stance) == "table" then
state = stanceconfig[stance.id] state = stanceconfig[stance.id]
else else
state = stanceconfig[stance] state = stanceconfig[stance]
@@ -167,7 +167,7 @@ end
function ActionBar:AddToStateButton(state) function ActionBar:AddToStateButton(state)
if not self.statebutton then self.statebutton = {} end if not self.statebutton then self.statebutton = {} end
if not tfind(self.statebutton, state) then if not tfind(self.statebutton, state) then
table_insert(self.statebutton, state) table_insert(self.statebutton, state)
end end
end end
+7 -7
View File
@@ -12,15 +12,15 @@ local abdefaults = {
hidehotkey = false, hidehotkey = false,
showgrid = false, showgrid = false,
autoassist = false, autoassist = false,
states = { states = {
enabled = false, enabled = false,
possess = false, possess = false,
actionbar = false, actionbar = false,
default = 0, default = 0,
ctrl = 0, ctrl = 0,
alt = 0, alt = 0,
shift = 0, shift = 0,
stance = { stance = {
['*'] = { ['*'] = {
}, },
}, },
@@ -55,10 +55,10 @@ local abdefaults = {
}, },
} }
local defaults = { local defaults = {
profile = { profile = {
actionbars = abdefaults, actionbars = abdefaults,
} }
} }
function BT4ActionBars:OnInitialize() function BT4ActionBars:OnInitialize()
+5 -5
View File
@@ -210,8 +210,8 @@ function onUpdate(self, elapsed)
local valid = IsActionInRange(self.action) local valid = IsActionInRange(self.action)
local hotkey = self.hotkey local hotkey = self.hotkey
local hkshown = (hotkey:GetText() == RANGE_INDICATOR and oor == "hotkey") local hkshown = (hotkey:GetText() == RANGE_INDICATOR and oor == "hotkey")
if valid and hkshown then if valid and hkshown then
hotkey:Show() hotkey:Show()
elseif hkshown then elseif hkshown then
hotkey:Hide() hotkey:Hide()
end end
@@ -389,7 +389,7 @@ function Button:GetBindings()
for i = 1, select('#', GetBindingKey(binding)) do for i = 1, select('#', GetBindingKey(binding)) do
local hotKey = select(i, GetBindingKey(binding)) local hotKey = select(i, GetBindingKey(binding))
if keys ~= "" then if keys ~= "" then
keys = keys .. ', ' keys = keys .. ', '
end end
keys = keys .. GetBindingText(hotKey,'KEY_') keys = keys .. GetBindingText(hotKey,'KEY_')
end end
@@ -399,7 +399,7 @@ function Button:GetBindings()
for i = 1, select('#', GetBindingKey(binding)) do for i = 1, select('#', GetBindingKey(binding)) do
local hotKey = select(i, GetBindingKey(binding)) local hotKey = select(i, GetBindingKey(binding))
if keys ~= "" then if keys ~= "" then
keys = keys .. ', ' keys = keys .. ', '
end end
keys = keys .. GetBindingText(hotKey,'KEY_') keys = keys .. GetBindingText(hotKey,'KEY_')
end end
@@ -445,7 +445,7 @@ end
function Button:UpdateUsable(force) function Button:UpdateUsable(force)
local isUsable, notEnoughMana = IsUsableAction(self.action) local isUsable, notEnoughMana = IsUsableAction(self.action)
local icon, hotkey = self.icon, self.hotkey local icon, hotkey = self.icon, self.hotkey
if force or not oor then if force or not oor then
oor = Bartender4.db.profile.outofrange oor = Bartender4.db.profile.outofrange
oorcolor, oomcolor = Bartender4.db.profile.colors.range, Bartender4.db.profile.colors.mana oorcolor, oomcolor = Bartender4.db.profile.colors.range, Bartender4.db.profile.colors.mana
end end
+6 -6
View File
@@ -12,7 +12,7 @@ local BagBar = setmetatable({}, {__index = ButtonBar})
local table_insert = table.insert local table_insert = table.insert
local defaults = { profile = Bartender4:Merge({ local defaults = { profile = Bartender4:Merge({
enabled = true, enabled = true,
keyring = false, keyring = false,
onebag = false, onebag = false,
@@ -72,7 +72,7 @@ function BagBar:FeedButtons()
btn:Hide() btn:Hide()
btn:SetParent(UIParent) btn:SetParent(UIParent)
btn:ClearSetPoint("CENTER") btn:ClearSetPoint("CENTER")
if btn ~= KeyRingButton and btn.LBFButtonData then if btn ~= KeyRingButton and btn.LBFButtonData then
local group = self.LBFGroup local group = self.LBFGroup
group:RemoveButton(btn) group:RemoveButton(btn)
end end
@@ -87,16 +87,16 @@ function BagBar:FeedButtons()
end end
if not self.config.onebag then if not self.config.onebag then
table_insert(self.buttons, CharacterBag3Slot) table_insert(self.buttons, CharacterBag3Slot)
table_insert(self.buttons, CharacterBag2Slot) table_insert(self.buttons, CharacterBag2Slot)
table_insert(self.buttons, CharacterBag1Slot) table_insert(self.buttons, CharacterBag1Slot)
table_insert(self.buttons, CharacterBag0Slot) table_insert(self.buttons, CharacterBag0Slot)
count = count + 4 count = count + 4
end end
table_insert(self.buttons, MainMenuBarBackpackButton) table_insert(self.buttons, MainMenuBarBackpackButton)
for i,v in pairs(self.buttons) do for i,v in pairs(self.buttons) do
v:SetParent(self) v:SetParent(self)
v:Show() v:Show()
if v ~= KeyRingButton then if v ~= KeyRingButton then
+1 -1
View File
@@ -54,7 +54,7 @@ do
-- TODO: Once dropdown config is stable, show dropdown on rightclick -- TODO: Once dropdown config is stable, show dropdown on rightclick
end end
function barOnUpdateFunc(self, elapsed) function barOnUpdateFunc(self, elapsed)
self.elapsed = self.elapsed + elapsed self.elapsed = self.elapsed + elapsed
if self.elapsed > self.config.fadeoutdelay then if self.elapsed > self.config.fadeoutdelay then
self:ControlFadeOut(self.elapsed) self:ControlFadeOut(self.elapsed)
+1 -1
View File
@@ -50,7 +50,7 @@ end
function Bartender4:CombatLockdown() function Bartender4:CombatLockdown()
self:Lock() self:Lock()
LibStub("AceConfigDialog-3.0"):Close("Bartender4") LibStub("AceConfigDialog-3.0"):Close("Bartender4")
end end
function Bartender4:ToggleLock() function Bartender4:ToggleLock()
+1 -1
View File
@@ -1,5 +1,5 @@
## Interface: 30000 ## Interface: 30000
## Notes-ruRU: Простой и усовершенствованный - Аддон паненей команд Бармен4 ## Notes-ruRU: Простой и усовершенствованный - Аддон паненей команд Бармен4
## Notes: Simple and Advanced combined - Bartender4 ActionBar AddOn ## Notes: Simple and Advanced combined - Bartender4 ActionBar AddOn
## Title: Bartender4 ## Title: Bartender4
## Author: Nevcairiel ## Author: Nevcairiel
+2 -2
View File
@@ -106,8 +106,8 @@ function ButtonBar:UpdateButtonLayout()
local Rows = self:GetRows() local Rows = self:GetRows()
local ButtonPerRow = math_floor(numbuttons / Rows + 0.5) -- just a precaution local ButtonPerRow = math_floor(numbuttons / Rows + 0.5) -- just a precaution
Rows = math_floor(numbuttons / ButtonPerRow + 0.5) Rows = math_floor(numbuttons / ButtonPerRow + 0.5)
if Rows > numbuttons then if Rows > numbuttons then
Rows = numbuttons Rows = numbuttons
ButtonPerRow = 1 ButtonPerRow = 1
end end
+3 -3
View File
@@ -12,7 +12,7 @@ local MicroMenuBar = setmetatable({}, {__index = Bar})
local table_insert = table.insert local table_insert = table.insert
local defaults = { profile = Bartender4:Merge({ local defaults = { profile = Bartender4:Merge({
enabled = true, enabled = true,
vertical = false, vertical = false,
visibility = { visibility = {
@@ -45,9 +45,9 @@ function MicroMenuMod:OnEnable()
self:RawHook("UpdateTalentButton", noopFunc, true) self:RawHook("UpdateTalentButton", noopFunc, true)
for i,v in pairs(buttons) do for i,v in pairs(buttons) do
v:SetParent(self.bar) v:SetParent(self.bar)
v:Show() v:Show()
v:SetFrameLevel(self.bar:GetFrameLevel() + 1) v:SetFrameLevel(self.bar:GetFrameLevel() + 1)
end end
+1 -1
View File
@@ -93,7 +93,7 @@ end
PetBar.button_width = 30 PetBar.button_width = 30
PetBar.button_height = 30 PetBar.button_height = 30
function PetBar:OnEvent(event, arg1) function PetBar:OnEvent(event, arg1)
if event == "PET_BAR_UPDATE" or if event == "PET_BAR_UPDATE" or
(event == "UNIT_PET" and arg1 == "player") or (event == "UNIT_PET" and arg1 == "player") or
((event == "UNIT_FLAGS" or event == "UNIT_AURA") and arg1 == "pet") or ((event == "UNIT_FLAGS" or event == "UNIT_AURA") and arg1 == "pet") or
event == "PLAYER_CONTROL_LOST" or event == "PLAYER_CONTROL_GAINED" or event == "PLAYER_FARSIGHT_FOCUS_CHANGED" event == "PLAYER_CONTROL_LOST" or event == "PLAYER_CONTROL_GAINED" or event == "PLAYER_FARSIGHT_FOCUS_CHANGED"
+2 -2
View File
@@ -182,7 +182,7 @@ function PetButtonPrototype:GetBindings()
for i = 1, select('#', GetBindingKey(binding)) do for i = 1, select('#', GetBindingKey(binding)) do
local hotKey = select(i, GetBindingKey(binding)) local hotKey = select(i, GetBindingKey(binding))
if keys ~= "" then if keys ~= "" then
keys = keys .. ', ' keys = keys .. ', '
end end
keys = keys .. GetBindingText(hotKey,'KEY_') keys = keys .. GetBindingText(hotKey,'KEY_')
end end
@@ -191,7 +191,7 @@ function PetButtonPrototype:GetBindings()
for i = 1, select('#', GetBindingKey(binding)) do for i = 1, select('#', GetBindingKey(binding)) do
local hotKey = select(i, GetBindingKey(binding)) local hotKey = select(i, GetBindingKey(binding))
if keys ~= "" then if keys ~= "" then
keys = keys .. ', ' keys = keys .. ', '
end end
keys = keys.. GetBindingText(hotKey,'KEY_') keys = keys.. GetBindingText(hotKey,'KEY_')
end end
+3 -3
View File
@@ -17,7 +17,7 @@ local format = string.format
local LBF = LibStub("LibButtonFacade", true) local LBF = LibStub("LibButtonFacade", true)
local KeyBound = LibStub("LibKeyBound-1.0") local KeyBound = LibStub("LibKeyBound-1.0")
local defaults = { profile = Bartender4:Merge({ local defaults = { profile = Bartender4:Merge({
enabled = true, enabled = true,
scale = 1.5, scale = 1.5,
}, Bartender4.ButtonBar.defaults) } }, Bartender4.ButtonBar.defaults) }
@@ -120,7 +120,7 @@ function StanceButtonPrototype:GetBindings()
for i = 1, select('#', GetBindingKey(binding)) do for i = 1, select('#', GetBindingKey(binding)) do
local hotKey = select(i, GetBindingKey(binding)) local hotKey = select(i, GetBindingKey(binding))
if keys ~= "" then if keys ~= "" then
keys = keys .. ', ' keys = keys .. ', '
end end
keys = keys .. GetBindingText(hotKey,'KEY_') keys = keys .. GetBindingText(hotKey,'KEY_')
end end
@@ -129,7 +129,7 @@ function StanceButtonPrototype:GetBindings()
for i = 1, select('#', GetBindingKey(binding)) do for i = 1, select('#', GetBindingKey(binding)) do
local hotKey = select(i, GetBindingKey(binding)) local hotKey = select(i, GetBindingKey(binding))
if keys ~= "" then if keys ~= "" then
keys = keys .. ', ' keys = keys .. ', '
end end
keys = keys.. GetBindingText(hotKey,'KEY_') keys = keys.. GetBindingText(hotKey,'KEY_')
end end