Skip to content

Commit

Permalink
For a Patch Update that is Incoming.
Browse files Browse the repository at this point in the history
  • Loading branch information
@CarJem
CarJem committed Dec 24, 2019
1 parent 2bfff20 commit 5ef686e
Show file tree
Hide file tree
Showing 26 changed files with 458 additions and 366 deletions.
47 changes: 2 additions & 45 deletions Sonic3AIR_ModManager/App.config
View file
Expand Up @@ -2,58 +2,15 @@
<configuration>
<configSections>
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<section name="Sonic3AIR_ModManager.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>

<section name="Sonic3AIR_ModLoader.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
</sectionGroup>
</configSections>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
</startup>
<userSettings>
<Sonic3AIR_ModManager.Properties.Settings>
<setting name="Sonic3AIRPath" serializeAs="String">
<value />
</setting>
<setting name="AutoLaunch" serializeAs="String">
<value>False</value>
</setting>
<setting name="KeepOpenOnLaunch" serializeAs="String">
<value>False</value>
</setting>
<setting name="KeepOpenOnQuit" serializeAs="String">
<value>False</value>
</setting>
<setting name="AutoLaunchDelay" serializeAs="String">
<value>5</value>
</setting>
<setting name="PathModeManual" serializeAs="String">
<value>False</value>
</setting>
<setting name="PathModeAuto" serializeAs="String">
<value>True</value>
</setting>
<setting name="AutoUpdates" serializeAs="String">
<value>True</value>
</setting>
<setting name="UserLanguage" serializeAs="String">
<value>EN</value>
</setting>
<setting name="UseDarkTheme" serializeAs="String">
<value>False</value>
</setting>
<setting name="WindowSize" serializeAs="String">
<value>0, 0</value>
</setting>
<setting name="ShowFullDebugOutput" serializeAs="String">
<value>False</value>
</setting>
<setting name="DisableInGameEnhancements" serializeAs="String">
<value>False</value>
</setting>
<setting name="ShowDiscordRPC" serializeAs="String">
<value>True</value>
</setting>
</Sonic3AIR_ModManager.Properties.Settings>

<Sonic3AIR_ModLoader.Properties.Settings>
<setting name="Sonic3AIRPath" serializeAs="String">
<value/>
Expand Down
13 changes: 10 additions & 3 deletions Sonic3AIR_ModManager/App.xaml.cs
View file
Expand Up @@ -28,7 +28,7 @@ public partial class App : Application

public App()
{
if (Sonic3AIR_ModManager.Properties.Settings.Default.UseDarkTheme == true) ChangeSkin(Skin.Dark);
if (Sonic3AIR_ModManager.MainDataModel.Settings.UseDarkTheme == true) ChangeSkin(Skin.Dark);
else ChangeSkin(Skin.Light);

DebugDisable();
Expand All @@ -41,9 +41,16 @@ public App()
#region Launch
public void RunAutoBoot(bool isForced = false)
{
if (isForced) Program.Log.InfoFormat("Starting in forced auto-boot mode...");
int? value = null;
if (isForced)
{
Program.Log.InfoFormat("Starting in forced auto-boot mode...");
value = 7;
}
else Program.Log.InfoFormat("Starting Auto-Boot Mode...");
var auto = new AutoBootDialog();


var auto = new AutoBootDialog(value);
if (auto.ShowDialog() == true)
{

Expand Down
11 changes: 7 additions & 4 deletions Sonic3AIR_ModManager/Controls/AutoBootDialog.xaml.cs
View file
Expand Up @@ -24,7 +24,7 @@ public partial class AutoBootDialog : Window
{
private System.Windows.Forms.Timer CountDown = new System.Windows.Forms.Timer();
private System.Windows.Forms.Timer AnimationLoop = new System.Windows.Forms.Timer();
private int TimeLeft = (int)(Properties.Settings.Default.AutoLaunchDelay - 1);
private int TimeLeft;


private static Color TransparentSpecial = Color.FromArgb(Colors.Transparent.A, Colors.White.R, Colors.White.G, Colors.White.B);
Expand All @@ -40,10 +40,13 @@ public partial class AutoBootDialog : Window
private LinearGradientBrush BrushTest = new LinearGradientBrush();
private LinearGradientBrush BrushTest2 = new LinearGradientBrush();

public AutoBootDialog()
public AutoBootDialog(int? forcedTimeLeft = null)
{
InitializeComponent();

if (forcedTimeLeft != null) TimeLeft = forcedTimeLeft.Value;
else TimeLeft = (int)(MainDataModel.Settings.AutoLaunchDelay - 1);

AutoBootDialog Instance = this;
UserLanguage.ApplyLanguage(ref Instance);

Expand Down Expand Up @@ -74,7 +77,7 @@ public AutoBootDialog()

private void AnimationLoop_Tick(object sender, EventArgs e)
{
bool allowedToTick = (Properties.Settings.Default.AutoUpdates ? Program.CheckedForUpdateOnStartup && Program.AIRUpdaterState == Program.UpdateState.Finished && Program.MMUpdaterState == Program.UpdateState.Finished : true);
bool allowedToTick = (MainDataModel.Settings.AutoUpdates ? Program.CheckedForUpdateOnStartup && Program.AIRUpdaterState == Program.UpdateState.Finished && Program.MMUpdaterState == Program.UpdateState.Finished : true);
if (allowedToTick)
{

Expand Down Expand Up @@ -221,7 +224,7 @@ private bool HasUpdatesFinalized()

private void CountDown_Tick(object sender, EventArgs evt)
{
bool allowedToProcced = (Properties.Settings.Default.AutoUpdates ? HasUpdatesFinalized() : true);
bool allowedToProcced = (MainDataModel.Settings.AutoUpdates ? HasUpdatesFinalized() : true);
if (allowedToProcced)
{
if (!CancelButton.IsEnabled) CancelButton.IsEnabled = true;
Expand Down

0 comments on commit 5ef686e

Please sign in to comment.