From d612fd1a8bd024babc92f1adff9b3c5d4c8fa004 Mon Sep 17 00:00:00 2001 From: Jaex Date: Mon, 26 Sep 2016 10:03:02 +0300 Subject: [PATCH] Move task settings button top of application settings --- ShareX/Forms/MainForm.Designer.cs | 4 +- ShareX/Forms/MainForm.resx | 709 ++++++++++++++---------------- 2 files changed, 337 insertions(+), 376 deletions(-) diff --git a/ShareX/Forms/MainForm.Designer.cs b/ShareX/Forms/MainForm.Designer.cs index b7843f0a6..2bffd2e17 100644 --- a/ShareX/Forms/MainForm.Designer.cs +++ b/ShareX/Forms/MainForm.Designer.cs @@ -406,8 +406,8 @@ private void InitializeComponent() this.tsddbAfterCaptureTasks, this.tsddbAfterUploadTasks, this.tsddbDestinations, - this.tsbApplicationSettings, this.tsbTaskSettings, + this.tsbApplicationSettings, this.tsbHotkeySettings, this.tssMain2, this.tsbScreenshotsFolder, @@ -1304,8 +1304,8 @@ private void InitializeComponent() this.tsmiTrayAfterCaptureTasks, this.tsmiTrayAfterUploadTasks, this.tsmiTrayDestinations, - this.tsmiTrayApplicationSettings, this.tsmiTrayTaskSettings, + this.tsmiTrayApplicationSettings, this.tsmiTrayHotkeySettings, this.tsmiTrayToggleHotkeys, this.tssTray2, diff --git a/ShareX/Forms/MainForm.resx b/ShareX/Forms/MainForm.resx index 85f090e7c..b2dbfa437 100644 --- a/ShareX/Forms/MainForm.resx +++ b/ShareX/Forms/MainForm.resx @@ -125,9 +125,6 @@ 160, 0 - - 567, 17 - Top, Right @@ -144,6 +141,9 @@ 3 + + 567, 17 + Show tips and hotkeys @@ -216,6 +216,45 @@ 2 + + Filename + + + 150 + + + Status + + + Progress + + + 125 + + + Speed + + + 75 + + + Elapsed + + + 45 + + + Remaining + + + 45 + + + URL + + + 145 + Fill @@ -312,102 +351,12 @@ 3 - - Filename - - - 150 - - - Status - - - Progress - - - 125 - - - Speed - - - 75 - - - Elapsed - - - 45 - - - Remaining - - - 45 - - - URL - - - 145 - Bottom, Right True - - pbPatreonOpen - - - System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - flpPatreon - - - 0 - - - pbPatreonHide - - - System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - flpPatreon - - - 1 - - - 613, 356 - - - 215, 45 - - - 3 - - - False - - - False - - - flpPatreon - - - System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 2 - 0, 0 @@ -468,6 +417,33 @@ 1 + + 613, 356 + + + 215, 45 + + + 3 + + + False + + + False + + + flpPatreon + + + System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 2 + 17, 17 @@ -477,42 +453,6 @@ Left - - 0, 0 - - - 6, 6, 6, 6 - - - 160, 407 - - - 1 - - - tsMain - - - System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 4 - - - MiddleLeft - - - Magenta - - - 147, 20 - - - Capture - 191, 22 @@ -591,17 +531,17 @@ Auto capture... - + MiddleLeft - + Magenta - + 147, 20 - - Upload + + Capture 203, 22 @@ -633,6 +573,18 @@ Drag and drop upload... + + MiddleLeft + + + Magenta + + + 147, 20 + + + Upload + BottomLeft @@ -645,18 +597,6 @@ Workflows - - MiddleLeft - - - Magenta - - - 147, 20 - - - Tools - 183, 22 @@ -747,6 +687,18 @@ Monitor test... + + MiddleLeft + + + Magenta + + + 147, 20 + + + Tools + 147, 6 @@ -774,18 +726,6 @@ After upload tasks - - MiddleLeft - - - Magenta - - - 147, 20 - - - Destinations - 187, 22 @@ -825,17 +765,17 @@ Destination settings... - + MiddleLeft - + Magenta - + 147, 20 - - Application settings... + + Destinations MiddleLeft @@ -849,6 +789,18 @@ Task settings... + + MiddleLeft + + + Magenta + + + 147, 20 + + + Application settings... + MiddleLeft @@ -900,18 +852,6 @@ Image history... - - MiddleLeft - - - Magenta - - - 147, 20 - - - Debug - 172, 22 @@ -948,6 +888,18 @@ Test URL sharing + + MiddleLeft + + + Magenta + + + 147, 20 + + + Debug + MiddleLeft @@ -972,18 +924,33 @@ About... + + 0, 0 + + + 6, 6, 6, 6 + + + 160, 407 + + + 1 + + + tsMain + + + System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 4 + 286, 17 - - 173, 362 - - - cmsTaskInfo - - - System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 172, 22 @@ -996,12 +963,6 @@ Stop upload - - 172, 22 - - - Open - 156, 22 @@ -1047,11 +1008,11 @@ Thumbnail file - + 172, 22 - - Copy + + Open 233, 22 @@ -1185,6 +1146,12 @@ False + + 172, 22 + + + Copy + 172, 22 @@ -1254,12 +1221,6 @@ Hide columns - - 172, 22 - - - Image preview - 130, 22 @@ -1278,6 +1239,21 @@ Automatic + + 172, 22 + + + Image preview + + + 173, 362 + + + cmsTaskInfo + + + System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + 105, 17 @@ -1368,144 +1344,6 @@ Capture - - 188, 22 - - - Upload - - - 188, 22 - - - Workflows - - - 188, 22 - - - Tools - - - 185, 6 - - - 188, 22 - - - After capture tasks - - - 188, 22 - - - After upload tasks - - - 188, 22 - - - Destinations - - - 188, 22 - - - Application settings... - - - 188, 22 - - - Task settings... - - - 188, 22 - - - Hotkey settings... - - - 188, 22 - - - Disable hotkeys - - - 185, 6 - - - 188, 22 - - - Screenshots folder... - - - 188, 22 - - - History... - - - 188, 22 - - - Image history... - - - 188, 22 - - - Debug - - - 188, 22 - - - Donate... - - - 188, 22 - - - About... - - - 185, 6 - - - 188, 22 - - - Recent links - - - False - - - 188, 22 - - - Open main window - - - 188, 22 - - - Exit - - - 189, 462 - - - cmsTray - - - System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ShareX - 203, 22 @@ -1536,6 +1374,18 @@ Drag and drop upload... + + 188, 22 + + + Upload + + + 188, 22 + + + Workflows + 183, 22 @@ -1626,6 +1476,27 @@ Monitor test... + + 188, 22 + + + Tools + + + 185, 6 + + + 188, 22 + + + After capture tasks + + + 188, 22 + + + After upload tasks + 187, 22 @@ -1665,6 +1536,57 @@ Destination settings... + + 188, 22 + + + Destinations + + + 188, 22 + + + Task settings... + + + 188, 22 + + + Application settings... + + + 188, 22 + + + Hotkey settings... + + + 188, 22 + + + Disable hotkeys + + + 185, 6 + + + 188, 22 + + + Screenshots folder... + + + 188, 22 + + + History... + + + 188, 22 + + + Image history... + 172, 22 @@ -1701,6 +1623,60 @@ Test URL sharing + + 188, 22 + + + Debug + + + 188, 22 + + + Donate... + + + 188, 22 + + + About... + + + 185, 6 + + + 188, 22 + + + Recent links + + + False + + + 188, 22 + + + Open main window + + + 188, 22 + + + Exit + + + 189, 462 + + + cmsTray + + + System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ShareX + 405, 17 @@ -1710,6 +1686,27 @@ True + + True + + + Microsoft Sans Serif, 9.75pt + + + NoControl + + + 0, 0 + + + 10, 10, 10, 10 + + + 20, 36 + + + 0 + lblTips @@ -1746,42 +1743,6 @@ 5 - - True - - - Microsoft Sans Serif, 9.75pt - - - NoControl - - - 0, 0 - - - 10, 10, 10, 10 - - - 20, 36 - - - 0 - - - lblTips - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - pTips - - - 0 - - - 567, 17 - True @@ -2974,6 +2935,6 @@ MainForm - ShareX.HotkeyForm, ShareX, Version=11.1.0.0, Culture=neutral, PublicKeyToken=null + ShareX.HotkeyForm, ShareX, Version=11.2.1.0, Culture=neutral, PublicKeyToken=null \ No newline at end of file