diff --git a/BookmarkManager.csproj b/BookmarkManager.csproj index de0e693..b7b0818 100644 --- a/BookmarkManager.csproj +++ b/BookmarkManager.csproj @@ -117,7 +117,12 @@ - + + References\Ryz3core.dll + + + References\Ryz3ui.dll + \ No newline at end of file diff --git a/MainForm.Designer.cs b/MainForm.Designer.cs index 4f546ba..55c8220 100644 --- a/MainForm.Designer.cs +++ b/MainForm.Designer.cs @@ -97,7 +97,6 @@ namespace FizzyLauncher this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripButton4 = new System.Windows.Forms.ToolStripButton(); this.treeView1 = new RyzStudio.Windows.Forms.BookmarkTreeView(); - this.toolStripButton5 = new System.Windows.Forms.ToolStripButton(); this.menuStrip1.SuspendLayout(); this.rootContextMenu.SuspendLayout(); this.folderContextMenu.SuspendLayout(); @@ -538,8 +537,7 @@ namespace FizzyLauncher this.toolStripSeparator3, this.toolStripButton3, this.toolStripSeparator4, - this.toolStripButton4, - this.toolStripButton5}); + this.toolStripButton4}); this.toolStrip1.Location = new System.Drawing.Point(0, 24); this.toolStrip1.Name = "toolStrip1"; this.toolStrip1.Size = new System.Drawing.Size(300, 25); @@ -606,15 +604,6 @@ namespace FizzyLauncher this.treeView1.Size = new System.Drawing.Size(300, 531); this.treeView1.TabIndex = 5; // - // toolStripButton5 - // - this.toolStripButton5.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.toolStripButton5.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton5.Image"))); - this.toolStripButton5.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButton5.Name = "toolStripButton5"; - this.toolStripButton5.Size = new System.Drawing.Size(23, 22); - this.toolStripButton5.Text = "toolStripButton5"; - // // MainForm // this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); @@ -707,7 +696,6 @@ namespace FizzyLauncher private System.Windows.Forms.ToolStripSeparator toolStripSeparator4; private System.Windows.Forms.ToolStripButton toolStripButton4; private RyzStudio.Windows.Forms.BookmarkTreeView treeView1; - private System.Windows.Forms.ToolStripButton toolStripButton5; } } diff --git a/MainForm.cs b/MainForm.cs index 3869a40..b3cc9b3 100644 --- a/MainForm.cs +++ b/MainForm.cs @@ -94,9 +94,6 @@ namespace FizzyLauncher { newToolStripMenuItem_Click(null, null); } - - /// todo: clean-up - toolStripButton5.Image = SimpleShapeGenerator.Circle(16, 1.6F, Color.Black); } protected async override void OnClosing(CancelEventArgs e) diff --git a/MainForm.resx b/MainForm.resx index 256477a..f254feb 100644 --- a/MainForm.resx +++ b/MainForm.resx @@ -79,15 +79,6 @@ 1290, 17 - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACRSURBVDhPY/j27dt/SjDYACcnJ7IwigEf3n8kCZNswPNb - J/+f6DYF0yA+yQac6Db5f6hWCmwIiE+mC0wIu2DS2Vf/F1x6DefjwlgNyNr34r/0wkdgTMgQDAOQNRNj - CIoBOg0rMTTDMLIhIHbriZeYBmDTiIxBGkEYxge5liQDsGGQqykyAISpZwAlmIEywMAAAAc1/Jwvt6sN - AAAAAElFTkSuQmCC - - AAABAAQAMDAAAAEAIACoJQAARgAAACAgAAABACAAqBAAAO4lAAAYGAAAAQAgAIgJAACWNgAAEBAAAAEA diff --git a/References/HtmlAgilityPack.dll b/References/HtmlAgilityPack.dll new file mode 100644 index 0000000..d817f94 Binary files /dev/null and b/References/HtmlAgilityPack.dll differ diff --git a/References/Ryz3core.deps.json b/References/Ryz3core.deps.json new file mode 100644 index 0000000..0866e06 --- /dev/null +++ b/References/Ryz3core.deps.json @@ -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" + } + } +} \ No newline at end of file diff --git a/References/Ryz3core.dll b/References/Ryz3core.dll new file mode 100644 index 0000000..2a0daf0 Binary files /dev/null and b/References/Ryz3core.dll differ diff --git a/References/Ryz3ui.dll b/References/Ryz3ui.dll new file mode 100644 index 0000000..be95657 Binary files /dev/null and b/References/Ryz3ui.dll differ diff --git a/References/SQLite.Interop.dll b/References/SQLite.Interop.dll new file mode 100644 index 0000000..0736a58 Binary files /dev/null and b/References/SQLite.Interop.dll differ diff --git a/References/System.Data.SQLite.dll b/References/System.Data.SQLite.dll new file mode 100644 index 0000000..58593e6 Binary files /dev/null and b/References/System.Data.SQLite.dll differ diff --git a/skye.sln b/skye.sln index 648d3b1..9c9d90e 100644 --- a/skye.sln +++ b/skye.sln @@ -5,8 +5,6 @@ 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 @@ -17,10 +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 - {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