Resolved #41

Save file and close it, without closing the app
2026-03-11 08:55:25 +00:00 · 2019-11-05 22:00:38 +02:00 · 2019-11-05 22:00:38 +02:00 · 30a4c3f9b5
commit 30a4c3f9b5
parent cf9953e9f5
4 changed files with 74 additions and 17 deletions
--- a/Notepad/MainForm.Designer.cs
+++ b/Notepad/MainForm.Designer.cs
@ -37,6 +37,7 @@ public void InitializeComponent()
            this.mainMenuSeparator1 = new System.Windows.Forms.ToolStripSeparator();
            this.saveMainMenu = new System.Windows.Forms.ToolStripMenuItem();
            this.saveAsMainMenu = new System.Windows.Forms.ToolStripMenuItem();
+            this.saveCloseFileMainMenu = new System.Windows.Forms.ToolStripMenuItem();
            this.mainMenuSeparator2 = new System.Windows.Forms.ToolStripSeparator();
            this.openFileLocationMainMenu = new System.Windows.Forms.ToolStripMenuItem();
            this.deleteFileMainMenu = new System.Windows.Forms.ToolStripMenuItem();
@ -172,6 +173,7 @@ public void InitializeComponent()
            this.mainMenuSeparator1,
            this.saveMainMenu,
            this.saveAsMainMenu,
+            this.saveCloseFileMainMenu,
            this.mainMenuSeparator2,
            this.openFileLocationMainMenu,
            this.deleteFileMainMenu,
@ -187,7 +189,7 @@ public void InitializeComponent()
            // 
            this.newMainMenu.Name = "newMainMenu";
            this.newMainMenu.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.N)));
-            this.newMainMenu.Size = new System.Drawing.Size(195, 22);
+            this.newMainMenu.Size = new System.Drawing.Size(232, 22);
            this.newMainMenu.Text = "New";
            this.newMainMenu.Click += new System.EventHandler(this.NewMainMenu_Click);
            // 
@ -195,20 +197,20 @@ public void InitializeComponent()
            // 
            this.openMainMenu.Name = "openMainMenu";
            this.openMainMenu.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O)));
-            this.openMainMenu.Size = new System.Drawing.Size(195, 22);
+            this.openMainMenu.Size = new System.Drawing.Size(232, 22);
            this.openMainMenu.Text = "Open...";
            this.openMainMenu.Click += new System.EventHandler(this.OpenMainMenu_Click);
            // 
            // mainMenuSeparator1
            // 
            this.mainMenuSeparator1.Name = "mainMenuSeparator1";
-            this.mainMenuSeparator1.Size = new System.Drawing.Size(192, 6);
+            this.mainMenuSeparator1.Size = new System.Drawing.Size(229, 6);
            // 
            // saveMainMenu
            // 
            this.saveMainMenu.Name = "saveMainMenu";
            this.saveMainMenu.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S)));
-            this.saveMainMenu.Size = new System.Drawing.Size(195, 22);
+            this.saveMainMenu.Size = new System.Drawing.Size(232, 22);
            this.saveMainMenu.Text = "Save";
            this.saveMainMenu.Click += new System.EventHandler(this.SaveMainMenu_Click);
            // 
@ -217,39 +219,48 @@ public void InitializeComponent()
            this.saveAsMainMenu.Name = "saveAsMainMenu";
            this.saveAsMainMenu.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) 
            | System.Windows.Forms.Keys.S)));
-            this.saveAsMainMenu.Size = new System.Drawing.Size(195, 22);
+            this.saveAsMainMenu.Size = new System.Drawing.Size(232, 22);
            this.saveAsMainMenu.Text = "Save As...";
            this.saveAsMainMenu.Click += new System.EventHandler(this.SaveAsMainMenu_Click);
            // 
+            // saveCloseFileMainMenu
+            // 
+            this.saveCloseFileMainMenu.Name = "saveCloseFileMainMenu";
+            this.saveCloseFileMainMenu.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.Shift) 
+            | System.Windows.Forms.Keys.S)));
+            this.saveCloseFileMainMenu.Size = new System.Drawing.Size(232, 22);
+            this.saveCloseFileMainMenu.Text = "Save && Close File";
+            this.saveCloseFileMainMenu.Click += new System.EventHandler(this.SaveCloseFileMainMenu_Click);
+            // 
            // mainMenuSeparator2
            // 
            this.mainMenuSeparator2.Name = "mainMenuSeparator2";
