mirror of
https://github.com/ppy/osu.git
synced 2025-01-12 23:12:56 +08:00
Remove most options which have not yet been implemented.
This commit is contained in:
parent
f9de733128
commit
691742b828
@ -1,7 +1,6 @@
|
|||||||
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
|
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
|
||||||
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
|
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
|
||||||
|
|
||||||
using System;
|
|
||||||
using osu.Framework.Configuration;
|
using osu.Framework.Configuration;
|
||||||
using osu.Framework.Platform;
|
using osu.Framework.Platform;
|
||||||
using osu.Game.Screens.Select;
|
using osu.Game.Screens.Select;
|
||||||
@ -17,6 +16,9 @@ namespace osu.Game.Configuration
|
|||||||
Set(OsuConfig.Ruleset, 0, 0, int.MaxValue);
|
Set(OsuConfig.Ruleset, 0, 0, int.MaxValue);
|
||||||
Set(OsuConfig.BeatmapDetailTab, BeatmapDetailTab.Details);
|
Set(OsuConfig.BeatmapDetailTab, BeatmapDetailTab.Details);
|
||||||
|
|
||||||
|
Set(OsuConfig.DisplayStarsMinimum, 0.0, 0, 10);
|
||||||
|
Set(OsuConfig.DisplayStarsMaximum, 10.0, 0, 10);
|
||||||
|
|
||||||
// Online settings
|
// Online settings
|
||||||
|
|
||||||
Set(OsuConfig.Username, string.Empty);
|
Set(OsuConfig.Username, string.Empty);
|
||||||
@ -66,128 +68,6 @@ namespace osu.Game.Configuration
|
|||||||
// Update
|
// Update
|
||||||
|
|
||||||
Set(OsuConfig.ReleaseStream, ReleaseStream.Lazer);
|
Set(OsuConfig.ReleaseStream, ReleaseStream.Lazer);
|
||||||
|
|
||||||
//todo: implement all settings below this line (remove the Disabled set when doing so).
|
|
||||||
|
|
||||||
Set(OsuConfig.MouseSpeed, 1.0).Disabled = true;
|
|
||||||
Set(OsuConfig.BeatmapDirectory, @"Songs").Disabled = true;
|
|
||||||
Set(OsuConfig.AllowPublicInvites, true).Disabled = true;
|
|
||||||
Set(OsuConfig.AutoChatHide, true).Disabled = true;
|
|
||||||
Set(OsuConfig.AutomaticDownload, true).Disabled = true;
|
|
||||||
Set(OsuConfig.AutomaticDownloadNoVideo, false).Disabled = true;
|
|
||||||
Set(OsuConfig.BlockNonFriendPM, false).Disabled = true;
|
|
||||||
Set(OsuConfig.Bloom, false).Disabled = true;
|
|
||||||
Set(OsuConfig.BloomSoftening, false).Disabled = true;
|
|
||||||
Set(OsuConfig.BossKeyFirstActivation, true).Disabled = true;
|
|
||||||
Set(OsuConfig.ChatAudibleHighlight, true).Disabled = true;
|
|
||||||
Set(OsuConfig.ChatChannels, string.Empty).Disabled = true;
|
|
||||||
Set(OsuConfig.ChatFilter, false).Disabled = true;
|
|
||||||
Set(OsuConfig.ChatHighlightName, true).Disabled = true;
|
|
||||||
Set(OsuConfig.ChatMessageNotification, true).Disabled = true;
|
|
||||||
Set(OsuConfig.ChatLastChannel, string.Empty).Disabled = true;
|
|
||||||
Set(OsuConfig.ChatRemoveForeign, false).Disabled = true;
|
|
||||||
//Set(OsuConfig.ChatSortMode, UserSortMode.Rank).Disabled = true;
|
|
||||||
Set(OsuConfig.ComboBurst, true).Disabled = true;
|
|
||||||
Set(OsuConfig.ComboFire, false).Disabled = true;
|
|
||||||
Set(OsuConfig.ComboFireHeight, 3).Disabled = true;
|
|
||||||
Set(OsuConfig.ConfirmExit, false).Disabled = true;
|
|
||||||
Set(OsuConfig.AutoSendNowPlaying, true).Disabled = true;
|
|
||||||
Set(OsuConfig.AutomaticCursorSizing, false).Disabled = true;
|
|
||||||
Set(OsuConfig.Display, 1).Disabled = true;
|
|
||||||
Set(OsuConfig.DisplayCityLocation, false).Disabled = true;
|
|
||||||
Set(OsuConfig.DistanceSpacingEnabled, true).Disabled = true;
|
|
||||||
Set(OsuConfig.EditorTip, 0).Disabled = true;
|
|
||||||
Set(OsuConfig.VideoEditor, true).Disabled = true;
|
|
||||||
Set(OsuConfig.EditorDefaultSkin, false).Disabled = true;
|
|
||||||
Set(OsuConfig.EditorSnakingSliders, true).Disabled = true;
|
|
||||||
Set(OsuConfig.EditorHitAnimations, false).Disabled = true;
|
|
||||||
Set(OsuConfig.EditorFollowPoints, true).Disabled = true;
|
|
||||||
Set(OsuConfig.EditorStacking, true).Disabled = true;
|
|
||||||
Set(OsuConfig.ForceSliderRendering, false).Disabled = true;
|
|
||||||
Set(OsuConfig.FpsCounter, false).Disabled = true;
|
|
||||||
Set(OsuConfig.FrameTimeDisplay, false).Disabled = true;
|
|
||||||
Set(OsuConfig.GuideTips, @"").Disabled = true;
|
|
||||||
Set(OsuConfig.CursorRipple, false).Disabled = true;
|
|
||||||
Set(OsuConfig.HighlightWords, string.Empty).Disabled = true;
|
|
||||||
Set(OsuConfig.HighResolution, false).Disabled = true;
|
|
||||||
Set(OsuConfig.HitLighting, true).Disabled = true;
|
|
||||||
Set(OsuConfig.IgnoreBarline, false).Disabled = true;
|
|
||||||
Set(OsuConfig.IgnoreBeatmapSamples, false).Disabled = true;
|
|
||||||
Set(OsuConfig.IgnoreBeatmapSkins, false).Disabled = true;
|
|
||||||
Set(OsuConfig.IgnoreList, string.Empty).Disabled = true;
|
|
||||||
Set(OsuConfig.AllowNowPlayingHighlights, false).Disabled = true;
|
|
||||||
Set(OsuConfig.LastVersion, string.Empty).Disabled = true;
|
|
||||||
Set(OsuConfig.LastVersionPermissionsFailed, string.Empty).Disabled = true;
|
|
||||||
Set(OsuConfig.LoadSubmittedThread, true).Disabled = true;
|
|
||||||
Set(OsuConfig.LobbyPlayMode, -1).Disabled = true;
|
|
||||||
Set(OsuConfig.ShowInterfaceDuringRelax, false).Disabled = true;
|
|
||||||
Set(OsuConfig.LobbyShowExistingOnly, false).Disabled = true;
|
|
||||||
Set(OsuConfig.LobbyShowFriendsOnly, false).Disabled = true;
|
|
||||||
Set(OsuConfig.LobbyShowFull, false).Disabled = true;
|
|
||||||
Set(OsuConfig.LobbyShowInProgress, true).Disabled = true;
|
|
||||||
Set(OsuConfig.LobbyShowPassworded, true).Disabled = true;
|
|
||||||
Set(OsuConfig.LogPrivateMessages, false).Disabled = true;
|
|
||||||
Set(OsuConfig.LowResolution, false).Disabled = true;
|
|
||||||
//Set(OsuConfig.ManiaSpeed, SpeedMania.SPEED_DEFAULT, SpeedMania.SPEED_MIN, SpeedMania.SPEED_MAX).Disabled = true;
|
|
||||||
Set(OsuConfig.UsePerBeatmapManiaSpeed, true).Disabled = true;
|
|
||||||
Set(OsuConfig.ManiaSpeedBPMScale, true).Disabled = true;
|
|
||||||
Set(OsuConfig.MenuTip, 0).Disabled = true;
|
|
||||||
Set(OsuConfig.MouseSpeed, 1, 0.4, 6).Disabled = true;
|
|
||||||
Set(OsuConfig.ScoreMeterScale, 1, 0.5, 2).Disabled = true;
|
|
||||||
//Set(OsuConfig.ScoreMeterScale, 1, 0.5, OsuGame.Tournament ? 10 : 2).Disabled = true;
|
|
||||||
Set(OsuConfig.DistanceSpacing, 0.8, 0.1, 6).Disabled = true;
|
|
||||||
Set(OsuConfig.EditorBeatDivisor, 1, 1, 16).Disabled = true;
|
|
||||||
Set(OsuConfig.EditorGridSize, 32, 4, 32).Disabled = true;
|
|
||||||
Set(OsuConfig.EditorGridSizeDesign, 32, 4, 32).Disabled = true;
|
|
||||||
Set(OsuConfig.CustomFrameLimit, 240, 240, 999).Disabled = true;
|
|
||||||
Set(OsuConfig.MsnIntegration, false).Disabled = true;
|
|
||||||
Set(OsuConfig.MyPcSucks, false).Disabled = true;
|
|
||||||
Set(OsuConfig.NotifyFriends, true).Disabled = true;
|
|
||||||
Set(OsuConfig.NotifySubmittedThread, true).Disabled = true;
|
|
||||||
Set(OsuConfig.PopupDuringGameplay, true).Disabled = true;
|
|
||||||
Set(OsuConfig.ProgressBarType, ProgressBarType.Pie).Disabled = true;
|
|
||||||
Set(OsuConfig.RankType, RankingType.Top).Disabled = true;
|
|
||||||
Set(OsuConfig.RefreshRate, 60).Disabled = true;
|
|
||||||
Set(OsuConfig.OverrideRefreshRate, Get<int>(OsuConfig.RefreshRate) != 60).Disabled = true;
|
|
||||||
//Set(OsuConfig.ScaleMode, ScaleMode.WidescreenConservative).Disabled = true;
|
|
||||||
Set(OsuConfig.ScoreboardVisible, true).Disabled = true;
|
|
||||||
Set(OsuConfig.ScoreMeter, ScoreMeterType.Error).Disabled = true;
|
|
||||||
//Set(OsuConfig.ScoreMeter, OsuGame.Tournament ? ScoreMeterType.Colour : ScoreMeterType.Error).Disabled = true;
|
|
||||||
Set(OsuConfig.ScreenshotId, 0).Disabled = true;
|
|
||||||
Set(OsuConfig.MenuSnow, false).Disabled = true;
|
|
||||||
Set(OsuConfig.MenuTriangles, true).Disabled = true;
|
|
||||||
Set(OsuConfig.SongSelectThumbnails, true).Disabled = true;
|
|
||||||
Set(OsuConfig.ScreenshotFormat, ScreenshotFormat.Jpg).Disabled = true;
|
|
||||||
Set(OsuConfig.ShowReplayComments, true).Disabled = true;
|
|
||||||
Set(OsuConfig.ShowSpectators, true).Disabled = true;
|
|
||||||
Set(OsuConfig.ShowStoryboard, true).Disabled = true;
|
|
||||||
//Set(OsuConfig.Skin, SkinManager.DEFAULT_SKIN).Disabled = true;
|
|
||||||
Set(OsuConfig.SkinSamples, true).Disabled = true;
|
|
||||||
Set(OsuConfig.SkipTablet, false).Disabled = true;
|
|
||||||
Set(OsuConfig.Tablet, false).Disabled = true;
|
|
||||||
Set(OsuConfig.UpdatePending, false).Disabled = true;
|
|
||||||
Set(OsuConfig.UseSkinCursor, false).Disabled = true;
|
|
||||||
Set(OsuConfig.UseTaikoSkin, false).Disabled = true;
|
|
||||||
Set(OsuConfig.Video, true).Disabled = true;
|
|
||||||
Set(OsuConfig.Wiimote, false).Disabled = true;
|
|
||||||
Set(OsuConfig.YahooIntegration, false).Disabled = true;
|
|
||||||
Set(OsuConfig.ForceFrameFlush, false).Disabled = true;
|
|
||||||
Set(OsuConfig.DetectPerformanceIssues, true).Disabled = true;
|
|
||||||
Set(OsuConfig.RawInput, false).Disabled = true;
|
|
||||||
Set(OsuConfig.AbsoluteToOsuWindow, Get<bool>(OsuConfig.RawInput)).Disabled = true;
|
|
||||||
Set(OsuConfig.ShowMenuTips, true).Disabled = true;
|
|
||||||
Set(OsuConfig.HiddenShowFirstApproach, true).Disabled = true;
|
|
||||||
Set(OsuConfig.ComboColourSliderBall, true).Disabled = true;
|
|
||||||
Set(OsuConfig.AlternativeChatFont, false).Disabled = true;
|
|
||||||
Set(OsuConfig.DisplayStarsMaximum, 10.0, 0.0, 10.0).Disabled = true;
|
|
||||||
Set(OsuConfig.DisplayStarsMinimum, 0.0, 0.0, 10.0).Disabled = true;
|
|
||||||
Set(OsuConfig.UpdateFailCount, 0).Disabled = true;
|
|
||||||
//Set(OsuConfig.TreeSortMode, TreeGroupMode.Show_All).Disabled = true;
|
|
||||||
//Set(OsuConfig.TreeSortMode2, TreeSortMode.Title).Disabled = true;
|
|
||||||
Set(OsuConfig.PermanentSongInfo, false).Disabled = true;
|
|
||||||
Set(OsuConfig.Ticker, false).Disabled = true;
|
|
||||||
Set(OsuConfig.CompatibilityContext, false).Disabled = true;
|
|
||||||
Set(OsuConfig.CanForceOptimusCompatibility, true).Disabled = true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public OsuConfigManager(Storage storage) : base(storage)
|
public OsuConfigManager(Storage storage) : base(storage)
|
||||||
@ -197,150 +77,28 @@ namespace osu.Game.Configuration
|
|||||||
|
|
||||||
public enum OsuConfig
|
public enum OsuConfig
|
||||||
{
|
{
|
||||||
// New osu:
|
|
||||||
Ruleset,
|
Ruleset,
|
||||||
Token,
|
Token,
|
||||||
// Imported from old osu:
|
|
||||||
BeatmapDirectory,
|
|
||||||
AllowPublicInvites,
|
|
||||||
AutoChatHide,
|
|
||||||
AutomaticDownload,
|
|
||||||
AutomaticDownloadNoVideo,
|
|
||||||
BlockNonFriendPM,
|
|
||||||
Bloom,
|
|
||||||
BloomSoftening,
|
|
||||||
BossKeyFirstActivation,
|
|
||||||
ChatAudibleHighlight,
|
|
||||||
ChatChannels,
|
|
||||||
ChatFilter,
|
|
||||||
ChatHighlightName,
|
|
||||||
ChatMessageNotification,
|
|
||||||
ChatLastChannel,
|
|
||||||
ChatRemoveForeign,
|
|
||||||
ChatSortMode,
|
|
||||||
ComboBurst,
|
|
||||||
ComboFire,
|
|
||||||
ComboFireHeight,
|
|
||||||
ConfirmExit,
|
|
||||||
AutoSendNowPlaying,
|
|
||||||
MenuCursorSize,
|
MenuCursorSize,
|
||||||
GameplayCursorSize,
|
GameplayCursorSize,
|
||||||
AutomaticCursorSizing,
|
|
||||||
DimLevel,
|
DimLevel,
|
||||||
Display,
|
|
||||||
DisplayCityLocation,
|
|
||||||
DistanceSpacingEnabled,
|
|
||||||
EditorTip,
|
|
||||||
VideoEditor,
|
|
||||||
EditorDefaultSkin,
|
|
||||||
EditorSnakingSliders,
|
|
||||||
EditorHitAnimations,
|
|
||||||
EditorFollowPoints,
|
|
||||||
EditorStacking,
|
|
||||||
ForceSliderRendering,
|
|
||||||
FpsCounter,
|
|
||||||
FrameTimeDisplay,
|
|
||||||
GuideTips,
|
|
||||||
CursorRipple,
|
|
||||||
HighlightWords,
|
|
||||||
HighResolution,
|
|
||||||
HitLighting,
|
|
||||||
IgnoreBarline,
|
|
||||||
IgnoreBeatmapSamples,
|
|
||||||
IgnoreBeatmapSkins,
|
|
||||||
IgnoreList,
|
|
||||||
KeyOverlay,
|
KeyOverlay,
|
||||||
Language,
|
|
||||||
LastPlayMode,
|
|
||||||
AllowNowPlayingHighlights,
|
|
||||||
LastVersion,
|
|
||||||
LastVersionPermissionsFailed,
|
|
||||||
LoadSubmittedThread,
|
|
||||||
LobbyPlayMode,
|
|
||||||
ShowInterface,
|
ShowInterface,
|
||||||
ShowInterfaceDuringRelax,
|
|
||||||
LobbyShowExistingOnly,
|
|
||||||
LobbyShowFriendsOnly,
|
|
||||||
LobbyShowFull,
|
|
||||||
LobbyShowInProgress,
|
|
||||||
LobbyShowPassworded,
|
|
||||||
LogPrivateMessages,
|
|
||||||
LowResolution,
|
|
||||||
ManiaSpeed,
|
|
||||||
UsePerBeatmapManiaSpeed,
|
|
||||||
ManiaSpeedBPMScale,
|
|
||||||
MenuTip,
|
|
||||||
MouseDisableButtons,
|
MouseDisableButtons,
|
||||||
MouseDisableWheel,
|
MouseDisableWheel,
|
||||||
MouseSpeed,
|
|
||||||
AudioOffset,
|
AudioOffset,
|
||||||
ScoreMeterScale,
|
|
||||||
DistanceSpacing,
|
|
||||||
EditorBeatDivisor,
|
|
||||||
EditorGridSize,
|
|
||||||
EditorGridSizeDesign,
|
|
||||||
CustomFrameLimit,
|
|
||||||
MsnIntegration,
|
|
||||||
MyPcSucks,
|
|
||||||
NotifyFriends,
|
|
||||||
NotifySubmittedThread,
|
|
||||||
PopupDuringGameplay,
|
|
||||||
ProgressBarType,
|
|
||||||
RankType,
|
|
||||||
RefreshRate,
|
|
||||||
OverrideRefreshRate,
|
|
||||||
ScaleMode,
|
|
||||||
ScoreboardVisible,
|
|
||||||
ScoreMeter,
|
|
||||||
ScreenshotId,
|
|
||||||
MenuSnow,
|
|
||||||
MenuTriangles,
|
|
||||||
SongSelectThumbnails,
|
|
||||||
ScreenshotFormat,
|
|
||||||
ShowReplayComments,
|
|
||||||
ShowSpectators,
|
|
||||||
ShowStoryboard,
|
|
||||||
Skin,
|
|
||||||
SkinSamples,
|
|
||||||
SkipTablet,
|
|
||||||
SnakingInSliders,
|
|
||||||
SnakingOutSliders,
|
|
||||||
Tablet,
|
|
||||||
UpdatePending,
|
|
||||||
UserFilter,
|
|
||||||
UseSkinCursor,
|
|
||||||
UseTaikoSkin,
|
|
||||||
Video,
|
|
||||||
Wiimote,
|
|
||||||
YahooIntegration,
|
|
||||||
ForceFrameFlush,
|
|
||||||
DetectPerformanceIssues,
|
|
||||||
MenuMusic,
|
MenuMusic,
|
||||||
MenuVoice,
|
MenuVoice,
|
||||||
MenuParallax,
|
MenuParallax,
|
||||||
BeatmapDetailTab,
|
BeatmapDetailTab,
|
||||||
RawInput,
|
|
||||||
AbsoluteToOsuWindow,
|
|
||||||
ConfineMouse,
|
|
||||||
[Obsolete]
|
|
||||||
ConfineMouseToFullscreen,
|
|
||||||
ShowMenuTips,
|
|
||||||
HiddenShowFirstApproach,
|
|
||||||
ComboColourSliderBall,
|
|
||||||
AlternativeChatFont,
|
|
||||||
Username,
|
Username,
|
||||||
DisplayStarsMaximum,
|
|
||||||
DisplayStarsMinimum,
|
|
||||||
AudioDevice,
|
AudioDevice,
|
||||||
ReleaseStream,
|
ReleaseStream,
|
||||||
UpdateFailCount,
|
|
||||||
SavePassword,
|
SavePassword,
|
||||||
SaveUsername,
|
SaveUsername,
|
||||||
TreeSortMode,
|
DisplayStarsMinimum,
|
||||||
TreeSortMode2,
|
DisplayStarsMaximum,
|
||||||
PermanentSongInfo,
|
SnakingInSliders,
|
||||||
Ticker,
|
SnakingOutSliders
|
||||||
CompatibilityContext,
|
|
||||||
CanForceOptimusCompatibility,
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,18 +0,0 @@
|
|||||||
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
|
|
||||||
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
|
|
||||||
|
|
||||||
using System.ComponentModel;
|
|
||||||
|
|
||||||
namespace osu.Game.Configuration
|
|
||||||
{
|
|
||||||
public enum ProgressBarType
|
|
||||||
{
|
|
||||||
Off,
|
|
||||||
Pie,
|
|
||||||
[Description("Top Right")]
|
|
||||||
TopRight,
|
|
||||||
[Description("Bottom Right")]
|
|
||||||
BottomRight,
|
|
||||||
Bottom
|
|
||||||
}
|
|
||||||
}
|
|
@ -4,8 +4,6 @@
|
|||||||
using osu.Framework.Allocation;
|
using osu.Framework.Allocation;
|
||||||
using osu.Framework.Audio;
|
using osu.Framework.Audio;
|
||||||
using osu.Framework.Graphics;
|
using osu.Framework.Graphics;
|
||||||
using osu.Game.Configuration;
|
|
||||||
using osu.Game.Graphics.UserInterface;
|
|
||||||
|
|
||||||
namespace osu.Game.Overlays.Options.Sections.Audio
|
namespace osu.Game.Overlays.Options.Sections.Audio
|
||||||
{
|
{
|
||||||
@ -14,18 +12,13 @@ namespace osu.Game.Overlays.Options.Sections.Audio
|
|||||||
protected override string Header => "Volume";
|
protected override string Header => "Volume";
|
||||||
|
|
||||||
[BackgroundDependencyLoader]
|
[BackgroundDependencyLoader]
|
||||||
private void load(OsuConfigManager config, AudioManager audio)
|
private void load(AudioManager audio)
|
||||||
{
|
{
|
||||||
Children = new Drawable[]
|
Children = new Drawable[]
|
||||||
{
|
{
|
||||||
new OptionSlider<double> { LabelText = "Master", Bindable = audio.Volume },
|
new OptionSlider<double> { LabelText = "Master", Bindable = audio.Volume },
|
||||||
new OptionSlider<double> { LabelText = "Effect", Bindable = audio.VolumeSample },
|
new OptionSlider<double> { LabelText = "Effect", Bindable = audio.VolumeSample },
|
||||||
new OptionSlider<double> { LabelText = "Music", Bindable = audio.VolumeTrack },
|
new OptionSlider<double> { LabelText = "Music", Bindable = audio.VolumeTrack },
|
||||||
new OsuCheckbox
|
|
||||||
{
|
|
||||||
LabelText = "Ignore beatmap hitsounds",
|
|
||||||
Bindable = config.GetBindable<bool>(OsuConfig.IgnoreBeatmapSamples)
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,58 +0,0 @@
|
|||||||
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
|
|
||||||
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
|
|
||||||
|
|
||||||
using osu.Framework.Allocation;
|
|
||||||
using osu.Framework.Graphics;
|
|
||||||
using osu.Game.Configuration;
|
|
||||||
using osu.Game.Graphics;
|
|
||||||
using osu.Game.Graphics.UserInterface;
|
|
||||||
using OpenTK;
|
|
||||||
|
|
||||||
namespace osu.Game.Overlays.Options.Sections
|
|
||||||
{
|
|
||||||
public class EditorSection : OptionsSection
|
|
||||||
{
|
|
||||||
public override string Header => "Editor";
|
|
||||||
public override FontAwesome Icon => FontAwesome.fa_pencil;
|
|
||||||
|
|
||||||
[BackgroundDependencyLoader]
|
|
||||||
private void load(OsuConfigManager config)
|
|
||||||
{
|
|
||||||
FlowContent.Spacing = new Vector2(0, 5);
|
|
||||||
Children = new Drawable[]
|
|
||||||
{
|
|
||||||
new OsuCheckbox
|
|
||||||
{
|
|
||||||
LabelText = "Background video",
|
|
||||||
Bindable = config.GetBindable<bool>(OsuConfig.VideoEditor)
|
|
||||||
},
|
|
||||||
new OsuCheckbox
|
|
||||||
{
|
|
||||||
LabelText = "Always use default skin",
|
|
||||||
Bindable = config.GetBindable<bool>(OsuConfig.EditorDefaultSkin)
|
|
||||||
},
|
|
||||||
new OsuCheckbox
|
|
||||||
{
|
|
||||||
LabelText = "Snaking sliders",
|
|
||||||
Bindable = config.GetBindable<bool>(OsuConfig.EditorSnakingSliders)
|
|
||||||
},
|
|
||||||
new OsuCheckbox
|
|
||||||
{
|
|
||||||
LabelText = "Hit animations",
|
|
||||||
Bindable = config.GetBindable<bool>(OsuConfig.EditorHitAnimations)
|
|
||||||
},
|
|
||||||
new OsuCheckbox
|
|
||||||
{
|
|
||||||
LabelText = "Follow points",
|
|
||||||
Bindable = config.GetBindable<bool>(OsuConfig.EditorFollowPoints)
|
|
||||||
},
|
|
||||||
new OsuCheckbox
|
|
||||||
{
|
|
||||||
LabelText = "Stacking",
|
|
||||||
Bindable = config.GetBindable<bool>(OsuConfig.EditorStacking)
|
|
||||||
},
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -22,21 +22,6 @@ namespace osu.Game.Overlays.Options.Sections.Gameplay
|
|||||||
LabelText = "Background dim",
|
LabelText = "Background dim",
|
||||||
Bindable = config.GetBindable<double>(OsuConfig.DimLevel)
|
Bindable = config.GetBindable<double>(OsuConfig.DimLevel)
|
||||||
},
|
},
|
||||||
new OptionEnumDropdown<ProgressBarType>
|
|
||||||
{
|
|
||||||
LabelText = "Progress display",
|
|
||||||
Bindable = config.GetBindable<ProgressBarType>(OsuConfig.ProgressBarType)
|
|
||||||
},
|
|
||||||
new OptionEnumDropdown<ScoreMeterType>
|
|
||||||
{
|
|
||||||
LabelText = "Score meter type",
|
|
||||||
Bindable = config.GetBindable<ScoreMeterType>(OsuConfig.ScoreMeter)
|
|
||||||
},
|
|
||||||
new OptionSlider<double>
|
|
||||||
{
|
|
||||||
LabelText = "Score meter size",
|
|
||||||
Bindable = config.GetBindable<double>(OsuConfig.ScoreMeterScale)
|
|
||||||
},
|
|
||||||
new OsuCheckbox
|
new OsuCheckbox
|
||||||
{
|
{
|
||||||
LabelText = "Show score overlay",
|
LabelText = "Show score overlay",
|
||||||
@ -47,21 +32,6 @@ namespace osu.Game.Overlays.Options.Sections.Gameplay
|
|||||||
LabelText = "Always show key overlay",
|
LabelText = "Always show key overlay",
|
||||||
Bindable = config.GetBindable<bool>(OsuConfig.KeyOverlay)
|
Bindable = config.GetBindable<bool>(OsuConfig.KeyOverlay)
|
||||||
},
|
},
|
||||||
new OsuCheckbox
|
|
||||||
{
|
|
||||||
LabelText = "Show approach circle on first \"Hidden\" object",
|
|
||||||
Bindable = config.GetBindable<bool>(OsuConfig.HiddenShowFirstApproach)
|
|
||||||
},
|
|
||||||
new OsuCheckbox
|
|
||||||
{
|
|
||||||
LabelText = "Scale osu!mania scroll speed with BPM",
|
|
||||||
Bindable = config.GetBindable<bool>(OsuConfig.ManiaSpeedBPMScale)
|
|
||||||
},
|
|
||||||
new OsuCheckbox
|
|
||||||
{
|
|
||||||
LabelText = "Remember osu!mania scroll speed per beatmap",
|
|
||||||
Bindable = config.GetBindable<bool>(OsuConfig.UsePerBeatmapManiaSpeed)
|
|
||||||
},
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -4,7 +4,6 @@
|
|||||||
using osu.Framework.Allocation;
|
using osu.Framework.Allocation;
|
||||||
using osu.Framework.Configuration;
|
using osu.Framework.Configuration;
|
||||||
using osu.Framework.Graphics;
|
using osu.Framework.Graphics;
|
||||||
using osu.Game.Configuration;
|
|
||||||
using osu.Game.Graphics.UserInterface;
|
using osu.Game.Graphics.UserInterface;
|
||||||
|
|
||||||
namespace osu.Game.Overlays.Options.Sections.General
|
namespace osu.Game.Overlays.Options.Sections.General
|
||||||
@ -14,21 +13,15 @@ namespace osu.Game.Overlays.Options.Sections.General
|
|||||||
protected override string Header => "Language";
|
protected override string Header => "Language";
|
||||||
|
|
||||||
[BackgroundDependencyLoader]
|
[BackgroundDependencyLoader]
|
||||||
private void load(OsuConfigManager osuConfig, FrameworkConfigManager frameworkConfig)
|
private void load(FrameworkConfigManager frameworkConfig)
|
||||||
{
|
{
|
||||||
Children = new Drawable[]
|
Children = new Drawable[]
|
||||||
{
|
{
|
||||||
new OptionLabel { Text = "TODO: Dropdown" },
|
|
||||||
new OsuCheckbox
|
new OsuCheckbox
|
||||||
{
|
{
|
||||||
LabelText = "Prefer metadata in original language",
|
LabelText = "Prefer metadata in original language",
|
||||||
Bindable = frameworkConfig.GetBindable<bool>(FrameworkConfig.ShowUnicode)
|
Bindable = frameworkConfig.GetBindable<bool>(FrameworkConfig.ShowUnicode)
|
||||||
},
|
},
|
||||||
new OsuCheckbox
|
|
||||||
{
|
|
||||||
LabelText = "Use alternative font for chat display",
|
|
||||||
Bindable = osuConfig.GetBindable<bool>(OsuConfig.AlternativeChatFont)
|
|
||||||
},
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -27,41 +27,6 @@ namespace osu.Game.Overlays.Options.Sections.Graphics
|
|||||||
LabelText = "Snaking out sliders",
|
LabelText = "Snaking out sliders",
|
||||||
Bindable = config.GetBindable<bool>(OsuConfig.SnakingOutSliders)
|
Bindable = config.GetBindable<bool>(OsuConfig.SnakingOutSliders)
|
||||||
},
|
},
|
||||||
new OsuCheckbox
|
|
||||||
{
|
|
||||||
LabelText = "Background video",
|
|
||||||
Bindable = config.GetBindable<bool>(OsuConfig.Video)
|
|
||||||
},
|
|
||||||
new OsuCheckbox
|
|
||||||
{
|
|
||||||
LabelText = "Storyboards",
|
|
||||||
Bindable = config.GetBindable<bool>(OsuConfig.ShowStoryboard)
|
|
||||||
},
|
|
||||||
new OsuCheckbox
|
|
||||||
{
|
|
||||||
LabelText = "Combo bursts",
|
|
||||||
Bindable = config.GetBindable<bool>(OsuConfig.ComboBurst)
|
|
||||||
},
|
|
||||||
new OsuCheckbox
|
|
||||||
{
|
|
||||||
LabelText = "Hit lighting",
|
|
||||||
Bindable = config.GetBindable<bool>(OsuConfig.HitLighting)
|
|
||||||
},
|
|
||||||
new OsuCheckbox
|
|
||||||
{
|
|
||||||
LabelText = "Shaders",
|
|
||||||
Bindable = config.GetBindable<bool>(OsuConfig.Bloom)
|
|
||||||
},
|
|
||||||
new OsuCheckbox
|
|
||||||
{
|
|
||||||
LabelText = "Softening filter",
|
|
||||||
Bindable = config.GetBindable<bool>(OsuConfig.BloomSoftening)
|
|
||||||
},
|
|
||||||
new OptionEnumDropdown<ScreenshotFormat>
|
|
||||||
{
|
|
||||||
LabelText = "Screenshot",
|
|
||||||
Bindable = config.GetBindable<ScreenshotFormat>(OsuConfig.ScreenshotFormat)
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -24,7 +24,6 @@ namespace osu.Game.Overlays.Options.Sections.Graphics
|
|||||||
|
|
||||||
Children = new Drawable[]
|
Children = new Drawable[]
|
||||||
{
|
{
|
||||||
new OptionLabel { Text = "Resolution: TODO dropdown" },
|
|
||||||
new OptionEnumDropdown<WindowMode>
|
new OptionEnumDropdown<WindowMode>
|
||||||
{
|
{
|
||||||
LabelText = "Screen mode",
|
LabelText = "Screen mode",
|
||||||
|
@ -9,28 +9,18 @@ namespace osu.Game.Overlays.Options.Sections.Graphics
|
|||||||
{
|
{
|
||||||
public class MainMenuOptions : OptionsSubsection
|
public class MainMenuOptions : OptionsSubsection
|
||||||
{
|
{
|
||||||
protected override string Header => "Main Menu";
|
protected override string Header => "User Interface";
|
||||||
|
|
||||||
[BackgroundDependencyLoader]
|
[BackgroundDependencyLoader]
|
||||||
private void load(OsuConfigManager config)
|
private void load(OsuConfigManager config)
|
||||||
{
|
{
|
||||||
Children = new[]
|
Children = new[]
|
||||||
{
|
{
|
||||||
new OsuCheckbox
|
|
||||||
{
|
|
||||||
LabelText = "Snow",
|
|
||||||
Bindable = config.GetBindable<bool>(OsuConfig.MenuSnow)
|
|
||||||
},
|
|
||||||
new OsuCheckbox
|
new OsuCheckbox
|
||||||
{
|
{
|
||||||
LabelText = "Parallax",
|
LabelText = "Parallax",
|
||||||
Bindable = config.GetBindable<bool>(OsuConfig.MenuParallax)
|
Bindable = config.GetBindable<bool>(OsuConfig.MenuParallax)
|
||||||
},
|
},
|
||||||
new OsuCheckbox
|
|
||||||
{
|
|
||||||
LabelText = "Menu tips",
|
|
||||||
Bindable = config.GetBindable<bool>(OsuConfig.ShowMenuTips)
|
|
||||||
},
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -4,8 +4,6 @@
|
|||||||
using osu.Framework.Allocation;
|
using osu.Framework.Allocation;
|
||||||
using osu.Framework.Configuration;
|
using osu.Framework.Configuration;
|
||||||
using osu.Framework.Graphics;
|
using osu.Framework.Graphics;
|
||||||
using osu.Game.Configuration;
|
|
||||||
using osu.Game.Graphics.UserInterface;
|
|
||||||
|
|
||||||
namespace osu.Game.Overlays.Options.Sections.Graphics
|
namespace osu.Game.Overlays.Options.Sections.Graphics
|
||||||
{
|
{
|
||||||
@ -14,7 +12,7 @@ namespace osu.Game.Overlays.Options.Sections.Graphics
|
|||||||
protected override string Header => "Renderer";
|
protected override string Header => "Renderer";
|
||||||
|
|
||||||
[BackgroundDependencyLoader]
|
[BackgroundDependencyLoader]
|
||||||
private void load(OsuConfigManager osuConfig, FrameworkConfigManager config)
|
private void load(FrameworkConfigManager config)
|
||||||
{
|
{
|
||||||
// NOTE: Compatability mode omitted
|
// NOTE: Compatability mode omitted
|
||||||
Children = new Drawable[]
|
Children = new Drawable[]
|
||||||
@ -25,21 +23,6 @@ namespace osu.Game.Overlays.Options.Sections.Graphics
|
|||||||
LabelText = "Frame limiter",
|
LabelText = "Frame limiter",
|
||||||
Bindable = config.GetBindable<FrameSync>(FrameworkConfig.FrameSync)
|
Bindable = config.GetBindable<FrameSync>(FrameworkConfig.FrameSync)
|
||||||
},
|
},
|
||||||
new OsuCheckbox
|
|
||||||
{
|
|
||||||
LabelText = "Show FPS counter",
|
|
||||||
Bindable = osuConfig.GetBindable<bool>(OsuConfig.FpsCounter),
|
|
||||||
},
|
|
||||||
new OsuCheckbox
|
|
||||||
{
|
|
||||||
LabelText = "Reduce dropped frames",
|
|
||||||
Bindable = osuConfig.GetBindable<bool>(OsuConfig.ForceFrameFlush),
|
|
||||||
},
|
|
||||||
new OsuCheckbox
|
|
||||||
{
|
|
||||||
LabelText = "Detect performance issues",
|
|
||||||
Bindable = osuConfig.GetBindable<bool>(OsuConfig.DetectPerformanceIssues),
|
|
||||||
},
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,27 +0,0 @@
|
|||||||
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
|
|
||||||
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
|
|
||||||
|
|
||||||
using osu.Framework.Allocation;
|
|
||||||
using osu.Game.Configuration;
|
|
||||||
using osu.Game.Graphics.UserInterface;
|
|
||||||
|
|
||||||
namespace osu.Game.Overlays.Options.Sections.Graphics
|
|
||||||
{
|
|
||||||
public class SongSelectGraphicsOptions : OptionsSubsection
|
|
||||||
{
|
|
||||||
protected override string Header => "Song Select";
|
|
||||||
|
|
||||||
[BackgroundDependencyLoader]
|
|
||||||
private void load(OsuConfigManager config)
|
|
||||||
{
|
|
||||||
Children = new[]
|
|
||||||
{
|
|
||||||
new OsuCheckbox
|
|
||||||
{
|
|
||||||
LabelText = "Show thumbnails",
|
|
||||||
Bindable = config.GetBindable<bool>(OsuConfig.SongSelectThumbnails)
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@ -20,7 +20,6 @@ namespace osu.Game.Overlays.Options.Sections
|
|||||||
new LayoutOptions(),
|
new LayoutOptions(),
|
||||||
new DetailOptions(),
|
new DetailOptions(),
|
||||||
new MainMenuOptions(),
|
new MainMenuOptions(),
|
||||||
new SongSelectGraphicsOptions(),
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -17,13 +17,8 @@ namespace osu.Game.Overlays.Options.Sections.Input
|
|||||||
new OsuButton
|
new OsuButton
|
||||||
{
|
{
|
||||||
RelativeSizeAxes = Axes.X,
|
RelativeSizeAxes = Axes.X,
|
||||||
Text = "Change keyboard bindings"
|
Text = "Key Configuration"
|
||||||
},
|
},
|
||||||
new OsuButton
|
|
||||||
{
|
|
||||||
RelativeSizeAxes = Axes.X,
|
|
||||||
Text = "osu!mania layout"
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -19,21 +19,6 @@ namespace osu.Game.Overlays.Options.Sections.Input
|
|||||||
{
|
{
|
||||||
Children = new Drawable[]
|
Children = new Drawable[]
|
||||||
{
|
{
|
||||||
new OptionSlider<double, SensitivitySlider>
|
|
||||||
{
|
|
||||||
LabelText = "Sensitivity",
|
|
||||||
Bindable = osuConfig.GetBindable<double>(OsuConfig.MouseSpeed)
|
|
||||||
},
|
|
||||||
new OsuCheckbox
|
|
||||||
{
|
|
||||||
LabelText = "Raw input",
|
|
||||||
Bindable = osuConfig.GetBindable<bool>(OsuConfig.RawInput)
|
|
||||||
},
|
|
||||||
new OsuCheckbox
|
|
||||||
{
|
|
||||||
LabelText = "Map absolute raw input to the osu! window",
|
|
||||||
Bindable = osuConfig.GetBindable<bool>(OsuConfig.AbsoluteToOsuWindow)
|
|
||||||
},
|
|
||||||
new OptionEnumDropdown<ConfineMouseMode>
|
new OptionEnumDropdown<ConfineMouseMode>
|
||||||
{
|
{
|
||||||
LabelText = "Confine mouse cursor",
|
LabelText = "Confine mouse cursor",
|
||||||
@ -49,11 +34,6 @@ namespace osu.Game.Overlays.Options.Sections.Input
|
|||||||
LabelText = "Disable mouse buttons during gameplay",
|
LabelText = "Disable mouse buttons during gameplay",
|
||||||
Bindable = osuConfig.GetBindable<bool>(OsuConfig.MouseDisableButtons)
|
Bindable = osuConfig.GetBindable<bool>(OsuConfig.MouseDisableButtons)
|
||||||
},
|
},
|
||||||
new OsuCheckbox
|
|
||||||
{
|
|
||||||
LabelText = "Cursor ripples",
|
|
||||||
Bindable = osuConfig.GetBindable<bool>(OsuConfig.CursorRipple)
|
|
||||||
},
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,34 +0,0 @@
|
|||||||
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
|
|
||||||
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
|
|
||||||
|
|
||||||
using osu.Framework.Allocation;
|
|
||||||
using osu.Framework.Graphics;
|
|
||||||
using osu.Game.Configuration;
|
|
||||||
using osu.Game.Graphics.UserInterface;
|
|
||||||
|
|
||||||
namespace osu.Game.Overlays.Options.Sections.Input
|
|
||||||
{
|
|
||||||
public class OtherInputOptions : OptionsSubsection
|
|
||||||
{
|
|
||||||
protected override string Header => "Other";
|
|
||||||
|
|
||||||
[BackgroundDependencyLoader]
|
|
||||||
private void load(OsuConfigManager config)
|
|
||||||
{
|
|
||||||
Children = new Drawable[]
|
|
||||||
{
|
|
||||||
new OsuCheckbox
|
|
||||||
{
|
|
||||||
LabelText = "OS TabletPC support",
|
|
||||||
Bindable = config.GetBindable<bool>(OsuConfig.Tablet)
|
|
||||||
},
|
|
||||||
new OsuCheckbox
|
|
||||||
{
|
|
||||||
LabelText = "Wiimote/TaTaCon Drum Support",
|
|
||||||
Bindable = config.GetBindable<bool>(OsuConfig.Wiimote)
|
|
||||||
},
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -18,7 +18,6 @@ namespace osu.Game.Overlays.Options.Sections
|
|||||||
{
|
{
|
||||||
new MouseOptions(),
|
new MouseOptions(),
|
||||||
new KeyboardOptions(),
|
new KeyboardOptions(),
|
||||||
new OtherInputOptions(),
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -3,7 +3,6 @@
|
|||||||
|
|
||||||
using osu.Framework.Graphics;
|
using osu.Framework.Graphics;
|
||||||
using osu.Game.Graphics;
|
using osu.Game.Graphics;
|
||||||
using osu.Game.Graphics.UserInterface;
|
|
||||||
using OpenTK;
|
using OpenTK;
|
||||||
|
|
||||||
namespace osu.Game.Overlays.Options.Sections
|
namespace osu.Game.Overlays.Options.Sections
|
||||||
@ -18,26 +17,7 @@ namespace osu.Game.Overlays.Options.Sections
|
|||||||
FlowContent.Spacing = new Vector2(0, 5);
|
FlowContent.Spacing = new Vector2(0, 5);
|
||||||
Children = new Drawable[]
|
Children = new Drawable[]
|
||||||
{
|
{
|
||||||
new OsuButton
|
|
||||||
{
|
|
||||||
RelativeSizeAxes = Axes.X,
|
|
||||||
Text = "Delete all unranked maps",
|
|
||||||
},
|
|
||||||
new OsuButton
|
|
||||||
{
|
|
||||||
RelativeSizeAxes = Axes.X,
|
|
||||||
Text = "Repair folder permissions",
|
|
||||||
},
|
|
||||||
new OsuButton
|
|
||||||
{
|
|
||||||
RelativeSizeAxes = Axes.X,
|
|
||||||
Text = "Mark all maps as played",
|
|
||||||
},
|
|
||||||
new OsuButton
|
|
||||||
{
|
|
||||||
RelativeSizeAxes = Axes.X,
|
|
||||||
Text = "Run osu! updater",
|
|
||||||
},
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,53 +0,0 @@
|
|||||||
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
|
|
||||||
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
|
|
||||||
|
|
||||||
using osu.Framework.Allocation;
|
|
||||||
using osu.Framework.Graphics;
|
|
||||||
using osu.Game.Configuration;
|
|
||||||
using osu.Game.Graphics.UserInterface;
|
|
||||||
|
|
||||||
namespace osu.Game.Overlays.Options.Sections.Online
|
|
||||||
{
|
|
||||||
public class InGameChatOptions : OptionsSubsection
|
|
||||||
{
|
|
||||||
protected override string Header => "Chat";
|
|
||||||
|
|
||||||
[BackgroundDependencyLoader]
|
|
||||||
private void load(OsuConfigManager config)
|
|
||||||
{
|
|
||||||
Children = new Drawable[]
|
|
||||||
{
|
|
||||||
new OsuCheckbox
|
|
||||||
{
|
|
||||||
LabelText = "Filter offensive words",
|
|
||||||
Bindable = config.GetBindable<bool>(OsuConfig.ChatFilter)
|
|
||||||
},
|
|
||||||
new OsuCheckbox
|
|
||||||
{
|
|
||||||
LabelText = "Filter foreign characters",
|
|
||||||
Bindable = config.GetBindable<bool>(OsuConfig.ChatRemoveForeign)
|
|
||||||
},
|
|
||||||
new OsuCheckbox
|
|
||||||
{
|
|
||||||
LabelText = "Log private messages",
|
|
||||||
Bindable = config.GetBindable<bool>(OsuConfig.LogPrivateMessages)
|
|
||||||
},
|
|
||||||
new OsuCheckbox
|
|
||||||
{
|
|
||||||
LabelText = "Block private messages from non-friends",
|
|
||||||
Bindable = config.GetBindable<bool>(OsuConfig.BlockNonFriendPM)
|
|
||||||
},
|
|
||||||
new OptionLabel { Text = "Chat ignore list (space-seperated list)" },
|
|
||||||
new OptionTextBox {
|
|
||||||
RelativeSizeAxes = Axes.X,
|
|
||||||
Bindable = config.GetBindable<string>(OsuConfig.IgnoreList)
|
|
||||||
},
|
|
||||||
new OptionLabel { Text = "Chat highlight words (space-seperated list)" },
|
|
||||||
new OptionTextBox {
|
|
||||||
RelativeSizeAxes = Axes.X,
|
|
||||||
Bindable = config.GetBindable<string>(OsuConfig.HighlightWords)
|
|
||||||
},
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,43 +0,0 @@
|
|||||||
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
|
|
||||||
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
|
|
||||||
|
|
||||||
using osu.Framework.Allocation;
|
|
||||||
using osu.Framework.Graphics;
|
|
||||||
using osu.Game.Configuration;
|
|
||||||
using osu.Game.Graphics.UserInterface;
|
|
||||||
|
|
||||||
namespace osu.Game.Overlays.Options.Sections.Online
|
|
||||||
{
|
|
||||||
public class IntegrationOptions : OptionsSubsection
|
|
||||||
{
|
|
||||||
protected override string Header => "Integration";
|
|
||||||
|
|
||||||
[BackgroundDependencyLoader]
|
|
||||||
private void load(OsuConfigManager config)
|
|
||||||
{
|
|
||||||
Children = new Drawable[]
|
|
||||||
{
|
|
||||||
new OsuCheckbox
|
|
||||||
{
|
|
||||||
LabelText = "Integrate with Yahoo! status display",
|
|
||||||
Bindable = config.GetBindable<bool>(OsuConfig.YahooIntegration)
|
|
||||||
},
|
|
||||||
new OsuCheckbox
|
|
||||||
{
|
|
||||||
LabelText = "Integrate with MSN Live status display",
|
|
||||||
Bindable = config.GetBindable<bool>(OsuConfig.MsnIntegration)
|
|
||||||
},
|
|
||||||
new OsuCheckbox
|
|
||||||
{
|
|
||||||
LabelText = "Automatically start osu!direct downloads",
|
|
||||||
Bindable = config.GetBindable<bool>(OsuConfig.AutomaticDownload)
|
|
||||||
},
|
|
||||||
new OsuCheckbox
|
|
||||||
{
|
|
||||||
LabelText = "Prefer no-video downloads",
|
|
||||||
Bindable = config.GetBindable<bool>(OsuConfig.AutomaticDownloadNoVideo)
|
|
||||||
},
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,53 +0,0 @@
|
|||||||
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
|
|
||||||
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
|
|
||||||
|
|
||||||
using osu.Framework.Allocation;
|
|
||||||
using osu.Framework.Graphics;
|
|
||||||
using osu.Game.Configuration;
|
|
||||||
using osu.Game.Graphics.UserInterface;
|
|
||||||
|
|
||||||
namespace osu.Game.Overlays.Options.Sections.Online
|
|
||||||
{
|
|
||||||
public class NotificationsOptions : OptionsSubsection
|
|
||||||
{
|
|
||||||
protected override string Header => "Notifications";
|
|
||||||
|
|
||||||
[BackgroundDependencyLoader]
|
|
||||||
private void load(OsuConfigManager config)
|
|
||||||
{
|
|
||||||
Children = new Drawable[]
|
|
||||||
{
|
|
||||||
new OsuCheckbox
|
|
||||||
{
|
|
||||||
LabelText = "Enable chat ticker",
|
|
||||||
Bindable = config.GetBindable<bool>(OsuConfig.Ticker)
|
|
||||||
},
|
|
||||||
new OsuCheckbox
|
|
||||||
{
|
|
||||||
LabelText = "Show a notification popup when someone says your name",
|
|
||||||
Bindable = config.GetBindable<bool>(OsuConfig.ChatHighlightName)
|
|
||||||
},
|
|
||||||
new OsuCheckbox
|
|
||||||
{
|
|
||||||
LabelText = "Show chat message notifications",
|
|
||||||
Bindable = config.GetBindable<bool>(OsuConfig.ChatMessageNotification)
|
|
||||||
},
|
|
||||||
new OsuCheckbox
|
|
||||||
{
|
|
||||||
LabelText = "Play a sound when someone says your name",
|
|
||||||
Bindable = config.GetBindable<bool>(OsuConfig.ChatAudibleHighlight)
|
|
||||||
},
|
|
||||||
new OsuCheckbox
|
|
||||||
{
|
|
||||||
LabelText = "Show notification popups instantly during gameplay",
|
|
||||||
Bindable = config.GetBindable<bool>(OsuConfig.PopupDuringGameplay)
|
|
||||||
},
|
|
||||||
new OsuCheckbox
|
|
||||||
{
|
|
||||||
LabelText = "Show notification popups when friends change status",
|
|
||||||
Bindable = config.GetBindable<bool>(OsuConfig.NotifyFriends)
|
|
||||||
},
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,33 +0,0 @@
|
|||||||
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
|
|
||||||
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
|
|
||||||
|
|
||||||
using osu.Framework.Allocation;
|
|
||||||
using osu.Framework.Graphics;
|
|
||||||
using osu.Game.Configuration;
|
|
||||||
using osu.Game.Graphics.UserInterface;
|
|
||||||
|
|
||||||
namespace osu.Game.Overlays.Options.Sections.Online
|
|
||||||
{
|
|
||||||
public class PrivacyOptions : OptionsSubsection
|
|
||||||
{
|
|
||||||
protected override string Header => "Privacy";
|
|
||||||
|
|
||||||
[BackgroundDependencyLoader]
|
|
||||||
private void load(OsuConfigManager config)
|
|
||||||
{
|
|
||||||
Children = new Drawable[]
|
|
||||||
{
|
|
||||||
new OsuCheckbox
|
|
||||||
{
|
|
||||||
LabelText = "Share your city location with others",
|
|
||||||
Bindable = config.GetBindable<bool>(OsuConfig.DisplayCityLocation)
|
|
||||||
},
|
|
||||||
new OsuCheckbox
|
|
||||||
{
|
|
||||||
LabelText = "Allow multiplayer game invites from all users",
|
|
||||||
Bindable = config.GetBindable<bool>(OsuConfig.AllowPublicInvites)
|
|
||||||
},
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@ -3,7 +3,6 @@
|
|||||||
|
|
||||||
using osu.Framework.Graphics;
|
using osu.Framework.Graphics;
|
||||||
using osu.Game.Graphics;
|
using osu.Game.Graphics;
|
||||||
using osu.Game.Overlays.Options.Sections.Online;
|
|
||||||
|
|
||||||
namespace osu.Game.Overlays.Options.Sections
|
namespace osu.Game.Overlays.Options.Sections
|
||||||
{
|
{
|
||||||
@ -16,10 +15,6 @@ namespace osu.Game.Overlays.Options.Sections
|
|||||||
{
|
{
|
||||||
Children = new Drawable[]
|
Children = new Drawable[]
|
||||||
{
|
{
|
||||||
new InGameChatOptions(),
|
|
||||||
new PrivacyOptions(),
|
|
||||||
new NotificationsOptions(),
|
|
||||||
new IntegrationOptions(),
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -21,43 +21,6 @@ namespace osu.Game.Overlays.Options.Sections
|
|||||||
FlowContent.Spacing = new Vector2(0, 5);
|
FlowContent.Spacing = new Vector2(0, 5);
|
||||||
Children = new Drawable[]
|
Children = new Drawable[]
|
||||||
{
|
{
|
||||||
new OptionLabel { Text = "TODO: Skin preview textures" },
|
|
||||||
new OptionLabel { Text = "Current skin: TODO dropdown" },
|
|
||||||
new OsuButton
|
|
||||||
{
|
|
||||||
RelativeSizeAxes = Axes.X,
|
|
||||||
Text = "Preview gameplay",
|
|
||||||
},
|
|
||||||
new OsuButton
|
|
||||||
{
|
|
||||||
RelativeSizeAxes = Axes.X,
|
|
||||||
Text = "Open skin folder",
|
|
||||||
},
|
|
||||||
new OsuButton
|
|
||||||
{
|
|
||||||
RelativeSizeAxes = Axes.X,
|
|
||||||
Text = "Export as .osk",
|
|
||||||
},
|
|
||||||
new OsuCheckbox
|
|
||||||
{
|
|
||||||
LabelText = "Ignore all beatmap skins",
|
|
||||||
Bindable = config.GetBindable<bool>(OsuConfig.IgnoreBeatmapSkins)
|
|
||||||
},
|
|
||||||
new OsuCheckbox
|
|
||||||
{
|
|
||||||
LabelText = "Use skin's sound samples",
|
|
||||||
Bindable = config.GetBindable<bool>(OsuConfig.SkinSamples)
|
|
||||||
},
|
|
||||||
new OsuCheckbox
|
|
||||||
{
|
|
||||||
LabelText = "Use Taiko skin for Taiko mode",
|
|
||||||
Bindable = config.GetBindable<bool>(OsuConfig.UseTaikoSkin)
|
|
||||||
},
|
|
||||||
new OsuCheckbox
|
|
||||||
{
|
|
||||||
LabelText = "Always use skin cursor",
|
|
||||||
Bindable = config.GetBindable<bool>(OsuConfig.UseSkinCursor)
|
|
||||||
},
|
|
||||||
new OptionSlider<double, SizeSlider>
|
new OptionSlider<double, SizeSlider>
|
||||||
{
|
{
|
||||||
LabelText = "Menu cursor size",
|
LabelText = "Menu cursor size",
|
||||||
@ -68,11 +31,6 @@ namespace osu.Game.Overlays.Options.Sections
|
|||||||
LabelText = "Gameplay cursor size",
|
LabelText = "Gameplay cursor size",
|
||||||
Bindable = config.GetBindable<double>(OsuConfig.GameplayCursorSize)
|
Bindable = config.GetBindable<double>(OsuConfig.GameplayCursorSize)
|
||||||
},
|
},
|
||||||
new OsuCheckbox
|
|
||||||
{
|
|
||||||
LabelText = "Automatic cursor size",
|
|
||||||
Bindable = config.GetBindable<bool>(OsuConfig.AutomaticCursorSizing)
|
|
||||||
},
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -51,7 +51,6 @@ namespace osu.Game.Overlays
|
|||||||
new AudioSection(),
|
new AudioSection(),
|
||||||
new SkinSection(),
|
new SkinSection(),
|
||||||
new InputSection(),
|
new InputSection(),
|
||||||
new EditorSection(),
|
|
||||||
new OnlineSection(),
|
new OnlineSection(),
|
||||||
new MaintenanceSection(),
|
new MaintenanceSection(),
|
||||||
new DebugSection(),
|
new DebugSection(),
|
||||||
|
@ -356,7 +356,6 @@
|
|||||||
<Compile Include="Overlays\Options\Sections\Graphics\LayoutOptions.cs" />
|
<Compile Include="Overlays\Options\Sections\Graphics\LayoutOptions.cs" />
|
||||||
<Compile Include="Overlays\Options\Sections\Graphics\DetailOptions.cs" />
|
<Compile Include="Overlays\Options\Sections\Graphics\DetailOptions.cs" />
|
||||||
<Compile Include="Overlays\Options\Sections\Graphics\MainMenuOptions.cs" />
|
<Compile Include="Overlays\Options\Sections\Graphics\MainMenuOptions.cs" />
|
||||||
<Compile Include="Overlays\Options\Sections\Graphics\SongSelectGraphicsOptions.cs" />
|
|
||||||
<Compile Include="Overlays\Options\Sections\GameplaySection.cs" />
|
<Compile Include="Overlays\Options\Sections\GameplaySection.cs" />
|
||||||
<Compile Include="Overlays\Options\Sections\Gameplay\GeneralOptions.cs" />
|
<Compile Include="Overlays\Options\Sections\Gameplay\GeneralOptions.cs" />
|
||||||
<Compile Include="Overlays\Options\Sections\Gameplay\SongSelectOptions.cs" />
|
<Compile Include="Overlays\Options\Sections\Gameplay\SongSelectOptions.cs" />
|
||||||
@ -367,19 +366,12 @@
|
|||||||
<Compile Include="Overlays\Options\Sections\InputSection.cs" />
|
<Compile Include="Overlays\Options\Sections\InputSection.cs" />
|
||||||
<Compile Include="Overlays\Options\Sections\Input\MouseOptions.cs" />
|
<Compile Include="Overlays\Options\Sections\Input\MouseOptions.cs" />
|
||||||
<Compile Include="Overlays\Options\Sections\Input\KeyboardOptions.cs" />
|
<Compile Include="Overlays\Options\Sections\Input\KeyboardOptions.cs" />
|
||||||
<Compile Include="Overlays\Options\Sections\Input\OtherInputOptions.cs" />
|
|
||||||
<Compile Include="Overlays\Options\Sections\OnlineSection.cs" />
|
<Compile Include="Overlays\Options\Sections\OnlineSection.cs" />
|
||||||
<Compile Include="Overlays\Options\Sections\Online\IntegrationOptions.cs" />
|
|
||||||
<Compile Include="Overlays\Options\Sections\Online\InGameChatOptions.cs" />
|
|
||||||
<Compile Include="Overlays\Options\Sections\EditorSection.cs" />
|
|
||||||
<Compile Include="Overlays\Options\Sections\SkinSection.cs" />
|
<Compile Include="Overlays\Options\Sections\SkinSection.cs" />
|
||||||
<Compile Include="Overlays\Options\Sections\Online\PrivacyOptions.cs" />
|
|
||||||
<Compile Include="Overlays\Options\Sections\Online\NotificationsOptions.cs" />
|
|
||||||
<Compile Include="Graphics\UserInterface\OsuCheckbox.cs" />
|
<Compile Include="Graphics\UserInterface\OsuCheckbox.cs" />
|
||||||
<Compile Include="Overlays\Options\SidebarButton.cs" />
|
<Compile Include="Overlays\Options\SidebarButton.cs" />
|
||||||
<Compile Include="Overlays\Options\OptionTextBox.cs" />
|
<Compile Include="Overlays\Options\OptionTextBox.cs" />
|
||||||
<Compile Include="Overlays\Options\OptionSlider.cs" />
|
<Compile Include="Overlays\Options\OptionSlider.cs" />
|
||||||
<Compile Include="Configuration\ProgressBarType.cs" />
|
|
||||||
<Compile Include="Overlays\Options\OptionEnumDropdown.cs" />
|
<Compile Include="Overlays\Options\OptionEnumDropdown.cs" />
|
||||||
<Compile Include="Configuration\RankingType.cs" />
|
<Compile Include="Configuration\RankingType.cs" />
|
||||||
<Compile Include="Configuration\ScoreMeterType.cs" />
|
<Compile Include="Configuration\ScoreMeterType.cs" />
|
||||||
|
Loading…
Reference in New Issue
Block a user