diff --git a/BookmarkForm.cs b/BookmarkForm.cs
index 831b834..88cf262 100644
--- a/BookmarkForm.cs
+++ b/BookmarkForm.cs
@@ -333,7 +333,7 @@ namespace FizzyLauncher
{
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(textBox2, !this.IsBusy);
diff --git a/BookmarkManager.csproj b/BookmarkManager.csproj
index 53aa656..de0e693 100644
--- a/BookmarkManager.csproj
+++ b/BookmarkManager.csproj
@@ -110,16 +110,14 @@
-
+
-
- References\RyzStudio3.dll
-
+
\ No newline at end of file
diff --git a/Classes/Crypto.cs b/Classes/Crypto.cs
index 24747d8..7146990 100644
--- a/Classes/Crypto.cs
+++ b/Classes/Crypto.cs
@@ -9,8 +9,8 @@ namespace BookmarkManager
public static string GetSHA256Hash(string text)
{
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));
diff --git a/OptionsForm.cs b/OptionsForm.cs
index cf97853..4b84a1c 100644
--- a/OptionsForm.cs
+++ b/OptionsForm.cs
@@ -1,7 +1,8 @@
-using FizzyLauncher.Models;
+using System;
using System.Windows.Forms;
+using FizzyLauncher.Models;
using RyzStudio.Windows.ThemedForms;
-using System;
+using RyzStudio.Windows.ThemedForms.PickerBox;
namespace FizzyLauncher
{
@@ -46,9 +47,9 @@ namespace FizzyLauncher
{
this.label1 = new System.Windows.Forms.Label();
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.pickerBox2 = new RyzStudio.Windows.ThemedForms.TYesNoPickerBox();
+ this.pickerBox2 = new TYesNoPickerBox();
this.label7 = new System.Windows.Forms.Label();
this.label8 = new System.Windows.Forms.Label();
this.pickerBox3 = new RyzStudio.Windows.ThemedForms.TPickerBox();
@@ -56,9 +57,9 @@ namespace FizzyLauncher
this.tHorizontalSeparator2 = new RyzStudio.Windows.Forms.THorizontalSeparator();
this.tHorizontalSeparator3 = new RyzStudio.Windows.Forms.THorizontalSeparator();
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.pickerBox5 = new RyzStudio.Windows.ThemedForms.TYesNoPickerBox();
+ this.pickerBox5 = new TYesNoPickerBox();
this.label3 = new System.Windows.Forms.Label();
this.SuspendLayout();
//
diff --git a/UpdateIconsForm.cs b/UpdateIconsForm.cs
index 72becc7..27e5e45 100644
--- a/UpdateIconsForm.cs
+++ b/UpdateIconsForm.cs
@@ -1,17 +1,17 @@
-using BookmarkManager;
-using bzit.bomg.Models;
-using FizzyLauncher.Models;
-using RyzStudio.IO;
-using RyzStudio.Windows.Forms;
-using RyzStudio.Windows.ThemedForms;
-using System;
+using System;
using System.Collections.Generic;
-using System.ComponentModel;
using System.Drawing;
using System.Net;
using System.Threading.Tasks;
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
{
@@ -63,7 +63,7 @@ namespace FizzyLauncher
this.label2 = new System.Windows.Forms.Label();
this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
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.progressBar1 = new RyzStudio.Windows.ThemedForms.TProgressBar();
((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit();
@@ -246,7 +246,7 @@ namespace FizzyLauncher
{
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);
button2.LabelText = (this.IsBusy ? "&Stop" : "&Run");
diff --git a/skye.sln b/skye.sln
index 94d56d8..648d3b1 100644
--- a/skye.sln
+++ b/skye.sln
@@ -1,10 +1,12 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.31410.357
+# Visual Studio Version 17
+VisualStudioVersion = 17.4.33205.214
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BookmarkManager", "BookmarkManager.csproj", "{4833FB27-0817-4720-A54B-180369B0C374}"
EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RyzStudio3", "..\..\gitlab-hiimray\ryzstudio3\RyzStudio3.csproj", "{25B10AC4-28A0-4C2F-A158-51D0FADC8295}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
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}.Release|Any CPU.ActiveCfg = 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
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE