diff --git a/EditTileFolderForm.cs b/EditTileFolderForm.cs index 2e310ad..dffa3f3 100644 --- a/EditTileFolderForm.cs +++ b/EditTileFolderForm.cs @@ -6,11 +6,9 @@ using System.IO; using System.Linq; using System.Windows.Forms; using FizzyLauncher.Models; -using FizzyLauncher.Windows.Forms; using RyzStudio.Windows.Forms; using RyzStudio.Windows.ThemedForms; using RyzStudio.Windows.ThemedForms.ButtonTextBox; -using static RyzStudio.Windows.ThemedForms.ButtonTextBox.ThKeyCodeTextBox; namespace FizzyLauncher { diff --git a/EditTileForm.cs b/EditTileForm.cs index 8ff7721..0aa2700 100644 --- a/EditTileForm.cs +++ b/EditTileForm.cs @@ -5,7 +5,6 @@ using RyzStudio.Windows.Forms; using RyzStudio.Windows.ThemedForms; using RyzStudio.Windows.ThemedForms.ButtonTextBox; using RyzStudio.Windows.ThemedForms.PickerBox; -using static RyzStudio.Windows.ThemedForms.ButtonTextBox.ThKeyCodeTextBox; namespace FizzyLauncher { diff --git a/FizzyLauncher.csproj b/FizzyLauncher.csproj index 3e6e32e..3da3510 100644 --- a/FizzyLauncher.csproj +++ b/FizzyLauncher.csproj @@ -73,8 +73,8 @@ - - + + diff --git a/MainForm.cs b/MainForm.cs index 0104b4a..d4e5272 100644 --- a/MainForm.cs +++ b/MainForm.cs @@ -38,8 +38,6 @@ namespace FizzyLauncher notifyIcon1.Text = System.Windows.Forms.Application.ProductName; this.AutoScaleMode = AutoScaleMode.None; - //this.StartPosition = FormStartPosition.WindowsDefaultBounds; - //this.Visible = false; } protected async override void OnShown(EventArgs e) @@ -63,8 +61,6 @@ namespace FizzyLauncher this.CurrentSession = new AppOptions(); InvalidateOptions(); - - //UIControl.SetVisible(this, true); } } @@ -420,7 +416,6 @@ namespace FizzyLauncher AutoResize(); - //UIControl.SetVisible(this, true); UIControl.SetFocus(this); return true; diff --git a/Program.cs b/Program.cs index 71f4564..e10bece 100644 --- a/Program.cs +++ b/Program.cs @@ -1,7 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; using System.Windows.Forms; namespace FizzyLauncher diff --git a/References/HtmlAgilityPack.dll b/References/HtmlAgilityPack.dll deleted file mode 100644 index d817f94..0000000 Binary files a/References/HtmlAgilityPack.dll and /dev/null differ diff --git a/References/Ryz3core.deps.json b/References/Ryz3core.deps.json deleted file mode 100644 index 0866e06..0000000 --- a/References/Ryz3core.deps.json +++ /dev/null @@ -1,75 +0,0 @@ -{ - "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" - } - } -} \ No newline at end of file diff --git a/References/Ryz3core.dll b/References/Ryz3core.dll deleted file mode 100644 index 2a0daf0..0000000 Binary files a/References/Ryz3core.dll and /dev/null differ diff --git a/References/Ryz3ui.dll b/References/Ryz3ui.dll deleted file mode 100644 index f77c4e4..0000000 Binary files a/References/Ryz3ui.dll and /dev/null differ diff --git a/References/RyzStudio.8.1.2.244.nupkg b/References/RyzStudio.8.1.2.244.nupkg new file mode 100644 index 0000000..e296f09 Binary files /dev/null and b/References/RyzStudio.8.1.2.244.nupkg differ diff --git a/References/RyzStudio.Windows.Forms.8.1.2.244.nupkg b/References/RyzStudio.Windows.Forms.8.1.2.244.nupkg new file mode 100644 index 0000000..49c1773 Binary files /dev/null and b/References/RyzStudio.Windows.Forms.8.1.2.244.nupkg differ diff --git a/References/SQLite.Interop.dll b/References/SQLite.Interop.dll deleted file mode 100644 index 0736a58..0000000 Binary files a/References/SQLite.Interop.dll and /dev/null differ diff --git a/References/System.Data.SQLite.dll b/References/System.Data.SQLite.dll deleted file mode 100644 index 58593e6..0000000 Binary files a/References/System.Data.SQLite.dll and /dev/null differ diff --git a/Windows/Forms/TilePanel.cs b/Windows/Forms/TilePanel.cs index 1d2cfb4..7232c57 100644 --- a/Windows/Forms/TilePanel.cs +++ b/Windows/Forms/TilePanel.cs @@ -4,7 +4,6 @@ using System.Diagnostics; using System.Drawing; using System.IO; using System.Windows.Forms; -using System.Xml.Linq; using FizzyLauncher.Models; using RyzStudio.Windows.Forms; @@ -23,6 +22,7 @@ namespace FizzyLauncher.Windows.Forms this.ContextMenuStrip = contextMenuStrip1; this.Font = new Font(this.Font.FontFamily, 8.25F); this.Size = new Size(70, 70); + this.AutoScaleMode = AutoScaleMode.None; this.EnableMovable = true; } @@ -53,13 +53,6 @@ namespace FizzyLauncher.Windows.Forms InvalidateGroupMenu(this.ModelInfo); } - else - { - //if (this.PanelContainer != null) - //{ - // this.PanelContainer.LoadShortcuts(fileList); - //} - } } protected override void OnMouseClick(MouseEventArgs e) @@ -240,8 +233,7 @@ namespace FizzyLauncher.Windows.Forms protected void InvalidateGroupMenu(TileModel model) { - //var iconSize = ((this.PanelContainer?.MainForm?.CurrentSession?.EnableBigIconInFolder ?? true) ? 24 : 16); - var iconSize = 24; + var iconSize = ((this.MainForm?.CurrentSession?.ShowBigIcons ?? true) ? 24 : 16); if (this.LeftContextMenuStrip == null) { diff --git a/skye.sln b/skye.sln index 95187b0..94d918f 100644 --- a/skye.sln +++ b/skye.sln @@ -5,12 +5,6 @@ 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 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RyzStudio", "..\ryzstudio8\core\RyzStudio.csproj", "{C790A76B-C968-476E-AD96-C8DA6147C0B4}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RyzStudio.Windows.Forms", "..\ryzstudio8\windows.forms\RyzStudio.Windows.Forms.csproj", "{C828C8E9-F46C-444E-8C0F-A2C7887B1117}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RyzStudio.Data.Sqlite", "..\ryzstudio8\data.sqlite\RyzStudio.Data.Sqlite.csproj", "{96E88371-0C86-4574-A507-FF19092C840B}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -21,18 +15,6 @@ 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 - {C790A76B-C968-476E-AD96-C8DA6147C0B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C790A76B-C968-476E-AD96-C8DA6147C0B4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C790A76B-C968-476E-AD96-C8DA6147C0B4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C790A76B-C968-476E-AD96-C8DA6147C0B4}.Release|Any CPU.Build.0 = Release|Any CPU - {C828C8E9-F46C-444E-8C0F-A2C7887B1117}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C828C8E9-F46C-444E-8C0F-A2C7887B1117}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C828C8E9-F46C-444E-8C0F-A2C7887B1117}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C828C8E9-F46C-444E-8C0F-A2C7887B1117}.Release|Any CPU.Build.0 = Release|Any CPU - {96E88371-0C86-4574-A507-FF19092C840B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {96E88371-0C86-4574-A507-FF19092C840B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {96E88371-0C86-4574-A507-FF19092C840B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {96E88371-0C86-4574-A507-FF19092C840B}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE