Updated to net6 + update ryz packages

This commit is contained in:
Ray committed 2022-12-26 23:37:53 +00:00
1 parent f674e6bed8
commit 48b8127258
23 files changed
+211 -95

No files matched your search

+5 -6
View File
@@ -52,7 +52,7 @@ namespace FizzyLauncher.Windows.Forms
this.textBox1.Name = "textBox1";
this.textBox1.Padding = new System.Windows.Forms.Padding(10, 10, 9, 9);
this.textBox1.Size = new System.Drawing.Size(177, 35);
this.textBox1.SubmitButton = null;
this.textBox1.AcceptButton = null;
this.textBox1.TabIndex = 152;
this.textBox1.UseSystemPasswordChar = false;
//
@@ -87,14 +87,13 @@ namespace FizzyLauncher.Windows.Forms
//
this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.button1.BackColor = System.Drawing.Color.Transparent;
this.button1.DefaultImage = null;
this.button1.DownImage = null;
this.button1.IsSelected = false;
this.button1.IdleImage = null;
this.button1.ActiveImage = null;
this.button1.LabelText = "&Save";
this.button1.Location = new System.Drawing.Point(241, 469);
this.button1.Margin = new System.Windows.Forms.Padding(10);
this.button1.Name = "button1";
this.button1.OverImage = null;
this.button1.HoverImage = null;
this.button1.Padding = new System.Windows.Forms.Padding(4, 4, 3, 3);
this.button1.Size = new System.Drawing.Size(128, 32);
this.button1.TabIndex = 173;
@@ -110,7 +109,7 @@ namespace FizzyLauncher.Windows.Forms
this.pickerBox1.Name = "pickerBox1";
this.pickerBox1.Padding = new System.Windows.Forms.Padding(10, 6, 7, 5);
this.pickerBox1.Size = new System.Drawing.Size(84, 34);
this.pickerBox1.SubmitButton = null;
this.pickerBox1.AcceptButton = null;
this.pickerBox1.TabIndex = 174;
//
// horizontalSeparator2
+5 -6
View File
@@ -75,7 +75,7 @@ namespace FizzyLauncher.Windows.Forms
this.textBox1.Name = "textBox1";
this.textBox1.Padding = new System.Windows.Forms.Padding(10, 10, 9, 9);
this.textBox1.Size = new System.Drawing.Size(177, 35);
this.textBox1.SubmitButton = null;
this.textBox1.AcceptButton = null;
this.textBox1.TabIndex = 152;
this.textBox1.UseSystemPasswordChar = false;
//
@@ -97,14 +97,13 @@ namespace FizzyLauncher.Windows.Forms
//
this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.button1.BackColor = System.Drawing.Color.Transparent;
this.button1.DefaultImage = null;
this.button1.DownImage = null;
this.button1.IsSelected = false;
this.button1.IdleImage = null;
this.button1.ActiveImage = null;
this.button1.LabelText = "&Save";
this.button1.Location = new System.Drawing.Point(241, 469);
this.button1.Margin = new System.Windows.Forms.Padding(10);
this.button1.Name = "button1";
this.button1.OverImage = null;
this.button1.HoverImage = null;
this.button1.Padding = new System.Windows.Forms.Padding(4, 4, 3, 3);
this.button1.Size = new System.Drawing.Size(128, 32);
this.button1.TabIndex = 173;
@@ -139,7 +138,7 @@ namespace FizzyLauncher.Windows.Forms
this.listBox1.Name = "listBox1";
this.listBox1.Padding = new System.Windows.Forms.Padding(10, 6, 7, 5);
this.listBox1.Size = new System.Drawing.Size(260, 346);
this.listBox1.SubmitButton = null;
this.listBox1.AcceptButton = null;
this.listBox1.TabIndex = 180;
this.listBox1.OnAdd += new System.EventHandler(this.listBox1_OnAdd);
this.listBox1.OnEdit += new System.EventHandler(this.listBox1_OnEdit);
+17 -17
View File
@@ -1,5 +1,6 @@
using FizzyLauncher.Models;
using RyzStudio.Windows.ThemedForms;
using RyzStudio.Windows.ThemedForms.ButtonTextBox;
using System;
using System.Drawing;
@@ -82,19 +83,19 @@ namespace FizzyLauncher.Windows.Forms
private void InitializeComponent()
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(EditTileForm));
this.textBox1 = new RyzStudio.Windows.ThemedForms.TTextBox();
this.textBox1 = new TTextBox();
this.label6 = new System.Windows.Forms.Label();
this.label7 = new System.Windows.Forms.Label();
this.label4 = new System.Windows.Forms.Label();
this.label3 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
this.label1 = new System.Windows.Forms.Label();
this.textBox2 = new RyzStudio.Windows.ThemedForms.TOpenFileTextBox();
this.textBox3 = new RyzStudio.Windows.ThemedForms.TTextBox();
this.textBox4 = new RyzStudio.Windows.ThemedForms.TFolderTextBox();
this.button1 = new RyzStudio.Windows.ThemedForms.TButton();
this.pickerBox1 = new RyzStudio.Windows.ThemedForms.TPickerBox();
this.pickerBox2 = new RyzStudio.Windows.ThemedForms.TPickerBox();
this.textBox2 = new TOpenFileTextBox();
this.textBox3 = new TTextBox();
this.textBox4 = new TFolderTextBox();
this.button1 = new TButton();
this.pickerBox1 = new TPickerBox();
this.pickerBox2 = new TPickerBox();
this.horizontalSeparator1 = new RyzStudio.Windows.Forms.THorizontalSeparator();
this.horizontalSeparator2 = new RyzStudio.Windows.Forms.THorizontalSeparator();
this.SuspendLayout();
@@ -110,7 +111,7 @@ namespace FizzyLauncher.Windows.Forms
this.textBox1.Name = "textBox1";
this.textBox1.Padding = new System.Windows.Forms.Padding(10, 10, 9, 9);
this.textBox1.Size = new System.Drawing.Size(177, 35);
this.textBox1.SubmitButton = null;
this.textBox1.AcceptButton = null;
this.textBox1.TabIndex = 152;
this.textBox1.UseSystemPasswordChar = false;
//
@@ -207,7 +208,7 @@ namespace FizzyLauncher.Windows.Forms
this.textBox2.NormalImage = ((System.Drawing.Image)(resources.GetObject("textBox2.NormalImage")));
this.textBox2.Padding = new System.Windows.Forms.Padding(10, 10, 9, 9);
this.textBox2.Size = new System.Drawing.Size(177, 35);
this.textBox2.SubmitButton = null;
this.textBox2.AcceptButton = null;
this.textBox2.TabIndex = 170;
this.textBox2.UseSystemPasswordChar = false;
//
@@ -222,7 +223,7 @@ namespace FizzyLauncher.Windows.Forms
this.textBox3.Name = "textBox3";
this.textBox3.Padding = new System.Windows.Forms.Padding(10, 10, 9, 9);
this.textBox3.Size = new System.Drawing.Size(177, 35);
this.textBox3.SubmitButton = null;
this.textBox3.AcceptButton = null;
this.textBox3.TabIndex = 171;
this.textBox3.UseSystemPasswordChar = false;
//
@@ -240,7 +241,7 @@ namespace FizzyLauncher.Windows.Forms
this.textBox4.NormalImage = ((System.Drawing.Image)(resources.GetObject("textBox4.NormalImage")));
this.textBox4.Padding = new System.Windows.Forms.Padding(10, 10, 9, 9);
this.textBox4.Size = new System.Drawing.Size(177, 35);
this.textBox4.SubmitButton = null;
this.textBox4.AcceptButton = null;
this.textBox4.TabIndex = 172;
this.textBox4.UseSystemPasswordChar = false;
//
@@ -248,14 +249,13 @@ namespace FizzyLauncher.Windows.Forms
//
this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.button1.BackColor = System.Drawing.Color.Transparent;
this.button1.DefaultImage = null;
this.button1.DownImage = null;
this.button1.IsSelected = false;
this.button1.IdleImage = null;
this.button1.ActiveImage = null;
this.button1.LabelText = "&Save";
this.button1.Location = new System.Drawing.Point(241, 469);
this.button1.Margin = new System.Windows.Forms.Padding(10);
this.button1.Name = "button1";
this.button1.OverImage = null;
this.button1.HoverImage = null;
this.button1.Padding = new System.Windows.Forms.Padding(4, 4, 3, 3);
this.button1.Size = new System.Drawing.Size(128, 32);
this.button1.TabIndex = 173;
@@ -271,7 +271,7 @@ namespace FizzyLauncher.Windows.Forms
this.pickerBox1.Name = "pickerBox1";
this.pickerBox1.Padding = new System.Windows.Forms.Padding(10, 6, 7, 5);
this.pickerBox1.Size = new System.Drawing.Size(128, 34);
this.pickerBox1.SubmitButton = null;
this.pickerBox1.AcceptButton = null;
this.pickerBox1.TabIndex = 174;
//
// pickerBox2
@@ -284,7 +284,7 @@ namespace FizzyLauncher.Windows.Forms
this.pickerBox2.Name = "pickerBox2";
this.pickerBox2.Padding = new System.Windows.Forms.Padding(10, 6, 7, 5);
this.pickerBox2.Size = new System.Drawing.Size(84, 34);
this.pickerBox2.SubmitButton = null;
this.pickerBox2.AcceptButton = null;
this.pickerBox2.TabIndex = 175;
//
// horizontalSeparator1
+2 -2
View File
@@ -98,7 +98,7 @@ namespace FizzyLauncher.Windows.Forms
public void Add(TilePanelLayout tilePanelLayout)
{
ThreadControl.Add(flowLayoutPanel1, tilePanelLayout);
UIControl.Add(flowLayoutPanel1, tilePanelLayout);
this.InvalidateColumnSize();
}
@@ -112,7 +112,7 @@ namespace FizzyLauncher.Windows.Forms
public void Clear()
{
ThreadControl.Clear(flowLayoutPanel1);
UIControl.Clear(flowLayoutPanel1);
this.TileWidthCount = DEFAULT_COLUMN;
+3 -4
View File
@@ -1,12 +1,11 @@
using FizzyLauncher.Models;
using RyzStudio.Windows.Forms;
using System;
using System;
using System.ComponentModel;
using System.Diagnostics;
using System.Drawing;
using System.IO;
using System.Windows.Forms;
using AppResource = FizzyLauncher.AppResource;
using FizzyLauncher.Models;
using RyzStudio.Windows.ThemedForms;
namespace FizzyLauncher.Windows.Forms
{
+8 -8
View File
@@ -1,6 +1,4 @@
using FizzyLauncher.Models;
using RyzStudio.Windows.Forms;
using System;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Drawing;
@@ -9,7 +7,9 @@ using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using System.Windows.Forms;
using AppResource = FizzyLauncher.AppResource;
using FizzyLauncher.Models;
using RyzStudio.Windows.Forms;
using RyzStudio.Windows.ThemedForms;
namespace FizzyLauncher.Windows.Forms
{
@@ -330,13 +330,13 @@ namespace FizzyLauncher.Windows.Forms
{
while (this.Height > this.CollapseHeight)
{
ThreadControl.SetHeight(this, (this.Height - collapseIncrement));
UIControl.SetHeight(this, (this.Height - collapseIncrement));
Thread.Sleep(10);
}
}
ThreadControl.SetHeight(this, this.CollapseHeight);
UIControl.SetHeight(this, this.CollapseHeight);
isAnimating = false;
@@ -357,12 +357,12 @@ namespace FizzyLauncher.Windows.Forms
{
while (this.Height < this.ExpandedHeight)
{
ThreadControl.SetHeight(this, (this.Height + expandIncrement));
UIControl.SetHeight(this, (this.Height + expandIncrement));
Thread.Sleep(10);
}
}
ThreadControl.SetHeight(this, this.ExpandedHeight);
UIControl.SetHeight(this, this.ExpandedHeight);
isAnimating = false;