diff --git a/Notepad/.vs/Notepad/v16/.suo b/Notepad/.vs/Notepad/v16/.suo index 99d49e3..59f720d 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 9e6dd56..4bafda0 100644 --- a/Notepad/Notepad v2/App.config +++ b/Notepad/Notepad v2/App.config @@ -15,11 +15,14 @@ Calibri, 12pt - 900, 512 + 1044, 700 White + + True + diff --git a/Notepad/Notepad v2/Form1.Designer.cs b/Notepad/Notepad v2/Form1.Designer.cs index 455d026..e866c1e 100644 --- a/Notepad/Notepad v2/Form1.Designer.cs +++ b/Notepad/Notepad v2/Form1.Designer.cs @@ -32,6 +32,9 @@ namespace Notatnik this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Form1)); this.panel1 = new System.Windows.Forms.Panel(); + this.button15 = new System.Windows.Forms.Button(); + this.button16 = new System.Windows.Forms.Button(); + this.button17 = new System.Windows.Forms.Button(); this.button14 = new System.Windows.Forms.Button(); this.button13 = new System.Windows.Forms.Button(); this.button12 = new System.Windows.Forms.Button(); @@ -58,6 +61,10 @@ namespace Notatnik this.toolStripSeparator2 = 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(); + this.pogrubienieToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.kursywaToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.podkreślenieToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog(); this.saveFileDialog1 = new System.Windows.Forms.SaveFileDialog(); @@ -69,13 +76,8 @@ namespace Notatnik this.printPreviewDialog1 = new System.Windows.Forms.PrintPreviewDialog(); this.colorDialog1 = new System.Windows.Forms.ColorDialog(); this.colorDialog2 = new System.Windows.Forms.ColorDialog(); - this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); - this.pogrubienieToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.kursywaToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.podkreślenieToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.button15 = new System.Windows.Forms.Button(); - this.button16 = new System.Windows.Forms.Button(); - this.button17 = new System.Windows.Forms.Button(); + this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); + this.updateToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.panel1.SuspendLayout(); this.contextMenuStrip1.SuspendLayout(); this.statusStrip1.SuspendLayout(); @@ -107,6 +109,66 @@ namespace Notatnik this.panel1.Size = new System.Drawing.Size(44, 639); 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.Margin = new System.Windows.Forms.Padding(0); + this.button15.Name = "button15"; + this.button15.Size = new System.Drawing.Size(36, 36); + this.button15.TabIndex = 19; + this.button15.Text = ""; + this.button15.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.toolTip1.SetToolTip(this.button15, "Podkreślenie"); + this.button15.UseVisualStyleBackColor = true; + this.button15.Click += new System.EventHandler(this.button15_Click); + // + // 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.Margin = new System.Windows.Forms.Padding(0); + this.button16.Name = "button16"; + this.button16.Size = new System.Drawing.Size(36, 36); + this.button16.TabIndex = 18; + this.button16.Text = ""; + this.button16.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.toolTip1.SetToolTip(this.button16, "Kursywa"); + this.button16.UseVisualStyleBackColor = true; + this.button16.Click += new System.EventHandler(this.button16_Click); + // + // 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.Margin = new System.Windows.Forms.Padding(0); + this.button17.Name = "button17"; + this.button17.Size = new System.Drawing.Size(36, 36); + this.button17.TabIndex = 17; + this.button17.Text = ""; + this.button17.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.toolTip1.SetToolTip(this.button17, "Pobrugienie"); + this.button17.UseVisualStyleBackColor = true; + this.button17.Click += new System.EventHandler(this.button17_Click); + // // button14 // this.button14.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); @@ -450,9 +512,11 @@ namespace Notatnik this.toolStripSeparator3, this.pogrubienieToolStripMenuItem, this.kursywaToolStripMenuItem, - this.podkreślenieToolStripMenuItem}); + this.podkreślenieToolStripMenuItem, + this.toolStripSeparator4, + this.updateToolStripMenuItem}); this.contextMenuStrip1.Name = "contextMenuStrip1"; - this.contextMenuStrip1.Size = new System.Drawing.Size(185, 242); + this.contextMenuStrip1.Size = new System.Drawing.Size(185, 292); // // kopiujToolStripMenuItem // @@ -518,6 +582,35 @@ namespace Notatnik 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(181, 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(184, 22); + this.pogrubienieToolStripMenuItem.Text = "Pogrubienie"; + this.pogrubienieToolStripMenuItem.Click += new System.EventHandler(this.pogrubienieToolStripMenuItem_Click); + // + // kursywaToolStripMenuItem + // + 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(184, 22); + this.kursywaToolStripMenuItem.Text = "Kursywa"; + this.kursywaToolStripMenuItem.Click += new System.EventHandler(this.kursywaToolStripMenuItem_Click); + // + // podkreślenieToolStripMenuItem + // + 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(184, 22); + this.podkreślenieToolStripMenuItem.Text = "Podkreślenie"; + this.podkreślenieToolStripMenuItem.Click += new System.EventHandler(this.podkreślenieToolStripMenuItem_Click); + // // openFileDialog1 // this.openFileDialog1.Filter = "Plik tekstowy (*.txt)|*.txt|Tekst sformatowany (*.rtf)|*.rtf|Strona HTML (*.html)" + @@ -576,94 +669,19 @@ namespace Notatnik this.printPreviewDialog1.Name = "printPreviewDialog1"; this.printPreviewDialog1.Visible = false; // - // toolStripSeparator3 + // toolStripSeparator4 // - this.toolStripSeparator3.Name = "toolStripSeparator3"; - this.toolStripSeparator3.Size = new System.Drawing.Size(181, 6); + this.toolStripSeparator4.Name = "toolStripSeparator4"; + this.toolStripSeparator4.Size = new System.Drawing.Size(181, 6); // - // pogrubienieToolStripMenuItem + // updateToolStripMenuItem // - 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(184, 22); - this.pogrubienieToolStripMenuItem.Text = "Pogrubienie"; - this.pogrubienieToolStripMenuItem.Click += new System.EventHandler(this.pogrubienieToolStripMenuItem_Click); - // - // kursywaToolStripMenuItem - // - 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(184, 22); - this.kursywaToolStripMenuItem.Text = "Kursywa"; - this.kursywaToolStripMenuItem.Click += new System.EventHandler(this.kursywaToolStripMenuItem_Click); - // - // podkreślenieToolStripMenuItem - // - 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(184, 22); - this.podkreślenieToolStripMenuItem.Text = "Podkreślenie"; - this.podkreślenieToolStripMenuItem.Click += new System.EventHandler(this.podkreślenieToolStripMenuItem_Click); - // - // 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.Margin = new System.Windows.Forms.Padding(0); - this.button15.Name = "button15"; - this.button15.Size = new System.Drawing.Size(36, 36); - this.button15.TabIndex = 19; - this.button15.Text = ""; - this.button15.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.toolTip1.SetToolTip(this.button15, "Podkreślenie"); - this.button15.UseVisualStyleBackColor = true; - this.button15.Click += new System.EventHandler(this.button15_Click); - // - // 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.Margin = new System.Windows.Forms.Padding(0); - this.button16.Name = "button16"; - this.button16.Size = new System.Drawing.Size(36, 36); - this.button16.TabIndex = 18; - this.button16.Text = ""; - this.button16.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.toolTip1.SetToolTip(this.button16, "Kursywa"); - this.button16.UseVisualStyleBackColor = true; - this.button16.Click += new System.EventHandler(this.button16_Click); - // - // 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.Margin = new System.Windows.Forms.Padding(0); - this.button17.Name = "button17"; - this.button17.Size = new System.Drawing.Size(36, 36); - this.button17.TabIndex = 17; - this.button17.Text = ""; - this.button17.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.toolTip1.SetToolTip(this.button17, "Pobrugienie"); - this.button17.UseVisualStyleBackColor = true; - this.button17.Click += new System.EventHandler(this.button17_Click); + this.updateToolStripMenuItem.Enabled = false; + 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(184, 22); + this.updateToolStripMenuItem.Text = "Update!"; + this.updateToolStripMenuItem.Click += new System.EventHandler(this.updateToolStripMenuItem_Click); // // Form1 // @@ -739,6 +757,8 @@ namespace Notatnik private System.Windows.Forms.Button button15; private System.Windows.Forms.Button button16; private System.Windows.Forms.Button button17; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator4; + private System.Windows.Forms.ToolStripMenuItem updateToolStripMenuItem; } } diff --git a/Notepad/Notepad v2/Form1.cs b/Notepad/Notepad v2/Form1.cs index 287ba57..49ab1d8 100644 --- a/Notepad/Notepad v2/Form1.cs +++ b/Notepad/Notepad v2/Form1.cs @@ -8,6 +8,8 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; using System.IO; +using System.Net; +using System.Net.NetworkInformation; namespace Notatnik { @@ -16,6 +18,7 @@ namespace Notatnik public string filePath = Path.GetTempPath() + "null.txt"; private string[] lines; private int printedLines; + public Form1() { InitializeComponent(); @@ -31,9 +34,13 @@ namespace Notatnik button8.Enabled = false; button9.Enabled = false; - TextWriter textWriter = new StreamWriter(filePath); - textWriter.Write("null"); - textWriter.Close(); + if(NetworkInterface.GetIsNetworkAvailable()) + checkUpdate(); + } + + public void openFile_FromExplorer(String[] file) { + filePath = file[0]; + openFile(true); } #region Zmiany kolorów przycisków @@ -156,18 +163,28 @@ namespace Notatnik } } - void openFile() + void openFile(bool fromCmd) { - if (openFileDialog1.ShowDialog() == DialogResult.OK) + if (fromCmd) { - filePath = openFileDialog1.FileName; - this.Text = openFileDialog1.FileName + " - Notatnik"; - - var fileStream = openFileDialog1.OpenFile(); - TextReader textReader = new StreamReader(fileStream); - richTextBox1.Text = textReader.ReadToEnd(); + this.Text = filePath + " - Notatnik"; + StreamReader streamReader = new StreamReader(filePath); + richTextBox1.Text = streamReader.ReadToEnd(); + streamReader.Close(); + } + else + { + if (openFileDialog1.ShowDialog() == DialogResult.OK) + { + filePath = openFileDialog1.FileName; + this.Text = openFileDialog1.FileName + " - Notatnik"; + + var fileStream = openFileDialog1.OpenFile(); + TextReader textReader = new StreamReader(fileStream); + richTextBox1.Text = textReader.ReadToEnd(); + } + toolStripStatusLabel1.Text = "Otwarto plik " + openFileDialog1.FileName + "!"; } - toolStripStatusLabel1.Text = "Otwarto plik " + openFileDialog1.FileName + "!"; } void saveFile() @@ -284,7 +301,7 @@ namespace Notatnik #endregion #region Skrypty odpowiadające za przyciski private void button1_Click(object sender, EventArgs e) { newFile(); } - private void button2_Click(object sender, EventArgs e) { openFile(); } + private void button2_Click(object sender, EventArgs e) { openFile(false); } private void button3_Click(object sender, EventArgs e) { if (filePath == Path.GetTempPath() + "null.txt") @@ -355,27 +372,37 @@ namespace Notatnik private void Form1_FormClosing(object sender, FormClosingEventArgs e) { - TextReader textReader = new StreamReader(filePath); - if (filePath != Path.GetTempPath() + "null.txt" && richTextBox1.Text == "") + if (MessageBox.Show("Czy chcesz zapisać plik?", "Notatnik", MessageBoxButtons.YesNo, MessageBoxIcon.Warning) == DialogResult.Yes) { - if (richTextBox1.Text == textReader.ReadToEnd()) - { - if (MessageBox.Show("W tym pliku zostały wprowadzone zmiany. Czy chcesz je zapisać", "Notatnik", MessageBoxButtons.YesNo, MessageBoxIcon.Warning) == DialogResult.Yes) - { - if (filePath == Path.GetTempPath() + "null.txt") - saveAsFile(); - else - saveFile(); - } - else - Application.Exit(); - } + if (filePath == Path.GetTempPath() + "null.txt") + saveAsFile(); else - Application.Exit(); + saveFile(); } - else - Application.Exit(); } + void checkUpdate() + { + string urlVersion = "https://raw.githubusercontent.com/KrzysiekSiemv/Notepad/main/version.txt"; + WebClient webClient = new WebClient(); + Stream stream = webClient.OpenRead(urlVersion); + + StreamReader reader = new StreamReader(stream); + String content = reader.ReadToEnd(); + + if(Application.ProductVersion != content) + { + toolStripStatusLabel1.Text = "Jest dostępna nowa wersja! Jeżeli chcesz zainstalować, wybierz w Context Menu: Pobierz update!"; + statusStrip1.BackColor = Color.FromArgb(255, 202, 81, 0); + + updateToolStripMenuItem.Enabled = true; + } + } + + private void updateToolStripMenuItem_Click(object sender, EventArgs e) + { + Update update = new Update(); + update.Show(); + } } } diff --git a/Notepad/Notepad v2/Form1.resx b/Notepad/Notepad v2/Form1.resx index 30854ea..4943b85 100644 --- a/Notepad/Notepad v2/Form1.resx +++ b/Notepad/Notepad v2/Form1.resx @@ -123,6 +123,9 @@ 1285, 17 + + 17, 17 + 114, 17 diff --git a/Notepad/Notepad v2/Notepad v2.csproj b/Notepad/Notepad v2/Notepad v2.csproj index efd5d8f..82fc17f 100644 --- a/Notepad/Notepad v2/Notepad v2.csproj +++ b/Notepad/Notepad v2/Notepad v2.csproj @@ -11,6 +11,25 @@ v4.5 512 true + false + publikuj\ + true + Disk + false + Foreground + 7 + Days + false + false + true + pl-PL + Notatnik + Krzysztof %27KrzysiekSiemv%27 Smaga + Notepad + 0 + 1.0.0.%2a + false + true AnyCPU @@ -34,6 +53,15 @@ icon.ico + + LocalIntranet + + + false + + + Properties\app.manifest + @@ -56,6 +84,12 @@ + + Form + + + Update.cs + Form1.cs @@ -69,6 +103,10 @@ Resources.resx True + + Update.cs + + SettingsSingleFileGenerator Settings.Designer.cs @@ -85,5 +123,20 @@ + + + False + .NET Framework 3.5 SP1 + false + + + + + False + Plik tekstowy + 1 + icon.ico + + \ No newline at end of file diff --git a/Notepad/Notepad v2/Notepad v2.csproj.user b/Notepad/Notepad v2/Notepad v2.csproj.user new file mode 100644 index 0000000..8d65b16 --- /dev/null +++ b/Notepad/Notepad v2/Notepad v2.csproj.user @@ -0,0 +1,13 @@ + + + + publikuj\ + + + + + + pl-PL + false + + \ No newline at end of file diff --git a/Notepad/Notepad v2/Program.cs b/Notepad/Notepad v2/Program.cs index 4132939..dbaaedb 100644 --- a/Notepad/Notepad v2/Program.cs +++ b/Notepad/Notepad v2/Program.cs @@ -12,11 +12,21 @@ namespace Notatnik /// Główny punkt wejścia dla aplikacji. /// [STAThread] - static void Main() + static void Main(String[] args) { - Application.EnableVisualStyles(); Application.SetCompatibleTextRenderingDefault(false); - Application.Run(new Form1()); + Application.EnableVisualStyles(); + Form1 form1 = new Form1(); + + if (args.Length > 0) + { + form1.openFile_FromExplorer(args); + Application.Run(form1); + } + else + { + Application.Run(form1); + } } } } diff --git a/Notepad/Notepad v2/Properties/AssemblyInfo.cs b/Notepad/Notepad v2/Properties/AssemblyInfo.cs index 5730773..a2ce30c 100644 --- a/Notepad/Notepad v2/Properties/AssemblyInfo.cs +++ b/Notepad/Notepad v2/Properties/AssemblyInfo.cs @@ -10,7 +10,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Krzysztof 'KrzysiekSiemv' Smaga")] [assembly: AssemblyProduct("Notatnik")] -[assembly: AssemblyCopyright("Copyright © Krzysztof Smaga 2020")] +[assembly: AssemblyCopyright("Copyright © Krzysztof Smaga 2021")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/Notepad/Notepad v2/Properties/Settings.Designer.cs b/Notepad/Notepad v2/Properties/Settings.Designer.cs index 29c1fa2..ed61693 100644 --- a/Notepad/Notepad v2/Properties/Settings.Designer.cs +++ b/Notepad/Notepad v2/Properties/Settings.Designer.cs @@ -37,7 +37,7 @@ namespace Notatnik.Properties { [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("900, 512")] + [global::System.Configuration.DefaultSettingValueAttribute("1044, 700")] public global::System.Drawing.Size FormSize { get { return ((global::System.Drawing.Size)(this["FormSize"])); @@ -58,5 +58,17 @@ namespace Notatnik.Properties { this["Tlo"] = value; } } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("True")] + public bool FirstRun { + get { + return ((bool)(this["FirstRun"])); + } + set { + this["FirstRun"] = value; + } + } } } diff --git a/Notepad/Notepad v2/Properties/Settings.settings b/Notepad/Notepad v2/Properties/Settings.settings index 9a64dc7..785dac8 100644 --- a/Notepad/Notepad v2/Properties/Settings.settings +++ b/Notepad/Notepad v2/Properties/Settings.settings @@ -6,10 +6,13 @@ Calibri, 12pt - 900, 512 + 1044, 700 White + + True + \ No newline at end of file diff --git a/Notepad/Notepad v2/Properties/app.manifest b/Notepad/Notepad v2/Properties/app.manifest new file mode 100644 index 0000000..70833e8 --- /dev/null +++ b/Notepad/Notepad v2/Properties/app.manifest @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Notepad/Notepad v2/Update.Designer.cs b/Notepad/Notepad v2/Update.Designer.cs new file mode 100644 index 0000000..15cffb3 --- /dev/null +++ b/Notepad/Notepad v2/Update.Designer.cs @@ -0,0 +1,141 @@ + +namespace Notatnik +{ + partial class Update + { + /// + /// 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.label1 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); + this.label3 = new System.Windows.Forms.Label(); + this.label4 = new System.Windows.Forms.Label(); + this.richTextBox1 = new System.Windows.Forms.RichTextBox(); + this.button1 = new System.Windows.Forms.Button(); + this.progressBar1 = new System.Windows.Forms.ProgressBar(); + this.SuspendLayout(); + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(13, 13); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(81, 13); + this.label1.TabIndex = 0; + this.label1.Text = "Obecna wersja:"; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(23, 35); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(71, 13); + this.label2.TabIndex = 1; + this.label2.Text = "Nowa wersja:"; + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(100, 13); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(31, 13); + this.label3.TabIndex = 2; + this.label3.Text = "1.0.2"; + // + // label4 + // + this.label4.AutoSize = true; + this.label4.Location = new System.Drawing.Point(100, 35); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(31, 13); + this.label4.TabIndex = 3; + this.label4.Text = "1.0.3"; + // + // richTextBox1 + // + this.richTextBox1.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.richTextBox1.Location = new System.Drawing.Point(12, 61); + this.richTextBox1.Name = "richTextBox1"; + this.richTextBox1.ReadOnly = true; + this.richTextBox1.Size = new System.Drawing.Size(417, 157); + this.richTextBox1.TabIndex = 5; + this.richTextBox1.Text = ""; + // + // button1 + // + this.button1.Location = new System.Drawing.Point(330, 19); + this.button1.Name = "button1"; + this.button1.Size = new System.Drawing.Size(99, 23); + this.button1.TabIndex = 6; + this.button1.Text = "Update"; + this.button1.UseVisualStyleBackColor = true; + // + // progressBar1 + // + this.progressBar1.Location = new System.Drawing.Point(12, 224); + this.progressBar1.Name = "progressBar1"; + this.progressBar1.Size = new System.Drawing.Size(417, 23); + this.progressBar1.TabIndex = 7; + // + // Update + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(441, 259); + this.Controls.Add(this.progressBar1); + this.Controls.Add(this.button1); + this.Controls.Add(this.richTextBox1); + this.Controls.Add(this.label4); + this.Controls.Add(this.label3); + this.Controls.Add(this.label2); + this.Controls.Add(this.label1); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; + this.MaximizeBox = false; + this.MaximumSize = new System.Drawing.Size(457, 298); + this.MinimizeBox = false; + this.MinimumSize = new System.Drawing.Size(457, 298); + this.Name = "Update"; + this.ShowIcon = false; + this.ShowInTaskbar = false; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.Text = "Update notatnika"; + this.Load += new System.EventHandler(this.Update_Load); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.Label label1; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.Label label4; + private System.Windows.Forms.RichTextBox richTextBox1; + private System.Windows.Forms.Button button1; + private System.Windows.Forms.ProgressBar progressBar1; + } +} \ No newline at end of file diff --git a/Notepad/Notepad v2/Update.cs b/Notepad/Notepad v2/Update.cs new file mode 100644 index 0000000..416d6eb --- /dev/null +++ b/Notepad/Notepad v2/Update.cs @@ -0,0 +1,42 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; +using System.Net; +using System.IO; + +namespace Notatnik +{ + public partial class Update : Form + { + WebClient webClient; + String content; + public Update() + { + InitializeComponent(); + } + + private void Update_Load(object sender, EventArgs e) + { + string urlVersion = "https://raw.githubusercontent.com/KrzysiekSiemv/Notepad/main/version.txt"; + webClient = new WebClient(); + Stream stream = webClient.OpenRead(urlVersion); + + StreamReader reader = new StreamReader(stream); + content = reader.ReadToEnd(); + + label3.Text = Application.ProductVersion; + label4.Text = content; + } + + void downloadUpdate() + { + webClient.DownloadFile("https://github.com/KrzysiekSiemv/Notepad/releases/download/" + content + "/Notatnik.exe", Path.GetTempPath() + "\\Notatnik\\NotatnikUpdate.exe"); + } + } +} diff --git a/Notepad/Notepad v2/Update.resx b/Notepad/Notepad v2/Update.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/Notepad/Notepad v2/Update.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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/Notepad/Notepad v2/bin/Debug/Notatnik.exe b/Notepad/Notepad v2/bin/Debug/Notatnik.exe index 85140ef..bffd618 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 9e6dd56..5616f65 100644 --- a/Notepad/Notepad v2/bin/Debug/Notatnik.exe.config +++ b/Notepad/Notepad v2/bin/Debug/Notatnik.exe.config @@ -15,7 +15,7 @@ Calibri, 12pt - 900, 512 + 1044, 700 White diff --git a/Notepad/Notepad v2/bin/Debug/Notatnik.pdb b/Notepad/Notepad v2/bin/Debug/Notatnik.pdb index 6b9fc36..631f2f0 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/bin/Debug/test.txt b/Notepad/Notepad v2/bin/Debug/test.txt new file mode 100644 index 0000000..e69de29 diff --git a/Notepad/Notepad v2/bin/Release/Notatnik.exe b/Notepad/Notepad v2/bin/Release/Notatnik.exe index d9f9101..ca1509d 100644 Binary files a/Notepad/Notepad v2/bin/Release/Notatnik.exe and b/Notepad/Notepad v2/bin/Release/Notatnik.exe differ diff --git a/Notepad/Notepad v2/bin/Release/Notatnik.exe.config b/Notepad/Notepad v2/bin/Release/Notatnik.exe.config index 9e6dd56..4bafda0 100644 --- a/Notepad/Notepad v2/bin/Release/Notatnik.exe.config +++ b/Notepad/Notepad v2/bin/Release/Notatnik.exe.config @@ -15,11 +15,14 @@ Calibri, 12pt - 900, 512 + 1044, 700 White + + True + diff --git a/Notepad/Notepad v2/bin/Release/Notatnik.pdb b/Notepad/Notepad v2/bin/Release/Notatnik.pdb index cd5b681..e58ea53 100644 Binary files a/Notepad/Notepad v2/bin/Release/Notatnik.pdb and b/Notepad/Notepad v2/bin/Release/Notatnik.pdb differ diff --git a/Notepad/Notepad v2/bin/Release/test.txt b/Notepad/Notepad v2/bin/Release/test.txt new file mode 100644 index 0000000..e69de29 diff --git a/Notepad/Notepad v2/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/Notepad/Notepad v2/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 9ffc8f6..ddc199d 100644 Binary files a/Notepad/Notepad v2/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/Notepad/Notepad v2/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/Notepad/Notepad v2/obj/Debug/Notatnik.exe b/Notepad/Notepad v2/obj/Debug/Notatnik.exe index 85140ef..bffd618 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 6b9fc36..631f2f0 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.FileListAbsolute.txt b/Notepad/Notepad v2/obj/Debug/Notepad v2.csproj.FileListAbsolute.txt index cc4de95..2b69db5 100644 --- a/Notepad/Notepad v2/obj/Debug/Notepad v2.csproj.FileListAbsolute.txt +++ b/Notepad/Notepad v2/obj/Debug/Notepad v2.csproj.FileListAbsolute.txt @@ -8,3 +8,13 @@ C:\Users\Krzysiek\source\repos\Notepad v2\Notepad v2\bin\Debug\Notatnik.exe C:\Users\Krzysiek\source\repos\Notepad v2\Notepad v2\bin\Debug\Notatnik.pdb C:\Users\Krzysiek\source\repos\Notepad v2\Notepad v2\obj\Debug\Notatnik.exe C:\Users\Krzysiek\source\repos\Notepad v2\Notepad v2\obj\Debug\Notatnik.pdb +C:\Users\Krzysiek\Documents\GitHub\Notepad\Notepad\Notepad v2\bin\Debug\Notatnik.exe.config +C:\Users\Krzysiek\Documents\GitHub\Notepad\Notepad\Notepad v2\bin\Debug\Notatnik.exe +C:\Users\Krzysiek\Documents\GitHub\Notepad\Notepad\Notepad v2\bin\Debug\Notatnik.pdb +C:\Users\Krzysiek\Documents\GitHub\Notepad\Notepad\Notepad v2\obj\Debug\Notepad v2.csprojAssemblyReference.cache +C:\Users\Krzysiek\Documents\GitHub\Notepad\Notepad\Notepad v2\obj\Debug\Notatnik.Form1.resources +C:\Users\Krzysiek\Documents\GitHub\Notepad\Notepad\Notepad v2\obj\Debug\Notatnik.Properties.Resources.resources +C:\Users\Krzysiek\Documents\GitHub\Notepad\Notepad\Notepad v2\obj\Debug\Notepad v2.csproj.GenerateResource.cache +C:\Users\Krzysiek\Documents\GitHub\Notepad\Notepad\Notepad v2\obj\Debug\Notepad v2.csproj.CoreCompileInputs.cache +C:\Users\Krzysiek\Documents\GitHub\Notepad\Notepad\Notepad v2\obj\Debug\Notatnik.exe +C:\Users\Krzysiek\Documents\GitHub\Notepad\Notepad\Notepad v2\obj\Debug\Notatnik.pdb 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 21de7fa..97b4c01 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 9575526..9b81105 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/Release/DesignTimeResolveAssemblyReferences.cache b/Notepad/Notepad v2/obj/Release/DesignTimeResolveAssemblyReferences.cache index a9d48fc..9457fa0 100644 Binary files a/Notepad/Notepad v2/obj/Release/DesignTimeResolveAssemblyReferences.cache and b/Notepad/Notepad v2/obj/Release/DesignTimeResolveAssemblyReferences.cache differ diff --git a/Notepad/Notepad v2/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/Notepad/Notepad v2/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache index 95112c0..2c2bb2c 100644 Binary files a/Notepad/Notepad v2/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache and b/Notepad/Notepad v2/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/Notepad/Notepad v2/obj/Release/Notatnik.Update.resources b/Notepad/Notepad v2/obj/Release/Notatnik.Update.resources new file mode 100644 index 0000000..6c05a97 Binary files /dev/null and b/Notepad/Notepad v2/obj/Release/Notatnik.Update.resources differ diff --git a/Notepad/Notepad v2/obj/Release/Notatnik.exe b/Notepad/Notepad v2/obj/Release/Notatnik.exe index d9f9101..ca1509d 100644 Binary files a/Notepad/Notepad v2/obj/Release/Notatnik.exe and b/Notepad/Notepad v2/obj/Release/Notatnik.exe differ diff --git a/Notepad/Notepad v2/obj/Release/Notatnik.pdb b/Notepad/Notepad v2/obj/Release/Notatnik.pdb index cd5b681..e58ea53 100644 Binary files a/Notepad/Notepad v2/obj/Release/Notatnik.pdb and b/Notepad/Notepad v2/obj/Release/Notatnik.pdb differ diff --git a/Notepad/Notepad v2/obj/Release/Notepad v2.csproj.CoreCompileInputs.cache b/Notepad/Notepad v2/obj/Release/Notepad v2.csproj.CoreCompileInputs.cache index 6ec8458..2e271fa 100644 --- a/Notepad/Notepad v2/obj/Release/Notepad v2.csproj.CoreCompileInputs.cache +++ b/Notepad/Notepad v2/obj/Release/Notepad v2.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -42fc91b920426e379a4ce720848eb9d703449fc4 +5ecff3787183e7feb272360ec7673dd58ad31ff2 diff --git a/Notepad/Notepad v2/obj/Release/Notepad v2.csproj.FileListAbsolute.txt b/Notepad/Notepad v2/obj/Release/Notepad v2.csproj.FileListAbsolute.txt index 1ae8547..fbb7ec0 100644 --- a/Notepad/Notepad v2/obj/Release/Notepad v2.csproj.FileListAbsolute.txt +++ b/Notepad/Notepad v2/obj/Release/Notepad v2.csproj.FileListAbsolute.txt @@ -8,3 +8,4 @@ C:\Users\Krzysiek\Documents\GitHub\Notepad\Notepad\Notepad v2\obj\Release\Notepa C:\Users\Krzysiek\Documents\GitHub\Notepad\Notepad\Notepad v2\obj\Release\Notepad v2.csproj.CoreCompileInputs.cache C:\Users\Krzysiek\Documents\GitHub\Notepad\Notepad\Notepad v2\obj\Release\Notatnik.exe C:\Users\Krzysiek\Documents\GitHub\Notepad\Notepad\Notepad v2\obj\Release\Notatnik.pdb +C:\Users\Krzysiek\Documents\GitHub\Notepad\Notepad\Notepad v2\obj\Release\Notatnik.Update.resources diff --git a/Notepad/Notepad v2/obj/Release/Notepad v2.csproj.GenerateResource.cache b/Notepad/Notepad v2/obj/Release/Notepad v2.csproj.GenerateResource.cache index b3fb653..2d0789b 100644 Binary files a/Notepad/Notepad v2/obj/Release/Notepad v2.csproj.GenerateResource.cache and b/Notepad/Notepad v2/obj/Release/Notepad v2.csproj.GenerateResource.cache differ diff --git a/Notepad/Notepad v2/obj/Release/Notepad v2.csprojAssemblyReference.cache b/Notepad/Notepad v2/obj/Release/Notepad v2.csprojAssemblyReference.cache index 0919955..bda9875 100644 Binary files a/Notepad/Notepad v2/obj/Release/Notepad v2.csprojAssemblyReference.cache and b/Notepad/Notepad v2/obj/Release/Notepad v2.csprojAssemblyReference.cache differ diff --git a/Notepad/Notepad v2/obj/Release/TempPE/Properties.Resources.Designer.cs.dll b/Notepad/Notepad v2/obj/Release/TempPE/Properties.Resources.Designer.cs.dll index eae6b53..507284c 100644 Binary files a/Notepad/Notepad v2/obj/Release/TempPE/Properties.Resources.Designer.cs.dll and b/Notepad/Notepad v2/obj/Release/TempPE/Properties.Resources.Designer.cs.dll differ diff --git a/version.txt b/version.txt new file mode 100644 index 0000000..e6d5cb8 --- /dev/null +++ b/version.txt @@ -0,0 +1 @@ +1.0.2 \ No newline at end of file