release/0.4.1.0217 #4

Merged
Ray merged 2 commits from release/0.4.1.0217 into master 2026-05-15 21:40:09 +00:00
18 changed files with 54 additions and 58 deletions
Showing only changes of commit 71693de736 - Show all commits

View File

@ -3,7 +3,7 @@ using System.Diagnostics;
using System.Drawing;
using System.Text.Json.Serialization;
namespace RokettoLaunch.Models.SaveFile
namespace RokettoLaunch.DTOs.SaveFile
{
public class App3Options : AppOptionsBase
{

View File

@ -6,7 +6,7 @@ using System.Linq;
using System.Text.Json;
using System.Text.Json.Serialization;
namespace RokettoLaunch.Models.SaveFile
namespace RokettoLaunch.DTOs.SaveFile
{
public class App4Options : AppOptionsBase
{

View File

@ -1,6 +1,6 @@
using System.Drawing;
namespace RokettoLaunch.Models.SaveFile
namespace RokettoLaunch.DTOs.SaveFile
{
public class AppOptionsBase
{

View File

@ -5,7 +5,7 @@ using System.Windows.Forms;
using RyzStudio.Windows.Forms;
using RyzStudio.Windows.ThemedForms;
namespace RokettoLaunch
namespace RokettoLaunch.Forms
{
public class CopyToTileForm : Form
{

View File

@ -5,12 +5,12 @@ using System.Drawing;
using System.IO;
using System.Linq;
using System.Windows.Forms;
using RokettoLaunch.Models.SaveFile;
using RokettoLaunch.DTOs.SaveFile;
using RyzStudio.Windows.Forms;
using RyzStudio.Windows.ThemedForms;
using RyzStudio.Windows.ThemedForms.ButtonTextBox;
namespace RokettoLaunch
namespace RokettoLaunch.Forms
{
public class EditFolderForm : Form
{

View File

@ -1,12 +1,12 @@
using System;
using System.Windows.Forms;
using RokettoLaunch.Models.SaveFile;
using RokettoLaunch.DTOs.SaveFile;
using RokettoLaunch.Windows.Forms;
using RyzStudio.Windows.Forms;
using RyzStudio.Windows.ThemedForms.ButtonTextBox;
using RyzStudio.Windows.ThemedForms.PickerBox;
namespace RokettoLaunch
namespace RokettoLaunch.Forms
{
public class EditGroupForm : Form
{

View File

@ -2,13 +2,13 @@
using System.Diagnostics;
using System.Drawing;
using System.Windows.Forms;
using RokettoLaunch.Models.SaveFile;
using RokettoLaunch.DTOs.SaveFile;
using RyzStudio.Windows.Forms;
using RyzStudio.Windows.ThemedForms;
using RyzStudio.Windows.ThemedForms.ButtonTextBox;
using RyzStudio.Windows.ThemedForms.PickerBox;
namespace RokettoLaunch
namespace RokettoLaunch.Forms
{
public class EditTileForm : Form
{

View File

@ -3,10 +3,10 @@ using System.Collections.Generic;
using System.IO;
using System.Threading.Tasks;
using System.Windows.Forms;
using RokettoLaunch.Models.SaveFile;
using RokettoLaunch.DTOs.SaveFile;
using RyzStudio.Windows.Forms;
namespace RokettoLaunch
namespace RokettoLaunch.Forms
{
public class LoadingForm : Form
{

View File

@ -1,12 +1,12 @@
using System;
using System.Windows.Forms;
using RokettoLaunch.Models.SaveFile;
using RokettoLaunch.DTOs.SaveFile;
using RyzStudio.Windows.Forms;
using RyzStudio.Windows.ThemedForms;
using RyzStudio.Windows.ThemedForms.ButtonTextBox;
using RyzStudio.Windows.ThemedForms.PickerBox;
namespace RokettoLaunch
namespace RokettoLaunch.Forms
{
public class OptionsForm : Form
{

View File

@ -6,7 +6,8 @@ using System.IO;
using System.Linq;
using System.Threading.Tasks;
using System.Windows.Forms;
using RokettoLaunch.Models.SaveFile;
using RokettoLaunch.DTOs.SaveFile;
using RokettoLaunch.Forms;
using RokettoLaunch.Windows.Forms;
using RyzStudio;
using RyzStudio.Windows.Forms;
@ -19,8 +20,9 @@ namespace RokettoLaunch
{
private readonly IFileSessionManager _fileSessionManager;
private bool _isBusy = false;
private bool _requestExit = false;
private App4Options currentSession = null;
private bool isBusy = false;
private bool requestExit = false;
public MainForm()
@ -76,7 +78,7 @@ namespace RokettoLaunch
this.CurrentSession = new App4Options();
}
if (this.CurrentSession.HideOnClose && !_requestExit)
if (this.CurrentSession.HideOnClose && !requestExit)
{
this.Hide();
@ -84,7 +86,7 @@ namespace RokettoLaunch
return;
}
_requestExit = false;
requestExit = false;
var result = await _fileSessionManager.CloseSession();
if (!result)
@ -113,7 +115,7 @@ namespace RokettoLaunch
break;
case RyzStudio.Runtime.InteropServices.User32.WM_QUERYENDSESSION:
_requestExit = true;
requestExit = true;
Application.Exit();
@ -127,8 +129,19 @@ namespace RokettoLaunch
[Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
public App4Options CurrentSession { get; set; } = null;
public App4Options CurrentSession
{
get
{
if (currentSession == null)
{
currentSession = new App4Options();
}
return currentSession;
}
set => currentSession = value;
}
private void InvalidateOptions(bool resize)
{
@ -193,7 +206,7 @@ namespace RokettoLaunch
/// <param name="e"></param>
private async void NewToolStripMenuItem_Click(object sender, EventArgs e)
{
if (_isBusy)
if (isBusy)
{
return;
}
@ -208,7 +221,7 @@ namespace RokettoLaunch
/// <param name="e"></param>
private async void OpenToolStripMenuItem_Click(object sender, EventArgs e)
{
if (_isBusy)
if (isBusy)
{
return;
}
@ -223,7 +236,7 @@ namespace RokettoLaunch
/// <param name="e"></param>
private async void CloseToolStripMenuItem_Click(object sender, EventArgs e)
{
if (_isBusy)
if (isBusy)
{
return;
}
@ -238,7 +251,7 @@ namespace RokettoLaunch
/// <param name="e"></param>
private async void SaveToolStripMenuItem_Click(object sender, EventArgs e)
{
if (_isBusy)
if (isBusy)
{
return;
}
@ -253,7 +266,7 @@ namespace RokettoLaunch
/// <param name="e"></param>
private async void SaveAsToolStripMenuItem_Click(object sender, EventArgs e)
{
if (_isBusy)
if (isBusy)
{
return;
}
@ -268,12 +281,12 @@ namespace RokettoLaunch
/// <param name="e"></param>
private void ExitToolStripMenuItem_Click(object sender, EventArgs e)
{
if (_isBusy)
if (isBusy)
{
return;
}
_requestExit = true;
requestExit = true;
this.Close();
}
@ -392,12 +405,12 @@ namespace RokettoLaunch
private void NotifyExitToolStripMenuItem_Click(object sender, EventArgs e)
{
if (_isBusy)
if (isBusy)
{
return;
}
_requestExit = true;
requestExit = true;
this.Close();
}
@ -460,12 +473,12 @@ namespace RokettoLaunch
return await Task.Run(async () =>
{
if (_isBusy)
if (isBusy)
{
return false;
}
_isBusy = true;
isBusy = true;
// update session
if (this.CurrentSession == null)
@ -517,7 +530,7 @@ namespace RokettoLaunch
}
}
_isBusy = false;
isBusy = false;
return result.IsSuccess;
});
@ -711,7 +724,7 @@ namespace RokettoLaunch
return;
}
_isBusy = true;
isBusy = true;
await Task.Run(() =>
{
@ -722,7 +735,7 @@ namespace RokettoLaunch
});
_fileSessionManager.HasChanged = true;
_isBusy = false;
isBusy = false;
}
/// <summary>

View File

@ -1,10 +0,0 @@
namespace RokettoLaunch.Models
{
public class NewFormModel
{
public int ColumnCount { get; set; } = 8;
public int GroupCount { get; set; } = 1;
}
}

View File

@ -14,7 +14,7 @@
<Copyright>Ray Lam</Copyright>
<AssemblyVersion>1.0.0.0</AssemblyVersion>
<FileVersion>1.0.0.0</FileVersion>
<Version>0.4.1.0202</Version>
<Version>0.4.1.0217</Version>
<EnableNETAnalyzers>False</EnableNETAnalyzers>
<PlatformTarget>x64</PlatformTarget>
<PackageIcon>icon-128.png</PackageIcon>
@ -31,15 +31,15 @@
<ItemGroup>
<Compile Remove="#\**" />
<Compile Remove="Resources\UI\**" />
<Compile Remove="Resources\**" />
<Compile Remove="RyzStudio\**" />
<Compile Remove="Text\**" />
<EmbeddedResource Remove="#\**" />
<EmbeddedResource Remove="Resources\UI\**" />
<EmbeddedResource Remove="Resources\**" />
<EmbeddedResource Remove="RyzStudio\**" />
<EmbeddedResource Remove="Text\**" />
<None Remove="#\**" />
<None Remove="Resources\UI\**" />
<None Remove="Resources\**" />
<None Remove="RyzStudio\**" />
<None Remove="Text\**" />
</ItemGroup>
@ -88,10 +88,10 @@
<AutoGen>True</AutoGen>
<DependentUpon>AppResource.resx</DependentUpon>
</Compile>
<Compile Update="CopyToTileForm.cs">
<Compile Update="Forms\CopyToTileForm.cs">
<SubType>Form</SubType>
</Compile>
<Compile Update="LoadingForm.cs">
<Compile Update="Forms\LoadingForm.cs">
<SubType>Form</SubType>
</Compile>
</ItemGroup>
@ -103,11 +103,4 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<None Update="Resources\icon-128.png">
<Pack>True</Pack>
<PackagePath>\</PackagePath>
</None>
</ItemGroup>
</Project>