h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-15 10:22:56 +08:00
Code Issues Releases Wiki Activity

Rearrange some options a bit, update framework

Browse Source
This commit is contained in:
Drew DeVault 2016-11-07 22:15:48 -05:00
parent cbbac0565f
commit 4d04eb6fb1
6 changed files with 50 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

@ -1 +1 @@
Subproject commit 9e9145afcd1d37c56f89a6ae6e7b59e43d51037e
Subproject commit 478d0dd295a66c99556ca8039453e0f806ff4e9b

29
osu.Game/Overlays/Options/Online/AlertsPrivacyOptions.cs
View File

@ -1,29 +0,0 @@
using osu.Framework.Graphics;
using osu.Framework.Graphics.UserInterface;
namespace osu.Game.Overlays.Options.Online
{
public class AlertsPrivacyOptions : OptionsSubsection
{
protected override string Header => "Alerts & Privacy";
public AlertsPrivacyOptions()
{
// TODO: this should probably be split into Alerts and Privacy
Children = new Drawable[]
{
new BasicCheckBox { LabelText = "Chat ticker" },
new BasicCheckBox { LabelText = "Automatically hide chat during gameplay" },
new BasicCheckBox { LabelText = "Show a notification popup when someone says your name" },
new BasicCheckBox { LabelText = "Show chat message notifications" },
new BasicCheckBox { LabelText = "Play a sound when someone says your name" },
new BasicCheckBox { LabelText = "Share your city location with others" },
new BasicCheckBox { LabelText = "Show spectators" },
new BasicCheckBox { LabelText = "Automatically link beatmaps to spectators" },
new BasicCheckBox { LabelText = "Show notification popups instantly during gameplay" },
new BasicCheckBox { LabelText = "Show notification popups when friends change status" },
new BasicCheckBox { LabelText = "Allow multiplayer game invites from all users" },
};
}
}
}

23
osu.Game/Overlays/Options/Online/NotificationsOptions.cs Normal file
View File

@ -0,0 +1,23 @@
using osu.Framework.Graphics;
using osu.Framework.Graphics.UserInterface;
namespace osu.Game.Overlays.Options.Online
{
public class NotificationsOptions : OptionsSubsection
{
protected override string Header => "Notifications";
public NotificationsOptions()
{
Children = new Drawable[]
{
new BasicCheckBox { LabelText = "Enable chat ticker" },
new BasicCheckBox { LabelText = "Show a notification popup when someone says your name" },
new BasicCheckBox { LabelText = "Show chat message notifications" },
new BasicCheckBox { LabelText = "Play a sound when someone says your name" },
new BasicCheckBox { LabelText = "Show notification popups instantly during gameplay" },
new BasicCheckBox { LabelText = "Show notification popups when friends change status" },
};
}
}
}

5
osu.Game/Overlays/Options/Online/OnlineSection.cs
View File

@ -12,9 +12,10 @@ namespace osu.Game.Overlays.Options.Online
{
Children = new Drawable[]
{
new AlertsPrivacyOptions(),
new InGameChatOptions(),
new PrivacyOptions(),
new NotificationsOptions(),
new OnlineIntegrationOptions(),
new InGameChatOptions(),
};
}
}

21
osu.Game/Overlays/Options/Online/PrivacyOptions.cs Normal file
View File

@ -0,0 +1,21 @@
using osu.Framework.Graphics;
using osu.Framework.Graphics.UserInterface;
namespace osu.Game.Overlays.Options.Online
{
public class PrivacyOptions : OptionsSubsection
{
protected override string Header => "Privacy";
public PrivacyOptions()
{
// TODO: this should probably be split into Alerts and Privacy
Children = new Drawable[]
{
new BasicCheckBox { LabelText = "Share your city location with others" },
new BasicCheckBox { LabelText = "Allow multiplayer game invites from all users" },
new BasicCheckBox { LabelText = "Block private messages from non-friends" },
};
}
}
}

3
osu.Game/osu.Game.csproj
View File

@ -225,11 +225,12 @@
<Compile Include="Overlays\Options\Input\KeyboardOptions.cs" />
<Compile Include="Overlays\Options\Input\OtherInputOptions.cs" />
<Compile Include="Overlays\Options\Online\OnlineSection.cs" />
<Compile Include="Overlays\Options\Online\AlertsPrivacyOptions.cs" />
<Compile Include="Overlays\Options\Online\OnlineIntegrationOptions.cs" />
<Compile Include="Overlays\Options\Online\InGameChatOptions.cs" />
<Compile Include="Overlays\Options\EditorSection.cs" />
<Compile Include="Overlays\Options\SkinSection.cs" />
<Compile Include="Overlays\Options\Online\PrivacyOptions.cs" />
<Compile Include="Overlays\Options\Online\NotificationsOptions.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="$(SolutionDir)\osu-framework\osu.Framework\osu.Framework.csproj">