From eb87cc06ecf025b9012c90baf78d660f2c87077f Mon Sep 17 00:00:00 2001
From: Jaex <Jaex@users.noreply.github.com>
Date: Wed, 26 May 2021 04:43:07 +0300
Subject: [PATCH] Removed "Show" sub menu, instead moved items to parent menu

---
 .../HistoryItemManager_ContextMenu.cs         | 46 +++++--------------
 .../Properties/Resources.Designer.cs          | 11 +----
 ShareX.HistoryLib/Properties/Resources.resx   |  5 +-
 .../Properties/Resources.tr.resx              |  5 +-
 4 files changed, 15 insertions(+), 52 deletions(-)

diff --git a/ShareX.HistoryLib/HistoryItemManager_ContextMenu.cs b/ShareX.HistoryLib/HistoryItemManager_ContextMenu.cs
index d2c647952..b424da46d 100644
--- a/ShareX.HistoryLib/HistoryItemManager_ContextMenu.cs
+++ b/ShareX.HistoryLib/HistoryItemManager_ContextMenu.cs
@@ -68,7 +68,6 @@ public partial class HistoryItemManager
         private ToolStripMenuItem tsmiCopyFileName;
         private ToolStripMenuItem tsmiCopyFileNameWithExtension;
         private ToolStripMenuItem tsmiCopyFolder;
-        private ToolStripMenuItem tsmiShow;
         private ToolStripMenuItem tsmiShowImagePreview;
         private ToolStripMenuItem tsmiShowMoreInfo;
         private ToolStripMenuItem tsmiUploadFile;
@@ -111,7 +110,6 @@ private void InitializeComponent()
             tsmiCopyFileName = new ToolStripMenuItem();
             tsmiCopyFileNameWithExtension = new ToolStripMenuItem();
             tsmiCopyFolder = new ToolStripMenuItem();
-            tsmiShow = new ToolStripMenuItem();
             tsmiShowImagePreview = new ToolStripMenuItem();
             tsmiShowMoreInfo = new ToolStripMenuItem();
             tsmiUploadFile = new ToolStripMenuItem();
@@ -125,9 +123,10 @@ private void InitializeComponent()
             {
                 tsmiOpen,
                 tsmiCopy,
-                tsmiShow,
+                tsmiShowImagePreview,
                 tsmiUploadFile,
-                tsmiEditImage
+                tsmiEditImage,
+                tsmiShowMoreInfo
             });
             cmsHistory.Name = "cmsHistory";
             cmsHistory.ShowImageMargin = false;
@@ -396,17 +395,6 @@ private void InitializeComponent()
             tsmiCopyFolder.Text = Resources.HistoryItemManager_InitializeComponent_Folder;
             tsmiCopyFolder.Click += tsmiCopyFolder_Click;
             //
-            // tsmiShow
-            //
-            tsmiShow.DropDownItems.AddRange(new ToolStripItem[]
-            {
-                tsmiShowImagePreview,
-                tsmiShowMoreInfo
-            });
-            tsmiShow.Name = "tsmiShow";
-            tsmiShow.Size = new Size(127, 22);
-            tsmiShow.Text = Resources.HistoryItemManager_InitializeComponent_Show;
-            //
             // tsmiShowImagePreview
             //
             tsmiShowImagePreview.Name = "tsmiShowImagePreview";
@@ -501,16 +489,11 @@ public void UpdateContextMenu(int itemCount)
                 tsmiCopyFileNameWithExtension.Text = Resources.HistoryItemManager_InitializeComponent_File_name_with_extension + " (" + itemCount + ")";
                 tsmiCopyFolder.Text = Resources.HistoryItemManager_InitializeComponent_Folder + " (" + itemCount + ")";
 
-                // Show
-                tsmiShow.Enabled = false;
+                // Other
                 tsmiShowImagePreview.Enabled = false;
-                tsmiShowMoreInfo.Enabled = false;
-
-                // Upload file
                 tsmiUploadFile.Enabled = false;
-
-                // Edit image
                 tsmiEditImage.Enabled = false;
