Merge pull request 'feature/net-6-upgrade' (#1) from feature/net-6-upgrade into master
Reviewed-on: #1
This commit is contained in:
commit
b4f041c088
52
AppResource.Designer.cs
generated
52
AppResource.Designer.cs
generated
@ -19,7 +19,7 @@ namespace FizzyLauncher {
|
||||
// class via a tool like ResGen or Visual Studio.
|
||||
// To add or remove a member, edit your .ResX file then rerun ResGen
|
||||
// with the /str option, or rebuild your VS project.
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
|
||||
internal class AppResource {
|
||||
@ -69,6 +69,46 @@ namespace FizzyLauncher {
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
||||
/// </summary>
|
||||
internal static System.Drawing.Bitmap cog2 {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("cog2", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
||||
/// </summary>
|
||||
internal static System.Drawing.Bitmap disk2 {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("disk2", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
||||
/// </summary>
|
||||
internal static System.Drawing.Bitmap file {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("file", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
||||
/// </summary>
|
||||
internal static System.Drawing.Bitmap folder {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("folder", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
||||
/// </summary>
|
||||
@ -79,6 +119,16 @@ namespace FizzyLauncher {
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
||||
/// </summary>
|
||||
internal static System.Drawing.Bitmap help2 {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("help2", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
||||
/// </summary>
|
||||
|
@ -112,18 +112,33 @@
|
||||
<value>2.0</value>
|
||||
</resheader>
|
||||
<resheader name="reader">
|
||||
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
<resheader name="writer">
|
||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
<data name="AppHelpURL" xml:space="preserve">
|
||||
<value>https://www.hiimray.co.uk/software-fizzy-launcher</value>
|
||||
</data>
|
||||
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
<data name="cog2" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>Resources\cog2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="disk2" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>Resources\disk2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="file" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>Resources\file.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="folder" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>Resources\folder.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="folder_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>Resources\folder_32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="help2" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>Resources\help2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="toggle_left_ea_16" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>Resources\toggle-left-ea-16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
|
@ -2,7 +2,7 @@
|
||||
|
||||
<PropertyGroup>
|
||||
<OutputType>WinExe</OutputType>
|
||||
<TargetFramework>net5.0-windows</TargetFramework>
|
||||
<TargetFramework>net6.0-windows</TargetFramework>
|
||||
<UseWindowsForms>true</UseWindowsForms>
|
||||
<NoWin32Manifest>true</NoWin32Manifest>
|
||||
<ApplicationIcon>favicon.ico</ApplicationIcon>
|
||||
@ -12,9 +12,11 @@
|
||||
<Company>Hi, I'm Ray</Company>
|
||||
<Product>Fizzy Launcher</Product>
|
||||
<Copyright>Ray Lam</Copyright>
|
||||
<AssemblyVersion>0.2.4.117</AssemblyVersion>
|
||||
<FileVersion>0.2.4.117</FileVersion>
|
||||
<Version>0.2.4.117</Version>
|
||||
<AssemblyVersion>1.0.0.0</AssemblyVersion>
|
||||
<FileVersion>1.0.0.0</FileVersion>
|
||||
<Version>0.2.5.058</Version>
|
||||
<EnableNETAnalyzers>False</EnableNETAnalyzers>
|
||||
<PlatformTarget>x64</PlatformTarget>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
||||
@ -57,8 +59,11 @@
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Reference Include="RyzStudio3">
|
||||
<HintPath>References\RyzStudio3.dll</HintPath>
|
||||
<Reference Include="Ryz3core">
|
||||
<HintPath>References\Ryz3core.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Ryz3ui">
|
||||
<HintPath>References\Ryz3ui.dll</HintPath>
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
|
||||
|
10
MainForm.Designer.cs
generated
10
MainForm.Designer.cs
generated
@ -129,7 +129,7 @@ namespace FizzyLauncher
|
||||
//
|
||||
// newToolStripMenuItem
|
||||
//
|
||||
this.newToolStripMenuItem.Image = global::RyzStudio.UIResource.file2;
|
||||
this.newToolStripMenuItem.Image = AppResource.file;
|
||||
this.newToolStripMenuItem.Name = "newToolStripMenuItem";
|
||||
this.newToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.N)));
|
||||
this.newToolStripMenuItem.Size = new System.Drawing.Size(146, 22);
|
||||
@ -138,7 +138,7 @@ namespace FizzyLauncher
|
||||
//
|
||||
// openToolStripMenuItem
|
||||
//
|
||||
this.openToolStripMenuItem.Image = global::RyzStudio.UIResource.folder2;
|
||||
this.openToolStripMenuItem.Image = AppResource.folder;
|
||||
this.openToolStripMenuItem.Name = "openToolStripMenuItem";
|
||||
this.openToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O)));
|
||||
this.openToolStripMenuItem.Size = new System.Drawing.Size(146, 22);
|
||||
@ -164,7 +164,7 @@ namespace FizzyLauncher
|
||||
//
|
||||
// saveToolStripMenuItem
|
||||
//
|
||||
this.saveToolStripMenuItem.Image = global::RyzStudio.UIResource.disk2;
|
||||
this.saveToolStripMenuItem.Image = AppResource.disk2;
|
||||
this.saveToolStripMenuItem.Name = "saveToolStripMenuItem";
|
||||
this.saveToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S)));
|
||||
this.saveToolStripMenuItem.Size = new System.Drawing.Size(146, 22);
|
||||
@ -246,7 +246,7 @@ namespace FizzyLauncher
|
||||
//
|
||||
// optionsToolStripMenuItem
|
||||
//
|
||||
this.optionsToolStripMenuItem.Image = global::RyzStudio.UIResource.cog2;
|
||||
this.optionsToolStripMenuItem.Image = AppResource.cog2;
|
||||
this.optionsToolStripMenuItem.Name = "optionsToolStripMenuItem";
|
||||
this.optionsToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.F12)));
|
||||
this.optionsToolStripMenuItem.Size = new System.Drawing.Size(168, 22);
|
||||
@ -265,7 +265,7 @@ namespace FizzyLauncher
|
||||
//
|
||||
// viewHelpToolStripMenuItem1
|
||||
//
|
||||
this.viewHelpToolStripMenuItem1.Image = global::RyzStudio.UIResource.help2;
|
||||
this.viewHelpToolStripMenuItem1.Image = AppResource.help2;
|
||||
this.viewHelpToolStripMenuItem1.Name = "viewHelpToolStripMenuItem1";
|
||||
this.viewHelpToolStripMenuItem1.ShortcutKeys = System.Windows.Forms.Keys.F1;
|
||||
this.viewHelpToolStripMenuItem1.Size = new System.Drawing.Size(146, 22);
|
||||
|
33
MainForm.cs
33
MainForm.cs
@ -1,4 +1,5 @@
|
||||
using FizzyLauncher.Models;
|
||||
using RyzStudio.Drawing;
|
||||
using RyzStudio.Text.Json;
|
||||
using RyzStudio.Windows.Forms;
|
||||
using System;
|
||||
@ -53,15 +54,15 @@ namespace FizzyLauncher
|
||||
|
||||
this.AutoScaleMode = AutoScaleMode.None;
|
||||
|
||||
ThreadControl.SetVisible(this, false);
|
||||
ThreadControl.SetSize(this, this.MinimumSize);
|
||||
UIControl.SetVisible(this, false);
|
||||
UIControl.SetSize(this, this.MinimumSize);
|
||||
}
|
||||
|
||||
protected async override void OnShown(EventArgs e)
|
||||
{
|
||||
base.OnShown(e);
|
||||
|
||||
ThreadControl.SetVisible(this, false);
|
||||
UIControl.SetVisible(this, false);
|
||||
|
||||
string[] commandLineArgs = Environment.GetCommandLineArgs();
|
||||
|
||||
@ -77,7 +78,7 @@ namespace FizzyLauncher
|
||||
{
|
||||
this.CurrentSession = new LauncherSession();
|
||||
|
||||
ThreadControl.SetVisible(this, true);
|
||||
UIControl.SetVisible(this, true);
|
||||
}
|
||||
}
|
||||
|
||||
@ -183,12 +184,12 @@ namespace FizzyLauncher
|
||||
{
|
||||
while (this.Width > width)
|
||||
{
|
||||
ThreadControl.SetWidth(this, (this.Width - increment));
|
||||
UIControl.SetWidth(this, (this.Width - increment));
|
||||
|
||||
Application.DoEvents();
|
||||
}
|
||||
|
||||
ThreadControl.SetWidth(this, width);
|
||||
UIControl.SetWidth(this, width);
|
||||
});
|
||||
}
|
||||
|
||||
@ -198,12 +199,12 @@ namespace FizzyLauncher
|
||||
{
|
||||
while (this.Width < width)
|
||||
{
|
||||
ThreadControl.SetWidth(this, (this.Width + increment));
|
||||
UIControl.SetWidth(this, (this.Width + increment));
|
||||
|
||||
Application.DoEvents();
|
||||
}
|
||||
|
||||
ThreadControl.SetWidth(this, width);
|
||||
UIControl.SetWidth(this, width);
|
||||
});
|
||||
}
|
||||
|
||||
@ -350,16 +351,16 @@ namespace FizzyLauncher
|
||||
tileContainer1.Load(this.CurrentSession.Groups);
|
||||
|
||||
// reposition
|
||||
if (!this.CurrentSession.StartPosition.IsEmpty) ThreadControl.SetLocation(this, this.CurrentSession.StartPosition);
|
||||
if (!this.CurrentSession.StartPosition.IsEmpty) UIControl.SetLocation(this, this.CurrentSession.StartPosition);
|
||||
|
||||
//
|
||||
ThreadControl.SetTopMost(this, this.CurrentSession.AlwaysOnTop);
|
||||
ThreadControl.SetVisible(this, true);
|
||||
ThreadControl.SetChecked(enableAnimationsToolStripMenuItem, this.CurrentSession.EnableAnimation);
|
||||
ThreadControl.SetChecked(showBigIconsToolStripMenuItem, this.CurrentSession.EnableBigIconInFolder);
|
||||
ThreadControl.SetClientHeight(this, this.CurrentSession.DefaultHeight);
|
||||
UIControl.SetTopMost(this, this.CurrentSession.AlwaysOnTop);
|
||||
UIControl.SetVisible(this, true);
|
||||
UIControl.SetChecked(enableAnimationsToolStripMenuItem, this.CurrentSession.EnableAnimation);
|
||||
UIControl.SetChecked(showBigIconsToolStripMenuItem, this.CurrentSession.EnableBigIconInFolder);
|
||||
UIControl.SetClientHeight(this, this.CurrentSession.DefaultHeight);
|
||||
|
||||
ThreadControl.SetFocus(this);
|
||||
UIControl.SetFocus(this);
|
||||
|
||||
// hotkey
|
||||
invalidateHotKey();
|
||||
@ -731,7 +732,7 @@ namespace FizzyLauncher
|
||||
{
|
||||
int newWidth = this.Padding.Horizontal + SystemInformation.VerticalScrollBarWidth + tileContainer1.CalcWidth;
|
||||
|
||||
ThreadControl.SetClientWidth(this, newWidth);
|
||||
UIControl.SetClientWidth(this, newWidth);
|
||||
}
|
||||
|
||||
}
|
||||
|
15
NewForm.cs
15
NewForm.cs
@ -17,9 +17,9 @@ namespace FizzyLauncher
|
||||
|
||||
parentForm = parent;
|
||||
|
||||
numericBox1.InnerControl.Minimum = 4;
|
||||
numericBox1.InnerControl.Maximum = 24;
|
||||
numericBox1.InnerControl.Value = 6;
|
||||
numericBox1.Minimum = 4;
|
||||
numericBox1.Maximum = 24;
|
||||
numericBox1.Value = 6;
|
||||
}
|
||||
|
||||
private void InitializeComponent()
|
||||
@ -48,14 +48,13 @@ namespace FizzyLauncher
|
||||
//
|
||||
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, 109);
|
||||
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;
|
||||
@ -87,7 +86,7 @@ namespace FizzyLauncher
|
||||
this.numericBox1.Name = "numericBox1";
|
||||
this.numericBox1.Padding = new System.Windows.Forms.Padding(8, 8, 7, 7);
|
||||
this.numericBox1.Size = new System.Drawing.Size(84, 34);
|
||||
this.numericBox1.SubmitButton = null;
|
||||
this.numericBox1.AcceptButton = null;
|
||||
this.numericBox1.TabIndex = 189;
|
||||
this.numericBox1.Value = 0;
|
||||
//
|
||||
|
@ -1,5 +1,7 @@
|
||||
using FizzyLauncher.Models;
|
||||
using RyzStudio.Windows.ThemedForms;
|
||||
using RyzStudio.Windows.ThemedForms.ButtonTextBox;
|
||||
using RyzStudio.Windows.ThemedForms.PickerBox;
|
||||
using System;
|
||||
|
||||
namespace FizzyLauncher
|
||||
@ -37,17 +39,17 @@ namespace FizzyLauncher
|
||||
private void InitializeComponent()
|
||||
{
|
||||
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(OptionsForm));
|
||||
RyzStudio.Windows.ThemedForms.TKeyCodeTextBox.Results results1 = new RyzStudio.Windows.ThemedForms.TKeyCodeTextBox.Results();
|
||||
TKeyCodeTextBox.Results results1 = new TKeyCodeTextBox.Results();
|
||||
this.label1 = new System.Windows.Forms.Label();
|
||||
this.button1 = new RyzStudio.Windows.ThemedForms.TButton();
|
||||
this.pickerBox2 = new RyzStudio.Windows.ThemedForms.TYesNoPickerBox();
|
||||
this.button1 = new TButton();
|
||||
this.pickerBox2 = new TYesNoPickerBox();
|
||||
this.label6 = new System.Windows.Forms.Label();
|
||||
this.pickerBox3 = new RyzStudio.Windows.ThemedForms.TYesNoPickerBox();
|
||||
this.pickerBox3 = new TYesNoPickerBox();
|
||||
this.label7 = new System.Windows.Forms.Label();
|
||||
this.label8 = new System.Windows.Forms.Label();
|
||||
this.pickerBox1 = new RyzStudio.Windows.ThemedForms.TPickerBox();
|
||||
this.pickerBox1 = new TPickerBox();
|
||||
this.tHorizontalSeparator1 = new RyzStudio.Windows.Forms.THorizontalSeparator();
|
||||
this.textBox1 = new RyzStudio.Windows.ThemedForms.TKeyCodeTextBox();
|
||||
this.textBox1 = new TKeyCodeTextBox();
|
||||
this.SuspendLayout();
|
||||
//
|
||||
// label1
|
||||
@ -68,14 +70,13 @@ namespace FizzyLauncher
|
||||
//
|
||||
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;
|
||||
@ -91,7 +92,7 @@ namespace FizzyLauncher
|
||||
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 = 183;
|
||||
this.pickerBox2.Value = true;
|
||||
//
|
||||
@ -119,7 +120,7 @@ namespace FizzyLauncher
|
||||
this.pickerBox3.Name = "pickerBox3";
|
||||
this.pickerBox3.Padding = new System.Windows.Forms.Padding(10, 6, 7, 5);
|
||||
this.pickerBox3.Size = new System.Drawing.Size(84, 34);
|
||||
this.pickerBox3.SubmitButton = null;
|
||||
this.pickerBox3.AcceptButton = null;
|
||||
this.pickerBox3.TabIndex = 185;
|
||||
this.pickerBox3.Value = true;
|
||||
//
|
||||
@ -161,7 +162,7 @@ namespace FizzyLauncher
|
||||
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 = 187;
|
||||
//
|
||||
// tHorizontalSeparator1
|
||||
@ -198,7 +199,7 @@ namespace FizzyLauncher
|
||||
this.textBox1.NormalImage = ((System.Drawing.Image)(resources.GetObject("textBox1.NormalImage")));
|
||||
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 = 189;
|
||||
this.textBox1.UseSystemPasswordChar = false;
|
||||
//
|
||||
|
BIN
References/HtmlAgilityPack.dll
Normal file
BIN
References/HtmlAgilityPack.dll
Normal file
Binary file not shown.
75
References/Ryz3core.deps.json
Normal file
75
References/Ryz3core.deps.json
Normal file
@ -0,0 +1,75 @@
|
||||
{
|
||||
"runtimeTarget": {
|
||||
"name": ".NETCoreApp,Version=v6.0/win-x64",
|
||||
"signature": ""
|
||||
},
|
||||
"compilationOptions": {},
|
||||
"targets": {
|
||||
".NETCoreApp,Version=v6.0": {},
|
||||
".NETCoreApp,Version=v6.0/win-x64": {
|
||||
"Ryz3core/0.1.5.035": {
|
||||
"dependencies": {
|
||||
"HtmlAgilityPack": "1.11.46",
|
||||
"System.Data.SQLite.Core": "1.0.117"
|
||||
},
|
||||
"runtime": {
|
||||
"Ryz3core.dll": {}
|
||||
}
|
||||
},
|
||||
"HtmlAgilityPack/1.11.46": {
|
||||
"runtime": {
|
||||
"lib/netstandard2.0/HtmlAgilityPack.dll": {
|
||||
"assemblyVersion": "1.11.46.0",
|
||||
"fileVersion": "1.11.46.0"
|
||||
}
|
||||
}
|
||||
},
|
||||
"Stub.System.Data.SQLite.Core.NetStandard/1.0.117": {
|
||||
"runtime": {
|
||||
"lib/netstandard2.1/System.Data.SQLite.dll": {
|
||||
"assemblyVersion": "1.0.117.0",
|
||||
"fileVersion": "1.0.117.0"
|
||||
}
|
||||
},
|
||||
"native": {
|
||||
"runtimes/win-x64/native/SQLite.Interop.dll": {
|
||||
"fileVersion": "1.0.117.0"
|
||||
}
|
||||
}
|
||||
},
|
||||
"System.Data.SQLite.Core/1.0.117": {
|
||||
"dependencies": {
|
||||
"Stub.System.Data.SQLite.Core.NetStandard": "1.0.117"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"libraries": {
|
||||
"Ryz3core/0.1.5.035": {
|
||||
"type": "project",
|
||||
"serviceable": false,
|
||||
"sha512": ""
|
||||
},
|
||||
"HtmlAgilityPack/1.11.46": {
|
||||
"type": "package",
|
||||
"serviceable": true,
|
||||
"sha512": "sha512-dLMn4EVfJBHWmWK4Uh0XGD76FPLHI0qr2Tm0s1m/xmgiHb1JUb9zB8AzO8HtrkBBlMN6JfCUBYddhqC0hZNR+g==",
|
||||
"path": "htmlagilitypack/1.11.46",
|
||||
"hashPath": "htmlagilitypack.1.11.46.nupkg.sha512"
|
||||
},
|
||||
"Stub.System.Data.SQLite.Core.NetStandard/1.0.117": {
|
||||
"type": "package",
|
||||
"serviceable": true,
|
||||
"sha512": "sha512-x1zzPC/A4MmiKGDLoxLE6O5KLu7Kz7dyzhPQzlqYFTFcXmXAtM7hNNWpGw5yLEz833AnGbd/kxoitXArgR4YyA==",
|
||||
"path": "stub.system.data.sqlite.core.netstandard/1.0.117",
|
||||
"hashPath": "stub.system.data.sqlite.core.netstandard.1.0.117.nupkg.sha512"
|
||||
},
|
||||
"System.Data.SQLite.Core/1.0.117": {
|
||||
"type": "package",
|
||||
"serviceable": true,
|
||||
"sha512": "sha512-lGfOhA3QQod9XhdWYqLgNgbgq5uZnVG6DtnhDAdPisbLpTTgZBNbeGnp+GWt8C+3EyaqBYTGJWXcxHlHKwo05A==",
|
||||
"path": "system.data.sqlite.core/1.0.117",
|
||||
"hashPath": "system.data.sqlite.core.1.0.117.nupkg.sha512"
|
||||
}
|
||||
}
|
||||
}
|
BIN
References/Ryz3core.dll
Normal file
BIN
References/Ryz3core.dll
Normal file
Binary file not shown.
BIN
References/Ryz3ui.dll
Normal file
BIN
References/Ryz3ui.dll
Normal file
Binary file not shown.
Binary file not shown.
BIN
References/SQLite.Interop.dll
Normal file
BIN
References/SQLite.Interop.dll
Normal file
Binary file not shown.
BIN
References/System.Data.SQLite.dll
Normal file
BIN
References/System.Data.SQLite.dll
Normal file
Binary file not shown.
BIN
Resources/cog2.png
Normal file
BIN
Resources/cog2.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 467 B |
BIN
Resources/disk2.png
Normal file
BIN
Resources/disk2.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 347 B |
BIN
Resources/file.png
Normal file
BIN
Resources/file.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 390 B |
BIN
Resources/folder.png
Normal file
BIN
Resources/folder.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 318 B |
BIN
Resources/help2.png
Normal file
BIN
Resources/help2.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 436 B |
@ -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
|
||||
|
@ -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);
|
||||
|
@ -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
|
||||
|
@ -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;
|
||||
|
||||
|
@ -1,16 +1,14 @@
|
||||
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;
|
||||
|
||||
namespace FizzyLauncher.Windows.Forms
|
||||
{
|
||||
public partial class TilePanel : TUserControl
|
||||
public partial class TilePanel : RyzStudio.Windows.Forms.TC1UserControl
|
||||
{
|
||||
protected bool isDragging = false;
|
||||
protected Point startPosition = new Point();
|
||||
|
@ -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,11 +7,12 @@ 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;
|
||||
|
||||
namespace FizzyLauncher.Windows.Forms
|
||||
{
|
||||
public partial class TilePanelLayout : TUserControl
|
||||
public partial class TilePanelLayout : RyzStudio.Windows.Forms.TC1UserControl
|
||||
{
|
||||
public static int CalcWidth(int tileCount) => (tileCount * tileSize) + ((tileCount - 1) * margin);
|
||||
|
||||
@ -330,13 +329,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 +356,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;
|
||||
|
||||
|
@ -2,7 +2,7 @@
|
||||
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
|
||||
|
||||
#define MyAppName "Fizzy Launcher"
|
||||
#define MyAppVersion "0.2.4.117"
|
||||
#define MyAppVersion "0.2.5.058"
|
||||
#define MyAppPublisher "Hi, I'm Ray"
|
||||
#define MyAppURL "https://www.hiimray.co.uk/software-fizzy-launcher"
|
||||
#define MyAppExeName "fizzylauncher.exe"
|
||||
@ -23,7 +23,7 @@ DefaultGroupName={#MyAppName}
|
||||
DisableProgramGroupPage=yes
|
||||
; Remove the following line to run in administrative install mode (install for all users.)
|
||||
PrivilegesRequired=lowest
|
||||
OutputDir=L:\gitlab-hiimray\fizzy-launcher\bin
|
||||
OutputDir=L:\gitea-hiimray\linear-app-launcher\bin\Release
|
||||
OutputBaseFilename=fizzy-launcher
|
||||
Compression=lzma
|
||||
SolidCompression=yes
|
||||
@ -36,7 +36,7 @@ Name: "english"; MessagesFile: "compiler:Default.isl"
|
||||
Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
|
||||
|
||||
[Files]
|
||||
Source: "L:\gitlab-hiimray\fizzy-launcher\bin\Release\fizzylauncher.exe"; DestDir: "{app}"; Flags: ignoreversion
|
||||
Source: "L:\gitea-hiimray\linear-app-launcher\bin\Release\fizzylauncher.exe"; DestDir: "{app}"; Flags: ignoreversion
|
||||
; NOTE: Don't use "Flags: ignoreversion" on any shared system files
|
||||
|
||||
[Icons]
|
||||
|
4
skye.sln
4
skye.sln
@ -1,7 +1,7 @@
|
||||
|
||||
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}") = "FizzyLauncher", "FizzyLauncher.csproj", "{4833FB27-0817-4720-A54B-180369B0C374}"
|
||||
EndProject
|
||||
|
Reference in New Issue
Block a user