diff --git a/Notepad/.vs/Notepad/v16/.suo b/Notepad/.vs/Notepad/v16/.suo index ede5ea9..846d985 100644 Binary files a/Notepad/.vs/Notepad/v16/.suo and b/Notepad/.vs/Notepad/v16/.suo differ diff --git a/Notepad/Notepad v2/App.config b/Notepad/Notepad v2/App.config index e278b98..b344b03 100644 --- a/Notepad/Notepad v2/App.config +++ b/Notepad/Notepad v2/App.config @@ -24,7 +24,10 @@ True - + Black + + + False diff --git a/Notepad/Notepad v2/Form1.Designer.cs b/Notepad/Notepad v2/Form1.Designer.cs index cd2ffb0..5d973f9 100644 --- a/Notepad/Notepad v2/Form1.Designer.cs +++ b/Notepad/Notepad v2/Form1.Designer.cs @@ -59,6 +59,11 @@ namespace Notatnik this.cofnijToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.przywrócToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); + this.nowyDokumentToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.zapiszToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.zapiszJakoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.otwórzToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); this.zmieńKolorTłaToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.zmieńKolorCzcionkiToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); @@ -66,6 +71,7 @@ namespace Notatnik this.kursywaToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.podkreślenieToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.updateSeparator = new System.Windows.Forms.ToolStripSeparator(); + this.informacjeOProgramieToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.updateToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog(); @@ -78,27 +84,27 @@ namespace Notatnik this.printPreviewDialog1 = new System.Windows.Forms.PrintPreviewDialog(); this.colorDialog1 = new System.Windows.Forms.ColorDialog(); this.colorDialog2 = new System.Windows.Forms.ColorDialog(); - this.informacjeOProgramieToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.drukujToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.panel3 = new System.Windows.Forms.Panel(); + this.button18 = new System.Windows.Forms.Button(); + this.button19 = new System.Windows.Forms.Button(); + this.zawijanieWierszyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.panel1.SuspendLayout(); this.contextMenuStrip1.SuspendLayout(); this.statusStrip1.SuspendLayout(); + this.panel3.SuspendLayout(); this.SuspendLayout(); // // panel1 // this.panel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(45)))), ((int)(((byte)(48))))); - this.panel1.Controls.Add(this.button15); - this.panel1.Controls.Add(this.button16); - this.panel1.Controls.Add(this.button17); - this.panel1.Controls.Add(this.button14); - this.panel1.Controls.Add(this.button13); + this.panel1.Controls.Add(this.button18); this.panel1.Controls.Add(this.button12); this.panel1.Controls.Add(this.button11); this.panel1.Controls.Add(this.button10); this.panel1.Controls.Add(this.button9); this.panel1.Controls.Add(this.button8); this.panel1.Controls.Add(this.button7); - this.panel1.Controls.Add(this.button6); this.panel1.Controls.Add(this.button5); this.panel1.Controls.Add(this.button4); this.panel1.Controls.Add(this.button3); @@ -107,19 +113,18 @@ namespace Notatnik this.panel1.Dock = System.Windows.Forms.DockStyle.Left; this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(44, 639); + this.panel1.Size = new System.Drawing.Size(44, 439); this.panel1.TabIndex = 0; // // button15 // - this.button15.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.button15.FlatAppearance.BorderSize = 0; this.button15.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Transparent; this.button15.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; this.button15.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.button15.Font = new System.Drawing.Font("Segoe MDL2 Assets", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.button15.ForeColor = System.Drawing.Color.White; - this.button15.Location = new System.Drawing.Point(5, 481); + this.button15.Location = new System.Drawing.Point(72, 0); this.button15.Margin = new System.Windows.Forms.Padding(0); this.button15.Name = "button15"; this.button15.Size = new System.Drawing.Size(36, 36); @@ -129,17 +134,18 @@ namespace Notatnik this.toolTip1.SetToolTip(this.button15, "Podkreślenie"); this.button15.UseVisualStyleBackColor = true; this.button15.Click += new System.EventHandler(this.button15_Click); + this.button15.MouseEnter += new System.EventHandler(this.button15_MouseEnter); + this.button15.MouseLeave += new System.EventHandler(this.button15_MouseLeave); // // button16 // - this.button16.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.button16.FlatAppearance.BorderSize = 0; this.button16.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Transparent; this.button16.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; this.button16.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.button16.Font = new System.Drawing.Font("Segoe MDL2 Assets", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.button16.ForeColor = System.Drawing.Color.White; - this.button16.Location = new System.Drawing.Point(5, 445); + this.button16.Location = new System.Drawing.Point(36, 0); this.button16.Margin = new System.Windows.Forms.Padding(0); this.button16.Name = "button16"; this.button16.Size = new System.Drawing.Size(36, 36); @@ -149,17 +155,18 @@ namespace Notatnik this.toolTip1.SetToolTip(this.button16, "Kursywa"); this.button16.UseVisualStyleBackColor = true; this.button16.Click += new System.EventHandler(this.button16_Click); + this.button16.MouseEnter += new System.EventHandler(this.button16_MouseEnter); + this.button16.MouseLeave += new System.EventHandler(this.button16_MouseLeave); // // button17 // - this.button17.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.button17.FlatAppearance.BorderSize = 0; this.button17.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Transparent; this.button17.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; this.button17.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.button17.Font = new System.Drawing.Font("Segoe MDL2 Assets", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.button17.ForeColor = System.Drawing.Color.White; - this.button17.Location = new System.Drawing.Point(5, 409); + this.button17.Location = new System.Drawing.Point(0, 0); this.button17.Margin = new System.Windows.Forms.Padding(0); this.button17.Name = "button17"; this.button17.Size = new System.Drawing.Size(36, 36); @@ -169,17 +176,18 @@ namespace Notatnik this.toolTip1.SetToolTip(this.button17, "Pobrugienie"); this.button17.UseVisualStyleBackColor = true; this.button17.Click += new System.EventHandler(this.button17_Click); + this.button17.MouseEnter += new System.EventHandler(this.button17_MouseEnter); + this.button17.MouseLeave += new System.EventHandler(this.button17_MouseLeave); // // button14 // - this.button14.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.button14.FlatAppearance.BorderSize = 0; this.button14.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Transparent; this.button14.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; this.button14.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.button14.Font = new System.Drawing.Font("Segoe MDL2 Assets", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.button14.ForeColor = System.Drawing.Color.White; - this.button14.Location = new System.Drawing.Point(4, 529); + this.button14.Location = new System.Drawing.Point(108, 0); this.button14.Margin = new System.Windows.Forms.Padding(0); this.button14.Name = "button14"; this.button14.Size = new System.Drawing.Size(36, 36); @@ -194,14 +202,13 @@ namespace Notatnik // // button13 // - this.button13.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.button13.FlatAppearance.BorderSize = 0; this.button13.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Transparent; this.button13.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; this.button13.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.button13.Font = new System.Drawing.Font("Segoe MDL2 Assets", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.button13.ForeColor = System.Drawing.Color.White; - this.button13.Location = new System.Drawing.Point(4, 565); + this.button13.Location = new System.Drawing.Point(144, 0); this.button13.Margin = new System.Windows.Forms.Padding(0); this.button13.Name = "button13"; this.button13.Size = new System.Drawing.Size(36, 36); @@ -344,14 +351,13 @@ namespace Notatnik // // button6 // - this.button6.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.button6.FlatAppearance.BorderSize = 0; this.button6.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Transparent; this.button6.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; this.button6.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.button6.Font = new System.Drawing.Font("Segoe MDL2 Assets", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.button6.ForeColor = System.Drawing.Color.White; - this.button6.Location = new System.Drawing.Point(4, 601); + this.button6.Location = new System.Drawing.Point(180, 0); this.button6.Margin = new System.Windows.Forms.Padding(0); this.button6.Name = "button6"; this.button6.Size = new System.Drawing.Size(36, 36); @@ -475,7 +481,7 @@ namespace Notatnik this.panel2.Dock = System.Windows.Forms.DockStyle.Top; this.panel2.Location = new System.Drawing.Point(44, 0); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(984, 10); + this.panel2.Size = new System.Drawing.Size(740, 10); this.panel2.TabIndex = 1; // // richTextBox1 @@ -490,11 +496,12 @@ namespace Notatnik this.richTextBox1.ForeColor = System.Drawing.Color.Black; this.richTextBox1.Location = new System.Drawing.Point(44, 10); this.richTextBox1.Name = "richTextBox1"; - this.richTextBox1.ScrollBars = System.Windows.Forms.RichTextBoxScrollBars.ForcedVertical; + this.richTextBox1.ScrollBars = System.Windows.Forms.RichTextBoxScrollBars.ForcedBoth; this.richTextBox1.ShowSelectionMargin = true; - this.richTextBox1.Size = new System.Drawing.Size(984, 629); + this.richTextBox1.Size = new System.Drawing.Size(740, 429); this.richTextBox1.TabIndex = 2; this.richTextBox1.Text = ""; + this.richTextBox1.WordWrap = false; this.richTextBox1.SelectionChanged += new System.EventHandler(this.richTextBox1_SelectionChanged); this.richTextBox1.TextChanged += new System.EventHandler(this.richTextBox1_TextChanged); // @@ -508,6 +515,13 @@ namespace Notatnik this.cofnijToolStripMenuItem, this.przywrócToolStripMenuItem, this.toolStripSeparator2, + this.nowyDokumentToolStripMenuItem, + this.zapiszToolStripMenuItem, + this.zapiszJakoToolStripMenuItem, + this.otwórzToolStripMenuItem, + this.drukujToolStripMenuItem, + this.toolStripSeparator4, + this.zawijanieWierszyToolStripMenuItem, this.zmieńKolorTłaToolStripMenuItem, this.zmieńKolorCzcionkiToolStripMenuItem, this.toolStripSeparator3, @@ -518,13 +532,13 @@ namespace Notatnik this.informacjeOProgramieToolStripMenuItem, this.updateToolStripMenuItem}); this.contextMenuStrip1.Name = "contextMenuStrip1"; - this.contextMenuStrip1.Size = new System.Drawing.Size(200, 314); + this.contextMenuStrip1.Size = new System.Drawing.Size(214, 452); // // kopiujToolStripMenuItem // this.kopiujToolStripMenuItem.Name = "kopiujToolStripMenuItem"; this.kopiujToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.C))); - this.kopiujToolStripMenuItem.Size = new System.Drawing.Size(199, 22); + this.kopiujToolStripMenuItem.Size = new System.Drawing.Size(213, 22); this.kopiujToolStripMenuItem.Text = "Kopiuj"; this.kopiujToolStripMenuItem.Click += new System.EventHandler(this.kopiujToolStripMenuItem_Click); // @@ -532,7 +546,7 @@ namespace Notatnik // this.wytnijToolStripMenuItem.Name = "wytnijToolStripMenuItem"; this.wytnijToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.X))); - this.wytnijToolStripMenuItem.Size = new System.Drawing.Size(199, 22); + this.wytnijToolStripMenuItem.Size = new System.Drawing.Size(213, 22); this.wytnijToolStripMenuItem.Text = "Wytnij"; this.wytnijToolStripMenuItem.Click += new System.EventHandler(this.wytnijToolStripMenuItem_Click); // @@ -540,20 +554,20 @@ namespace Notatnik // this.wklejToolStripMenuItem.Name = "wklejToolStripMenuItem"; this.wklejToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.V))); - this.wklejToolStripMenuItem.Size = new System.Drawing.Size(199, 22); + this.wklejToolStripMenuItem.Size = new System.Drawing.Size(213, 22); this.wklejToolStripMenuItem.Text = "Wklej"; this.wklejToolStripMenuItem.Click += new System.EventHandler(this.wklejToolStripMenuItem_Click); // // toolStripSeparator1 // this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(196, 6); + this.toolStripSeparator1.Size = new System.Drawing.Size(210, 6); // // cofnijToolStripMenuItem // this.cofnijToolStripMenuItem.Name = "cofnijToolStripMenuItem"; this.cofnijToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Z))); - this.cofnijToolStripMenuItem.Size = new System.Drawing.Size(199, 22); + this.cofnijToolStripMenuItem.Size = new System.Drawing.Size(213, 22); this.cofnijToolStripMenuItem.Text = "Cofnij"; this.cofnijToolStripMenuItem.Click += new System.EventHandler(this.cofnijToolStripMenuItem_Click); // @@ -561,39 +575,77 @@ namespace Notatnik // this.przywrócToolStripMenuItem.Name = "przywrócToolStripMenuItem"; this.przywrócToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Y))); - this.przywrócToolStripMenuItem.Size = new System.Drawing.Size(199, 22); + this.przywrócToolStripMenuItem.Size = new System.Drawing.Size(213, 22); this.przywrócToolStripMenuItem.Text = "Przywróć"; this.przywrócToolStripMenuItem.Click += new System.EventHandler(this.przywrócToolStripMenuItem_Click); // // toolStripSeparator2 // this.toolStripSeparator2.Name = "toolStripSeparator2"; - this.toolStripSeparator2.Size = new System.Drawing.Size(196, 6); + this.toolStripSeparator2.Size = new System.Drawing.Size(210, 6); + // + // nowyDokumentToolStripMenuItem + // + this.nowyDokumentToolStripMenuItem.Name = "nowyDokumentToolStripMenuItem"; + this.nowyDokumentToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.N))); + this.nowyDokumentToolStripMenuItem.Size = new System.Drawing.Size(213, 22); + this.nowyDokumentToolStripMenuItem.Text = "Nowy dokument"; + this.nowyDokumentToolStripMenuItem.Click += new System.EventHandler(this.nowyDokumentToolStripMenuItem_Click); + // + // zapiszToolStripMenuItem + // + this.zapiszToolStripMenuItem.Name = "zapiszToolStripMenuItem"; + this.zapiszToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S))); + this.zapiszToolStripMenuItem.Size = new System.Drawing.Size(213, 22); + this.zapiszToolStripMenuItem.Text = "Zapisz"; + this.zapiszToolStripMenuItem.Click += new System.EventHandler(this.zapiszToolStripMenuItem_Click); + // + // zapiszJakoToolStripMenuItem + // + this.zapiszJakoToolStripMenuItem.Name = "zapiszJakoToolStripMenuItem"; + this.zapiszJakoToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) + | System.Windows.Forms.Keys.S))); + this.zapiszJakoToolStripMenuItem.Size = new System.Drawing.Size(213, 22); + this.zapiszJakoToolStripMenuItem.Text = "Zapisz jako..."; + this.zapiszJakoToolStripMenuItem.Click += new System.EventHandler(this.zapiszJakoToolStripMenuItem_Click); + // + // otwórzToolStripMenuItem + // + this.otwórzToolStripMenuItem.Name = "otwórzToolStripMenuItem"; + this.otwórzToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O))); + this.otwórzToolStripMenuItem.Size = new System.Drawing.Size(213, 22); + this.otwórzToolStripMenuItem.Text = "Otwórz"; + this.otwórzToolStripMenuItem.Click += new System.EventHandler(this.otwórzToolStripMenuItem_Click); + // + // toolStripSeparator4 + // + this.toolStripSeparator4.Name = "toolStripSeparator4"; + this.toolStripSeparator4.Size = new System.Drawing.Size(210, 6); // // zmieńKolorTłaToolStripMenuItem // this.zmieńKolorTłaToolStripMenuItem.Name = "zmieńKolorTłaToolStripMenuItem"; - this.zmieńKolorTłaToolStripMenuItem.Size = new System.Drawing.Size(199, 22); + this.zmieńKolorTłaToolStripMenuItem.Size = new System.Drawing.Size(213, 22); this.zmieńKolorTłaToolStripMenuItem.Text = "Zmień kolor tła"; this.zmieńKolorTłaToolStripMenuItem.Click += new System.EventHandler(this.zmieńKolorTłaToolStripMenuItem_Click); // // zmieńKolorCzcionkiToolStripMenuItem // this.zmieńKolorCzcionkiToolStripMenuItem.Name = "zmieńKolorCzcionkiToolStripMenuItem"; - this.zmieńKolorCzcionkiToolStripMenuItem.Size = new System.Drawing.Size(199, 22); + this.zmieńKolorCzcionkiToolStripMenuItem.Size = new System.Drawing.Size(213, 22); this.zmieńKolorCzcionkiToolStripMenuItem.Text = "Zmień kolor czcionki"; this.zmieńKolorCzcionkiToolStripMenuItem.Click += new System.EventHandler(this.zmieńKolorCzcionkiToolStripMenuItem_Click); // // toolStripSeparator3 // this.toolStripSeparator3.Name = "toolStripSeparator3"; - this.toolStripSeparator3.Size = new System.Drawing.Size(196, 6); + this.toolStripSeparator3.Size = new System.Drawing.Size(210, 6); // // pogrubienieToolStripMenuItem // this.pogrubienieToolStripMenuItem.Name = "pogrubienieToolStripMenuItem"; this.pogrubienieToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.B))); - this.pogrubienieToolStripMenuItem.Size = new System.Drawing.Size(199, 22); + this.pogrubienieToolStripMenuItem.Size = new System.Drawing.Size(213, 22); this.pogrubienieToolStripMenuItem.Text = "Pogrubienie"; this.pogrubienieToolStripMenuItem.Click += new System.EventHandler(this.pogrubienieToolStripMenuItem_Click); // @@ -601,7 +653,7 @@ namespace Notatnik // this.kursywaToolStripMenuItem.Name = "kursywaToolStripMenuItem"; this.kursywaToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.I))); - this.kursywaToolStripMenuItem.Size = new System.Drawing.Size(199, 22); + this.kursywaToolStripMenuItem.Size = new System.Drawing.Size(213, 22); this.kursywaToolStripMenuItem.Text = "Kursywa"; this.kursywaToolStripMenuItem.Click += new System.EventHandler(this.kursywaToolStripMenuItem_Click); // @@ -609,20 +661,27 @@ namespace Notatnik // this.podkreślenieToolStripMenuItem.Name = "podkreślenieToolStripMenuItem"; this.podkreślenieToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.U))); - this.podkreślenieToolStripMenuItem.Size = new System.Drawing.Size(199, 22); + this.podkreślenieToolStripMenuItem.Size = new System.Drawing.Size(213, 22); this.podkreślenieToolStripMenuItem.Text = "Podkreślenie"; this.podkreślenieToolStripMenuItem.Click += new System.EventHandler(this.podkreślenieToolStripMenuItem_Click); // // updateSeparator // this.updateSeparator.Name = "updateSeparator"; - this.updateSeparator.Size = new System.Drawing.Size(196, 6); + this.updateSeparator.Size = new System.Drawing.Size(210, 6); + // + // informacjeOProgramieToolStripMenuItem + // + this.informacjeOProgramieToolStripMenuItem.Name = "informacjeOProgramieToolStripMenuItem"; + this.informacjeOProgramieToolStripMenuItem.Size = new System.Drawing.Size(213, 22); + this.informacjeOProgramieToolStripMenuItem.Text = "Informacje o programie"; + this.informacjeOProgramieToolStripMenuItem.Click += new System.EventHandler(this.informacjeOProgramieToolStripMenuItem_Click); // // updateToolStripMenuItem // this.updateToolStripMenuItem.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold); this.updateToolStripMenuItem.Name = "updateToolStripMenuItem"; - this.updateToolStripMenuItem.Size = new System.Drawing.Size(199, 22); + this.updateToolStripMenuItem.Size = new System.Drawing.Size(213, 22); this.updateToolStripMenuItem.Text = "Update!"; this.updateToolStripMenuItem.Visible = false; this.updateToolStripMenuItem.Click += new System.EventHandler(this.updateToolStripMenuItem_Click); @@ -647,9 +706,9 @@ namespace Notatnik this.statusStrip1.Font = new System.Drawing.Font("Calibri", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.toolStripStatusLabel1}); - this.statusStrip1.Location = new System.Drawing.Point(0, 639); + this.statusStrip1.Location = new System.Drawing.Point(0, 439); this.statusStrip1.Name = "statusStrip1"; - this.statusStrip1.Size = new System.Drawing.Size(1028, 22); + this.statusStrip1.Size = new System.Drawing.Size(784, 22); this.statusStrip1.SizingGrip = false; this.statusStrip1.TabIndex = 3; this.statusStrip1.Text = "statusStrip1"; @@ -685,26 +744,95 @@ namespace Notatnik this.printPreviewDialog1.Name = "printPreviewDialog1"; this.printPreviewDialog1.Visible = false; // - // informacjeOProgramieToolStripMenuItem + // drukujToolStripMenuItem // - this.informacjeOProgramieToolStripMenuItem.Name = "informacjeOProgramieToolStripMenuItem"; - this.informacjeOProgramieToolStripMenuItem.Size = new System.Drawing.Size(199, 22); - this.informacjeOProgramieToolStripMenuItem.Text = "Informacje o programie"; - this.informacjeOProgramieToolStripMenuItem.Click += new System.EventHandler(this.informacjeOProgramieToolStripMenuItem_Click); + this.drukujToolStripMenuItem.Name = "drukujToolStripMenuItem"; + this.drukujToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.P))); + this.drukujToolStripMenuItem.Size = new System.Drawing.Size(213, 22); + this.drukujToolStripMenuItem.Text = "Drukuj"; + this.drukujToolStripMenuItem.Click += new System.EventHandler(this.drukujToolStripMenuItem_Click); + // + // panel3 + // + this.panel3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.panel3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(45)))), ((int)(((byte)(48))))); + this.panel3.Controls.Add(this.button19); + this.panel3.Controls.Add(this.button13); + this.panel3.Controls.Add(this.button14); + this.panel3.Controls.Add(this.button15); + this.panel3.Controls.Add(this.button17); + this.panel3.Controls.Add(this.button16); + this.panel3.Controls.Add(this.button6); + this.panel3.Location = new System.Drawing.Point(44, 386); + this.panel3.Name = "panel3"; + this.panel3.Size = new System.Drawing.Size(288, 36); + this.panel3.TabIndex = 4; + this.panel3.Visible = false; + // + // button18 + // + this.button18.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.button18.FlatAppearance.BorderSize = 0; + this.button18.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Transparent; + this.button18.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; + this.button18.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.button18.Font = new System.Drawing.Font("Segoe MDL2 Assets", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.button18.ForeColor = System.Drawing.Color.White; + this.button18.Location = new System.Drawing.Point(4, 386); + this.button18.Margin = new System.Windows.Forms.Padding(0); + this.button18.Name = "button18"; + this.button18.Size = new System.Drawing.Size(36, 36); + this.button18.TabIndex = 20; + this.button18.Text = ""; + this.button18.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.toolTip1.SetToolTip(this.button18, "Modyfikowanie czcionki"); + this.button18.UseVisualStyleBackColor = true; + this.button18.Click += new System.EventHandler(this.button18_Click); + this.button18.MouseEnter += new System.EventHandler(this.button18_MouseEnter); + this.button18.MouseLeave += new System.EventHandler(this.button18_MouseLeave); + // + // button19 + // + this.button19.FlatAppearance.BorderSize = 0; + this.button19.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Transparent; + this.button19.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; + this.button19.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.button19.Font = new System.Drawing.Font("Segoe MDL2 Assets", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.button19.ForeColor = System.Drawing.Color.White; + this.button19.Location = new System.Drawing.Point(252, 0); + this.button19.Margin = new System.Windows.Forms.Padding(0); + this.button19.Name = "button19"; + this.button19.Size = new System.Drawing.Size(36, 36); + this.button19.TabIndex = 20; + this.button19.Text = ""; + this.button19.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.toolTip1.SetToolTip(this.button19, "Informacje o programie"); + this.button19.UseVisualStyleBackColor = true; + this.button19.Click += new System.EventHandler(this.button19_Click); + this.button19.MouseEnter += new System.EventHandler(this.button19_MouseEnter); + this.button19.MouseLeave += new System.EventHandler(this.button19_MouseLeave); + // + // zawijanieWierszyToolStripMenuItem + // + this.zawijanieWierszyToolStripMenuItem.Name = "zawijanieWierszyToolStripMenuItem"; + this.zawijanieWierszyToolStripMenuItem.Size = new System.Drawing.Size(213, 22); + this.zawijanieWierszyToolStripMenuItem.Text = "Zawijanie wierszy"; + this.zawijanieWierszyToolStripMenuItem.Click += new System.EventHandler(this.zawijanieWierszyToolStripMenuItem_Click); // // Form1 // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); - this.ClientSize = new System.Drawing.Size(1028, 661); + this.ClientSize = new System.Drawing.Size(784, 461); + this.Controls.Add(this.panel3); this.Controls.Add(this.richTextBox1); this.Controls.Add(this.panel2); this.Controls.Add(this.panel1); this.Controls.Add(this.statusStrip1); this.ForeColor = System.Drawing.Color.White; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.MinimumSize = new System.Drawing.Size(1044, 700); + this.MinimumSize = new System.Drawing.Size(800, 500); this.Name = "Form1"; this.Text = "Bez tytułu - Notatnik"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Form1_FormClosing); @@ -714,6 +842,7 @@ namespace Notatnik this.contextMenuStrip1.ResumeLayout(false); this.statusStrip1.ResumeLayout(false); this.statusStrip1.PerformLayout(); + this.panel3.ResumeLayout(false); this.ResumeLayout(false); this.PerformLayout(); @@ -769,6 +898,16 @@ namespace Notatnik private System.Windows.Forms.ToolStripSeparator updateSeparator; private System.Windows.Forms.ToolStripMenuItem updateToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem informacjeOProgramieToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem nowyDokumentToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem zapiszToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem zapiszJakoToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem otwórzToolStripMenuItem; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator4; + private System.Windows.Forms.ToolStripMenuItem drukujToolStripMenuItem; + private System.Windows.Forms.Panel panel3; + private System.Windows.Forms.Button button18; + private System.Windows.Forms.Button button19; + private System.Windows.Forms.ToolStripMenuItem zawijanieWierszyToolStripMenuItem; } } diff --git a/Notepad/Notepad v2/Form1.cs b/Notepad/Notepad v2/Form1.cs index 13676d5..2735af8 100644 --- a/Notepad/Notepad v2/Form1.cs +++ b/Notepad/Notepad v2/Form1.cs @@ -20,16 +20,15 @@ namespace Notatnik private string[] lines; private int printedLines; - public Form1() - { - InitializeComponent(); - } + public Form1() { InitializeComponent(); } private void Form1_Load(object sender, EventArgs e) { richTextBox1.Font = Properties.Settings.Default.Czcionka; richTextBox1.BackColor = Properties.Settings.Default.Tlo; richTextBox1.ForeColor = Properties.Settings.Default.KolorCzcionki; + richTextBox1.WordWrap = Properties.Settings.Default.ZawijanieWierszy; + zawijanieWierszyToolStripMenuItem.Checked = Properties.Settings.Default.ZawijanieWierszy; this.Size = Properties.Settings.Default.FormSize; wytnijToolStripMenuItem.Enabled = false; kopiujToolStripMenuItem.Enabled = false; @@ -74,6 +73,16 @@ namespace Notatnik private void button13_MouseLeave(object sender, EventArgs e) { button13.ForeColor = Color.White; } private void button14_MouseEnter(object sender, EventArgs e) { button14.ForeColor = Color.FromArgb(40, 167, 69); } private void button14_MouseLeave(object sender, EventArgs e) { button14.ForeColor = Color.White; } + private void button15_MouseEnter(object sender, EventArgs e) { button15.ForeColor = Color.FromArgb(40, 167, 69); } + private void button15_MouseLeave(object sender, EventArgs e) { button15.ForeColor = Color.White; } + private void button16_MouseEnter(object sender, EventArgs e) { button16.ForeColor = Color.FromArgb(40, 167, 69); } + private void button16_MouseLeave(object sender, EventArgs e) { button16.ForeColor = Color.White; } + private void button17_MouseEnter(object sender, EventArgs e) { button17.ForeColor = Color.FromArgb(40, 167, 69); } + private void button17_MouseLeave(object sender, EventArgs e) { button17.ForeColor = Color.White; } + private void button18_MouseEnter(object sender, EventArgs e) { button18.ForeColor = Color.FromArgb(40, 167, 69); } + private void button18_MouseLeave(object sender, EventArgs e) { button18.ForeColor = Color.White; } + private void button19_MouseEnter(object sender, EventArgs e) { button19.ForeColor = Color.FromArgb(40, 167, 69); } + private void button19_MouseLeave(object sender, EventArgs e) { button19.ForeColor = Color.White; } #endregion #region Drukowanie private void printIt(object sender, EventArgs e) @@ -332,11 +341,24 @@ namespace Notatnik private void button10_Click(object sender, EventArgs e) { pasteText(); } private void button11_Click(object sender, EventArgs e) { undoChanges(); } private void button12_Click(object sender, EventArgs e) { redoChanges(); } - private void button13_Click(object sender, EventArgs e) { changeFontColor(); } - private void button14_Click(object sender, EventArgs e) { changeBackgroundColor(); } - private void button15_Click(object sender, EventArgs e) { underlineText(); } - private void button16_Click(object sender, EventArgs e) { italicText(); } - private void button17_Click(object sender, EventArgs e) { boldText(); } + private void button13_Click(object sender, EventArgs e) { changeFontColor(); panel3.Visible = false; } + private void button14_Click(object sender, EventArgs e) { changeBackgroundColor(); panel3.Visible = false; } + private void button15_Click(object sender, EventArgs e) { underlineText(); panel3.Visible = false; } + private void button16_Click(object sender, EventArgs e) { italicText(); panel3.Visible = false; } + private void button17_Click(object sender, EventArgs e) { boldText(); panel3.Visible = false; } + private void button18_Click(object sender, EventArgs e) + { + if (!panel3.Visible) + panel3.Visible = true; + else + panel3.Visible = false; + } + private void button19_Click(object sender, EventArgs e) + { + Info info = new Info(); + info.Show(); + panel3.Visible = false; + } #endregion #region Skrypty ToolStripa private void kopiujToolStripMenuItem_Click(object sender, EventArgs e) { copySelected(); } @@ -349,6 +371,54 @@ namespace Notatnik private void pogrubienieToolStripMenuItem_Click(object sender, EventArgs e) { boldText(); } private void kursywaToolStripMenuItem_Click(object sender, EventArgs e) { italicText(); } private void podkreślenieToolStripMenuItem_Click(object sender, EventArgs e) { underlineText(); } + private void informacjeOProgramieToolStripMenuItem_Click(object sender, EventArgs e) + { + Info info = new Info(); + info.Show(); + } + private void nowyDokumentToolStripMenuItem_Click(object sender, EventArgs e) { newFile(); } + private void zapiszToolStripMenuItem_Click(object sender, EventArgs e) + { + if (filePath == Path.GetTempPath() + "null.txt") + saveAsFile(); + else + saveFile(); + } + private void zapiszJakoToolStripMenuItem_Click(object sender, EventArgs e) { saveAsFile(); } + private void otwórzToolStripMenuItem_Click(object sender, EventArgs e) { openFile(false); } + private void drukujToolStripMenuItem_Click(object sender, EventArgs e) { printPreviewDialog1.ShowDialog(); } + private void updateToolStripMenuItem_Click(object sender, EventArgs e) + { + if (File.Exists(Application.StartupPath + "\\updater.exe")) + { + Process.Start("updater.exe"); + this.Close(); + } + else + { + if (MessageBox.Show("Nie posiadasz programu do aktualizacji Notatnika. Być może dlatego, że jest to wersja Portable lub plik \"updater.exe\" został usunięty.", "Nie ma pliku updater.exe!", MessageBoxButtons.YesNo, MessageBoxIcon.Warning) == DialogResult.Yes) + { + Process.Start("https://github.com/KrzysiekSiemv/Notepad/releases"); + } + } + } + private void zawijanieWierszyToolStripMenuItem_Click(object sender, EventArgs e) + { + if (!richTextBox1.WordWrap) + { + richTextBox1.WordWrap = true; + Properties.Settings.Default.ZawijanieWierszy = true; + Properties.Settings.Default.Save(); + zawijanieWierszyToolStripMenuItem.Checked = true; + } + else + { + richTextBox1.WordWrap = false; + Properties.Settings.Default.ZawijanieWierszy = false; + Properties.Settings.Default.Save(); + zawijanieWierszyToolStripMenuItem.Checked = false; + } + } #endregion private void Form1_SizeChanged(object sender, EventArgs e) @@ -407,26 +477,5 @@ namespace Notatnik updateToolStripMenuItem.Visible = true; } } - - private void updateToolStripMenuItem_Click(object sender, EventArgs e) - { - if (File.Exists(Application.StartupPath + "\\updater.exe")) - { - Process.Start("updater.exe"); - this.Close(); - } else - { - if(MessageBox.Show("Nie posiadasz programu do aktualizacji Notatnika. Być może dlatego, że jest to wersja Portable lub plik \"updater.exe\" został usunięty.", "Nie ma pliku updater.exe!", MessageBoxButtons.YesNo, MessageBoxIcon.Warning) == DialogResult.Yes) - { - Process.Start("https://github.com/KrzysiekSiemv/Notepad/releases"); - } - } - } - - private void informacjeOProgramieToolStripMenuItem_Click(object sender, EventArgs e) - { - Info info = new Info(); - info.Show(); - } } } diff --git a/Notepad/Notepad v2/Form1.resx b/Notepad/Notepad v2/Form1.resx index 4943b85..b6d9778 100644 --- a/Notepad/Notepad v2/Form1.resx +++ b/Notepad/Notepad v2/Form1.resx @@ -120,6 +120,15 @@ 17, 17 + + 17, 17 + + + 17, 17 + + + 17, 17 + 1285, 17 @@ -327,6 +336,9 @@ 1164, 17 + + 17, 17 + AAABAAYAEBAAAAEAIABoBAAAZgAAAAAAAAABACAAZxoAAM4EAAAwMAAAAQAgAKglAAA1HwAAICAAAAEA diff --git a/Notepad/Notepad v2/Info.Designer.cs b/Notepad/Notepad v2/Info.Designer.cs index 3b711fd..e684612 100644 --- a/Notepad/Notepad v2/Info.Designer.cs +++ b/Notepad/Notepad v2/Info.Designer.cs @@ -92,7 +92,7 @@ namespace Notatnik // linkLabel2 // this.linkLabel2.AutoSize = true; - this.linkLabel2.Location = new System.Drawing.Point(181, 89); + this.linkLabel2.Location = new System.Drawing.Point(181, 64); this.linkLabel2.Name = "linkLabel2"; this.linkLabel2.Size = new System.Drawing.Size(91, 13); this.linkLabel2.TabIndex = 5; @@ -104,7 +104,7 @@ namespace Notatnik // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(284, 111); + this.ClientSize = new System.Drawing.Size(284, 86); this.Controls.Add(this.linkLabel2); this.Controls.Add(this.label4); this.Controls.Add(this.linkLabel1); @@ -113,9 +113,9 @@ namespace Notatnik this.Controls.Add(this.label1); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MaximizeBox = false; - this.MaximumSize = new System.Drawing.Size(300, 150); + this.MaximumSize = new System.Drawing.Size(300, 125); this.MinimizeBox = false; - this.MinimumSize = new System.Drawing.Size(300, 150); + this.MinimumSize = new System.Drawing.Size(300, 125); this.Name = "Info"; this.Text = "Informacje o programie"; this.Load += new System.EventHandler(this.Info_Load); diff --git a/Notepad/Notepad v2/Info.cs b/Notepad/Notepad v2/Info.cs index 4c4f963..2a4cbe9 100644 --- a/Notepad/Notepad v2/Info.cs +++ b/Notepad/Notepad v2/Info.cs @@ -15,6 +15,6 @@ namespace Notatnik public Info() { InitializeComponent(); } private void Info_Load(object sender, EventArgs e) { label4.Text = Application.ProductVersion; } private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) { System.Diagnostics.Process.Start("https://github.com/KrzysiekSiemv"); } - private void linkLabel2_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) { System.Diagnostics.Process.Start("https://tipply.pl/u/krzysieksiemv"); } + private void linkLabel2_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) { System.Diagnostics.Process.Start("https://paypal.me/KrzysztofSmaga"); } } } diff --git a/Notepad/Notepad v2/Properties/AssemblyInfo.cs b/Notepad/Notepad v2/Properties/AssemblyInfo.cs index 3654ff2..732b293 100644 --- a/Notepad/Notepad v2/Properties/AssemblyInfo.cs +++ b/Notepad/Notepad v2/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // Możesz określić wszystkie wartości lub użyć domyślnych numerów kompilacji i poprawki // przy użyciu symbolu „*”, tak jak pokazano poniżej: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.3.0")] -[assembly: AssemblyFileVersion("1.0.3.0")] +[assembly: AssemblyVersion("1.0.3.3")] +[assembly: AssemblyFileVersion("1.0.3.3")] diff --git a/Notepad/Notepad v2/Properties/Settings.Designer.cs b/Notepad/Notepad v2/Properties/Settings.Designer.cs index 5484e1a..9076fde 100644 --- a/Notepad/Notepad v2/Properties/Settings.Designer.cs +++ b/Notepad/Notepad v2/Properties/Settings.Designer.cs @@ -73,6 +73,7 @@ namespace Notatnik.Properties { [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("Black")] public global::System.Drawing.Color KolorCzcionki { get { return ((global::System.Drawing.Color)(this["KolorCzcionki"])); @@ -81,5 +82,17 @@ namespace Notatnik.Properties { this["KolorCzcionki"] = value; } } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool ZawijanieWierszy { + get { + return ((bool)(this["ZawijanieWierszy"])); + } + set { + this["ZawijanieWierszy"] = value; + } + } } } diff --git a/Notepad/Notepad v2/Properties/Settings.settings b/Notepad/Notepad v2/Properties/Settings.settings index d00903c..eeb14af 100644 --- a/Notepad/Notepad v2/Properties/Settings.settings +++ b/Notepad/Notepad v2/Properties/Settings.settings @@ -15,7 +15,10 @@ True - + Black + + + False \ No newline at end of file diff --git a/Notepad/Notepad v2/bin/Debug/Notatnik.exe b/Notepad/Notepad v2/bin/Debug/Notatnik.exe index fe29d92..dd557fc 100644 Binary files a/Notepad/Notepad v2/bin/Debug/Notatnik.exe and b/Notepad/Notepad v2/bin/Debug/Notatnik.exe differ diff --git a/Notepad/Notepad v2/bin/Debug/Notatnik.exe.config b/Notepad/Notepad v2/bin/Debug/Notatnik.exe.config index e278b98..b344b03 100644 --- a/Notepad/Notepad v2/bin/Debug/Notatnik.exe.config +++ b/Notepad/Notepad v2/bin/Debug/Notatnik.exe.config @@ -24,7 +24,10 @@ True - + Black + + + False diff --git a/Notepad/Notepad v2/bin/Debug/Notatnik.pdb b/Notepad/Notepad v2/bin/Debug/Notatnik.pdb index 7ac5cc3..2b0ac11 100644 Binary files a/Notepad/Notepad v2/bin/Debug/Notatnik.pdb and b/Notepad/Notepad v2/bin/Debug/Notatnik.pdb differ diff --git a/Notepad/Notepad v2/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/Notepad/Notepad v2/obj/Debug/DesignTimeResolveAssemblyReferences.cache index 4abef47..3d03857 100644 Binary files a/Notepad/Notepad v2/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/Notepad/Notepad v2/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/Notepad/Notepad v2/obj/Debug/Notatnik.exe b/Notepad/Notepad v2/obj/Debug/Notatnik.exe index fe29d92..dd557fc 100644 Binary files a/Notepad/Notepad v2/obj/Debug/Notatnik.exe and b/Notepad/Notepad v2/obj/Debug/Notatnik.exe differ diff --git a/Notepad/Notepad v2/obj/Debug/Notatnik.pdb b/Notepad/Notepad v2/obj/Debug/Notatnik.pdb index 7ac5cc3..2b0ac11 100644 Binary files a/Notepad/Notepad v2/obj/Debug/Notatnik.pdb and b/Notepad/Notepad v2/obj/Debug/Notatnik.pdb differ diff --git a/Notepad/Notepad v2/obj/Debug/Notepad v2.csproj.GenerateResource.cache b/Notepad/Notepad v2/obj/Debug/Notepad v2.csproj.GenerateResource.cache index e7fab38..f944c86 100644 Binary files a/Notepad/Notepad v2/obj/Debug/Notepad v2.csproj.GenerateResource.cache and b/Notepad/Notepad v2/obj/Debug/Notepad v2.csproj.GenerateResource.cache differ diff --git a/Notepad/Notepad v2/obj/Debug/Notepad v2.csprojAssemblyReference.cache b/Notepad/Notepad v2/obj/Debug/Notepad v2.csprojAssemblyReference.cache index 9d8ff60..73c8b14 100644 Binary files a/Notepad/Notepad v2/obj/Debug/Notepad v2.csprojAssemblyReference.cache and b/Notepad/Notepad v2/obj/Debug/Notepad v2.csprojAssemblyReference.cache differ diff --git a/Notepad/Notepad v2/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll b/Notepad/Notepad v2/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll index 80e82e0..dbf59ce 100644 Binary files a/Notepad/Notepad v2/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll and b/Notepad/Notepad v2/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll differ diff --git a/NotepadUpdater/.vs/NotepadUpdater/v16/.suo b/NotepadUpdater/.vs/NotepadUpdater/v16/.suo index 48bd2bb..e400c6d 100644 Binary files a/NotepadUpdater/.vs/NotepadUpdater/v16/.suo and b/NotepadUpdater/.vs/NotepadUpdater/v16/.suo differ diff --git a/NotepadUpdater/NotepadUpdater/NotepadUpdater.csproj b/NotepadUpdater/NotepadUpdater/NotepadUpdater.csproj index f798879..2f41d3d 100644 --- a/NotepadUpdater/NotepadUpdater/NotepadUpdater.csproj +++ b/NotepadUpdater/NotepadUpdater/NotepadUpdater.csproj @@ -31,6 +31,9 @@ prompt 4 + + app.manifest + @@ -65,6 +68,7 @@ True Resources.resx + SettingsSingleFileGenerator Settings.Designer.cs diff --git a/NotepadUpdater/NotepadUpdater/app.manifest b/NotepadUpdater/NotepadUpdater/app.manifest new file mode 100644 index 0000000..a806cb1 --- /dev/null +++ b/NotepadUpdater/NotepadUpdater/app.manifest @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/NotepadUpdater/NotepadUpdater/bin/Debug/NotepadUpdater.exe b/NotepadUpdater/NotepadUpdater/bin/Debug/NotepadUpdater.exe index 14abb1c..b92ea32 100644 Binary files a/NotepadUpdater/NotepadUpdater/bin/Debug/NotepadUpdater.exe and b/NotepadUpdater/NotepadUpdater/bin/Debug/NotepadUpdater.exe differ diff --git a/NotepadUpdater/NotepadUpdater/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/NotepadUpdater/NotepadUpdater/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 1e11542..d4d7546 100644 Binary files a/NotepadUpdater/NotepadUpdater/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/NotepadUpdater/NotepadUpdater/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/NotepadUpdater/NotepadUpdater/obj/Debug/NotepadUpdater.csproj.GenerateResource.cache b/NotepadUpdater/NotepadUpdater/obj/Debug/NotepadUpdater.csproj.GenerateResource.cache index bb96217..f2de4fd 100644 Binary files a/NotepadUpdater/NotepadUpdater/obj/Debug/NotepadUpdater.csproj.GenerateResource.cache and b/NotepadUpdater/NotepadUpdater/obj/Debug/NotepadUpdater.csproj.GenerateResource.cache differ diff --git a/NotepadUpdater/NotepadUpdater/obj/Debug/NotepadUpdater.csprojAssemblyReference.cache b/NotepadUpdater/NotepadUpdater/obj/Debug/NotepadUpdater.csprojAssemblyReference.cache index f81aff4..d6f90b8 100644 Binary files a/NotepadUpdater/NotepadUpdater/obj/Debug/NotepadUpdater.csprojAssemblyReference.cache and b/NotepadUpdater/NotepadUpdater/obj/Debug/NotepadUpdater.csprojAssemblyReference.cache differ diff --git a/NotepadUpdater/NotepadUpdater/obj/Debug/NotepadUpdater.exe b/NotepadUpdater/NotepadUpdater/obj/Debug/NotepadUpdater.exe index 14abb1c..b92ea32 100644 Binary files a/NotepadUpdater/NotepadUpdater/obj/Debug/NotepadUpdater.exe and b/NotepadUpdater/NotepadUpdater/obj/Debug/NotepadUpdater.exe differ