WoWInterface SVN OpenRDX

Compare Revisions

  • This comparison shows the changes necessary to convert path 
    /branches
    from Rev 580 to Rev 581
    ↔ Reverse comparison
  •

Rev 580 → Rev 581

7.5_cataclysm/VFL/UI/PopupMenu.lua
16,8 → 16,6
 
function VFLUI.PopUpMenu(data, point, parent, relpoint, x, y)
if (point) then
--menuFrame:ClearAllPoints();
--menuFrame:SetPoint(point, parent, relpoint, x, y);
EasyMenu(data, menuFrame, parent, x, y, "MENU");
else
EasyMenu(data, menuFrame, "cursor", 0 , 0, "MENU");
7.5_cataclysm/RDX/DesktopMgr/LockUnlockKeyBindings.lua
4,12 → 4,14
-- Lock / Unlock KeyBindings
 
function RDXDK.IsKeyBindingsLocked()
if RDXU then return RDXU.keylocked; else return nil; end
if RDXU then
if not RDXU.keyNotlocked then return true; else return nil; end
end
end
 
function RDXDK.UnlockKeyBindings()
if not InCombatLockdown() then
RDXU.keylocked = nil;
RDXU.keyNotlocked = true;
DesktopEvents:Dispatch("DESKTOP_UNLOCK_BINDINGS");
else
RDX.printI(VFLI.i18n("Cannot change unlock state while in combat."));
17,7 → 19,7
end
 
function RDXDK.LockKeyBindings()
RDXU.keylocked = true;
RDXU.keyNotlocked = nil;
DesktopEvents:Dispatch("DESKTOP_LOCK_BINDINGS");
--SaveBindings(GetCurrentBindingSet());
end
7.5_cataclysm/RDX/RDX.toc
250,7 → 250,7
Designs\Texts\StaticText.lua
Designs\Texts\StatusText.lua
Designs\Texts\OtherText.lua
Designs\Texts\CombatText.lua
#Designs\Texts\CombatText.lua
 
