AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-29 08:32:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Launcher: Reduce clutter at main menu by moving stuff to settings screen.

Browse Source
This commit is contained in:
UnknownShadow200 2016-10-06 22:33:04 +11:00
parent 6b9d741c29
commit e67cdcf6ba
5 changed files with 37 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Launcher2/Gui/Screens/MainScreen.cs
View File

@ -43,14 +43,14 @@ namespace Launcher.Gui.Screens {
string currentVer = Program.AppName.Substring( spaceIndex + 1 ); string currentVer = Program.AppName.Substring( spaceIndex + 1 );
bool update = new Version( latestVer ) > new Version( currentVer ); bool update = new Version( latestVer ) > new Version( currentVer );
view.updateText = update ? "&aNew release available" : "&eUp to date "; view.updateText = update ? "&aNew release" : "&eUp to date";
game.RedrawBackground(); game.RedrawBackground();
Resize(); Resize();
SelectWidget( selectedWidget ); SelectWidget( selectedWidget );
} }
void FailedUpdateCheck( UpdateCheckTask task ) { void FailedUpdateCheck( UpdateCheckTask task ) {
view.updateText = "&cUpdate check failed "; view.updateText = "&cCheck failed";
game.RedrawBackground(); game.RedrawBackground();
Resize(); Resize();
SelectWidget( selectedWidget ); SelectWidget( selectedWidget );
@ -64,14 +64,6 @@ namespace Launcher.Gui.Screens {
widgets[view.spIndex].OnClick = widgets[view.spIndex].OnClick =
(x, y) => Client.Start( widgets[0].Text, ref game.ShouldExit ); (x, y) => Client.Start( widgets[0].Text, ref game.ShouldExit );
if( widgets[view.colIndex] != null )
widgets[view.colIndex].OnClick =
(x, y) => game.SetScreen( new ColoursScreen( game ) );
widgets[view.updatesIndex].OnClick =
(x, y) => game.SetScreen( new UpdatesScreen( game ) );
widgets[view.modeIndex].OnClick =
(x, y) => game.SetScreen( new ChooseModeScreen( game, false ) );
widgets[view.settingsIndex].OnClick = widgets[view.settingsIndex].OnClick =
(x, y) => game.SetScreen( new SettingsScreen( game ) ); (x, y) => game.SetScreen( new SettingsScreen( game ) );
SetupInputHandlers(); SetupInputHandlers();

2
Launcher2/Gui/Views/ChooseModeView.cs
View File

@ -71,7 +71,7 @@ namespace Launcher.Gui.Views {
} else { } else {
backIndex = widgetIndex; backIndex = widgetIndex;
Makers.Button( this, "Back", 80, 35, titleFont ) Makers.Button( this, "Back", 80, 35, titleFont )
.SetLocation( Anchor.Centre, Anchor.Centre, 0, 175 ); .SetLocation( Anchor.Centre, Anchor.Centre, 0, 170 );
} }
} }
} }

29
Launcher2/Gui/Views/MainView.cs
View File