-            this.mainMenuSeparator2.Size = new System.Drawing.Size(192, 6);
+            this.mainMenuSeparator2.Size = new System.Drawing.Size(229, 6);
            // 
            // openFileLocationMainMenu
            // 
            this.openFileLocationMainMenu.Name = "openFileLocationMainMenu";
-            this.openFileLocationMainMenu.Size = new System.Drawing.Size(195, 22);
+            this.openFileLocationMainMenu.Size = new System.Drawing.Size(232, 22);
            this.openFileLocationMainMenu.Text = "Open File Location";
            this.openFileLocationMainMenu.Click += new System.EventHandler(this.OpenFileLocationMainMenu_Click);
            // 
            // deleteFileMainMenu
            // 
            this.deleteFileMainMenu.Name = "deleteFileMainMenu";
-            this.deleteFileMainMenu.Size = new System.Drawing.Size(195, 22);
+            this.deleteFileMainMenu.Size = new System.Drawing.Size(232, 22);
            this.deleteFileMainMenu.Text = "Delete File";
            this.deleteFileMainMenu.Click += new System.EventHandler(this.DeleteFileToolStripMenuItem_Click);
            // 
            // mainMenuSeparator3
            // 
            this.mainMenuSeparator3.Name = "mainMenuSeparator3";
-            this.mainMenuSeparator3.Size = new System.Drawing.Size(192, 6);
+            this.mainMenuSeparator3.Size = new System.Drawing.Size(229, 6);
            // 
            // exitMainMenu
            // 
            this.exitMainMenu.Name = "exitMainMenu";
            this.exitMainMenu.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Q)));
-            this.exitMainMenu.Size = new System.Drawing.Size(195, 22);
+            this.exitMainMenu.Size = new System.Drawing.Size(232, 22);
            this.exitMainMenu.Text = "Exit";
            this.exitMainMenu.Click += new System.EventHandler(this.ExitMainMenu_Click);
            // 
@ -1327,5 +1338,6 @@ public void InitializeComponent()
        private System.Windows.Forms.ToolStripStatusLabel statusPanelModifiedLabel;
        private System.Windows.Forms.ToolStripStatusLabel statusPanelSizeLabel;
        private System.Windows.Forms.Timer statusPanelTimer;
+        private System.Windows.Forms.ToolStripMenuItem saveCloseFileMainMenu;
    }
 }
--- a/Notepad/MainForm.cs
+++ b/Notepad/MainForm.cs
@ -625,6 +625,7 @@ public void MenuIcons(bool menuIcons)
                checkForUpdatesMainMenu.Image = Resources.upload_cloud;
                aboutMainMenu.Image = Resources.information;
                alwaysOnTopMainMenu.Image = Resources.applications_blue;
+                saveCloseFileMainMenu.Image = Resources.disk__minus;
            }
            else
            {
@ -1104,6 +1105,23 @@ private void SaveAsMainMenu_Click(object sender, EventArgs e)
            StatusPanelFileInfo();
        }

+        private async void SaveCloseFileMainMenu_Click(object sender, EventArgs e)
+        {
+            using (StreamWriter writer = new StreamWriter(filePath))
+            {
+                writer.Write(AES.Encrypt(richTextBox.Text, PublicVar.encryptionKey.Get(), null, settings.HashAlgorithm, Convert.ToInt32(settings.PasswordIterations), Convert.ToInt32(settings.KeySize)));
+                writer.Close();
+            }
+            PublicVar.encryptionKey.Set(null);
+            richTextBox.Clear();
+            PublicVar.openFileName = "";
+            filePath = "";
+            Text = PublicVar.appName;
+            statusPanelModifiedLabel.Text = "Modified";
+            statusPanelModifiedLabel.ToolTipText = null;
+            statusPanelSizeLabel.Text = "Size";
+        }
+
        private void OpenFileLocationMainMenu_Click(object sender, EventArgs e)
        {
            Process.Start("explorer.exe", @"/select, " + filePath);
@ -1147,11 +1165,13 @@ private void FileMainMenu_DropDownOpened(object sender, EventArgs e)
            {
                openFileLocationMainMenu.Enabled = false;
                deleteFileMainMenu.Enabled = false;
+                saveCloseFileMainMenu.Enabled = false;
            }
            else
            {
                openFileLocationMainMenu.Enabled = true;
                deleteFileMainMenu.Enabled = true;
+                saveCloseFileMainMenu.Enabled = true;
            }
        }
        /*File*/
--- a/Notepad/Properties/Resources.Designer.cs
+++ b/Notepad/Properties/Resources.Designer.cs
@ -130,6 +130,16 @@ internal static System.Drawing.Bitmap cross_button {
            }
        }
        