Designs\Textures\ClassIcon.lua
Designs\Textures\FactionIcon.lua
270,7 → 270,7
Designs\Variables\AuraVariables.lua
Designs\Variables\CastLagVariables.lua
Designs\Variables\CastSpellVariables.lua
Designs\Variables\CooldownVariables.lua
#Designs\Variables\CooldownVariables.lua
Designs\Variables\DamageMeterVariables.lua
Designs\Variables\DecurseVariables.lua
Designs\Variables\DetailedFactionVariables.lua
291,7 → 291,7
Designs\Variables\TotemsVariables.lua
Designs\Variables\UnitInSetVar.lua
Designs\Variables\UnitInSortVariables.lua
Designs\Variables\WeaponVariables.lua
#Designs\Variables\WeaponVariables.lua
Designs\Variables\XPVariables.lua
Designs\Variables\ComboVariables.lua
Designs\Variables\Auras\DpVariables.lua
7.5_cataclysm/RDX/RosterMgr/Core.lua
147,7 → 147,7
debuffCacheN["@curse"] = {
name = "@curse",
texture = "Interface\\InventoryItems\\WoWUnknownItem01.blp",
properName = VFLI.i18n("(Any Curse)"),
properName = VFLI.i18n("@curse"),
descr = VFLI.i18n("Matches any curse."),
set = RDXDAL.GetDebuffSet("@curse"), isInvisible = true,
};
155,7 → 155,7
debuffCacheN["@magic"] = {
name = "@magic",
texture = "Interface\\InventoryItems\\WoWUnknownItem01.blp",
properName = VFLI.i18n("(Any Magic)"),
properName = VFLI.i18n("@magic"),
descr = VFLI.i18n("Matches any magic debuff."),
set = RDXDAL.GetDebuffSet("@magic"), isInvisible = true,
};
163,7 → 163,7
debuffCacheN["@poison"] = {
name = "@poison",
texture = "Interface\\InventoryItems\\WoWUnknownItem01.blp",
properName = VFLI.i18n("(Any Poison)"),
properName = VFLI.i18n("@poison"),
descr = VFLI.i18n("Matches any poison debuff."),
set = RDXDAL.GetDebuffSet("@poison"), isInvisible = true,
};
171,7 → 171,7
debuffCacheN["@disease"] = {
name = "@disease",
texture = "Interface\\InventoryItems\\WoWUnknownItem01.blp",
properName = VFLI.i18n("(Any Disease)"),
properName = VFLI.i18n("@disease"),
descr = VFLI.i18n("Matches any disease debuff."),
set = RDXDAL.GetDebuffSet("@disease"), isInvisible = true,
};
179,7 → 179,7
debuffCacheN["@other"] = {
name = "@other",
texture = "Interface\\InventoryItems\\WoWUnknownItem01.blp",
properName = VFLI.i18n("(Any Other)"),
properName = VFLI.i18n("@other"),
descr = VFLI.i18n("Matches any debuff that is not disease, poison, magic, or curse."),
set = RDXDAL.GetDebuffSet("@other"), isInvisible = true,
};
7.5_cataclysm/RDX/Designs/Variables/DecurseVariables.lua
190,10 → 190,10
end;
CreateDescriptor = function()
return { feature = "Variables decurse";
set1 = { file = "WoWRDX:Debuff_Magic_fset", class = "file"};
set2 = { file = "WoWRDX:Debuff_Poison_fset", class = "file"};
set3 = { file = "WoWRDX:Debuff_Disease_fset", class = "file"};
set4 = { file = "WoWRDX:Debuff_Curse_fset", class = "file"};
set1 = { buff = "@magic", class = "debuff"};
set2 = { buff = "@poison", class = "debuff"};
set3 = { buff = "@disease", class = "debuff"};
set4 = { buff = "@curse", class = "debuff"};
texture1 = { blendMode = "BLEND", path = "Interface\\Icons\\Spell_Holy_DispelMagic"};
texture2 = { blendMode = "BLEND", path = "Interface\\Icons\\Spell_Nature_NullifyPoison_02"};
texture3 = { blendMode = "BLEND", path = "Interface\\Icons\\Spell_Nature_RemoveDisease"};
7.5_cataclysm/RDX/Designs/PreviewWindow.lua
21,33 → 21,31
preview_window:SetBackdrop(VFLUI.DefaultDialogBorder);
preview_window:Show();
 
local top = VFLUI.AcquireFrame("Frame");
top:SetParent(preview_window);
top:SetPoint("TOPLEFT", preview_window, "TOPLEFT", 2, -2);
top:SetWidth(300);
top:SetHeight(80);
top:Show();
preview_window.top = top;
--local top = VFLUI.AcquireFrame("Frame");
--top:SetParent(preview_window);
--top:SetPoint("TOPLEFT", preview_window, "TOPLEFT", 2, -2);
--top:SetWidth(300);
--top:SetHeight(80);
--top:Show();
--preview_window.top = top;
 
local middle = VFLUI.AcquireFrame("Frame");
middle:SetParent(preview_window);
middle:SetPoint("TOPLEFT", top, "BOTTOMLEFT", 0, 0);
middle:SetWidth(300);
middle:SetHeight(300);
middle:SetAllPoints(preview_window);
--middle:SetBackdrop(VFLUI.DarkDialogBackdrop);
--middle:SetBackdrop({
-- bgFile="Interface\\Addons\\VFL\\Skin\\Checker", tile = true, tileSize = 64,
-- insets = { left = 0, right = 0, top = 0, bottom = 0 }
--});
middle:SetBackdrop({
bgFile="Interface\\Addons\\VFL\\Skin\\Checker", tile = true, tileSize = 16,
insets = { left = 0, right = 0, top = 0, bottom = 0 }
});
middle:Show();
middle.tex = VFLUI.CreateTexture(middle);
middle.tex:SetDrawLayer("BACKGROUND", 0);
middle.tex:SetAllPoints(middle);
--middle.tex = VFLUI.CreateTexture(middle);
--middle.tex:SetDrawLayer("BACKGROUND", 0);
--middle.tex:SetAllPoints(middle);
--middle.tex:SetTexCoord(0, 0.5, 0, 0.5);
middle.tex:SetTexture("Interface\\Addons\\VFL\\Skin\\Checker3");
--middle.tex:SetTexture("Interface\\Addons\\VFL\\Skin\\Checker3");
--middle.tex:SetHorizTile(true);
--middle.tex:SetVertTile(true);
middle.tex:Show();
--middle.tex:Show();
preview_window.middle = middle;
 
--local bottom = VFLUI.AcquireFrame("Frame");
113,6 → 111,8
curUF:SetData(1, unit.uid, unit);
end
if curUF:GetWidth() > 300 then
preview_window:SetWidth(curUF:GetWidth() + 20);
preview_window:SetHeight(curUF:GetHeight() + 20);
preview_window:ClearAllPoints();
preview_window:SetPoint("TOP", parent, "BOTTOM", 5, 0);
end
140,9 → 140,9
--VFLT.AdaptiveUnschedule("__uf_preview");
RDXIEEvents:Unbind("IEREBUILD");
preview_window.bottom:Destroy(); preview_window.bottom = nil;
VFLUI.ReleaseRegion(preview_window.middle.tex); preview_window.middle.tex = nil;
--VFLUI.ReleaseRegion(preview_window.middle.tex); preview_window.middle.tex = nil;
preview_window.middle:Destroy(); preview_window.middle = nil;
preview_window.top:Destroy(); preview_window.top = nil;
--preview_window.top:Destroy(); preview_window.top = nil;
end, preview_window.Destroy);
 
return preview_window;
7.5_cataclysm/RDX/PanelMgr/Menu.lua
54,8 → 54,11
func(entries[i]);
end
for j,_ in ipairs(entries) do if j > i then entries[j] = nil; end end
VFLUI.PopUpMenu(entries, point, parent, relpoint, x, y);
--tree:Expand(frame, entries);
--if tree then
-- tree:Expand(parent, entries);
--else
VFLUI.PopUpMenu(entries, point, parent, relpoint, x, y);
--end
end
 
function RDXPM.Menu:Close()