From e32d8d6fc460b3c94b892a01e64675392c0af812 Mon Sep 17 00:00:00 2001
From: Jaex <Jaex@users.noreply.github.com>
Date: Mon, 3 Oct 2016 14:56:30 +0300
Subject: [PATCH] Move capture buttons to sub menu to save space because
 capture buttons not frequently used

---
 .../Properties/Resources.Designer.cs          |  10 ++++++
 .../Properties/Resources.resx                 |   3 ++
 ShareX.ScreenCaptureLib/Resources/camera.png  | Bin 0 -> 626 bytes
 .../Shapes/ShapeManagerMenu.cs                |  34 +++++++++---------
 .../ShareX.ScreenCaptureLib.csproj            |   1 +
 5 files changed, 31 insertions(+), 17 deletions(-)
 create mode 100644 ShareX.ScreenCaptureLib/Resources/camera.png

diff --git a/ShareX.ScreenCaptureLib/Properties/Resources.Designer.cs b/ShareX.ScreenCaptureLib/Properties/Resources.Designer.cs
index f18c881ca..2a0275808 100644
--- a/ShareX.ScreenCaptureLib/Properties/Resources.Designer.cs
+++ b/ShareX.ScreenCaptureLib/Properties/Resources.Designer.cs
@@ -89,6 +89,16 @@ internal class Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap camera {
+            get {
+                object obj = ResourceManager.GetObject("camera", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
diff --git a/ShareX.ScreenCaptureLib/Properties/Resources.resx b/ShareX.ScreenCaptureLib/Properties/Resources.resx
index e6bf0df62..5507fd786 100644
--- a/ShareX.ScreenCaptureLib/Properties/Resources.resx
+++ b/ShareX.ScreenCaptureLib/Properties/Resources.resx
@@ -477,4 +477,7 @@ Distance: {6:0.00} px / Angle: {7:0.00}°</value>
   <data name="arrow_circle_225_left" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\arrow-circle-225-left.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="camera" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\camera.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/ShareX.ScreenCaptureLib/Resources/camera.png b/ShareX.ScreenCaptureLib/Resources/camera.png
new file mode 100644
index 0000000000000000000000000000000000000000..22fec5c905d8b233eff199b6c027a1fd6d6cf4ae
GIT binary patch
literal 626
zcmV-&0*(ENP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!6iGxuRCwB?lh11!Q4q(!yZhYLhK(d1
z#6xOgi-Hg+*h71eLQN?>^djhAP$b2_z&|07YpM7rBw%QJE)*oErWC{w(jKhV7PX36
zHU3()GcUF6A(zyF*?sKn_cQZm-c#oDIhHXIkH;75r-z4!h{a-Wt_2{!OCCxj5@~W|
zGMU|L=szgYXmmH7PQRQ?CRhG()fV}i5CX|$^0~-nv(HMUk_-fcL8MYC<Z?NL!(lMA
z)9GL|8p*g}7;rkBu-R;|+wGW6r;1P%<qHWzOw8x=7!HSsM0U_<{6MqWgvaB7+wGQs
ze!q`Or2?1B1=7K?ELElNwr;m8g=~Yt0JT~b<#JhO${xK!SNIXxd5nXDBdThKlar4G
z@B9Ji<M9~mY`tEOvV23Ka7HBp?~V)D+sokolN65MpJ8=%9rb!07Z;WU@Dy~;&Ly$c
zY7KfSP$?vY4zKSHwnHHqE1*GD8PGJH;x_J)DyX9dXV*0Ca<0OVV$)owJrD6P973^L
zWhNdyxJOO>iM2KNUjX-j#k1M$cc*Viz{bW+6pLTs_uod)f7!HFtA+FPPw@Ey;OQ;^
z8t<EJbMqE-odFt+X$4zbD=3w|<Mi~ijGLw@#SVvq05b+?!t3?E-rs)_vaC5}QKfUe
z{MK~`0s#|?v-Izw;$^$t))hJ!5h_3OKNm?=)wjyBw^7BC_Dg^P0L>WSs1wPEoB#j-
M07*qoM6N<$f-C4Evj6}9

literal 0
HcmV?d00001

diff --git a/ShareX.ScreenCaptureLib/Shapes/ShapeManagerMenu.cs b/ShareX.ScreenCaptureLib/Shapes/ShapeManagerMenu.cs
index 08f2afdf6..a34de6527 100644
--- a/ShareX.ScreenCaptureLib/Shapes/ShapeManagerMenu.cs
+++ b/ShareX.ScreenCaptureLib/Shapes/ShapeManagerMenu.cs
@@ -445,25 +445,25 @@ private void CreateMenu()
             {
                 tsMain.Items.Add(new ToolStripSeparator());
 
-                ToolStripButton tsbFullscreenCapture = new ToolStripButton(Resources.ShapeManager_CreateContextMenu_Capture_fullscreen);
-                tsbFullscreenCapture.DisplayStyle = ToolStripItemDisplayStyle.Image;
-                tsbFullscreenCapture.Image = Resources.layer_fullscreen;
-                tsbFullscreenCapture.MouseDown += (sender, e) => form.Close(RegionResult.Fullscreen);
-                tsMain.Items.Add(tsbFullscreenCapture);
+                ToolStripDropDownButton tsddbCapture = new ToolStripDropDownButton("Capture");
+                tsddbCapture.DisplayStyle = ToolStripItemDisplayStyle.Image;
+                tsddbCapture.Image = Resources.camera;
+                tsMain.Items.Add(tsddbCapture);
 
-                ToolStripButton tsbActiveMonitorCapture = new ToolStripButton(Resources.ShapeManager_CreateContextMenu_Capture_active_monitor);
-                tsbActiveMonitorCapture.DisplayStyle = ToolStripItemDisplayStyle.Image;
-                tsbActiveMonitorCapture.Image = Resources.monitor;
-                tsbActiveMonitorCapture.MouseDown += (sender, e) => form.Close(RegionResult.ActiveMonitor);
-                tsMain.Items.Add(tsbActiveMonitorCapture);
+                ToolStripMenuItem tsmiFullscreenCapture = new ToolStripMenuItem(Resources.ShapeManager_CreateContextMenu_Capture_fullscreen);
+                tsmiFullscreenCapture.Image = Resources.layer_fullscreen;
+                tsmiFullscreenCapture.MouseDown += (sender, e) => form.Close(RegionResult.Fullscreen);
+                tsddbCapture.DropDownItems.Add(tsmiFullscreenCapture);
 
-                ToolStripDropDownButton tsddbMonitorCapture = new ToolStripDropDownButton(Resources.ShapeManager_CreateContextMenu_Capture_monitor);
-                tsddbMonitorCapture.HideImageMargin();
-                tsddbMonitorCapture.DisplayStyle = ToolStripItemDisplayStyle.Image;
-                tsddbMonitorCapture.Image = Resources.monitor_window;
-                tsMain.Items.Add(tsddbMonitorCapture);
+                ToolStripMenuItem tsmiActiveMonitorCapture = new ToolStripMenuItem(Resources.ShapeManager_CreateContextMenu_Capture_active_monitor);
+                tsmiActiveMonitorCapture.Image = Resources.monitor;
+                tsmiActiveMonitorCapture.MouseDown += (sender, e) => form.Close(RegionResult.ActiveMonitor);
+                tsddbCapture.DropDownItems.Add(tsmiActiveMonitorCapture);
 
-                tsddbMonitorCapture.DropDownItems.Clear();
+                ToolStripMenuItem tsmiMonitorCapture = new ToolStripMenuItem(Resources.ShapeManager_CreateContextMenu_Capture_monitor);
+                tsmiMonitorCapture.HideImageMargin();
+                tsmiMonitorCapture.Image = Resources.monitor_window;
+                tsddbCapture.DropDownItems.Add(tsmiMonitorCapture);
 
                 Screen[] screens = Screen.AllScreens;
 
@@ -477,7 +477,7 @@ private void CreateMenu()
                         form.MonitorIndex = index;
                         form.Close(RegionResult.Monitor);
                     };
-                    tsddbMonitorCapture.DropDownItems.Add(tsmi);
+                    tsmiMonitorCapture.DropDownItems.Add(tsmi);
                 }
             }
 
diff --git a/ShareX.ScreenCaptureLib/ShareX.ScreenCaptureLib.csproj b/ShareX.ScreenCaptureLib/ShareX.ScreenCaptureLib.csproj
index 281591959..168db3018 100644
--- a/ShareX.ScreenCaptureLib/ShareX.ScreenCaptureLib.csproj
+++ b/ShareX.ScreenCaptureLib/ShareX.ScreenCaptureLib.csproj
@@ -206,6 +206,7 @@
     <None Include="Resources\balloon-box-left.png" />
     <None Include="Resources\clipboard.png" />
     <None Include="Resources\arrow-circle-225-left.png" />
+    <None Include="Resources\camera.png" />
     <Content Include="Resources\Crosshair.cur" />
     <None Include="Resources\exclamation-button.png" />
   </ItemGroup>