From 5f94a764089585675233bea0750443ea3d97c720 Mon Sep 17 00:00:00 2001 From: Ray Date: Tue, 9 Nov 2021 23:27:16 +0000 Subject: [PATCH] Changed to ryzstudio package + build script --- FizzyLauncher.csproj | 64 +- MainForm.Designer.cs | 10 +- MainForm.cs | 8 +- Models/TileGroupModel.cs | 6 +- Models/TileModel.cs | 5 +- Properties/PublishProfiles/Release x64.pubxml | 17 - Properties/PublishProfiles/Release x86.pubxml | 17 - References/RyzStudio3.dll | Bin 0 -> 134144 bytes Resources/UI/arrow_down.png | Bin 601 -> 0 bytes Resources/UI/arrow_down2.png | Bin 417 -> 0 bytes Resources/UI/arrow_up.png | Bin 590 -> 0 bytes Resources/UI/arrow_up2.png | Bin 410 -> 0 bytes Resources/UI/circle_menu.png | Bin 597 -> 0 bytes Resources/UI/circle_menu2.png | Bin 421 -> 0 bytes Resources/UI/close.png | Bin 367 -> 0 bytes Resources/UI/close2.png | Bin 468 -> 0 bytes Resources/UI/cog.png | Bin 713 -> 0 bytes Resources/UI/cog2.png | Bin 467 -> 0 bytes Resources/UI/disk.png | Bin 439 -> 0 bytes Resources/UI/disk2.png | Bin 347 -> 0 bytes Resources/UI/edit.png | Bin 612 -> 0 bytes Resources/UI/edit2.png | Bin 419 -> 0 bytes Resources/UI/file.png | Bin 372 -> 0 bytes Resources/UI/file2.png | Bin 323 -> 0 bytes Resources/UI/folder.png | Bin 352 -> 0 bytes Resources/UI/folder2.png | Bin 288 -> 0 bytes Resources/UI/help.png | Bin 670 -> 0 bytes Resources/UI/help2.png | Bin 436 -> 0 bytes Resources/UI/icons.svg | 603 ------------------ Resources/UI/menu.png | Bin 212 -> 0 bytes Resources/UI/menu2.png | Bin 187 -> 0 bytes Resources/UI/minus.png | Bin 532 -> 0 bytes Resources/UI/minus2.png | Bin 380 -> 0 bytes Resources/UI/pencil_line.png | Bin 630 -> 0 bytes Resources/UI/pencil_line2.png | Bin 394 -> 0 bytes Resources/UI/plus.png | Bin 559 -> 0 bytes Resources/UI/plus2.png | Bin 398 -> 0 bytes Resources/UI/trash.png | Bin 382 -> 0 bytes Resources/UI/trash2.png | Bin 289 -> 0 bytes RyzStudio/Data/SQLite/SQLiteDatabase.cs | 444 ------------- RyzStudio/Drawing/Rectangoid.cs | 124 ---- RyzStudio/IO/FileType.cs | 56 -- RyzStudio/IO/SessionFileFormatBase.cs | 290 --------- RyzStudio/IO/SharpZipLib.cs | 76 --- RyzStudio/Net/HttpWeb.cs | 168 ----- RyzStudio/Windows/Forms/StackLayoutPanel.cs | 69 -- RyzStudio/Windows/Forms/TFlatButton.cs | 115 ---- RyzStudio/Windows/Forms/TForm.cs | 434 ------------- RyzStudio/Windows/Forms/TForm.resx | 424 ------------ .../Forms/THorizontalSeparator.Designer.cs | 37 -- .../Windows/Forms/THorizontalSeparator.cs | 101 --- .../Windows/Forms/THorizontalSeparator.resx | 120 ---- RyzStudio/Windows/Forms/TImageBox.cs | 84 --- RyzStudio/Windows/Forms/TPanelBook.cs | 258 -------- RyzStudio/Windows/Forms/TUserControl.cs | 73 --- RyzStudio/Windows/Forms/ThreadControl.cs | 585 ----------------- .../ThemedForms/BorderlessForm.Designer.cs | 193 ------ .../Windows/ThemedForms/BorderlessForm.cs | 409 ------------ .../Windows/ThemedForms/BorderlessForm.resx | 158 ----- .../BorderlessToolForm.Designer.cs | 191 ------ .../Windows/ThemedForms/BorderlessToolForm.cs | 394 ------------ .../ThemedForms/BorderlessToolForm.resx | 138 ---- .../ThemedForms/PickerBox/TPickerBox.cs | 98 --- .../PickerBox/TPickerBox.designer.cs | 59 -- .../ThemedForms/PickerBox/TPickerBox.resx | 120 ---- .../ThemedForms/PickerBox/TYesNoPickerBox.cs | 17 - RyzStudio/Windows/ThemedForms/TButton.cs | 170 ----- .../Windows/ThemedForms/TButton.designer.cs | 61 -- RyzStudio/Windows/ThemedForms/TButton.resx | 120 ---- .../ThemedForms/TDialogForm.Designer.cs | 47 -- RyzStudio/Windows/ThemedForms/TDialogForm.cs | 117 ---- .../Windows/ThemedForms/TDialogForm.resx | 60 -- RyzStudio/Windows/ThemedForms/TListBox.cs | 385 ----------- .../Windows/ThemedForms/TListBox.designer.cs | 358 ----------- RyzStudio/Windows/ThemedForms/TListBox.resx | 69 -- RyzStudio/Windows/ThemedForms/TNumericBox.cs | 99 --- .../ThemedForms/TNumericBox.designer.cs | 60 -- .../Windows/ThemedForms/TNumericBox.resx | 60 -- RyzStudio/Windows/ThemedForms/TUserControl.cs | 106 --- .../ThemedForms/TUserControl.designer.cs | 37 -- .../ThemedForms/TextBox/TButtonTextBox.cs | 127 ---- .../TextBox/TButtonTextBox.designer.cs | 81 --- .../ThemedForms/TextBox/TButtonTextBox.resx | 120 ---- .../TextBox/TFolderTextBox - Copy.resx | 120 ---- .../ThemedForms/TextBox/TFolderTextBox.cs | 42 -- .../ThemedForms/TextBox/TFolderTextBox.resx | 120 ---- .../ThemedForms/TextBox/TKeyCodeTextBox.cs | 92 --- .../ThemedForms/TextBox/TOpenFileTextBox.cs | 43 -- .../Windows/ThemedForms/TextBox/TTextBox.cs | 100 --- .../ThemedForms/TextBox/TTextBox.designer.cs | 60 -- .../Windows/ThemedForms/TextBox/TTextBox.resx | 120 ---- Text/Json/JsonPointConverter.cs | 40 -- Text/Json/JsonSizeConverter.cs | 40 -- UIResource.Designer.cs | 303 --------- UIResource.resx | 193 ------ build.bat | 5 + installer-64.iss | 2 +- installer-86.iss | 2 +- FizzyLauncher.sln => skye.sln | 2 +- 99 files changed, 45 insertions(+), 9281 deletions(-) delete mode 100644 Properties/PublishProfiles/Release x64.pubxml delete mode 100644 Properties/PublishProfiles/Release x86.pubxml create mode 100644 References/RyzStudio3.dll delete mode 100644 Resources/UI/arrow_down.png delete mode 100644 Resources/UI/arrow_down2.png delete mode 100644 Resources/UI/arrow_up.png delete mode 100644 Resources/UI/arrow_up2.png delete mode 100644 Resources/UI/circle_menu.png delete mode 100644 Resources/UI/circle_menu2.png delete mode 100644 Resources/UI/close.png delete mode 100644 Resources/UI/close2.png delete mode 100644 Resources/UI/cog.png delete mode 100644 Resources/UI/cog2.png delete mode 100644 Resources/UI/disk.png delete mode 100644 Resources/UI/disk2.png delete mode 100644 Resources/UI/edit.png delete mode 100644 Resources/UI/edit2.png delete mode 100644 Resources/UI/file.png delete mode 100644 Resources/UI/file2.png delete mode 100644 Resources/UI/folder.png delete mode 100644 Resources/UI/folder2.png delete mode 100644 Resources/UI/help.png delete mode 100644 Resources/UI/help2.png delete mode 100644 Resources/UI/icons.svg delete mode 100644 Resources/UI/menu.png delete mode 100644 Resources/UI/menu2.png delete mode 100644 Resources/UI/minus.png delete mode 100644 Resources/UI/minus2.png delete mode 100644 Resources/UI/pencil_line.png delete mode 100644 Resources/UI/pencil_line2.png delete mode 100644 Resources/UI/plus.png delete mode 100644 Resources/UI/plus2.png delete mode 100644 Resources/UI/trash.png delete mode 100644 Resources/UI/trash2.png delete mode 100644 RyzStudio/Data/SQLite/SQLiteDatabase.cs delete mode 100644 RyzStudio/Drawing/Rectangoid.cs delete mode 100644 RyzStudio/IO/FileType.cs delete mode 100644 RyzStudio/IO/SessionFileFormatBase.cs delete mode 100644 RyzStudio/IO/SharpZipLib.cs delete mode 100644 RyzStudio/Net/HttpWeb.cs delete mode 100644 RyzStudio/Windows/Forms/StackLayoutPanel.cs delete mode 100644 RyzStudio/Windows/Forms/TFlatButton.cs delete mode 100644 RyzStudio/Windows/Forms/TForm.cs delete mode 100644 RyzStudio/Windows/Forms/TForm.resx delete mode 100644 RyzStudio/Windows/Forms/THorizontalSeparator.Designer.cs delete mode 100644 RyzStudio/Windows/Forms/THorizontalSeparator.cs delete mode 100644 RyzStudio/Windows/Forms/THorizontalSeparator.resx delete mode 100644 RyzStudio/Windows/Forms/TImageBox.cs delete mode 100644 RyzStudio/Windows/Forms/TPanelBook.cs delete mode 100644 RyzStudio/Windows/Forms/TUserControl.cs delete mode 100644 RyzStudio/Windows/Forms/ThreadControl.cs delete mode 100644 RyzStudio/Windows/ThemedForms/BorderlessForm.Designer.cs delete mode 100644 RyzStudio/Windows/ThemedForms/BorderlessForm.cs delete mode 100644 RyzStudio/Windows/ThemedForms/BorderlessForm.resx delete mode 100644 RyzStudio/Windows/ThemedForms/BorderlessToolForm.Designer.cs delete mode 100644 RyzStudio/Windows/ThemedForms/BorderlessToolForm.cs delete mode 100644 RyzStudio/Windows/ThemedForms/BorderlessToolForm.resx delete mode 100644 RyzStudio/Windows/ThemedForms/PickerBox/TPickerBox.cs delete mode 100644 RyzStudio/Windows/ThemedForms/PickerBox/TPickerBox.designer.cs delete mode 100644 RyzStudio/Windows/ThemedForms/PickerBox/TPickerBox.resx delete mode 100644 RyzStudio/Windows/ThemedForms/PickerBox/TYesNoPickerBox.cs delete mode 100644 RyzStudio/Windows/ThemedForms/TButton.cs delete mode 100644 RyzStudio/Windows/ThemedForms/TButton.designer.cs delete mode 100644 RyzStudio/Windows/ThemedForms/TButton.resx delete mode 100644 RyzStudio/Windows/ThemedForms/TDialogForm.Designer.cs delete mode 100644 RyzStudio/Windows/ThemedForms/TDialogForm.cs delete mode 100644 RyzStudio/Windows/ThemedForms/TDialogForm.resx delete mode 100644 RyzStudio/Windows/ThemedForms/TListBox.cs delete mode 100644 RyzStudio/Windows/ThemedForms/TListBox.designer.cs delete mode 100644 RyzStudio/Windows/ThemedForms/TListBox.resx delete mode 100644 RyzStudio/Windows/ThemedForms/TNumericBox.cs delete mode 100644 RyzStudio/Windows/ThemedForms/TNumericBox.designer.cs delete mode 100644 RyzStudio/Windows/ThemedForms/TNumericBox.resx delete mode 100644 RyzStudio/Windows/ThemedForms/TUserControl.cs delete mode 100644 RyzStudio/Windows/ThemedForms/TUserControl.designer.cs delete mode 100644 RyzStudio/Windows/ThemedForms/TextBox/TButtonTextBox.cs delete mode 100644 RyzStudio/Windows/ThemedForms/TextBox/TButtonTextBox.designer.cs delete mode 100644 RyzStudio/Windows/ThemedForms/TextBox/TButtonTextBox.resx delete mode 100644 RyzStudio/Windows/ThemedForms/TextBox/TFolderTextBox - Copy.resx delete mode 100644 RyzStudio/Windows/ThemedForms/TextBox/TFolderTextBox.cs delete mode 100644 RyzStudio/Windows/ThemedForms/TextBox/TFolderTextBox.resx delete mode 100644 RyzStudio/Windows/ThemedForms/TextBox/TKeyCodeTextBox.cs delete mode 100644 RyzStudio/Windows/ThemedForms/TextBox/TOpenFileTextBox.cs delete mode 100644 RyzStudio/Windows/ThemedForms/TextBox/TTextBox.cs delete mode 100644 RyzStudio/Windows/ThemedForms/TextBox/TTextBox.designer.cs delete mode 100644 RyzStudio/Windows/ThemedForms/TextBox/TTextBox.resx delete mode 100644 Text/Json/JsonPointConverter.cs delete mode 100644 Text/Json/JsonSizeConverter.cs delete mode 100644 UIResource.Designer.cs delete mode 100644 UIResource.resx create mode 100644 build.bat rename FizzyLauncher.sln => skye.sln (94%) diff --git a/FizzyLauncher.csproj b/FizzyLauncher.csproj index c0c79e8..ce43ce6 100644 --- a/FizzyLauncher.csproj +++ b/FizzyLauncher.csproj @@ -12,9 +12,9 @@ Hi, I'm Ray Fizzy Launcher Ray Lam - 0.2.4.032 - 0.2.4.032 - 0.2.4.032 + 0.2.4.047 + 0.2.4.047 + 0.2.4.047 @@ -28,58 +28,47 @@ - - - + + + - - - + + + - - - + + + - - - - - - - - + - - - + + + + + + References\RyzStudio3.dll + + + True True AppResource.resx - - Form - - - UserControl - - - True - True - UIResource.resx - + @@ -87,13 +76,6 @@ ResXFileCodeGenerator AppResource.Designer.cs - - TFolderTextBox.resx - - - ResXFileCodeGenerator - UIResource.Designer.cs - \ No newline at end of file diff --git a/MainForm.Designer.cs b/MainForm.Designer.cs index de4f811..302be68 100644 --- a/MainForm.Designer.cs +++ b/MainForm.Designer.cs @@ -129,7 +129,7 @@ namespace FizzyLauncher // // newToolStripMenuItem // - this.newToolStripMenuItem.Image = global::FizzyLauncher.UIResource.file2; + this.newToolStripMenuItem.Image = global::RyzStudio.UIResource.file2; 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::FizzyLauncher.UIResource.folder2; + this.openToolStripMenuItem.Image = global::RyzStudio.UIResource.folder2; 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::FizzyLauncher.UIResource.disk2; + this.saveToolStripMenuItem.Image = global::RyzStudio.UIResource.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::FizzyLauncher.UIResource.cog2; + this.optionsToolStripMenuItem.Image = global::RyzStudio.UIResource.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::FizzyLauncher.UIResource.help2; + this.viewHelpToolStripMenuItem1.Image = global::RyzStudio.UIResource.help2; this.viewHelpToolStripMenuItem1.Name = "viewHelpToolStripMenuItem1"; this.viewHelpToolStripMenuItem1.ShortcutKeys = System.Windows.Forms.Keys.F1; this.viewHelpToolStripMenuItem1.Size = new System.Drawing.Size(146, 22); diff --git a/MainForm.cs b/MainForm.cs index 9ee27e4..339feda 100644 --- a/MainForm.cs +++ b/MainForm.cs @@ -1,5 +1,5 @@ using FizzyLauncher.Models; -using FizzyLauncher.Text.Json; +using RyzStudio.Text.Json; using RyzStudio.Windows.Forms; using System; using System.Collections.Generic; @@ -271,8 +271,8 @@ namespace FizzyLauncher return openFilename; - i++; - break; + //i++; + //break; } i++; @@ -334,7 +334,7 @@ namespace FizzyLauncher { this.CurrentSession = JsonSerializer.Deserialize(sourceCode, options); } - catch (Exception exc) + catch (Exception) { MessageBox.Show("Unable to read session", "Load session"); return; diff --git a/Models/TileGroupModel.cs b/Models/TileGroupModel.cs index 6f69481..5ce4fd1 100644 --- a/Models/TileGroupModel.cs +++ b/Models/TileGroupModel.cs @@ -1,5 +1,4 @@ -using FizzyLauncher.Text.Json; -using System.Collections.Generic; +using System.Collections.Generic; using System.Drawing; using System.Text.Json.Serialization; @@ -15,7 +14,8 @@ namespace FizzyLauncher.Models public List Items { get; set; } = new List(); - [JsonConverter(typeof(JsonSizeConverter))] + [JsonConverter(typeof(RyzStudio.Text.Json.JsonSizeConverter))] public Size GridSize { get; set; } = new Size(0, 0); + } } \ No newline at end of file diff --git a/Models/TileModel.cs b/Models/TileModel.cs index 9e47756..d7fe793 100644 --- a/Models/TileModel.cs +++ b/Models/TileModel.cs @@ -1,5 +1,4 @@ -using FizzyLauncher.Text.Json; -using System; +using System; using System.Collections.Generic; using System.Diagnostics; using System.Drawing; @@ -21,7 +20,7 @@ namespace FizzyLauncher.Models public bool ProcessAsAdmin { get; set; } = false; - [JsonConverter(typeof(JsonPointConverter))] + [JsonConverter(typeof(RyzStudio.Text.Json.JsonPointConverter))] public Point Position { get; set; } public bool IsGroup { get; set; } = false; diff --git a/Properties/PublishProfiles/Release x64.pubxml b/Properties/PublishProfiles/Release x64.pubxml deleted file mode 100644 index 23a6044..0000000 --- a/Properties/PublishProfiles/Release x64.pubxml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - Release - Any CPU - bin\Release\64\ - FileSystem - net5.0-windows - win-x64 - false - True - False - - \ No newline at end of file diff --git a/Properties/PublishProfiles/Release x86.pubxml b/Properties/PublishProfiles/Release x86.pubxml deleted file mode 100644 index 56c7547..0000000 --- a/Properties/PublishProfiles/Release x86.pubxml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - Release - Any CPU - bin\Release\86\ - FileSystem - net5.0-windows - win-x86 - false - True - False - - \ No newline at end of file diff --git a/References/RyzStudio3.dll b/References/RyzStudio3.dll new file mode 100644 index 0000000000000000000000000000000000000000..8bf7e7560dedd87967cd53aa96abe388509593f9 GIT binary patch literal 134144 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
f()V!!y1RD-~+9 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 literal 0 HcmV?d00001 diff --git a/Resources/UI/arrow_down.png b/Resources/UI/arrow_down.png deleted file mode 100644 index cccf233e96a5deccc73a84bdfff320ebbdfafc31..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 601 zcmV-f0;c_mP)pF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10p>|W zK~y-6eN#PaR6!Iy=Mro-30PSKiIpPraGR~|R%2l*e}HHL+OCNp+H6D%i7rT@MYhmh z(i)A;{sSL-=OJm7fImQkE@*a-h4bX)1w7SoKjxlu?hH{wQ52b^B}r`n^C|oVz%I#t z2q9MMSsr4HCnWU%+yd|oz>cIn03dl5zyirxNiRv>2_gLYcR^}?3*aKjhojMGz13>{ ztWL`FykTamX7)hRfaI0(61e-OyZ?6gt940r#26Q2jEBSF@Hqf5Y5oXcErhUEE4~H* zA%r*8xVv{r-Uo2Ol40LRqtSYOnxth(%k}tpJbohSK+=*Ww|DBA|A%I?`2&AVZX1Bp zrQ0R#;c)m^l2w>kjPX$^DPfP~{1hsyOqeEluPBOBBnbdTQEW-N0pNO_%@lzBv}XW7 z2;r5xpOo~BpF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10WL{I zK~y-6jnlm@#8D6h@SlxrVbQ8YCtB8ZG=hYV6`zG(JOYKMKq6{25g!Gc zP~6$wzw0k?l1XmP%$dxcdoI5*fj!*fHR1+M)brw=!nqnn3wXu_?jtvfX$;~7%lMFq zukeXA^p#9j!#Y|~TP-G!LOfF<%+ZJ@`)y((h_#a9*@zq)p&2JF?D3DWFC%i)@Pyq8 zCZ&bF|6}|%-a<23!LaVO+hcE|Qs64s^7A_P80q!%DWM;$7%JpWF^{>jac*&zaZC8Z zL&R5bMVw0p)0CE2`=d#jxL;aglVs19WRe^QI4t2eL({SLVGxay;vBz>MAynK$t3x8 z1lKlD$IAI<+QA}TBm><=ZVXcxz%f>2pQ(sCc5xkzUgO*p)-B>2nOsV+E0#r300000 LNkvXXu0mjf{w}h~ diff --git a/Resources/UI/arrow_up.png b/Resources/UI/arrow_up.png deleted file mode 100644 index a08438ba358ad09ba06ed091b453a749822880e9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 590 zcmV-U0pF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10ozGL zK~y-6jZ?d7R8bUNYa=#e@&^(t#e2kQrnVc6h4}>q6HrW}CN{B|2nrHM@L9~@7lgD% zV>5r?W%d~)jS|QQXp9#$bC=DTaC22~Rhxa*eynxQA!-Dwn+9v z2(ilNB#1E{m-H0C4FF#OY)aY&0FtKx%#xgz^qS<|5W>&H2C4WhfD0ra6h*PtYPEh; zC*^tGFtcSdyDw=#^75n!-2J7y|8n;$bxC!^80TV)2gBj;82~V8{s>?-gs@sAyZdu9 zW0qx$wS0%<3V`#L4Et6T#afMY8^B^&mbX%Ti1B#*Skj)Pc}s3@RyC)BF3DYzy8yb? zCe3DZKbhP%04FDICym!q@f!dm0HYLl-Ti81k!_MQhRRhYe3$en%d!O}WLdUA@*&Cn zx~azi?4)}J0E7_M0jwt}005FDfR$fQf^7~=^^mjG-T$v(+x zGh40`N%lzg>Ul}`NKTRLBdz)(#&{58ocoXIM;?-;Np~a-0BpE>=WlZIJa4#r2f&7; zftf7Q?WoAo9K2vSQAnCfKHpx=}DCslF4pF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10VhdB zK~y-6jnlm@#6c7V@E?&aEFMGR<2l&IR(cuSj8oi2Z4ea<-~bDFQy^dB z9n0v=oUDu$w4%4vS=&NS~}Hj#!a|`7in~jti1KTYl=$#$-ehYr*-l_HHDq|JePPk@&W9OHwy?ow9EOeObBq znKm$o7fHO^s10EZ{n*E%!e{Elh~%)V7}Sh)O<1=RpFIqP)pF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10pdwS zK~y-6os+w2R8bU$zki>@;4sEF@Y0MTTbw4fU=c5ff-hh-g@Rb zJNq+bDvF}xoO|e;dtzqmlCDlc2qC-*AsmDdt~Vt$Eyj2w#yHv7*mwb;TJvXM-g`g) zFMyhGDCse9KCc_Lv$wamkg%L6%Q8=svMif;@3#TUvV4|h**&12*WF%CHCI)2(>Zq} z1u(OHU=g6#>+OaRR?TcK2acQB+celYw*|D)x2mcp4JDhBuH_`7oSLL>O#m}HIIJHz zuwBnN4Zdh*?M7Amz}>JNo!_yt0;<2uh-iJXti34=Edp6^2l!=flU&BUT8 zIw6E1@XpNEopS^D`%^>P!87R?;O&GgVc+cFqm{IHpF4-pu;I9B``E j{8iE?NlV`QQ5ydXqrm>^<pF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10WwKM zK~y-6ozuH6L{St5;BS%>!7zy)C2@HP#fU^mynvdT+N~ENE~N+X0u&0*U?idvQ4?_~ zW~NY_HRjlkMEuE4_Fn7%SJqkQU;M;0_Hl!^I1TJ!DkWD6_nsiF;05Qni`*FIP{Rq< z(3FTT(ZUA$OFFA!3+>?c6q83GUMLZ!Sd1bEoxpSiHvS;)U^_IE75TuHF^rEOj3P@! zZ9K%iibtGgsLKcTQ6Mj&H!0AR4;kJ=Q_nDhvxIyv8B%mm#2w}{-+yHX&m{#~B|Mq@ zyT+3E4EmB-6IX@zcxdh8Nj{hkY8XmRt&ksxF89do*~VsBi@#teG+)*}jKIH)MAyn~ zxk;)&b*j1s`m%DmOuJacD=u&wxe3f-5XV@TEK?Cv^5Hae*ZDePlPUQVhbTqw-rwVt P00000NkvXXu0mjfiG#1D diff --git a/Resources/UI/close.png b/Resources/UI/close.png deleted file mode 100644 index 25fc63244c4ebb4d67ac4fe0f893e9c281eb1584..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 367 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9F5he4R}c>anMprB-l zYeY$Kep*R+Vo@qXd3m{BW?pu2a$-TMUVc&f>~}U&Kt+E%T^vI!dZ$iy^gC=I;CkO> z<|#+zzjR7P%Dh^VpUb|W zuaP%kWos0J=myW7@>pF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10bxl* zK~y-6jgwDG!(b4_e=m)Hj-UilO2wT^H#X2qR7$HOD^ccms&;z)#hy{b* zK+rVfq7iFbYTj;U-kW(de4moz(*yIY0~`T9#gGCISjqXh_|U|)P+CN7m@nf5Wmi6M zWa4_~wtrD@IsmU>Q^1)A_(doGfxIuk_m0<*a9lIrOvvdcW( z3*!BYpKdExm?9FgjTzb|^+zpZE;uky5r(URtmZ|W$qhAV}!e^5dtj$0000< KMNUMnLSTZlBh&@} diff --git a/Resources/UI/cog.png b/Resources/UI/cog.png deleted file mode 100644 index 7a63c8ff497a06e19075ce81b066f66cccff3621..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 713 zcmV;)0yh1LP)pF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10#->x zK~y-6g_ALe+(j70e{c36f*7kDVrxYBf4hqi!B{B7GN?sj@WAH4$O$3@vVKU}^TD=CDTk-i=|cdmwRK6?BwcH*eGD+2P9H6$JZW2Voc4h?fs>N% z*uDguk#w}RwkK%|_!L+H4ggn%!{Mm~LC<>K_6eYqbQ1U?BF+KioZn6`#0c9 zYwfY|czk0CK+?~)@1~TNBjP-8{$Elr^i9tBJ>d3WFt`P<1kiQePomJGM^)M8r8sN9XA*^{(FD+uQp^lK1J> zeP*}T_U2YAAH}M@wTauoUv^IYSsn+^oYwhXL zXmkXi);gT84Qxb2=_CKz_7B71aCNcM?(Xivob#Q@Wb!WmQ>B!(obz9$lt&gZ&StY^ z;2=;ZlgS$?r4`#(BjN)|E~T8ceG2&8_IJR6*4i>~b74--c@uaUxGU+h?bVdhG26e| zF2F~UUbX!&uo)4rNc!hf*jCPYlv27C5jS(r71#xS2VRVbLpwV=56)(@L*w!I#vHe_ v$mw2$+xz6cDe0o^2W-DCsR4iVy{NwdQgAt!(CbpF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10bof) zK~y-6jnX|!mT?pY@So4pP`D-L(2$!whJz3^1hyqKnBO7$0F_8i`T^1*H^EV~!EaDY zV`fWBU|SJCfcJo*|=qi;4l8H-~IFR_h<0Qcb;-r)(R6ML%;a3kn5y=JY+ zJPvWK=~%_v+W#n)^V&80c1G;V1AN9AW@Ed9zX|>ry#iUx2wir*Vhi`3v$CATR^ASl z;%h0(UB_MvSCq}~`=6R7#g%l@ZPzx9gE;15Yp3lUh4VkS9pCfB?%`nt(!vTp)GD>p z_EIgGLg$)>^y65$fs15Dp?t8aOgYbfg^j1F@}f59oWjUFek*$$Xd-WBwo~OM&J<=w zVt=hHyMv7iyt(O7{KAiP^F_J3N4Sow`R-m~R1*pOj>o-%{sE_RS^{qBODF&U002ov JPDHLkV1n}Z*WUmD diff --git a/Resources/UI/disk.png b/Resources/UI/disk.png deleted file mode 100644 index 7355b964686b0062baebd248f6857423282e052b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 439 zcmV;o0Z9IdP)pF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10Yphe zK~y-6t&_b)5XbR`bFSGBaRBm?l5x>{ilXR- zi-fJf)t@i+5WfNW!=EV}>z002ovPDHLkV1k?dw_^YR diff --git a/Resources/UI/disk2.png b/Resources/UI/disk2.png deleted file mode 100644 index 29b59a4edfdd5e1c25cd3912d2772c20c4b8e8c7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 347 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9F5he4R}c>anMprB-l zYeY$Kep*R+Vo@qXd3m{BW?pu2a$-TMUVc&f>~}U&Kt(S+T^vI!de>gI^Ngw?bDDi%l9pJp;Dum{qmSst11WCT60!?2w%<+t z>UhyNbbq*g$YHB>fr%zZ+afL=a++X%;dtDS^M75~+ba%=$<1)QX=nQ_M}|J+Jnj@y+qsYZz=EStxIqY4xv`t(f!5i*pCxF48OLZZ6O}esi|R r&%XJr&)YtRtUvQ@uJr1H&a3+7+TP-o%(d-6KQnl``njxgN@xNA{ppR@ diff --git a/Resources/UI/edit.png b/Resources/UI/edit.png deleted file mode 100644 index 031e3f604221f0e7d68be875e68412c8b19e089e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 612 zcmV-q0-ODbP)N&JP;!hkk{ zRVu+~Z1NxY$nNDxqXYy=r$G`A&=uh-v}Ty`Xl)F_Rz z44c^_NkL{SvR@t;JdFsO8D5|@|IhypJ#m5!Q1H8FZd#HA7)3J*ZxDUgU4a4Co} z6%!PDjXBPkVI?QoXRZBTXYKENoA#K*7Oqi`=L%I!pUHfp1o!65dr zj5j&>0`DlJ@0ZDnSVJTB7P7_NfaiVz^D!SywwsB`NR+!kQ#inIyjOx5Ckgh{VQeVj z0iQU{9OoIEB(;zJ0Y6|iQ#-~b)Fg5Kf){f23TnN6{>m)8g&{m*6^9+BY&*gz?lWI5 zb>L1UgQ-d)7Nbzc2kyGS{gQ}Pl06$*IxI$$kxnCHJ(zE6??ht03)GA@Bhj*QLsGZc z&M9gc=-bNq%d~+dyy6@;Q5(ZF2C#<}xyzJ|3CUrX(WoBls<3W0z5w(WQ9cjxl3D-& N002ovPDHLkV1gdCtIYra diff --git a/Resources/UI/file.png b/Resources/UI/file.png deleted file mode 100644 index d0c9e5830ade13c518f1a0a7fb5c4e4f20407e41..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 372 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBufiR<}hF1en1E;5pV~B-+@}K|z?GJx_eO>q8-{0o#jg5}n z9g>X_tOiC#_t=80Zr!@IUqOk7N1;}M!R*1StE;a!K12(Z}++-JXWeQ&xW63z>H+#w~#;bXZn+`j)9pFh|njA5wmragwuLSFoy^UXf z-QJ$R*||lK?E$O9ZJ!1+Yvz}S9d3O--Y>s=VUUaD2I&+{T?OdXq84umfFr?P-?xdad}WKNiL#_{XZGGItC Nc)I$ztaD0e0s!%Bg1i6# diff --git a/Resources/UI/file2.png b/Resources/UI/file2.png deleted file mode 100644 index f3e9f6d2179af7121d2314669151bada83185afe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 323 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBufiR<}hF1en@P?<0V~B_mzch1Gq$$e+;8eZOfUvhDuXxoI>Z<;4FSAKHgGum`mj9+JAe$xE~D$Gfb_Ufni z7#v^{&B$rov*qGpw%RufHG>j*wWC%%Y+_q<#CAgOdiK0!6}xON-0+;gM&xay`G2PQ zOt+G*wXB{cw|r8~q%TRk64!0sue^WDo$FTu|J0^hdJ9TEnV5RN^Ixw)1@p4T61G!! S%?<z-+dbOt}?FI(5&63 z!&xxsRAc6>xjSk&zt`3`Z)|F7-J~QH5X=#{UFURYn3YI@fwwJ_jttCAK*V_`Ki{a*MzIbzRjOhYh_C1ebkJR#jNvvd?fa!=5|A|9&sX=bBqw z_}4JvZ^yzP0u8$9uV$_TjT-wL<FVdQ&MBb@0I8Ogm;e9( diff --git a/Resources/UI/folder2.png b/Resources/UI/folder2.png deleted file mode 100644 index d21178aa8cafb22ebfe50bf0379772d84075e671..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 288 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sDEfH31!Z9ZwB;8sr;#}Etux0m z`({cN-g>d1b*@z9#RhA)7pn!Ax7qqdta#{pJI^3+VJW*+#mk31-fh|?`8{_S-y0oW z`^Bn$it?(JjOTVb)$O~faH{@5KU<52yXeMiVqQy{0_Lhp%~1Zkc=O`wSeX!(3x_|< hFBYubZFY>sKU2UnWXUOwlRytJc)I$ztaD0e0suaOZf^hp diff --git a/Resources/UI/help.png b/Resources/UI/help.png deleted file mode 100644 index 88b4864006518565fd2c8e5e5072b0fd688d4466..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 670 zcmV;P0%84$P)pF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10xL;G zK~y-6ZBsE!6hRbyZ*C(6LSv4^!e|5LZp@wqHCTvZOo*}4&O{1rY!n(S1Y<)mCdQzN z7aP0N7!wN-D8#~888>%xr%-5!4RlIybL4KG%^q16UN!mu&HVq~pHE~^uh&mW8kaNz z;CK@L1z?F}*;?z;e0C1bxkHj30k{F+4}b+ps{lZ90Kh28UP(_$-nQ26>^_iOeh*-X z~wW? zeeCb=-v)5cIro+18}I!bfLly7e*-XMt)1!k;Jsf2a5Rzdqt$AiEtN{Y0iaf^O_Q7g z5SqlWzi}MTb=vjb&jN_O_o4UxjHDw$5KMRS?RI-s(w3xgleoQ*)=csRfGc4bR>Lq{ z0kG`7Ki$cfN~P_@>*hO0Mu%=C(gN+b8ak6Y&04JjYeaSJm=h) zbFNjbRv!bIuS{}S(t~!pJ)4Yb7f}>-=W@A8l2hrgoL#1eByUREBKg64|2;_;NS-6v zpF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10YOPb zK~y-6b<;6RT|p29;7^n%`1Jh(Yr#BI+J&T38?Dk<+az^jE73l=L5!&aqM(*m5(|HV z)iV%;v}pp7s30U4wAhKR>wO0Xc4yA)-8uIxk1>Uh_=c;9Q&i}d}N5YtL6yu!Z14-@OV&0dS&h~paDL8xR!G$DF69%z_Ye}aZ ztGF2Q@K=`D!6FW@+>g{W!hbx&^FFnG$zUo;#C8K|D5AuuBw|IfXRTR>Eo?XB*P`dn z+8dErD2NjgIUX5_dn?zHx=rJ>-5co6%H?BvkJq@wk>o&_#0 - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Resources/UI/menu.png b/Resources/UI/menu.png deleted file mode 100644 index 9c63469ba258c68e9c03b77117c79163a0c95e15..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 212 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBufiR<}hF1enFw@h;F~q_@`Op9V_ROjcoL-Z8CDzC7tzv$` zRjM&x<-my(6~ZYFdKVaES4em=WE@D|7(7?`>)Gd|T6Tp@W%l|Nw4ObwHUMn;BxdM4g$vlnOpEoJa@^>bP0l+XkK DcE><1 diff --git a/Resources/UI/menu2.png b/Resources/UI/menu2.png deleted file mode 100644 index 2530762417e8ccd4ab973f5e184c86ba65713679..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 187 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBufiR<}hF1enFu>ErF~q_@`Op9V_ROjcoL<2!c?^apB%eHx z?r~5O?pF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10ij7m zK~y-6om0JPltC0d=MrqzO5kdSx+&3_!H6}Lu z1`a!Sku(W;0}b&5&CapNM814RT|CwN+1jj7FnNlIA6K0h}$zI{-FG_Cp9> zkLS_C-A_q+2H-A$F96mhZ2vZTIqB;-|9*+ z#+I2an%N^s1CrN|NRU!`nNs?ZQo7l+)P%dwx%$fHRWb)jZzHIo~-c(ahe2 z5LU}}i{uSMt(E_SDFC~r&j5g;u=?keLy){6Y1aU30GN$2wkB0|_tTQD0oXK>eUdX~ zwm2z)q$QHmB>Mn>l+p`#KXCWC3Dl2$BrAUIOBw)JODXkEvJ+!$rIdOA)+7zgYytRv zn4XfnCuxu5hn(~0a($8HRg%*==T~O7aBP?wPYjZ7OX`w52Y`~cNq!{xHiR&$$NvNo W{^Fg|2zLko0000?$b diff --git a/Resources/UI/minus2.png b/Resources/UI/minus2.png deleted file mode 100644 index 9bb41283a7f3e8d7bdf81467b5391984bea3e424..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 380 zcmV-?0fYXDP)pF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10SQS& zK~y-6ozqP&Ltzxg@gI>6wCuoCLc0!;h?>{~#$wuF&J`hI14vi^39BfHbP+^!LbHDi&}exebH)(CK42f-|p2KH8R>@rpHj$_iauf~A; zx<-2j3%Jb{HnCL#UE(g{4%Vjq|CJMI(kt9Z29rrctd0TKq#u!B!L;5BMXSiziR`#punlviDHSUVQ#Mw|)j a=Jf+%ay>&=(wun!0000JP)pF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10s~1z zK~y-6jm|r06j2n1@$cMRnFxVkZ()QbOK!4hENom+Obmh&iNQ`K5eo_UXwrxxir84h zN1=tHRail=5yc1C1Qa2zbMHhYA~x}nLXikN?9LpUC=%nEQ=i|TPgvnqDwUS5uCBAd zA>dP<=Z8zB(oXBJi}*nlMSB6#G_3$zRrOqNZ}0nm4tVd6 z0VjZ|EX#(br>7gOt*tkKT_SSbId=-6WjP!|7y~ANXV%*7&bc4JRbW4G%Q-hHA`0+V zK?vc1s!jl}L}W*2XXio);WBU#xHCULKPn>muYXyB_W+Zs`c75LJv}|2z4zyVao~Ow zMT3PxA^p?*9!Qd8FwgVbzz1t>xmYaDdGAjHCsp-PTU*=Cj*gDn(qaP;$8let=aaz4 zEX(>9@loI;FlCI{y&MLRYPGu7TKiU2zlliMIX4?Z7*o|t!1E}I`U-`@_vJ8vHOBO- z>S_@ga?Z`haXg}`7lCS?=L5|!fDw^0P*>GC@BO$j<{I!i%d-Absr0oO2C%>;U={EZ zKvie0wcEP8yT8P7JR%|kP5c`Rq`(aDL{%RfV;&ZZ#RULk%obH0ZZa_Q6D^P6`U3HH QJpcdz07*qoM6N<$f>pN;+W-In diff --git a/Resources/UI/pencil_line2.png b/Resources/UI/pencil_line2.png deleted file mode 100644 index 9c30d393819c421db6daf5fa652a5da4b312c156..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 394 zcmV;50d@X~P)pF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10T)R` zK~y-6mD9f~#Zef?@z=$T@*@nCEM)g5SSU8iWRlsyWX8Z^BZHKiVp2?$jEXD_Zr!>T z!(GHE`8|9exrY0_*HdRWpFZz%p67Eq)L!*i!6R-l^bb}Ya`?g(9`JX)K13FcIKw;os=>qZ$l5c*P(VBq8R}RSTTK9s0|(qU5KQqMOka oz94SPV;vLz2DU31uhPnY1K7w)aW0U!9{>OV07*qoM6N<$f@;#Fi2wiq diff --git a/Resources/UI/plus.png b/Resources/UI/plus.png deleted file mode 100644 index f63ace902d9e993fbf04de2688e18f9c4648530e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 559 zcmV+~0?_@5P)pF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10lY~> zK~y-6om0zdR6!6urwDGwONgnr%qKDk=bN2xg=>pQV+n{1b+cAA~_5p z#HK$F4l%}4lAZ&&3*ak&O-b7TK=M3*Ig&Gy-jI9{Lil-@AO&v#xJvR#RaL9qZudu% zsVIt;nJt^yV@YF@*AJ4w-Cw!;FL%G0OUfCsYmi00808y@&n012w~Fn{|yw|_65H@(}Ms2002ovPDHLkV1jc+^1c87 diff --git a/Resources/UI/plus2.png b/Resources/UI/plus2.png deleted file mode 100644 index 0c29081e25aa7911ea1e9793e66094cb06efb9df..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 398 zcmV;90df9`P)pF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10UJp~ zK~y-6ozp!|LQxO};7KRYlk!JoJaAu%jMV?+z3 zuy_MJAMYjTNhY~>X3o7cbI)ZOHJqY{L0A_ZRI|x*sdYJ$_V9*V^dq*4Z7ksm2l$d9 zKjIrr%;!{AK?}pkEvJJQLEgzBX3>a4&PI+}IGQ=hyJ1-z1!tXPU@rw_--TsS!7JJ& z)FlJ^oT2;?K7vy(VcBHbqp}~uHo`{xbUS^ll>C0mf1!u#f>_ZE;0E0i?j<6r{Nd6C zY)RTul{`r+C$Z=mkApLo_IWrOGu%EUBqmZGN<@;^PQ^q(V<~4p(+T$RE*ai)#MZEh sMO@-g<};;HMH^3X&>+?wA>A~70F4SmZKJ&MYXATM07*qoM6N<$f>mIi`~Uy| diff --git a/Resources/UI/trash.png b/Resources/UI/trash.png deleted file mode 100644 index 55e65525ddc861bd34825421f233b1589aa8733a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 382 zcmV-^0fGLBP)pF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10Sie) zK~yM_?T)cZ!%!H7&$$VKIz+OFd#CFw_!<)3>f{5s2r9Vf;No0$5f>q&n=g>5TXNB* zv*Hp=KqZiSoLYhuN(VQ;`TNfQ6Fssl3#_%b#+W@x0{|fT1>nIscaWxOH*>>&Xsz8L zIr83LlKcPw@BKQ-BWvvwfNbV6&+|c&Bx`Nk20;)UO4^rX`-3E(N#1o`cNIlZS5?&~ z%d&h0u!+@p3ym?ml1?QJNnQZh05JU}4gtJNIw3hFc@6+5iel`Xn=CuyoSPIyF$Ms$ z;)`?s!#@qZ_gp6Toe%&>z5p0G=guU3FN!1$NN!2GpNDl_U&nF0E$J9Qv?wIm0(fki c<^}+M0F=gWXpb8FNB{r;07*qoM6N<$f^I65pa1{> diff --git a/Resources/UI/trash2.png b/Resources/UI/trash2.png deleted file mode 100644 index 1ae8d4397a12014956b526440cb2e4675e781690..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 289 zcmeAS@N?(olHy`uVBq!ia0vp^d_XL~!3HGNrubO_Db50q$YP-QVGw3Kp1&dmC@5Lt z8c`CQpH@mmtT}V`<;yxP|-S17sn8diEl62@;Md?uzZ-` z|17gaZ^7k4hUFK$W1JipEff&H5TIe%c#cuVVezzp%oZn&Kb-nUvP;x%rlqHqcRdu9 z>?u5;dWLcF0ow_^lG!U3_t)Nddhv+N<@Ds1m>m(v_?mAVWYdaxAQN=M=BSs|Y>`zN zi#z1FB97aMZFJQxxNB{Ak`$T(tQF+0igsy-?D*NU< hd{S)h? 0); - } - - public bool DoQueryExist(string query, params string[] args) - { - string sql = SQLiteDatabase.PrepareQuery(query, args); - - return DoQueryExist(sql); - } - - public bool HasTable(string table_name) - { - lastError = string.Empty; - if (database == null) - { - return false; - } - - int rv = this.DoQueryCount("SELECT 1 FROM sqlite_master WHERE type='table' AND name='" + escapeSQL(table_name) + "'"); - - return (rv > 0); - } - - public bool CheckRequiredTables() - { - bool rv = true; - foreach (string tbl in requiredTableList) - { - if (string.IsNullOrEmpty(tbl)) - { - continue; - } - - if (!this.HasTable(tbl)) - { - rv = false; - break; - } - } - - return rv; - } - - - protected bool PrepareConfig() - { - if (HasTable(tableNameConfig)) - { - return true; - } - - bool rv = this.DoNonQuery(@" - BEGIN TRANSACTION; - CREATE TABLE " + tableNameConfig + @" (cfg_name TEXT, cfg_value TEXT); - COMMIT; - "); - - return rv; - } - - public bool SetConfig(string name, string value) - { - if (!PrepareConfig()) - { - return false; - } - - string sql = string.Empty; - int rv = this.DoQueryCount("SELECT 1 FROM " + tableNameConfig + " WHERE cfg_name='" + escapeSQL(name) + "'"); - if (rv <= 0) - { - sql = "INSERT INTO " + tableNameConfig + " (cfg_name, cfg_value) VALUES ('[^1]', '[^2]');"; - } - else - { - sql = "UPDATE " + tableNameConfig + " SET cfg_value='[^2]' WHERE cfg_name='[^1]';"; - } - - sql = PrepareQuery(sql, new string[] { name, value }); - - return this.DoNonQuery(sql); - } - - public string GetConfig(string name, string default_value = "") - { - if (!PrepareConfig()) - { - return default_value; - } - - bool rv = this.DoQueryExist("SELECT 1 FROM " + tableNameConfig + " WHERE cfg_name='" + escapeSQL(name) + "'"); - if (!rv) - { - return default_value; - } - - return this.DoQuerySingle("SELECT cfg_value FROM " + tableNameConfig + " WHERE cfg_name='" + escapeSQL(name) + "'"); - } - - #endregion - - protected virtual bool Prepare() - { - return true; - } - } -} \ No newline at end of file diff --git a/RyzStudio/Drawing/Rectangoid.cs b/RyzStudio/Drawing/Rectangoid.cs deleted file mode 100644 index 59a24d8..0000000 --- a/RyzStudio/Drawing/Rectangoid.cs +++ /dev/null @@ -1,124 +0,0 @@ -using System.Drawing; -using System.Drawing.Drawing2D; - -namespace RyzStudio.Drawing -{ - public struct Rectangoid - { - private int X; - private int Y; - private int Width; - private int Height; - private int Radius; - - public Rectangoid(Rectangle rect, int radius) - { - X = rect.X; - Y = rect.Y; - Width = rect.Width; - Height = rect.Height; - Radius = radius; - } - - public Rectangoid(Rectangle rect, int radius, int borderWidth) - { - rect.Inflate((-1 * borderWidth), (-1 * borderWidth)); - - X = rect.X; - Y = rect.Y; - Width = rect.Width; - Height = rect.Height; - Radius = radius; - } - - public Rectangoid(int x, int y, int width, int height, int radius) - { - X = x; - Y = y; - Width = width; - Height = height; - Radius = radius; - } - - public Rectangoid(int x, int y, int width, int height) - { - X = x; - Y = y; - Width = width; - Height = height; - Radius = 0; - } - - public Rectangoid(int width, int height, int radius) - { - X = 0; - Y = 0; - Width = width; - Height = height; - Radius = radius; - } - - public Rectangoid(int width, int height) - { - X = 0; - Y = 0; - Width = width; - Height = height; - Radius = 0; - } - - public Rectangoid(int width) - { - X = 0; - Y = 0; - Width = width; - Height = width; - Radius = 0; - } - - public GraphicsPath ToGraphicsPath() - { - GraphicsPath rv = new GraphicsPath(); - rv.AddLine(X + this.Radius, Y, X + Width - (this.Radius * 2), Y); - - if (this.Radius > 0) - { - rv.AddArc(X + Width - (this.Radius * 2), Y, this.Radius * 2, this.Radius * 2, 270, 90); - } - - rv.AddLine(X + Width, Y + this.Radius, X + Width, Y + Height - (this.Radius * 2)); - - if (this.Radius > 0) - { - rv.AddArc(X + Width - (this.Radius * 2), Y + Height - (this.Radius * 2), this.Radius * 2, this.Radius * 2, 0, 90); - } - - rv.AddLine(X + Width - (this.Radius * 2), Y + Height, X + this.Radius, Y + Height); - - if (this.Radius > 0) - { - rv.AddArc(X, Y + Height - (this.Radius * 2), this.Radius * 2, this.Radius * 2, 90, 90); - } - - rv.AddLine(X, Y + Height - (this.Radius * 2), X, Y + this.Radius); - - if (this.Radius > 0) - { - rv.AddArc(X, Y, this.Radius * 2, this.Radius * 2, 180, 90); - } - - rv.CloseFigure(); - - return rv; - } - - public PointF GetOrigin() - { - PointF rv = new PointF(); - rv.X = ((float)Width / 2) + X; - rv.Y = ((float)Height / 2) + Y; - - return rv; - } - } -} \ No newline at end of file diff --git a/RyzStudio/IO/FileType.cs b/RyzStudio/IO/FileType.cs deleted file mode 100644 index 3c8b616..0000000 --- a/RyzStudio/IO/FileType.cs +++ /dev/null @@ -1,56 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace RyzStudio.IO -{ - public class FileType - { - protected static readonly byte[] BMP = { 66, 77 }; - protected static readonly byte[] GIF = { 71, 73, 70, 56 }; - protected static readonly byte[] ICO = { 0, 0, 1, 0 }; - protected static readonly byte[] JPG = { 255, 216, 255 }; - protected static readonly byte[] PNG = { 137, 80, 78, 71, 13, 10, 26, 10, 0, 0, 0, 13, 73, 72, 68, 82 }; - - public static bool IsImage(byte[] byteArray) - { - if (byteArray == null) - { - return false; - } - - if (byteArray.Length <= 0) - { - return false; - } - - if (byteArray.Take(2).SequenceEqual(BMP)) - { - return true; - } - - if (byteArray.Take(4).SequenceEqual(GIF)) - { - return true; - } - - if (byteArray.Take(4).SequenceEqual(ICO)) - { - return true; - } - - if (byteArray.Take(3).SequenceEqual(JPG)) - { - return true; - } - - if (byteArray.Take(16).SequenceEqual(PNG)) - { - return true; - } - - return false; - } - } -} diff --git a/RyzStudio/IO/SessionFileFormatBase.cs b/RyzStudio/IO/SessionFileFormatBase.cs deleted file mode 100644 index 3ae2887..0000000 --- a/RyzStudio/IO/SessionFileFormatBase.cs +++ /dev/null @@ -1,290 +0,0 @@ -using System; -using System.IO; -using System.Text; -using System.Xml; -using System.Windows.Forms; -using ICSharpCode.SharpZipLib.Zip; - -namespace RyzStudio.IO -{ - public abstract class SessionFileFormatBase - { - protected string CONST_KEYPASS = ""; - protected string CONST_PRODUCT = ""; - protected string CONST_STREAM_FILE_NAME = ""; - - protected bool enableErrorReporting = false; - protected string lastUsedFileName = ""; - - #region public properties - - public string passkey - { - get { return CONST_KEYPASS; } - set { CONST_KEYPASS = value; } - } - - /*public string LastFilename - { - get { return lastUsedFileName; } - set { lastUsedFileName = value; } - }*/ - - #endregion - - #region public methods - -/* public bool loadFromRyz() - { - return loadFromRyz(lastUsedFileName); - }*/ - - public bool loadFromRyz(string file_name) - { - lastUsedFileName = file_name; - if (!File.Exists(file_name)) - { - return false; - } - - bool rv = false; - - try - { - ZipInputStream zipIn = new ZipInputStream(File.OpenRead(file_name)); - zipIn.Password = CONST_KEYPASS; - ZipEntry theEntry = null; - - while ((theEntry = zipIn.GetNextEntry()) != null) - { - string streamFileName = Path.GetFileName(theEntry.Name); - if (streamFileName.Equals(CONST_STREAM_FILE_NAME)) - { - MemoryStream oxStream = new MemoryStream(); - StreamWriter streamWriter = new StreamWriter(oxStream); - int size = 2048; - byte[] data = new byte[size]; - while (true) - { - size = zipIn.Read(data, 0, data.Length); - if (size <= 0) break; - streamWriter.BaseStream.Write(data, 0, size); - } - - oxStream.Position = 0; - - StreamReader sr2 = new StreamReader(oxStream, Encoding.UTF8); - XmlDocument xDoc = new XmlDocument(); - xDoc.LoadXml(sr2.ReadToEnd()); - - loadFromXmlDocument(ref xDoc); - } - } - - zipIn.Close(); - - rv = true; - } - catch (Exception exc) - { - if (enableErrorReporting) - { - MessageBox.Show(exc.Message); - } - } - - return rv; - } - - public bool loadFromXml() - { - return loadFromXml(lastUsedFileName); - } - - public bool loadFromXml(string file_name) - { - lastUsedFileName = file_name; - if (!File.Exists(file_name)) - { - return false; - } - - bool rv = false; - - try - { - StreamReader sr2 = new StreamReader(file_name, Encoding.UTF8); - XmlDocument xDoc = new XmlDocument(); - xDoc.LoadXml(sr2.ReadToEnd()); - - loadFromXmlDocument(ref xDoc); - sr2.Close(); - - rv = true; - } - catch (Exception exc) - { - if (enableErrorReporting) - { - MessageBox.Show(exc.Message); - } - } - - return rv; - } - -/* public bool saveToRyz() - { - return saveToRyz(lastUsedFileName); - } -*/ - - public bool saveToRyz(string file_name) - { - bool rv = false; - lastUsedFileName = file_name; - byte[] buffer = new byte[4096]; - - try - { - File.Delete(file_name); - FileInfo fileinfo1 = new FileInfo(file_name); - if (!Directory.Exists(fileinfo1.DirectoryName)) - { - Directory.CreateDirectory(fileinfo1.DirectoryName); - } - } - catch (Exception exc) - { - if (enableErrorReporting) - { - MessageBox.Show(exc.Message); - } - } - - try - { - ZipOutputStream zipOutStream1 = new ZipOutputStream(File.Create(file_name)); - zipOutStream1.SetLevel(9); - zipOutStream1.Password = CONST_KEYPASS; - - MemoryStream oxIndexStream = new MemoryStream(); - XmlTextWriter oxTW = new XmlTextWriter(oxIndexStream, Encoding.UTF8); - saveToXmlTextWriter(ref oxTW); - oxTW.Flush(); - - // write to file - zipOutStream1.PutNextEntry(new ZipEntry(CONST_STREAM_FILE_NAME)); - oxIndexStream.Position = 0; - StreamReader sr2 = new StreamReader(oxIndexStream, Encoding.UTF8); - int sourceBytes; - do - { - sourceBytes = sr2.BaseStream.Read(buffer, 0, buffer.Length); - zipOutStream1.Write(buffer, 0, sourceBytes); - } - while (sourceBytes > 0); - - sr2.Close(); - oxTW.Close(); - zipOutStream1.Finish(); - zipOutStream1.Close(); - - rv = true; - } - catch (Exception exc) - { - if (enableErrorReporting) - { - MessageBox.Show(exc.Message); - } - } - - return rv; - } - - public bool saveToXml() - { - return saveToXml(lastUsedFileName); - } - - public bool saveToXml(string file_name) - { - bool rv = false; - - lastUsedFileName = file_name; - try - { - File.Delete(file_name); - FileInfo fileinfo1 = new FileInfo(file_name); - if (!Directory.Exists(fileinfo1.DirectoryName)) - { - Directory.CreateDirectory(fileinfo1.DirectoryName); - } - } - catch (Exception exc) - { - if (enableErrorReporting) - { - MessageBox.Show(exc.Message); - } - } - - try - { - XmlTextWriter oxTW = new XmlTextWriter(file_name, Encoding.UTF8); - saveToXmlTextWriter(ref oxTW); - oxTW.Flush(); - oxTW.Close(); - - rv = true; - } - catch (Exception exc) - { - if (enableErrorReporting) - { - MessageBox.Show(exc.Message); - } - } - - return rv; - } - - #endregion - - protected virtual void loadFromXmlDocument(ref XmlDocument xml_doc) { } - protected virtual void saveToXmlTextWriter(ref XmlTextWriter writer) { } - - #region public methods (conversions) - - public int[] convIntArrayString(string s1, char c) - { - string[] sarr = s1.Split(c); - int[] iarr = new int[sarr.Length]; - for (int i = 0; i < sarr.Length; i++) - { - iarr[i] = Int32.Parse(sarr[i]); - } - - return iarr; - } - - public string convStringIntArray(int[] r, char s) - { - string t = null; - for (int i = 0; i < r.Length; i++) - { - if (i != 0) - { - t += s.ToString(); - } - - t += r[i].ToString(); - } - - return t; - } - -#endregion - } -} \ No newline at end of file diff --git a/RyzStudio/IO/SharpZipLib.cs b/RyzStudio/IO/SharpZipLib.cs deleted file mode 100644 index b162124..0000000 --- a/RyzStudio/IO/SharpZipLib.cs +++ /dev/null @@ -1,76 +0,0 @@ -using System; -using System.IO; -using ICSharpCode.SharpZipLib.Zip; - -namespace RyzStudio.IO -{ - public class SharpZipLib - { - /// - /// Is zip file encrypted - /// - /// Filename - /// Is encrypted - public static bool IsZipEncrypted(string fn) - { - bool ret_val = false; - try - { - ZipInputStream zipIn = new ZipInputStream(System.IO.File.OpenRead(fn)); - ZipEntry theEntry = null; - while ((theEntry = zipIn.GetNextEntry()) != null) - { - if (theEntry.IsCrypted) - { - ret_val = true; - } - - break; - } - - zipIn.Close(); - } - catch - { - // do nothing - } - - return ret_val; - } - - public static void AddFile(ZipOutputStream zipstream, string filename, string prefixpath = null) - { - byte[] buffer = new byte[4096]; - - string f1 = ""; - if (prefixpath != null) - { - f1 = Path.GetDirectoryName(filename).TrimEnd('\\') + "\\"; - f1 = f1.Replace(prefixpath, "").TrimEnd('\\') + "\\"; - f1 = f1 + Path.GetFileName(filename); - f1 = f1.TrimStart('\\'); - } - - ZipEntry entry = new ZipEntry(f1); - entry.DateTime = DateTime.Now; - zipstream.PutNextEntry(entry); - - FileStream fs = File.OpenRead(filename); - int sourceBytes; - do - { - sourceBytes = fs.Read(buffer, 0, buffer.Length); - zipstream.Write(buffer, 0, sourceBytes); - } - while (sourceBytes > 0); - } - - public static void AddFolder(ZipOutputStream zipstream, string folderpath, string prefixpath = null) - { - foreach (string fn in Directory.GetFiles(folderpath, "*.*", System.IO.SearchOption.AllDirectories)) - { - AddFile(zipstream, fn, prefixpath); - } - } - } -} \ No newline at end of file diff --git a/RyzStudio/Net/HttpWeb.cs b/RyzStudio/Net/HttpWeb.cs deleted file mode 100644 index bafff2e..0000000 --- a/RyzStudio/Net/HttpWeb.cs +++ /dev/null @@ -1,168 +0,0 @@ -using System; -using System.IO; -using System.Net; -using System.Text; -using System.Windows.Forms; - -namespace RyzStudio.Net -{ - public class HttpWeb - { - public string defaultUserAgent = "Momozilla/5.0 (" + Environment.OSVersion.Platform.ToString() + " ; " + Environment.OSVersion.VersionString + "; " + Application.CurrentCulture.TwoLetterISOLanguageName + ")"; - public int defaultTimeout = 6000; - public int defaultMaxRedirect = 8; - public bool defaultAllowRedirect = true; - public CookieContainer defaultCookierContainer = null; - - public HttpWeb() - { - } - - public HttpWebRequest CreateRequest(string url) - { - return this.CreateRequest(url, url); - } - - public HttpWebRequest CreateRequest(string url, string referrerURL) - { - if (defaultCookierContainer == null) - { - defaultCookierContainer = new CookieContainer(); - } - - HttpWebRequest webRequest = (HttpWebRequest)WebRequest.Create(url); - webRequest.CachePolicy = new System.Net.Cache.RequestCachePolicy(System.Net.Cache.RequestCacheLevel.NoCacheNoStore); - webRequest.MaximumAutomaticRedirections = defaultMaxRedirect; - webRequest.CookieContainer = defaultCookierContainer; - webRequest.UserAgent = defaultUserAgent; - webRequest.AllowAutoRedirect = defaultAllowRedirect; - webRequest.Timeout = defaultTimeout; - - return webRequest; - } - - public int GetResponse(out string sourceCode, string url, string referrerURL = "") - { - HttpWebRequest webRequest = this.CreateRequest(url, referrerURL); - - return GetResponse(out sourceCode, webRequest); - } - - public int GetResponse(out string sourceCode, HttpWebRequest webRequest) - { - sourceCode = string.Empty; - - int rv = 0; - - try - { - HttpWebResponse webResponse = (HttpWebResponse)webRequest.GetResponse(); - - rv = (int)webResponse.StatusCode; - - StreamReader readContent = new StreamReader(webResponse.GetResponseStream()); - sourceCode = readContent.ReadToEnd(); - - webResponse.Close(); - webResponse = null; - } - catch (WebException xc) - { - if (xc.Response is HttpWebResponse) - { - HttpWebResponse rs = xc.Response as HttpWebResponse; - StreamReader readContent = new StreamReader(rs.GetResponseStream()); - if (readContent != null) - { - sourceCode = readContent.ReadToEnd(); - } - - rv = (int)rs.StatusCode; - } - else - { - rv = (int)xc.Status; - sourceCode = xc.Message; - } - } - catch (Exception xc) - { - sourceCode = xc.Message; - } - - return rv; - } - - public static HttpWebRequest AddBasicAuthentication(HttpWebRequest webRequest, string username, string password) - { - webRequest.Headers["Authorization"] = "Basic " + Convert.ToBase64String(Encoding.Default.GetBytes(string.Concat(username, ":", password))); - webRequest.PreAuthenticate = true; - - return webRequest; - } - - - public int GetPOSTResponse(out string sourceCode, HttpWebRequest webRequest, string postData) - { - sourceCode = ""; - int rv = 0; - byte[] buffer = Encoding.UTF8.GetBytes(postData); - - webRequest.ContentLength = buffer.Length; - - try - { - Stream dataStream = webRequest.GetRequestStream(); - dataStream.Write(buffer, 0, buffer.Length); - dataStream.Close(); - } - catch (Exception xc) - { - sourceCode = xc.Message; - return rv; - } - - return this.GetResponse(out sourceCode, webRequest); - } - - public int GetHeader(out WebHeaderCollection headerCollection, string url, string referrerURL = "") - { - headerCollection = null; - - int rv = 0; - - HttpWebRequest webRequest = this.CreateRequest(url, referrerURL); - webRequest.Method = "HEAD"; - - try - { - HttpWebResponse webResponse = (HttpWebResponse)webRequest.GetResponse(); - headerCollection = webResponse.Headers; - - rv = (int)webResponse.StatusCode; - - webResponse.Close(); - webResponse = null; - } - catch (WebException xc) - { - if (xc.Response is HttpWebResponse) - { - HttpWebResponse rs = xc.Response as HttpWebResponse; - - rv = (int)rs.StatusCode; - } - else - { - rv = (int)xc.Status; - } - } - catch - { - // do nothing - } - - return rv; - } - } -} \ No newline at end of file diff --git a/RyzStudio/Windows/Forms/StackLayoutPanel.cs b/RyzStudio/Windows/Forms/StackLayoutPanel.cs deleted file mode 100644 index 8cdeae5..0000000 --- a/RyzStudio/Windows/Forms/StackLayoutPanel.cs +++ /dev/null @@ -1,69 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; - -namespace RyzStudio.Windows.Forms -{ - public class StackLayoutPanel : FlowLayoutPanel - { - public StackLayoutPanel() : base() - { - this.AutoScroll = true; - this.FlowDirection = FlowDirection.TopDown; - this.WrapContents = false; - } - - protected override void OnResize(EventArgs eventargs) - { - base.OnResize(eventargs); - - //int w = this.ClientRectangle.Width - SystemInformation.VerticalScrollBarWidth; - int w = this.ClientRectangle.Width - 1; - - foreach (Control item in this.Controls) - { - if (item.Width != w) - { - item.Width = w; - } - } - } - - protected override void OnControlAdded(ControlEventArgs e) - { - base.OnControlAdded(e); - - OnResize(null); - } - - protected override void OnControlRemoved(ControlEventArgs e) - { - base.OnControlRemoved(e); - - OnResize(null); - } - - public void AddControl(Control value) - { - if (this.InvokeRequired) - { - this.Invoke(new MethodInvoker(() => - { - value.Margin = new Padding(0, 3, 0, 3); - - this.Controls.Add(value); - })); - } - else - { - value.Margin = new Padding(0, 3, 0, 3); - - this.Controls.Add(value); - } - } - - } -} diff --git a/RyzStudio/Windows/Forms/TFlatButton.cs b/RyzStudio/Windows/Forms/TFlatButton.cs deleted file mode 100644 index b50dee0..0000000 --- a/RyzStudio/Windows/Forms/TFlatButton.cs +++ /dev/null @@ -1,115 +0,0 @@ -using System.Drawing; -using System.Windows.Forms; - -namespace RyzStudio.Windows.Forms -{ - public class TFlatButton : Label - { - public class ButtonStyle - { - public Color BackColour { get; set; } = Color.Transparent; - public Color PenColour { get; set; } = Color.Transparent; - } - - public enum FlatButtonState - { - Idle = 0, - Hover, - Down - } - - protected FlatButtonState controlState = FlatButtonState.Idle; - - public TFlatButton() : base() - { - this.AutoSize = false; - this.ImageAlign = ContentAlignment.MiddleCenter; - this.TextAlign = ContentAlignment.MiddleCenter; - - // customise - this.StyleOver = new ButtonStyle() - { - BackColour = Color.FromArgb(51, 51, 51), - PenColour = Color.White - }; - this.StyleDown = new ButtonStyle() - { - BackColour = Color.FromArgb(179, 179, 179), - PenColour = Color.Black - }; - this.StyleDefault = new ButtonStyle() - { - BackColour = Color.White, - PenColour = Color.Black - }; - - this.VisualState = FlatButtonState.Idle; - - this.Click += delegate { this.OnClick(null); }; - this.MouseEnter += delegate { this.VisualState = FlatButtonState.Hover; }; - this.MouseLeave += delegate { this.VisualState = FlatButtonState.Idle; }; - this.MouseDown += delegate { this.VisualState = FlatButtonState.Down; }; - this.MouseUp += delegate { this.VisualState = FlatButtonState.Idle; }; - } - - protected FlatButtonState VisualState - { - get { return controlState; } - set - { - switch (value) - { - case FlatButtonState.Idle: - if (this.VisualState == FlatButtonState.Down) - { - updateButton(StyleOver); - } - else - { - updateButton(StyleDefault); - } - - break; - case FlatButtonState.Hover: - updateButton(StyleOver); - break; - case FlatButtonState.Down: - updateButton(StyleDown); - break; - default: - updateButton(StyleDefault); - break; - } - - controlState = value; - } - } - - protected void updateButton(ButtonStyle style) - { - this.ForeColor = style.PenColour; - this.BackColor = style.BackColour; - } - - protected ButtonStyle StyleOver { get; set; } = new ButtonStyle(); - - protected ButtonStyle StyleDown { get; set; } = new ButtonStyle(); - - protected ButtonStyle StyleDefault { get; set; } = new ButtonStyle(); - - public void PerformClick() - { - if (this.InvokeRequired) - { - this.Invoke(new MethodInvoker(() => { - this.OnClick(null); - })); - } - else - { - this.OnClick(null); - } - } - - } -} diff --git a/RyzStudio/Windows/Forms/TForm.cs b/RyzStudio/Windows/Forms/TForm.cs deleted file mode 100644 index 58ed7dc..0000000 --- a/RyzStudio/Windows/Forms/TForm.cs +++ /dev/null @@ -1,434 +0,0 @@ -using System; -using System.ComponentModel; -using System.Drawing; -using System.Windows.Forms; -//using Resources = AppLauncher.Properties.Resources; - -namespace RyzStudio.Windows.Forms -{ - public class TForm : Form - { - //protected readonly Color borderColour = Color.FromArgb(200, 200, 200); - //protected readonly int borderWidth = 1; - - //protected readonly int resizeBorderWidth = 4; - - protected readonly Color backColour = Color.FromArgb(250, 250, 250); - - //protected readonly Color titleBackColour = Color.FromArgb(235, 234, 233); - //protected readonly Color titleBorderColour = Color.FromArgb(200, 198, 196); - //protected readonly Color titleColour = Color.FromArgb(102, 102, 102); - //protected readonly int titleBarHeight = 33; - //protected readonly bool showTitleBarLine = true; - //protected Font titleFont = null; - //protected int titleFontTop = 0; - - //protected readonly Size titleBarIconSize = new Size(48, 32); - //protected readonly int titleBarIconMargin = 0; - //protected readonly int titleBarIconMarginRight = 0; - - //protected Image appIcon = null; - //protected const int appIconLeft = 12; - //protected const int appIconRight = 6; - //protected int appIconTop = 0; - - protected bool isDragging = false; - protected Point startPosition = new Point(); - - //protected Point startWindowSize = new Point(); - - //protected bool enableMinimise { get; set; } = true; - //protected bool enableMaximise { get; set; } = true; - //protected bool enableClose { get; set; } = true; - //protected bool closeOnMinimise { get; set; } = false; - - protected bool isBusy = false; - - private IContainer components; - - public TForm() : base() - { - InitializeComponent(); - - //if (!this.DesignMode) - //{ - // this.FormBorderStyle = FormBorderStyle.None; - // this.StartPosition = FormStartPosition.Manual; - //} - - this.AutoScaleMode = AutoScaleMode.Font; - this.BackColor = backColour; - this.FormBorderStyle = FormBorderStyle.Sizable; - this.Padding = new Padding(0); - this.DoubleBuffered = true; - - this.MouseDown += new MouseEventHandler(form_MouseDown); - this.MouseMove += new MouseEventHandler(form_MouseMove); - this.MouseUp += new MouseEventHandler(form_MouseUp); - this.PreviewKeyDown += new PreviewKeyDownEventHandler(form_PreviewKeyDown); - } - - protected override void OnLoad(EventArgs e) - { - base.OnLoad(e); - - this.Text = Application.ProductName; - - //initialiseLoadComponent(); - - //if (appIcon != null) appIconTop = (int)Math.Floor((decimal)(titleBarHeight - appIcon.Height) / 2) + borderWidth; - //titleFont = new Font(this.Font.FontFamily, 10F); - //titleFontTop = (int)Math.Floor((decimal)(titleBarHeight - TextRenderer.MeasureText("#", titleFont).Height) / 2) + borderWidth; - - } - - //protected override void OnMouseClick(MouseEventArgs e) - //{ - // base.OnMouseClick(e); - - // bool isLabel = ((e.Location.X >= 0) && (e.Location.X <= this.Width) && (e.Location.Y >= 0) && (e.Location.Y <= titleBarHeight)); - - // if (e.Button == MouseButtons.Left) - // { - // if (isLabel) - // { - // // do nothing - // } - // else - // { - // // do nothing - // } - // } - // else if (e.Button == MouseButtons.Right) - // { - // if (isLabel) - // { - // if (this.TitleContextMenuStrip != null) - // { - // this.TitleContextMenuStrip.Show(this, e.Location); - // } - // } - // else - // { - // // do nothing - // } - // } - //} - - //protected override void OnPaint(PaintEventArgs e) - //{ - // base.OnPaint(e); - - // Graphics g = e.Graphics; - // Rectangle area = new Rectangle(this.DisplayRectangle.X, this.DisplayRectangle.Y, (this.DisplayRectangle.Width - borderWidth), (this.DisplayRectangle.Height - borderWidth)); - - // // border - // g.DrawRectangle(new Pen(borderColour, borderWidth), area); - - // area.Inflate((-1 * borderWidth), (-1 * borderWidth)); - - //g.FillRectangle(new SolidBrush(titleBackColour), area.X, area.Y, (area.Width + area.X), titleBarHeight); - - //if (showTitleBarLine) g.DrawLine(new Pen(titleBorderColour, 1), area.X, titleBarHeight, (area.Width + area.X), titleBarHeight); - - //if (!DesignMode) - //{ - // if (appIcon != null) g.DrawImageUnscaled(appIcon, appIconLeft, appIconTop); - - // int iconPosX = borderWidth + appIconLeft + appIconRight + ((appIcon == null) ? 0 : appIcon.Width); - // TextRenderer.DrawText(g, this.Text, titleFont, new Point(iconPosX, titleFontTop), titleColour); - //} - //} - - protected override void OnResize(EventArgs e) - { - base.OnResize(e); - - this.Invalidate(); - } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public override Color BackColor { get => base.BackColor; set => base.BackColor = backColour; } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public new FormBorderStyle FormBorderStyle { get => base.FormBorderStyle; set => base.FormBorderStyle = value; } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public new Padding Padding { get => base.Padding; set => base.Padding = value; } - - [Category("Appearance")] - public ContextMenuStrip TitleContextMenuStrip { get; set; } = null; - - //[Browsable(false)] - //public Image AppIcon { get; set; } = null; - - //[Browsable(false)] - //public bool IsMaximiseEnabled { get; set; } = false; - - //protected Point DefaultLocation - //{ - // get - // { - // Point newPosition = new Point(Cursor.Position.X, Cursor.Position.Y); - // newPosition.X -= (this.Width / 2); - // newPosition.Y -= (this.Height / 2); - - // newPosition.X = Math.Max(newPosition.X, Screen.PrimaryScreen.WorkingArea.Left); - // newPosition.Y = Math.Max(newPosition.Y, Screen.PrimaryScreen.WorkingArea.Top); - - // return newPosition; - // } - //} - - private void InitializeComponent() - { - this.components = new System.ComponentModel.Container(); - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(TForm)); - this.SuspendLayout(); - // - // AForm - // - this.Name = "AForm"; - this.ResumeLayout(false); - } - - private void form_MouseDown(object sender, MouseEventArgs e) - { - if (e.Button == MouseButtons.Left) - { - isDragging = true; - startPosition = e.Location; - //startWindowSize = new Point(this.Width, this.Height); - } - } - - private void form_MouseMove(object sender, MouseEventArgs e) - { - if (isDragging) - { - int x = (this.Location.X + (e.Location.X - startPosition.X)); - int y = (this.Location.Y + (e.Location.Y - startPosition.Y)); - - //this.Location = validateFormLocation(x, y); - this.Location = new Point(x, y); - } - } - - private void form_MouseUp(object sender, MouseEventArgs e) - { - isDragging = false; - } - - private void form_PreviewKeyDown(object sender, PreviewKeyDownEventArgs e) - { - if (e.KeyCode == Keys.Escape) - { - Application.Exit(); - } - } - - //protected virtual void initialiseLoadComponent() - //{ - // if (DesignMode) return; - - // // close - // TImageBox closeBox = generateToolbarImageBox(); - // closeBox.Image = closeBox.ImageNormal = (enableClose) ? Resources.titlebar_close : Resources.titlebar_blank; - // closeBox.ImageHover = (enableClose) ? Resources.titlebar_close3 : Resources.titlebar_blank; - // closeBox.ImageSelected = Resources.titlebar_close3; - // closeBox.MouseClick += delegate (object sender, MouseEventArgs e) - // { - // if (e.Button == MouseButtons.Left) - // { - // if (enableClose) - // { - // this.Close(); - // } - // } - // }; - // closeBox.Left = this.DisplayRectangle.Width - closeBox.Width - (titleBarIconMarginRight + borderWidth); - - // this.Controls.Add(closeBox); - - // // maximise - // TImageBox maximiseBox = generateToolbarImageBox(); - // maximiseBox.Image = maximiseBox.ImageNormal = (enableMaximise) ? Resources.titlebar_maximise : Resources.titlebar_blank; - // maximiseBox.ImageHover = (enableMaximise) ? Resources.titlebar_maximise5 : Resources.titlebar_blank; - // maximiseBox.ImageSelected = Resources.titlebar_maximise3; - // maximiseBox.MouseClick += delegate (object sender, MouseEventArgs e) - // { - // if (!(sender is TImageBox)) return; - - // TImageBox imageBox2 = (sender as TImageBox); - - // if (imageBox2 == null) return; - - // if (e.Button == MouseButtons.Left) - // { - // if (enableMaximise) - // { - // if (this.WindowState == FormWindowState.Maximized) - // { - // this.WindowState = FormWindowState.Normal; - // imageBox2.Image = imageBox2.ImageNormal = Resources.titlebar_maximise; - // } - // else - // { - // this.WindowState = FormWindowState.Maximized; - // imageBox2.Image = imageBox2.ImageNormal = Resources.titlebar_maximise5; - // } - // } - // } - // else if (e.Button == MouseButtons.Right) - // { - // this.TopMost = !this.TopMost; - - // if (this.TopMost) - // { - // imageBox2.Image = imageBox2.ImageNormal = Resources.titlebar_maximise3; - // imageBox2.ImageHover = (enableMaximise) ? Resources.titlebar_maximise5 : Resources.titlebar_maximise3; - // } - // else - // { - // imageBox2.Image = imageBox2.ImageNormal = (enableMaximise) ? Resources.titlebar_maximise : Resources.titlebar_blank; - // imageBox2.ImageHover = (enableMaximise) ? Resources.titlebar_maximise5 : Resources.titlebar_blank; - // } - // } - // }; - // maximiseBox.Left = closeBox.Left - maximiseBox.Width - titleBarIconMargin; - - // this.Controls.Add(maximiseBox); - - // // minimise - // TImageBox minimiseBox = generateToolbarImageBox(); - // minimiseBox.Image = minimiseBox.ImageNormal = (enableMinimise) ? Resources.titlebar_minimise : Resources.titlebar_blank; - // minimiseBox.ImageHover = (enableMinimise) ? Resources.titlebar_minimise5 : Resources.titlebar_blank; - // //minimiseBox.ImageSelected = null; - // minimiseBox.MouseClick += delegate (object sender, MouseEventArgs e) - // { - // if (!enableMinimise) return; - // if (e.Button != MouseButtons.Left) return; - - // if (closeOnMinimise) - // { - // this.Close(); - // } - // else - // { - // this.WindowState = FormWindowState.Minimized; - // } - // }; - // minimiseBox.Left = maximiseBox.Left - minimiseBox.Width - titleBarIconMargin; - - // this.Controls.Add(minimiseBox); - - // // resize - // UserControl uc1 = new UserControl() - // { - // Anchor = (AnchorStyles.Left | AnchorStyles.Bottom | AnchorStyles.Right), - // Height = resizeBorderWidth, - // Width = this.DisplayRectangle.Width - resizeBorderWidth, - // Left = 0, - // Top = this.DisplayRectangle.Height - resizeBorderWidth, - // BackColor = Color.Transparent, - // Cursor = Cursors.SizeNS - // }; - // uc1.MouseDown += form_MouseDown; - // uc1.MouseUp += form_MouseUp; - // uc1.MouseMove += delegate (object sender, MouseEventArgs e) - // { - // if (isDragging) - // { - // this.Size = new Size(startWindowSize.X, e.Y - startPosition.Y + this.Height); - // } - // }; - // uc1.BringToFront(); - - // this.Controls.Add(uc1); - - // UserControl uc2 = new UserControl() - // { - // Anchor = (AnchorStyles.Top | AnchorStyles.Right | AnchorStyles.Bottom), - // Height = this.DisplayRectangle.Height - resizeBorderWidth, - // Width = resizeBorderWidth, - // Left = this.DisplayRectangle.Width - resizeBorderWidth, - // Top = 0, - // BackColor = Color.Transparent, - // Cursor = Cursors.SizeWE - // }; - // uc2.MouseDown += form_MouseDown; - // uc2.MouseUp += form_MouseUp; - // uc2.MouseMove += delegate (object sender, MouseEventArgs e) - // { - // if (isDragging) - // { - // this.Size = new Size(e.X - startPosition.X + this.Width, startWindowSize.Y); - // } - // }; - // uc2.BringToFront(); - - // this.Controls.Add(uc2); - - // UserControl uc3 = new UserControl() - // { - // Anchor = (AnchorStyles.Bottom | AnchorStyles.Right), - // Height = resizeBorderWidth, - // Width = resizeBorderWidth, - // Left = this.DisplayRectangle.Width - resizeBorderWidth, - // Top = this.DisplayRectangle.Height - resizeBorderWidth, - // BackColor = Color.Transparent, - // Cursor = Cursors.SizeNWSE - // }; - // uc3.MouseDown += form_MouseDown; - // uc3.MouseUp += form_MouseUp; - // uc3.MouseMove += delegate (object sender, MouseEventArgs e) - // { - // if (isDragging) - // { - // this.Size = new Size((e.X - startPosition.X + this.Width), (e.Y - startPosition.Y + this.Height)); - // } - // }; - // uc3.BringToFront(); - - // this.Controls.Add(uc3); - //} - - //protected TImageBox generateToolbarImageBox() - //{ - // TImageBox imageBox = new TImageBox(); - // //imageBox.BackColor = Color.Transparent; - // imageBox.BackColorHover = imageBox.BackColorSelected = Color.FromArgb(220, 220, 220); - // imageBox.BackgroundImageLayout = ImageLayout.Center; - // imageBox.ErrorImage = null; - // //imageBox.Image = Resources.close; - // //imageBox.ImageHover = Resources.close2; - // //imageBox.ImageNormal = Resources.close; - // imageBox.ImageSelected = null; - // imageBox.IsSelected = false; - // //closeBox.Location = new System.Drawing.Point(169, 12); - // imageBox.Size = titleBarIconSize; - // imageBox.SizeMode = PictureBoxSizeMode.CenterImage; - // //imageBox.MouseClick += new MouseEventHandler(closeBox_MouseClick); - // //imageBox.Left = this.DisplayRectangle.Width - imageBox.Width - 17; - // imageBox.Top = (int)Math.Floor((decimal) (titleBarHeight - titleBarIconSize.Height) / 2) + borderWidth; - // imageBox.Anchor = (AnchorStyles.Top | AnchorStyles.Right); - // imageBox.Padding = new Padding(0); - - // return imageBox; - //} - - //private void exitToolStripMenuItem_Click(object sender, EventArgs e) => this.Close(); - - //private void notifyIcon1_MouseClick(object sender, MouseEventArgs e) - //{ - // if (e.Button == MouseButtons.Left) - // { - // this.Visible = !this.Visible; - // } - - // //notifyIcon1.Visible = !this.Visible; - //} - - - } -} \ No newline at end of file diff --git a/RyzStudio/Windows/Forms/TForm.resx b/RyzStudio/Windows/Forms/TForm.resx deleted file mode 100644 index b723165..0000000 --- a/RyzStudio/Windows/Forms/TForm.resx +++ /dev/null @@ -1,424 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 17, 17 - - - 130, 17 - - - - - AAABAAQAMDAAAAEAIACoJQAARgAAACAgAAABACAAqBAAAO4lAAAYGAAAAQAgAIgJAACWNgAAEBAAAAEA - IABoBAAAHkAAACgAAAAwAAAAYAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGxc - VU5rW1Tna1tU22paU5BsXVVCgEBABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAaltTZWtbVPxrW1T/a1tU/2tbVP9rW1T/a1tU7mtbU6VrXFNWbVtbDgAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAABqWlR/a1tU/2tbVP9rW1T/a1tU/2tbVP9rW1T/a1tU/2tbVP9rW1T/a1tU+Wta - VLprW1Nrb15VHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAVVVVA2tbVJhrW1T/a1tU/2tbVP+NgXz/2NPR/6+mov+Bc23/a1tU/2tb - VP9rW1T/a1tU/2tbVP9rW1T/a1tU/2tbVc1sXFSAa1xSMgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABtSUkHa1xUqmtbVP9rW1T/a1tU/5iNiP/6+fn///////// - ////////6+no/7+4tf+Sh4L/bV5X/2tbVP9rW1T/a1tU/2tbVP9rW1T/a1tU/2tbVOFrXFOZallTTW1J - SQcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGlaWhFqW1TCa1tU/2tbVP9rW1T/o5mV//38 - /P//////////////////////////////////////9PPy/8jDwP+cko3/c2Nd/2tbVP9rW1T/a1tU/2tb - VP9rW1T/a1tU/2tbVPVrW1SzalxUXmlaWhEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAalhYHWtbVNRrW1T/a1tU/2tb - VP+1rar/////////////////////////////////////////////////////////////////+vn5/9LN - y/+lm5f/eGpj/2tbVP9rW1T/a1tU/2tbVP9rW1T/a1tU/2tbVPtrWlS9bFxVb2xdVSEAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABrWVMra1tU42tb - VP9rW1T/bV1W/8S9u/////////////////////////////////////////////////////////////// - /////////////////////////v7+/97a2f+xqKT/g3Zw/2tbVP9rW1T/a1tU/2tbVP9rW1T/a1tU/2tb - VP5qW1V4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGpZ - VTxrW1Tua1tU/2tbVP9wYVr/0czK//////////////////////////////////////////////////// - /////////////////////////////////////////////////////////////+ro5/+8tbL/j4N+/21d - Vv9rW1T/a1tU/2tbVP9rW1TpAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAbFxTUGtbVPZrW1T/a1tU/3VnYP/d2df///////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - //////////////Tz8v/Iw8D/dmdh/2tbVP9rW1T/blpTJQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAABsXFRha1tU+2tbVP9rW1T/emxl/+Th4P////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - ////////////////////////////////////////m5CL/2tbVP9rW1T/a1tTXwAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAGtaVHdrW1T/a1tU/2tbVP+DdnD/7uzs/////////////Pvw//z6 - 7v/8+u7//Pru//z67v/8+u7//Pru//z67v/9/PT///////////////////////z4+f/79fX/+/X1//v1 - 9f/79fX/+/X1//v19f/79fX//Pb2////////////////////////////vLWy/2tbVP9rW1T/a1xTmQAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABVVVUDa1tUmGtbVP9rW1T/a1tU/4t/ev/08/L///////// - ///cyT7/0bcA/9G3AP/RtwD/0bcA/9G3AP/RtwD/0bcA/9G3AP/RtwD/6Nt+////////////4bG1/8Rl - bP/EZWz/xGVs/8RlbP/EZWz/xGVs/8RlbP/EZWz/xGVs/9KKkP//////////////////////3tvZ/2tb - VP9rW1T/a1tU1AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAG1JSQdrW1Sra1tU/2tbVP9rW1T/mY6J//r5 - +f////////////389f/RtwD/0bcA/9G3AP/RtwD/0bcA/9G3AP/RtwD/0bcA/9G3AP/RtwD/28Y1//// - ////////0IWL/8RlbP/EZWz/xGVs/8RlbP/EZWz/xGVs/8RlbP/EZWz/xGVs/8RlbP/9+fn///////// - /////////Pz8/3BhWv9rW1T/a1tU/nFVVRIAAAAAAAAAAAAAAAAAAAAAaVpaEWtcVMNrW1T/a1tU/2tb - VP+kmpb//fz8//////////////////389P/RtwD/0bcA/+TVbP/w56r/8Oeq//Dnqv/w56r/8Oeq/93K - Qv/RtwD/28Y1////////////0IWL/8RlbP/TjZL/68zO/+vMzv/rzM7/68zO/+vMzv/dpqr/xGVs/8Rl - bP/8+Pn//////////////////////46CfP9rW1T/a1tU/2xbVEkAAAAAAAAAAAAAAABsWFgaa1xU0Wtb - VP9rW1T/a1tU/7CopP////////////////////////////389P/RtwD/0bcA/+7lov////////////// - /////////////+PTY//RtwD/28Y1////////////0IWL/8RlbP/boaX///////////////////////// - ///px8n/xGVs/8RlbP/8+Pn//////////////////////7CopP9rW1T/a1tU/2tbVIMAAAAAAAAAAAAA - AABqXFTOa1tU/2tbVP9tXlf/xr+9//////////////////////////////////389P/RtwD/0bcA/+7l - ov///////////////////////////+PTY//RtwD/28Y1////////////0IWL/8RlbP/boaX///////// - ///////////////////px8n/xGVs/8RlbP/8+Pn//////////////////////9LNy/9rW1T/a1tU/2tb - VL8AAAAAAAAAAAAAAABrW1Tva1tU/2tbVP/KxML///////////////////////////////////////38 - 9P/RtwD/0bcA/+7lov///////////////////////////+PTY//RtwD/28Y1////////////0IWL/8Rl - bP/boaX////////////////////////////px8n/xGVs/8RlbP/8+Pn///////////////////////Py - 8v9sXFX/a1tU/2tbVPRmZmYFAAAAAAAAAABrW1W4a1tU/2tbVP/Oycf///////////////////////// - //////////////389P/RtwD/0bcA/+7lov///////////////////////////+PTY//RtwD/28Y1//// - ////////0IWL/8RlbP/boaX////////////////////////////px8n/xGVs/8RlbP/8+Pn///////// - //////////////////+CdG7/a1tU/2tbVP9sXVM0AAAAAAAAAABqWlR/a1tU/2tbVP+tpKD///////// - //////////////////////////////389P/RtwD/0bcA/+7lov///////////////////////////+PT - Y//RtwD/28Y1////////////0IWL/8RlbP/boaX////////////////////////////px8n/xGVs/8Rl - bP/8+Pn///////////////////////////+jmZX/a1tU/2tbVP9rWlNuAAAAAAAAAABtWlNEa1tU/2tb - VP+Lfnn///////////////////////////////////////389P/RtwD/0bcA/93JQf/j1Gb/49Rm/+PU - Zv/j1Gb/49Rm/9jCJ//RtwD/28Y1////////////0IWL/8RlbP/NfYL/3KOn/9yjp//co6f/3KOn/9yj - p//TjJH/xGVs/8RlbP/8+Pn////////////////////////////Fv7z/a1tU/2tbVP9qW1OoAAAAAAAA - AABqVVUMa1tU+2tbVP9uXlf/+fn4//////////////////////////////////389P/RtwD/0bcA/9G3 - AP/RtwD/0bcA/9G3AP/RtwD/0bcA/9G3AP/RtwD/28c5////////////0IWL/8RlbP/EZWz/xGVs/8Rl - bP/EZWz/xGVs/8RlbP/EZWz/xGVs/8Rmbf/9+vr////////////////////////////n5eT/a1tU/2tb - VP9rW1TkAAAAAAAAAAAAAAAAa1tUz2tbVP9rW1T/3NjW//////////////////////////////////38 - 9v/axTP/2sUz/9rFM//axTP/2sUz/9rFM//axTP/2sUz/9rFM//bxzj/8Ois////////////2p2i/9CE - if/QhIn/0ISJ/9CEif/QhIn/0ISJ/9CEif/QhIn/0ISJ/+GwtP////////////////////////////// - ///+/v7/dWdg/2tbVP9rW1T/alhYHQAAAAAAAAAAa1tUlGtbVP9rW1T/ubKv//////////////////// - //////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - ////////////////////////l4uG/2tbVP9rW1T/a1pUWAAAAAAAAAAAbFtVWmtbVP9rW1T/mI2I//// - //////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - ////////////////////////////////////////uLGt/2tbVP9rW1T/a1tUkgAAAAAAAAAAa1pSH2tb - VP9rW1T/dmdh//7+/v////////////////////////////////+rnPH/fGTp/3xk6f98ZOn/fGTp/3xk - 6f98ZOn/fGTp/3xk6f9/aOr/ysD2////////////rOH9/zi4+v8ztvr/M7b6/zO2+v8ztvr/M7b6/zO2 - +v8ztvr/M7b6/33R/P//////////////////////////////////////2tbV/2tbVP9rW1T/a1tVzQAA - AAAAAAAAAAAAAGtbVONrW1T/a1tU/+jm5f////////////////////////////r5/v9cPuT/Wz3k/1s9 - 5P9bPeT/Wz3k/1s95P9bPeT/Wz3k/1s95P9bPeT/gGjq////////////Obj6/wCk+f8ApPn/AKT5/wCk - +f8ApPn/AKT5/wCk+f8ApPn/AKT5/wGk+f/3/P//////////////////////////////////+vn5/25f - WP9rW1T/a1tU/GpVVQwAAAAAAAAAAGtcVKprW1T/a1tU/8bAvf////////////////////////////j3 - /v9bPeT/Wz3k/4Vu6/+di+//nYvv/52L7/+di+//nYvv/3Rb6P9bPeT/fWXq////////////Nbf6/wCk - +f8nsvr/Zsj7/2bI+/9myPv/Zsj7/2bI+/9Bu/v/AKT5/wCk+f/0+/////////////////////////// - /////////////4p9eP9rW1T/a1tU/2xdVUIAAAAAAAAAAGtbVHBrW1T/a1tU/6Sblv////////////// - //////////////j3/v9bPeT/Wz3k/8O49f///////////////////////////5uI7v9bPeT/fWXq//// - ////////Nbf6/wCk+f9jx/v///////////////////////////+i3v3/AKT5/wCk+f/0+/////////// - /////////////////////////////6yjn/9rW1T/a1tU/2pcVH0AAAAAAAAAAGxdUzRrW1T/a1tU/4J0 - bv////////////////////////////j3/v9bPeT/Wz3k/8O49f///////////////////////////5uI - 7v9bPeT/fWXq////////////Nbf6/wCk+f9jx/v///////////////////////////+i3v3/AKT5/wCk - +f/0+////////////////////////////////////////87Jx/9rW1T/a1tU/2tbVbgAAAAAAAAAAGZm - ZgVrW1T0a1tU/2xcVf/z8vL///////////////////////j3/v9bPeT/Wz3k/8O49f////////////// - /////////////5uI7v9bPeT/fWXq////////////Nbf6/wCk+f9jx/v///////////////////////// - //+i3v3/AKT5/wCk+f/0+////////////////////////////////////////8rEwv9rW1T/a1tU/2tb - VO8AAAAAAAAAAAAAAABrW1S/a1tU/2tbVP/Szcv///////////////////////j3/v9bPeT/Wz3k/8O4 - 9f///////////////////////////5uI7v9bPeT/fWXq////////////Nbf6/wCk+f9jx/v///////// - //////////////////+i3v3/AKT5/wCk+f/0+///////////////////////////////////xr+9/21e - V/9rW1T/a1tU/2pcVM4AAAAAAAAAAAAAAABrWlSFa1tU/2tbVP+xqaX///////////////////////j3 - /v9bPeT/Wz3k/8O49f///////////////////////////5uI7v9bPeT/fWXq////////////Nbf6/wCk - +f9jx/v///////////////////////////+i3v3/AKT5/wCk+f/0+/////////////////////////// - //+6sq//bFxV/2tbVP9rW1T/a1tT1m9eVR4AAAAAAAAAAAAAAABpXFVLa1tU/2tbVP+Pg37///////// - //////////////j3/v9bPeT/Wz3k/6CP7//Ivvb/yL72/8i+9v/Ivvb/yL72/4Vv6/9bPeT/fWXq//// - ////////Nbf6/wCk+f9CvPv/quH9/6rh/f+q4f3/quH9/6rh/f9sy/z/AKT5/wCk+f/0+/////////// - /////////f39/6ifmv9rW1T/a1tU/2tbVP9rW1TIZllZFAAAAAAAAAAAAAAAAAAAAABpWloRa1tU/Wtb - VP9wYVr//Pv7//////////////////j3/v9bPeT/Wz3k/1s95P9bPeT/Wz3k/1s95P9bPeT/Wz3k/1s9 - 5P9bPeT/fWXq////////////Nbf6/wCk+f8ApPn/AKT5/wCk+f8ApPn/AKT5/wCk+f8ApPn/AKT5/wCk - +f/1+//////////////7+vr/nZKO/2tbVP9rW1T/a1tU/2tcVbJmZk0KAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAa1tT1mtbVP9rW1T/4Nzb//////////////////j3/v9bPeT/Wz3k/1s95P9bPeT/Wz3k/1s9 - 5P9bPeT/Wz3k/1s95P9bPeT/rJ3x////////////Nbf6/wCk+f8ApPn/AKT5/wCk+f8ApPn/AKT5/wCk - +f8ApPn/AKT5/z66+v////////////b19P+Pg37/a1tU/2tbVP9rW1T/a1tTn4BAQAQAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAa1pUm2tbVP9rW1T/vbaz//////////////////7+///08v3/9PL9//Ty - /f/08v3/9PL9//Ty/f/08v3/9PL9//Ty/f/49/7/////////////////8vr//+75///u+f//7vn//+75 - ///u+f//7vn//+75///u+f//8Pr/////////////8O/u/4Z5dP9rW1T/a1tU/2tbVP9rXFSIAAAAAQAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbFxUYWtbVP9rW1T/nJGM//////////////////// - //////////////////////////////////////////////////////////////////////////////// - ///////////////////////////////////////////////////n5eT/fG5o/2tbVP9rW1T/a1tU/Gta - VWkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAblpTJWtbVP9rW1T/dmdh/8jD - wP/08/L///////////////////////////////////////////////////////////////////////// - /////////////////////////////////////////////////////////////93Z1/91Z2D/a1tU/2tb - VP9rW1T2bFxTUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWtb - VOlrW1T/a1tU/2tbVP9tXVb/j4N+/7y1sv/q6Of///////////////////////////////////////// - ////////////////////////////////////////////////////////////////////////0czK/3Bh - Wv9rW1T/a1tU/2tbVO5qWVU8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAGpbVXhrW1T+a1tU/2tbVP9rW1T/a1tU/2tbVP9rW1T/g3Zw/7GopP/e2tn//v7+//// - //////////////////////////////////////////////////////////////////////////////// - ///Evbv/bV1W/2tbVP9rW1T/a1tU42tZUysAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABsXVUhbFxVb2taVL1rW1T7a1tU/2tbVP9rW1T/a1tU/2tb - VP9rW1T/eGpj/6Wbl//Szcv/+vn5//////////////////////////////////////////////////// - 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 - AAAAAAAAAAAAAAAAAAAAAAAAbFtVe2tbVP5rW1T/a1tU/2tbVP9rW1T/a1tT1mtcVIhrWVU5gICAAgAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAVVVVA2xbVJVrW1T/bV5X/8K7uf/RzMr/pJqW/3hpY/9rW1T/a1tU/2tb - VP9rW1TpalxTnGxcVU5mZk0KAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAG1JSQdrW1Spa1tU/29fWf/Oycf//////////////////v7+/+He - 3f+1ran/iXx2/2tbVP9rW1T/a1tU/2tbVPZqW1W7bFxVb2xYWBoAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwYFAQbFxUwGtbVP91ZmD+3trZ//////////////////// - ////////////////////////6efm/7y0sf+Ogn3/bV1W/2tbVP9rW1T/a1tU/WtbVMZrWlR3ZlVVDwAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaF5VG2tbVNJrW1T/fW9p/+fl5P////////////// - ///////////////////////////////////////////////////z8vL/x8G//5uQi/9xYlv/a1tU/2tb - VP9rW1SPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGpdVylrW1Tha1tU/4V4cv/w7u7///////// - //////////////////////////////////////////////////////////////////////////////r6 - +v/Evbv/a1tU/2xbVMwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABrXVM3a1tU62tbVP+MgHr/9PPy//// - //////////////////////////////////////////////////////////////////////////////// - //////////////v6+v9vX1n/a1tU+2pVVQwAAAAAAAAAAAAAAAAAAAAAallTTWtbVPVrW1T/mY6K//r5 - +f///v3/1r8d/9G3AP/RtwD/0bcA/9G3AP/RtwD/07oL//r34//57u//x2xy/8RlbP/EZWz/xGVs/8Rl - bP/EZWz/y3d9///+/v///////////4yAev9rW1T/alpSQQAAAAAAAAAAAAAAAGpaVWBrW1T7a1tU/6mg - nP/+/v7///////799//RtwD/2cMr/+PUZv/j1Gb/49Rm/9zIPP/RtwD/9vHM//Pg4v/EZWz/0omP/9yj - p//co6f/3KOn/85/hf/EZWz//fr6////////////rqai/2tbVP9sW1V7AAAAAAAAAABrW1R5a1tU/2xc - Vf+4sa3//////////////////v33/9G3AP/k1Wz/////////////////7OGW/9G3AP/28cz/8+Di/8Rl - bP/nwML/////////////////3aaq/8RlbP/9+vr////////////RzMn/a1tU/2pbVLYAAAAAAAAAAGtb - VO5rW1T/w726///////////////////////+/ff/0bcA/+TVbP/////////////////s4Zb/0bcA//bx - zP/z4OL/xGVs/+fAwv/////////////////dpqr/xGVs//36+v////////////Lw8P9rW1T/a1tU74CA - gAIAAAAAa1tUxWtbVP/Z1dP///////////////////////799//RtwD/5NVs/////////////////+zh - lv/RtwD/9vHM//Pg4v/EZWz/58DC/////////////////92mqv/EZWz//fr6/////////////////4By - bP9rW1T/aF1RLAAAAABqXFSLa1tU/7iwrf///////////////////////v33/9G3AP/dyUH/7eKZ/+3i - mf/t4pn/4dBa/9G3AP/28cz/8+Di/8RlbP/Zm6D/58HE/+fBxP/nwcT/04yR/8RlbP/9+vr///////// - ////////opeT/2tbVP9qW1NlAAAAAGtbVVFrW1T/louG///////////////////////+/ff/0bcA/9G3 - AP/RtwD/0bcA/9G3AP/RtwD/0bcB//n12//z4OL/xGVs/8RlbP/EZWz/xGVs/8RlbP/EZWz/x2xy//79 - /f/////////////////Dvbr/a1tU/2tbU58AAAAAaF1RFmtbVP90ZV///v7+///////////////////+ - /f/28cz/9vHM//bxzP/28cz/9vHM//bxzP/49dr///////35+f/z4OL/8+Di//Pg4v/z4OL/8+Di//Pg - 4v/47e7//////////////////////+Xi4f9rW1T/altU2gAAAAAAAAAAa1xT3GtbVP/m4+L///////// - /////////////+zp/P/e2Pr/3tj6/97Y+v/e2Pr/3tj6/+fj+////////////9ry/v/M7f7/zO3+/8zt - /v/M7f7/zO3+/+L1/v///////////////////////v7+/3VmX/9rW1T+aF1RFgAAAABsWlSha1tU/8S+ - u//////////////////8/P//YkXl/1s95P9bPeT/Wz3k/1s95P9bPeT/XD7k/+jk+//b8v7/AaT5/wCk - +f8ApPn/AKT5/wCk+f8ApPn/C6j5//v+////////////////////////lYmE/2tbVP9rWlRPAAAAAGpc - VGdrW1T/o5mU//////////////////r5/v9bPeT/hW7r/72x9P+9sfT/vbH0/5WB7v9bPeT/3tj6/8zt - /v8ApPn/WsT7/5nb/f+Z2/3/mdv9/0G7+/8ApPn/9/z///////////////////////+2r6v/a1tU/2pb - VIkAAAAAaF1RLGtbVP+Acmz/////////////////+vn+/1s95P+gj+//////////////////u6/0/1s9 - 5P/e2Pr/zO3+/wCk+f+W2v3/////////////////bMv8/wCk+f/3/P///////////////////////9nV - 0/9rW1T/a1tUxQAAAACAgIACa1tU72tbVP/y8PD////////////6+f7/Wz3k/6CP7/////////////// - //+7r/T/Wz3k/97Y+v/M7f7/AKT5/5ba/f////////////////9sy/z/AKT5//f8//////////////// - ////////w726/2tbVP9rW1TuAAAAAAAAAABqW1S2a1tU/9HMyf////////////r5/v9bPeT/oI/v//// - /////////////7uv9P9bPeT/3tj6/8zt/v8ApPn/ltr9/////////////////2zL/P8ApPn/9/z///// - /////////////7ixrf9sXFX/a1tU/2tbVHkAAAAAAAAAAGpcVH1rW1T/r6ej////////////+vn+/1s9 - 5P93Xun/nYvv/52L7/+di+//gmvq/1s95P/e2Pr/zO3+/wCk+f88ufr/Zsj7/2bI+/9myPv/K7P6/wCk - +f/3/P////////7+/v+upaH/a1tU/2tbVPxqXFRnAAAAAAAAAAAAAAAAa1tUQ2tbVP+NgXz///////// - ///6+f7/Wz3k/1s95P9bPeT/Wz3k/1s95P9bPeT/YkXl/+3q/P/M7f7/AKT5/wCk+f8ApPn/AKT5/wCk - +f8ApPn/Ha76//3+///7+vr/nZOO/2tbVP9rWlT4altVVAAAAAAAAAAAAAAAAAAAAAB0XV0La1tU+29f - Wf/7+vr///////////////////////////////////////////////////////////////////////// - ////////////////////////9vX0/5CEfv9rW1T/bFxU72pZVTwAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AABsW1TMa1tU/8S9u//6+vr///////////////////////////////////////////////////////// - //////////////////////////////Du7v+FeHL/a1tU/2tbVOFqXVcpAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAGtbVI9rW1T/a1tU/3FiW/+bkIv/x8G///Py8v////////////////////////////// - ///////////////////////////////////n5eT/fW9p/2tbVP9rW1TSaF5VGwAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAZlVVD2taVHdrW1TGa1tU/WtbVP9rW1T/bV1W/46Cff+8tLH/6efm//// - ////////////////////////////////////////3trZ/3ZnYf9rW1T/bFxUwHBgUBAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABmWVkUalxUXmtcVKprW1Tya1tU/2tb - VP9rW1T/f3Fr/6uinv/Y09H//fz8/////////////////9LNy/9xYVv/a1tU/2paVa9xVVUJAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGZm - TQpsXFVOalxTnGtbVOlrW1T/a1tU/2tbVP94aWP/pJqW/9HMyv/Cu7n/bV5X/2tbVP9sW1SVVVVVAwAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAgICAAmtZVTlrXFSIa1tT1mtbVP9rW1T/a1tU/2tbVP9rW1T+bFtVewAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAalxVJGpbVHNrW1XBa1tU7Gxc - VGEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP/g////wA///wAB//4A - AD/8AAAH+AAAB/AAAAfgAAADwAAAA4AAAAMAAAADAAAAAQAAAAEAAAABAAAAAQAAAAGAAAAAgAAAAIAA - AACAAAAAgAAAAMAAAADAAAABwAAAA8AAAAfgAAAP4AAAH+AAAD/8AAB//4AA///wA////wf/KAAAABgA - AAAwAAAAAQAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAa1tTa2xcVfBsXFW1bFpVZmZcUhkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFrWlSFa1tU/4+Dfv+AcWv8a1tU/2tb - VP5tXlbMa1xUemxbVS0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAVVVVA2xbVJprW1T/qqCc//7+/v//////6+no/7+4tf+RhoH9bF1W/mtbVP9tXlbia1xTmWpZ - U02AVVUGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB0XV0LbFxVtWxcVf+5sq////////// - ////////////////////////8/Hx/8bAvf+Zjor/cGBa/WtbVP9tXVbxaltUo2heVRsAAAAAAAAAAAAA - AAAAAAAAAAAAAGZZWRRtXFbKbV1W/sjCv/////////////////////////////////////////////// - ////////+vn5/9LNy/+mnJj/bV1W/WtbVIMAAAAAAAAAAAAAAAAAAAAAaFhYIG1eV9pvYFn808/N//// - ////////////////////////////////////////////////////////////////////////in55/W1d - Vr4AAAAAAAAAAAAAAABoXVEsbV5X53NlXvzd2tj//v78/9S8EP/RtwD/0bcA/9G3AP/RtwD/8Oit/+zN - 0P/EZWz/xGVs/8RlbP/EZWz/yG91//79/f//////raSg/2xcVfaAQEAEAAAAAGxcVEBtXVbzfG5n++jm - 5f///////v35/9G3AP/v5qf/9vHM//bxzP/Ywij/7eKZ/+fBxP/NfYP/8+Di//Pg4v/rysz/xGVs//77 - /P//////z8rH/2tbVP9rXFIyAAAAAG1dVe2CdW/98O/u/////////////v35/9G3AP/38tH///////// - ///axTL/7eKZ/+fBxP/Qg4n////////////04+T/xGVs//77/P//////8fDv/2tbVP9sW1RtAAAAAG5e - Vs+ViYT+/////////////////v35/9G3AP/38tH////////////axTL/7eKZ/+fBxP/Qg4n///////// - ///04+T/xGVs//77/P///////////31waftqW1OoAAAAAGxaU5NyY138/v7+/////////////v35/9G3 - AP/Zwyr/2sUz/9rFM//Tugr/7eOb/+fBxP/Ga3L/0ISJ/9CEif/OfoT/xGVs//78/P///////////6CW - kv9tXlflAAAAAGpcU1lrW1T/5ePh//////////////79/+3imf/t4pn/7eKZ/+3imf/t4pr/+/nr//bm - 5//nwcT/58HE/+fBxP/nwcT/7M3P/////////////////8K7uf9rW1T/alhYHW9eVR5rW1T/w726//// - /////////////8rA9v+9sfT/vbH0/72x9P++svT/8vD9/+v4//+a2/3/mdv9/5nb/f+Z2/3/rOH9//// - /////////////+Th4P9rW1T/bFtVVwAAAABtXlfnopeT/////////////Pv+/1s95P92Xej/fGTp/3xk - 6f9hReX/v7P0/5vb/f8KqPn/M7b6/zO2+v8qs/r/AKT5//r9//////////////7+/v9yY1z8a1tUkQAA - AABqW1OofXBp+///////////+/r+/1s95P/h3Pr///////////97Y+n/vbH0/5nb/f8ytvr///////// - ///R7/7/AKT5//n9//////////////////+ViYT+bl5WzwAAAABsW1Rta1tU//Hw7///////+/r+/1s9 - 5P/h3Pr///////////97Y+n/vbH0/5nb/f8ytvr////////////R7/7/AKT5//n9//////////////Dv - 7v+CdW/9bV1V7QAAAABsXVM0a1tU/9DLyf//////+/r+/1s95P/GvPb/3tj6/97Y+v91W+j/vbH0/5nb - /f8osvr/zO3+/8zt/v+n4P3/AKT5//n9////////6+no/35wavxsXVX1altURgAAAACAQEAEbV1W9q6m - ov//////+/r+/1s95P9bPeT/Wz3k/1s95P9bPeT/ysH2/5nb/f8ApPn/AKT5/wCk+f8ApPn/EKr5//z+ - ///g3dv/dmdh/G1dVuptWFMxAAAAAAAAAAAAAAAAbFxVv4x/ev3///////////////////////////// - /////////////////////////////////////////////9jT0f9xYVv8bV5W32pcVSQAAAAAAAAAAAAA - AAAAAAAAa1tUg21dVv2mnJj/0s3L//r5+f////////////////////////////////////////////// - ////////yMK//21dVv5tXFbKZllZFAAAAAAAAAAAAAAAAAAAAAAAAAAAaF5VG2pbVKNsXFXwa1tU/3Bg - Wv2Zjor+xsC9//Px8f////////////////////////////////+5sq//bFxV/2xcVbV0XV0LAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABVVVUDallVPGtcVIhtXVbba1tU/2tbVP6Ie3X9ta2p/+He - 3f///////v7+/66mov9rW1T/bFpUoWZmZgUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAbFtVLWtcVHpsXVXLa1tU/mtbVP9/cWv7j4N+/2tbVP9rWlSFAAAAAQAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAZlxSGWxaVWZsXFW1bFxV8GtbU2sAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP8H - /0H8AP9B+AAPQfAAA0HgAANBwAADQYAAAUEAAAFBAAABQQAAAUEAAAFBAAAAQQAAAEGAAABBgAAAQYAA - AEGAAABBgAABQcAAA0HAAAdBwAAPQfAAH0H/AD9B/+D/QSgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHJhW3tvYFn0dWZgsmxbVVdmVVUPAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgICAAnFiW5eCdG705OHg/8a/vf+UiYT0cWFa+Xdo - YcptXFVsb15VHgAAAAAAAAAAAAAAAAAAAAAAAAAAbUlJB3NkXbKMgHr09/b2//////////////////r5 - +f/Szcv/oJeS9XNlXfZzZV7baVxVJwAAAAAAAAAAbVtbDnNjXciZj4n1+/r6//////////////////// - ///////////////////+/v7/pJqW+WxdVnYAAAAAamBVGHJkXdmnnpn2/f37/9S8E//axTP/2MIo/+XX - cP/eqa3/zX2D/9CEif/IcHf//v39/83Ixf92Z2C8AAAAAHJjXOC5sK36//////7++//bxjb///////Xw - yv/k1Gf/3KOn//Pf4P//////0IaL//79/f/w7u7/cWFb8gAAAAF0Zl/i4+Df///////+/vv/2cMr//bx - zP/u5aL/5NRn/9yjp//px8n/8+Di/85/hf/+/f3//////3hpYvNuWlMldGReo8K7uf////////79/+PU - Zv/j1Gb/49Rm//Dorv/qyMv/3KOn/9yjp//eqKz///7+//////+ajoryalxUXmpaVWCbkYzz//////7+ - //+ikfD/nYvv/52L7//Lwfb/ruL9/2bI+/9myPv/b8z8//7/////////wbq3/3RlXqJuWlMleGli8/// - ///8/P//d17p/97Y+v/DuPX/nYvv/2fJ+/+i3v3/zO3+/yuz+v/7/v///////+Pg3/90Zl/iAAAAAXFh - W/Lw7u7//Pz//35m6v//////3df5/52L7/9nyfv/yuz+//////82t/r/+/7///////+5sK36cmNc4AAA - AAB2Z2G+zsnH//z8//9iReX/fGTp/3Vb6P+jkvD/Z8n7/yiy+v8ztvr/E6v5//v9/v+to5/4c2Nd3m1b - UhwAAAAAbF1WdqSalvn+/v7///////////////////////////////////////v6+v+Zj4r2c2ReyW1b - Ww4AAAAAAAAAAGlcVSdzZV7bc2Vd9qCXkvXSzcv/+vn5//////////////////f29v+MgHr0c2Rdsm1J - SQcAAAAAAAAAAAAAAAAAAAAAAAAAAG9eVR5rW1NrdGRexnBhWfiShoHvxr+9/uTh4P+CdG70c2RdmYCA - gAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABmVVUPbFtVV3VmYLJvYFn0cmFbewAA - AAAAAAAAAAAAAAAAAAAAAAAA+D+sQeAHrEHAAaxBgAGsQQABrEEAAKxBAACsQQAArEEAAKxBAACsQQAA - rEGAAKxBgAGsQYADrEHgB6xB/B+sQQ== - - - \ No newline at end of file diff --git a/RyzStudio/Windows/Forms/THorizontalSeparator.Designer.cs b/RyzStudio/Windows/Forms/THorizontalSeparator.Designer.cs deleted file mode 100644 index 1058088..0000000 --- a/RyzStudio/Windows/Forms/THorizontalSeparator.Designer.cs +++ /dev/null @@ -1,37 +0,0 @@ -namespace RyzStudio.Windows.Forms -{ - partial class THorizontalSeparator - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Component Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - components = new System.ComponentModel.Container(); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - } - - #endregion - } -} diff --git a/RyzStudio/Windows/Forms/THorizontalSeparator.cs b/RyzStudio/Windows/Forms/THorizontalSeparator.cs deleted file mode 100644 index 1be87f2..0000000 --- a/RyzStudio/Windows/Forms/THorizontalSeparator.cs +++ /dev/null @@ -1,101 +0,0 @@ -using System.ComponentModel; -using System.Drawing; -using System.Windows.Forms; - -namespace RyzStudio.Windows.Forms -{ - public partial class THorizontalSeparator : System.Windows.Forms.UserControl - { - public THorizontalSeparator() - { - InitializeComponent(); - - this.BackColor = Color.Transparent; - this.Margin = new Padding(10, 0, 10, 0); - this.MaximumSize = new Size(SystemInformation.VirtualScreen.Width, 22); - this.MinimumSize = new Size(0, 22); - this.Padding = new Padding(0, 10, 0, 10); - } - - protected override void OnPaintBackground(PaintEventArgs e) - { - base.OnPaintBackground(e); - - Graphics g = e.Graphics; - - g.FillRectangle(new SolidBrush(Color.FromArgb(213, 223, 229)), new Rectangle(this.DisplayRectangle.Left, 11, this.DisplayRectangle.Width, 1)); - g.FillRectangle(new SolidBrush(Color.FromArgb(249, 251, 253)), new Rectangle(this.DisplayRectangle.Left, 12, this.DisplayRectangle.Width, 1)); - } - - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public override Image BackgroundImage { get => base.BackgroundImage; set => base.BackgroundImage = value; } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public override ImageLayout BackgroundImageLayout { get => base.BackgroundImageLayout; set => base.BackgroundImageLayout = value; } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public new BorderStyle BorderStyle { get => base.BorderStyle; set => base.BorderStyle = value; } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public override Cursor Cursor { get => base.Cursor; set => base.Cursor = value; } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public override Font Font { get => base.Font; set => base.Font = value; } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public override Color BackColor { get => base.BackColor; set => base.BackColor = value; } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public override Color ForeColor { get => base.ForeColor; set => base.ForeColor = value; } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public override RightToLeft RightToLeft { get => base.RightToLeft; set => base.RightToLeft = value; } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public new bool UseWaitCursor { get => base.UseWaitCursor; set => base.UseWaitCursor = value; } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public override bool AllowDrop { get => base.AllowDrop; set => base.AllowDrop = value; } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public override AutoValidate AutoValidate { get => base.AutoValidate; set => base.AutoValidate = value; } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public override ContextMenuStrip ContextMenuStrip { get => base.ContextMenuStrip; set => base.ContextMenuStrip = value; } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public new ImeMode ImeMode { get => base.ImeMode; set => base.ImeMode = value; } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public override bool AutoScroll { get => base.AutoScroll; set => base.AutoScroll = value; } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public new Size AutoScrollMargin { get => base.AutoScrollMargin; set => base.AutoScrollMargin = value; } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public new Size AutoScrollMinSize { get => base.AutoScrollMinSize; set => base.AutoScrollMinSize = value; } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public override bool AutoSize { get => base.AutoSize; set => base.AutoSize = value; } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public new AutoSizeMode AutoSizeMode { get => base.AutoSizeMode; set => base.AutoSizeMode = value; } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public override Size MaximumSize { get => base.MaximumSize; set => base.MaximumSize = value; } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public override Size MinimumSize { get => base.MinimumSize; set => base.MinimumSize = value; } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public new Padding Margin { get => base.Margin; set => base.Margin = value; } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public new Padding Padding { get => base.Padding; set => base.Padding = value; } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public new DockStyle Dock { get => base.Dock; set => base.Dock = value; } - - } -} diff --git a/RyzStudio/Windows/Forms/THorizontalSeparator.resx b/RyzStudio/Windows/Forms/THorizontalSeparator.resx deleted file mode 100644 index 1af7de1..0000000 --- a/RyzStudio/Windows/Forms/THorizontalSeparator.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/RyzStudio/Windows/Forms/TImageBox.cs b/RyzStudio/Windows/Forms/TImageBox.cs deleted file mode 100644 index 09f7bbe..0000000 --- a/RyzStudio/Windows/Forms/TImageBox.cs +++ /dev/null @@ -1,84 +0,0 @@ -using System; -using System.ComponentModel; -using System.Drawing; - -namespace RyzStudio.Windows.Forms -{ - public class TImageBox : System.Windows.Forms.PictureBox - { - public TImageBox() : base() - { - this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.ErrorImage = null; - this.InitialImage = null; - this.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - } - - protected override void OnCreateControl() - { - OnMouseLeave(null); - - base.OnCreateControl(); - } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public new Color BackColor { get => base.BackColor; set => base.BackColor = value; } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public new Image Image { get => base.Image; set => base.Image = value; } - - [Category("Appearance"), Browsable(true)] - public Color BackColorNormal { get; set; } = Color.Transparent; - - [Category("Appearance"), Browsable(true)] - public Color BackColorHover { get; set; } = Color.Transparent; - - [Category("Appearance"), Browsable(true)] - public Color BackColorSelected { get; set; } = Color.Transparent; - - [Category("Appearance"), Browsable(true)] - public Image ImageNormal { get; set; } - - [Category("Appearance"), Browsable(true)] - public Image ImageHover { get; set; } - - [Category("Appearance"), Browsable(true)] - public Image ImageSelected { get; set; } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public Image NormalImage { get => this.ImageNormal; set => this.ImageNormal = value; } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public Image HoverImage { get => this.ImageHover; set => this.ImageHover = value; } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public Image SelectedImage { get => this.ImageSelected; set => this.ImageSelected = value; } - - public bool IsSelected { get; set; } = false; - - protected override void OnMouseEnter(EventArgs e) - { - this.Image = this.ImageHover; - this.BackColor = this.BackColorHover; - - base.OnMouseEnter(e); - } - - protected override void OnMouseLeave(EventArgs e) - { - this.Image = (this.IsSelected ? this.ImageSelected : this.ImageNormal); - this.BackColor = (this.IsSelected ? this.BackColorSelected : this.BackColorNormal); - - base.OnMouseLeave(e); - } - - protected override void OnLostFocus(EventArgs e) - { - this.Image = (this.IsSelected ? this.ImageSelected : this.ImageNormal); - this.BackColor = (this.IsSelected ? this.BackColorSelected : this.BackColorNormal); - - base.OnLostFocus(e); - } - - } -} diff --git a/RyzStudio/Windows/Forms/TPanelBook.cs b/RyzStudio/Windows/Forms/TPanelBook.cs deleted file mode 100644 index eae6a0f..0000000 --- a/RyzStudio/Windows/Forms/TPanelBook.cs +++ /dev/null @@ -1,258 +0,0 @@ -namespace RyzStudio.Windows.Forms -{ - using System; - using System.Collections; - using System.ComponentModel; - using System.Drawing; - using System.Windows.Forms; - - [ToolboxItem(true)] - public class TPanelBook : UserControl - { - public class PanelCollection : CollectionBase - { - protected TPanelBook panelBook = null; - - public PanelCollection(TPanelBook parentPanelBook) : base() - { - panelBook = parentPanelBook; - } - - public TPanelBook Parent => panelBook; - - public Panel this[int index] { get => (Panel)List[index]; set => List[index] = value; } - - public int Add(Panel value) => List.Add(value); - - public void AddRange(Panel[] pages) => Array.ForEach(pages, x => this.Add(x)); - - public bool Contains(Panel value) => List.Contains(value); - - public int IndexOf(Panel value) => List.IndexOf(value); - - public void Insert(int index, Panel value) => List.Insert(index, value); - - public void Remove(Panel value) => List.Remove(value); - - protected override void OnInsertComplete(int index, object value) - { - base.OnInsertComplete(index, value); - - if (panelBook != null) - { - panelBook.PageIndex = index; - } - } - - protected override void OnRemoveComplete(int index, object value) - { - base.OnRemoveComplete(index, value); - - if (panelBook != null) - { - if (panelBook.PageIndex == index) - { - if (index < InnerList.Count) - { - panelBook.PageIndex = index; - } - else - { - panelBook.PageIndex = InnerList.Count - 1; - } - } - } - } - - } - - private System.ComponentModel.IContainer components = null; - - protected PanelCollection panelCollection = null; - - public TPanelBook() - { - InitializeComponent(); - - panelCollection = new PanelCollection(this); - } - - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - - base.Dispose(disposing); - } - - protected void InitializeComponent() - { - components = new System.ComponentModel.Container(); - } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public Panel ActivePanel { get; protected set; } = null; - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public override bool AutoScroll { get => base.AutoScroll; set => base.AutoScroll = value; } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public new Size AutoScrollMargin { get => base.AutoScrollMargin; set => base.AutoScrollMargin = value; } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public new Size AutoScrollMinSize { get => base.AutoScrollMinSize; set => base.AutoScrollMinSize = value; } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public override Image BackgroundImage { get => base.BackgroundImage; set => base.BackgroundImage = value; } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public override ImageLayout BackgroundImageLayout { get => base.BackgroundImageLayout; set => base.BackgroundImageLayout = value; } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public new ImeMode ImeMode { get => base.ImeMode; set => base.ImeMode = value; } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public override RightToLeft RightToLeft { get => base.RightToLeft; set => base.RightToLeft = value; } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public new bool UseWaitCursor { get => base.UseWaitCursor; set => base.UseWaitCursor = value; } - - [Category("Collection")] - [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)] - public PanelCollection Pages => panelCollection; - - [Category("Collection")] - public int SelectedIndex - { - get => (panelCollection.Count <= 0) ? -1 : panelCollection.IndexOf(this.ActivePanel); - set - { - if (panelCollection.Count <= 0) return; - if (value < 0) return; - if (value > (panelCollection.Count - 1)) return; - if (value == this.SelectedIndex) return; - - ActivatePage(value); - } - } - - protected internal int PageIndex - { - get => panelCollection.IndexOf(this.ActivePanel); - set - { - if (panelCollection.Count <= 0) - { - ActivatePage(-1); - return; - } - - if ((value < -1) || (value >= panelCollection.Count)) - { - throw new ArgumentOutOfRangeException("PageIndex", value, "The page index must be between 0 and " + Convert.ToString(panelCollection.Count - 1)); - } - - ActivatePage(value); - } - } - - protected internal void ActivatePage(int index) - { - if ((panelCollection.Count == 0) && (index >= panelCollection.Count) && (index <= 0)) - { - return; - } - - Panel p = (Panel)panelCollection[index]; - - ActivatePage(p); - } - - protected internal void ActivatePage(Panel page) - { - if (this.ActivePanel != null) - { - if (this.ActivePanel.InvokeRequired) - { - this.ActivePanel.Invoke(new MethodInvoker(() => { - this.ActivePanel.Visible = false; - })); - } - else - { - this.ActivePanel.Visible = false; - } - } - - this.ActivePanel = page; - if (this.ActivePanel != null) - { - this.ActivePanel.Parent = this; - if (!this.Contains(this.ActivePanel)) - { - this.Container.Add(this.ActivePanel); - } - - if (this.ActivePanel.InvokeRequired) - { - this.ActivePanel.Invoke(new MethodInvoker(() => { - this.ActivePanel.Dock = DockStyle.Fill; - this.ActivePanel.Visible = true; - this.ActivePanel.BringToFront(); - })); - } - else - { - this.ActivePanel.Dock = DockStyle.Fill; - this.ActivePanel.Visible = true; - this.ActivePanel.BringToFront(); - } - } - - if (this.ActivePanel != null) - { - if (this.ActivePanel.InvokeRequired) - { - this.ActivePanel.Invoke(new MethodInvoker(() => { - this.ActivePanel.Invalidate(); - })); - } - else - { - this.ActivePanel.Invalidate(); - } - } - else - { - this.Invalidate(); - } - } - -#if DEBUG - - protected override void OnResize(EventArgs e) - { - base.OnResize(e); - - if (this.DesignMode) - { - this.Invalidate(); - } - } - -#endif - - protected override void DestroyHandle() - { - base.DestroyHandle(); - - foreach (Panel p in panelCollection) - { - p.Dispose(); - } - } - - } -} \ No newline at end of file diff --git a/RyzStudio/Windows/Forms/TUserControl.cs b/RyzStudio/Windows/Forms/TUserControl.cs deleted file mode 100644 index 8a22585..0000000 --- a/RyzStudio/Windows/Forms/TUserControl.cs +++ /dev/null @@ -1,73 +0,0 @@ -using System.ComponentModel; -using System.Drawing; -using System.Windows.Forms; - -namespace RyzStudio.Windows.Forms -{ - public class TUserControl : UserControl - { - - public TUserControl() : base() - { - - } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public override Image BackgroundImage { get => base.BackgroundImage; set => base.BackgroundImage = value; } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public override ImageLayout BackgroundImageLayout { get => base.BackgroundImageLayout; set => base.BackgroundImageLayout = value; } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public new BorderStyle BorderStyle { get => base.BorderStyle; set => base.BorderStyle = value; } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public override Cursor Cursor { get => base.Cursor; set => base.Cursor = value; } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public override Font Font { get => base.Font; set => base.Font = value; } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public override Color ForeColor { get => base.ForeColor; set => base.ForeColor = value; } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public override RightToLeft RightToLeft { get => base.RightToLeft; set => base.RightToLeft = value; } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public new bool UseWaitCursor { get => base.UseWaitCursor; set => base.UseWaitCursor = value; } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public override bool AllowDrop { get => base.AllowDrop; set => base.AllowDrop = value; } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public override AutoValidate AutoValidate { get => base.AutoValidate; set => base.AutoValidate = value; } - - //[Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - //public override ContextMenuStrip ContextMenuStrip { get => base.ContextMenuStrip; set => base.ContextMenuStrip = value; } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public new ImeMode ImeMode { get => base.ImeMode; set => base.ImeMode = value; } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public override bool AutoScroll { get => base.AutoScroll; set => base.AutoScroll = value; } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public new Size AutoScrollMargin { get => base.AutoScrollMargin; set => base.AutoScrollMargin = value; } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public new Size AutoScrollMinSize { get => base.AutoScrollMinSize; set => base.AutoScrollMinSize = value; } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public override bool AutoSize { get => base.AutoSize; set => base.AutoSize = value; } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public new AutoSizeMode AutoSizeMode { get => base.AutoSizeMode; set => base.AutoSizeMode = value; } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public override Size MaximumSize { get => base.MaximumSize; set => base.MaximumSize = value; } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public override Size MinimumSize { get => base.MinimumSize; set => base.MinimumSize = value; } - - } -} \ No newline at end of file diff --git a/RyzStudio/Windows/Forms/ThreadControl.cs b/RyzStudio/Windows/Forms/ThreadControl.cs deleted file mode 100644 index f183a18..0000000 --- a/RyzStudio/Windows/Forms/ThreadControl.cs +++ /dev/null @@ -1,585 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; - -namespace RyzStudio.Windows.Forms -{ - public class ThreadControl - { - public static void Add(Control control, Control value) - { - if (control.InvokeRequired) - { - control.Invoke(new MethodInvoker(() => - { - control.Controls.Add(value); - })); - } - else - { - control.Controls.Add(value); - } - } - - public static void Add(ListBox control, string value) - { - if (control.InvokeRequired) - { - control.Invoke(new MethodInvoker(() => { - control.Items.Add(value); - })); - } - else - { - control.Items.Add(value); - } - } - - //public static void Add(FlowLayoutPanel control, Control value) - //{ - // if (control.InvokeRequired) - // { - // control.Invoke(new MethodInvoker(() => { - // control.Controls.Add(value); - // })); - // } - // else - // { - // control.Controls.Add(value); - // } - //} - - public static int Add(TreeView control, TreeNode value) - { - int n = -1; - - if (control.InvokeRequired) - { - control.Invoke(new MethodInvoker(() => { - n = control.Nodes.Add(value); - })); - } - else - { - n = control.Nodes.Add(value); - } - - return n; - } - - public static int Add(TreeNode control, TreeNode value) - { - int n = -1; - - if (control.TreeView.InvokeRequired) - { - control.TreeView.Invoke(new MethodInvoker(() => { - n = control.Nodes.Add(value); - })); - } - else - { - n = control.Nodes.Add(value); - } - - return n; - } - - public static int Add(DataGridView control, object[] value) - { - int n = -1; - - if (control.InvokeRequired) - { - control.Invoke(new MethodInvoker(() => { - n = control.Rows.Add(value); - })); - } - else - { - n = control.Rows.Add(value); - } - - return n; - } - - public static int Add(DataGridView control, object[] value, object tag) - { - int n = -1; - - if (control.InvokeRequired) - { - control.Invoke(new MethodInvoker(() => { - n = control.Rows.Add(value); - control.Rows[n].Tag = tag; - })); - } - else - { - n = control.Rows.Add(value); - control.Rows[n].Tag = tag; - } - - return n; - } - - public static TreeNode Add(TreeView control, string key, string text) - { - TreeNode rv = null; - - if (control.InvokeRequired) - { - control.Invoke(new MethodInvoker(() => { - rv = control.Nodes.Add(key, text); - })); - } - else - { - rv = control.Nodes.Add(key, text); - } - - return rv; - } - - public static TreeNode Add(TreeNode control, string key, string text) - { - TreeNode rv = null; - - if (control.TreeView.InvokeRequired) - { - control.TreeView.Invoke(new MethodInvoker(() => { - rv = control.Nodes.Add(key, text); - })); - } - else - { - rv = control.Nodes.Add(key, text); - } - - return rv; - } - - public static void AddLine(RichTextBox control, string text) - { - if (control.InvokeRequired) - { - control.Invoke(new MethodInvoker(() => - { - control.Text += text + Environment.NewLine; - })); - } - else - { - control.Text += text + Environment.NewLine; - } - } - - public static void Clear(ListBox control) - { - if (control.InvokeRequired) - { - control.Invoke(new MethodInvoker(() => { - control.Items.Clear(); - })); - } - else - { - control.Items.Clear(); - } - } - - public static void Clear(FlowLayoutPanel control) - { - if (control.InvokeRequired) - { - control.Invoke(new MethodInvoker(() => { - control.Controls.Clear(); - })); - } - else - { - control.Controls.Clear(); - } - } - - public static void Clear(TreeView control) - { - if (control.InvokeRequired) - { - control.Invoke(new MethodInvoker(() => { - control.Nodes.Clear(); - })); - } - else - { - control.Nodes.Clear(); - } - } - - public static void Clear(Label control) => SetText(control, string.Empty); - - public static void Clear(PictureBox control) - { - if (control.InvokeRequired) - { - control.Invoke(new MethodInvoker(() => - { - control.Image = null; - })); - } - else - { - control.Image = null; - } - } - - public static void Clear(DataGridView control) - { - if (control.InvokeRequired) - { - control.Invoke(new MethodInvoker(() => - { - control.Rows.Clear(); - })); - } - else - { - control.Rows.Clear(); - } - } - - public static List FindChildControl(Control control) where T : Control - { - List rs = new List(); - - foreach (Control item in control.Controls) - { - var ctr = item as T; - if (ctr == null) - { - rs.AddRange(FindChildControl(item)); - } - else - { - rs.Add(ctr); - } - } - - return rs; - } - - public static string GetText(Control control, bool doTrim = true) - { - string rv = string.Empty; - - if (control.InvokeRequired) - { - control.Invoke(new MethodInvoker(() => { - rv = (doTrim ? control.Text?.Trim() : control.Text); - })); - } - else - { - rv = (doTrim ? control.Text?.Trim() : control.Text); - } - - return rv; - } - - public static void SetChecked(ToolStripMenuItem control, bool value) - { - if (control.GetCurrentParent().InvokeRequired) - { - control.GetCurrentParent().Invoke(new MethodInvoker(() => - { - control.Checked = value; - })); - } - else - { - control.Checked = value; - } - } - - public static void SetEnable(Control control, bool value) - { - if (control.InvokeRequired) - { - control.Invoke(new MethodInvoker(() => - { - control.Enabled = value; - })); - } - else - { - control.Enabled = value; - } - } - - public static void SetFocus(Control control) - { - if (control.InvokeRequired) - { - control.Invoke(new MethodInvoker(() => - { - control.Focus(); - })); - } - else - { - control.Focus(); - } - } - - public static int GetValue(NumericUpDown sender) - { - int rv = 0; - - if (sender.InvokeRequired) - { - sender.Invoke(new MethodInvoker(() => { - rv = (int)sender.Value; - })); - } - else - { - rv = (int)sender.Value; - } - - return rv; - } - - public static string GetSelectedValue(ListBox sender) - { - string rv = string.Empty; - - if (sender.InvokeRequired) - { - sender.Invoke(new MethodInvoker(() => { - rv = (sender.SelectedItem == null) ? string.Empty : sender.SelectedItem.ToString(); - })); - } - else - { - rv = (sender.SelectedItem == null) ? string.Empty : sender.SelectedItem.ToString(); - } - - return rv; - } - - public static void SetHeight(Control control, int value) - { - if (control.InvokeRequired) - { - control.Invoke(new MethodInvoker(() => { - control.Height = value; - })); - } - else - { - control.Height = value; - } - } - - public static void SetLocation(Control control, Point value) - { - if (control.InvokeRequired) - { - control.Invoke(new MethodInvoker(() => { - control.Location = value; - })); - } - else - { - control.Location = value; - } - } - - public static void SetClientSize(Control control, int width, int height) => SetClientSize(control, new Size(width, height)); - - public static void SetClientSize(Control control, Size value) - { - if (control.InvokeRequired) - { - control.Invoke(new MethodInvoker(() => { - control.ClientSize = value; - })); - } - else - { - control.ClientSize = value; - } - } - - public static void SetClientHeight(Control control, int value) - { - if (control.InvokeRequired) - { - control.Invoke(new MethodInvoker(() => { - control.ClientSize = new Size(control.ClientSize.Width, value); - })); - } - else - { - control.ClientSize = new Size(control.ClientSize.Width, value); - } - } - - public static void SetSize(Control control, int width, int height) => SetSize(control, new Size(width, height)); - - public static void SetSize(Control control, Size value) - { - if (control.InvokeRequired) - { - control.Invoke(new MethodInvoker(() => { - control.Size = value; - })); - } - else - { - control.Size = value; - } - } - - public static void SetText(Control control, string text) - { - if (control.InvokeRequired) - { - control.Invoke(new MethodInvoker(() => - { - control.Text = text; - })); - } - else - { - control.Text = text; - } - } - - public static void SetTopMost(Form control, bool value) - { - if (control.InvokeRequired) - { - control.Invoke(new MethodInvoker(() => { - control.TopMost = value; - })); - } - else - { - control.TopMost = value; - } - } - - public static void SetValue(Control control, string value) - { - if (control.InvokeRequired) - { - control.Invoke(new MethodInvoker(() => { - control.Text = value; - })); - } - else - { - control.Text = value; - } - } - - public static void SetValue(PictureBox control, Image value) - { - if (control.InvokeRequired) - { - control.Invoke(new MethodInvoker(() => - { - control.Image = value; - })); - } - else - { - control.Image = value; - } - } - - public static void SetVisible(Control control, bool value) - { - if (control.InvokeRequired) - { - control.Invoke(new MethodInvoker(() => { - control.Visible = value; - })); - } - else - { - control.Visible = value; - } - } - - public static void SetVisible(Form control, bool value) - { - if (control.InvokeRequired) - { - control.Invoke(new MethodInvoker(() => { - if (value) - { - //control.ShowInTaskbar = value; - //control.Opacity = 100; - control.Visible = value; - } - else - { - control.Visible = value; - //control.ShowInTaskbar = value; - //control.Opacity = 0; - } - })); - } - else - { - if (value) - { - //control.ShowInTaskbar = value; - //control.Opacity = 100; - control.Visible = value; - } - else - { - control.Visible = value; - //control.ShowInTaskbar = value; - //control.Opacity = 0; - } - } - } - - public static void SetWidth(Control control, int value) - { - if (control.InvokeRequired) - { - control.Invoke(new MethodInvoker(() => { - control.Width = value; - })); - } - else - { - control.Width = value; - } - } - - public static void SetClientWidth(Control control, int value) - { - if (control.InvokeRequired) - { - control.Invoke(new MethodInvoker(() => { - control.ClientSize = new Size(value, control.ClientSize.Height); - })); - } - else - { - control.ClientSize = new Size(value, control.ClientSize.Height); - } - } - - } -} \ No newline at end of file diff --git a/RyzStudio/Windows/ThemedForms/BorderlessForm.Designer.cs b/RyzStudio/Windows/ThemedForms/BorderlessForm.Designer.cs deleted file mode 100644 index d39ad3c..0000000 --- a/RyzStudio/Windows/ThemedForms/BorderlessForm.Designer.cs +++ /dev/null @@ -1,193 +0,0 @@ -using RyzStudio.Windows.Forms; - -namespace RyzStudio.Windows.ThemedForms -{ - partial class BorderlessForm - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(BorderlessForm)); - this.label1 = new System.Windows.Forms.Label(); - this.panel1 = new System.Windows.Forms.Panel(); - this.area1 = new System.Windows.Forms.Panel(); - this.pictureBox4 = new RyzStudio.Windows.Forms.TImageBox(); - this.pictureBox2 = new RyzStudio.Windows.Forms.TImageBox(); - this.pictureBox1 = new RyzStudio.Windows.Forms.TImageBox(); - this.pictureBox3 = new RyzStudio.Windows.Forms.TImageBox(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).BeginInit(); - this.SuspendLayout(); - // - // label1 - // - this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.label1.BackColor = System.Drawing.Color.Transparent; - this.label1.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(241)))), ((int)(((byte)(241)))), ((int)(((byte)(241))))); - this.label1.Location = new System.Drawing.Point(1, 1); - this.label1.Name = "label1"; - this.label1.Padding = new System.Windows.Forms.Padding(48, 0, 0, 0); - this.label1.Size = new System.Drawing.Size(454, 48); - this.label1.TabIndex = 148; - this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.label1.DoubleClick += new System.EventHandler(this.label1_DoubleClick); - this.label1.MouseClick += new System.Windows.Forms.MouseEventHandler(this.label1_MouseClick); - this.label1.MouseDown += new System.Windows.Forms.MouseEventHandler(this.label1_MouseDown); - this.label1.MouseMove += new System.Windows.Forms.MouseEventHandler(this.label1_MouseMove); - this.label1.MouseUp += new System.Windows.Forms.MouseEventHandler(this.label1_MouseUp); - // - // panel1 - // - this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.panel1.BackColor = System.Drawing.Color.Transparent; - this.panel1.Cursor = System.Windows.Forms.Cursors.SizeNWSE; - this.panel1.Location = new System.Drawing.Point(594, 674); - this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(6, 6); - this.panel1.TabIndex = 150; - this.panel1.MouseDown += new System.Windows.Forms.MouseEventHandler(this.panel1_MouseDown); - this.panel1.MouseMove += new System.Windows.Forms.MouseEventHandler(this.panel1_MouseMove); - this.panel1.MouseUp += new System.Windows.Forms.MouseEventHandler(this.panel1_MouseUp); - // - // area1 - // - this.area1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.area1.BackColor = System.Drawing.Color.Transparent; - this.area1.Cursor = System.Windows.Forms.Cursors.SizeNS; - this.area1.Location = new System.Drawing.Point(1, 674); - this.area1.Name = "area1"; - this.area1.Size = new System.Drawing.Size(592, 6); - this.area1.TabIndex = 152; - this.area1.MouseDown += new System.Windows.Forms.MouseEventHandler(this.panel2_MouseDown); - this.area1.MouseMove += new System.Windows.Forms.MouseEventHandler(this.panel2_MouseMove); - this.area1.MouseUp += new System.Windows.Forms.MouseEventHandler(this.panel2_MouseUp); - // - // pictureBox4 - // - this.pictureBox4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.pictureBox4.BackColor = System.Drawing.Color.Transparent; - this.pictureBox4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.pictureBox4.ErrorImage = null; - this.pictureBox4.ImageHover = global::hiim.dply.Properties.Resources.form20_menu2; - this.pictureBox4.Image = global::hiim.dply.Properties.Resources.form20_menu; - this.pictureBox4.InitialImage = null; - this.pictureBox4.Location = new System.Drawing.Point(460, 11); - this.pictureBox4.Name = "pictureBox4"; - this.pictureBox4.NormalImage = global::hiim.dply.Properties.Resources.form20_menu; - this.pictureBox4.Size = new System.Drawing.Size(28, 28); - this.pictureBox4.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.pictureBox4.TabIndex = 149; - this.pictureBox4.TabStop = false; - // - // pictureBox2 - // - this.pictureBox2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.pictureBox2.BackColor = System.Drawing.Color.Transparent; - this.pictureBox2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.pictureBox2.ErrorImage = null; - this.pictureBox2.ImageHover = global::hiim.dply.Properties.Resources.form20_maximise2; - this.pictureBox2.Image = global::hiim.dply.Properties.Resources.form20_maximise; - this.pictureBox2.InitialImage = null; - this.pictureBox2.Location = new System.Drawing.Point(528, 11); - this.pictureBox2.Name = "pictureBox2"; - this.pictureBox2.NormalImage = global::hiim.dply.Properties.Resources.form20_maximise; - this.pictureBox2.Size = new System.Drawing.Size(28, 28); - this.pictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.pictureBox2.TabIndex = 147; - this.pictureBox2.TabStop = false; - // - // pictureBox1 - // - this.pictureBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.pictureBox1.BackColor = System.Drawing.Color.Transparent; - this.pictureBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.pictureBox1.ErrorImage = null; - this.pictureBox1.ImageHover = global::hiim.dply.Properties.Resources.form20_minimise2; - this.pictureBox1.Image = global::hiim.dply.Properties.Resources.form20_minimise; - this.pictureBox1.InitialImage = null; - this.pictureBox1.Location = new System.Drawing.Point(494, 11); - this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.NormalImage = global::hiim.dply.Properties.Resources.form20_minimise; - this.pictureBox1.Size = new System.Drawing.Size(28, 28); - this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.pictureBox1.TabIndex = 146; - this.pictureBox1.TabStop = false; - // - // pictureBox3 - // - this.pictureBox3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.pictureBox3.BackColor = System.Drawing.Color.Transparent; - this.pictureBox3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.pictureBox3.ErrorImage = null; - this.pictureBox3.ImageHover = global::hiim.dply.Properties.Resources.form20_close2; - this.pictureBox3.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox3.Image"))); - this.pictureBox3.InitialImage = null; - this.pictureBox3.Location = new System.Drawing.Point(562, 11); - this.pictureBox3.Name = "pictureBox3"; - this.pictureBox3.NormalImage = ((System.Drawing.Image)(resources.GetObject("pictureBox3.NormalImage"))); - this.pictureBox3.Size = new System.Drawing.Size(28, 28); - this.pictureBox3.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.pictureBox3.TabIndex = 145; - this.pictureBox3.TabStop = false; - // - // BorderlessForm - // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; - this.BackColor = System.Drawing.Color.WhiteSmoke; - this.ClientSize = new System.Drawing.Size(600, 680); - this.Controls.Add(this.area1); - this.Controls.Add(this.panel1); - this.Controls.Add(this.pictureBox4); - this.Controls.Add(this.label1); - this.Controls.Add(this.pictureBox2); - this.Controls.Add(this.pictureBox1); - this.Controls.Add(this.pictureBox3); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; - this.Name = "BorderlessForm"; - ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).EndInit(); - this.ResumeLayout(false); - - } - - #endregion - - protected internal TImageBox pictureBox2; - protected internal TImageBox pictureBox1; - protected internal TImageBox pictureBox3; - protected internal System.Windows.Forms.Label label1; - protected internal TImageBox pictureBox4; - protected internal System.Windows.Forms.Panel panel1; - protected internal System.Windows.Forms.Panel area1; - } -} \ No newline at end of file diff --git a/RyzStudio/Windows/ThemedForms/BorderlessForm.cs b/RyzStudio/Windows/ThemedForms/BorderlessForm.cs deleted file mode 100644 index 840d970..0000000 --- a/RyzStudio/Windows/ThemedForms/BorderlessForm.cs +++ /dev/null @@ -1,409 +0,0 @@ -namespace RyzStudio.Windows.ThemedForms -{ - using System; - using System.ComponentModel; - using System.Drawing; - using System.Drawing.Design; - using System.Windows.Forms; - - public partial class BorderlessForm : System.Windows.Forms.Form - { - protected bool isBusy = false; - - protected Color topFillColour = Color.FromArgb(15, 15, 15); - protected int topFillHeight = 48; - protected Color bottomFillColour = Color.FromArgb(15, 15, 15); - protected int bottomFillMargin = 19; - protected int bottomLeftMargin = 20; - protected int borderWidth = 1; - protected int menuFillWidth = 160; - protected Color menuFillColour = Color.FromArgb(179, 179, 179); - - private bool windowDragging = false; - private Point windowOffset = new Point(); - private Point windowSize = new Point(); - - public BorderlessForm() : base() - { - this.InitializeComponent(); - - this.BackColor = Color.FromArgb(247, 247, 247); - this.FormBorderStyle = FormBorderStyle.None; - this.Padding = new Padding(1); - - this.topFillColour = Color.FromArgb(51, 51, 51); - this.topFillHeight = 48; - this.bottomFillColour = Color.FromArgb(0, 152, 167); - this.bottomFillMargin = 6; - - pictureBox1.Click += pictureBox1_Click; - pictureBox2.Click += pictureBox2_Click; - pictureBox3.Click += pictureBox3_Click; - pictureBox4.Click += pictureBox4_Click; - - updatePictureBox2Image(); - } - - protected override void OnClosing(CancelEventArgs e) - { - base.OnClosing(e); - - if (this.IsBusy) - { - e.Cancel = true; - } - } - - protected override void OnPaint(PaintEventArgs e) - { - base.OnPaint(e); - - Graphics g = e.Graphics; - - Rectangle areaTop = new Rectangle(this.DisplayRectangle.Left, this.Padding.Top, this.DisplayRectangle.Width, topFillHeight); - Rectangle areaBottom = new Rectangle(this.DisplayRectangle.Left, (this.DisplayRectangle.Height - bottomFillMargin + this.Padding.Top), this.DisplayRectangle.Width, bottomFillMargin); - Rectangle areaBorder = new Rectangle(this.ClientRectangle.X, this.ClientRectangle.Y, this.ClientRectangle.Width - borderWidth, this.ClientRectangle.Height - borderWidth); - - Rectangle areaMenu = new Rectangle(this.DisplayRectangle.Left, this.DisplayRectangle.Top + topFillHeight, menuFillWidth, (this.DisplayRectangle.Height - bottomFillMargin - topFillHeight)); - - // draw header - if (topFillHeight > 0) - { - g.FillRectangle(new SolidBrush(topFillColour), areaTop); - } - - // fill menu - g.FillRectangle(new SolidBrush(menuFillColour), areaMenu); - - // draw footer - if (bottomFillMargin > 0) - { - g.FillRectangle(new SolidBrush(bottomFillColour), areaBottom); - } - - // draw logo - if (this.TitleLogo != null) - { - g.DrawImageUnscaled(this.TitleLogo, this.Padding.Left, this.Padding.Top); - } - - if (this.Banner != null) - { - g.DrawImageUnscaled(this.Banner, this.Padding.Left + bottomLeftMargin, (this.DisplayRectangle.Height - this.Banner.Height - bottomFillMargin + this.Padding.Top), (this.DisplayRectangle.Width - (this.Padding.Left + this.Padding.Right)), this.Banner.Height); - } - - g.DrawRectangle(new Pen(Color.Black, borderWidth), areaBorder); - } - - protected override void OnResize(EventArgs e) - { - base.OnResize(e); - - updatePictureBox2Image(); - - this.Invalidate(); - } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public new Color BackColor { get => base.BackColor; set => base.BackColor = value; } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public new FormBorderStyle FormBorderStyle { get => base.FormBorderStyle; set => base.FormBorderStyle = value; } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public new Padding Padding { get => base.Padding; set => base.Padding = value; } - - [Category("Appearance"), Browsable(true)] - public string Description - { - get - { - return label1.Text?.Replace("\n", "\\n"); - } - set - { - label1.Text = value?.Replace("\\n", "\n"); - } - } - - [Category("Appearance"), Browsable(true)] - public Image TitleLogo { get; set; } - - [Category("Appearance"), Browsable(true)] - public Image Banner { get; set; } - - [Category("Appearance"), Browsable(true)] - public bool ShowMenuButton { get => pictureBox4.Visible; set => pictureBox4.Visible = value; } - - protected virtual bool IsBusy { get => isBusy; set => isBusy = value; } - - private void pictureBox4_Click(object sender, System.EventArgs e) - { - //this.WindowState = FormWindowState.Minimized; - } - - private void pictureBox1_Click(object sender, System.EventArgs e) - { - MouseEventArgs mouseEvent = (MouseEventArgs)e; - if (mouseEvent != null) - { - if (mouseEvent.Button != MouseButtons.Left) - { - return; - } - } - - this.WindowState = FormWindowState.Minimized; - } - - private void pictureBox2_Click(object sender, System.EventArgs e) - { - MouseEventArgs mouseEvent = (MouseEventArgs)e; - if (mouseEvent != null) - { - if (mouseEvent.Button != MouseButtons.Left) - { - return; - } - } - - if (this.WindowState == FormWindowState.Maximized) - { - this.WindowState = FormWindowState.Normal; - pictureBox2.NormalImage = Resources.form20_maximise; - pictureBox2.HighlightImage = Resources.form20_maximise2; - } - else - { - this.WindowState = FormWindowState.Maximized; - pictureBox2.NormalImage = Resources.form20_restore; - pictureBox2.HighlightImage = Resources.form20_restore2; - } - } - - private void pictureBox3_Click(object sender, System.EventArgs e) - { - MouseEventArgs mouseEvent = (MouseEventArgs)e; - if (mouseEvent != null) - { - if (mouseEvent.Button != MouseButtons.Left) - { - return; - } - } - - this.Close(); - } - - public void SetValue(Label sender, string value) - { - if (sender.InvokeRequired) - { - sender.Invoke(new MethodInvoker(() => { sender.Text = value; })); - } - else - { - sender.Text = value; - } - } - - public void SetValue(GroupBox sender, string value) - { - if (sender.InvokeRequired) - { - sender.Invoke(new MethodInvoker(() => { sender.Text = value; })); - } - else - { - sender.Text = value; - } - } - - public void AddValue(ListBox sender, string value) - { - if (sender.InvokeRequired) - { - sender.Invoke(new MethodInvoker(() => { sender.Items.Add(value); })); - } - else - { - sender.Items.Add(value); - } - } - - public void AddControl(FlowLayoutPanel sender, Control value) - { - if (sender.InvokeRequired) - { - sender.Invoke(new MethodInvoker(() => - { - sender.Controls.Add(value); - })); - } - else - { - sender.Controls.Add(value); - } - } - - public void ClearValues(ListBox sender) - { - if (sender.InvokeRequired) - { - sender.Invoke(new MethodInvoker(() => { sender.Items.Clear(); })); - } - else - { - sender.Items.Clear(); - } - } - - public string GetValue(ListBox sender) - { - string rv = string.Empty; - - if (sender.InvokeRequired) - { - sender.Invoke(new MethodInvoker(() => { rv = (sender.SelectedItem == null) ? string.Empty : sender.SelectedItem.ToString(); })); - } - else - { - rv = (sender.SelectedItem == null) ? string.Empty : sender.SelectedItem.ToString(); - } - - return rv; - } - - public string GetValue(TextBox sender) - { - string rv = string.Empty; - - if (sender.InvokeRequired) - { - sender.Invoke(new MethodInvoker(() => { rv = sender.Text.Trim(); })); - } - else - { - rv = sender.Text.Trim(); - } - - return rv; - } - - public int GetValue(NumericUpDown sender) - { - int rv = 0; - - if (sender.InvokeRequired) - { - sender.Invoke(new MethodInvoker(() => { rv = (int)sender.Value; })); - } - else - { - rv = (int)sender.Value; - } - - return rv; - } - - protected void updatePictureBox2Image() - { - if (this.WindowState == FormWindowState.Maximized) - { - pictureBox2.NormalImage = Resources.form20_restore; - pictureBox2.HighlightImage = Resources.form20_restore2; - } - else - { - pictureBox2.NormalImage = Resources.form20_maximise; - pictureBox2.HighlightImage = Resources.form20_maximise2; - } - } - - private void label1_MouseDown(object sender, MouseEventArgs e) - { - if (e.Button != MouseButtons.Left) - { - return; - } - - windowDragging = true; - windowOffset = e.Location; - } - - private void label1_MouseUp(object sender, MouseEventArgs e) - { - windowDragging = false; - } - - private void label1_MouseMove(object sender, MouseEventArgs e) - { - if (windowDragging) - { - Point currentScreenPos = PointToScreen(e.Location); - Location = new Point(currentScreenPos.X - windowOffset.X, currentScreenPos.Y - windowOffset.Y); - } - } - - private void label1_DoubleClick(object sender, EventArgs e) => pictureBox2_Click(sender, e); - - private void label1_MouseClick(object sender, MouseEventArgs e) - { - if (e.Button == MouseButtons.Middle) - { - this.TopMost = !this.TopMost; - } - } - - private void panel1_MouseDown(object sender, MouseEventArgs e) - { - if (e.Button != MouseButtons.Left) - { - return; - } - - windowDragging = true; - windowOffset = e.Location; - windowSize = new Point(this.Width, this.Height); - } - - private void panel1_MouseUp(object sender, MouseEventArgs e) - { - windowDragging = false; - } - - private void panel1_MouseMove(object sender, MouseEventArgs e) - { - if (windowDragging) - { - this.Size = new Size(e.X - windowOffset.X + this.Width, e.Y - windowOffset.Y + this.Height); - } - } - - private void panel2_MouseDown(object sender, MouseEventArgs e) - { - if (e.Button != MouseButtons.Left) - { - return; - } - - windowDragging = true; - windowOffset = e.Location; - windowSize = new Point(this.Width, this.Height); - } - - private void panel2_MouseUp(object sender, MouseEventArgs e) - { - windowDragging = false; - } - - private void panel2_MouseMove(object sender, MouseEventArgs e) - { - if (windowDragging) - { - this.Size = new Size(windowSize.X, e.Y - windowOffset.Y + this.Height); - } - } - - } -} \ No newline at end of file diff --git a/RyzStudio/Windows/ThemedForms/BorderlessForm.resx b/RyzStudio/Windows/ThemedForms/BorderlessForm.resx deleted file mode 100644 index db173e1..0000000 --- a/RyzStudio/Windows/ThemedForms/BorderlessForm.resx +++ /dev/null @@ -1,158 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - True - - - True - - - True - - - True - - - True - - - - - iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - xAAADsQBlSsOGwAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAADnSURBVDhP1ZVB - DoIwEEW7whNo9Cri/QCv5Y4YEoTWxK71Gvqn+W2AgEkbNvxkYPgzfWkpKcpau9NaX/u+/yC+iSFjK3Ay - RdhcU0qUChc3s67rzipRGJ8T+JYHR2ctWYGzXSC8Gzbs3rbtgZaSXDyp0QoKnJBMBK8WH5vVCUhCcvbX - bAuivwxsmmaP2TxYfyE3zJ/Ij2wLYu3/OxQoah4kYedgIt8TDTTGnFgeyfcsAodLxn205Dlo4IRkInjr - bgq8dT+bWG0L6A/WnLVo4b1eyHDHV8WHNaJwvwAkJeI9KMSGjC201tkP+AimzgF8cMEAAAAASUVORK5C - YII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - xAAADsQBlSsOGwAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAADnSURBVDhP1ZVB - DoIwEEW7whNo9Cri/QCv5Y4YEoTWxK71Gvqn+W2AgEkbNvxkYPgzfWkpKcpau9NaX/u+/yC+iSFjK3Ay - RdhcU0qUChc3s67rzipRGJ8T+JYHR2ctWYGzXSC8Gzbs3rbtgZaSXDyp0QoKnJBMBK8WH5vVCUhCcvbX - bAuivwxsmmaP2TxYfyE3zJ/Ij2wLYu3/OxQoah4kYedgIt8TDTTGnFgeyfcsAodLxn205Dlo4IRkInjr - bgq8dT+bWG0L6A/WnLVo4b1eyHDHV8WHNaJwvwAkJeI9KMSGjC201tkP+AimzgF8cMEAAAAASUVORK5C - YII= - - - \ No newline at end of file diff --git a/RyzStudio/Windows/ThemedForms/BorderlessToolForm.Designer.cs b/RyzStudio/Windows/ThemedForms/BorderlessToolForm.Designer.cs deleted file mode 100644 index 75f86a0..0000000 --- a/RyzStudio/Windows/ThemedForms/BorderlessToolForm.Designer.cs +++ /dev/null @@ -1,191 +0,0 @@ -namespace RyzStudio.Windows.ThemedForms -{ - partial class BorderlessToolForm - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - this.lblDescription = new System.Windows.Forms.Label(); - this.panel1 = new System.Windows.Forms.Panel(); - this.imgbxMenu = new RyzStudio.Windows.Forms.ImageBox(); - this.imgbxMaximise = new RyzStudio.Windows.Forms.ImageBox(); - this.imgbxMinimise = new RyzStudio.Windows.Forms.ImageBox(); - this.imgbxClose = new RyzStudio.Windows.Forms.ImageBox(); - this.area1 = new System.Windows.Forms.Panel(); - ((System.ComponentModel.ISupportInitialize)(this.imgbxMenu)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.imgbxMaximise)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.imgbxMinimise)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.imgbxClose)).BeginInit(); - this.SuspendLayout(); - // - // lblDescription - // - this.lblDescription.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.lblDescription.BackColor = System.Drawing.Color.Transparent; - this.lblDescription.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblDescription.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(241)))), ((int)(((byte)(241)))), ((int)(((byte)(241))))); - this.lblDescription.Location = new System.Drawing.Point(1, 1); - this.lblDescription.Name = "lblDescription"; - this.lblDescription.Padding = new System.Windows.Forms.Padding(10, 0, 0, 0); - this.lblDescription.Size = new System.Drawing.Size(194, 30); - this.lblDescription.TabIndex = 148; - this.lblDescription.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.lblDescription.DoubleClick += new System.EventHandler(this.label1_DoubleClick); - this.lblDescription.MouseClick += new System.Windows.Forms.MouseEventHandler(this.label1_MouseClick); - this.lblDescription.MouseDown += new System.Windows.Forms.MouseEventHandler(this.label1_MouseDown); - this.lblDescription.MouseMove += new System.Windows.Forms.MouseEventHandler(this.label1_MouseMove); - this.lblDescription.MouseUp += new System.Windows.Forms.MouseEventHandler(this.label1_MouseUp); - // - // panel1 - // - this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.panel1.BackColor = System.Drawing.Color.Transparent; - this.panel1.Cursor = System.Windows.Forms.Cursors.SizeNWSE; - this.panel1.Location = new System.Drawing.Point(335, 595); - this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(5, 5); - this.panel1.TabIndex = 150; - this.panel1.MouseDown += new System.Windows.Forms.MouseEventHandler(this.panel1_MouseDown); - this.panel1.MouseMove += new System.Windows.Forms.MouseEventHandler(this.panel1_MouseMove); - this.panel1.MouseUp += new System.Windows.Forms.MouseEventHandler(this.panel1_MouseUp); - // - // imgbxMenu - // - this.imgbxMenu.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.imgbxMenu.BackColor = System.Drawing.Color.Transparent; - this.imgbxMenu.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.imgbxMenu.ErrorImage = null; - this.imgbxMenu.HighlightImage = global::AppLauncher.Properties.Resources.form16_menu2; - this.imgbxMenu.Image = global::AppLauncher.Properties.Resources.form16_menu; - this.imgbxMenu.InitialImage = null; - this.imgbxMenu.Location = new System.Drawing.Point(224, 4); - this.imgbxMenu.Name = "imgbxMenu"; - this.imgbxMenu.NormalImage = global::AppLauncher.Properties.Resources.form16_menu; - this.imgbxMenu.Size = new System.Drawing.Size(24, 24); - this.imgbxMenu.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.imgbxMenu.TabIndex = 149; - this.imgbxMenu.TabStop = false; - // - // imgbxMaximise - // - this.imgbxMaximise.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.imgbxMaximise.BackColor = System.Drawing.Color.Transparent; - this.imgbxMaximise.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.imgbxMaximise.ErrorImage = null; - this.imgbxMaximise.HighlightImage = global::AppLauncher.Properties.Resources.form16_maximise2; - this.imgbxMaximise.Image = global::AppLauncher.Properties.Resources.form16_maximise; - this.imgbxMaximise.InitialImage = null; - this.imgbxMaximise.Location = new System.Drawing.Point(280, 4); - this.imgbxMaximise.Name = "imgbxMaximise"; - this.imgbxMaximise.NormalImage = global::AppLauncher.Properties.Resources.form16_maximise; - this.imgbxMaximise.Size = new System.Drawing.Size(24, 24); - this.imgbxMaximise.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.imgbxMaximise.TabIndex = 147; - this.imgbxMaximise.TabStop = false; - // - // imgbxMinimise - // - this.imgbxMinimise.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.imgbxMinimise.BackColor = System.Drawing.Color.Transparent; - this.imgbxMinimise.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.imgbxMinimise.ErrorImage = null; - this.imgbxMinimise.HighlightImage = global::AppLauncher.Properties.Resources.form16_minimise2; - this.imgbxMinimise.Image = global::AppLauncher.Properties.Resources.form16_minimise; - this.imgbxMinimise.InitialImage = null; - this.imgbxMinimise.Location = new System.Drawing.Point(252, 4); - this.imgbxMinimise.Name = "imgbxMinimise"; - this.imgbxMinimise.NormalImage = global::AppLauncher.Properties.Resources.form16_minimise; - this.imgbxMinimise.Size = new System.Drawing.Size(24, 24); - this.imgbxMinimise.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.imgbxMinimise.TabIndex = 146; - this.imgbxMinimise.TabStop = false; - // - // imgbxClose - // - this.imgbxClose.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.imgbxClose.BackColor = System.Drawing.Color.Transparent; - this.imgbxClose.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.imgbxClose.ErrorImage = null; - this.imgbxClose.HighlightImage = global::AppLauncher.Properties.Resources.form16_close2; - this.imgbxClose.Image = global::AppLauncher.Properties.Resources.form16_close; - this.imgbxClose.InitialImage = null; - this.imgbxClose.Location = new System.Drawing.Point(308, 4); - this.imgbxClose.Name = "imgbxClose"; - this.imgbxClose.NormalImage = global::AppLauncher.Properties.Resources.form16_close; - this.imgbxClose.Size = new System.Drawing.Size(24, 24); - this.imgbxClose.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.imgbxClose.TabIndex = 145; - this.imgbxClose.TabStop = false; - // - // area1 - // - this.area1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.area1.BackColor = System.Drawing.Color.Transparent; - this.area1.Cursor = System.Windows.Forms.Cursors.SizeNS; - this.area1.Location = new System.Drawing.Point(0, 595); - this.area1.Name = "area1"; - this.area1.Size = new System.Drawing.Size(334, 5); - this.area1.TabIndex = 151; - this.area1.MouseDown += new System.Windows.Forms.MouseEventHandler(this.panel2_MouseDown); - this.area1.MouseMove += new System.Windows.Forms.MouseEventHandler(this.panel2_MouseMove); - this.area1.MouseUp += new System.Windows.Forms.MouseEventHandler(this.panel2_MouseUp); - // - // BorderlessToolForm - // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; - this.BackColor = System.Drawing.Color.WhiteSmoke; - this.ClientSize = new System.Drawing.Size(340, 600); - this.Controls.Add(this.area1); - this.Controls.Add(this.panel1); - this.Controls.Add(this.imgbxMenu); - this.Controls.Add(this.lblDescription); - this.Controls.Add(this.imgbxMaximise); - this.Controls.Add(this.imgbxMinimise); - this.Controls.Add(this.imgbxClose); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; - this.MinimumSize = new System.Drawing.Size(40, 0); - this.Name = "BorderlessToolForm"; - ((System.ComponentModel.ISupportInitialize)(this.imgbxMenu)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.imgbxMaximise)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.imgbxMinimise)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.imgbxClose)).EndInit(); - this.ResumeLayout(false); - - } - - #endregion - - protected internal Forms.ImageBox imgbxMaximise; - protected internal Forms.ImageBox imgbxMinimise; - protected internal Forms.ImageBox imgbxClose; - protected internal System.Windows.Forms.Label lblDescription; - protected internal Forms.ImageBox imgbxMenu; - protected internal System.Windows.Forms.Panel panel1; - protected internal System.Windows.Forms.Panel area1; - } -} \ No newline at end of file diff --git a/RyzStudio/Windows/ThemedForms/BorderlessToolForm.cs b/RyzStudio/Windows/ThemedForms/BorderlessToolForm.cs deleted file mode 100644 index 3c17b0b..0000000 --- a/RyzStudio/Windows/ThemedForms/BorderlessToolForm.cs +++ /dev/null @@ -1,394 +0,0 @@ -namespace RyzStudio.Windows.ThemedForms -{ - using System; - using System.ComponentModel; - using System.Drawing; - using System.Drawing.Design; - using System.Windows.Forms; - using Resources = AppLauncher.Properties.Resources; - - public partial class BorderlessToolForm : System.Windows.Forms.Form - { - protected bool isBusy = false; - - protected Color topFillColour = Color.FromArgb(15, 15, 15); - protected int topFillHeight = 32; - protected int borderWidth = 1; - - private bool windowDragging = false; - private Point windowOffset = new Point(); - private Point windowSize = new Point(); - - public BorderlessToolForm() : base() - { - this.InitializeComponent(); - - this.BackColor = Color.FromArgb(246, 246, 246); - this.Padding = new Padding(1); - - this.topFillColour = Color.FromArgb(51, 51, 51); - this.topFillHeight = 32; - - this.BackColor = Color.FromArgb(179, 179, 179); - this.FormBorderStyle = FormBorderStyle.None; - - imgbxMinimise.Click += pictureBox1_Click; - imgbxMaximise.Click += pictureBox2_Click; - imgbxClose.Click += pictureBox3_Click; - imgbxMenu.Click += pictureBox4_Click; - - updatePictureBox2Image(); - } - - protected override void OnClosing(CancelEventArgs e) - { - base.OnClosing(e); - - if (this.IsBusy) - { - e.Cancel = true; - } - } - - protected override void OnPaint(PaintEventArgs e) - { - base.OnPaint(e); - - Graphics g = e.Graphics; - - Rectangle areaTop = new Rectangle(this.DisplayRectangle.Left, this.Padding.Top, this.DisplayRectangle.Width, topFillHeight); - Rectangle areaBorder = new Rectangle(this.ClientRectangle.X, this.ClientRectangle.Y, this.ClientRectangle.Width - borderWidth, this.ClientRectangle.Height - borderWidth); - - // draw header - if (topFillHeight > 0) - { - g.FillRectangle(new SolidBrush(topFillColour), areaTop); - } - - // draw logo - //if (this.TitleLogo != null) - //{ - // g.DrawImageUnscaled(this.TitleLogo, this.Padding.Left, this.Padding.Top); - //} - - g.DrawRectangle(new Pen(Color.Black, borderWidth), areaBorder); - } - - protected override void OnResize(EventArgs e) - { - base.OnResize(e); - - updatePictureBox2Image(); - - this.Invalidate(); - } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public new Color BackColor { get => base.BackColor; set => base.BackColor = value; } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public new FormBorderStyle FormBorderStyle { get => base.FormBorderStyle; set => base.FormBorderStyle = value; } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public new Padding Padding { get => base.Padding; set => base.Padding = value; } - - [Category("Appearance"), Browsable(true)] - public string Description - { - get - { - return lblDescription.Text?.Replace("\n", "\\n"); - } - set - { - lblDescription.Text = value?.Replace("\\n", "\n"); - } - } - - //[Category("Appearance"), Browsable(true)] - //public Image TitleLogo { get; set; } - - [Category("Appearance"), Browsable(true)] - public Image Banner { get; set; } - - [Category("Appearance"), Browsable(true)] - public bool ShowMenuButton { get => imgbxMenu.Visible; set => imgbxMenu.Visible = value; } - - [Category("Appearance"), Browsable(true)] - public bool ShowMinimiseButton { get => imgbxMinimise.Visible; set => imgbxMinimise.Visible = value; } - - [Category("Appearance"), Browsable(true)] - public bool ShowMaximiseButton { get => imgbxMaximise.Visible; set => imgbxMaximise.Visible = value; } - - protected virtual bool IsBusy { get => isBusy; set => isBusy = value; } - - private void pictureBox4_Click(object sender, System.EventArgs e) - { - //this.WindowState = FormWindowState.Minimized; - } - - private void pictureBox1_Click(object sender, System.EventArgs e) - { - MouseEventArgs mouseEvent = (MouseEventArgs)e; - if (mouseEvent != null) - { - if (mouseEvent.Button != MouseButtons.Left) - { - return; - } - } - - this.WindowState = FormWindowState.Minimized; - } - - private void pictureBox2_Click(object sender, System.EventArgs e) - { - MouseEventArgs mouseEvent = (MouseEventArgs)e; - if (mouseEvent != null) - { - if (mouseEvent.Button != MouseButtons.Left) - { - return; - } - } - - if (this.WindowState == FormWindowState.Maximized) - { - this.WindowState = FormWindowState.Normal; - imgbxMaximise.NormalImage = Resources.form16_maximise; - imgbxMaximise.HighlightImage = Resources.form16_maximise2; - } - else - { - this.WindowState = FormWindowState.Maximized; - imgbxMaximise.NormalImage = Resources.form16_restore; - imgbxMaximise.HighlightImage = Resources.form16_restore2; - } - } - - private void pictureBox3_Click(object sender, System.EventArgs e) - { - MouseEventArgs mouseEvent = (MouseEventArgs)e; - if (mouseEvent != null) - { - if (mouseEvent.Button != MouseButtons.Left) - { - return; - } - } - - this.Close(); - } - - public void SetValue(Label sender, string value) - { - if (sender.InvokeRequired) - { - sender.Invoke(new MethodInvoker(() => { sender.Text = value; })); - } - else - { - sender.Text = value; - } - } - - public void SetValue(GroupBox sender, string value) - { - if (sender.InvokeRequired) - { - sender.Invoke(new MethodInvoker(() => { sender.Text = value; })); - } - else - { - sender.Text = value; - } - } - - public void AddValue(ListBox sender, string value) - { - if (sender.InvokeRequired) - { - sender.Invoke(new MethodInvoker(() => { sender.Items.Add(value); })); - } - else - { - sender.Items.Add(value); - } - } - - public void AddControl(FlowLayoutPanel sender, Control value) - { - if (sender.InvokeRequired) - { - sender.Invoke(new MethodInvoker(() => - { - sender.Controls.Add(value); - })); - } - else - { - sender.Controls.Add(value); - } - } - - public void ClearValues(ListBox sender) - { - if (sender.InvokeRequired) - { - sender.Invoke(new MethodInvoker(() => { sender.Items.Clear(); })); - } - else - { - sender.Items.Clear(); - } - } - - public string GetValue(ListBox sender) - { - string rv = string.Empty; - - if (sender.InvokeRequired) - { - sender.Invoke(new MethodInvoker(() => { rv = (sender.SelectedItem == null) ? string.Empty : sender.SelectedItem.ToString(); })); - } - else - { - rv = (sender.SelectedItem == null) ? string.Empty : sender.SelectedItem.ToString(); - } - - return rv; - } - - public string GetValue(TTextBox sender) - { - string rv = string.Empty; - - if (sender.InvokeRequired) - { - sender.Invoke(new MethodInvoker(() => { rv = sender.Text.Trim(); })); - } - else - { - rv = sender.Text.Trim(); - } - - return rv; - } - - public int GetValue(NumericUpDown sender) - { - int rv = 0; - - if (sender.InvokeRequired) - { - sender.Invoke(new MethodInvoker(() => { rv = (int)sender.Value; })); - } - else - { - rv = (int)sender.Value; - } - - return rv; - } - - protected void updatePictureBox2Image() - { - if (this.WindowState == FormWindowState.Maximized) - { - imgbxMaximise.NormalImage = Resources.form16_restore; - imgbxMaximise.HighlightImage = Resources.form16_restore2; - } - else - { - imgbxMaximise.NormalImage = Resources.form16_maximise; - imgbxMaximise.HighlightImage = Resources.form16_maximise2; - } - } - - private void label1_MouseDown(object sender, MouseEventArgs e) - { - if (e.Button != MouseButtons.Left) - { - return; - } - - windowDragging = true; - windowOffset = e.Location; - } - - private void label1_MouseUp(object sender, MouseEventArgs e) - { - windowDragging = false; - } - - private void label1_MouseMove(object sender, MouseEventArgs e) - { - if (windowDragging) - { - Point currentScreenPos = PointToScreen(e.Location); - Location = new Point(currentScreenPos.X - windowOffset.X, currentScreenPos.Y - windowOffset.Y); - } - } - - private void label1_DoubleClick(object sender, EventArgs e) => pictureBox2_Click(sender, e); - - private void label1_MouseClick(object sender, MouseEventArgs e) - { - if (e.Button == MouseButtons.Middle) - { - this.TopMost = !this.TopMost; - } - } - - private void panel1_MouseDown(object sender, MouseEventArgs e) - { - if (e.Button != MouseButtons.Left) - { - return; - } - - windowDragging = true; - windowOffset = e.Location; - windowSize = new Point(this.Width, this.Height); - } - - private void panel1_MouseUp(object sender, MouseEventArgs e) - { - windowDragging = false; - } - - private void panel1_MouseMove(object sender, MouseEventArgs e) - { - if (windowDragging) - { - this.Size = new Size(e.X - windowOffset.X + this.Width, e.Y - windowOffset.Y + this.Height); - } - } - - private void panel2_MouseDown(object sender, MouseEventArgs e) - { - if (e.Button != MouseButtons.Left) - { - return; - } - - windowDragging = true; - windowOffset = e.Location; - windowSize = new Point(this.Width, this.Height); - } - - private void panel2_MouseUp(object sender, MouseEventArgs e) - { - windowDragging = false; - - } - - private void panel2_MouseMove(object sender, MouseEventArgs e) - { - if (windowDragging) - { - this.Size = new Size(windowSize.X, e.Y - windowOffset.Y + this.Height); - } - } - } -} \ No newline at end of file diff --git a/RyzStudio/Windows/ThemedForms/BorderlessToolForm.resx b/RyzStudio/Windows/ThemedForms/BorderlessToolForm.resx deleted file mode 100644 index 8c98a25..0000000 --- a/RyzStudio/Windows/ThemedForms/BorderlessToolForm.resx +++ /dev/null @@ -1,138 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - True - - - True - - - True - - - True - - - True - - - True - - \ No newline at end of file diff --git a/RyzStudio/Windows/ThemedForms/PickerBox/TPickerBox.cs b/RyzStudio/Windows/ThemedForms/PickerBox/TPickerBox.cs deleted file mode 100644 index 255f98c..0000000 --- a/RyzStudio/Windows/ThemedForms/PickerBox/TPickerBox.cs +++ /dev/null @@ -1,98 +0,0 @@ -namespace RyzStudio.Windows.ThemedForms -{ - using RyzStudio.Drawing; - using System; - using System.ComponentModel; - using System.Drawing; - using System.Windows.Forms; - - public partial class TPickerBox : RyzStudio.Windows.ThemedForms.TUserControl - { - protected readonly Padding textboxPadding = new Padding(6, 2, 4, 2); - - public TPickerBox() : base() - { - InitializeComponent(); - - this.Font = new Font(this.Font, FontStyle.Regular); - this.Margin = new Padding(10, 4, 10, 4); - - comboBox1.Font = this.Font; - comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; - comboBox1.PreviewKeyDown += textBox_PreviewKeyDown; - } - - protected override void OnResize(EventArgs e) - { - base.OnResize(e); - - int b = (styleActive.BorderWidth + 1) + styleActive.BorderPadding; - - this.Height = comboBox1.Height + (b + textboxPadding.Top) + ((b - 1) + textboxPadding.Bottom); - } - - protected override void OnGotFocus(EventArgs e) - { - base.OnGotFocus(e); - - comboBox1.Focus(); - } - - protected void textBox_PreviewKeyDown(object sender, PreviewKeyDownEventArgs e) - { - switch (e.KeyCode) - { - case Keys.Enter: - if (this.SubmitButton != null) - { - this.SubmitButton.PerformClick(); - } - - break; - case Keys.Escape: - close(); - break; - default: break; - } - } - - [Browsable(true), EditorBrowsable(EditorBrowsableState.Advanced)] - [Category("Appearance")] - public System.Windows.Forms.ComboBox ComboBox { get => comboBox1; set => comboBox1 = value; } - - //[Browsable(true), EditorBrowsable(EditorBrowsableState.Advanced)] - //[Category("Appearance")] - //public new string Text - //{ - // get => textBox1.Text; - // set - // { - // textBox1.Text = value; - // textBox1.SelectionStart = textBox1.Text.Length; - // } - //} - - //[Browsable(true)] - //[Category("Appearance")] - //public ComboBox.ObjectCollection Items { get => comboBox1.Items; set => comboBox1.Items = value; } - - [Browsable(true), EditorBrowsable(EditorBrowsableState.Advanced)] - [Category("Appearance")] - public TButton SubmitButton { get; set; } = null; - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public new Padding Margin { get => base.Margin; set => base.Margin = value; } - - protected override void updateBackground(Graphics g, ThemeStyle style) - { - int b = (styleActive.BorderWidth + 1) + styleActive.BorderPadding; - - this.Padding = new Padding((b + textboxPadding.Left), (b + textboxPadding.Top), ((b - 1) + textboxPadding.Right), ((b - 1) + textboxPadding.Bottom)); - - Rectangoid area = new Rectangoid(this.ClientRectangle, style.BorderRadius, style.BorderWidth); - g.FillPath(new SolidBrush(style.BackColour), area.ToGraphicsPath()); - g.DrawPath(new Pen(new SolidBrush(style.BorderColour), style.BorderWidth), area.ToGraphicsPath()); - } - - } -} \ No newline at end of file diff --git a/RyzStudio/Windows/ThemedForms/PickerBox/TPickerBox.designer.cs b/RyzStudio/Windows/ThemedForms/PickerBox/TPickerBox.designer.cs deleted file mode 100644 index 760329f..0000000 --- a/RyzStudio/Windows/ThemedForms/PickerBox/TPickerBox.designer.cs +++ /dev/null @@ -1,59 +0,0 @@ -namespace RyzStudio.Windows.ThemedForms -{ - partial class TPickerBox - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Component Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - this.comboBox1 = new System.Windows.Forms.ComboBox(); - this.SuspendLayout(); - // - // comboBox1 - // - this.comboBox1.Dock = System.Windows.Forms.DockStyle.Fill; - this.comboBox1.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.comboBox1.FormattingEnabled = true; - this.comboBox1.Location = new System.Drawing.Point(4, 4); - this.comboBox1.Name = "comboBox1"; - this.comboBox1.Size = new System.Drawing.Size(121, 21); - this.comboBox1.TabIndex = 0; - // - // PickerBox - // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; - this.Controls.Add(this.comboBox1); - this.Name = "PickerBox"; - this.Padding = new System.Windows.Forms.Padding(4, 4, 3, 3); - this.Size = new System.Drawing.Size(128, 32); - this.ResumeLayout(false); - - } - - #endregion - - private System.Windows.Forms.ComboBox comboBox1; - } -} diff --git a/RyzStudio/Windows/ThemedForms/PickerBox/TPickerBox.resx b/RyzStudio/Windows/ThemedForms/PickerBox/TPickerBox.resx deleted file mode 100644 index 1af7de1..0000000 --- a/RyzStudio/Windows/ThemedForms/PickerBox/TPickerBox.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/RyzStudio/Windows/ThemedForms/PickerBox/TYesNoPickerBox.cs b/RyzStudio/Windows/ThemedForms/PickerBox/TYesNoPickerBox.cs deleted file mode 100644 index 89225ee..0000000 --- a/RyzStudio/Windows/ThemedForms/PickerBox/TYesNoPickerBox.cs +++ /dev/null @@ -1,17 +0,0 @@ -namespace RyzStudio.Windows.ThemedForms -{ - public class TYesNoPickerBox : TPickerBox - { - - public TYesNoPickerBox() : base() - { - this.ComboBox.Items.Clear(); - - this.ComboBox.Items.AddRange(new string[] { "No", "Yes" }); - if (this.ComboBox.Items.Count > 0) this.ComboBox.SelectedIndex = 0; - } - - public bool Value { get => (this.ComboBox.SelectedIndex == 1); set =>this.ComboBox.SelectedIndex = (value ? 1 : 0); } - - } -} diff --git a/RyzStudio/Windows/ThemedForms/TButton.cs b/RyzStudio/Windows/ThemedForms/TButton.cs deleted file mode 100644 index 74803bb..0000000 --- a/RyzStudio/Windows/ThemedForms/TButton.cs +++ /dev/null @@ -1,170 +0,0 @@ -namespace RyzStudio.Windows.ThemedForms -{ - using System; - using System.ComponentModel; - using System.Drawing; - using System.Windows.Forms; - - public partial class TButton : RyzStudio.Windows.ThemedForms.TUserControl - { - public class ButtonStyle - { - public Color BackColour { get; set; } = Color.Transparent; - public Color PenColour { get; set; } = Color.Transparent; - public Image ForeImage { get; set; } = null; - } - - public enum ButtonState - { - Idle = 0, - Hover, - Down - } - - protected ButtonState controlState = ButtonState.Idle; - protected bool isSelected = false; - - public TButton() : base() - { - InitializeComponent(); - - this.Margin = new Padding(10); - - this.StyleDefault = new ButtonStyle() - { - BackColour = Color.White, - PenColour = Color.Black, - ForeImage = this.DefaultImage - }; - this.StyleDown = new ButtonStyle() - { - BackColour = Color.FromArgb(60, 53, 148), - PenColour = Color.White, - ForeImage = this.DownImage - }; - this.StyleOver = new ButtonStyle() - { - BackColour = Color.FromArgb(108, 101, 196), - PenColour = Color.White, - ForeImage = this.OverImage - }; - this.StyleSelected = new ButtonStyle() - { - BackColour = Color.FromArgb(51, 51, 51), - PenColour = Color.White, - ForeImage = this.OverImage - }; - - label1.ImageAlign = ContentAlignment.MiddleCenter; - label1.Click += delegate { this.OnClick(null); }; - label1.MouseEnter += delegate { this.VisualState = ButtonState.Hover; }; - label1.MouseLeave += delegate { this.VisualState = ButtonState.Idle; }; - label1.MouseDown += delegate { this.VisualState = ButtonState.Down; }; - label1.MouseUp += delegate { this.VisualState = ButtonState.Idle; }; - } - - protected override void OnLoad(EventArgs e) - { - base.OnLoad(e); - - this.VisualState = ButtonState.Idle; - } - - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public new Padding Margin { get => base.Margin; set => base.Margin = value; } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public new Padding Padding { get => base.Padding; set => base.Padding = value; } - - - protected ButtonState VisualState - { - get { return controlState; } - set - { - switch (value) - { - case ButtonState.Idle: - if (this.VisualState == ButtonState.Down) - { - updateButton(StyleOver); - } - else - { - if (this.IsSelected) - { - updateButton(StyleSelected); - } - else - { - updateButton(StyleDefault); - } - } - - break; - case ButtonState.Hover: - updateButton(StyleOver); - break; - case ButtonState.Down: - updateButton(StyleDown); - break; - default: - if (this.IsSelected) - { - updateButton(StyleSelected); - } - else - { - updateButton(StyleDefault); - } - - break; - } - - controlState = value; - } - } - - protected void updateButton(ButtonStyle style) - { - label1.ForeColor = style.PenColour; - label1.BackColor = style.BackColour; - label1.Image = style.ForeImage; - } - - [Browsable(true)] - [Category("Appearance")] - public string LabelText { get => label1.Text; set => label1.Text = value; } - - [Browsable(true)] - [Category("Appearance")] - public Image OverImage { get; set; } = null; - - [Browsable(true)] - [Category("Appearance")] - public Image DownImage { get; set; } = null; - - [Browsable(true)] - [Category("Appearance")] - public Image DefaultImage { get; set; } = null; - - public bool IsSelected - { - get => isSelected; - set - { - isSelected = value; - - this.VisualState = this.VisualState; - } - } - - protected ButtonStyle StyleOver { get; set; } = new ButtonStyle(); - protected ButtonStyle StyleDown { get; set; } = new ButtonStyle(); - protected ButtonStyle StyleDefault { get; set; } = new ButtonStyle(); - protected ButtonStyle StyleSelected { get; set; } = new ButtonStyle(); - - public void PerformClick() => this.OnClick(null); - } -} \ No newline at end of file diff --git a/RyzStudio/Windows/ThemedForms/TButton.designer.cs b/RyzStudio/Windows/ThemedForms/TButton.designer.cs deleted file mode 100644 index 5bf79d6..0000000 --- a/RyzStudio/Windows/ThemedForms/TButton.designer.cs +++ /dev/null @@ -1,61 +0,0 @@ -namespace RyzStudio.Windows.ThemedForms -{ - partial class TButton - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Component Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - this.label1 = new System.Windows.Forms.Label(); - this.SuspendLayout(); - // - // label1 - // - this.label1.Dock = System.Windows.Forms.DockStyle.Fill; - this.label1.Location = new System.Drawing.Point(4, 4); - this.label1.Margin = new System.Windows.Forms.Padding(0); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(121, 25); - this.label1.TabIndex = 0; - this.label1.Text = "label1"; - this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // - // Button - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.Controls.Add(this.label1); - this.Name = "Button"; - this.Padding = new System.Windows.Forms.Padding(4, 4, 3, 3); - this.Size = new System.Drawing.Size(128, 32); - this.ResumeLayout(false); - - } - - #endregion - - private System.Windows.Forms.Label label1; - } -} diff --git a/RyzStudio/Windows/ThemedForms/TButton.resx b/RyzStudio/Windows/ThemedForms/TButton.resx deleted file mode 100644 index 1af7de1..0000000 --- a/RyzStudio/Windows/ThemedForms/TButton.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/RyzStudio/Windows/ThemedForms/TDialogForm.Designer.cs b/RyzStudio/Windows/ThemedForms/TDialogForm.Designer.cs deleted file mode 100644 index 0133a0e..0000000 --- a/RyzStudio/Windows/ThemedForms/TDialogForm.Designer.cs +++ /dev/null @@ -1,47 +0,0 @@ -namespace RyzStudio.Windows.ThemedForms -{ - partial class TDialogForm - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - this.SuspendLayout(); - // - // TDialogForm - // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; - this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(249)))), ((int)(((byte)(250))))); - this.ClientSize = new System.Drawing.Size(340, 600); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; - this.MinimumSize = new System.Drawing.Size(40, 0); - this.Name = "TDialogForm"; - this.ResumeLayout(false); - - } - - #endregion - } -} \ No newline at end of file diff --git a/RyzStudio/Windows/ThemedForms/TDialogForm.cs b/RyzStudio/Windows/ThemedForms/TDialogForm.cs deleted file mode 100644 index 49453dc..0000000 --- a/RyzStudio/Windows/ThemedForms/TDialogForm.cs +++ /dev/null @@ -1,117 +0,0 @@ -using System.ComponentModel; -using System.Drawing; -using System.Windows.Forms; - -namespace RyzStudio.Windows.ThemedForms -{ - public partial class TDialogForm : Form - { - public TDialogForm() - { - this.InitializeComponent(); - - this.BackColor = Color.FromArgb(254, 254, 254); - this.FormBorderStyle = FormBorderStyle.Sizable; - this.MaximizeBox = false; - this.MinimizeBox = false; - this.Padding = new Padding(5, 10, 5, 10); - this.ShowIcon = false; - this.ShowInTaskbar = false; - this.StartPosition = FormStartPosition.CenterParent; - this.TopMost = true; - this.SizeGripStyle = SizeGripStyle.Hide; - this.AutoScaleMode = AutoScaleMode.None; - } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public override Color BackColor { get => base.BackColor; set => base.BackColor = value; } - - [Browsable(false)] - public override Image BackgroundImage { get => base.BackgroundImage; set => base.BackgroundImage = value; } - - [Browsable(false)] - public override ImageLayout BackgroundImageLayout { get => base.BackgroundImageLayout; set => base.BackgroundImageLayout = value; } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public new FormBorderStyle FormBorderStyle { get => base.FormBorderStyle; set => base.FormBorderStyle = value; } - - //[Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - //public override Size MaximumSize { get => base.MaximumSize; set => base.MaximumSize = value; } - - //[Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - //public override Size MinimumSize { get => base.MinimumSize; set => base.MinimumSize = value; } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public new Padding Padding { get => base.Padding; set => base.Padding = value; } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public new bool ShowIcon { get => base.ShowIcon; set => base.ShowIcon = value; } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public new bool ShowInTaskbar { get => base.ShowInTaskbar; set => base.ShowInTaskbar = value; } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public new FormStartPosition StartPosition { get => base.StartPosition; set => base.StartPosition = value; } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public new bool TopMost { get => base.TopMost; set => base.TopMost = value; } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public override Cursor Cursor { get => base.Cursor; set => base.Cursor = value; } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public override RightToLeft RightToLeft { get => base.RightToLeft; set => base.RightToLeft = value; } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public override bool RightToLeftLayout { get => base.RightToLeftLayout; set => base.RightToLeftLayout = value; } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public new bool UseWaitCursor { get => base.UseWaitCursor; set => base.UseWaitCursor = value; } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public new ImeMode ImeMode { get => base.ImeMode; set => base.ImeMode = value; } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public override bool AutoSize { get => base.AutoSize; set => base.AutoSize = value; } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public new AutoSizeMode AutoSizeMode { get => base.AutoSizeMode; set => base.AutoSizeMode = value; } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public new bool MinimizeBox { get => base.MinimizeBox; set => base.MinimizeBox = value; } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public new bool MaximizeBox { get => base.MaximizeBox; set => base.MaximizeBox = value; } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public new bool ControlBox { get => base.ControlBox; set => base.ControlBox = value; } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public new bool HelpButton { get => base.HelpButton; set => base.HelpButton = value; } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public new MenuStrip MainMenuStrip { get => base.MainMenuStrip; set => base.MainMenuStrip = value; } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public new SizeGripStyle SizeGripStyle { get => base.SizeGripStyle; set => base.SizeGripStyle = value; } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public new AutoScaleMode AutoScaleMode { get => base.AutoScaleMode; set => base.AutoScaleMode = value; } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public new bool AutoScroll { get => base.AutoScroll; set => base.AutoScroll = value; } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public new Size AutoScrollMargin { get => base.AutoScrollMargin; set => base.AutoScrollMargin = value; } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public new Size AutoScrollMinSize { get => base.AutoScrollMinSize; set => base.AutoScrollMinSize = value; } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public new Point AutoScrollOffset { get => base.AutoScrollOffset; set => base.AutoScrollOffset = value; } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public new FormWindowState WindowState { get => base.WindowState; set => base.WindowState = value; } - - } -} \ No newline at end of file diff --git a/RyzStudio/Windows/ThemedForms/TDialogForm.resx b/RyzStudio/Windows/ThemedForms/TDialogForm.resx deleted file mode 100644 index f298a7b..0000000 --- a/RyzStudio/Windows/ThemedForms/TDialogForm.resx +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/RyzStudio/Windows/ThemedForms/TListBox.cs b/RyzStudio/Windows/ThemedForms/TListBox.cs deleted file mode 100644 index ab3fa86..0000000 --- a/RyzStudio/Windows/ThemedForms/TListBox.cs +++ /dev/null @@ -1,385 +0,0 @@ -using RyzStudio.Drawing; -using System; -using System.ComponentModel; -using System.Drawing; -using System.Windows.Forms; -using UIResource = FizzyLauncher.UIResource; - -namespace RyzStudio.Windows.ThemedForms -{ - public partial class TListBox : RyzStudio.Windows.ThemedForms.TUserControl - { - protected readonly Padding textboxPadding = new Padding(6, 2, 4, 2); - - public TListBox() : base() - { - InitializeComponent(); - - this.Font = new Font(this.Font, FontStyle.Regular); - this.Margin = new Padding(10, 4, 10, 4); - - listBox1.Font = this.Font; - listBox1.BorderStyle = BorderStyle.None; - } - - //protected override void OnResize(EventArgs e) - //{ - // base.OnResize(e); - - // //int b = (styleActive.BorderWidth + 1) + styleActive.BorderPadding; - - // //this.Height = comboBox1.Height + (b + textboxPadding.Top) + ((b - 1) + textboxPadding.Bottom); - //} - - protected override void OnGotFocus(EventArgs e) - { - base.OnGotFocus(e); - - listBox1.Focus(); - } - - [Browsable(true), EditorBrowsable(EditorBrowsableState.Advanced)] - [Category("Appearance")] - public System.Windows.Forms.ListBox ListBox { get => listBox1; set => listBox1 = value; } - - [Browsable(true), EditorBrowsable(EditorBrowsableState.Advanced)] - [Category("Appearance")] - public TButton SubmitButton { get; set; } = null; - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public new Padding Margin { get => base.Margin; set => base.Margin = value; } - - [Browsable(false)] - public event EventHandler OnAdd; - - [Browsable(false)] - public event EventHandler OnEdit; - - protected override void updateBackground(Graphics g, ThemeStyle style) - { - int b = (styleActive.BorderWidth + 1) + styleActive.BorderPadding; - - this.Padding = new Padding((b + textboxPadding.Left), (b + textboxPadding.Top), ((b - 1) + textboxPadding.Right), ((b - 1) + textboxPadding.Bottom)); - - Rectangoid area = new Rectangoid(this.ClientRectangle, style.BorderRadius, style.BorderWidth); - g.FillPath(new SolidBrush(style.BackColour), area.ToGraphicsPath()); - g.DrawPath(new Pen(new SolidBrush(style.BorderColour), style.BorderWidth), area.ToGraphicsPath()); - } - - /// - /// Add - /// - /// - /// - private void imageBox1_MouseClick(object sender, MouseEventArgs e) - { - if (e.Button != MouseButtons.Left) - { - return; - } - - this.OnAdd?.Invoke(sender, e); - } - - /// - /// Edit - /// - /// - /// - private void tImageBox1_MouseClick(object sender, MouseEventArgs e) - { - if (e.Button != MouseButtons.Left) - { - return; - } - - editToolStripMenuItem_Click(sender, e); - } - - /// - /// Menu - /// - /// - /// - private void imageBox5_MouseClick(object sender, MouseEventArgs e) - { - if (e.Button != MouseButtons.Left) - { - return; - } - - contextMenuStrip1.Show(Cursor.Position); - } - - /// - /// Move up - /// - /// - /// - private void imageBox3_MouseClick(object sender, MouseEventArgs e) - { - if (e != null) - { - if (e.Button != MouseButtons.Left) - { - return; - } - } - - moveUpToolStripMenuItem_Click(sender, e); - } - - /// - /// Move down - /// - /// - /// - private void imageBox4_MouseClick(object sender, MouseEventArgs e) - { - if (e != null) - { - if (e.Button != MouseButtons.Left) - { - return; - } - } - - moveDownToolStripMenuItem_Click(sender, e); - } - - private void listBox1_MouseDoubleClick(object sender, MouseEventArgs e) - { - editToolStripMenuItem_Click(sender, e); - } - - private void listBox1_PreviewKeyDown(object sender, PreviewKeyDownEventArgs e) - { - switch (e.KeyCode) - { - case Keys.Enter: - if (this.SubmitButton != null) - { - this.SubmitButton.PerformClick(); - } - - break; - case Keys.Escape: - close(); - break; - case Keys.Up: - if (e.Alt) - { - imageBox3_MouseClick(sender, null); - } - - break; - case Keys.Down: - if (e.Alt) - { - imageBox4_MouseClick(sender, null); - } - - break; - default: break; - } - } - - #region context menu - - /// - /// Add - /// - /// - /// - private void addItemToolStripMenuItem_Click(object sender, EventArgs e) - { - this.OnAdd?.Invoke(sender, e); - } - - /// - /// Copy - /// - /// - /// - private void toolStripMenuItem2_Click(object sender, EventArgs e) - { - if (listBox1.SelectedIndex <= 0) - { - return; - } - - if (listBox1.SelectedItem == null) - { - return; - } - - object item = listBox1.SelectedItem; - - listBox1.Items.Add(item); - listBox1.SelectedIndex = (listBox1.Items.Count- 1); - } - - /// - /// Edit - /// - /// - /// - private void editToolStripMenuItem_Click(object sender, EventArgs e) - { - if (listBox1.SelectedIndex < 0) - { - return; - } - - if (listBox1.SelectedItem == null) - { - return; - } - - this.OnEdit?.Invoke(sender, e); - } - - /// - /// Remove - /// - /// - /// - private void removeToolStripMenuItem_Click(object sender, EventArgs e) - { - if (listBox1.SelectedIndex < 0) - { - return; - } - - int pos = listBox1.SelectedIndex; - - listBox1.Items.RemoveAt(pos); - - if (pos > (listBox1.Items.Count - 1)) - { - pos = (listBox1.Items.Count - 1); - } - - listBox1.SelectedIndex = pos; - } - - /// - /// Remove all - /// - /// - /// - private void toolStripMenuItem1_Click(object sender, EventArgs e) - { - listBox1.Items.Clear(); - } - - /// - /// Move to top - /// - /// - /// - private void moveToTopToolStripMenuItem_Click(object sender, EventArgs e) - { - if (listBox1.SelectedIndex <= 0) - { - return; - } - - if (listBox1.SelectedItem == null) - { - return; - } - - object item = listBox1.SelectedItem; - int pos = listBox1.SelectedIndex; - - listBox1.Items.RemoveAt(pos); - listBox1.Items.Insert(0, item); - - listBox1.SelectedIndex = 0; - } - - /// - /// Move up - /// - /// - /// - private void moveUpToolStripMenuItem_Click(object sender, EventArgs e) - { - if (listBox1.SelectedIndex <= 0) - { - return; - } - - if (listBox1.SelectedItem == null) - { - return; - } - - object item = listBox1.SelectedItem; - int pos = listBox1.SelectedIndex; - - listBox1.Items.RemoveAt(pos); - listBox1.Items.Insert((pos - 1), item); - - listBox1.SelectedIndex = (pos - 1); - } - - /// - /// Move down - /// - /// - /// - private void moveDownToolStripMenuItem_Click(object sender, EventArgs e) - { - if (listBox1.SelectedIndex >= (listBox1.Items.Count - 1)) - { - return; - } - - if (listBox1.SelectedItem == null) - { - return; - } - - object item = listBox1.SelectedItem; - int pos = listBox1.SelectedIndex; - - listBox1.Items.RemoveAt(pos); - listBox1.Items.Insert((pos + 1), item); - - listBox1.SelectedIndex = (pos + 1); - } - - /// - /// Move to bottom - /// - /// - /// - private void moveToBottomToolStripMenuItem_Click(object sender, EventArgs e) - { - int n = (listBox1.Items.Count - 1); - - if (listBox1.SelectedIndex >= (listBox1.Items.Count - 1)) - { - return; - } - - if (listBox1.SelectedItem == null) - { - return; - } - - object item = listBox1.SelectedItem; - int pos = listBox1.SelectedIndex; - - listBox1.Items.RemoveAt(pos); - listBox1.Items.Insert(n, item); - - listBox1.SelectedIndex = n; - } - - #endregion - - } -} \ No newline at end of file diff --git a/RyzStudio/Windows/ThemedForms/TListBox.designer.cs b/RyzStudio/Windows/ThemedForms/TListBox.designer.cs deleted file mode 100644 index e45fa50..0000000 --- a/RyzStudio/Windows/ThemedForms/TListBox.designer.cs +++ /dev/null @@ -1,358 +0,0 @@ -using System.Drawing; - -namespace RyzStudio.Windows.ThemedForms -{ - partial class TListBox - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Component Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - this.components = new System.ComponentModel.Container(); - this.listBox1 = new System.Windows.Forms.ListBox(); - this.imageBox5 = new RyzStudio.Windows.Forms.TImageBox(); - this.imageBox4 = new RyzStudio.Windows.Forms.TImageBox(); - this.imageBox3 = new RyzStudio.Windows.Forms.TImageBox(); - this.imageBox1 = new RyzStudio.Windows.Forms.TImageBox(); - this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); - this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); - this.addItemToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); - this.editToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); - this.removeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); - this.moveToTopToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.moveUpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.moveDownToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.moveToBottomToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.tImageBox1 = new RyzStudio.Windows.Forms.TImageBox(); - ((System.ComponentModel.ISupportInitialize)(this.imageBox5)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.imageBox4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.imageBox3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.imageBox1)).BeginInit(); - this.contextMenuStrip1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.tImageBox1)).BeginInit(); - this.SuspendLayout(); - // - // listBox1 - // - this.listBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.listBox1.BackColor = System.Drawing.SystemColors.Window; - this.listBox1.FormattingEnabled = true; - this.listBox1.ItemHeight = 15; - this.listBox1.Location = new System.Drawing.Point(4, 4); - this.listBox1.Name = "listBox1"; - this.listBox1.Size = new System.Drawing.Size(98, 214); - this.listBox1.TabIndex = 0; - this.listBox1.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.listBox1_MouseDoubleClick); - this.listBox1.PreviewKeyDown += new System.Windows.Forms.PreviewKeyDownEventHandler(this.listBox1_PreviewKeyDown); - // - // imageBox5 - // - this.imageBox5.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.imageBox5.BackColor = System.Drawing.Color.Transparent; - this.imageBox5.BackColorHover = System.Drawing.Color.Transparent; - this.imageBox5.BackColorNormal = System.Drawing.Color.Transparent; - this.imageBox5.BackColorSelected = System.Drawing.Color.Transparent; - this.imageBox5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.imageBox5.ErrorImage = null; - this.imageBox5.HoverImage = global::FizzyLauncher.UIResource.circle_menu2; - this.imageBox5.Image = global::FizzyLauncher.UIResource.circle_menu; - this.imageBox5.ImageHover = global::FizzyLauncher.UIResource.circle_menu2; - this.imageBox5.ImageNormal = global::FizzyLauncher.UIResource.circle_menu; - this.imageBox5.ImageSelected = null; - this.imageBox5.InitialImage = null; - this.imageBox5.IsSelected = false; - this.imageBox5.Location = new System.Drawing.Point(106, 48); - this.imageBox5.Name = "imageBox5"; - this.imageBox5.NormalImage = global::FizzyLauncher.UIResource.circle_menu; - this.imageBox5.SelectedImage = null; - this.imageBox5.Size = new System.Drawing.Size(18, 18); - this.imageBox5.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.imageBox5.TabIndex = 6; - this.imageBox5.TabStop = false; - this.toolTip1.SetToolTip(this.imageBox5, "Menu"); - this.imageBox5.MouseClick += new System.Windows.Forms.MouseEventHandler(this.imageBox5_MouseClick); - this.imageBox5.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.imageBox5_MouseClick); - // - // imageBox4 - // - this.imageBox4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.imageBox4.BackColor = System.Drawing.Color.Transparent; - this.imageBox4.BackColorHover = System.Drawing.Color.Transparent; - this.imageBox4.BackColorNormal = System.Drawing.Color.Transparent; - this.imageBox4.BackColorSelected = System.Drawing.Color.Transparent; - this.imageBox4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.imageBox4.ErrorImage = null; - this.imageBox4.HoverImage = global::FizzyLauncher.UIResource.arrow_down2; - this.imageBox4.Image = global::FizzyLauncher.UIResource.arrow_down; - this.imageBox4.ImageHover = global::FizzyLauncher.UIResource.arrow_down2; - this.imageBox4.ImageNormal = global::FizzyLauncher.UIResource.arrow_down; - this.imageBox4.ImageSelected = null; - this.imageBox4.InitialImage = null; - this.imageBox4.IsSelected = false; - this.imageBox4.Location = new System.Drawing.Point(106, 92); - this.imageBox4.Name = "imageBox4"; - this.imageBox4.NormalImage = global::FizzyLauncher.UIResource.arrow_down; - this.imageBox4.SelectedImage = null; - this.imageBox4.Size = new System.Drawing.Size(18, 18); - this.imageBox4.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.imageBox4.TabIndex = 5; - this.imageBox4.TabStop = false; - this.toolTip1.SetToolTip(this.imageBox4, "Move Down"); - this.imageBox4.MouseClick += new System.Windows.Forms.MouseEventHandler(this.imageBox4_MouseClick); - this.imageBox4.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.imageBox4_MouseClick); - // - // imageBox3 - // - this.imageBox3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.imageBox3.BackColor = System.Drawing.Color.Transparent; - this.imageBox3.BackColorHover = System.Drawing.Color.Transparent; - this.imageBox3.BackColorNormal = System.Drawing.Color.Transparent; - this.imageBox3.BackColorSelected = System.Drawing.Color.Transparent; - this.imageBox3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.imageBox3.ErrorImage = null; - this.imageBox3.HoverImage = global::FizzyLauncher.UIResource.arrow_up2; - this.imageBox3.Image = global::FizzyLauncher.UIResource.arrow_up; - this.imageBox3.ImageHover = global::FizzyLauncher.UIResource.arrow_up2; - this.imageBox3.ImageNormal = global::FizzyLauncher.UIResource.arrow_up; - this.imageBox3.ImageSelected = null; - this.imageBox3.InitialImage = null; - this.imageBox3.IsSelected = false; - this.imageBox3.Location = new System.Drawing.Point(106, 72); - this.imageBox3.Name = "imageBox3"; - this.imageBox3.NormalImage = global::FizzyLauncher.UIResource.arrow_up; - this.imageBox3.SelectedImage = null; - this.imageBox3.Size = new System.Drawing.Size(18, 18); - this.imageBox3.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.imageBox3.TabIndex = 4; - this.imageBox3.TabStop = false; - this.toolTip1.SetToolTip(this.imageBox3, "Move Up"); - this.imageBox3.MouseClick += new System.Windows.Forms.MouseEventHandler(this.imageBox3_MouseClick); - this.imageBox3.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.imageBox3_MouseClick); - // - // imageBox1 - // - this.imageBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.imageBox1.BackColor = System.Drawing.Color.Transparent; - this.imageBox1.BackColorHover = System.Drawing.Color.Transparent; - this.imageBox1.BackColorNormal = System.Drawing.Color.Transparent; - this.imageBox1.BackColorSelected = System.Drawing.Color.Transparent; - this.imageBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.imageBox1.ErrorImage = null; - this.imageBox1.HoverImage = global::FizzyLauncher.UIResource.plus2; - this.imageBox1.Image = global::FizzyLauncher.UIResource.plus; - this.imageBox1.ImageHover = global::FizzyLauncher.UIResource.plus2; - this.imageBox1.ImageNormal = global::FizzyLauncher.UIResource.plus; - this.imageBox1.ImageSelected = null; - this.imageBox1.InitialImage = null; - this.imageBox1.IsSelected = false; - this.imageBox1.Location = new System.Drawing.Point(106, 4); - this.imageBox1.Name = "imageBox1"; - this.imageBox1.NormalImage = global::FizzyLauncher.UIResource.plus; - this.imageBox1.SelectedImage = null; - this.imageBox1.Size = new System.Drawing.Size(18, 18); - this.imageBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.imageBox1.TabIndex = 2; - this.imageBox1.TabStop = false; - this.toolTip1.SetToolTip(this.imageBox1, "Add"); - this.imageBox1.MouseClick += new System.Windows.Forms.MouseEventHandler(this.imageBox1_MouseClick); - this.imageBox1.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.imageBox1_MouseClick); - // - // contextMenuStrip1 - // - this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.addItemToolStripMenuItem, - this.toolStripMenuItem2, - this.toolStripSeparator3, - this.editToolStripMenuItem, - this.toolStripSeparator2, - this.removeToolStripMenuItem, - this.toolStripMenuItem1, - this.toolStripSeparator1, - this.moveToTopToolStripMenuItem, - this.moveUpToolStripMenuItem, - this.moveDownToolStripMenuItem, - this.moveToBottomToolStripMenuItem}); - this.contextMenuStrip1.Name = "contextMenuStrip1"; - this.contextMenuStrip1.Size = new System.Drawing.Size(163, 220); - // - // addItemToolStripMenuItem - // - this.addItemToolStripMenuItem.Name = "addItemToolStripMenuItem"; - this.addItemToolStripMenuItem.Size = new System.Drawing.Size(162, 22); - this.addItemToolStripMenuItem.Text = "&Add"; - this.addItemToolStripMenuItem.Click += new System.EventHandler(this.addItemToolStripMenuItem_Click); - // - // toolStripMenuItem2 - // - this.toolStripMenuItem2.Name = "toolStripMenuItem2"; - this.toolStripMenuItem2.Size = new System.Drawing.Size(162, 22); - this.toolStripMenuItem2.Text = "&Copy"; - this.toolStripMenuItem2.Click += new System.EventHandler(this.toolStripMenuItem2_Click); - // - // toolStripSeparator3 - // - this.toolStripSeparator3.Name = "toolStripSeparator3"; - this.toolStripSeparator3.Size = new System.Drawing.Size(159, 6); - // - // editToolStripMenuItem - // - this.editToolStripMenuItem.Name = "editToolStripMenuItem"; - this.editToolStripMenuItem.Size = new System.Drawing.Size(162, 22); - this.editToolStripMenuItem.Text = "&Edit"; - this.editToolStripMenuItem.Click += new System.EventHandler(this.editToolStripMenuItem_Click); - // - // toolStripSeparator2 - // - this.toolStripSeparator2.Name = "toolStripSeparator2"; - this.toolStripSeparator2.Size = new System.Drawing.Size(159, 6); - // - // removeToolStripMenuItem - // - this.removeToolStripMenuItem.Name = "removeToolStripMenuItem"; - this.removeToolStripMenuItem.Size = new System.Drawing.Size(162, 22); - this.removeToolStripMenuItem.Text = "&Remove"; - this.removeToolStripMenuItem.Click += new System.EventHandler(this.removeToolStripMenuItem_Click); - // - // toolStripMenuItem1 - // - this.toolStripMenuItem1.Name = "toolStripMenuItem1"; - this.toolStripMenuItem1.Size = new System.Drawing.Size(162, 22); - this.toolStripMenuItem1.Text = "Remove A&ll"; - this.toolStripMenuItem1.Click += new System.EventHandler(this.toolStripMenuItem1_Click); - // - // toolStripSeparator1 - // - this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(159, 6); - // - // moveToTopToolStripMenuItem - // - this.moveToTopToolStripMenuItem.Name = "moveToTopToolStripMenuItem"; - this.moveToTopToolStripMenuItem.Size = new System.Drawing.Size(162, 22); - this.moveToTopToolStripMenuItem.Text = "Move To &Top"; - this.moveToTopToolStripMenuItem.Click += new System.EventHandler(this.moveToTopToolStripMenuItem_Click); - // - // moveUpToolStripMenuItem - // - this.moveUpToolStripMenuItem.Name = "moveUpToolStripMenuItem"; - this.moveUpToolStripMenuItem.Size = new System.Drawing.Size(162, 22); - this.moveUpToolStripMenuItem.Text = "Move &Up"; - this.moveUpToolStripMenuItem.Click += new System.EventHandler(this.moveUpToolStripMenuItem_Click); - // - // moveDownToolStripMenuItem - // - this.moveDownToolStripMenuItem.Name = "moveDownToolStripMenuItem"; - this.moveDownToolStripMenuItem.Size = new System.Drawing.Size(162, 22); - this.moveDownToolStripMenuItem.Text = "Move &Down"; - this.moveDownToolStripMenuItem.Click += new System.EventHandler(this.moveDownToolStripMenuItem_Click); - // - // moveToBottomToolStripMenuItem - // - this.moveToBottomToolStripMenuItem.Name = "moveToBottomToolStripMenuItem"; - this.moveToBottomToolStripMenuItem.Size = new System.Drawing.Size(162, 22); - this.moveToBottomToolStripMenuItem.Text = "Move To &Bottom"; - this.moveToBottomToolStripMenuItem.Click += new System.EventHandler(this.moveToBottomToolStripMenuItem_Click); - // - // tImageBox1 - // - this.tImageBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.tImageBox1.BackColor = System.Drawing.Color.Transparent; - this.tImageBox1.BackColorHover = System.Drawing.Color.Transparent; - this.tImageBox1.BackColorNormal = System.Drawing.Color.Transparent; - this.tImageBox1.BackColorSelected = System.Drawing.Color.Transparent; - this.tImageBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.tImageBox1.ErrorImage = null; - this.tImageBox1.HoverImage = global::FizzyLauncher.UIResource.edit2; - this.tImageBox1.Image = global::FizzyLauncher.UIResource.edit; - this.tImageBox1.ImageHover = global::FizzyLauncher.UIResource.edit2; - this.tImageBox1.ImageNormal = global::FizzyLauncher.UIResource.edit; - this.tImageBox1.ImageSelected = null; - this.tImageBox1.InitialImage = null; - this.tImageBox1.IsSelected = false; - this.tImageBox1.Location = new System.Drawing.Point(106, 24); - this.tImageBox1.Name = "tImageBox1"; - this.tImageBox1.NormalImage = global::FizzyLauncher.UIResource.edit; - this.tImageBox1.SelectedImage = null; - this.tImageBox1.Size = new System.Drawing.Size(18, 18); - this.tImageBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.tImageBox1.TabIndex = 7; - this.tImageBox1.TabStop = false; - this.toolTip1.SetToolTip(this.tImageBox1, "Edit"); - this.tImageBox1.MouseClick += new System.Windows.Forms.MouseEventHandler(this.tImageBox1_MouseClick); - this.tImageBox1.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.tImageBox1_MouseClick); - // - // TListBox - // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; - this.Controls.Add(this.tImageBox1); - this.Controls.Add(this.imageBox5); - this.Controls.Add(this.imageBox4); - this.Controls.Add(this.imageBox3); - this.Controls.Add(this.imageBox1); - this.Controls.Add(this.listBox1); - this.Name = "TListBox"; - this.Padding = new System.Windows.Forms.Padding(4, 4, 3, 3); - this.Size = new System.Drawing.Size(128, 225); - ((System.ComponentModel.ISupportInitialize)(this.imageBox5)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.imageBox4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.imageBox3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.imageBox1)).EndInit(); - this.contextMenuStrip1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.tImageBox1)).EndInit(); - this.ResumeLayout(false); - - } - - #endregion - - private System.Windows.Forms.ListBox listBox1; - private Forms.TImageBox imageBox1; - private Forms.TImageBox imageBox3; - private Forms.TImageBox imageBox4; - private Forms.TImageBox imageBox5; - private System.Windows.Forms.ToolTip toolTip1; - private System.Windows.Forms.ContextMenuStrip contextMenuStrip1; - private System.Windows.Forms.ToolStripMenuItem addItemToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem editToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem removeToolStripMenuItem; - private System.Windows.Forms.ToolStripSeparator toolStripSeparator1; - private System.Windows.Forms.ToolStripMenuItem moveToTopToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem moveUpToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem moveDownToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem moveToBottomToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem2; - private System.Windows.Forms.ToolStripSeparator toolStripSeparator3; - private System.Windows.Forms.ToolStripSeparator toolStripSeparator2; - private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem1; - private Forms.TImageBox tImageBox1; - } -} diff --git a/RyzStudio/Windows/ThemedForms/TListBox.resx b/RyzStudio/Windows/ThemedForms/TListBox.resx deleted file mode 100644 index 34628c2..0000000 --- a/RyzStudio/Windows/ThemedForms/TListBox.resx +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 17, 17 - - - 17, 17 - - - 114, 17 - - \ No newline at end of file diff --git a/RyzStudio/Windows/ThemedForms/TNumericBox.cs b/RyzStudio/Windows/ThemedForms/TNumericBox.cs deleted file mode 100644 index 76a1f7e..0000000 --- a/RyzStudio/Windows/ThemedForms/TNumericBox.cs +++ /dev/null @@ -1,99 +0,0 @@ -using RyzStudio.Drawing; -using System; -using System.ComponentModel; -using System.Drawing; -using System.Windows.Forms; - -namespace RyzStudio.Windows.ThemedForms -{ - public partial class TNumericBox : RyzStudio.Windows.ThemedForms.TUserControl - { - protected readonly Padding textboxPadding = new Padding(4, 4, 4, 4); - - - public TNumericBox() : base() - { - InitializeComponent(); - - this.Margin = new Padding(10, 6, 10, 6); - this.Font = new Font(this.Font, FontStyle.Regular); - - numericUpDown1.Font = this.Font; - numericUpDown1.PreviewKeyDown += textBox_PreviewKeyDown; - } - - protected override void OnResize(EventArgs e) - { - base.OnResize(e); - - int b = (styleActive.BorderWidth + 1) + styleActive.BorderPadding; - - this.Height = numericUpDown1.Height + (b + textboxPadding.Top) + ((b - 1) + textboxPadding.Bottom); - - this.Invalidate(); - } - - protected override void OnGotFocus(EventArgs e) - { - base.OnGotFocus(e); - - numericUpDown1.Focus(); - } - - protected void textBox_PreviewKeyDown(object sender, PreviewKeyDownEventArgs e) - { - switch (e.KeyCode) - { - case Keys.Enter: - if (this.SubmitButton != null) - { - this.SubmitButton.PerformClick(); - } - - break; - case Keys.Escape: - close(); - break; - default: break; - } - } - - [Browsable(true), EditorBrowsable(EditorBrowsableState.Advanced)] - [Category("Appearance")] - public System.Windows.Forms.NumericUpDown InnerControl { get => numericUpDown1; set => numericUpDown1 = value; } - - [Browsable(true), EditorBrowsable(EditorBrowsableState.Advanced)] - [Category("Appearance")] - public int Value - { - get => (int)numericUpDown1.Value; - set - { - numericUpDown1.Value = value; - } - } - - //[Browsable(true), EditorBrowsable(EditorBrowsableState.Advanced)] - //[Category("Appearance")] - //public bool UseSystemPasswordChar { get => textBox1.UseSystemPasswordChar; set => textBox1.UseSystemPasswordChar = value; } - - [Browsable(true), EditorBrowsable(EditorBrowsableState.Advanced)] - [Category("Appearance")] - public TButton SubmitButton { get; set; } = null; - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public new Padding Margin { get { return base.Margin; } set { base.Margin = value; } } - - protected override void updateBackground(Graphics g, ThemeStyle style) - { - int b = (styleActive.BorderWidth + 1) + styleActive.BorderPadding; - - this.Padding = new Padding((b + textboxPadding.Left), (b + textboxPadding.Top), ((b - 1) + textboxPadding.Right), ((b - 1) + textboxPadding.Bottom)); - - Rectangoid area = new Rectangoid(this.ClientRectangle, style.BorderRadius, style.BorderWidth); - g.FillPath(new SolidBrush(style.BackColour), area.ToGraphicsPath()); - g.DrawPath(new Pen(new SolidBrush(style.BorderColour), style.BorderWidth), area.ToGraphicsPath()); - } - - } -} \ No newline at end of file diff --git a/RyzStudio/Windows/ThemedForms/TNumericBox.designer.cs b/RyzStudio/Windows/ThemedForms/TNumericBox.designer.cs deleted file mode 100644 index 799db24..0000000 --- a/RyzStudio/Windows/ThemedForms/TNumericBox.designer.cs +++ /dev/null @@ -1,60 +0,0 @@ -namespace RyzStudio.Windows.ThemedForms -{ - partial class TNumericBox - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Component Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - this.numericUpDown1 = new System.Windows.Forms.NumericUpDown(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).BeginInit(); - this.SuspendLayout(); - // - // numericUpDown1 - // - this.numericUpDown1.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.numericUpDown1.Dock = System.Windows.Forms.DockStyle.Fill; - this.numericUpDown1.Location = new System.Drawing.Point(4, 4); - this.numericUpDown1.Name = "numericUpDown1"; - this.numericUpDown1.Size = new System.Drawing.Size(121, 19); - this.numericUpDown1.TabIndex = 0; - // - // TNumericBox - // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; - this.Controls.Add(this.numericUpDown1); - this.Name = "TNumericBox"; - this.Padding = new System.Windows.Forms.Padding(4, 4, 3, 3); - this.Size = new System.Drawing.Size(128, 32); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).EndInit(); - this.ResumeLayout(false); - - } - - #endregion - - private System.Windows.Forms.NumericUpDown numericUpDown1; - } -} diff --git a/RyzStudio/Windows/ThemedForms/TNumericBox.resx b/RyzStudio/Windows/ThemedForms/TNumericBox.resx deleted file mode 100644 index f298a7b..0000000 --- a/RyzStudio/Windows/ThemedForms/TNumericBox.resx +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/RyzStudio/Windows/ThemedForms/TUserControl.cs b/RyzStudio/Windows/ThemedForms/TUserControl.cs deleted file mode 100644 index 56bea24..0000000 --- a/RyzStudio/Windows/ThemedForms/TUserControl.cs +++ /dev/null @@ -1,106 +0,0 @@ -using System; -using System.Drawing; -using System.Windows.Forms; -using RyzStudio.Drawing; -using System.ComponentModel; - -namespace RyzStudio.Windows.ThemedForms -{ - public partial class TUserControl : System.Windows.Forms.UserControl - { - public class ThemeStyle - { - public int BorderWidth; - public int BorderRadius; - public int BorderPadding; - public Color BorderColour; - public Color BackColour; - public Color ForeColour; - - public ThemeStyle(int borderWidth, int borderRadius, int borderPadding, Color borderColour, Color backColour) - { - this.BorderWidth = borderWidth; - this.BorderRadius = borderRadius; - this.BorderPadding = borderPadding; - this.BorderColour = borderColour; - this.BackColour = backColour; - this.ForeColour = Color.Black; - } - - public ThemeStyle(int borderWidth, int borderRadius, int borderPadding, Color borderColour, Color backColour, Color foreColour) - { - this.BorderWidth = borderWidth; - this.BorderRadius = borderRadius; - this.BorderPadding = borderPadding; - this.BorderColour = borderColour; - this.BackColour = backColour; - this.ForeColour = foreColour; - } - } - - protected ThemeStyle styleActive = new ThemeStyle(1, 3, 2, Color.FromArgb(212, 212, 212), Color.White); - - public TUserControl() - { - InitializeComponent(); - } - - protected override void OnLoad(EventArgs e) - { - base.OnLoad(e); - - this.BackColor = Color.Transparent; - } - - protected override void OnPaintBackground(PaintEventArgs e) - { - base.OnPaintBackground(e); - - Graphics g = e.Graphics; - //g.InterpolationMode = System.Drawing.Drawing2D.InterpolationMode.HighQualityBicubic; - //g.CompositingQuality = System.Drawing.Drawing2D.CompositingQuality.HighQuality; - //g.PixelOffsetMode = System.Drawing.Drawing2D.PixelOffsetMode.HighQuality; - //g.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.HighQuality; - - updateBackground(g, styleActive); - } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public new Padding Padding { get => base.Padding; set => base.Padding = value; } - - protected virtual void updateBackground(Graphics g, ThemeStyle style) - { - int b = (styleActive.BorderWidth + 1) + styleActive.BorderPadding; - - this.Padding = new Padding(b, b, (b - 1), (b - 1)); - - Rectangoid area = new Rectangoid(this.ClientRectangle, style.BorderRadius, style.BorderWidth); - g.FillPath(new SolidBrush(style.BackColour), area.ToGraphicsPath()); - g.DrawPath(new Pen(new SolidBrush(style.BorderColour), style.BorderWidth), area.ToGraphicsPath()); - } - - protected virtual void close() - { - if (this.Parent == null) - { - return; - } - - if (this.Parent is Form) - { - (this.Parent as Form).Close(); - return; - } - - if (this.Parent.GetType().IsSubclassOf(typeof(System.Windows.Forms.Form))) - { - System.Windows.Forms.Form parentForm = (System.Windows.Forms.Form)this.Parent; - if (parentForm != null) - { - parentForm.Close(); - } - } - } - - } -} \ No newline at end of file diff --git a/RyzStudio/Windows/ThemedForms/TUserControl.designer.cs b/RyzStudio/Windows/ThemedForms/TUserControl.designer.cs deleted file mode 100644 index 6f57544..0000000 --- a/RyzStudio/Windows/ThemedForms/TUserControl.designer.cs +++ /dev/null @@ -1,37 +0,0 @@ -namespace RyzStudio.Windows.ThemedForms -{ - partial class TUserControl - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Component Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - components = new System.ComponentModel.Container(); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - } - - #endregion - } -} diff --git a/RyzStudio/Windows/ThemedForms/TextBox/TButtonTextBox.cs b/RyzStudio/Windows/ThemedForms/TextBox/TButtonTextBox.cs deleted file mode 100644 index dbe7d77..0000000 --- a/RyzStudio/Windows/ThemedForms/TextBox/TButtonTextBox.cs +++ /dev/null @@ -1,127 +0,0 @@ -namespace RyzStudio.Windows.ThemedForms -{ - using RyzStudio.Drawing; - using System; - using System.ComponentModel; - using System.Drawing; - using System.Windows.Forms; - - public partial class TButtonTextBox : RyzStudio.Windows.ThemedForms.TUserControl - { - protected readonly Padding textboxPadding = new Padding(6, 6, 6, 6); - - public TButtonTextBox() : base() - { - InitializeComponent(); - - //this.Margin = new Padding(10, 6, 10, 6); - this.Margin = new Padding(10, 3, 3, 3); - this.Font = new Font(this.Font, FontStyle.Regular); - - textBox1.Font = this.Font; - textBox1.Left = this.Margin.Left; - textBox1.PreviewKeyDown += textBox_PreviewKeyDown; - - imageBox1.Click += imageBox1_Click; - - OnResize(null); - } - - protected override void OnResize(EventArgs e) - { - base.OnResize(e); - - int b = (styleActive.BorderWidth + 1) + styleActive.BorderPadding; - - this.Height = textBox1.Height + (b + textboxPadding.Top) + ((b - 1) + textboxPadding.Bottom); - - imageBox1.Width = 18; - imageBox1.Height = textBox1.Height + textboxPadding.Top + textboxPadding.Bottom; - imageBox1.Left = this.Width - (this.Margin.Right + b + imageBox1.Width); - - textBox1.Left = this.Margin.Left; - textBox1.Width = imageBox1.Left - textBox1.Left - 3; - textBox1.Top = (int)Math.Ceiling(decimal.Divide((this.Height - textBox1.Height), 2)); - } - - protected override void OnGotFocus(EventArgs e) - { - base.OnGotFocus(e); - - textBox1.Focus(); - } - - protected void textBox_PreviewKeyDown(object sender, PreviewKeyDownEventArgs e) - { - switch (e.KeyCode) - { - case Keys.Enter: - if (this.SubmitButton != null) - { - this.SubmitButton.PerformClick(); - } - - break; - case Keys.Escape: - close(); - break; - default: break; - } - } - - protected virtual void imageBox1_Click(object sender, EventArgs e) => OnButtonClick?.Invoke(sender, e); - - [Category("Action")] - [Browsable(true)] - public event EventHandler OnButtonClick; - - [Browsable(true), EditorBrowsable(EditorBrowsableState.Advanced)] - [Category("Appearance")] - public Forms.TImageBox InnerImageBox { get => imageBox1; set => imageBox1 = value; } - - [Browsable(true), EditorBrowsable(EditorBrowsableState.Advanced)] - [Category("Appearance")] - public System.Windows.Forms.TextBox InnerTextBox { get => textBox1; set => textBox1 = value; } - - [Category("Appearance"), Browsable(true)] - public Image NormalImage { get => imageBox1.ImageNormal; set => imageBox1.ImageNormal = value; } - - [Category("Appearance"), Browsable(true)] - public Image HighlightImage { get => imageBox1.ImageHover; set => imageBox1.ImageHover = value; } - - [Browsable(true), EditorBrowsable(EditorBrowsableState.Advanced)] - [Category("Appearance")] - public new string Text - { - get => textBox1.Text; - set - { - textBox1.Text = value; - textBox1.SelectionStart = textBox1.Text.Length; - } - } - - [Browsable(true), EditorBrowsable(EditorBrowsableState.Advanced)] - [Category("Appearance")] - public bool UseSystemPasswordChar { get => textBox1.UseSystemPasswordChar; set => textBox1.UseSystemPasswordChar = value; } - - [Browsable(true), EditorBrowsable(EditorBrowsableState.Advanced)] - [Category("Appearance")] - public TButton SubmitButton { get; set; } = null; - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public new Padding Margin { get => base.Margin; set => base.Margin = value; } - - protected override void updateBackground(Graphics g, ThemeStyle style) - { - int b = (styleActive.BorderWidth + 1) + styleActive.BorderPadding; - - this.Padding = new Padding((b + textboxPadding.Left), (b + textboxPadding.Top), ((b - 1) + textboxPadding.Right), ((b - 1) + textboxPadding.Bottom)); - - Rectangoid area = new Rectangoid(this.ClientRectangle, style.BorderRadius, style.BorderWidth); - g.FillPath(new SolidBrush(style.BackColour), area.ToGraphicsPath()); - g.DrawPath(new Pen(new SolidBrush(style.BorderColour), style.BorderWidth), area.ToGraphicsPath()); - } - - } -} \ No newline at end of file diff --git a/RyzStudio/Windows/ThemedForms/TextBox/TButtonTextBox.designer.cs b/RyzStudio/Windows/ThemedForms/TextBox/TButtonTextBox.designer.cs deleted file mode 100644 index 6a37b71..0000000 --- a/RyzStudio/Windows/ThemedForms/TextBox/TButtonTextBox.designer.cs +++ /dev/null @@ -1,81 +0,0 @@ -namespace RyzStudio.Windows.ThemedForms -{ - partial class TButtonTextBox - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Component Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - this.textBox1 = new System.Windows.Forms.TextBox(); - this.imageBox1 = new RyzStudio.Windows.Forms.TImageBox(); - ((System.ComponentModel.ISupportInitialize)(this.imageBox1)).BeginInit(); - this.SuspendLayout(); - // - // textBox1 - // - this.textBox1.BackColor = System.Drawing.SystemColors.Window; - this.textBox1.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.textBox1.HideSelection = false; - this.textBox1.Location = new System.Drawing.Point(7, 7); - this.textBox1.Name = "textBox1"; - this.textBox1.Size = new System.Drawing.Size(68, 13); - this.textBox1.TabIndex = 0; - // - // imageBox1 - // - this.imageBox1.BackColor = System.Drawing.Color.Transparent; - this.imageBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.imageBox1.ErrorImage = null; - this.imageBox1.ImageHover = null; - this.imageBox1.Image = null; - this.imageBox1.InitialImage = null; - this.imageBox1.Location = new System.Drawing.Point(107, 4); - this.imageBox1.Name = "imageBox1"; - this.imageBox1.ImageNormal = null; - this.imageBox1.Size = new System.Drawing.Size(18, 25); - this.imageBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.imageBox1.TabIndex = 1; - this.imageBox1.TabStop = false; - // - // TextBox2 - // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; - this.Controls.Add(this.imageBox1); - this.Controls.Add(this.textBox1); - this.Name = "TextBox2"; - this.Padding = new System.Windows.Forms.Padding(4, 4, 3, 3); - this.Size = new System.Drawing.Size(128, 32); - ((System.ComponentModel.ISupportInitialize)(this.imageBox1)).EndInit(); - this.ResumeLayout(false); - this.PerformLayout(); - - } - - #endregion - - private System.Windows.Forms.TextBox textBox1; - private Forms.TImageBox imageBox1; - } -} diff --git a/RyzStudio/Windows/ThemedForms/TextBox/TButtonTextBox.resx b/RyzStudio/Windows/ThemedForms/TextBox/TButtonTextBox.resx deleted file mode 100644 index 1af7de1..0000000 --- a/RyzStudio/Windows/ThemedForms/TextBox/TButtonTextBox.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/RyzStudio/Windows/ThemedForms/TextBox/TFolderTextBox - Copy.resx b/RyzStudio/Windows/ThemedForms/TextBox/TFolderTextBox - Copy.resx deleted file mode 100644 index 1af7de1..0000000 --- a/RyzStudio/Windows/ThemedForms/TextBox/TFolderTextBox - Copy.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/RyzStudio/Windows/ThemedForms/TextBox/TFolderTextBox.cs b/RyzStudio/Windows/ThemedForms/TextBox/TFolderTextBox.cs deleted file mode 100644 index 341b480..0000000 --- a/RyzStudio/Windows/ThemedForms/TextBox/TFolderTextBox.cs +++ /dev/null @@ -1,42 +0,0 @@ -using System; -using System.IO; -using System.Windows.Forms; -using UIResources = FizzyLauncher.UIResource; - -namespace RyzStudio.Windows.ThemedForms -{ - public class TFolderTextBox : TButtonTextBox - { - public TFolderTextBox() : base() - { - this.NormalImage = UIResources.folder; - this.HighlightImage = UIResources.folder2; - this.Text = string.Empty; - } - - public FolderBrowserDialog FolderDialog { get; set; } = null; - - protected override void imageBox1_Click(object sender, EventArgs e) - { - if (this.FolderDialog == null) - { - this.FolderDialog = new FolderBrowserDialog(); - this.FolderDialog.Description = "Choose a directory"; - } - - if (!string.IsNullOrWhiteSpace(this.Text)) - { - if (Directory.Exists(this.Text)) - { - this.FolderDialog.SelectedPath = this.Text; - } - } - - if (this.FolderDialog.ShowDialog() == System.Windows.Forms.DialogResult.OK) - { - this.Text = this.FolderDialog.SelectedPath; - } - } - - } -} diff --git a/RyzStudio/Windows/ThemedForms/TextBox/TFolderTextBox.resx b/RyzStudio/Windows/ThemedForms/TextBox/TFolderTextBox.resx deleted file mode 100644 index 1af7de1..0000000 --- a/RyzStudio/Windows/ThemedForms/TextBox/TFolderTextBox.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/RyzStudio/Windows/ThemedForms/TextBox/TKeyCodeTextBox.cs b/RyzStudio/Windows/ThemedForms/TextBox/TKeyCodeTextBox.cs deleted file mode 100644 index 08e9f2f..0000000 --- a/RyzStudio/Windows/ThemedForms/TextBox/TKeyCodeTextBox.cs +++ /dev/null @@ -1,92 +0,0 @@ -using System; -using System.Text; -using System.Windows.Forms; -using UIResources = FizzyLauncher.UIResource; - -namespace RyzStudio.Windows.ThemedForms -{ - public class TKeyCodeTextBox : TButtonTextBox - { - public class Results - { - public bool IsCtrl { get; set; } = false; - public bool IsAlt { get; set; } = false; - public bool IsShift { get; set; } = false; - public Keys Key { get; set; } = Keys.None; - - public int ModifierCode => ((this.IsAlt ? 1 : 0) + (this.IsCtrl ? 2 : 0) + (this.IsShift ? 4 : 0)); - - public int KeyCode => (int)this.Key; - - public string DisplayText - { - get - { - StringBuilder sb = new StringBuilder(); - - if (this.IsCtrl) sb.Append("Ctrl+"); - if (this.IsShift) sb.Append("Shift+"); - if (this.IsAlt) sb.Append("Alt+"); - - sb.Append(this.Key.ToString()); - - return sb.ToString(); - } - } - - public void Clear() - { - this.IsCtrl = false; - this.IsAlt = false; - this.IsShift = false; - this.Key = Keys.None; - } - } - - - public Results KeyCodeResults { get; set; } = new Results(); - - - public TKeyCodeTextBox() : base() - { - this.NormalImage = UIResources.trash; - this.HighlightImage = UIResources.trash2; - this.Text = string.Empty; - - this.InnerTextBox.ReadOnly = true; - this.InnerTextBox.PreviewKeyDown += textBox1_PreviewKeyDown; - } - - private void textBox1_PreviewKeyDown(object sender, PreviewKeyDownEventArgs e) - { - if (e.KeyCode == Keys.ControlKey) return; - if (e.KeyCode == Keys.ShiftKey) return; - if (e.KeyCode == Keys.Menu) return; - - this.KeyCodeResults.IsCtrl = e.Control; - this.KeyCodeResults.IsAlt = e.Alt; - this.KeyCodeResults.IsShift = e.Shift; - this.KeyCodeResults.Key = e.KeyCode; - - this.Text = this.KeyCodeResults.DisplayText; - } - - protected override void imageBox1_Click(object sender, EventArgs e) - { - this.KeyCodeResults.Clear(); - - this.Text = this.KeyCodeResults.DisplayText; - } - - public void UpdateKeyCode(bool isCtrl, bool isAlt, bool isShift, Keys key) - { - this.KeyCodeResults.IsCtrl = isCtrl; - this.KeyCodeResults.IsAlt = isAlt; - this.KeyCodeResults.IsShift = isShift; - this.KeyCodeResults.Key = key; - - this.Text = this.KeyCodeResults.DisplayText; - } - - } -} diff --git a/RyzStudio/Windows/ThemedForms/TextBox/TOpenFileTextBox.cs b/RyzStudio/Windows/ThemedForms/TextBox/TOpenFileTextBox.cs deleted file mode 100644 index 0fb3daa..0000000 --- a/RyzStudio/Windows/ThemedForms/TextBox/TOpenFileTextBox.cs +++ /dev/null @@ -1,43 +0,0 @@ -using System; -using System.IO; -using System.Windows.Forms; -using UIResources = FizzyLauncher.UIResource; - -namespace RyzStudio.Windows.ThemedForms -{ - public class TOpenFileTextBox : TButtonTextBox - { - public TOpenFileTextBox() : base() - { - this.NormalImage = UIResources.file; - this.HighlightImage = UIResources.file2; - this.Text = string.Empty; - } - - public OpenFileDialog FileDialog { get; set; } = null; - - protected override void imageBox1_Click(object sender, EventArgs e) - { - if (this.FileDialog == null) - { - this.FileDialog = new OpenFileDialog(); - this.FileDialog.Title = "Choose a file"; - this.FileDialog.Filter = "All files|*"; - } - - if (!string.IsNullOrWhiteSpace(this.Text)) - { - if (File.Exists(this.Text)) - { - this.FileDialog.InitialDirectory = Path.GetDirectoryName(this.Text); - } - } - - if (this.FileDialog.ShowDialog() == System.Windows.Forms.DialogResult.OK) - { - this.Text = this.FileDialog.FileName; - } - } - - } -} diff --git a/RyzStudio/Windows/ThemedForms/TextBox/TTextBox.cs b/RyzStudio/Windows/ThemedForms/TextBox/TTextBox.cs deleted file mode 100644 index be72ccd..0000000 --- a/RyzStudio/Windows/ThemedForms/TextBox/TTextBox.cs +++ /dev/null @@ -1,100 +0,0 @@ -using RyzStudio.Drawing; -using System; -using System.ComponentModel; -using System.Drawing; -using System.Windows.Forms; - -namespace RyzStudio.Windows.ThemedForms -{ - public partial class TTextBox : RyzStudio.Windows.ThemedForms.TUserControl - { - protected readonly Padding textboxPadding = new Padding(6, 6, 6, 6); - - - public TTextBox() : base() - { - InitializeComponent(); - - this.Margin = new Padding(10, 6, 10, 6); - this.Font = new Font(this.Font, FontStyle.Regular); - - textBox1.Font = this.Font; - textBox1.PreviewKeyDown += textBox_PreviewKeyDown; - } - - protected override void OnResize(EventArgs e) - { - base.OnResize(e); - - int b = (styleActive.BorderWidth + 1) + styleActive.BorderPadding; - - this.Height = textBox1.Height + (b + textboxPadding.Top) + ((b - 1) + textboxPadding.Bottom); - - this.Invalidate(); - } - - protected override void OnGotFocus(EventArgs e) - { - base.OnGotFocus(e); - - textBox1.Focus(); - } - - protected void textBox_PreviewKeyDown(object sender, PreviewKeyDownEventArgs e) - { - switch (e.KeyCode) - { - case Keys.Enter: - if (this.SubmitButton != null) - { - this.SubmitButton.PerformClick(); - } - - break; - case Keys.Escape: - close(); - break; - default: break; - } - } - - [Browsable(true), EditorBrowsable(EditorBrowsableState.Advanced)] - [Category("Appearance")] - public System.Windows.Forms.TextBox InnerTextBox { get => textBox1; set => textBox1 = value; } - - [Browsable(true), EditorBrowsable(EditorBrowsableState.Advanced)] - [Category("Appearance")] - public new string Text - { - get => textBox1.Text; - set - { - textBox1.Text = value; - textBox1.SelectionStart = textBox1.Text.Length; - } - } - - [Browsable(true), EditorBrowsable(EditorBrowsableState.Advanced)] - [Category("Appearance")] - public bool UseSystemPasswordChar { get => textBox1.UseSystemPasswordChar; set => textBox1.UseSystemPasswordChar = value; } - - [Browsable(true), EditorBrowsable(EditorBrowsableState.Advanced)] - [Category("Appearance")] - public TButton SubmitButton { get; set; } = null; - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public new Padding Margin { get { return base.Margin; } set { base.Margin = value; } } - - protected override void updateBackground(Graphics g, ThemeStyle style) - { - int b = (styleActive.BorderWidth + 1) + styleActive.BorderPadding; - - this.Padding = new Padding((b + textboxPadding.Left), (b + textboxPadding.Top), ((b - 1) + textboxPadding.Right), ((b - 1) + textboxPadding.Bottom)); - - Rectangoid area = new Rectangoid(this.ClientRectangle, style.BorderRadius, style.BorderWidth); - g.FillPath(new SolidBrush(style.BackColour), area.ToGraphicsPath()); - g.DrawPath(new Pen(new SolidBrush(style.BorderColour), style.BorderWidth), area.ToGraphicsPath()); - } - - } -} \ No newline at end of file diff --git a/RyzStudio/Windows/ThemedForms/TextBox/TTextBox.designer.cs b/RyzStudio/Windows/ThemedForms/TextBox/TTextBox.designer.cs deleted file mode 100644 index 752557d..0000000 --- a/RyzStudio/Windows/ThemedForms/TextBox/TTextBox.designer.cs +++ /dev/null @@ -1,60 +0,0 @@ -namespace RyzStudio.Windows.ThemedForms -{ - partial class TTextBox - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Component Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - this.textBox1 = new System.Windows.Forms.TextBox(); - this.SuspendLayout(); - // - // textBox1 - // - this.textBox1.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.textBox1.Dock = System.Windows.Forms.DockStyle.Fill; - this.textBox1.HideSelection = false; - this.textBox1.Location = new System.Drawing.Point(4, 4); - this.textBox1.Name = "textBox1"; - this.textBox1.Size = new System.Drawing.Size(121, 13); - this.textBox1.TabIndex = 0; - // - // TextBox - // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; - this.Controls.Add(this.textBox1); - this.Name = "TextBox"; - this.Padding = new System.Windows.Forms.Padding(4, 4, 3, 3); - this.Size = new System.Drawing.Size(128, 32); - this.ResumeLayout(false); - this.PerformLayout(); - - } - - #endregion - - private System.Windows.Forms.TextBox textBox1; - } -} diff --git a/RyzStudio/Windows/ThemedForms/TextBox/TTextBox.resx b/RyzStudio/Windows/ThemedForms/TextBox/TTextBox.resx deleted file mode 100644 index 1af7de1..0000000 --- a/RyzStudio/Windows/ThemedForms/TextBox/TTextBox.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/Text/Json/JsonPointConverter.cs b/Text/Json/JsonPointConverter.cs deleted file mode 100644 index e787cdc..0000000 --- a/Text/Json/JsonPointConverter.cs +++ /dev/null @@ -1,40 +0,0 @@ -using System; -using System.Drawing; -using System.Text.Json; -using System.Text.Json.Serialization; - -namespace FizzyLauncher.Text.Json -{ - public class JsonPointConverter : JsonConverter - { - public override Point Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) - { - Point rs = new Point(0, 0); - - if (reader.TokenType == JsonTokenType.String) - { - string[] parts = reader.GetString().Split(','); - if (parts.Length != 2) - { - return rs; - } - - int x = 0; - int y = 0; - - if (!int.TryParse(parts[0].Trim(), out x)) x = 0; - if (!int.TryParse(parts[1].Trim(), out y)) y = 0; - - return new Point(x, y); - } - - return rs; - } - - public override void Write(Utf8JsonWriter writer, Point value, JsonSerializerOptions options) - { - writer.WriteStringValue(string.Format("{0}, {1}", value.X.ToString(), value.Y.ToString())); - } - - } -} diff --git a/Text/Json/JsonSizeConverter.cs b/Text/Json/JsonSizeConverter.cs deleted file mode 100644 index eb763fa..0000000 --- a/Text/Json/JsonSizeConverter.cs +++ /dev/null @@ -1,40 +0,0 @@ -using System; -using System.Drawing; -using System.Text.Json; -using System.Text.Json.Serialization; - -namespace FizzyLauncher.Text.Json -{ - public class JsonSizeConverter : JsonConverter - { - public override Size Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) - { - Size rs = new Size(0, 0); - - if (reader.TokenType == JsonTokenType.String) - { - string[] parts = reader.GetString().Split(','); - if (parts.Length != 2) - { - return rs; - } - - int w = 0; - int h = 0; - - if (!int.TryParse(parts[0].Trim(), out w)) w = 0; - if (!int.TryParse(parts[1].Trim(), out h)) h = 0; - - return new Size(w, h); - } - - return rs; - } - - public override void Write(Utf8JsonWriter writer, Size value, JsonSerializerOptions options) - { - writer.WriteStringValue(string.Format("{0}, {1}", value.Width.ToString(), value.Height.ToString())); - } - - } -} diff --git a/UIResource.Designer.cs b/UIResource.Designer.cs deleted file mode 100644 index d8654e6..0000000 --- a/UIResource.Designer.cs +++ /dev/null @@ -1,303 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace FizzyLauncher { - using System; - - - /// - /// A strongly-typed resource class, for looking up localized strings, etc. - /// - // This class was auto-generated by the StronglyTypedResourceBuilder - // 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.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class UIResource { - - private static global::System.Resources.ResourceManager resourceMan; - - private static global::System.Globalization.CultureInfo resourceCulture; - - [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal UIResource() { - } - - /// - /// Returns the cached ResourceManager instance used by this class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager { - get { - if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("FizzyLauncher.UIResource", typeof(UIResource).Assembly); - resourceMan = temp; - } - return resourceMan; - } - } - - /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture { - get { - return resourceCulture; - } - set { - resourceCulture = value; - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap arrow_down { - get { - object obj = ResourceManager.GetObject("arrow_down", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap arrow_down2 { - get { - object obj = ResourceManager.GetObject("arrow_down2", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap arrow_up { - get { - object obj = ResourceManager.GetObject("arrow_up", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap arrow_up2 { - get { - object obj = ResourceManager.GetObject("arrow_up2", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap circle_menu { - get { - object obj = ResourceManager.GetObject("circle_menu", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap circle_menu2 { - get { - object obj = ResourceManager.GetObject("circle_menu2", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap close { - get { - object obj = ResourceManager.GetObject("close", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap close2 { - get { - object obj = ResourceManager.GetObject("close2", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap cog { - get { - object obj = ResourceManager.GetObject("cog", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap cog2 { - get { - object obj = ResourceManager.GetObject("cog2", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap disk { - get { - object obj = ResourceManager.GetObject("disk", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap disk2 { - get { - object obj = ResourceManager.GetObject("disk2", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap edit { - get { - object obj = ResourceManager.GetObject("edit", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap edit2 { - get { - object obj = ResourceManager.GetObject("edit2", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap file { - get { - object obj = ResourceManager.GetObject("file", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap file2 { - get { - object obj = ResourceManager.GetObject("file2", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap folder { - get { - object obj = ResourceManager.GetObject("folder", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap folder2 { - get { - object obj = ResourceManager.GetObject("folder2", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap help { - get { - object obj = ResourceManager.GetObject("help", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap help2 { - get { - object obj = ResourceManager.GetObject("help2", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap plus { - get { - object obj = ResourceManager.GetObject("plus", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap plus2 { - get { - object obj = ResourceManager.GetObject("plus2", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap trash { - get { - object obj = ResourceManager.GetObject("trash", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap trash2 { - get { - object obj = ResourceManager.GetObject("trash2", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - } -} diff --git a/UIResource.resx b/UIResource.resx deleted file mode 100644 index 20df970..0000000 --- a/UIResource.resx +++ /dev/null @@ -1,193 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - Resources\UI\arrow_down.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - Resources\UI\arrow_down2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - Resources\UI\arrow_up.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - Resources\UI\arrow_up2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - Resources\UI\circle_menu.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - Resources\UI\circle_menu2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - Resources\UI\close.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - Resources\UI\close2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - Resources\UI\cog.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - Resources\UI\cog2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - Resources\UI\disk.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - Resources\UI\disk2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - Resources\UI\edit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - Resources\UI\edit2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - Resources\UI\file.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - Resources\UI\file2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - Resources\UI\folder.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - Resources\UI\folder2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - Resources\UI\help.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - Resources\UI\help2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - Resources\UI\plus.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - Resources\UI\plus2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - Resources\UI\trash.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - Resources\UI\trash2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - \ No newline at end of file diff --git a/build.bat b/build.bat new file mode 100644 index 0000000..f18db46 --- /dev/null +++ b/build.bat @@ -0,0 +1,5 @@ +rmdir /s /q "bin\Release\64\" +dotnet publish skye.sln -r win-x64 -c Release /p:PublishSingleFile=true /p:SelfContained=false /p:PublishReadyToRunfalse=true /p:PublishDir="bin\Release\64\" + +rmdir /s /q "bin\Release\86\" +dotnet publish skye.sln -r win-x86 -c Release /p:PublishSingleFile=true /p:SelfContained=false /p:PublishReadyToRunfalse=true /p:PublishDir="bin\Release\86\" \ No newline at end of file diff --git a/installer-64.iss b/installer-64.iss index 65ce4f1..a298f50 100644 --- a/installer-64.iss +++ b/installer-64.iss @@ -2,7 +2,7 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define MyAppName "Fizzy Launcher" -#define MyAppVersion "0.2.4.032" +#define MyAppVersion "0.2.4.047" #define MyAppPublisher "Hi, I'm Ray" #define MyAppURL "https://www.hiimray.co.uk/software-fizzy-launcher" #define MyAppExeName "fizzylauncher.exe" diff --git a/installer-86.iss b/installer-86.iss index 69ee0ce..20f1a2f 100644 --- a/installer-86.iss +++ b/installer-86.iss @@ -2,7 +2,7 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define MyAppName "Fizzy Launcher" -#define MyAppVersion "0.2.4.032" +#define MyAppVersion "0.2.4.047" #define MyAppPublisher "Hi, I'm Ray" #define MyAppURL "https://www.hiimray.co.uk/software-fizzy-launcher" #define MyAppExeName "fizzylauncher.exe" diff --git a/FizzyLauncher.sln b/skye.sln similarity index 94% rename from FizzyLauncher.sln rename to skye.sln index aafd02f..28e22b4 100644 --- a/FizzyLauncher.sln +++ b/skye.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.31410.357 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FizzyLauncher", "FizzyLauncher.csproj", "{4833FB27-0817-4720-A54B-180369B0C374}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FizzyLauncher", "FizzyLauncher.csproj", "{4833FB27-0817-4720-A54B-180369B0C374}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution