mirror of
https://github.com/ShareX/ShareX.git
synced 2024-06-30 20:20:34 +12:00
Change how hotkey tips looks in main window
This commit is contained in:
Jaex
parent
31c94623da
commit
9a92490f91
|
|
@ -1705,7 +1705,7 @@ internal class Resources {
|
|||
}
|
||||
|
||||
/// <summary>
|
||||
/// 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.
|
||||
/// </summary>
|
||||
internal static string HotkeyType_ScreenRecorder {
|
||||
get {
|
||||
|
|
@ -1759,7 +1759,7 @@ internal class Resources {
|
|||
}
|
||||
|
||||
/// <summary>
|
||||
/// 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).
|
||||
/// </summary>
|
||||
internal static string HotkeyType_ScreenRecorderGIF {
|
||||
get {
|
||||
|
|
|
|||
|
|
@ -546,7 +546,7 @@ Would you like to download it?</value>
|
|||
<value>Tools</value>
|
||||
</data>
|
||||
<data name="HotkeyType_ScreenRecorderGIF" xml:space="preserve">
|
||||
<value>Start/Stop screen recording (GIF) using custom region</value>
|
||||
<value>Start/Stop screen recording (GIF)</value>
|
||||
</data>
|
||||
<data name="YouTubeVideoPrivacy_Unlisted" xml:space="preserve">
|
||||
<value>Unlisted</value>
|
||||
|
|
@ -615,7 +615,7 @@ Would you like to download it?</value>
|
|||
<value>Copy file path to clipboard</value>
|
||||
</data>
|
||||
<data name="HotkeyType_ScreenRecorder" xml:space="preserve">
|
||||
<value>Start/Stop screen recording using custom region</value>
|
||||
<value>Start/Stop screen recording</value>
|
||||
</data>
|
||||
<data name="HotkeyType_FTPClient_Category" xml:space="preserve">
|
||||
<value>Tools</value>
|
||||
|
|
|
|||
36
ShareX/Forms/MainForm.Designer.cs
generated
36
ShareX/Forms/MainForm.Designer.cs
generated
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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
|
||||
{
|
||||
|
|
|
|||
|
|
@ -125,25 +125,25 @@
|
|||
<data name="scMain.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>165, 0</value>
|
||||
</data>
|
||||
<data name="lblListViewTip.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<value>Top, Bottom, Left, Right</value>
|
||||
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
<data name="lblListViewTip.AutoSize" type="System.Boolean, mscorlib">
|
||||
<value>True</value>
|
||||
</data>
|
||||
<data name="lblListViewTip.Font" type="System.Drawing.Font, System.Drawing">
|
||||
<value>Microsoft Sans Serif, 12pt</value>
|
||||
<value>Consolas, 9.75pt</value>
|
||||
</data>
|
||||
<data name="lblListViewTip.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
|
||||
<value>NoControl</value>
|
||||
</data>
|
||||
<data name="lblListViewTip.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>8, 40</value>
|
||||
<value>0, 20</value>
|
||||
</data>
|
||||
<data name="lblListViewTip.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
|
||||
<value>10, 0, 10, 0</value>
|
||||
<value>10, 10, 10, 10</value>
|
||||
</data>
|
||||
<data name="lblListViewTip.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>320, 408</value>
|
||||
<value>20, 35</value>
|
||||
</data>
|
||||
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
<data name="lblListViewTip.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>1</value>
|
||||
</data>
|
||||
|
|
@ -1840,7 +1840,7 @@
|
|||
<value>Exit</value>
|
||||
</data>
|
||||
<data name="cmsTray.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>192, 506</value>
|
||||
<value>192, 484</value>
|
||||
</data>
|
||||
<data name=">>cmsTray.Name" xml:space="preserve">
|
||||
<value>cmsTray</value>
|
||||
|
|
@ -1941,11 +1941,14 @@
|
|||
<data name=">>pNews.ZOrder" xml:space="preserve">
|
||||
<value>2</value>
|
||||
</data>
|
||||
<data name="lblThumbnailViewTip.AutoSize" type="System.Boolean, mscorlib">
|
||||
<value>True</value>
|
||||
</data>
|
||||
<data name="lblThumbnailViewTip.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
|
||||
<value>Fill</value>
|
||||
</data>
|
||||
<data name="lblThumbnailViewTip.Font" type="System.Drawing.Font, System.Drawing">
|
||||
<value>Microsoft Sans Serif, 12pt</value>
|
||||
<value>Consolas, 9.75pt</value>
|
||||
</data>
|
||||
<data name="lblThumbnailViewTip.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
|
||||
<value>NoControl</value>
|
||||
|
|
@ -1954,10 +1957,10 @@
|
|||
<value>0, 0</value>
|
||||
</data>
|
||||
<data name="lblThumbnailViewTip.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
|
||||
<value>20, 20, 20, 20</value>
|
||||
<value>10, 10, 10, 10</value>
|
||||
</data>
|
||||
<data name="lblThumbnailViewTip.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>679, 471</value>
|
||||
<value>20, 35</value>
|
||||
</data>
|
||||
<data name="lblThumbnailViewTip.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>2</value>
|
||||
|
|
@ -2481,6 +2484,12 @@
|
|||
<data name=">>tsmiVideoThumbnailer.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>tsmiClipboardViewer.Name" xml:space="preserve">
|
||||
<value>tsmiClipboardViewer</value>
|
||||
</data>
|
||||
<data name=">>tsmiClipboardViewer.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>tsmiTweetMessage.Name" xml:space="preserve">
|
||||
<value>tsmiTweetMessage</value>
|
||||
</data>
|
||||
|
|
@ -3393,6 +3402,12 @@
|
|||
<data name=">>tsmiTrayVideoThumbnailer.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>tsmiTrayClipboardViewer.Name" xml:space="preserve">
|
||||
<value>tsmiTrayClipboardViewer</value>
|
||||
</data>
|
||||
<data name=">>tsmiTrayClipboardViewer.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>tsmiTrayTweetMessage.Name" xml:space="preserve">
|
||||
<value>tsmiTrayTweetMessage</value>
|
||||
</data>
|
||||
|
|
@ -3651,18 +3666,6 @@
|
|||
<data name=">>tsbGitHub.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>tsmiClipboardViewer.Name" xml:space="preserve">
|
||||
<value>tsmiClipboardViewer</value>
|
||||
</data>
|
||||
<data name=">>tsmiClipboardViewer.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>tsmiTrayClipboardViewer.Name" xml:space="preserve">
|
||||
<value>tsmiTrayClipboardViewer</value>
|
||||
</data>
|
||||
<data name=">>tsmiTrayClipboardViewer.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>$this.Name" xml:space="preserve">
|
||||
<value>MainForm</value>
|
||||
</data>
|
||||
|
|
|
|||
Loading…
Reference in a new issue