diff --git a/ShareX/Forms/MainForm.Designer.cs b/ShareX/Forms/MainForm.Designer.cs index 894010bfd..9afdd4f55 100644 --- a/ShareX/Forms/MainForm.Designer.cs +++ b/ShareX/Forms/MainForm.Designer.cs @@ -276,9 +276,9 @@ private void InitializeComponent() this.tsmiTrayDonate = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiTrayAbout = new System.Windows.Forms.ToolStripMenuItem(); this.tssTray3 = new System.Windows.Forms.ToolStripSeparator(); + this.tsmiRestartAsAdmin = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiTrayRecentItems = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiOpenActionsToolbar = new System.Windows.Forms.ToolStripMenuItem(); - this.tsmiRestartAsAdmin = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiTrayShow = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiTrayExit = new System.Windows.Forms.ToolStripMenuItem(); this.timerTraySingleClick = new System.Windows.Forms.Timer(this.components); @@ -2202,6 +2202,13 @@ private void InitializeComponent() this.tssTray3.Name = "tssTray3"; resources.ApplyResources(this.tssTray3, "tssTray3"); // + // tsmiRestartAsAdmin + // + this.tsmiRestartAsAdmin.Image = global::ShareX.Properties.Resources.user_business; + this.tsmiRestartAsAdmin.Name = "tsmiRestartAsAdmin"; + resources.ApplyResources(this.tsmiRestartAsAdmin, "tsmiRestartAsAdmin"); + this.tsmiRestartAsAdmin.Click += new System.EventHandler(this.tsmiRestartAsAdmin_Click); + // // tsmiTrayRecentItems // this.tsmiTrayRecentItems.Image = global::ShareX.Properties.Resources.clipboard_list; @@ -2215,13 +2222,6 @@ private void InitializeComponent() resources.ApplyResources(this.tsmiOpenActionsToolbar, "tsmiOpenActionsToolbar"); this.tsmiOpenActionsToolbar.Click += new System.EventHandler(this.tsmiOpenActionsToolbar_Click); // - // tsmiRestartAsAdmin - // - this.tsmiRestartAsAdmin.Image = global::ShareX.Properties.Resources.user_business; - this.tsmiRestartAsAdmin.Name = "tsmiRestartAsAdmin"; - resources.ApplyResources(this.tsmiRestartAsAdmin, "tsmiRestartAsAdmin"); - this.tsmiRestartAsAdmin.Click += new System.EventHandler(this.tsmiRestartAsAdmin_Click); - // // tsmiTrayShow // this.tsmiTrayShow.Image = global::ShareX.Properties.Resources.tick_button; diff --git a/ShareX/Forms/MainForm.cs b/ShareX/Forms/MainForm.cs index 505fbb7e5..d73d1d45e 100644 --- a/ShareX/Forms/MainForm.cs +++ b/ShareX/Forms/MainForm.cs @@ -2504,10 +2504,7 @@ private void TsmiThumbnailTitleShow_Click(object sender, EventArgs e) private void tsmiRestartAsAdmin_Click(object sender, EventArgs e) { - if (MessageBox.Show("Would you like to restart ShareX as admin?", "ShareX - Confirmation", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) - { - Program.Restart(true); - } + Program.Restart(true); } private void TsmiThumbnailTitleHide_Click(object sender, EventArgs e) diff --git a/ShareX/Forms/MainForm.resx b/ShareX/Forms/MainForm.resx index a1eb1539d..392bec0ab 100644 --- a/ShareX/Forms/MainForm.resx +++ b/ShareX/Forms/MainForm.resx @@ -159,6 +159,45 @@ 0 + + Filename + + + 150 + + + Status + + + Progress + + + 125 + + + Speed + + + 75 + + + Elapsed + + + 45 + + + Remaining + + + 45 + + + URL + + + 145 + Fill @@ -255,90 +294,12 @@ 4 - - Filename - - - 150 - - - Status - - - Progress - - - 125 - - - Speed - - - 75 - - - Elapsed - - - 45 - - - Remaining - - - 45 - - - URL - - - 145 - 17, 17 Fill - - 0, 0 - - - 165, 0 - - - 6, 6, 6, 0 - - - 165, 429 - - - 1 - - - tsMain - - - ShareX.HelpersLib.ToolStripBorderRight, ShareX.HelpersLib, Version=13.2.2.0, Culture=neutral, PublicKeyToken=null - - - pToolbars - - - 0 - - - MiddleLeft - - - Magenta - - - 152, 20 - - - Capture - 191, 22 @@ -420,12 +381,6 @@ Show cursor - - 191, 22 - - - Screenshot delay - 126, 22 @@ -462,17 +417,23 @@ 5 seconds - + + 191, 22 + + + Screenshot delay + + MiddleLeft - + Magenta - + 152, 20 - - Upload + + Capture 203, 22 @@ -516,6 +477,18 @@ Shorten URL... + + MiddleLeft + + + Magenta + + + 152, 20 + + + Upload + BottomLeft @@ -528,18 +501,6 @@ Workflows - - MiddleLeft - - - Magenta - - - 152, 20 - - - Tools - 184, 22 @@ -642,6 +603,18 @@ Monitor test... + + MiddleLeft + + + Magenta + + + 152, 20 + + + Tools + 152, 6 @@ -669,18 +642,6 @@ After upload tasks - - MiddleLeft - - - Magenta - - - 152, 20 - - - Destinations - 219, 22 @@ -726,6 +687,18 @@ Custom uploader settings... + + MiddleLeft + + + Magenta + + + 152, 20 + + + Destinations + MiddleLeft @@ -813,18 +786,6 @@ News - - MiddleLeft - - - Magenta - - - 152, 20 - - - Debug - 171, 22 @@ -861,6 +822,18 @@ Test URL sharing + + MiddleLeft + + + Magenta + + + 152, 20 + + + Debug + MiddleLeft @@ -888,18 +861,36 @@ 152, 6 + + 0, 0 + + + 165, 0 + + + 6, 6, 6, 0 + + + 165, 429 + + + 1 + + + tsMain + + + ShareX.HelpersLib.ToolStripBorderRight, ShareX.HelpersLib, Version=13.2.2.0, Culture=neutral, PublicKeyToken=null + + + pToolbars + + + 0 + 286, 17 - - 229, 538 - - - cmsTaskInfo - - - System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 228, 22 @@ -912,12 +903,6 @@ Stop upload - - 228, 22 - - - Open - Enter @@ -972,11 +957,11 @@ Thumbnail file - + 228, 22 - - Copy + + Open Ctrl+C @@ -1149,6 +1134,12 @@ False + + 228, 22 + + + Copy + Ctrl+U @@ -1269,12 +1260,6 @@ Hide columns - - 228, 22 - - - Image preview - 130, 22 @@ -1308,11 +1293,11 @@ Bottom - + 228, 22 - - Thumbnail title + + Image preview 114, 22 @@ -1341,177 +1326,33 @@ Bottom + + 228, 22 + + + Thumbnail title + 228, 22 Switch to thumbnail view + + 229, 538 + + + cmsTaskInfo + + + System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + 105, 17 190, 17 - - 209, 22 - - - Capture - - - 209, 22 - - - Upload - - - 209, 22 - - - Workflows - - - 209, 22 - - - Tools - - - 206, 6 - - - 209, 22 - - - After capture tasks - - - 209, 22 - - - After upload tasks - - - 209, 22 - - - Destinations - - - 209, 22 - - - Task settings... - - - 209, 22 - - - Application settings... - - - 209, 22 - - - Hotkey settings... - - - 209, 22 - - - Disable hotkeys - - - 206, 6 - - - 209, 22 - - - Screenshots folder... - - - 209, 22 - - - History... - - - 209, 22 - - - Image history... - - - 209, 22 - - - Debug - - - 209, 22 - - - Donate... - - - 209, 22 - - - About... - - - 206, 6 - - - 209, 22 - - - Restart ShareX as admin... - - - False - - - 209, 22 - - - Recent links - - - False - - - 209, 22 - - - Toggle actions toolbar - - - 209, 22 - - - Open main window - - - 209, 22 - - - Exit - - - 210, 506 - - - cmsTray - - - System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ShareX - 191, 22 @@ -1593,12 +1434,6 @@ Show cursor - - 191, 22 - - - Screenshot delay - 126, 22 @@ -1635,6 +1470,18 @@ 5 seconds + + 191, 22 + + + Screenshot delay + + + 209, 22 + + + Capture + 203, 22 @@ -1677,6 +1524,18 @@ Shorten URL... + + 209, 22 + + + Upload + + + 209, 22 + + + Workflows + 184, 22 @@ -1779,6 +1638,27 @@ Monitor test... + + 209, 22 + + + Tools + + + 206, 6 + + + 209, 22 + + + After capture tasks + + + 209, 22 + + + After upload tasks + 219, 22 @@ -1824,6 +1704,57 @@ Custom uploader settings... + + 209, 22 + + + Destinations + + + 209, 22 + + + Task settings... + + + 209, 22 + + + Application settings... + + + 209, 22 + + + Hotkey settings... + + + 209, 22 + + + Disable hotkeys + + + 206, 6 + + + 209, 22 + + + Screenshots folder... + + + 209, 22 + + + History... + + + 209, 22 + + + Image history... + 171, 22 @@ -1860,60 +1791,78 @@ Test URL sharing + + 209, 22 + + + Debug + + + 209, 22 + + + Donate... + + + 209, 22 + + + About... + + + 206, 6 + + + 209, 22 + + + Restart ShareX as admin... + + + False + + + 209, 22 + + + Recent links + + + False + + + 209, 22 + + + Toggle actions toolbar + + + 209, 22 + + + Open main window + + + 209, 22 + + + Exit + + + 210, 528 + + + cmsTray + + + System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ShareX + 405, 17 - - btnCloseNews - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - pNews - - - 0 - - - ucNews - - - ShareX.NewsListControl, ShareX, Version=13.2.2.0, Culture=neutral, PublicKeyToken=null - - - pNews - - - 1 - - - Fill - - - 165, 0 - - - 679, 471 - - - 5 - - - False - - - pNews - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 2 - Bottom, Right @@ -1974,53 +1923,32 @@ 1 - - 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.2.2.0, Culture=neutral, PublicKeyToken=null - - - pThumbnailView - - - 1 - - + Fill - + 165, 0 - + 679, 471 - - 7 + + 5 - - pThumbnailView + + False - + + pNews + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + $this - - 3 + + 2 True @@ -2085,81 +2013,42 @@ 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 + + + 3 + 567, 17 - - 654, 17 - True - - tsSocialButtons - - - ShareX.HelpersLib.ToolStripBorderRight, ShareX.HelpersLib, Version=13.2.2.0, Culture=neutral, PublicKeyToken=null - - - pToolbars - - - 1 - - - Left - - - 0, 0 - - - 165, 471 - - - 8 - - - pToolbars - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 5 - 654, 17 Bottom - - 0, 429 - - - 6, 3, 6, 6 - - - 165, 42 - - - 2 - - - tsSocialButtons - - - ShareX.HelpersLib.ToolStripBorderRight, ShareX.HelpersLib, Version=13.2.2.0, Culture=neutral, PublicKeyToken=null - - - pToolbars - - - 1 - Magenta @@ -2220,6 +2109,54 @@ Star our GitHub repo + + 0, 429 + + + 6, 3, 6, 6 + + + 165, 42 + + + 2 + + + tsSocialButtons + + + ShareX.HelpersLib.ToolStripBorderRight, ShareX.HelpersLib, Version=13.2.2.0, Culture=neutral, PublicKeyToken=null + + + pToolbars + + + 1 + + + Left + + + 0, 0 + + + 165, 471 + + + 8 + + + pToolbars + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 5 + True @@ -3672,6 +3609,12 @@ System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + tsmiRestartAsAdmin + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + tsmiTrayRecentItems @@ -3684,12 +3627,6 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tsmiRestartAsAdmin - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - tsmiTrayShow