diff --git a/ShareX/Forms/MainForm.Designer.cs b/ShareX/Forms/MainForm.Designer.cs index e877121fb..83a80b5cc 100644 --- a/ShareX/Forms/MainForm.Designer.cs +++ b/ShareX/Forms/MainForm.Designer.cs @@ -230,6 +230,7 @@ private void InitializeComponent() this.tsmiTrayColorPicker = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiTrayScreenColorPicker = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiTrayRuler = new System.Windows.Forms.ToolStripMenuItem(); + this.tsmiTrayPinToScreen = new System.Windows.Forms.ToolStripMenuItem(); this.tssTrayTools1 = new System.Windows.Forms.ToolStripSeparator(); this.tsmiTrayImageEditor = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiTrayImageEffects = new System.Windows.Forms.ToolStripMenuItem(); @@ -283,7 +284,6 @@ private void InitializeComponent() this.ucTaskThumbnailView = new ShareX.TaskThumbnailView(); this.ttMain = new System.Windows.Forms.ToolTip(this.components); this.pToolbars = new System.Windows.Forms.Panel(); - this.tsmiTrayPinToScreen = new System.Windows.Forms.ToolStripMenuItem(); ((System.ComponentModel.ISupportInitialize)(this.scMain)).BeginInit(); this.scMain.Panel1.SuspendLayout(); this.scMain.Panel2.SuspendLayout(); @@ -1858,6 +1858,13 @@ private void InitializeComponent() resources.ApplyResources(this.tsmiTrayRuler, "tsmiTrayRuler"); this.tsmiTrayRuler.Click += new System.EventHandler(this.tsmiRuler_Click); // + // tsmiTrayPinToScreen + // + this.tsmiTrayPinToScreen.Image = global::ShareX.Properties.Resources.pin; + this.tsmiTrayPinToScreen.Name = "tsmiTrayPinToScreen"; + resources.ApplyResources(this.tsmiTrayPinToScreen, "tsmiTrayPinToScreen"); + this.tsmiTrayPinToScreen.Click += new System.EventHandler(this.tsmiPinToScreen_Click); + // // tssTrayTools1 // this.tssTrayTools1.Name = "tssTrayTools1"; @@ -2221,13 +2228,6 @@ private void InitializeComponent() this.pToolbars.Controls.Add(this.tsMain); this.pToolbars.Name = "pToolbars"; // - // tsmiTrayPinToScreen - // - this.tsmiTrayPinToScreen.Image = global::ShareX.Properties.Resources.pin; - this.tsmiTrayPinToScreen.Name = "tsmiTrayPinToScreen"; - resources.ApplyResources(this.tsmiTrayPinToScreen, "tsmiTrayPinToScreen"); - this.tsmiTrayPinToScreen.Click += new System.EventHandler(this.tsmiPinToScreen_Click); - // // MainForm // this.AllowDrop = true; diff --git a/ShareX/Forms/MainForm.cs b/ShareX/Forms/MainForm.cs index d876a6f58..8012b1d8d 100644 --- a/ShareX/Forms/MainForm.cs +++ b/ShareX/Forms/MainForm.cs @@ -1431,6 +1431,9 @@ private void lvUploads_KeyDown(object sender, KeyEventArgs e) case Keys.Control | Keys.E: uim.EditImage(); break; + case Keys.Control | Keys.P: + uim.PinToScreen(); + break; case Keys.Delete: RemoveSelectedItems(); break; diff --git a/ShareX/Forms/MainForm.resx b/ShareX/Forms/MainForm.resx index ac079134d..ce9a7c4d1 100644 --- a/ShareX/Forms/MainForm.resx +++ b/ShareX/Forms/MainForm.resx @@ -159,102 +159,6 @@ 0 - - Fill - - - 0, 0 - - - 335, 471 - - - 2 - - - lvUploads - - - ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=14.1.1.0, Culture=neutral, PublicKeyToken=null - - - scMain.Panel1 - - - 1 - - - scMain.Panel1 - - - System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - scMain - - - 0 - - - Fill - - - 0, 0 - - - 338, 471 - - - 0 - - - pbPreview - - - ShareX.HelpersLib.MyPictureBox, ShareX.HelpersLib, Version=14.1.1.0, Culture=neutral, PublicKeyToken=null - - - scMain.Panel2 - - - 0 - - - scMain.Panel2 - - - System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - scMain - - - 1 - - - 679, 471 - - - 335 - - - 6 - - - 1 - - - scMain - - - ShareX.HelpersLib.SplitContainerCustomSplitter, ShareX.HelpersLib, Version=14.1.1.0, Culture=neutral, PublicKeyToken=null - - - $this - - - 3 - Filename @@ -294,51 +198,108 @@ 145 + + Fill + + + 0, 0 + + + 335, 471 + + + 2 + + + lvUploads + + + ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=14.1.4.0, Culture=neutral, PublicKeyToken=null + + + scMain.Panel1 + + + 1 + + + scMain.Panel1 + + + System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + scMain + + + 0 + + + Fill + + + 0, 0 + + + 338, 471 + + + 0 + + + pbPreview + + + ShareX.HelpersLib.MyPictureBox, ShareX.HelpersLib, Version=14.1.4.0, Culture=neutral, PublicKeyToken=null + + + scMain.Panel2 + + + 0 + + + scMain.Panel2 + + + System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + scMain + + + 1 + + + 679, 471 + + + 335 + + + 6 + + + 1 + + + scMain + + + ShareX.HelpersLib.SplitContainerCustomSplitter, ShareX.HelpersLib, Version=14.1.4.0, Culture=neutral, PublicKeyToken=null + + + $this + + + 3 + 17, 17 Fill - - 0, 0 - - - 165, 0 - - - 6, 5, 6, 2 - - - 165, 471 - - - 1 - - - tsMain - - - ShareX.HelpersLib.ToolStripBorderRight, ShareX.HelpersLib, Version=14.1.1.0, Culture=neutral, PublicKeyToken=null - - - pToolbars - - - 0 - - - MiddleLeft - - - Magenta - - - 152, 20 - - - Capture - 191, 22 @@ -414,12 +375,6 @@ Show cursor - - 191, 22 - - - Screenshot delay - 126, 22 @@ -456,17 +411,23 @@ 5 seconds - + + 191, 22 + + + Screenshot delay + + MiddleLeft - + Magenta - + 152, 20 - - Upload + + Capture 203, 22 @@ -516,6 +477,18 @@ Tweet message... + + MiddleLeft + + + Magenta + + + 152, 20 + + + Upload + BottomLeft @@ -528,18 +501,6 @@ Workflows - - MiddleLeft - - - Magenta - - - 152, 20 - - - Tools - 184, 22 @@ -626,7 +587,6 @@ OCR... - 184, 22 @@ -679,6 +639,18 @@ DNS changer... + + MiddleLeft + + + Magenta + + + 152, 20 + + + Tools + 152, 6 @@ -706,18 +678,6 @@ After upload tasks - - MiddleLeft - - - Magenta - - - 152, 20 - - - Destinations - 219, 22 @@ -763,6 +723,18 @@ Custom uploader settings... + + MiddleLeft + + + Magenta + + + 152, 20 + + + Destinations + MiddleLeft @@ -841,18 +813,6 @@ 152, 6 - - MiddleLeft - - - Magenta - - - 152, 20 - - - Debug - 171, 22 @@ -889,6 +849,18 @@ Test URL sharing + + MiddleLeft + + + Magenta + + + 152, 20 + + + Debug + MiddleLeft @@ -912,7 +884,6 @@ Twitter... - @Invariant MiddleLeft @@ -925,7 +896,6 @@ Discord... - @Invariant MiddleLeft @@ -939,18 +909,36 @@ About... + + 0, 0 + + + 165, 0 + + + 6, 5, 6, 2 + + + 165, 471 + + + 1 + + + tsMain + + + ShareX.HelpersLib.ToolStripBorderRight, ShareX.HelpersLib, Version=14.1.4.0, Culture=neutral, PublicKeyToken=null + + + pToolbars + + + 0 + 286, 17 - - 229, 494 - - - cmsTaskInfo - - - System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 228, 22 @@ -963,15 +951,8 @@ Stop upload - - 228, 22 - - - Open - Enter - @Invariant 173, 22 @@ -1002,7 +983,6 @@ Ctrl+Enter - @Invariant 173, 22 @@ -1012,7 +992,6 @@ Shift+Enter - @Invariant 173, 22 @@ -1026,15 +1005,14 @@ Thumbnail file - + 228, 22 - - Copy + + Open Ctrl+C - @Invariant 233, 22 @@ -1065,7 +1043,6 @@ Shift+C - @Invariant 233, 22 @@ -1075,7 +1052,6 @@ Alt+C - @Invariant 233, 22 @@ -1175,7 +1151,6 @@ Ctrl+Shift+C - @Invariant 233, 22 @@ -1207,9 +1182,14 @@ False + + 228, 22 + + + Copy + Ctrl+U - @Invariant 228, 22 @@ -1219,7 +1199,6 @@ Ctrl+D - @Invariant 228, 22 @@ -1229,7 +1208,6 @@ Ctrl+E - @Invariant 228, 22 @@ -1243,6 +1221,9 @@ Add image effects... + + Ctrl+P + 228, 22 @@ -1257,7 +1238,6 @@ Del - @Invariant 228, 22 @@ -1267,7 +1247,6 @@ Shift+Del - @Invariant 228, 22 @@ -1311,12 +1290,6 @@ OCR image... - - 228, 22 - - - Combine images... - 188, 22 @@ -1329,6 +1302,12 @@ Combine vertically + + 228, 22 + + + Combine images... + 228, 22 @@ -1350,18 +1329,192 @@ Switch to thumbnail view + + 229, 494 + + + cmsTaskInfo + + + System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + 105, 17 190, 17 + + 191, 22 + + + Fullscreen + + + 191, 22 + + + Window + + + 191, 22 + + + Monitor + + + 191, 22 + + + Region + + + 191, 22 + + + Region (Light) + + + 191, 22 + + + Region (Transparent) + + + 191, 22 + + + Last region + + + 191, 22 + + + Screen recording + + + 191, 22 + + + Screen recording (GIF) + + + 191, 22 + + + Scrolling capture... + + + 191, 22 + + + Auto capture... + + + 188, 6 + + + 191, 22 + + + Show cursor + + + 126, 22 + + + No delay + + + 126, 22 + + + 1 second + + + 126, 22 + + + 2 seconds + + + 126, 22 + + + 3 seconds + + + 126, 22 + + + 4 seconds + + + 126, 22 + + + 5 seconds + + + 191, 22 + + + Screenshot delay + 200, 22 Capture + + 203, 22 + + + Upload file... + + + 203, 22 + + + Upload folder... + + + 203, 22 + + + Upload from clipboard... + + + 203, 22 + + + Upload text... + + + 203, 22 + + + Upload from URL... + + + 203, 22 + + + Drag and drop upload... + + + 203, 22 + + + Shorten URL... + + + 203, 22 + + + Tweet message... + 200, 22 @@ -1460,7 +1613,6 @@ OCR... - 184, 22 @@ -1534,6 +1686,51 @@ After upload tasks + + 219, 22 + + + Image uploaders + + + 219, 22 + + + Text uploaders + + + 219, 22 + + + File uploaders + + + 219, 22 + + + URL shorteners + + + 219, 22 + + + URL sharing services + + + 216, 6 + + + 219, 22 + + + Destination settings... + + + 219, 22 + + + Custom uploader settings... + 200, 22 @@ -1635,269 +1832,10 @@ ShareX - @Invariant - - - 191, 22 - - - Fullscreen - - - 191, 22 - - - Window - - - 191, 22 - - - Monitor - - - 191, 22 - - - Region - - - 191, 22 - - - Region (Light) - - - 191, 22 - - - Region (Transparent) - - - 191, 22 - - - Last region - - - 191, 22 - - - Screen recording - - - 191, 22 - - - Screen recording (GIF) - - - 191, 22 - - - Scrolling capture... - - - 191, 22 - - - Auto capture... - - - 188, 6 - - - 191, 22 - - - Show cursor - - - 191, 22 - - - Screenshot delay - - - 126, 22 - - - No delay - - - 126, 22 - - - 1 second - - - 126, 22 - - - 2 seconds - - - 126, 22 - - - 3 seconds - - - 126, 22 - - - 4 seconds - - - 126, 22 - - - 5 seconds - - - 203, 22 - - - Upload file... - - - 203, 22 - - - Upload folder... - - - 203, 22 - - - Upload from clipboard... - - - 203, 22 - - - Upload text... - - - 203, 22 - - - Upload from URL... - - - 203, 22 - - - Drag and drop upload... - - - 203, 22 - - - Shorten URL... - - - 203, 22 - - - Tweet message... - - - 219, 22 - - - Image uploaders - - - 219, 22 - - - Text uploaders - - - 219, 22 - - - File uploaders - - - 219, 22 - - - URL shorteners - - - 219, 22 - - - URL sharing services - - - 216, 6 - - - 219, 22 - - - Destination settings... - - - 219, 22 - - - Custom uploader settings... 405, 17 - - lblThumbnailViewTip - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - pThumbnailView - - - 0 - - - ucTaskThumbnailView - - - ShareX.TaskThumbnailView, ShareX, Version=14.1.1.0, Culture=neutral, PublicKeyToken=null - - - pThumbnailView - - - 1 - - - Fill - - - 165, 0 - - - 679, 471 - - - 7 - - - pThumbnailView - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 2 - True @@ -1953,7 +1891,7 @@ ucTaskThumbnailView - ShareX.TaskThumbnailView, ShareX, Version=14.1.1.0, Culture=neutral, PublicKeyToken=null + ShareX.TaskThumbnailView, ShareX, Version=14.1.4.0, Culture=neutral, PublicKeyToken=null pThumbnailView @@ -1961,6 +1899,30 @@ 1 + + Fill + + + 165, 0 + + + 679, 471 + + + 7 + + + pThumbnailView + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 2 + 567, 17 @@ -3167,6 +3129,12 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + tsmiTrayPinToScreen + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + tssTrayTools1 @@ -3461,16 +3429,10 @@ System.Windows.Forms.ToolTip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tsmiTrayPinToScreen - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - MainForm - ShareX.HelpersLib.HotkeyForm, ShareX.HelpersLib, Version=14.1.1.0, Culture=neutral, PublicKeyToken=null + ShareX.HelpersLib.HotkeyForm, ShareX.HelpersLib, Version=14.1.4.0, Culture=neutral, PublicKeyToken=null \ No newline at end of file