From 3d62d6ea9788df27081657f362297f144128b69e Mon Sep 17 00:00:00 2001 From: Ray Date: Mon, 15 Nov 2021 23:46:18 +0000 Subject: [PATCH] Changed build no + rystudio + clean-up --- BookmarkForm.cs | 4 +- BookmarkManager.csproj | 66 +- MainForm.Designer.cs | 32 +- References/RyzStudio3.dll | Bin 0 -> 137216 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 | 641 -------------- 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/search.png | Bin 584 -> 0 bytes Resources/UI/search2.png | Bin 394 -> 0 bytes Resources/UI/trash.png | Bin 382 -> 0 bytes Resources/UI/trash2.png | Bin 289 -> 0 bytes Resources/loading-block.gif | Bin 33840 -> 0 bytes RyzStudio/Data/SQLite/SQLiteDatabase.cs | 444 ---------- RyzStudio/Drawing/Rectangoid.cs | 124 --- RyzStudio/IO/SessionFileFormatBase.cs | 290 ------- RyzStudio/Net/HttpWeb.cs | 175 ---- RyzStudio/Windows/Forms/StackLayoutPanel.cs | 69 -- .../Forms/TCustomProgressBar.Designer.cs | 63 -- RyzStudio/Windows/Forms/TCustomProgressBar.cs | 158 ---- .../Windows/Forms/TCustomProgressBar.resx | 120 --- 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 | 808 ------------------ .../ThemedForms/PickerBox/TPickerBox.cs | 98 --- .../PickerBox/TPickerBox.designer.cs | 59 -- .../ThemedForms/PickerBox/TPickerBox.resx | 120 --- .../ThemedForms/PickerBox/TYesNoPickerBox.cs | 27 - RyzStudio/Windows/ThemedForms/TButton.cs | 183 ---- .../Windows/ThemedForms/TButton.designer.cs | 62 -- RyzStudio/Windows/ThemedForms/TButton.resx | 60 -- .../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/TMemoBox.cs | 59 -- .../Windows/ThemedForms/TMemoBox.designer.cs | 63 -- RyzStudio/Windows/ThemedForms/TNumericBox.cs | 99 --- .../ThemedForms/TNumericBox.designer.cs | 60 -- .../Windows/ThemedForms/TNumericBox.resx | 60 -- RyzStudio/Windows/ThemedForms/TProgressBar.cs | 50 -- .../ThemedForms/TProgressBar.designer.cs | 65 -- .../Windows/ThemedForms/TProgressBar.resx | 60 -- RyzStudio/Windows/ThemedForms/TUserControl.cs | 106 --- .../ThemedForms/TUserControl.designer.cs | 37 - .../ThemedForms/TextBox/TButtonTextBox.cs | 139 --- .../TextBox/TButtonTextBox.designer.cs | 81 -- .../ThemedForms/TextBox/TButtonTextBox.resx | 120 --- .../TextBox/TFolderTextBox - Copy.resx | 120 --- .../ThemedForms/TextBox/TFolderTextBox.cs | 46 - .../ThemedForms/TextBox/TFolderTextBox.resx | 120 --- .../ThemedForms/TextBox/TKeyCodeTextBox.cs | 96 --- .../ThemedForms/TextBox/TOpenFileTextBox.cs | 48 -- .../Windows/ThemedForms/TextBox/TTextBox.cs | 100 --- .../ThemedForms/TextBox/TTextBox.designer.cs | 60 -- .../Windows/ThemedForms/TextBox/TTextBox.resx | 120 --- UIResource.Designer.cs | 323 ------- UIResource.resx | 199 ----- installer-64.iss | 2 +- installer-86.iss | 2 +- 94 files changed, 41 insertions(+), 8479 deletions(-) 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/search.png delete mode 100644 Resources/UI/search2.png delete mode 100644 Resources/UI/trash.png delete mode 100644 Resources/UI/trash2.png delete mode 100644 Resources/loading-block.gif delete mode 100644 RyzStudio/Data/SQLite/SQLiteDatabase.cs delete mode 100644 RyzStudio/Drawing/Rectangoid.cs delete mode 100644 RyzStudio/IO/SessionFileFormatBase.cs delete mode 100644 RyzStudio/Net/HttpWeb.cs delete mode 100644 RyzStudio/Windows/Forms/StackLayoutPanel.cs delete mode 100644 RyzStudio/Windows/Forms/TCustomProgressBar.Designer.cs delete mode 100644 RyzStudio/Windows/Forms/TCustomProgressBar.cs delete mode 100644 RyzStudio/Windows/Forms/TCustomProgressBar.resx 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/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/TMemoBox.cs delete mode 100644 RyzStudio/Windows/ThemedForms/TMemoBox.designer.cs 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/TProgressBar.cs delete mode 100644 RyzStudio/Windows/ThemedForms/TProgressBar.designer.cs delete mode 100644 RyzStudio/Windows/ThemedForms/TProgressBar.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 UIResource.Designer.cs delete mode 100644 UIResource.resx diff --git a/BookmarkForm.cs b/BookmarkForm.cs index c9ba0a7..e257290 100644 --- a/BookmarkForm.cs +++ b/BookmarkForm.cs @@ -225,11 +225,11 @@ namespace FizzyLauncher | System.Windows.Forms.AnchorStyles.Right))); this.textBox2.BackColor = System.Drawing.Color.Transparent; this.textBox2.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); - this.textBox2.HighlightImage = global::BookmarkManager.UIResource.search2; + this.textBox2.HighlightImage = global::RyzStudio.UIResource.search2; this.textBox2.Location = new System.Drawing.Point(110, 66); this.textBox2.Margin = new System.Windows.Forms.Padding(10, 3, 3, 3); this.textBox2.Name = "textBox2"; - this.textBox2.NormalImage = global::BookmarkManager.UIResource.search; + this.textBox2.NormalImage = global::RyzStudio.UIResource.search; this.textBox2.Padding = new System.Windows.Forms.Padding(10, 10, 9, 9); this.textBox2.Size = new System.Drawing.Size(259, 35); this.textBox2.SubmitButton = null; diff --git a/BookmarkManager.csproj b/BookmarkManager.csproj index 7076389..d57d51d 100644 --- a/BookmarkManager.csproj +++ b/BookmarkManager.csproj @@ -12,9 +12,9 @@ Hi, I'm Ray Bookmark Manager Ray Lam - 0.4.1.006 - 0.4.1.006 - 0.4.1.006 + 0.4.2.008 + 0.4.2.008 + 0.4.2.008 bookmarkmanager @@ -30,21 +30,21 @@ - - - + + + - - - + + + - - - + + + @@ -53,16 +53,7 @@ - - - - - - - - - - + @@ -77,10 +68,7 @@ - - - - + @@ -93,12 +81,12 @@ + - @@ -107,9 +95,6 @@ True AppResource.resx - - UserControl - Form @@ -122,14 +107,6 @@ Form - - UserControl - - - True - True - UIResource.resx - @@ -137,13 +114,6 @@ ResXFileCodeGenerator AppResource.Designer.cs - - TFolderTextBox.resx - - - ResXFileCodeGenerator - UIResource.Designer.cs - @@ -153,4 +123,10 @@ + + + References\RyzStudio3.dll + + + \ No newline at end of file diff --git a/MainForm.Designer.cs b/MainForm.Designer.cs index 1647829..54f0f81 100644 --- a/MainForm.Designer.cs +++ b/MainForm.Designer.cs @@ -137,7 +137,7 @@ // // newToolStripMenuItem // - this.newToolStripMenuItem.Image = global::BookmarkManager.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); @@ -146,7 +146,7 @@ // // openToolStripMenuItem // - this.openToolStripMenuItem.Image = global::BookmarkManager.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); @@ -172,7 +172,7 @@ // // saveToolStripMenuItem // - this.saveToolStripMenuItem.Image = global::BookmarkManager.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); @@ -208,7 +208,7 @@ // // findToolStripMenuItem // - this.findToolStripMenuItem.Image = global::BookmarkManager.UIResource.search2; + this.findToolStripMenuItem.Image = global::RyzStudio.UIResource.search2; this.findToolStripMenuItem.Name = "findToolStripMenuItem"; this.findToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.F))); this.findToolStripMenuItem.Size = new System.Drawing.Size(137, 22); @@ -276,7 +276,7 @@ // // optionsToolStripMenuItem // - this.optionsToolStripMenuItem.Image = global::BookmarkManager.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); @@ -295,7 +295,7 @@ // // viewHelpToolStripMenuItem1 // - this.viewHelpToolStripMenuItem1.Image = global::BookmarkManager.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); @@ -424,7 +424,7 @@ // // deleteToolStripMenuItem // - this.deleteToolStripMenuItem.Image = global::BookmarkManager.UIResource.trash2; + this.deleteToolStripMenuItem.Image = global::RyzStudio.UIResource.trash2; this.deleteToolStripMenuItem.Name = "deleteToolStripMenuItem"; this.deleteToolStripMenuItem.Size = new System.Drawing.Size(138, 22); this.deleteToolStripMenuItem.Text = "&Delete"; @@ -449,7 +449,7 @@ // // moveUpToolStripMenuItem // - this.moveUpToolStripMenuItem.Image = global::BookmarkManager.UIResource.arrow_up2; + this.moveUpToolStripMenuItem.Image = global::RyzStudio.UIResource.arrow_up2; this.moveUpToolStripMenuItem.Name = "moveUpToolStripMenuItem"; this.moveUpToolStripMenuItem.Size = new System.Drawing.Size(138, 22); this.moveUpToolStripMenuItem.Text = "Move &Up"; @@ -457,7 +457,7 @@ // // moveDownToolStripMenuItem // - this.moveDownToolStripMenuItem.Image = global::BookmarkManager.UIResource.arrow_down2; + this.moveDownToolStripMenuItem.Image = global::RyzStudio.UIResource.arrow_down2; this.moveDownToolStripMenuItem.Name = "moveDownToolStripMenuItem"; this.moveDownToolStripMenuItem.Size = new System.Drawing.Size(138, 22); this.moveDownToolStripMenuItem.Text = "Move &Down"; @@ -498,7 +498,7 @@ // // deleteToolStripMenuItem1 // - this.deleteToolStripMenuItem1.Image = global::BookmarkManager.UIResource.trash2; + this.deleteToolStripMenuItem1.Image = global::RyzStudio.UIResource.trash2; this.deleteToolStripMenuItem1.Name = "deleteToolStripMenuItem1"; this.deleteToolStripMenuItem1.Size = new System.Drawing.Size(138, 22); this.deleteToolStripMenuItem1.Text = "&Delete"; @@ -511,7 +511,7 @@ // // moveUpToolStripMenuItem1 // - this.moveUpToolStripMenuItem1.Image = global::BookmarkManager.UIResource.arrow_up2; + this.moveUpToolStripMenuItem1.Image = global::RyzStudio.UIResource.arrow_up2; this.moveUpToolStripMenuItem1.Name = "moveUpToolStripMenuItem1"; this.moveUpToolStripMenuItem1.Size = new System.Drawing.Size(138, 22); this.moveUpToolStripMenuItem1.Text = "Move &Up"; @@ -519,7 +519,7 @@ // // moveDownToolStripMenuItem1 // - this.moveDownToolStripMenuItem1.Image = global::BookmarkManager.UIResource.arrow_down2; + this.moveDownToolStripMenuItem1.Image = global::RyzStudio.UIResource.arrow_down2; this.moveDownToolStripMenuItem1.Name = "moveDownToolStripMenuItem1"; this.moveDownToolStripMenuItem1.Size = new System.Drawing.Size(138, 22); this.moveDownToolStripMenuItem1.Text = "Move &Down"; @@ -543,7 +543,7 @@ // toolStripButton1 // this.toolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.toolStripButton1.Image = global::BookmarkManager.UIResource.file2; + this.toolStripButton1.Image = global::RyzStudio.UIResource.file2; this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButton1.Name = "toolStripButton1"; this.toolStripButton1.Size = new System.Drawing.Size(23, 22); @@ -554,7 +554,7 @@ // toolStripButton2 // this.toolStripButton2.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.toolStripButton2.Image = global::BookmarkManager.UIResource.folder2; + this.toolStripButton2.Image = global::RyzStudio.UIResource.folder2; this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButton2.Name = "toolStripButton2"; this.toolStripButton2.Size = new System.Drawing.Size(23, 22); @@ -569,7 +569,7 @@ // toolStripButton3 // this.toolStripButton3.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.toolStripButton3.Image = global::BookmarkManager.UIResource.disk2; + this.toolStripButton3.Image = global::RyzStudio.UIResource.disk2; this.toolStripButton3.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButton3.Name = "toolStripButton3"; this.toolStripButton3.Size = new System.Drawing.Size(23, 22); @@ -584,7 +584,7 @@ // toolStripButton4 // this.toolStripButton4.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.toolStripButton4.Image = global::BookmarkManager.UIResource.search2; + this.toolStripButton4.Image = global::RyzStudio.UIResource.search2; this.toolStripButton4.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButton4.Name = "toolStripButton4"; this.toolStripButton4.Size = new System.Drawing.Size(23, 22); diff --git a/References/RyzStudio3.dll b/References/RyzStudio3.dll new file mode 100644 index 0000000000000000000000000000000000000000..64c8303b502665b975e49774528a8da913cff04a GIT binary patch literal 137216 zcmdRX2Y6J~*7n|KCX-|mN1m1oIAVhuxVvYbB-&Ueq7n;y(g5-bdQ);+o40amsLG(7p0C^;wYW>!dB1PH>yWj zmeWtET*o-(G0G&fQ1imPk4^vOZwiR`KmP)1%4vz3j1&@*&L≷RGc~U~Z(N#xgMN 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Ǽs-( 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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/search.png b/Resources/UI/search.png deleted file mode 100644 index 12a0b2aaa9ffa0eeb52c00d9f3164c304c3116c8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 584 zcmV-O0=NB%P)pF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10o6%F zK~y-6jgm2FQvno3&;7qtLNP)G(M2mFgd{&9gCdj`f}jNlr*;!ZckL!Ps8bgmbd(~3 zi%3OrPzOOUQk`P{PYPMYibIpClZ~Oi=THk@X+zHZ&VBE}6)BP=8FlxIl4jk#1dIb6 zNz1^)d_MnJlBXS|bA>|T^FIM`9G?JQ1HXa!PN%b2 ztyVX;hwAnESQv(vfos5;yPt}pXca)US}l{!W>+NbGqdR^iaxRnjYi{~q$j|;VzD?4 z5M;C2OTb|>yD~@yh@$AZq+7sLk|Z+#0Wb@!ce~yDgXC?(FuV5t z7XX2o-2pa%yGfFa4wCEj`Twe`97{NrxoO02hD}cSlmk-A_kR)KYp&9LHyY>%htX z4lv-AnO&8%SJE@!CvZmWK&#c7FtZY{-^@B@_P$&$uca1Mfv3Q)9Rr3Tj^jy5OMd{J WD8cLq8J1uG0000pF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10T)R` zK~y-6mD8~FlsfQ_)7MRJD2VQ$x?A;}8sHEd5~H)2Pq4jZ1P)aP0_ oy1;vI6&zsQfPYaI73|^q8xqAu?d=vWm;e9(07*qoM6N<$f`4D0TL1t6 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 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 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/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/Net/HttpWeb.cs b/RyzStudio/Net/HttpWeb.cs deleted file mode 100644 index 27a4b18..0000000 --- a/RyzStudio/Net/HttpWeb.cs +++ /dev/null @@ -1,175 +0,0 @@ -using System; -using System.IO; -using System.Net; -using System.Text; -using System.Windows.Forms; - -namespace RyzStudio.Net -{ - public class HttpWeb - { - - - public HttpWeb() - { - } - - - public string UserAgent { get; set; } = "Momozilla/5.0 (" + Environment.OSVersion.Platform.ToString() + " ; " + Environment.OSVersion.VersionString + "; " + Application.CurrentCulture.TwoLetterISOLanguageName + ")"; - - public int Timeout { get; set; } = 6000; - - public int MaxRedirect { get; set; } = 8; - - public bool AllowRedirect { get; set; } = true; - - public bool IgnoreSSL { get; set; } = false; - - public CookieContainer CookierJar { get; set; } = null; - - - public HttpWebRequest CreateRequest(string url) => this.CreateRequest(url, url); - - public HttpWebRequest CreateRequest(string url, string referrerURL) - { - if (this.CookierJar == null) this.CookierJar = new CookieContainer(); - - HttpWebRequest webRequest = (HttpWebRequest)WebRequest.Create(url); - webRequest.CachePolicy = new System.Net.Cache.RequestCachePolicy(System.Net.Cache.RequestCacheLevel.NoCacheNoStore); - webRequest.MaximumAutomaticRedirections = this.MaxRedirect; - webRequest.CookieContainer = this.CookierJar; - webRequest.UserAgent = this.UserAgent; - webRequest.AllowAutoRedirect = this.AllowRedirect; - webRequest.Timeout = this.Timeout; - - if (this.IgnoreSSL) webRequest.ServerCertificateValidationCallback += (sender, certificate, chain, sslPolicyErrors) => true; - - 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/TCustomProgressBar.Designer.cs b/RyzStudio/Windows/Forms/TCustomProgressBar.Designer.cs deleted file mode 100644 index 73c344f..0000000 --- a/RyzStudio/Windows/Forms/TCustomProgressBar.Designer.cs +++ /dev/null @@ -1,63 +0,0 @@ -namespace RyzStudio.Windows.Forms -{ - partial class TCustomProgressBar - { - /// - /// 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.label3 = new System.Windows.Forms.Label(); - this.SuspendLayout(); - // - // label3 - // - this.label3.BackColor = System.Drawing.Color.Transparent; - this.label3.Dock = System.Windows.Forms.DockStyle.Fill; - this.label3.Font = new System.Drawing.Font("Segoe UI", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label3.Location = new System.Drawing.Point(4, 4); - this.label3.Margin = new System.Windows.Forms.Padding(0); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(803, 47); - this.label3.TabIndex = 144; - this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // ProgressBarInner - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.Controls.Add(this.label3); - this.Margin = new System.Windows.Forms.Padding(0); - this.Name = "ProgressBarInner"; - this.Padding = new System.Windows.Forms.Padding(4, 4, 3, 3); - this.Size = new System.Drawing.Size(810, 54); - this.ResumeLayout(false); - - } - - #endregion - - private System.Windows.Forms.Label label3; - } -} diff --git a/RyzStudio/Windows/Forms/TCustomProgressBar.cs b/RyzStudio/Windows/Forms/TCustomProgressBar.cs deleted file mode 100644 index 1a8493e..0000000 --- a/RyzStudio/Windows/Forms/TCustomProgressBar.cs +++ /dev/null @@ -1,158 +0,0 @@ -using System; -using System.ComponentModel; -using System.Drawing; -using System.Windows.Forms; - -namespace RyzStudio.Windows.Forms -{ - public partial class TCustomProgressBar : TUserControl - { - protected int minimum = 0; - protected int maximum = 100; - protected int value = 50; - - - public TCustomProgressBar() : base() - { - InitializeComponent(); - - this.Padding = new Padding(0); - } - - - [Category("Data"), Browsable(true)] - public int Minimum - { - get => minimum; - set - { - if (this.InvokeRequired) - { - this.Invoke(new MethodInvoker(() => { - SetMinimum(value); - })); - } - else - { - SetMinimum(value); - } - } - } - - [Category("Data"), Browsable(true)] - public int Maximum - { - get => maximum; - set - { - if (this.InvokeRequired) - { - this.Invoke(new MethodInvoker(() => { - SetMaximum(value); - })); - } - else - { - SetMaximum(value); - } - } - } - - [Category("Data"), Browsable(true)] - public int Value - { - get => value; - set - { - if (this.InvokeRequired) - { - this.Invoke(new MethodInvoker(() => { - SetValue(value); - })); - } - else - { - SetValue(value); - } - } - } - - [Category("Appearance"), Browsable(true)] - public Color BarColour { get; set; } = Color.FromArgb(158, 225, 249); - - [Category("Appearance"), Browsable(true)] - public Color BarTextColour { get => label3.ForeColor; set => label3.ForeColor = value; } - - - protected override void OnPaint(PaintEventArgs e) - { - base.OnPaint(e); - - Rectangle canvas = this.DisplayRectangle; - Graphics g = e.Graphics; - - if (this.Value > 0) - { - decimal result = decimal.Divide(canvas.Width, this.Maximum) * this.Value; - - canvas.Width = (int)Math.Round(result); - - g.FillRectangle(new SolidBrush(this.BarColour), canvas); - } - } - - - public void Reset(int value) - { - this.Minimum = 0; - this.Value = 0; - this.Maximum = value; - } - - protected void UpdateText() => RyzStudio.Windows.Forms.ThreadControl.SetText(label3, string.Format("{0}/{1}", this.Value.ToString(), this.Maximum.ToString())); - - protected void SetMinimum(int value) - { - int m = value; - if (m < 0) m = 0; - if (m > this.Maximum) m = this.Maximum; - if (this.Value < m) this.Value = m; - if (this.value > this.Maximum) this.value = this.Maximum; - - minimum = m; - - UpdateText(); - - this.Invalidate(); - } - - protected void SetMaximum(int value) - { - int m = value; - if (m < 0) m = 0; - if (m < this.Minimum) m = this.Minimum; - if (this.Value > m) this.Value = m; - if (this.value < this.Minimum) this.value = this.Minimum; - - maximum = m; - - UpdateText(); - - this.Invalidate(); - } - - protected void SetValue(int value) - { - int m = value; - if (m < this.Minimum) m = this.Minimum; - if (m > this.Maximum) m = this.Maximum; - - this.value = m; - - UpdateText(); - - this.Invalidate(); - } - - } -} diff --git a/RyzStudio/Windows/Forms/TCustomProgressBar.resx b/RyzStudio/Windows/Forms/TCustomProgressBar.resx deleted file mode 100644 index 1af7de1..0000000 --- a/RyzStudio/Windows/Forms/TCustomProgressBar.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/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 08a2e45..0000000 --- a/RyzStudio/Windows/Forms/ThreadControl.cs +++ /dev/null @@ -1,808 +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 TreeNode Add(TreeView parentControl, TreeNodeCollection control, string key, string text, int imageIndex, int selectedImageIndex) - { - TreeNode rv = null; - - if (parentControl.InvokeRequired) - { - parentControl.Invoke(new MethodInvoker(() => { - rv = control.Add(key, text, imageIndex, selectedImageIndex); - })); - } - else - { - rv = control.Add(key, text, imageIndex, selectedImageIndex); - } - - return rv; - } - - public static TreeNode Add(TreeNode control, string key, string text, int imageIndex, int selectedImageIndex) - { - TreeNode rv = null; - - if (control.TreeView.InvokeRequired) - { - control.TreeView.Invoke(new MethodInvoker(() => { - rv = control.Nodes.Add(key, text, imageIndex, selectedImageIndex); - })); - } - else - { - rv = control.Nodes.Add(key, text, imageIndex, selectedImageIndex); - } - - return rv; - } - - public static TreeNode Add(TreeView control, string key, string text, int imageIndex, int selectedImageIndex) - { - TreeNode rv = null; - - if (control.InvokeRequired) - { - control.Invoke(new MethodInvoker(() => { - rv = control.Nodes.Add(key, text, imageIndex, selectedImageIndex); - })); - } - else - { - rv = control.Nodes.Add(key, text, imageIndex, selectedImageIndex); - } - - return rv; - } - - public static void Add(TreeView parentControl, ImageList control, Image value) - { - if (parentControl.InvokeRequired) - { - parentControl.Invoke(new MethodInvoker(() => { - control.Images.Add(value); - })); - } - else - { - control.Images.Add(value); - } - } - - public static void Add(Control parentControl, ImageList control, string key, Image value) - { - if (parentControl.InvokeRequired) - { - parentControl.Invoke(new MethodInvoker(() => { - control.Images.Add(key, value); - })); - } - else - { - control.Images.Add(key, value); - } - } - - 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(TreeView parentControl, ImageList control) - { - if (parentControl.InvokeRequired) - { - parentControl.Invoke(new MethodInvoker(() => { - control.Images.Clear(); - })); - } - else - { - control.Images.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 void Expand(TreeNode control) - { - if (control.TreeView.InvokeRequired) - { - control.TreeView.Invoke(new MethodInvoker(() => { - control.Expand(); - })); - } - else - { - control.Expand(); - } - } - - 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 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 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 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 bool IsChild(TreeNode dragNode, TreeNode dropNode) - { - TreeNode tn = dropNode; - while (true) - { - if (tn.Parent == null) - { - break; - } - - if (tn.Equals(dragNode)) - { - return true; - } - - tn = tn.Parent; - } - - return false; - } - - 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 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 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 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); - } - } - - 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 SetEnable(ToolStripMenuItem control, bool value) - { - if (control.GetCurrentParent() == null) - { - control.Enabled = value; - return; - } - - if (control.GetCurrentParent().InvokeRequired) - { - control.GetCurrentParent().Invoke(new MethodInvoker(() => - { - control.Enabled = value; - })); - } - else - { - control.Enabled = value; - } - } - - public static void SetEnable(ToolStripButton control, bool value) - { - if (control.GetCurrentParent() == null) - { - control.Enabled = value; - return; - } - - if (control.GetCurrentParent().InvokeRequired) - { - control.GetCurrentParent().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 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 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(ComboBox control, int value) - { - if (control.InvokeRequired) - { - control.Invoke(new MethodInvoker(() => { - control.SelectedIndex = value; - })); - } - else - { - control.SelectedIndex = 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 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 static int GetValue(ComboBox sender) - { - int rv = -1; - - if (sender.InvokeRequired) - { - sender.Invoke(new MethodInvoker(() => { - rv = sender.SelectedIndex; - })); - } - else - { - rv = sender.SelectedIndex; - } - - return rv; - } - - 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; - } - } - - } -} \ 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 e9b0557..0000000 --- a/RyzStudio/Windows/ThemedForms/PickerBox/TYesNoPickerBox.cs +++ /dev/null @@ -1,27 +0,0 @@ -using RyzStudio.Windows.Forms; -using System.Windows.Forms; - -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 ComboBox InnerControl { get => this.ComboBox; } - - public bool Value - { - get => (ThreadControl.GetValue(this.ComboBox) == 1); - set => ThreadControl.SetValue(this.ComboBox, (value ? 1 : 0)); - } - - } -} diff --git a/RyzStudio/Windows/ThemedForms/TButton.cs b/RyzStudio/Windows/ThemedForms/TButton.cs deleted file mode 100644 index e3da499..0000000 --- a/RyzStudio/Windows/ThemedForms/TButton.cs +++ /dev/null @@ -1,183 +0,0 @@ -namespace RyzStudio.Windows.ThemedForms -{ - using RyzStudio.Windows.Forms; - 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 += label1_Click; - label1.MouseClick += label1_MouseClick; - 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 => ThreadControl.GetText(label1); set => ThreadControl.SetText(label1, 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(); - - - private void label1_MouseClick(object sender, MouseEventArgs e) => this.OnMouseClick(e); - - private void label1_Click(object sender, EventArgs e) => this.OnClick(e); - - - 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 687d7a0..0000000 --- a/RyzStudio/Windows/ThemedForms/TButton.designer.cs +++ /dev/null @@ -1,62 +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(142, 30); - this.label1.TabIndex = 0; - this.label1.Text = "label1"; - this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // - // TButton - // - this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.Controls.Add(this.label1); - this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); - this.Name = "TButton"; - this.Padding = new System.Windows.Forms.Padding(4, 4, 3, 3); - this.Size = new System.Drawing.Size(149, 37); - 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 f298a7b..0000000 --- a/RyzStudio/Windows/ThemedForms/TButton.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/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 23d11df..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.WindowsDefaultLocation; - 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 3f84e9c..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 = BookmarkManager.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 af75f87..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::BookmarkManager.UIResource.circle_menu2; - this.imageBox5.Image = global::BookmarkManager.UIResource.circle_menu; - this.imageBox5.ImageHover = global::BookmarkManager.UIResource.circle_menu2; - this.imageBox5.ImageNormal = global::BookmarkManager.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::BookmarkManager.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::BookmarkManager.UIResource.arrow_down2; - this.imageBox4.Image = global::BookmarkManager.UIResource.arrow_down; - this.imageBox4.ImageHover = global::BookmarkManager.UIResource.arrow_down2; - this.imageBox4.ImageNormal = global::BookmarkManager.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::BookmarkManager.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::BookmarkManager.UIResource.arrow_up2; - this.imageBox3.Image = global::BookmarkManager.UIResource.arrow_up; - this.imageBox3.ImageHover = global::BookmarkManager.UIResource.arrow_up2; - this.imageBox3.ImageNormal = global::BookmarkManager.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::BookmarkManager.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::BookmarkManager.UIResource.plus2; - this.imageBox1.Image = global::BookmarkManager.UIResource.plus; - this.imageBox1.ImageHover = global::BookmarkManager.UIResource.plus2; - this.imageBox1.ImageNormal = global::BookmarkManager.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::BookmarkManager.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::BookmarkManager.UIResource.edit2; - this.tImageBox1.Image = global::BookmarkManager.UIResource.edit; - this.tImageBox1.ImageHover = global::BookmarkManager.UIResource.edit2; - this.tImageBox1.ImageNormal = global::BookmarkManager.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::BookmarkManager.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/TMemoBox.cs b/RyzStudio/Windows/ThemedForms/TMemoBox.cs deleted file mode 100644 index cc2b320..0000000 --- a/RyzStudio/Windows/ThemedForms/TMemoBox.cs +++ /dev/null @@ -1,59 +0,0 @@ -namespace RyzStudio.Windows.ThemedForms -{ - using RyzStudio.Drawing; - using System; - using System.ComponentModel; - using System.Drawing; - using System.Windows.Forms; - - public partial class TMemoBox : RyzStudio.Windows.ThemedForms.TUserControl - { - protected readonly Padding textboxPadding = new Padding(6, 6, 0, 6); - - public TMemoBox() : base() - { - InitializeComponent(); - - this.Margin = new Padding(10, 6, 10, 6); - } - - //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); - //} - - protected override void OnGotFocus(EventArgs e) - { - base.OnGotFocus(e); - - textBox1.Focus(); - } - - [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; } - - [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/TMemoBox.designer.cs b/RyzStudio/Windows/ThemedForms/TMemoBox.designer.cs deleted file mode 100644 index 52800af..0000000 --- a/RyzStudio/Windows/ThemedForms/TMemoBox.designer.cs +++ /dev/null @@ -1,63 +0,0 @@ -namespace RyzStudio.Windows.ThemedForms -{ - partial class TMemoBox - { - /// - /// 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.AcceptsReturn = true; - 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.Multiline = true; - this.textBox1.Name = "textBox1"; - this.textBox1.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; - this.textBox1.Size = new System.Drawing.Size(121, 25); - this.textBox1.TabIndex = 0; - // - // MemoBox - // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; - this.Controls.Add(this.textBox1); - this.Name = "MemoBox"; - 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/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/TProgressBar.cs b/RyzStudio/Windows/ThemedForms/TProgressBar.cs deleted file mode 100644 index d30a566..0000000 --- a/RyzStudio/Windows/ThemedForms/TProgressBar.cs +++ /dev/null @@ -1,50 +0,0 @@ -using RyzStudio.Drawing; -using System; -using System.ComponentModel; -using System.Drawing; -using System.Windows.Forms; - -namespace RyzStudio.Windows.ThemedForms -{ - public partial class TProgressBar : RyzStudio.Windows.ThemedForms.TUserControl - { - protected readonly Padding textboxPadding = new Padding(2, 2, 2, 2); - - - public TProgressBar() : base() - { - InitializeComponent(); - - this.Margin = new Padding(10, 6, 10, 6); - this.Font = new Font(this.Font, FontStyle.Regular); - - customProgressBar1.Font = this.Font; - } - - protected override void OnResize(EventArgs e) - { - base.OnResize(e); - - this.Invalidate(); - } - - [Browsable(true), EditorBrowsable(EditorBrowsableState.Advanced)] - [Category("Appearance")] - public RyzStudio.Windows.Forms.TCustomProgressBar InnerControl { get => customProgressBar1; set => customProgressBar1 = value; } - - [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/TProgressBar.designer.cs b/RyzStudio/Windows/ThemedForms/TProgressBar.designer.cs deleted file mode 100644 index a1bc39f..0000000 --- a/RyzStudio/Windows/ThemedForms/TProgressBar.designer.cs +++ /dev/null @@ -1,65 +0,0 @@ -namespace RyzStudio.Windows.ThemedForms -{ - partial class TProgressBar - { - /// - /// 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.customProgressBar1 = new RyzStudio.Windows.Forms.TCustomProgressBar(); - this.SuspendLayout(); - // - // customProgressBar1 - // - this.customProgressBar1.AutoScrollMargin = new System.Drawing.Size(0, 0); - this.customProgressBar1.AutoScrollMinSize = new System.Drawing.Size(0, 0); - this.customProgressBar1.BarColour = System.Drawing.Color.FromArgb(((int)(((byte)(158)))), ((int)(((byte)(225)))), ((int)(((byte)(249))))); - this.customProgressBar1.BarTextColour = System.Drawing.SystemColors.ControlText; - this.customProgressBar1.Dock = System.Windows.Forms.DockStyle.Fill; - this.customProgressBar1.Location = new System.Drawing.Point(4, 4); - this.customProgressBar1.Margin = new System.Windows.Forms.Padding(0); - this.customProgressBar1.Maximum = 100; - this.customProgressBar1.Minimum = 0; - this.customProgressBar1.Name = "customProgressBar1"; - this.customProgressBar1.Size = new System.Drawing.Size(121, 25); - this.customProgressBar1.TabIndex = 0; - this.customProgressBar1.Value = 50; - // - // TProgressBar - // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; - this.Controls.Add(this.customProgressBar1); - this.Name = "TProgressBar"; - this.Padding = new System.Windows.Forms.Padding(4, 4, 3, 3); - this.Size = new System.Drawing.Size(128, 32); - this.ResumeLayout(false); - - } - - #endregion - - private Forms.TCustomProgressBar customProgressBar1; - } -} diff --git a/RyzStudio/Windows/ThemedForms/TProgressBar.resx b/RyzStudio/Windows/ThemedForms/TProgressBar.resx deleted file mode 100644 index f298a7b..0000000 --- a/RyzStudio/Windows/ThemedForms/TProgressBar.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 9f8f168..0000000 --- a/RyzStudio/Windows/ThemedForms/TextBox/TButtonTextBox.cs +++ /dev/null @@ -1,139 +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.MouseClick += imageBox1_MouseClick; - - OnResize(null); - } - - protected virtual void imageBox1_MouseClick(object sender, MouseEventArgs e) - { - if (e.Button == MouseButtons.Left) - { - OnButtonClick?.Invoke(sender, e); - } - } - - 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; - } - } - - [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; } - - - public void SetTooltipText(ToolTip toolTip, string text) - { - toolTip.SetToolTip(imageBox1, text); - } - - 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 dbf3830..0000000 --- a/RyzStudio/Windows/ThemedForms/TextBox/TFolderTextBox.cs +++ /dev/null @@ -1,46 +0,0 @@ -using System.IO; -using System.Windows.Forms; -using UIResources = BookmarkManager.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_MouseClick(object sender, MouseEventArgs e) - { - if (e.Button != MouseButtons.Left) - { - return; - } - - 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 aae9cbb..0000000 --- a/RyzStudio/Windows/ThemedForms/TextBox/TKeyCodeTextBox.cs +++ /dev/null @@ -1,96 +0,0 @@ -using System.Text; -using System.Windows.Forms; -using UIResources = BookmarkManager.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_MouseClick(object sender, MouseEventArgs e) - { - if (e.Button != MouseButtons.Left) - { - return; - } - - 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 8189c51..0000000 --- a/RyzStudio/Windows/ThemedForms/TextBox/TOpenFileTextBox.cs +++ /dev/null @@ -1,48 +0,0 @@ -using System; -using System.IO; -using System.Windows.Forms; -using UIResources = BookmarkManager.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_MouseClick(object sender, MouseEventArgs e) - { - if (e.Button != MouseButtons.Left) - { - return; - } - - 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/UIResource.Designer.cs b/UIResource.Designer.cs deleted file mode 100644 index a7410f8..0000000 --- a/UIResource.Designer.cs +++ /dev/null @@ -1,323 +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 BookmarkManager { - 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("BookmarkManager.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 search { - get { - object obj = ResourceManager.GetObject("search", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap search2 { - get { - object obj = ResourceManager.GetObject("search2", 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 ba6986d..0000000 --- a/UIResource.resx +++ /dev/null @@ -1,199 +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\search.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - Resources\UI\search2.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/installer-64.iss b/installer-64.iss index e3b5a73..a08e9d8 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 "Bookmark Manager" -#define MyAppVersion "0.4.1.006" +#define MyAppVersion "0.4.2.008" #define MyAppPublisher "Hi, I'm Ray" #define MyAppURL "https://www.hiimray.co.uk/software-bookmark-manager" #define MyAppExeName "bookmarkmanager.exe" diff --git a/installer-86.iss b/installer-86.iss index f902026..7ea977f 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 "Bookmark Manager" -#define MyAppVersion "0.4.1.006" +#define MyAppVersion "0.4.2.008" #define MyAppPublisher "Hi, I'm Ray" #define MyAppURL "https://www.hiimray.co.uk/software-bookmark-manager" #define MyAppExeName "bookmarkmanager.exe"