WoWInterface SVN OpenRDX

Compare Revisions

  • This comparison shows the changes necessary to convert path 
    /trunk/RDX/ObjectMgr
    from Rev 658 to Rev 676
    ↔ Reverse comparison
  •

Rev 658 → Rev 676

Install/OOBE.lua
308,7 → 308,7
end
-- Show the post install options window.
if(VFL.tsize(toggles) > 0) then
ShowInstallerDialog(VFLI.i18n("RDX6 Installer"), VFLI.i18n("The following post-installation options are available:"), InstallPhase3);
ShowInstallerDialog(VFLI.i18n("RDX Installer"), VFLI.i18n("The following post-installation options are available:"), InstallPhase3);
else
InstallDone();
end
327,7 → 327,7
 
-- Step 5: Show the first install options screen and wait for user feedback before proceeding.
if(VFL.tsize(toggles) > 0) then
ShowInstallerDialog(VFLI.i18n("RDX6 Installer"), VFLI.i18n("RDX has detected packages to install. The following user options are available. Select Decline to decline all, or Cancel to close."), InstallPhase2, InstallFreeAll, InstallDone);
ShowInstallerDialog(VFLI.i18n("RDX Installer"), VFLI.i18n("RDX has detected packages to install. The following user options are available. Select Decline to decline all, or Cancel to close."), InstallPhase2, InstallFreeAll, InstallDone);
else
InstallPhase2();
end
434,7 → 434,10
end
end
-- If no oobes were loaded, peace out.
if(not loadedOOBEs) then return; end
if(not loadedOOBEs) then
RDX.InstallerDone();
return;
end
VFLT.ZMSchedule(2, DeferredInstaller);
end
 
ObjectBrowser.lua
548,11 → 548,11
if dlg then return; end
 
dlg = VFLUI.Window:new(parent);
dlg:SetHeight(400); dlg:SetWidth(500);
VFLUI.Window.SetDefaultFraming(dlg, 24);
dlg:SetTitleColor(0,.6,0);
dlg:SetText("Repository Objects Browser");
dlg:SetPoint("CENTER", VFLParent, "CENTER");
dlg:SetHeight(400); dlg:SetWidth(500);
 
if RDXPM.Ismanaged("ObjectBrowser") then RDXPM.RestoreLayout(dlg, "ObjectBrowser"); end
VFLUI.Window.StdMove(dlg, dlg:GetTitleBar());
618,12 → 618,12
 
-- Escapement
local esch = function()
dlg:Hide(.2, true);
VFLT.ZMSchedule(.25, function()
RDXPM.StoreLayout(dlg, "ObjectBrowser");
--dlg:Hide(.2, true);
--VFLT.ZMSchedule(.25, function()
-- RDXPM.StoreLayout(dlg, "ObjectBrowser");
dlg:Destroy(); dlg = nil;
if selCallback then selCallback(nil); end
end);
--end);
end;
VFL.AddEscapeHandler(esch);