+                tsmiShowMoreInfo.Enabled = false;
             }
             else
             {
@@ -570,16 +553,11 @@ public void UpdateContextMenu(int itemCount)
                 tsmiCopyFileNameWithExtension.Text = Resources.HistoryItemManager_InitializeComponent_File_name_with_extension;
                 tsmiCopyFolder.Text = Resources.HistoryItemManager_InitializeComponent_Folder;
 
-                // Show
-                tsmiShow.Enabled = true;
+                // Other
                 tsmiShowImagePreview.Enabled = IsImageFile;
-                tsmiShowMoreInfo.Enabled = true;
-
-                // Upload file
                 tsmiUploadFile.Enabled = uploadFile != null && IsFileExist;
-
-                // Edit image
                 tsmiEditImage.Enabled = editImage != null && IsImageFile;
+                tsmiShowMoreInfo.Enabled = true;
             }
 
             cmsHistory.ResumeLayout();
@@ -720,11 +698,6 @@ private void tsmiShowImagePreview_Click(object sender, EventArgs e)
             ShowImagePreview();
         }
 
-        private void tsmiShowMoreInfo_Click(object sender, EventArgs e)
-        {
-            ShowMoreInfo();
-        }
-
         private void tsmiUploadFile_Click(object sender, EventArgs e)
         {
             UploadFile();
@@ -734,5 +707,10 @@ private void tsmiEditImage_Click(object sender, EventArgs e)
         {
             EditImage();
         }
+
+        private void tsmiShowMoreInfo_Click(object sender, EventArgs e)
+        {
+            ShowMoreInfo();
+        }
     }
 }
\ No newline at end of file
diff --git a/ShareX.HistoryLib/Properties/Resources.Designer.cs b/ShareX.HistoryLib/Properties/Resources.Designer.cs
index 7fc0f8121..38d630d26 100644
--- a/ShareX.HistoryLib/Properties/Resources.Designer.cs
+++ b/ShareX.HistoryLib/Properties/Resources.Designer.cs
@@ -270,7 +270,7 @@ internal class Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Image preview.
+        ///   Looks up a localized string similar to Image preview....
         /// </summary>
         internal static string HistoryItemManager_InitializeComponent_Image_preview {
             get {
@@ -332,15 +332,6 @@ internal class Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Show.
-        /// </summary>
-        internal static string HistoryItemManager_InitializeComponent_Show {
-            get {
-                return ResourceManager.GetString("HistoryItemManager_InitializeComponent_Show", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Text.
         /// </summary>
diff --git a/ShareX.HistoryLib/Properties/Resources.resx b/ShareX.HistoryLib/Properties/Resources.resx
index 67686ea0d..2ae66cc58 100644
--- a/ShareX.HistoryLib/Properties/Resources.resx
+++ b/ShareX.HistoryLib/Properties/Resources.resx
@@ -124,7 +124,7 @@
     <value>Thumbnail URL</value>
   </data>
   <data name="HistoryItemManager_InitializeComponent_Image_preview" xml:space="preserve">
-    <value>Image preview</value>
+    <value>Image preview...</value>
   </data>
   <data name="HistoryItemManager_InitializeComponent_File" xml:space="preserve">
     <value>File</value>
@@ -151,9 +151,6 @@
   <data name="HistoryItemManager_InitializeComponent_Copy" xml:space="preserve">
     <value>Copy</value>
   </data>
-  <data name="HistoryItemManager_InitializeComponent_Show" xml:space="preserve">
-    <value>Show</value>
-  </data>
   <data name="HistoryItemManager_InitializeComponent_HTML_image" xml:space="preserve">
     <value>HTML image</value>
   </data>
diff --git a/ShareX.HistoryLib/Properties/Resources.tr.resx b/ShareX.HistoryLib/Properties/Resources.tr.resx
index 53b1d62ad..fa7edd5c2 100644
--- a/ShareX.HistoryLib/Properties/Resources.tr.resx
+++ b/ShareX.HistoryLib/Properties/Resources.tr.resx
@@ -117,9 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="HistoryItemManager_InitializeComponent_Show" xml:space="preserve">
-    <value>Göster</value>
-  </data>
   <data name="HistoryForm_UpdateItemCount___Filtered___0_" xml:space="preserve">
     <value>Filtrelenmiş: {0}</value>
   </data>
@@ -169,7 +166,7 @@
     <value>Resim</value>
   </data>
   <data name="HistoryItemManager_InitializeComponent_Image_preview" xml:space="preserve">
-    <value>Resim önizleme</value>
+    <value>Resim önizleme...</value>
   </data>
   <data name="HistoryItemManager_InitializeComponent_More_info" xml:space="preserve">
     <value>Daha fazla bilgi</value>