+        /// <summary>
+        ///   Поиск локализованного ресурса типа System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap disk__minus {
+            get {
+                object obj = ResourceManager.GetObject("disk__minus", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
        /// <summary>
        ///   Поиск локализованного ресурса типа System.Drawing.Bitmap.
        /// </summary>
--- a/Notepad/Properties/Resources.resx
+++ b/Notepad/Properties/Resources.resx
@ -1014,15 +1014,30 @@
 </value>
  </data>
  <data name="application_blue" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFSSURBVDhPpdPBKwRhGMfx92j/AVquLkoODg5ikz1I
+        SltqS0kkTnLCYR0oaU8upA2rjVJSkr0hamUlXmSVtkSZtpnMNHa3mcwYM37muTt411Pf46ee5/AwAP+K
+        daTUsF/ajwtGJsxCSSU9deGU47lvLNx6mL9yMJu1MZP5wOSJifEjA0PHBiKnJkJnFhovPxG8+ULw3C6T
+        ZW2rBT6WfsfogY6RfQ3De28Y3JUxsFNA//Yrolsv6Es9IZLMo3ftET2JB3Sv3KNr+Q410xlOJ3D/loqG
+        LGtfl7nneXBdVygyZFlrQuKO48C2baHIkGUtS8/csiyYpikUGbKseTHPDcNAsVgUigxZ1hTP8VKpBE3T
+        hCJDljXMXXNd1yHLslBkyLL6WJarqgpJkoQiQ5bVTRxyWklRFKHIkGVVnbGNQHSTVxJZ5k/Ar9qvVjAy
+        gV9f9O+B/QDSyg0U5iAfSgAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <data name="disk__minus" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAABUklEQVQ4T6XTwSsEYRjH8fdo
-        /wFari5KDg4OYpM9SEpbaktJJE5ywmEdKGlPLqQNq41SUpK9IWplJV5klbZEmbaZzDR2t5nMGDN+5rk7
-        eNdT3+OnnufwMAD/inWk1LBf2o8LRibMQkklPXXhlOO5byzcepi/cjCbtTGT+cDkiYnxIwNDxwYipyZC
-        ZxYaLz8RvPlC8Nwuk2VtqwU+ln7H6IGOkX0Nw3tvGNyVMbBTQP/2K6JbL+hLPSGSzKN37RE9iQd0r9yj
-        a/kONdMZTidw/5aKhixrX5e553lwXVcoMmRZa0LijuPAtm2hyJBlLUvP3LIsmKYpFBmyrHkxzw3DQLFY
-        FIoMWdYUz/FSqQRN04QiQ5Y1zF1zXdchy7JQZMiy+liWq6oKSZKEIkOW1U0cclpJURShyJBlVZ2xjUB0
-        k1cSWeZPwK/ar1YwMoFfX/Tvgf0A0soNFOYgH0oAAAAASUVORK5CYII=
+        YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAAB6klEQVQ4T6XOXUhTcRjH8Wdn
+        u5f0IoiIontljqDbiKCii0CWKLZy5egi6ibwIkmhF3VtbcJsZqQW5VbD6AhR24qWCydSF2VFRvaCURkD
+        X/BlMNiv/+/gotgYRgc+HPj/n+9zjgD4L+I0+xT/MeWivbXVtRacZRMS9TSqBYp3cnBBLQRyRYy7XIja
+        bL/pW6zol3U/BkWuyGGzl3wTA2lkczlkstkCkepqrDgcBXpEnsshs4e6Xvb9xJIanlteLnDX6cRlq9UQ
+        VMv8m6vQIuUz5/gHDrObAi96v2E2k8H3+fmSOMNZNie1XSINWjsFx4PTmFFf+5ROl8QZzrJhK/XaeepN
+        BT7j49Qcvi4ulsQZzrJhK3XaWbqW9H9ArH1iTTjLhq3Uam00kPBOovPADXTYrxfFu7yx7i9gw1bs2hm6
+        +ajzDTx1t5BKjWFkJPkXnvHuTnMSvoYwnnVNgQ1bqdFOUzh64RX8B28jHk+gZU+3YXj4gYFnvOOC4NF7
+        eHrpPdiwlf1aMw3FO14j0DgEXY8ZbwqHdUP+jAv6jz/EE887sGErFaaNst1Us2Ov6USsbffV2Ugkip4m
+        3RAK3Tfkz7ggdCqBx+634DxbPpuUyq2y7chOaRq1WCzuYnj3J5vs61ttpUxZr2z4R6qRsl9qPVVwJqmK
+        bwAAAABJRU5ErkJggg==
 </value>
  </data>
 </root>