From 9a92490f91c1c681060c0ffe0e3d0be30ceaf063 Mon Sep 17 00:00:00 2001 From: Jaex Date: Sun, 20 Sep 2020 16:23:20 +0300 Subject: [PATCH] Change how hotkey tips looks in main window --- .../Properties/Resources.Designer.cs | 4 +- ShareX.HelpersLib/Properties/Resources.resx | 4 +- ShareX/Forms/MainForm.Designer.cs | 36 +++++++------- ShareX/Forms/MainForm.cs | 23 +++++++-- ShareX/Forms/MainForm.resx | 49 ++++++++++--------- 5 files changed, 67 insertions(+), 49 deletions(-) diff --git a/ShareX.HelpersLib/Properties/Resources.Designer.cs b/ShareX.HelpersLib/Properties/Resources.Designer.cs index 013789f67..6eec9eb85 100644 --- a/ShareX.HelpersLib/Properties/Resources.Designer.cs +++ b/ShareX.HelpersLib/Properties/Resources.Designer.cs @@ -1705,7 +1705,7 @@ internal class Resources { } /// - /// Looks up a localized string similar to Start/Stop screen recording using custom region. + /// Looks up a localized string similar to Start/Stop screen recording. /// internal static string HotkeyType_ScreenRecorder { get { @@ -1759,7 +1759,7 @@ internal class Resources { } /// - /// Looks up a localized string similar to Start/Stop screen recording (GIF) using custom region. + /// Looks up a localized string similar to Start/Stop screen recording (GIF). /// internal static string HotkeyType_ScreenRecorderGIF { get { diff --git a/ShareX.HelpersLib/Properties/Resources.resx b/ShareX.HelpersLib/Properties/Resources.resx index 78cade920..24258d15f 100644 --- a/ShareX.HelpersLib/Properties/Resources.resx +++ b/ShareX.HelpersLib/Properties/Resources.resx @@ -546,7 +546,7 @@ Would you like to download it? Tools - Start/Stop screen recording (GIF) using custom region + Start/Stop screen recording (GIF) Unlisted @@ -615,7 +615,7 @@ Would you like to download it? Copy file path to clipboard - Start/Stop screen recording using custom region + Start/Stop screen recording Tools diff --git a/ShareX/Forms/MainForm.Designer.cs b/ShareX/Forms/MainForm.Designer.cs index 04614a742..63974a23c 100644 --- a/ShareX/Forms/MainForm.Designer.cs +++ b/ShareX/Forms/MainForm.Designer.cs @@ -88,6 +88,7 @@ private void InitializeComponent() this.tsmiImageThumbnailer = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiVideoConverter = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiVideoThumbnailer = new System.Windows.Forms.ToolStripMenuItem(); + this.tsmiClipboardViewer = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiTweetMessage = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiMonitorTest = new System.Windows.Forms.ToolStripMenuItem(); this.tssMain1 = new System.Windows.Forms.ToolStripSeparator(); @@ -242,6 +243,7 @@ private void InitializeComponent() this.tsmiTrayImageThumbnailer = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiTrayVideoConverter = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiTrayVideoThumbnailer = new System.Windows.Forms.ToolStripMenuItem(); + this.tsmiTrayClipboardViewer = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiTrayTweetMessage = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiTrayMonitorTest = new System.Windows.Forms.ToolStripMenuItem(); this.tssTray1 = new System.Windows.Forms.ToolStripSeparator(); @@ -293,8 +295,6 @@ private void InitializeComponent() this.tsbPatreon = new System.Windows.Forms.ToolStripButton(); this.tsbBitcoin = new System.Windows.Forms.ToolStripButton(); this.tsbGitHub = new System.Windows.Forms.ToolStripButton(); - this.tsmiClipboardViewer = new System.Windows.Forms.ToolStripMenuItem(); - this.tsmiTrayClipboardViewer = new System.Windows.Forms.ToolStripMenuItem(); ((System.ComponentModel.ISupportInitialize)(this.scMain)).BeginInit(); this.scMain.Panel1.SuspendLayout(); this.scMain.Panel2.SuspendLayout(); @@ -791,6 +791,13 @@ private void InitializeComponent() resources.ApplyResources(this.tsmiVideoThumbnailer, "tsmiVideoThumbnailer"); this.tsmiVideoThumbnailer.Click += new System.EventHandler(this.tsmiVideoThumbnailer_Click); // + // tsmiClipboardViewer + // + this.tsmiClipboardViewer.Image = global::ShareX.Properties.Resources.clipboard_block; + this.tsmiClipboardViewer.Name = "tsmiClipboardViewer"; + resources.ApplyResources(this.tsmiClipboardViewer, "tsmiClipboardViewer"); + this.tsmiClipboardViewer.Click += new System.EventHandler(this.tsmiClipboardViewer_Click); + // // tsmiTweetMessage // this.tsmiTweetMessage.Image = global::ShareX.Properties.Resources.Twitter; @@ -1962,6 +1969,13 @@ private void InitializeComponent() resources.ApplyResources(this.tsmiTrayVideoThumbnailer, "tsmiTrayVideoThumbnailer"); this.tsmiTrayVideoThumbnailer.Click += new System.EventHandler(this.tsmiVideoThumbnailer_Click); // + // tsmiTrayClipboardViewer + // + this.tsmiTrayClipboardViewer.Image = global::ShareX.Properties.Resources.clipboard_block; + this.tsmiTrayClipboardViewer.Name = "tsmiTrayClipboardViewer"; + resources.ApplyResources(this.tsmiTrayClipboardViewer, "tsmiTrayClipboardViewer"); + this.tsmiTrayClipboardViewer.Click += new System.EventHandler(this.tsmiClipboardViewer_Click); + // // tsmiTrayTweetMessage // this.tsmiTrayTweetMessage.Image = global::ShareX.Properties.Resources.Twitter; @@ -2248,8 +2262,8 @@ private void InitializeComponent() // // lblThumbnailViewTip // - this.lblThumbnailViewTip.BackColor = System.Drawing.Color.Transparent; resources.ApplyResources(this.lblThumbnailViewTip, "lblThumbnailViewTip"); + this.lblThumbnailViewTip.BackColor = System.Drawing.Color.Transparent; this.lblThumbnailViewTip.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(228)))), ((int)(((byte)(228)))), ((int)(((byte)(228))))); this.lblThumbnailViewTip.Name = "lblThumbnailViewTip"; this.lblThumbnailViewTip.UseMnemonic = false; @@ -2343,20 +2357,6 @@ private void InitializeComponent() this.tsbGitHub.Padding = new System.Windows.Forms.Padding(1); this.tsbGitHub.Click += new System.EventHandler(this.TsbGitHub_Click); // - // tsmiClipboardViewer - // - this.tsmiClipboardViewer.Image = global::ShareX.Properties.Resources.clipboard_block; - this.tsmiClipboardViewer.Name = "tsmiClipboardViewer"; - resources.ApplyResources(this.tsmiClipboardViewer, "tsmiClipboardViewer"); - this.tsmiClipboardViewer.Click += new System.EventHandler(this.tsmiClipboardViewer_Click); - // - // tsmiTrayClipboardViewer - // - this.tsmiTrayClipboardViewer.Image = global::ShareX.Properties.Resources.clipboard_block; - this.tsmiTrayClipboardViewer.Name = "tsmiTrayClipboardViewer"; - resources.ApplyResources(this.tsmiTrayClipboardViewer, "tsmiTrayClipboardViewer"); - this.tsmiTrayClipboardViewer.Click += new System.EventHandler(this.tsmiClipboardViewer_Click); - // // MainForm // this.AllowDrop = true; @@ -2379,6 +2379,7 @@ private void InitializeComponent() this.DragEnter += new System.Windows.Forms.DragEventHandler(this.MainForm_DragEnter); this.Resize += new System.EventHandler(this.MainForm_Resize); this.scMain.Panel1.ResumeLayout(false); + this.scMain.Panel1.PerformLayout(); this.scMain.Panel2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.scMain)).EndInit(); this.scMain.ResumeLayout(false); @@ -2388,6 +2389,7 @@ private void InitializeComponent() this.cmsTray.ResumeLayout(false); this.pNews.ResumeLayout(false); this.pThumbnailView.ResumeLayout(false); + this.pThumbnailView.PerformLayout(); this.pToolbars.ResumeLayout(false); this.pToolbars.PerformLayout(); this.tsSocialButtons.ResumeLayout(false); diff --git a/ShareX/Forms/MainForm.cs b/ShareX/Forms/MainForm.cs index 0bf43195b..8bcb68a25 100644 --- a/ShareX/Forms/MainForm.cs +++ b/ShareX/Forms/MainForm.cs @@ -449,15 +449,28 @@ private void UpdateMainFormTip() { StringBuilder sb = new StringBuilder(); - sb.AppendLine(Resources.MainForm_UpdateMainFormTip_Currently_configured_hotkeys_); - sb.AppendLine(); + //sb.AppendLine(Resources.MainForm_UpdateMainFormTip_Currently_configured_hotkeys_); + //sb.AppendLine(); - foreach (HotkeySettings hotkey in hotkeys) + int maxHotkeyLength = hotkeys.Max(x => x.HotkeyInfo.ToString().Length); + int maxDescriptionLength = hotkeys.Max(x => x.TaskSettings.ToString().Length); + + sb.AppendFormat("┌{0}┬{1}┐\r\n", new string('─', maxHotkeyLength + 2), new string('─', maxDescriptionLength + 2)); + + for (int i = 0; i < hotkeys.Count; i++) { - sb.AppendFormat("{0} | {1}\r\n", hotkey.HotkeyInfo, hotkey.TaskSettings); + sb.AppendFormat("│ {0} │ {1} │\r\n", hotkeys[i].HotkeyInfo.ToString().PadRight(maxHotkeyLength), + hotkeys[i].TaskSettings.ToString().PadRight(maxDescriptionLength)); + + if (i + 1 < hotkeys.Count) + { + sb.AppendFormat("├{0}┼{1}┤\r\n", new string('─', maxHotkeyLength + 2), new string('─', maxDescriptionLength + 2)); + } } - lblListViewTip.Text = lblThumbnailViewTip.Text = sb.ToString().Trim(); + sb.AppendFormat("└{0}┴{1}┘", new string('─', maxHotkeyLength + 2), new string('─', maxDescriptionLength + 2)); + + lblListViewTip.Text = lblThumbnailViewTip.Text = sb.ToString(); } else { diff --git a/ShareX/Forms/MainForm.resx b/ShareX/Forms/MainForm.resx index 4bc776941..27c21caf2 100644 --- a/ShareX/Forms/MainForm.resx +++ b/ShareX/Forms/MainForm.resx @@ -125,25 +125,25 @@ 165, 0 - - Top, Bottom, Left, Right + + + True - Microsoft Sans Serif, 12pt + Consolas, 9.75pt NoControl - 8, 40 + 0, 20 - 10, 0, 10, 0 + 10, 10, 10, 10 - 320, 408 + 20, 35 - 1 @@ -1840,7 +1840,7 @@ Exit - 192, 506 + 192, 484 cmsTray @@ -1941,11 +1941,14 @@ 2 + + True + Fill - Microsoft Sans Serif, 12pt + Consolas, 9.75pt NoControl @@ -1954,10 +1957,10 @@ 0, 0 - 20, 20, 20, 20 + 10, 10, 10, 10 - 679, 471 + 20, 35 2 @@ -2481,6 +2484,12 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + tsmiClipboardViewer + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + tsmiTweetMessage @@ -3393,6 +3402,12 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + tsmiTrayClipboardViewer + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + tsmiTrayTweetMessage @@ -3651,18 +3666,6 @@ System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tsmiClipboardViewer - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tsmiTrayClipboardViewer - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - MainForm