feature/net-6-upgrade #1

Merged
Ray merged 4 commits from feature/net-6-upgrade into master 2022-12-29 14:37:12 +00:00
10 changed files with 33 additions and 8 deletions
Showing only changes of commit 501459bd50 - Show all commits

View File

@ -89,6 +89,26 @@ namespace FizzyLauncher {
}
}
/// <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>

View File

@ -127,6 +127,12 @@
<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>

4
MainForm.Designer.cs generated
View File

@ -129,7 +129,7 @@ namespace FizzyLauncher
//
// newToolStripMenuItem
//
this.newToolStripMenuItem.Image = global::RyzStudio.UIResource1.file;
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.UIResource1.folder;
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);

View File

@ -1,4 +1,5 @@
using FizzyLauncher.Models;
using RyzStudio.Drawing;
using RyzStudio.Text.Json;
using RyzStudio.Windows.Forms;
using System;

Binary file not shown.

BIN
Resources/file.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 390 B

BIN
Resources/folder.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 318 B

View File

@ -5,11 +5,10 @@ using System.Drawing;
using System.IO;
using System.Windows.Forms;
using FizzyLauncher.Models;
using RyzStudio.Windows.ThemedForms;
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();

View File

@ -9,11 +9,10 @@ using System.Threading.Tasks;
using System.Windows.Forms;
using FizzyLauncher.Models;
using RyzStudio.Windows.Forms;
using RyzStudio.Windows.ThemedForms;
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);

View File

@ -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