diff --git a/ShareX.HelpersLib/Native/NativeConstants.cs b/ShareX.HelpersLib/Native/NativeConstants.cs index 656f8b8d8..1c8c0890d 100644 --- a/ShareX.HelpersLib/Native/NativeConstants.cs +++ b/ShareX.HelpersLib/Native/NativeConstants.cs @@ -27,6 +27,14 @@ namespace ShareX.HelpersLib { public static class NativeConstants { + public const int GWL_WNDPROC = -4; + public const int GWL_HINSTANCE = -6; + public const int GWL_HWNDPARENT = -8; + public const int GWL_STYLE = -16; + public const int GWL_EXSTYLE = -20; + public const int GWL_USERDATA = -21; + public const int GWL_ID = -12; + public const int GCL_HICONSM = -34; public const int GCL_HICON = -14; public const int ICON_SMALL = 0; @@ -35,7 +43,6 @@ public static class NativeConstants public const int SC_MINIMIZE = 0xF020; public const int HT_CAPTION = 2; public const int CURSOR_SHOWING = 1; - public const int GWL_STYLE = -16; public const int DWM_TNP_RECTDESTINATION = 0x1; public const int DWM_TNP_RECTSOURCE = 0x2; public const int DWM_TNP_OPACITY = 0x4; diff --git a/ShareX.HelpersLib/Native/NativeMethods.cs b/ShareX.HelpersLib/Native/NativeMethods.cs index 4fb8cbe42..9ee001908 100644 --- a/ShareX.HelpersLib/Native/NativeMethods.cs +++ b/ShareX.HelpersLib/Native/NativeMethods.cs @@ -159,8 +159,17 @@ public static partial class NativeMethods [DllImport("user32.dll")] public static extern IntPtr GetWindowDC(IntPtr hWnd); - [DllImport("user32.dll")] - public static extern ulong GetWindowLong(IntPtr hWnd, int nIndex); + [DllImport("user32.dll", CharSet = CharSet.Auto, EntryPoint = "GetWindowLong")] + public static extern IntPtr GetWindowLong32(IntPtr hWnd, int nIndex); + + [DllImport("user32.dll", CharSet = CharSet.Auto, EntryPoint = "GetWindowLongPtr")] + public static extern IntPtr GetWindowLongPtr64(IntPtr hWnd, int nIndex); + + [DllImport("user32.dll", CharSet = CharSet.Auto, EntryPoint = "SetWindowLong")] + public static extern IntPtr SetWindowLongPtr32(IntPtr hWnd, int nIndex, IntPtr dwNewLong); + + [DllImport("user32.dll", CharSet = CharSet.Auto, EntryPoint = "SetWindowLongPtr")] + public static extern IntPtr SetWindowLongPtr64(IntPtr hWnd, int nIndex, IntPtr dwNewLong); [DllImport("user32.dll")] [return: MarshalAs(UnmanagedType.Bool)] diff --git a/ShareX.HelpersLib/Native/NativeMethods_Helpers.cs b/ShareX.HelpersLib/Native/NativeMethods_Helpers.cs index 361bfda73..3e9da3e3d 100644 --- a/ShareX.HelpersLib/Native/NativeMethods_Helpers.cs +++ b/ShareX.HelpersLib/Native/NativeMethods_Helpers.cs @@ -125,6 +125,26 @@ public static IntPtr GetClassLongPtrSafe(IntPtr hWnd, int nIndex) return new IntPtr(GetClassLong(hWnd, nIndex)); } + public static IntPtr GetWindowLong(IntPtr hWnd, int nIndex) + { + if (IntPtr.Size == 4) + { + return GetWindowLong32(hWnd, nIndex); + } + + return GetWindowLongPtr64(hWnd, nIndex); + } + + public static IntPtr SetWindowLong(IntPtr hWnd, int nIndex, IntPtr dwNewLong) + { + if (IntPtr.Size == 4) + { + return SetWindowLongPtr32(hWnd, nIndex, dwNewLong); + } + + return SetWindowLongPtr64(hWnd, nIndex, dwNewLong); + } + private static Icon GetSmallApplicationIcon(IntPtr handle) { SendMessageTimeout(handle, (int)WindowsMessages.GETICON, NativeConstants.ICON_SMALL2, 0, SendMessageTimeoutFlags.SMTO_ABORTIFHUNG, 1000, out IntPtr iconHandle); diff --git a/ShareX.HelpersLib/Native/WindowInfo.cs b/ShareX.HelpersLib/Native/WindowInfo.cs index 8e5e9a64a..4c3aede91 100644 --- a/ShareX.HelpersLib/Native/WindowInfo.cs +++ b/ShareX.HelpersLib/Native/WindowInfo.cs @@ -80,7 +80,29 @@ public int ProcessId public Rectangle ClientRectangle => NativeMethods.GetClientRect(Handle); - public WindowStyles Styles => (WindowStyles)NativeMethods.GetWindowLong(Handle, NativeConstants.GWL_STYLE); + public WindowStyles Style + { + get + { + return (WindowStyles)(ulong)NativeMethods.GetWindowLong(Handle, NativeConstants.GWL_STYLE); + } + set + { + NativeMethods.SetWindowLong(Handle, NativeConstants.GWL_STYLE, (IntPtr)value); + } + } + + public WindowStyles ExStyle + { + get + { + return (WindowStyles)(ulong)NativeMethods.GetWindowLong(Handle, NativeConstants.GWL_EXSTYLE); + } + set + { + NativeMethods.SetWindowLong(Handle, NativeConstants.GWL_EXSTYLE, (IntPtr)value); + } + } public Icon Icon => NativeMethods.GetApplicationIcon(Handle); @@ -115,6 +137,21 @@ public void Restore() } } + public void SetWindowPos(SetWindowPosFlags flags) + { + SetWindowPos(0, 0, 0, 0, flags); + } + + public void SetWindowPos(Rectangle rect, SetWindowPosFlags flags) + { + SetWindowPos(rect.X, rect.Y, rect.Width, rect.Height, flags); + } + + public void SetWindowPos(int x, int y, int width, int height, SetWindowPosFlags flags) + { + NativeMethods.SetWindowPos(Handle, IntPtr.Zero, x, y, width, height, flags); + } + public override string ToString() { return Text; diff --git a/ShareX/Forms/BorderlessWindowForm.Designer.cs b/ShareX/Forms/BorderlessWindowForm.Designer.cs new file mode 100644 index 000000000..bc4da12c5 --- /dev/null +++ b/ShareX/Forms/BorderlessWindowForm.Designer.cs @@ -0,0 +1,91 @@ + +namespace ShareX +{ + partial class BorderlessWindowForm + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.lblWindowTitle = new System.Windows.Forms.Label(); + this.txtWindowTitle = new System.Windows.Forms.TextBox(); + this.btnMakeWindowBorderless = new System.Windows.Forms.Button(); + this.SuspendLayout(); + // + // lblWindowTitle + // + this.lblWindowTitle.AutoSize = true; + this.lblWindowTitle.Location = new System.Drawing.Point(13, 16); + this.lblWindowTitle.Name = "lblWindowTitle"; + this.lblWindowTitle.Size = new System.Drawing.Size(68, 13); + this.lblWindowTitle.TabIndex = 0; + this.lblWindowTitle.Text = "Window title:"; + // + // txtWindowTitle + // + this.txtWindowTitle.Location = new System.Drawing.Point(16, 32); + this.txtWindowTitle.Name = "txtWindowTitle"; + this.txtWindowTitle.Size = new System.Drawing.Size(264, 20); + this.txtWindowTitle.TabIndex = 1; + this.txtWindowTitle.TextChanged += new System.EventHandler(this.txtWindowTitle_TextChanged); + // + // btnMakeWindowBorderless + // + this.btnMakeWindowBorderless.Enabled = false; + this.btnMakeWindowBorderless.Location = new System.Drawing.Point(16, 56); + this.btnMakeWindowBorderless.Name = "btnMakeWindowBorderless"; + this.btnMakeWindowBorderless.Size = new System.Drawing.Size(264, 32); + this.btnMakeWindowBorderless.TabIndex = 2; + this.btnMakeWindowBorderless.Text = "Make window borderless"; + this.btnMakeWindowBorderless.UseVisualStyleBackColor = true; + this.btnMakeWindowBorderless.Click += new System.EventHandler(this.btnMakeWindowBorderless_Click); + // + // BorderlessWindowForm + // + this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; + this.ClientSize = new System.Drawing.Size(297, 104); + this.Controls.Add(this.btnMakeWindowBorderless); + this.Controls.Add(this.txtWindowTitle); + this.Controls.Add(this.lblWindowTitle); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; + this.MaximizeBox = false; + this.MinimizeBox = false; + this.Name = "BorderlessWindowForm"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.Text = "ShareX - Borderless window"; + this.Shown += new System.EventHandler(this.BorderlessWindowForm_Shown); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.Label lblWindowTitle; + private System.Windows.Forms.TextBox txtWindowTitle; + private System.Windows.Forms.Button btnMakeWindowBorderless; + } +} \ No newline at end of file diff --git a/ShareX/Forms/BorderlessWindowForm.cs b/ShareX/Forms/BorderlessWindowForm.cs new file mode 100644 index 000000000..0f87e677e --- /dev/null +++ b/ShareX/Forms/BorderlessWindowForm.cs @@ -0,0 +1,128 @@ +#region License Information (GPL v3) + +/* + ShareX - A program that allows you to take screenshots and share any file type + Copyright (c) 2007-2021 ShareX Team + + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + Optionally you can also view the license at . +*/ + +#endregion License Information (GPL v3) + +using ShareX.HelpersLib; +using System; +using System.Diagnostics; +using System.Drawing; +using System.Windows.Forms; + +namespace ShareX +{ + public partial class BorderlessWindowForm : Form + { + public string DefaultWindowTitle { get; set; } = "minecraft"; + + public BorderlessWindowForm() + { + InitializeComponent(); + ShareXResources.ApplyTheme(this); + } + + private void MakeWindowBorderless(string title) + { + if (!string.IsNullOrEmpty(title)) + { + IntPtr hWnd = SearchWindow(title); + + if (hWnd == IntPtr.Zero) + { + // TODO: Translate + MessageBox.Show("Unable to find a window with specified window title.", "ShareX", MessageBoxButtons.OK, MessageBoxIcon.Information); + return; + } + + WindowInfo windowInfo = new WindowInfo(hWnd); + + if (windowInfo.IsMinimized) + { + windowInfo.Restore(); + } + + WindowStyles windowStyle = windowInfo.Style; + windowStyle &= ~(WindowStyles.WS_CAPTION | WindowStyles.WS_THICKFRAME | WindowStyles.WS_MINIMIZEBOX | WindowStyles.WS_MAXIMIZEBOX | WindowStyles.WS_SYSMENU); + windowInfo.Style = windowStyle; + + WindowStyles windowExStyle = windowInfo.ExStyle; + windowExStyle &= ~(WindowStyles.WS_EX_DLGMODALFRAME | WindowStyles.WS_EX_CLIENTEDGE | WindowStyles.WS_EX_STATICEDGE); + windowInfo.ExStyle = windowExStyle; + + Rectangle rect = Screen.FromHandle(hWnd).Bounds; + + SetWindowPosFlags setWindowPosFlag = SetWindowPosFlags.SWP_FRAMECHANGED | SetWindowPosFlags.SWP_NOZORDER | SetWindowPosFlags.SWP_NOOWNERZORDER; + + if (rect.IsEmpty) + { + setWindowPosFlag |= SetWindowPosFlags.SWP_NOMOVE | SetWindowPosFlags.SWP_NOSIZE; + } + + windowInfo.SetWindowPos(rect, setWindowPosFlag); + } + } + + private IntPtr SearchWindow(string title) + { + foreach (Process process in Process.GetProcesses()) + { + if (process.MainWindowTitle.Contains(title, StringComparison.InvariantCultureIgnoreCase)) + { + return process.MainWindowHandle; + } + } + + return IntPtr.Zero; + } + + #region Form events + + private void BorderlessWindowForm_Shown(object sender, EventArgs e) + { + if (!string.IsNullOrEmpty(DefaultWindowTitle)) + { + txtWindowTitle.Text = DefaultWindowTitle; + btnMakeWindowBorderless.Focus(); + } + } + + private void txtWindowTitle_TextChanged(object sender, EventArgs e) + { + btnMakeWindowBorderless.Enabled = !string.IsNullOrEmpty(txtWindowTitle.Text); + } + + private void btnMakeWindowBorderless_Click(object sender, EventArgs e) + { + try + { + MakeWindowBorderless(txtWindowTitle.Text); + } + catch (Exception ex) + { + ex.ShowError(); + } + } + + #endregion + } +} \ No newline at end of file diff --git a/ShareX/Forms/BorderlessWindowForm.resx b/ShareX/Forms/BorderlessWindowForm.resx new file mode 100644 index 000000000..1af7de150 --- /dev/null +++ b/ShareX/Forms/BorderlessWindowForm.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/ShareX/Forms/InspectWindowForm.cs b/ShareX/Forms/InspectWindowForm.cs index 612802769..a2be00485 100644 --- a/ShareX/Forms/InspectWindowForm.cs +++ b/ShareX/Forms/InspectWindowForm.cs @@ -80,7 +80,7 @@ private void UpdateWindowInfo() AddInfo(Resources.InspectWindow_ProcessIdentifier, SelectedWindow.ProcessId.ToString()); AddInfo(Resources.InspectWindow_WindowRectangle, SelectedWindow.Rectangle.ToStringProper()); AddInfo(Resources.InspectWindow_ClientRectangle, SelectedWindow.ClientRectangle.ToStringProper()); - AddInfo(Resources.InspectWindow_WindowStyles, SelectedWindow.Styles.ToString()); + AddInfo(Resources.InspectWindow_WindowStyles, SelectedWindow.Style.ToString()); } catch { diff --git a/ShareX/Forms/MainForm.Designer.cs b/ShareX/Forms/MainForm.Designer.cs index 9a4dc2b5e..1db86c178 100644 --- a/ShareX/Forms/MainForm.Designer.cs +++ b/ShareX/Forms/MainForm.Designer.cs @@ -96,6 +96,7 @@ private void InitializeComponent() this.tsmiInspectWindow = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiMonitorTest = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiDNSChanger = new System.Windows.Forms.ToolStripMenuItem(); + this.tsmiBorderlessWindow = new System.Windows.Forms.ToolStripMenuItem(); this.tssMain1 = new System.Windows.Forms.ToolStripSeparator(); this.tsddbAfterCaptureTasks = new System.Windows.Forms.ToolStripDropDownButton(); this.tsddbAfterUploadTasks = new System.Windows.Forms.ToolStripDropDownButton(); @@ -305,6 +306,7 @@ 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.tsmiTrayBorderlessWindow = new System.Windows.Forms.ToolStripMenuItem(); ((System.ComponentModel.ISupportInitialize)(this.scMain)).BeginInit(); this.scMain.Panel1.SuspendLayout(); this.scMain.Panel2.SuspendLayout(); @@ -707,6 +709,7 @@ private void InitializeComponent() this.tsmiIndexFolder, this.tssTools4, this.tsmiClipboardViewer, + this.tsmiBorderlessWindow, this.tsmiInspectWindow, this.tsmiMonitorTest, this.tsmiDNSChanger}); @@ -853,6 +856,13 @@ private void InitializeComponent() resources.ApplyResources(this.tsmiDNSChanger, "tsmiDNSChanger"); this.tsmiDNSChanger.Click += new System.EventHandler(this.tsmiDNSChanger_Click); // + // tsmiBorderlessWindow + // + this.tsmiBorderlessWindow.Image = global::ShareX.Properties.Resources.application_resize_full; + this.tsmiBorderlessWindow.Name = "tsmiBorderlessWindow"; + resources.ApplyResources(this.tsmiBorderlessWindow, "tsmiBorderlessWindow"); + this.tsmiBorderlessWindow.Click += new System.EventHandler(this.tsmiBorderlessWindow_Click); + // // tssMain1 // this.tssMain1.Margin = new System.Windows.Forms.Padding(0, 3, 0, 6); @@ -1960,6 +1970,7 @@ private void InitializeComponent() this.tsmiTrayIndexFolder, this.tssTrayTools4, this.tsmiTrayClipboardViewer, + this.tsmiTrayBorderlessWindow, this.tsmiTrayInspectWindow, this.tsmiTrayMonitorTest, this.tsmiTrayDNSChanger}); @@ -2417,6 +2428,13 @@ private void InitializeComponent() this.pToolbars.Controls.Add(this.tsMain); this.pToolbars.Name = "pToolbars"; // + // tsmiTrayBorderlessWindow + // + this.tsmiTrayBorderlessWindow.Image = global::ShareX.Properties.Resources.application_resize_full; + this.tsmiTrayBorderlessWindow.Name = "tsmiTrayBorderlessWindow"; + resources.ApplyResources(this.tsmiTrayBorderlessWindow, "tsmiTrayBorderlessWindow"); + this.tsmiTrayBorderlessWindow.Click += new System.EventHandler(this.tsmiBorderlessWindow_Click); + // // MainForm // this.AllowDrop = true; @@ -2731,5 +2749,7 @@ private void InitializeComponent() private System.Windows.Forms.ToolStripMenuItem tsmiTrayTwitter; private System.Windows.Forms.ToolStripMenuItem tsmiTrayDiscord; private System.Windows.Forms.ToolStripButton tsbDonate; + private System.Windows.Forms.ToolStripMenuItem tsmiBorderlessWindow; + private System.Windows.Forms.ToolStripMenuItem tsmiTrayBorderlessWindow; } } \ No newline at end of file diff --git a/ShareX/Forms/MainForm.cs b/ShareX/Forms/MainForm.cs index b2cbbabc3..d2568fff9 100644 --- a/ShareX/Forms/MainForm.cs +++ b/ShareX/Forms/MainForm.cs @@ -1824,6 +1824,11 @@ private void tsmiClipboardViewer_Click(object sender, EventArgs e) TaskHelpers.OpenClipboardViewer(); } + private void tsmiBorderlessWindow_Click(object sender, EventArgs e) + { + TaskHelpers.OpenBorderlessWindow(); + } + private void tsmiInspectWindow_Click(object sender, EventArgs e) { TaskHelpers.OpenInspectWindow(); diff --git a/ShareX/Forms/MainForm.resx b/ShareX/Forms/MainForm.resx index 63d03bf98..856983330 100644 --- a/ShareX/Forms/MainForm.resx +++ b/ShareX/Forms/MainForm.resx @@ -159,6 +159,102 @@ 0 + + Fill + + + 0, 0 + + + 335, 471 + + + 2 + + + lvUploads + + + ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=13.6.2.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=13.6.2.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=13.6.2.0, Culture=neutral, PublicKeyToken=null + + + $this + + + 3 + Filename @@ -198,108 +294,51 @@ 145 - - Fill - - - 0, 0 - - - 335, 471 - - - 2 - - - lvUploads - - - ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=13.5.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=13.5.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=13.5.1.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=13.6.2.0, Culture=neutral, PublicKeyToken=null + + + pToolbars + + + 0 + + + MiddleLeft + + + Magenta + + + 152, 20 + + + Capture + 191, 22 @@ -381,6 +420,12 @@ Show cursor + + 191, 22 + + + Screenshot delay + 126, 22 @@ -417,23 +462,17 @@ 5 seconds - - 191, 22 - - - Screenshot delay - - + MiddleLeft - + Magenta - + 152, 20 - - Capture + + Upload 203, 22 @@ -483,18 +522,6 @@ Tweet message... - - MiddleLeft - - - Magenta - - - 152, 20 - - - Upload - BottomLeft @@ -507,6 +534,18 @@ Workflows + + MiddleLeft + + + Magenta + + + 152, 20 + + + Tools + 184, 22 @@ -621,17 +660,11 @@ DNS changer... - - MiddleLeft + + 184, 22 - - Magenta - - - 152, 20 - - - Tools + + Borderless window... 152, 6 @@ -660,6 +693,18 @@ After upload tasks + + MiddleLeft + + + Magenta + + + 152, 20 + + + Destinations + 219, 22 @@ -705,18 +750,6 @@ Custom uploader settings... - - MiddleLeft - - - Magenta - - - 152, 20 - - - Destinations - MiddleLeft @@ -795,6 +828,18 @@ 152, 6 + + MiddleLeft + + + Magenta + + + 152, 20 + + + Debug + 171, 22 @@ -831,18 +876,6 @@ Test URL sharing - - MiddleLeft - - - Magenta - - - 152, 20 - - - Debug - MiddleLeft @@ -866,7 +899,6 @@ Twitter... - @Invariant MiddleLeft @@ -879,7 +911,6 @@ Discord... - @Invariant MiddleLeft @@ -893,36 +924,18 @@ About... - - 0, 0 - - - 165, 0 - - - 6, 5, 6, 2 - - - 165, 471 - - - 1 - - - tsMain - - - ShareX.HelpersLib.ToolStripBorderRight, ShareX.HelpersLib, Version=13.5.1.0, Culture=neutral, PublicKeyToken=null - - - pToolbars - - - 0 - 286, 17 + + 229, 582 + + + cmsTaskInfo + + + System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + 228, 22 @@ -935,9 +948,14 @@ Stop upload + + 228, 22 + + + Open + Enter - @Invariant 173, 22 @@ -968,7 +986,6 @@ Ctrl+Enter - @Invariant 173, 22 @@ -978,7 +995,6 @@ Shift+Enter - @Invariant 173, 22 @@ -992,15 +1008,14 @@ Thumbnail file - + 228, 22 - - Open + + Copy Ctrl+C - @Invariant 233, 22 @@ -1031,7 +1046,6 @@ Shift+C - @Invariant 233, 22 @@ -1041,7 +1055,6 @@ Alt+C - @Invariant 233, 22 @@ -1141,7 +1154,6 @@ Ctrl+Shift+C - @Invariant 233, 22 @@ -1173,15 +1185,8 @@ False - - 228, 22 - - - Copy - Ctrl+U - @Invariant 228, 22 @@ -1191,7 +1196,6 @@ Ctrl+D - @Invariant 228, 22 @@ -1201,7 +1205,6 @@ Ctrl+E - @Invariant 228, 22 @@ -1223,7 +1226,6 @@ Del - @Invariant 228, 22 @@ -1233,7 +1235,6 @@ Shift+Del - @Invariant 228, 22 @@ -1277,6 +1278,12 @@ OCR image... + + 228, 22 + + + Combine images... + 188, 22 @@ -1289,12 +1296,6 @@ Combine vertically - - 228, 22 - - - Combine images... - 228, 22 @@ -1322,6 +1323,12 @@ Hide columns + + 228, 22 + + + Image preview + 130, 22 @@ -1355,11 +1362,11 @@ Bottom - + 228, 22 - - Image preview + + Thumbnail title 114, 22 @@ -1388,12 +1395,6 @@ Bottom - - 228, 22 - - - Thumbnail title - 228, 22 @@ -1406,198 +1407,18 @@ Switch to thumbnail view - - 229, 582 - - - 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 - - - Text capture (OCR)... - - - 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 @@ -1706,6 +1527,12 @@ Clipboard viewer... + + 184, 22 + + + Borderless window... + 184, 22 @@ -1745,51 +1572,6 @@ 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 @@ -1844,42 +1626,6 @@ 197, 6 - - 171, 22 - - - Debug log... - - - 171, 22 - - - Test image upload - - - 171, 22 - - - Test text upload - - - 171, 22 - - - Test file upload - - - 171, 22 - - - Test URL shortener - - - 171, 22 - - - Test URL sharing - 200, 22 @@ -1897,14 +1643,12 @@ Twitter... - @Invariant 200, 22 Discord... - @Invariant 200, 22 @@ -1962,11 +1706,310 @@ 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 + + + Text capture (OCR)... + + + 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... + + + 171, 22 + + + Debug log... + + + 171, 22 + + + Test image upload + + + 171, 22 + + + Test text upload + + + 171, 22 + + + Test file upload + + + 171, 22 + + + Test URL shortener + + + 171, 22 + + + Test URL sharing 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=13.6.2.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 @@ -2022,7 +2065,7 @@ ucTaskThumbnailView - ShareX.TaskThumbnailView, ShareX, Version=13.5.1.0, Culture=neutral, PublicKeyToken=null + ShareX.TaskThumbnailView, ShareX, Version=13.6.2.0, Culture=neutral, PublicKeyToken=null pThumbnailView @@ -2030,30 +2073,6 @@ 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 @@ -2468,6 +2487,12 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + tsmiBorderlessWindow + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + tssMain1 @@ -3686,10 +3711,16 @@ System.Windows.Forms.ToolTip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + tsmiTrayBorderlessWindow + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + MainForm - ShareX.HelpersLib.HotkeyForm, ShareX.HelpersLib, Version=13.5.1.0, Culture=neutral, PublicKeyToken=null + ShareX.HelpersLib.HotkeyForm, ShareX.HelpersLib, Version=13.6.2.0, Culture=neutral, PublicKeyToken=null \ No newline at end of file diff --git a/ShareX/Properties/Resources.Designer.cs b/ShareX/Properties/Resources.Designer.cs index 72318b2a5..a41aa9911 100644 --- a/ShareX/Properties/Resources.Designer.cs +++ b/ShareX/Properties/Resources.Designer.cs @@ -458,6 +458,16 @@ public class Resources { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap application_resize_full { + get { + object obj = ResourceManager.GetObject("application-resize-full", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -3117,14 +3127,12 @@ public class Resources { "ShareX", resourceCulture); } } - + /// /// Looks up a localized string similar to Your system admin disabled the upload feature.. /// - public static string YourSystemAdminDisabledTheUploadFeature - { - get - { + public static string YourSystemAdminDisabledTheUploadFeature { + get { return ResourceManager.GetString("YourSystemAdminDisabledTheUploadFeature", resourceCulture); } } diff --git a/ShareX/Properties/Resources.resx b/ShareX/Properties/Resources.resx index 7abe0b9a9..1642f1c17 100644 --- a/ShareX/Properties/Resources.resx +++ b/ShareX/Properties/Resources.resx @@ -226,6 +226,9 @@ ..\Resources\control.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\heart.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Changelog @@ -258,11 +261,6 @@ Would you like to restart ShareX? Indonesian - - Hold left down to drag -Right click to open menu -Middle click to close - ..\Resources\application-browser.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -278,8 +276,8 @@ Middle click to close ..\Resources\exclamation.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - Task settings + + Class name Currently configured hotkeys: @@ -296,6 +294,9 @@ Middle click to close Disable hotkeys + + Do you really want to delete this file? + Missing @@ -311,8 +312,8 @@ Middle click to close Copied to clipboard: {0} - - ..\Resources\network-cloud.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\clock.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a Clipboard content: File (Count: {0}) @@ -332,12 +333,6 @@ Middle click to close ..\Resources\monitor.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - Use new name: - - - ..\Resources\clipboard-block.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - Are you sure you want to upload this screenshot? Press 'No' to cancel the current upload and disable screenshot auto uploading. @@ -401,12 +396,18 @@ Would you like to automatically download it? URL to download and upload + + Clipboard content: Text (Length: {0}) + Preview: ..\Resources\Rectangle.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + Process file name + ..\Resources\layout-select-content.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -416,8 +417,8 @@ Would you like to automatically download it? X: {0}, Y: {1}, Width: {2}, Height: {3} - - ..\Resources\heart.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + Would you like to reset ShareX settings? {0} is about to be uploaded to {1}. You may choose a different destination. @@ -429,9 +430,8 @@ Would you like to automatically download it? Please select a different hotkey or quit the conflicting application and reopen ShareX. - - Drop -here + + Task settings Startup has been disabled by your organization @@ -452,9 +452,6 @@ Are you sure you want to continue? ..\Resources\application-list.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - URL shortener: {0} - ..\Resources\crown.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -485,8 +482,8 @@ Are you sure you want to continue? ..\Resources\application-monitor.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\camera.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + Use new name: ..\Resources\wrench-screwdriver.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -512,12 +509,15 @@ Are you sure you want to continue? Startup has been enabled by your organization - - ..\Resources\clock-select.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + Choose ShareX personal folder path {0} configuration is invalid or missing. Please check "Destination settings" window to configure it. + + Process name + Shorten URL ({0}) @@ -560,6 +560,9 @@ Are you sure you want to continue? Text upload test + + Window rectangle + Would you like to enable image effects? @@ -595,8 +598,8 @@ You can later disable it from "After capture tasks" menu. ..\Resources\disk-rename.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\cross.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\clipboard-block.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\image-export.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -631,6 +634,9 @@ You can later disable it from "After capture tasks" menu. ..\Resources\cn.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\resources\twitter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Task completed @@ -649,6 +655,9 @@ You can later disable it from "After capture tasks" menu. Hungarian + + ..\Resources\Bing.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Japanese @@ -735,8 +744,8 @@ Would you like to restart ShareX? ..\Resources\folder-stand.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - Choose ShareX personal folder path + + URL shortener: {0} ..\Resources\pt.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -777,9 +786,15 @@ Would you like to restart ShareX? Done + + Contributors + ..\Resources\traffic-cone.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + Window styles + You can add workflows from hotkey settings... @@ -792,6 +807,9 @@ Would you like to restart ShareX? Downloading + + ..\Resources\network-cloud.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + French @@ -813,6 +831,9 @@ Would you like to restart ShareX? Hide menu + + Window title + ..\Resources\vn.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -825,6 +846,9 @@ Would you like to restart ShareX? ..\Resources\GitHub.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\resources\discord.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Stopped @@ -843,6 +867,9 @@ Would you like to restart ShareX? Upload with ShareX + + ..\Resources\clock-select.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\inbox.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -865,17 +892,21 @@ Please run ShareX as administrator to change personal folder path. ..\Resources\disk.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + Process identifier + ..\Resources\uac.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - Contributors + + Window handle Italian - - Do you really want to delete this file? + + Drop +here ..\Resources\nl.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -892,9 +923,6 @@ Please run ShareX as administrator to change personal folder path. ..\Resources\images-stack.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - Would you like to reset ShareX settings? - ..\Resources\layout-select-sidebar.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -913,6 +941,12 @@ Please run ShareX as administrator to change personal folder path. ..\Resources\color.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\camera.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + Client rectangle + ..\Resources\image-saturation.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -949,9 +983,6 @@ Please run ShareX as administrator to change personal folder path. ..\Resources\upload-cloud.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\clock.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\layer--arrow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -988,8 +1019,10 @@ Please run ShareX as administrator to change personal folder path. ..\Resources\tick-button.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - Clipboard content: Text (Length: {0}) + + Hold left down to drag +Right click to open menu +Middle click to close ..\Resources\navigation-000-button.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -1006,6 +1039,9 @@ Please run ShareX as administrator to change personal folder path. ..\Resources\drive-upload.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\cross.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Hotkey registration failed @@ -1030,6 +1066,9 @@ Please run ShareX as administrator to change personal folder path. Open at ShareX startup + + Your system admin disabled the upload feature. + ..\Resources\application-text-image.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -1061,43 +1100,7 @@ Please run ShareX as administrator to change personal folder path. ..\Resources\TaskCompletedSound.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\Resources\Bing.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - Window handle - - - Window title - - - Class name - - - Process name - - - Process file name - - - Process identifier - - - Window rectangle - - - Client rectangle - - - Window styles - - - ..\resources\twitter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\resources\discord.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - Your system admin disabled the upload feature. + + ..\Resources\application-resize-full.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/ShareX/Resources/application-resize-full.png b/ShareX/Resources/application-resize-full.png new file mode 100644 index 000000000..738b93c19 Binary files /dev/null and b/ShareX/Resources/application-resize-full.png differ diff --git a/ShareX/ShareX.csproj b/ShareX/ShareX.csproj index 0c3fedb21..dc1868770 100644 --- a/ShareX/ShareX.csproj +++ b/ShareX/ShareX.csproj @@ -181,6 +181,12 @@ + + Form + + + BorderlessWindowForm.cs + Form @@ -916,6 +922,9 @@ BeforeUploadForm.cs + + BorderlessWindowForm.cs + ClipboardFormatForm.cs @@ -1911,6 +1920,9 @@ + + + diff --git a/ShareX/TaskHelpers.cs b/ShareX/TaskHelpers.cs index 95c4af639..2101b200d 100644 --- a/ShareX/TaskHelpers.cs +++ b/ShareX/TaskHelpers.cs @@ -807,6 +807,12 @@ public static void OpenVideoThumbnailer(TaskSettings taskSettings = null) thumbnailerForm.Show(); } + public static void OpenBorderlessWindow() + { + BorderlessWindowForm borderlessWindowForm = new BorderlessWindowForm(); + borderlessWindowForm.Show(); + } + public static void OpenInspectWindow() { InspectWindowForm inspectWindowForm = new InspectWindowForm();