@ -8,12 +8,12 @@ namespace Launcher.Gui.Views {
public sealed partial class MainView : IView { public sealed partial class MainView : IView {
Font buttonFont, updateFont; Font buttonFont, updateFont;
internal int loginIndex, resIndex, dcIndex, spIndex, colIndex, statusIndex; internal int loginIndex, resIndex, dcIndex, spIndex, statusIndex;
internal int updatesIndex, modeIndex, sslIndex, settingsIndex; internal int sslIndex, settingsIndex;
const int buttonWidth = 220, buttonHeight = 35, sideButtonWidth = 150; const int buttonWidth = 220, buttonHeight = 35, sideButtonWidth = 150;
public MainView( LauncherWindow game ) : base( game ) { public MainView( LauncherWindow game ) : base( game ) {
widgets = new Widget[14]; widgets = new Widget[11];
} }
public override void Init() { public override void Init() {
@ -38,7 +38,7 @@ namespace Launcher.Gui.Views {
} }
internal string updateText = "&eChecking for updates.."; internal string updateText = "&eChecking..";
protected override void MakeWidgets() { protected override void MakeWidgets() {
widgetIndex = 0; widgetIndex = 0;
MakeInput( Get( 0 ), 280, false, 16, "&7Username.." ) MakeInput( Get( 0 ), 280, false, 16, "&7Username.." )
@ -64,24 +64,6 @@ namespace Launcher.Gui.Views {
Makers.Button( this, "Singleplayer", 200, buttonHeight, buttonFont ) Makers.Button( this, "Singleplayer", 200, buttonHeight, buttonFont )
.SetLocation( Anchor.Centre, Anchor.Centre, 0, 110 ); .SetLocation( Anchor.Centre, Anchor.Centre, 0, 110 );
colIndex = widgetIndex;
Makers.Button( this, "Colours", 110, buttonHeight, buttonFont )
.SetLocation( Anchor.LeftOrTop, Anchor.BottomOrRight, 10, -10 );
if( game.ClassicBackground )
widgets[widgetIndex - 1].Visible = false;
modeIndex = widgetIndex;
Makers.Button( this, "Choose mode", 200, buttonHeight, buttonFont )
.SetLocation( Anchor.Centre, Anchor.BottomOrRight, 0, -10 );
updatesIndex = widgetIndex;
Makers.Button( this, "Updates", 110, buttonHeight, buttonFont )
.SetLocation( Anchor.BottomOrRight, Anchor.BottomOrRight, -10, -10 );
Makers.Label( this, updateText, updateFont )
.SetLocation( Anchor.BottomOrRight, Anchor.BottomOrRight, -10, -50 );
sslIndex = widgetIndex; sslIndex = widgetIndex;
bool sslVisible = widgets[sslIndex] != null && widgets[sslIndex].Visible; bool sslVisible = widgets[sslIndex] != null && widgets[sslIndex].Visible;
Makers.Checkbox( this, textFont, true, 30 ) Makers.Checkbox( this, textFont, true, 30 )
@ -91,6 +73,9 @@ namespace Launcher.Gui.Views {
widgets[sslIndex].Visible = sslVisible; widgets[sslIndex].Visible = sslVisible;
widgets[sslIndex + 1].Visible = sslVisible; widgets[sslIndex + 1].Visible = sslVisible;
Makers.Label( this, updateText, updateFont )
.SetLocation( Anchor.BottomOrRight, Anchor.LeftOrTop, -5, 50 );
settingsIndex = widgetIndex; settingsIndex = widgetIndex;
Makers.Bitmap( this, Bitmaps.OptionsIndices, Makers.Bitmap( this, Bitmaps.OptionsIndices,
Bitmaps.OptionsPalette, Bitmaps.OptionsSize ) Bitmaps.OptionsPalette, Bitmaps.OptionsSize )

30
Launcher2/Gui/Views/SettingsView.cs
View File

@ -9,7 +9,7 @@ namespace Launcher.Gui.Views {
internal int backIndex, updatesIndex, modeIndex, coloursIndex; internal int backIndex, updatesIndex, modeIndex, coloursIndex;
public SettingsView( LauncherWindow game ) : base( game ) { public SettingsView( LauncherWindow game ) : base( game ) {
widgets = new Widget[3]; widgets = new Widget[7];
} }
public override void Init() { public override void Init() {
@ -22,16 +22,32 @@ namespace Launcher.Gui.Views {
widgetIndex = 0; widgetIndex = 0;
int middle = game.Width / 2; int middle = game.Width / 2;
modeIndex = widgetIndex; updatesIndex = widgetIndex;
Makers.Button( this, "Choose mode", 145, 35, titleFont ) Makers.Button( this, "Updates", 110, 35, titleFont )
.SetLocation( Anchor.LeftOrTop, Anchor.Centre, middle - 250, -72 ); .SetLocation( Anchor.Centre, Anchor.Centre, -135, -120 );
Makers.Label( this, "&eChange the client's mode/features", textFont ) Makers.Label( this, "&eGet the latest stuff", textFont )
.SetLocation( Anchor.LeftOrTop, Anchor.Centre, middle - 85, -72 - 12 ); .SetLocation( Anchor.Centre, Anchor.Centre, 10, -120 );
modeIndex = widgetIndex;
Makers.Button( this, "Mode", 110, 35, titleFont )
.SetLocation( Anchor.Centre, Anchor.Centre, -135, -70 );
Makers.Label( this, "&eChange the enabled features", textFont )
.SetLocation( Anchor.Centre, Anchor.Centre, 55, -70 );
coloursIndex = widgetIndex;
Makers.Button( this, "Colours", 110, 35, titleFont )
.SetLocation( Anchor.Centre, Anchor.Centre, -135, -20 );
Makers.Label( this, "&eChange how the launcher looks", textFont )
.SetLocation( Anchor.Centre, Anchor.Centre, 65, -20 );
if( game.ClassicBackground ) {
widgets[coloursIndex].Visible = false;
widgets[coloursIndex + 1].Visible = false;
}
backIndex = widgetIndex; backIndex = widgetIndex;
Makers.Button( this, "Back", 80, 35, titleFont ) Makers.Button( this, "Back", 80, 35, titleFont )
.SetLocation( Anchor.Centre, Anchor.Centre, 0, 175 ); .SetLocation( Anchor.Centre, Anchor.Centre, 0, 170 );
} }
} }
} }

2
Launcher2/Launcher2.csproj
View File

@ -4,7 +4,7 @@
<ProjectGuid>{3E84ACC1-27B4-401B-A359-6AAE4DF6C9B5}</ProjectGuid> <ProjectGuid>{3E84ACC1-27B4-401B-A359-6AAE4DF6C9B5}</ProjectGuid>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<OutputType>Exe</OutputType> <OutputType>WinExe</OutputType>
<RootNamespace>Launcher</RootNamespace> <RootNamespace>Launcher</RootNamespace>
<AssemblyName>Launcher2</AssemblyName> <AssemblyName>Launcher2</AssemblyName>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion> <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>