From 7ca11d9cfafb173b1dfea5dd5030bd5f8ca83fe2 Mon Sep 17 00:00:00 2001 From: Taiizor Date: Fri, 16 Apr 2021 23:01:49 +0300 Subject: [PATCH] 53X Again 44! --- .screenshots/Witcher_WF_CR.png | Bin 8769 -> 9403 bytes src/Witcher.WF/Notify/Standard/WF.Designer.cs | 6 +- src/Witcher.WF/Notify/Standard/WF.cs | 54 ++++++++------- src/Witcher.WF/Notify/Standard/WF.resx | 30 ++++----- src/Witcher.WF/Struct/Structs.cs | 12 ++++ src/Witcher.WF/Witcher.WF.cs | 3 + src/Witcher.WF/Witcher.WF.csproj | 4 ++ src/Witcher.WPF/Notify/Standard/WPF.xaml | 3 +- src/Witcher.WPF/Notify/Standard/WPF.xaml.cs | 32 ++++++--- src/Witcher.WPF/Struct/Structs.cs | 12 ++++ src/Witcher.WPF/Witcher.WPF.csproj | 4 ++ src/Witcher.sln | 12 +++- src/Witcher_WF_CR/Main.Designer.cs | 63 ++++++++++++++++-- src/Witcher_WF_CR/Main.cs | 31 +++++++++ src/Witcher_WPF_CR/App.xaml | 2 +- .../{MainWindow.xaml => Main.xaml} | 2 +- .../{MainWindow.xaml.cs => Main.xaml.cs} | 8 ++- 17 files changed, 214 insertions(+), 64 deletions(-) rename src/Witcher_WPF_CR/{MainWindow.xaml => Main.xaml} (96%) rename src/Witcher_WPF_CR/{MainWindow.xaml.cs => Main.xaml.cs} (89%) diff --git a/.screenshots/Witcher_WF_CR.png b/.screenshots/Witcher_WF_CR.png index 65d119d32606faae01d934ea9f3aa1a81995fc30..436600120848c7d4781464579e0d43175caa5bfe 100644 GIT binary patch literal 9403 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 H9`b(xK{9V9 diff --git a/src/Witcher.WF/Notify/Standard/WF.Designer.cs b/src/Witcher.WF/Notify/Standard/WF.Designer.cs index 4f9fe3c..6e285ee 100644 --- a/src/Witcher.WF/Notify/Standard/WF.Designer.cs +++ b/src/Witcher.WF/Notify/Standard/WF.Designer.cs @@ -29,7 +29,6 @@ protected override void Dispose(bool disposing) private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(WitcherStandardWF)); this.LEFT = new System.Windows.Forms.Panel(); this.CLOSE = new System.Windows.Forms.PictureBox(); this.TEXT = new System.Windows.Forms.Label(); @@ -79,7 +78,7 @@ private void InitializeComponent() this.TEXT.Location = new System.Drawing.Point(26, 0); this.TEXT.Margin = new System.Windows.Forms.Padding(0); this.TEXT.Name = "TEXT"; - this.TEXT.Size = new System.Drawing.Size(374, 60); + this.TEXT.Size = new System.Drawing.Size(374, 58); this.TEXT.TabIndex = 7; this.TEXT.Text = "My Name Is Soferity Witcher WF Sweetheart!"; this.TEXT.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -119,13 +118,14 @@ private void InitializeComponent() this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(38)))), ((int)(((byte)(38)))), ((int)(((byte)(38))))); this.ClientSize = new System.Drawing.Size(400, 60); this.ControlBox = false; - this.Controls.Add(this.PANEL); this.Controls.Add(this.TEXT); + this.Controls.Add(this.PANEL); this.Controls.Add(this.LEFT); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; this.Icon = global::Witcher.WF.Properties.Resources.ICO; this.MaximizeBox = false; this.MinimizeBox = false; + this.MinimumSize = new System.Drawing.Size(200, 40); this.Name = "WitcherStandardWF"; this.Opacity = 0D; this.ShowInTaskbar = false; diff --git a/src/Witcher.WF/Notify/Standard/WF.cs b/src/Witcher.WF/Notify/Standard/WF.cs index 91b7d1f..87f9b94 100644 --- a/src/Witcher.WF/Notify/Standard/WF.cs +++ b/src/Witcher.WF/Notify/Standard/WF.cs @@ -27,7 +27,7 @@ public partial class WitcherStandardWF : Form private StateType Stage = StateType.Show; private bool Exit = true; - private double Value = 0; + private double Value; public WitcherStandardWF(Structs.Data Data) { @@ -42,6 +42,11 @@ public WitcherStandardWF(Structs.Data Data) TEXT.Text = Local.Text; TEXT.Font = Local.Font; + Width = Local.Size.Width; + Height = Local.Size.Height; + + PANEL.Visible = Local.Close; + if (Local.Theme == ThemeType.Dark || Local.Theme == ThemeType.Light) { if (Local.Theme == ThemeType.Dark) @@ -203,34 +208,37 @@ private void General_Tick(object sender, EventArgs e) case StateType.Close: if (Text == NotifyName + "0") { - if (Local.Location == EdgeLocationType.BotRight || Local.Location == EdgeLocationType.TopRight || Local.Location == EdgeLocationType.RightCenter || Local.Location == EdgeLocationType.FullCenter) + if (Local.Close) { - Value += PANEL.Width / (Local.Time / General.Interval); - - if (PANEL.Width > Convert.ToInt32(Value)) - { - BAR.Location = new(PANEL.Width - Convert.ToInt32(Value), 0); - BAR.Width = Convert.ToInt32(Value); - } - else + if (Local.Location == EdgeLocationType.BotRight || Local.Location == EdgeLocationType.TopRight || Local.Location == EdgeLocationType.RightCenter || Local.Location == EdgeLocationType.FullCenter) { - BAR.Location = new(0, 0); - BAR.Width = PANEL.Width; - CLOSE_Click(sender, e); - } - } - else - { - Value += PANEL.Width / (Local.Time / General.Interval); + Value += PANEL.Width / (Local.Time / General.Interval); - if (PANEL.Width > Convert.ToInt32(Value)) - { - BAR.Width = Convert.ToInt32(Value); + if (PANEL.Width > Convert.ToInt32(Value)) + { + BAR.Location = new(PANEL.Width - Convert.ToInt32(Value), 0); + BAR.Width = Convert.ToInt32(Value); + } + else + { + BAR.Location = new(0, 0); + BAR.Width = PANEL.Width; + CLOSE_Click(sender, e); + } } else { - BAR.Width = PANEL.Width; - CLOSE_Click(sender, e); + Value += PANEL.Width / (Local.Time / General.Interval); + + if (PANEL.Width > Convert.ToInt32(Value)) + { + BAR.Width = Convert.ToInt32(Value); + } + else + { + BAR.Width = PANEL.Width; + CLOSE_Click(sender, e); + } } } } diff --git a/src/Witcher.WF/Notify/Standard/WF.resx b/src/Witcher.WF/Notify/Standard/WF.resx index 2096e64..272a13c 100644 --- a/src/Witcher.WF/Notify/Standard/WF.resx +++ b/src/Witcher.WF/Notify/Standard/WF.resx @@ -117,27 +117,25 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - + True - - + + True - - + + True - - + + True - - - + + 17, 17 - - + + True - - + + True - + \ No newline at end of file diff --git a/src/Witcher.WF/Struct/Structs.cs b/src/Witcher.WF/Struct/Structs.cs index 3c32a0a..887c9ea 100644 --- a/src/Witcher.WF/Struct/Structs.cs +++ b/src/Witcher.WF/Struct/Structs.cs @@ -29,11 +29,23 @@ public struct Data public string Title; public string Text; public Font Font; + public Size Size; public bool Pause; + public bool Close; public bool Top; public int Time; } + /// + /// + /// + [StructLayout(LayoutKind.Sequential)] + public struct Size + { + public int Width; + public int Height; + } + /// /// /// diff --git a/src/Witcher.WF/Witcher.WF.cs b/src/Witcher.WF/Witcher.WF.cs index fd9079b..fe736d4 100644 --- a/src/Witcher.WF/Witcher.WF.cs +++ b/src/Witcher.WF/Witcher.WF.cs @@ -175,6 +175,9 @@ public static void Show(Structs.Data Data) case Enums.NotifyType.Standard: Show(new WitcherStandardWF(Data)); break; + case Enums.NotifyType.Beautiful: + //Show(new WitcherBeautifulWF(Data)); + break; } } else diff --git a/src/Witcher.WF/Witcher.WF.csproj b/src/Witcher.WF/Witcher.WF.csproj index d8e1058..2eb61c0 100644 --- a/src/Witcher.WF/Witcher.WF.csproj +++ b/src/Witcher.WF/Witcher.WF.csproj @@ -91,4 +91,8 @@ Changes are detailed at https://github.com/Soferity/Witcher/releases + + + + \ No newline at end of file diff --git a/src/Witcher.WPF/Notify/Standard/WPF.xaml b/src/Witcher.WPF/Notify/Standard/WPF.xaml index 781c3a6..a76b972 100644 --- a/src/Witcher.WPF/Notify/Standard/WPF.xaml +++ b/src/Witcher.WPF/Notify/Standard/WPF.xaml @@ -6,6 +6,7 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d" Height="60" Width="400" + MinHeight="40" MinWidth="200" Title="Witcher Standard WPF" WindowStartupLocation="Manual" ResizeMode="NoResize" WindowStyle="None" @@ -17,7 +18,7 @@ - + diff --git a/src/Witcher.WPF/Notify/Standard/WPF.xaml.cs b/src/Witcher.WPF/Notify/Standard/WPF.xaml.cs index dbe83cd..2c590b4 100644 --- a/src/Witcher.WPF/Notify/Standard/WPF.xaml.cs +++ b/src/Witcher.WPF/Notify/Standard/WPF.xaml.cs @@ -32,7 +32,7 @@ public partial class WitcherStandardWPF : Window private bool Exit = true; private bool Enabled = true; - private double Value = 0; + private double Value; private int Time = 50; public WitcherStandardWPF(Structs.Data Data) @@ -56,6 +56,15 @@ public WitcherStandardWPF(Structs.Data Data) TEXT.FontStyle = Local.Font.Style; TEXT.FontWeight = Local.Font.Weight; + Width = Local.Size.Width; + Height = Local.Size.Height; + + if (!Local.Close) + { + TOP.Height += 2; + PANEL.Visibility = Visibility.Hidden; + } + if (Local.Theme == ThemeType.Dark || Local.Theme == ThemeType.Light) { if (Local.Theme == ThemeType.Dark) @@ -250,16 +259,19 @@ private Task General_Tick() case StateType.Close: if (Title == NotifyName + "0") { - Value += PANEL.ActualWidth / (Local.Time / Time); - - if (PANEL.ActualWidth > Value) + if (Local.Close) { - BAR.Width = Value; - } - else - { - BAR.Width = PANEL.Width; - CLOSE_MouseLeftButtonUp(null, null); + Value += PANEL.ActualWidth / (Local.Time / Time); + + if (PANEL.ActualWidth > Value) + { + BAR.Width = Value; + } + else + { + BAR.Width = PANEL.Width; + CLOSE_MouseLeftButtonUp(null, null); + } } } break; diff --git a/src/Witcher.WPF/Struct/Structs.cs b/src/Witcher.WPF/Struct/Structs.cs index a0fb040..d5767fa 100644 --- a/src/Witcher.WPF/Struct/Structs.cs +++ b/src/Witcher.WPF/Struct/Structs.cs @@ -30,11 +30,23 @@ public struct Data public string Title; public string Text; public Font Font; + public Size Size; public bool Pause; + public bool Close; public bool Top; public int Time; } + /// + /// + /// + [StructLayout(LayoutKind.Sequential)] + public struct Size + { + public double Width; + public double Height; + } + /// /// /// diff --git a/src/Witcher.WPF/Witcher.WPF.csproj b/src/Witcher.WPF/Witcher.WPF.csproj index 8345542..a8d34fd 100644 --- a/src/Witcher.WPF/Witcher.WPF.csproj +++ b/src/Witcher.WPF/Witcher.WPF.csproj @@ -104,4 +104,8 @@ Changes are detailed at https://github.com/Soferity/Witcher/releases + + + + \ No newline at end of file diff --git a/src/Witcher.sln b/src/Witcher.sln index 74a93b6..c63b4c3 100644 --- a/src/Witcher.sln +++ b/src/Witcher.sln @@ -19,6 +19,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WPF", "WPF", "{188D1AD9-1AA EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Witcher_WPF_CR", "Witcher_WPF_CR\Witcher_WPF_CR.csproj", "{06647B67-C720-4DB1-92E9-DE559F4AD0A9}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Catcher", "Catcher", "{E0268EBA-276A-410F-8923-4EDB7FADF1F0}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WF", "WF", "{0883B4DC-C35D-43D4-95F1-DAA5E1B31D96}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WPF", "WPF", "{19191630-9A04-4EE4-BE48-D155AAEC3AB1}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -51,10 +57,12 @@ Global EndGlobalSection GlobalSection(NestedProjects) = preSolution {29781EE5-4D9A-47BE-8C4A-3D79F69B0948} = {1EAD3DCD-AA7E-4645-B949-8D26184F2BA1} - {CE3B27D5-4416-4E0D-82D8-5E5C316AE974} = {F19BB245-AE13-48FE-9A76-A8B11AECCDA1} + {CE3B27D5-4416-4E0D-82D8-5E5C316AE974} = {0883B4DC-C35D-43D4-95F1-DAA5E1B31D96} {2079D7B4-A998-4C78-8674-10E4330A027A} = {188D1AD9-1AAE-43CE-886F-E366C61FBEDE} {A844967C-9F1A-4659-8D39-CCF79310FD09} = {F19BB245-AE13-48FE-9A76-A8B11AECCDA1} - {06647B67-C720-4DB1-92E9-DE559F4AD0A9} = {188D1AD9-1AAE-43CE-886F-E366C61FBEDE} + {06647B67-C720-4DB1-92E9-DE559F4AD0A9} = {19191630-9A04-4EE4-BE48-D155AAEC3AB1} + {0883B4DC-C35D-43D4-95F1-DAA5E1B31D96} = {E0268EBA-276A-410F-8923-4EDB7FADF1F0} + {19191630-9A04-4EE4-BE48-D155AAEC3AB1} = {E0268EBA-276A-410F-8923-4EDB7FADF1F0} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {FE10105D-CE85-4315-A7F7-0BF056EFC5B7} diff --git a/src/Witcher_WF_CR/Main.Designer.cs b/src/Witcher_WF_CR/Main.Designer.cs index 08f7a43..41900b1 100644 --- a/src/Witcher_WF_CR/Main.Designer.cs +++ b/src/Witcher_WF_CR/Main.Designer.cs @@ -53,6 +53,9 @@ private void InitializeComponent() this.radioButton3 = new System.Windows.Forms.RadioButton(); this.checkBox1 = new System.Windows.Forms.CheckBox(); this.checkBox2 = new System.Windows.Forms.CheckBox(); + this.checkBox3 = new System.Windows.Forms.CheckBox(); + this.maskedTextBox4 = new System.Windows.Forms.MaskedTextBox(); + this.maskedTextBox5 = new System.Windows.Forms.MaskedTextBox(); this.statusStrip1.SuspendLayout(); this.SuspendLayout(); // @@ -159,7 +162,7 @@ private void InitializeComponent() "Right Center", "Calc Center", "Full Center"}); - this.comboBox1.Location = new System.Drawing.Point(169, 71); + this.comboBox1.Location = new System.Drawing.Point(169, 100); this.comboBox1.Name = "comboBox1"; this.comboBox1.Size = new System.Drawing.Size(90, 21); this.comboBox1.TabIndex = 7; @@ -187,7 +190,7 @@ private void InitializeComponent() this.comboBox2.Items.AddRange(new object[] { "Standard", "Beautiful"}); - this.comboBox2.Location = new System.Drawing.Point(169, 100); + this.comboBox2.Location = new System.Drawing.Point(169, 129); this.comboBox2.Name = "comboBox2"; this.comboBox2.Size = new System.Drawing.Size(90, 21); this.comboBox2.TabIndex = 9; @@ -214,6 +217,7 @@ private void InitializeComponent() this.textBox1.Name = "textBox1"; this.textBox1.Size = new System.Drawing.Size(247, 20); this.textBox1.TabIndex = 11; + this.textBox1.TabStop = false; this.textBox1.Text = "My Name Is Soferity Witcher WF Sweetheart!"; this.textBox1.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.textBox1.TextChanged += new System.EventHandler(this.TextBox1_TextChanged); @@ -258,7 +262,7 @@ private void InitializeComponent() // button5 // this.button5.Cursor = System.Windows.Forms.Cursors.Hand; - this.button5.Location = new System.Drawing.Point(101, 99); + this.button5.Location = new System.Drawing.Point(89, 128); this.button5.Name = "button5"; this.button5.Size = new System.Drawing.Size(55, 23); this.button5.TabIndex = 13; @@ -273,6 +277,7 @@ private void InitializeComponent() this.textBox2.Name = "textBox2"; this.textBox2.Size = new System.Drawing.Size(247, 20); this.textBox2.TabIndex = 14; + this.textBox2.TabStop = false; this.textBox2.Text = "Soferity Witcher WF"; this.textBox2.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.textBox2.TextChanged += new System.EventHandler(this.TextBox2_TextChanged); @@ -282,7 +287,7 @@ private void InitializeComponent() this.button6.Cursor = System.Windows.Forms.Cursors.Hand; this.button6.Location = new System.Drawing.Point(12, 128); this.button6.Name = "button6"; - this.button6.Size = new System.Drawing.Size(247, 23); + this.button6.Size = new System.Drawing.Size(75, 23); this.button6.TabIndex = 15; this.button6.TabStop = false; this.button6.Text = "Select Font"; @@ -310,6 +315,7 @@ private void InitializeComponent() this.checkBox1.Name = "checkBox1"; this.checkBox1.Size = new System.Drawing.Size(56, 17); this.checkBox1.TabIndex = 18; + this.checkBox1.TabStop = false; this.checkBox1.Text = "Pause"; this.checkBox1.UseVisualStyleBackColor = true; this.checkBox1.CheckedChanged += new System.EventHandler(this.CheckBox1_CheckedChanged); @@ -323,15 +329,61 @@ private void InitializeComponent() this.checkBox2.Name = "checkBox2"; this.checkBox2.Size = new System.Drawing.Size(68, 17); this.checkBox2.TabIndex = 19; + this.checkBox2.TabStop = false; this.checkBox2.Text = "TopMost"; this.checkBox2.UseVisualStyleBackColor = true; this.checkBox2.CheckedChanged += new System.EventHandler(this.CheckBox2_CheckedChanged); // + // checkBox3 + // + this.checkBox3.AutoSize = true; + this.checkBox3.Checked = true; + this.checkBox3.CheckState = System.Windows.Forms.CheckState.Checked; + this.checkBox3.Location = new System.Drawing.Point(96, 102); + this.checkBox3.Name = "checkBox3"; + this.checkBox3.Size = new System.Drawing.Size(52, 17); + this.checkBox3.TabIndex = 20; + this.checkBox3.TabStop = false; + this.checkBox3.Text = "Close"; + this.checkBox3.UseVisualStyleBackColor = true; + this.checkBox3.CheckedChanged += new System.EventHandler(this.CheckBox3_CheckedChanged); + // + // maskedTextBox4 + // + this.maskedTextBox4.BeepOnError = true; + this.maskedTextBox4.Location = new System.Drawing.Point(238, 71); + this.maskedTextBox4.Mask = "00"; + this.maskedTextBox4.Name = "maskedTextBox4"; + this.maskedTextBox4.Size = new System.Drawing.Size(21, 20); + this.maskedTextBox4.TabIndex = 21; + this.maskedTextBox4.TabStop = false; + this.maskedTextBox4.Text = "60"; + this.maskedTextBox4.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.maskedTextBox4.ValidatingType = typeof(int); + this.maskedTextBox4.TextChanged += new System.EventHandler(this.MaskedTextBox4_TextChanged); + // + // maskedTextBox5 + // + this.maskedTextBox5.BeepOnError = true; + this.maskedTextBox5.Location = new System.Drawing.Point(184, 71); + this.maskedTextBox5.Mask = "000"; + this.maskedTextBox5.Name = "maskedTextBox5"; + this.maskedTextBox5.Size = new System.Drawing.Size(48, 20); + this.maskedTextBox5.TabIndex = 22; + this.maskedTextBox5.TabStop = false; + this.maskedTextBox5.Text = "400"; + this.maskedTextBox5.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.maskedTextBox5.ValidatingType = typeof(int); + this.maskedTextBox5.TextChanged += new System.EventHandler(this.MaskedTextBox5_TextChanged); + // // Main // this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; this.ClientSize = new System.Drawing.Size(271, 237); + this.Controls.Add(this.maskedTextBox5); + this.Controls.Add(this.maskedTextBox4); + this.Controls.Add(this.checkBox3); this.Controls.Add(this.checkBox2); this.Controls.Add(this.checkBox1); this.Controls.Add(this.button4); @@ -391,5 +443,8 @@ private void InitializeComponent() private System.Windows.Forms.RadioButton radioButton3; private System.Windows.Forms.CheckBox checkBox1; private System.Windows.Forms.CheckBox checkBox2; + private System.Windows.Forms.CheckBox checkBox3; + private System.Windows.Forms.MaskedTextBox maskedTextBox4; + private System.Windows.Forms.MaskedTextBox maskedTextBox5; } } \ No newline at end of file diff --git a/src/Witcher_WF_CR/Main.cs b/src/Witcher_WF_CR/Main.cs index 9629fc6..7ee07c7 100644 --- a/src/Witcher_WF_CR/Main.cs +++ b/src/Witcher_WF_CR/Main.cs @@ -26,7 +26,9 @@ public partial class Main : Form Title = "Soferity Witcher WF", Text = "My Name Is Soferity Witcher WF Sweetheart!", Font = new Font("Raleway SemiBold", 12F, FontStyle.Bold, GraphicsUnit.Point, 162), + Size = new() { Width = 400, Height = 60 }, Pause = true, + Close = true, Top = true, Time = 5000 }; @@ -98,6 +100,30 @@ private void MaskedTextBox3_TextChanged(object sender, EventArgs e) } } + private void MaskedTextBox4_TextChanged(object sender, EventArgs e) + { + if (string.IsNullOrEmpty(maskedTextBox4.Text) || string.IsNullOrWhiteSpace(maskedTextBox4.Text)) + { + Data.Size.Height = 60; + } + else + { + Data.Size.Height = Convert.ToInt32(maskedTextBox4.Text); + } + } + + private void MaskedTextBox5_TextChanged(object sender, EventArgs e) + { + if (string.IsNullOrEmpty(maskedTextBox5.Text) || string.IsNullOrWhiteSpace(maskedTextBox5.Text)) + { + Data.Size.Width = 400; + } + else + { + Data.Size.Width = Convert.ToInt32(maskedTextBox5.Text); + } + } + private void Thema_CheckedChanged(object sender, EventArgs e) { RadioButton RB = sender as RadioButton; @@ -183,5 +209,10 @@ private void CheckBox2_CheckedChanged(object sender, EventArgs e) { Data.Top = checkBox2.Checked; } + + private void CheckBox3_CheckedChanged(object sender, EventArgs e) + { + Data.Close = checkBox3.Checked; + } } } \ No newline at end of file diff --git a/src/Witcher_WPF_CR/App.xaml b/src/Witcher_WPF_CR/App.xaml index 60ea8f5..683eae0 100644 --- a/src/Witcher_WPF_CR/App.xaml +++ b/src/Witcher_WPF_CR/App.xaml @@ -2,7 +2,7 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:local="clr-namespace:Witcher_WPF_CR" - StartupUri="MainWindow.xaml"> + StartupUri="Main.xaml"> diff --git a/src/Witcher_WPF_CR/MainWindow.xaml b/src/Witcher_WPF_CR/Main.xaml similarity index 96% rename from src/Witcher_WPF_CR/MainWindow.xaml rename to src/Witcher_WPF_CR/Main.xaml index 7f47d66..d60dd86 100644 --- a/src/Witcher_WPF_CR/MainWindow.xaml +++ b/src/Witcher_WPF_CR/Main.xaml @@ -1,4 +1,4 @@ -