h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 11:07:52 +08:00
Code Issues Releases Wiki Activity

Merge pull request #10882 from PercyDan54/import-screen

Browse Source 
Add File Import screen
This commit is contained in:
Dean Herbert 2020-12-15 15:03:15 +09:00 committed by GitHub
commit 3faf7db068
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 177 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
osu.Game/Overlays/Settings/Sections/Debug/GeneralSettings.cs
View File

@ -4,6 +4,8 @@
using osu.Framework.Allocation;
using osu.Framework.Configuration;
using osu.Framework.Graphics;
using osu.Framework.Screens;
using osu.Game.Screens.Import;
namespace osu.Game.Overlays.Settings.Sections.Debug
{
@ -11,8 +13,8 @@ namespace osu.Game.Overlays.Settings.Sections.Debug
{
protected override string Header => "General";
[BackgroundDependencyLoader]
private void load(FrameworkDebugConfigManager config, FrameworkConfigManager frameworkConfig)
[BackgroundDependencyLoader(true)]
private void load(FrameworkDebugConfigManager config, FrameworkConfigManager frameworkConfig, OsuGame game)
{
Children = new Drawable[]
{
@ -27,6 +29,11 @@ namespace osu.Game.Overlays.Settings.Sections.Debug
Current = config.GetBindable<bool>(DebugSetting.BypassFrontToBackPass)
}
};
Add(new SettingsButton
{
Text = "Import files",
Action = () => game?.PerformFromScreen(menu => menu.Push(new FileImportScreen()))
});
}
}
}

168
osu.Game/Screens/Import/FileImportScreen.cs Normal file
View File

@ -0,0 +1,168 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
using System.IO;
using System.Linq;
using System.Threading.Tasks;
using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Platform;
using osu.Framework.Screens;
using osu.Game.Graphics;
using osu.Game.Graphics.Containers;
using osu.Game.Graphics.UserInterface;
using osu.Game.Graphics.UserInterfaceV2;
using osuTK;
namespace osu.Game.Screens.Import
{
public class FileImportScreen : OsuScreen
{
public override bool HideOverlaysOnEnter => true;
private FileSelector fileSelector;
private Container contentContainer;
private TextFlowContainer currentFileText;
private TriangleButton importButton;
private const float duration = 300;
private const float button_height = 50;
private const float button_vertical_margin = 15;
[Resolved]
private OsuGameBase game { get; set; }
[Resolved]
private OsuColour colours { get; set; }
[BackgroundDependencyLoader(true)]
private void load(Storage storage)
{
InternalChild = contentContainer = new Container
{
Masking = true,
CornerRadius = 10,
RelativeSizeAxes = Axes.Both,
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Size = new Vector2(0.9f, 0.8f),
Children = new Drawable[]
{
new Box
{
Colour = colours.GreySeafoamDark,
RelativeSizeAxes = Axes.Both,
},
fileSelector = new FileSelector(validFileExtensions: game.HandledExtensions.ToArray())
{
RelativeSizeAxes = Axes.Both,
Width = 0.65f
},
new Container
{
RelativeSizeAxes = Axes.Both,
Width = 0.35f,
Anchor = Anchor.TopRight,
Origin = Anchor.TopRight,
Children = new Drawable[]
{
new Box
{
Colour = colours.GreySeafoamDarker,
RelativeSizeAxes = Axes.Both
},
new Container
{
RelativeSizeAxes = Axes.Both,
Padding = new MarginPadding { Bottom = button_height + button_vertical_margin * 2 },
Child = new OsuScrollContainer
{
RelativeSizeAxes = Axes.Both,
Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre,
Child = currentFileText = new TextFlowContainer(t => t.Font = OsuFont.Default.With(size: 30))
{
AutoSizeAxes = Axes.Y,
RelativeSizeAxes = Axes.X,
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
TextAnchor = Anchor.Centre
},
ScrollContent =
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
}
},
},
importButton = new TriangleButton
{
Text = "Import",
Anchor = Anchor.BottomCentre,
Origin = Anchor.BottomCentre,
RelativeSizeAxes = Axes.X,
Height = button_height,
Width = 0.9f,
Margin = new MarginPadding { Vertical = button_vertical_margin },
Action = () => startImport(fileSelector.CurrentFile.Value?.FullName)
}
}
}
}
};
fileSelector.CurrentFile.BindValueChanged(fileChanged, true);
fileSelector.CurrentPath.BindValueChanged(directoryChanged);
}
public override void OnEntering(IScreen last)
{
base.OnEntering(last);
contentContainer.ScaleTo(0.95f).ScaleTo(1, duration, Easing.OutQuint);
this.FadeInFromZero(duration);
}
public override bool OnExiting(IScreen next)
{
contentContainer.ScaleTo(0.95f, duration, Easing.OutQuint);
this.FadeOut(duration, Easing.OutQuint);
return base.OnExiting(next);
}
private void directoryChanged(ValueChangedEvent<DirectoryInfo> _)
{
// this should probably be done by the selector itself, but let's do it here for now.
fileSelector.CurrentFile.Value = null;
}
private void fileChanged(ValueChangedEvent<FileInfo> selectedFile)
{
importButton.Enabled.Value = selectedFile.NewValue != null;
currentFileText.Text = selectedFile.NewValue?.Name ?? "Select a file";
}
private void startImport(string path)
{
if (string.IsNullOrEmpty(path))
return;
Task.Factory.StartNew(async () =>
{
await game.Import(path);
// some files will be deleted after successful import, so we want to refresh the view.
Schedule(() =>
{
// should probably be exposed as a refresh method.
fileSelector.CurrentPath.TriggerChange();
});
}, TaskCreationOptions.LongRunning);
}
}
}