Skip to content

Commit 88e9aaa

Browse files
committed
v1.4.0
- Added more detailed info to the update window when installing updates. - Changed some error messages and logs to provide better info if something is blocking the launchers permissions.
1 parent e46be5f commit 88e9aaa

16 files changed

Lines changed: 184 additions & 147 deletions

Controls/CRButton.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
using System;
22
using System.Drawing;
33
using System.Windows.Forms;
4-
using Windows.Devices.Sms;
54

65
namespace CodeRedLauncher.Controls
76
{

Controls/CRInstall.cs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
11
using System;
2-
using System.Collections.Generic;
3-
using System.ComponentModel;
4-
using System.Data;
52
using System.Drawing;
6-
using System.Linq;
7-
using System.Text;
8-
using System.Threading.Tasks;
93
using System.Windows.Forms;
10-
using Windows.Gaming.UI;
114

125
namespace CodeRedLauncher.Controls
136
{

Controls/CRLabel.cs

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,4 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.ComponentModel;
4-
using System.Data;
5-
using System.Drawing;
6-
using System.Linq;
7-
using System.Text;
8-
using System.Threading.Tasks;
1+
using System.Drawing;
92
using System.Windows.Forms;
103

114
namespace CodeRedLauncher.Controls

Controls/CROffline.cs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
11
using System;
2-
using System.Collections.Generic;
3-
using System.ComponentModel;
4-
using System.Data;
52
using System.Drawing;
6-
using System.Linq;
7-
using System.Text;
8-
using System.Threading.Tasks;
93
using System.Windows.Forms;
10-
using Windows.Gaming.UI;
114

125
namespace CodeRedLauncher.Controls
136
{

Controls/CRPathing.cs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
11
using System;
2-
using System.Collections.Generic;
3-
using System.ComponentModel;
4-
using System.Data;
52
using System.Drawing;
6-
using System.Linq;
7-
using System.Text;
8-
using System.Threading.Tasks;
93
using System.Windows.Forms;
10-
using Windows.Gaming.UI;
114

125
namespace CodeRedLauncher.Controls
136
{

Controls/CRUpdate.cs

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
11
using System;
2-
using System.Collections.Generic;
3-
using System.ComponentModel;
4-
using System.Data;
52
using System.Drawing;
6-
using System.Linq;
7-
using System.Text;
8-
using System.Threading.Tasks;
93
using System.Windows.Forms;
10-
using Windows.Gaming.UI;
114

125
namespace CodeRedLauncher.Controls
136
{
@@ -18,6 +11,7 @@ public enum UpdateLayouts : byte
1811
None,
1912
Running,
2013
Downloading,
14+
Installing,
2115
Module,
2216
Launcher,
2317
Both,
@@ -184,7 +178,15 @@ public void UpdateTheme()
184178
}
185179
else if (UpdateType == UpdateLayouts.Downloading)
186180
{
187-
DescriptionLbl.Text = "Downloading and installing files, please wait...";
181+
DescriptionLbl.Text = "Downloading latest version, please wait...";
182+
m_buttonsEnabled = false;
183+
AcceptBtn.Visible = true;
184+
DenyBtn.Visible = true;
185+
GameBtn.Visible = false;
186+
}
187+
else if (UpdateType == UpdateLayouts.Installing)
188+
{
189+
DescriptionLbl.Text = "Download complete, installing files...";
188190
m_buttonsEnabled = false;
189191
AcceptBtn.Visible = true;
190192
DenyBtn.Visible = true;

Forms/MainFrm.Designer.cs

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Forms/MainFrm.cs

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -450,8 +450,6 @@ private void PolicyBtn_OnButtonClick(object sender, EventArgs e)
450450

451451
private void EasterEggImg_Click(object sender, EventArgs e)
452452
{
453-
// It's been over half a year and no ones found this easter egg yet, starting to think no one ever will :(
454-
455453
if (EasterEggImg.BackgroundImage == null)
456454
{
457455
EasterEggImg.BackgroundImage = (Configuration.ShouldUseLightMode() ? Properties.Resources.Cupcake_Purple : Properties.Resources.Cupcake_Red);
@@ -938,10 +936,6 @@ private void ConfigToInterface()
938936
Configuration.SaveChanges();
939937
UpdateTheme();
940938
}
941-
else
942-
{
943-
Logger.Write("Failed to initialize the users settings!", LogLevel.LEVEL_ERROR);
944-
}
945939
}
946940

947941
private async void StorageToInterface()
@@ -999,11 +993,6 @@ private void UpdateTheme()
999993
NewsCtrl.SetTheme(control, icon);
1000994
}
1001995

1002-
// Sessions
1003-
{
1004-
1005-
}
1006-
1007996
// Settings
1008997
{
1009998
SettingsArtOne.BackgroundImage = (lightMode ? Properties.Resources.TR3_Light : Properties.Resources.TR3_Dark);
@@ -1311,7 +1300,7 @@ private async void UpdatePopup_ButtonClickAccept(object sender, EventArgs e)
13111300

13121301
Retrievers.Invalidate();
13131302
await Retrievers.CheckInitialized();
1314-
Result report = await Updator.InstallUpdates();
1303+
Result report = await Updator.InstallUpdates(UpdatePopup);
13151304
UpdatePopup.ButtonsEnabled = true;
13161305

13171306
if (report.Succeeded)

0 commit comments

Comments
 (0)