diff --git a/OpenRA.Mods.Cnc/Widgets/Logic/CncMapChooserLogic.cs b/OpenRA.Mods.Cnc/Widgets/Logic/CncMapChooserLogic.cs index 213077a454..21c5c517fe 100644 --- a/OpenRA.Mods.Cnc/Widgets/Logic/CncMapChooserLogic.cs +++ b/OpenRA.Mods.Cnc/Widgets/Logic/CncMapChooserLogic.cs @@ -44,9 +44,6 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic panel.GetWidget("BUTTON_OK").OnClick = () => { Widget.CloseWindow(); onSelect(map); }; panel.GetWidget("BUTTON_CANCEL").OnClick = () => { Widget.CloseWindow(); onExit(); }; - panel.GetWidget("BUTTON_INSTALL").IsDisabled = () => true; - panel.GetWidget("BUTTON_INSTALL").OnClick = () => InstallMap(); - scrollpanel = panel.GetWidget("MAP_LIST"); itemTemplate = scrollpanel.GetWidget("MAP_TEMPLATE"); EnumerateMaps(); @@ -68,31 +65,5 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic scrollpanel.AddChild(item); } } - - bool InstallMap() - { - Game.Utilities.PromptFilepathAsync("Select an OpenRA map file", path => - { - if (!string.IsNullOrEmpty(path)) - Game.RunAfterTick(() => InstallMapInner(path)); - }); - return true; - } - - void InstallMapInner(string path) - { - var toPath = new [] { Platform.SupportDir, "maps", Game.modData.Manifest.Mods[0], Path.GetFileName(path) }.Aggregate(Path.Combine); - - // Create directory if required - var dir = Path.GetDirectoryName(toPath); - if (!Directory.Exists(dir)) - Directory.CreateDirectory(dir); - - // TODO: Attempt to mount the map and verify that - // it is a valid Game.modData.Manifest.Mods[0] map. - File.Copy(path, toPath, true); - Game.modData.ReloadMaps(); - EnumerateMaps(); - } } } diff --git a/OpenRA.Mods.RA/Widgets/Logic/MapChooserLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/MapChooserLogic.cs index 8a91cea207..aa5da16ac0 100644 --- a/OpenRA.Mods.RA/Widgets/Logic/MapChooserLogic.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/MapChooserLogic.cs @@ -56,8 +56,6 @@ namespace OpenRA.Mods.RA.Widgets.Logic return true; }; - bg.GetWidget("BUTTON_INSTALL").IsVisible = () => false; - //bg.GetWidget("BUTTON_INSTALL").OnMouseUp = mi => InstallMap(); scrollpanel = bg.GetWidget("MAP_LIST"); itemTemplate = scrollpanel.GetWidget("MAP_TEMPLATE"); EnumerateMaps(); @@ -79,34 +77,5 @@ namespace OpenRA.Mods.RA.Widgets.Logic scrollpanel.AddChild(item); } } - - bool InstallMap() - { - Game.Utilities.PromptFilepathAsync("Select an OpenRA map file", path => - { - if (!string.IsNullOrEmpty(path)) - Game.RunAfterTick(() => InstallMapInner(path)); - }); - return true; - } - - void InstallMapInner(string path) - { - var toPath = "{0}{1}maps{1}{2}{1}{3}" - .F(Platform.SupportDir,Path.DirectorySeparatorChar, - Game.modData.Manifest.Mods[0], - Path.GetFileName(path)); - - // Create directory if required - var dir = Path.GetDirectoryName(toPath); - if (!Directory.Exists(dir)) - Directory.CreateDirectory(dir); - - // TODO: Attempt to mount the map and verify that - // it is a valid Game.modData.Manifest.Mods[0] map. - File.Copy(path, toPath, true); - Game.modData.ReloadMaps(); - EnumerateMaps(); - } } } diff --git a/mods/cnc/chrome/mapchooser.yaml b/mods/cnc/chrome/mapchooser.yaml index e366916d6a..20b6642c13 100644 --- a/mods/cnc/chrome/mapchooser.yaml +++ b/mods/cnc/chrome/mapchooser.yaml @@ -197,13 +197,6 @@ Container@MAPCHOOSER_PANEL: Width:140 Height:35 Text:Cancel - Button@BUTTON_INSTALL: - Id:BUTTON_INSTALL - X:450 - Y:499 - Width:140 - Height:35 - Text:Install Map Button@BUTTON_OK: Id:BUTTON_OK Key:return diff --git a/mods/ra/chrome/gamelobby.yaml b/mods/ra/chrome/gamelobby.yaml index da3aa061e9..88be930c0b 100644 --- a/mods/ra/chrome/gamelobby.yaml +++ b/mods/ra/chrome/gamelobby.yaml @@ -714,12 +714,4 @@ Background@MAP_CHOOSER: Width:120 Height:25 Text:Cancel - Font:Bold - Button@BUTTON_INSTALL: - Id:BUTTON_INSTALL - X:20 - Y:PARENT_BOTTOM-49 - Width:120 - Height:25 - Text:Install Map - Font:Bold + Font:Bold \ No newline at end of file