Upgrade to using RyzStudio3 package (WIP)
This commit is contained in:
parent
68a9f8e616
commit
e98111bf04
@ -333,7 +333,7 @@ namespace FizzyLauncher
|
|||||||
{
|
{
|
||||||
base.IsBusy = value;
|
base.IsBusy = value;
|
||||||
|
|
||||||
UIControl.SetValue(pictureBox2, (this.IsBusy ? UIcon.GetImage("loading_block") : null));
|
UIControl.SetValue(pictureBox2, (this.IsBusy ? UIResource1.loading_block : null));
|
||||||
|
|
||||||
UIControl.SetEnable(textBox1, !this.IsBusy);
|
UIControl.SetEnable(textBox1, !this.IsBusy);
|
||||||
UIControl.SetEnable(textBox2, !this.IsBusy);
|
UIControl.SetEnable(textBox2, !this.IsBusy);
|
||||||
|
@ -110,16 +110,14 @@
|
|||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="HtmlAgilityPack" Version="1.11.34" />
|
<PackageReference Include="HtmlAgilityPack" Version="1.11.46" />
|
||||||
<PackageReference Include="Microsoft.Data.Sqlite" Version="5.0.10" />
|
<PackageReference Include="Microsoft.Data.Sqlite" Version="5.0.10" />
|
||||||
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
|
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
|
||||||
<PackageReference Include="SharpZipLib" Version="1.3.2" />
|
<PackageReference Include="SharpZipLib" Version="1.3.2" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Reference Include="RyzStudio3">
|
<ProjectReference Include="..\..\gitlab-hiimray\ryzstudio3\RyzStudio3.csproj" />
|
||||||
<HintPath>References\RyzStudio3.dll</HintPath>
|
|
||||||
</Reference>
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
@ -9,8 +9,8 @@ namespace BookmarkManager
|
|||||||
public static string GetSHA256Hash(string text)
|
public static string GetSHA256Hash(string text)
|
||||||
{
|
{
|
||||||
if (string.IsNullOrWhiteSpace(text)) return string.Empty;
|
if (string.IsNullOrWhiteSpace(text)) return string.Empty;
|
||||||
|
|
||||||
using (var sha = new SHA256Managed())
|
using (var sha = SHA256.Create())
|
||||||
{
|
{
|
||||||
byte[] hash = sha.ComputeHash(Encoding.UTF8.GetBytes(text));
|
byte[] hash = sha.ComputeHash(Encoding.UTF8.GetBytes(text));
|
||||||
|
|
||||||
|
@ -1,7 +1,8 @@
|
|||||||
using FizzyLauncher.Models;
|
using System;
|
||||||
using System.Windows.Forms;
|
using System.Windows.Forms;
|
||||||
|
using FizzyLauncher.Models;
|
||||||
using RyzStudio.Windows.ThemedForms;
|
using RyzStudio.Windows.ThemedForms;
|
||||||
using System;
|
using RyzStudio.Windows.ThemedForms.PickerBox;
|
||||||
|
|
||||||
namespace FizzyLauncher
|
namespace FizzyLauncher
|
||||||
{
|
{
|
||||||
@ -46,9 +47,9 @@ namespace FizzyLauncher
|
|||||||
{
|
{
|
||||||
this.label1 = new System.Windows.Forms.Label();
|
this.label1 = new System.Windows.Forms.Label();
|
||||||
this.button1 = new RyzStudio.Windows.ThemedForms.TButton();
|
this.button1 = new RyzStudio.Windows.ThemedForms.TButton();
|
||||||
this.pickerBox1 = new RyzStudio.Windows.ThemedForms.TYesNoPickerBox();
|
this.pickerBox1 = new TYesNoPickerBox();
|
||||||
this.label6 = new System.Windows.Forms.Label();
|
this.label6 = new System.Windows.Forms.Label();
|
||||||
this.pickerBox2 = new RyzStudio.Windows.ThemedForms.TYesNoPickerBox();
|
this.pickerBox2 = new TYesNoPickerBox();
|
||||||
this.label7 = new System.Windows.Forms.Label();
|
this.label7 = new System.Windows.Forms.Label();
|
||||||
this.label8 = new System.Windows.Forms.Label();
|
this.label8 = new System.Windows.Forms.Label();
|
||||||
this.pickerBox3 = new RyzStudio.Windows.ThemedForms.TPickerBox();
|
this.pickerBox3 = new RyzStudio.Windows.ThemedForms.TPickerBox();
|
||||||
@ -56,9 +57,9 @@ namespace FizzyLauncher
|
|||||||
this.tHorizontalSeparator2 = new RyzStudio.Windows.Forms.THorizontalSeparator();
|
this.tHorizontalSeparator2 = new RyzStudio.Windows.Forms.THorizontalSeparator();
|
||||||
this.tHorizontalSeparator3 = new RyzStudio.Windows.Forms.THorizontalSeparator();
|
this.tHorizontalSeparator3 = new RyzStudio.Windows.Forms.THorizontalSeparator();
|
||||||
this.textBox1 = new RyzStudio.Windows.ThemedForms.TTextBox();
|
this.textBox1 = new RyzStudio.Windows.ThemedForms.TTextBox();
|
||||||
this.pickerBox4 = new RyzStudio.Windows.ThemedForms.TYesNoPickerBox();
|
this.pickerBox4 = new TYesNoPickerBox();
|
||||||
this.label2 = new System.Windows.Forms.Label();
|
this.label2 = new System.Windows.Forms.Label();
|
||||||
this.pickerBox5 = new RyzStudio.Windows.ThemedForms.TYesNoPickerBox();
|
this.pickerBox5 = new TYesNoPickerBox();
|
||||||
this.label3 = new System.Windows.Forms.Label();
|
this.label3 = new System.Windows.Forms.Label();
|
||||||
this.SuspendLayout();
|
this.SuspendLayout();
|
||||||
//
|
//
|
||||||
|
@ -1,17 +1,17 @@
|
|||||||
using BookmarkManager;
|
using System;
|
||||||
using bzit.bomg.Models;
|
|
||||||
using FizzyLauncher.Models;
|
|
||||||
using RyzStudio.IO;
|
|
||||||
using RyzStudio.Windows.Forms;
|
|
||||||
using RyzStudio.Windows.ThemedForms;
|
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.ComponentModel;
|
|
||||||
using System.Drawing;
|
using System.Drawing;
|
||||||
using System.Net;
|
using System.Net;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using System.Windows.Forms;
|
using System.Windows.Forms;
|
||||||
using TProgressBar = RyzStudio.Windows.ThemedForms.TProgressBar;
|
using BookmarkManager;
|
||||||
|
using bzit.bomg.Models;
|
||||||
|
using FizzyLauncher.Models;
|
||||||
|
using RyzStudio;
|
||||||
|
using RyzStudio.IO;
|
||||||
|
using RyzStudio.Windows.Forms;
|
||||||
|
using RyzStudio.Windows.ThemedForms;
|
||||||
|
using RyzStudio.Windows.ThemedForms.PickerBox;
|
||||||
|
|
||||||
namespace FizzyLauncher
|
namespace FizzyLauncher
|
||||||
{
|
{
|
||||||
@ -63,7 +63,7 @@ namespace FizzyLauncher
|
|||||||
this.label2 = new System.Windows.Forms.Label();
|
this.label2 = new System.Windows.Forms.Label();
|
||||||
this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
|
this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
|
||||||
this.pictureBox2 = new System.Windows.Forms.PictureBox();
|
this.pictureBox2 = new System.Windows.Forms.PictureBox();
|
||||||
this.pickerBox1 = new RyzStudio.Windows.ThemedForms.TYesNoPickerBox();
|
this.pickerBox1 = new TYesNoPickerBox();
|
||||||
this.button2 = new RyzStudio.Windows.ThemedForms.TButton();
|
this.button2 = new RyzStudio.Windows.ThemedForms.TButton();
|
||||||
this.progressBar1 = new RyzStudio.Windows.ThemedForms.TProgressBar();
|
this.progressBar1 = new RyzStudio.Windows.ThemedForms.TProgressBar();
|
||||||
((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit();
|
((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit();
|
||||||
@ -246,7 +246,7 @@ namespace FizzyLauncher
|
|||||||
{
|
{
|
||||||
base.IsBusy = value;
|
base.IsBusy = value;
|
||||||
|
|
||||||
UIControl.SetValue(pictureBox2, (this.IsBusy ? UIcon.GetImage("loading_block") : null));
|
UIControl.SetValue(pictureBox2, (this.IsBusy ? UIResource1.loading_block : null));
|
||||||
|
|
||||||
UIControl.SetEnable(pickerBox1, !this.IsBusy);
|
UIControl.SetEnable(pickerBox1, !this.IsBusy);
|
||||||
button2.LabelText = (this.IsBusy ? "&Stop" : "&Run");
|
button2.LabelText = (this.IsBusy ? "&Stop" : "&Run");
|
||||||
|
10
skye.sln
10
skye.sln
@ -1,10 +1,12 @@
|
|||||||
|
|
||||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||||
# Visual Studio Version 16
|
# Visual Studio Version 17
|
||||||
VisualStudioVersion = 16.0.31410.357
|
VisualStudioVersion = 17.4.33205.214
|
||||||
MinimumVisualStudioVersion = 10.0.40219.1
|
MinimumVisualStudioVersion = 10.0.40219.1
|
||||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BookmarkManager", "BookmarkManager.csproj", "{4833FB27-0817-4720-A54B-180369B0C374}"
|
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BookmarkManager", "BookmarkManager.csproj", "{4833FB27-0817-4720-A54B-180369B0C374}"
|
||||||
EndProject
|
EndProject
|
||||||
|
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RyzStudio3", "..\..\gitlab-hiimray\ryzstudio3\RyzStudio3.csproj", "{25B10AC4-28A0-4C2F-A158-51D0FADC8295}"
|
||||||
|
EndProject
|
||||||
Global
|
Global
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
Debug|Any CPU = Debug|Any CPU
|
Debug|Any CPU = Debug|Any CPU
|
||||||
@ -15,6 +17,10 @@ Global
|
|||||||
{4833FB27-0817-4720-A54B-180369B0C374}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{4833FB27-0817-4720-A54B-180369B0C374}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{4833FB27-0817-4720-A54B-180369B0C374}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
{4833FB27-0817-4720-A54B-180369B0C374}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
{4833FB27-0817-4720-A54B-180369B0C374}.Release|Any CPU.Build.0 = Release|Any CPU
|
{4833FB27-0817-4720-A54B-180369B0C374}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{25B10AC4-28A0-4C2F-A158-51D0FADC8295}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{25B10AC4-28A0-4C2F-A158-51D0FADC8295}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{25B10AC4-28A0-4C2F-A158-51D0FADC8295}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{25B10AC4-28A0-4C2F-A158-51D0FADC8295}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(SolutionProperties) = preSolution
|
GlobalSection(SolutionProperties) = preSolution
|
||||||
HideSolutionNode = FALSE
|
HideSolutionNode = FALSE
|
||||||
|
Loading…
Reference in New Issue
Block a user