epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #10490 from penev92/packages

Browse Source 
Some renaming from "folder" to "package"
This commit is contained in:
Paul Chote
2016-01-15 22:40:02 +00:00
parent 8ebee425ab e3f5697f7e
commit 24570f0bdf
14 changed files with 67 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenRA.Mods.Common/Widgets/Logic/AssetBrowserLogic.cs
View File

@@ -33,7 +33,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
ScrollPanelWidget assetList;
ScrollItemWidget template;
IFolder assetSource = null;
IPackage assetSource = null;
List<string> availableShps = new List<string>();
bool animateFrames = false;
@@ -50,7 +50,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
this.world = world;
panel = widget;
assetSource = Game.ModData.ModFiles.MountedFolders.First();
assetSource = Game.ModData.ModFiles.MountedPackages.First();
var ticker = panel.GetOrNull<LogicTickerWidget>("ANIMATION_TICKER");
if (ticker != null)
@@ -334,7 +334,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
bool ShowSourceDropdown(DropDownButtonWidget dropdown)
{
Func<IFolder, ScrollItemWidget, ScrollItemWidget> setupItem = (source, itemTemplate) =>
Func<IPackage, ScrollItemWidget, ScrollItemWidget> setupItem = (source, itemTemplate) =>
{
var item = ScrollItemWidget.Setup(itemTemplate,
() => assetSource == source,
@@ -344,8 +344,8 @@ namespace OpenRA.Mods.Common.Widgets.Logic
};
// TODO: Re-enable "All Packages" once list generation is done in a background thread
// var sources = new[] { (IFolder)null }.Concat(GlobalFileSystem.MountedFolders);
var sources = Game.ModData.ModFiles.MountedFolders;
// var sources = new[] { (IPackage)null }.Concat(GlobalFileSystem.MountedFolders);
var sources = Game.ModData.ModFiles.MountedPackages;
dropdown.ShowDropDown("LABEL_DROPDOWN_TEMPLATE", 280, sources, setupItem);
return true;
}