diff --git a/Notepad/App.config b/Notepad/App.config index 88fa402..d1428ad 100644 --- a/Notepad/App.config +++ b/Notepad/App.config @@ -1,6 +1,6 @@ - + - + - \ No newline at end of file + diff --git a/Notepad/Form1.Designer.cs b/Notepad/Form1.Designer.cs index 0d503d9..ba4a8e6 100644 --- a/Notepad/Form1.Designer.cs +++ b/Notepad/Form1.Designer.cs @@ -58,11 +58,12 @@ this.text_area.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.text_area.Location = new System.Drawing.Point(-3, 31); + this.text_area.Location = new System.Drawing.Point(-2, 25); + this.text_area.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.text_area.Multiline = true; this.text_area.Name = "text_area"; this.text_area.ScrollBars = System.Windows.Forms.ScrollBars.Both; - this.text_area.Size = new System.Drawing.Size(1057, 546); + this.text_area.Size = new System.Drawing.Size(794, 444); this.text_area.TabIndex = 0; this.text_area.WordWrap = false; // @@ -75,7 +76,8 @@ this.helpToolStripMenuItem}); this.menuStrip1.Location = new System.Drawing.Point(0, 0); this.menuStrip1.Name = "menuStrip1"; - this.menuStrip1.Size = new System.Drawing.Size(1054, 30); + this.menuStrip1.Padding = new System.Windows.Forms.Padding(4, 2, 0, 2); + this.menuStrip1.Size = new System.Drawing.Size(790, 24); this.menuStrip1.TabIndex = 1; this.menuStrip1.Text = "menuStrip1"; // @@ -89,14 +91,14 @@ this.saveFileWithNameToolStripMenuItem, this.exitToolStripMenuItem}); this.fileToolStripMenuItem.Name = "fileToolStripMenuItem"; - this.fileToolStripMenuItem.Size = new System.Drawing.Size(46, 26); + this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20); this.fileToolStripMenuItem.Text = "File"; // // newToolStripMenuItem // this.newToolStripMenuItem.Name = "newToolStripMenuItem"; this.newToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.N))); - this.newToolStripMenuItem.Size = new System.Drawing.Size(320, 26); + this.newToolStripMenuItem.Size = new System.Drawing.Size(229, 22); this.newToolStripMenuItem.Text = "New"; this.newToolStripMenuItem.Click += new System.EventHandler(this.newToolStripMenuItem_Click); // @@ -105,7 +107,7 @@ this.newWindowToolStripMenuItem.Name = "newWindowToolStripMenuItem"; this.newWindowToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) | System.Windows.Forms.Keys.N))); - this.newWindowToolStripMenuItem.Size = new System.Drawing.Size(320, 26); + this.newWindowToolStripMenuItem.Size = new System.Drawing.Size(229, 22); this.newWindowToolStripMenuItem.Text = "New window"; this.newWindowToolStripMenuItem.Click += new System.EventHandler(this.newWindowToolStripMenuItem_Click); // @@ -113,7 +115,7 @@ // this.openToolStripMenuItem.Name = "openToolStripMenuItem"; this.openToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O))); - this.openToolStripMenuItem.Size = new System.Drawing.Size(320, 26); + this.openToolStripMenuItem.Size = new System.Drawing.Size(229, 22); this.openToolStripMenuItem.Text = "Open"; this.openToolStripMenuItem.Click += new System.EventHandler(this.openToolStripMenuItem_Click); // @@ -121,7 +123,7 @@ // this.saveToolStripMenuItem.Name = "saveToolStripMenuItem"; this.saveToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S))); - this.saveToolStripMenuItem.Size = new System.Drawing.Size(320, 26); + this.saveToolStripMenuItem.Size = new System.Drawing.Size(229, 22); this.saveToolStripMenuItem.Text = "Save"; this.saveToolStripMenuItem.Click += new System.EventHandler(this.saveToolStripMenuItem_Click); // @@ -130,7 +132,7 @@ this.saveFileWithNameToolStripMenuItem.Name = "saveFileWithNameToolStripMenuItem"; this.saveFileWithNameToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) | System.Windows.Forms.Keys.S))); - this.saveFileWithNameToolStripMenuItem.Size = new System.Drawing.Size(320, 26); + this.saveFileWithNameToolStripMenuItem.Size = new System.Drawing.Size(229, 22); this.saveFileWithNameToolStripMenuItem.Text = "Save with name"; this.saveFileWithNameToolStripMenuItem.Click += new System.EventHandler(this.saveFileWithNameToolStripMenuItem_Click); // @@ -138,7 +140,7 @@ // this.exitToolStripMenuItem.Name = "exitToolStripMenuItem"; this.exitToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F4))); - this.exitToolStripMenuItem.Size = new System.Drawing.Size(320, 26); + this.exitToolStripMenuItem.Size = new System.Drawing.Size(229, 22); this.exitToolStripMenuItem.Text = "Exit"; this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click); // @@ -151,7 +153,7 @@ this.alwaysOnTopToolStripMenuItem, this.wordWrapToolStripMenuItem}); this.viewToolStripMenuItem.Name = "viewToolStripMenuItem"; - this.viewToolStripMenuItem.Size = new System.Drawing.Size(55, 26); + this.viewToolStripMenuItem.Size = new System.Drawing.Size(44, 20); this.viewToolStripMenuItem.Text = "View"; this.viewToolStripMenuItem.Click += new System.EventHandler(this.viewToolStripMenuItem_Click_1); // @@ -159,7 +161,7 @@ // this.characterStyleToolStripMenuItem.Name = "characterStyleToolStripMenuItem"; this.characterStyleToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F7; - this.characterStyleToolStripMenuItem.Size = new System.Drawing.Size(301, 26); + this.characterStyleToolStripMenuItem.Size = new System.Drawing.Size(232, 22); this.characterStyleToolStripMenuItem.Text = "Font style"; this.characterStyleToolStripMenuItem.Click += new System.EventHandler(this.characterStyleToolStripMenuItem_Click_1); // @@ -167,7 +169,7 @@ // this.backgroundColorToolStripMenuItem.Name = "backgroundColorToolStripMenuItem"; this.backgroundColorToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.F7))); - this.backgroundColorToolStripMenuItem.Size = new System.Drawing.Size(301, 26); + this.backgroundColorToolStripMenuItem.Size = new System.Drawing.Size(232, 22); this.backgroundColorToolStripMenuItem.Text = "Window color"; this.backgroundColorToolStripMenuItem.Click += new System.EventHandler(this.backgroundColorToolStripMenuItem_Click); // @@ -175,7 +177,7 @@ // this.searchTextInTheWebToolStripMenuItem.Name = "searchTextInTheWebToolStripMenuItem"; this.searchTextInTheWebToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Q))); - this.searchTextInTheWebToolStripMenuItem.Size = new System.Drawing.Size(301, 26); + this.searchTextInTheWebToolStripMenuItem.Size = new System.Drawing.Size(232, 22); this.searchTextInTheWebToolStripMenuItem.Text = "Search text in the web"; this.searchTextInTheWebToolStripMenuItem.Click += new System.EventHandler(this.searchTextInTheWebToolStripMenuItem_Click); // @@ -183,14 +185,14 @@ // this.alwaysOnTopToolStripMenuItem.Name = "alwaysOnTopToolStripMenuItem"; this.alwaysOnTopToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F5; - this.alwaysOnTopToolStripMenuItem.Size = new System.Drawing.Size(301, 26); + this.alwaysOnTopToolStripMenuItem.Size = new System.Drawing.Size(232, 22); this.alwaysOnTopToolStripMenuItem.Text = "Always on top"; this.alwaysOnTopToolStripMenuItem.Click += new System.EventHandler(this.alwaysOnTopToolStripMenuItem_Click); // // wordWrapToolStripMenuItem // this.wordWrapToolStripMenuItem.Name = "wordWrapToolStripMenuItem"; - this.wordWrapToolStripMenuItem.Size = new System.Drawing.Size(301, 26); + this.wordWrapToolStripMenuItem.Size = new System.Drawing.Size(232, 22); this.wordWrapToolStripMenuItem.Text = "Word wrap"; this.wordWrapToolStripMenuItem.Click += new System.EventHandler(this.wordWrapToolStripMenuItem_Click); // @@ -202,7 +204,7 @@ this.aboutToolStripMenuItem, this.aboutWindowsToolStripMenuItem}); this.helpToolStripMenuItem.Name = "helpToolStripMenuItem"; - this.helpToolStripMenuItem.Size = new System.Drawing.Size(30, 26); + this.helpToolStripMenuItem.Size = new System.Drawing.Size(24, 20); this.helpToolStripMenuItem.Text = "?"; this.helpToolStripMenuItem.Click += new System.EventHandler(this.viewToolStripMenuItem_Click); // @@ -210,7 +212,7 @@ // this.checkForUpdatesToolStripMenuItem.Name = "checkForUpdatesToolStripMenuItem"; this.checkForUpdatesToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F10; - this.checkForUpdatesToolStripMenuItem.Size = new System.Drawing.Size(265, 26); + this.checkForUpdatesToolStripMenuItem.Size = new System.Drawing.Size(205, 22); this.checkForUpdatesToolStripMenuItem.Text = "Check for updates"; this.checkForUpdatesToolStripMenuItem.Click += new System.EventHandler(this.checkForUpdatesToolStripMenuItem_Click); // @@ -219,7 +221,7 @@ this.giveAFeedbackToolStripMenuItem.Enabled = false; this.giveAFeedbackToolStripMenuItem.Name = "giveAFeedbackToolStripMenuItem"; this.giveAFeedbackToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F8; - this.giveAFeedbackToolStripMenuItem.Size = new System.Drawing.Size(265, 26); + this.giveAFeedbackToolStripMenuItem.Size = new System.Drawing.Size(205, 22); this.giveAFeedbackToolStripMenuItem.Text = "Give a feedback"; this.giveAFeedbackToolStripMenuItem.Click += new System.EventHandler(this.giveAFeedbackToolStripMenuItem_Click); // @@ -227,7 +229,7 @@ // this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem"; this.aboutToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F1; - this.aboutToolStripMenuItem.Size = new System.Drawing.Size(265, 26); + this.aboutToolStripMenuItem.Size = new System.Drawing.Size(205, 22); this.aboutToolStripMenuItem.Text = "About"; this.aboutToolStripMenuItem.Click += new System.EventHandler(this.aboutToolStripMenuItem_Click); // @@ -235,21 +237,23 @@ // this.aboutWindowsToolStripMenuItem.Name = "aboutWindowsToolStripMenuItem"; this.aboutWindowsToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.F1))); - this.aboutWindowsToolStripMenuItem.Size = new System.Drawing.Size(265, 26); + this.aboutWindowsToolStripMenuItem.Size = new System.Drawing.Size(205, 22); this.aboutWindowsToolStripMenuItem.Text = "About Windows"; this.aboutWindowsToolStripMenuItem.Visible = false; this.aboutWindowsToolStripMenuItem.Click += new System.EventHandler(this.aboutWindowsToolStripMenuItem_Click); // // Form1 // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1054, 575); + this.ClientSize = new System.Drawing.Size(790, 467); this.Controls.Add(this.text_area); this.Controls.Add(this.menuStrip1); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MainMenuStrip = this.menuStrip1; + this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.Name = "Form1"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "Notepad"; this.Load += new System.EventHandler(this.Form1_Load); this.menuStrip1.ResumeLayout(false); diff --git a/Notepad/Form1.cs b/Notepad/Form1.cs index 897d22f..958d09c 100644 --- a/Notepad/Form1.cs +++ b/Notepad/Form1.cs @@ -20,7 +20,7 @@ namespace Notepad { // Update strings - private readonly string _releaseURL = "http://git.vichingo455.freeddns.org/Vichingo455/Notepad/raw/branch/master/latest.txt"; + private readonly string _releaseURL = "https://git.vichingo455.freeddns.org/Vichingo455/Notepad/raw/branch/master/latest.txt"; public Version CurrentVersion = new Version(Application.ProductVersion); public Version LatestVersion; @@ -154,7 +154,11 @@ namespace Notepad private void aboutToolStripMenuItem_Click(object sender, EventArgs e) { - MessageBox.Show("Notepad\nVersion " + Program.GetCurrentVersionTostring() + "" + "\nMade by Vichingo455\nCopyright (C) 2025 Vichingo455. All rights reserved.\n\n\nReleased under GPL 3.0 License: you are free to\n- Modify\n- Use for business\n- Distribute\n- Use at home\n\nBut you have:\n- No liability\n- No warranty\n\nAt these conditions:\n- License and copyright notice\n- State changes\n- Disclose source\n- Same license", Text); +#if DEBUG + MessageBox.Show("Notepad\nVersion " + Program.GetCurrentVersionTostring() + " (Debug/Beta)" + "\nMade by Vichingo455\nCopyright (C) 2025 Vichingo455. All rights reserved.\n\n\nReleased under GPL 3.0 License: you are free to\n- Modify\n- Use for business\n- Distribute\n- Use at home\n\nBut you have:\n- No liability\n- No warranty\n\nAt these conditions:\n- License and copyright notice\n- State changes\n- Disclose source\n- Same license", Text); +#else + MessageBox.Show("Notepad\nVersion " + Program.GetCurrentVersionTostring() + "\nMade by Vichingo455\nCopyright (C) 2025 Vichingo455. All rights reserved.\n\n\nReleased under GPL 3.0 License: you are free to\n- Modify\n- Use for business\n- Distribute\n- Use at home\n\nBut you have:\n- No liability\n- No warranty\n\nAt these conditions:\n- License and copyright notice\n- State changes\n- Disclose source\n- Same license", Text); +#endif } /// /// Check for updates @@ -163,6 +167,7 @@ namespace Notepad { try { + ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12; //Fix HTTPS WebRequest hreq = WebRequest.Create(_releaseURL); hreq.Timeout = 10000; hreq.Headers.Set("Cache-Control", "no-cache, no-store, must-revalidate"); @@ -269,26 +274,18 @@ namespace Notepad private void Form1_Load(object sender, EventArgs e) { +#if DEBUG + var dialog = MessageBox.Show("This version is for testing purpouses only!!!\nYou should use it only for debugging.\nThe update feature is disabled. Continue?", Text, MessageBoxButtons.YesNo, MessageBoxIcon.None, MessageBoxDefaultButton.Button2); + if (dialog == DialogResult.No) + { + Environment.Exit(436); + } + checkForUpdatesToolStripMenuItem.Enabled = false; +#endif if (File.Exists(Global.savefilename)) { text_area.Text = File.ReadAllText(Global.savefilename); } - if (Global.confidential == "true") - { - var dialog = MessageBox.Show("This version is for testing purpouses only!!!\nYou should use it only for debugging.\nPublic publication of this version is fobidden and severally punished!! Do you agree?",Text,MessageBoxButtons.YesNo,MessageBoxIcon.None,MessageBoxDefaultButton.Button2); - if (dialog == DialogResult.Yes) - { - - } - else - { - Environment.Exit(436); - } - } - else - { - - } } private void aboutWindowsToolStripMenuItem_Click(object sender, EventArgs e) diff --git a/Notepad/Notepad.csproj b/Notepad/Notepad.csproj index b0ad1cc..c3e6919 100644 --- a/Notepad/Notepad.csproj +++ b/Notepad/Notepad.csproj @@ -8,7 +8,7 @@ WinExe Notepad Notepad - v4.5.2 + v4.5 512 true true @@ -37,6 +37,7 @@ false true true + AnyCPU @@ -125,6 +126,7 @@ True Resources.resx + True diff --git a/Notepad/Properties/AssemblyInfo.cs b/Notepad/Properties/AssemblyInfo.cs index a071b01..7fcae46 100644 --- a/Notepad/Properties/AssemblyInfo.cs +++ b/Notepad/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // È possibile specificare tutti i valori oppure impostare valori predefiniti per i numeri relativi alla revisione e alla build // usando l'asterisco '*' come illustrato di seguito: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.1.3.1")] -[assembly: AssemblyFileVersion("1.1.3.1")] +[assembly: AssemblyVersion("1.1.3.2")] +[assembly: AssemblyFileVersion("1.1.3.2")] diff --git a/Notepad/Properties/Resources.Designer.cs b/Notepad/Properties/Resources.Designer.cs index d1d1443..3111b33 100644 --- a/Notepad/Properties/Resources.Designer.cs +++ b/Notepad/Properties/Resources.Designer.cs @@ -1,69 +1,61 @@ //------------------------------------------------------------------------------ // -// Codice generato da uno strumento. -// Versione runtime:4.0.30319.42000 +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 // -// Le modifiche apportate a questo file possono causare un comportamento non corretto e andranno perse se -// il codice viene rigenerato. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. // //------------------------------------------------------------------------------ -namespace Notepad.Properties -{ - - +namespace Notepad.Properties { + using System; + + /// - /// Classe di risorse fortemente tipizzata per la ricerca di stringhe localizzate e così via. + /// A strongly-typed resource class, for looking up localized strings, etc. /// - // Questa classe è stata generata automaticamente dalla classe StronglyTypedResourceBuilder - // tramite uno strumento quale ResGen o Visual Studio. - // Per aggiungere o rimuovere un membro, modificare il file .ResX, quindi eseguire di nuovo ResGen - // con l'opzione /str oppure ricompilare il progetto VS. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + // This class was auto-generated by the StronglyTypedResourceBuilder + // class via a tool like ResGen or Visual Studio. + // To add or remove a member, edit your .ResX file then rerun ResGen + // with the /str option, or rebuild your VS project. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resources - { - + internal class Resources { + private static global::System.Resources.ResourceManager resourceMan; - + private static global::System.Globalization.CultureInfo resourceCulture; - + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Resources() - { + internal Resources() { } - + /// - /// Restituisce l'istanza di ResourceManager memorizzata nella cache e usata da questa classe. + /// Returns the cached ResourceManager instance used by this class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager - { - get - { - if ((resourceMan == null)) - { + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Notepad.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; } } - + /// - /// Esegue l'override della proprietà CurrentUICulture del thread corrente per tutte - /// le ricerche di risorse che utilizzano questa classe di risorse fortemente tipizzata. + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture - { - get - { + internal static global::System.Globalization.CultureInfo Culture { + get { return resourceCulture; } - set - { + set { resourceCulture = value; } } diff --git a/Notepad/Properties/Settings.Designer.cs b/Notepad/Properties/Settings.Designer.cs index e4cbbc0..dc9eaef 100644 --- a/Notepad/Properties/Settings.Designer.cs +++ b/Notepad/Properties/Settings.Designer.cs @@ -8,21 +8,17 @@ // //------------------------------------------------------------------------------ -namespace Notepad.Properties -{ - - +namespace Notepad.Properties { + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")] - internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase - { - + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.14.0.0")] + internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { + private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); - - public static Settings Default - { - get - { + + public static Settings Default { + get { return defaultInstance; } } diff --git a/latest.txt b/latest.txt index ab60e4b..b263cd3 100644 --- a/latest.txt +++ b/latest.txt @@ -1 +1 @@ -1.1.3.1 \ No newline at end of file +1.1.3.2 \ No newline at end of file