diff --git a/osu-framework b/osu-framework
index 9e9145afcd..478d0dd295 160000
--- a/osu-framework
+++ b/osu-framework
@@ -1 +1 @@
-Subproject commit 9e9145afcd1d37c56f89a6ae6e7b59e43d51037e
+Subproject commit 478d0dd295a66c99556ca8039453e0f806ff4e9b
diff --git a/osu.Game/Overlays/Options/Online/AlertsPrivacyOptions.cs b/osu.Game/Overlays/Options/Online/AlertsPrivacyOptions.cs
deleted file mode 100644
index 3ded801446..0000000000
--- a/osu.Game/Overlays/Options/Online/AlertsPrivacyOptions.cs
+++ /dev/null
@@ -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" },
- };
- }
- }
-}
\ No newline at end of file
diff --git a/osu.Game/Overlays/Options/Online/NotificationsOptions.cs b/osu.Game/Overlays/Options/Online/NotificationsOptions.cs
new file mode 100644
index 0000000000..3960560190
--- /dev/null
+++ b/osu.Game/Overlays/Options/Online/NotificationsOptions.cs
@@ -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" },
+ };
+ }
+ }
+}
\ No newline at end of file
diff --git a/osu.Game/Overlays/Options/Online/OnlineSection.cs b/osu.Game/Overlays/Options/Online/OnlineSection.cs
index 3c3ed2f41e..8524f33042 100644
--- a/osu.Game/Overlays/Options/Online/OnlineSection.cs
+++ b/osu.Game/Overlays/Options/Online/OnlineSection.cs
@@ -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(),
};
}
}
diff --git a/osu.Game/Overlays/Options/Online/PrivacyOptions.cs b/osu.Game/Overlays/Options/Online/PrivacyOptions.cs
new file mode 100644
index 0000000000..aeea7d3247
--- /dev/null
+++ b/osu.Game/Overlays/Options/Online/PrivacyOptions.cs
@@ -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" },
+ };
+ }
+ }
+}
\ No newline at end of file
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 2bc2c8c97d..051b53fafa 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -225,11 +225,12 @@
-
+
+