WoWInterface SVN OpenRDX

Compare Revisions

  • This comparison shows the changes necessary to convert path 
    /
    from Rev 668 to Rev 669
    ↔ Reverse comparison
  •

Rev 668 → Rev 669

trunk/RDX/Designs/Variables/DecurseVariables.lua
13,6 → 13,7
end;
ExposeFeature = function(desc, state, errs)
if not desc then VFL.AddError(errs, VFLI.i18n("No descriptor.")); return nil; end
if not desc.raColor5 then desc.raColor5 = _alphafull; end
if (not RDXDAL.FindSet(desc.set1)) or (not RDXDAL.FindSet(desc.set2)) or (not RDXDAL.FindSet(desc.set3)) or (not RDXDAL.FindSet(desc.set4)) then
VFL.AddError(errs, VFLI.i18n("Invalid set pointer."));
return nil;
39,6 → 40,7
deColor_cf[2] = ]] .. Serialize(desc.raColor2) .. [[;
deColor_cf[3] = ]] .. Serialize(desc.raColor3) .. [[;
deColor_cf[4] = ]] .. Serialize(desc.raColor4) .. [[;
deColor_cf[5] = ]] .. Serialize(desc.raColor5) .. [[;
 
local deTex_cf = {};
deTex_cf[1] = ]] .. string.format("%q", desc.texture1.path) .. [[;
77,6 → 79,9
decurseColor = deColor_cf[4];
decurseIcon = deTex_cf[4];
decurse_possible = true;
else
decurseColor = deColor_cf[5];
decurse_possible = false
end
]]);
end
173,6 → 178,15
local tsel4 = VFLUI.MakeTextureSelectButton(er4, desc.texture4); tsel4:Show();
er4:EmbedChild(tsel4); er4:Show();
ui:InsertFrame(er4);
 
ui:InsertFrame(VFLUI.Separator:new(ui, VFLI.i18n("Default")));
 
local er5 = VFLUI.EmbedRight(ui, VFLI.i18n("Default color"));
local swatch_raColor5 = VFLUI.ColorSwatch:new(er5);
swatch_raColor5:Show();
if desc and desc.raColor5 then swatch_raColor5:SetColor(VFL.explodeRGBA(desc.raColor5)); end
er5:EmbedChild(swatch_raColor5); er5:Show();
ui:InsertFrame(er5);
 
function ui:GetDescriptor()
return {
190,6 → 204,7
raColor2 = swatch_raColor2:GetColor();
raColor3 = swatch_raColor3:GetColor();
raColor4 = swatch_raColor4:GetColor();
raColor5 = swatch_raColor5:GetColor();
};
end
 
209,6 → 224,7
raColor2 = _green;
raColor3 = _yellow;
raColor4 = _red;
raColor5 = _alphafull;
};
end;
});
trunk/RDX/Designs/Lists/CooldownBarList.lua
525,7 → 525,6
-- display bar
sbtib = sbtib:GetSelectedSBTIB();
countTypeFlag = countTypeFlag:GetSelection();
sbcolor = chk_bc:GetChecked();
-- fonts
trunc = trunc;
abr = chk_abr:GetChecked();
trunk/RDX/Designs/Lists/HeaderAuraIconList.lua
388,7 → 388,7
 
local ed_yoffset = VFLUI.LabeledEdit:new(ui, 50); ed_yoffset:Show();
ed_yoffset:SetText(VFLI.i18n("Y offset"));
if desc and desc.yoffset then ed_yoffset.editBox:SetText(desc.xoffset); else ed_yoffset.editBox:SetText("0"); end
if desc and desc.yoffset then ed_yoffset.editBox:SetText(desc.yoffset); else ed_yoffset.editBox:SetText("0"); end
ui:InsertFrame(ed_yoffset);
 
-------------- ButtonSkin
trunk/RDX/RDX.toc
2,7 → 2,7
## Title: |c007ffcffRDX|r
## Notes: RDX is Raid Data Exchange - UI and raid mods.
## Author: Raid Informatics / OpenRDX Project
## Version: 8.0.17
## Version: 8.0.18
## RequiredDeps: VFL, RDX_mediapack
## OptionalDeps: RDX_filesystem, RDX_localspelldb, RDX_combatlogs, RDX_recovery, RDX_languagepack_frFR, RDX_languagepack_deDE, RDX_languagepack_ruRU
## SavedVariables: RDXSession