From c7c44280f77d566eb253711acadcd028846c4b77 Mon Sep 17 00:00:00 2001 From: Jaex Date: Sun, 7 May 2017 00:34:03 +0300 Subject: [PATCH] Added label and icon for "Image (Screen)" drawing tool --- .../Properties/Resources.Designer.cs | 11 ++++++- ShareX.HelpersLib/Properties/Resources.resx | 5 ++- .../Properties/Resources.Designer.cs | 30 ++++++++++++------ .../Properties/Resources.resx | 9 ++++-- .../Resources/folder-open-image.png | Bin 0 -> 764 bytes ShareX.ScreenCaptureLib/Resources/image.png | Bin 547 -> 0 bytes .../Resources/monitor-image.png | Bin 0 -> 631 bytes .../Shapes/ShapeManagerMenu.cs | 4 +-- .../ShareX.ScreenCaptureLib.csproj | 3 +- 9 files changed, 44 insertions(+), 18 deletions(-) create mode 100644 ShareX.ScreenCaptureLib/Resources/folder-open-image.png delete mode 100644 ShareX.ScreenCaptureLib/Resources/image.png create mode 100644 ShareX.ScreenCaptureLib/Resources/monitor-image.png diff --git a/ShareX.HelpersLib/Properties/Resources.Designer.cs b/ShareX.HelpersLib/Properties/Resources.Designer.cs index 37735cf03..a846f76cc 100644 --- a/ShareX.HelpersLib/Properties/Resources.Designer.cs +++ b/ShareX.HelpersLib/Properties/Resources.Designer.cs @@ -2429,7 +2429,7 @@ internal class Resources { } /// - /// Looks up a localized string similar to Drawing: Image. + /// Looks up a localized string similar to Drawing: Image (File). /// internal static string ShapeType_DrawingImage { get { @@ -2437,6 +2437,15 @@ internal class Resources { } } + /// + /// Looks up a localized string similar to Drawing: Image (Screen). + /// + internal static string ShapeType_DrawingImageScreen { + get { + return ResourceManager.GetString("ShapeType_DrawingImageScreen", resourceCulture); + } + } + /// /// Looks up a localized string similar to Drawing: Line. /// diff --git a/ShareX.HelpersLib/Properties/Resources.resx b/ShareX.HelpersLib/Properties/Resources.resx index fa7936953..f8f1bc9f6 100644 --- a/ShareX.HelpersLib/Properties/Resources.resx +++ b/ShareX.HelpersLib/Properties/Resources.resx @@ -963,7 +963,7 @@ Would you like to download it? Drawing: Freehand - Drawing: Image + Drawing: Image (File) Drawing: Speech balloon @@ -998,4 +998,7 @@ Would you like to download it? Crop image + + Drawing: Image (Screen) + \ No newline at end of file diff --git a/ShareX.ScreenCaptureLib/Properties/Resources.Designer.cs b/ShareX.ScreenCaptureLib/Properties/Resources.Designer.cs index d01478e32..44a1ce77e 100644 --- a/ShareX.ScreenCaptureLib/Properties/Resources.Designer.cs +++ b/ShareX.ScreenCaptureLib/Properties/Resources.Designer.cs @@ -364,6 +364,16 @@ internal class Resources { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap folder_open_image { + get { + object obj = ResourceManager.GetObject("folder_open_image", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -394,16 +404,6 @@ internal class Resources { } } - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap image { - get { - object obj = ResourceManager.GetObject("image", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -624,6 +624,16 @@ internal class Resources { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap monitor_image { + get { + object obj = ResourceManager.GetObject("monitor_image", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// diff --git a/ShareX.ScreenCaptureLib/Properties/Resources.resx b/ShareX.ScreenCaptureLib/Properties/Resources.resx index 64c367c2b..938610303 100644 --- a/ShareX.ScreenCaptureLib/Properties/Resources.resx +++ b/ShareX.ScreenCaptureLib/Properties/Resources.resx @@ -429,9 +429,6 @@ Distance: {6:0.00} px / Angle: {7:0.00}° ..\Resources\layer-shape-polygon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\image.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\balloon-box-left.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -513,4 +510,10 @@ Distance: {6:0.00} px / Angle: {7:0.00}° ..\Resources\image-crop.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\folder-open-image.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\monitor-image.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.ScreenCaptureLib/Resources/folder-open-image.png b/ShareX.ScreenCaptureLib/Resources/folder-open-image.png new file mode 100644 index 0000000000000000000000000000000000000000..6b21e1abbb7ba2fc1e13cea8ab799f3beedc3ac0 GIT binary patch literal 764 zcmV^3+3AFA)Th(3|y=4;A$gL~qec1omJL6(n>+3yQU%>>?&2 znwKrj*x6-v=kiZyc6L|SUOI4?IWzNp^L^((huO9bC*EIWC+QN#|HUN1?q1U_LC!uA zHn!Fuz0#AI9R;JJaP1cOODe&of_$hfBXZ|hZ=Zg`Epr3{TnSYZunM{wMPhagZ(a|9 zg%9N6na6`+y|Zb`+H{)A*&KmogA2=oZ5WWfB`B%cgNi6aW9RvQ^mlZe?P5UJ;hvr| z%LD?F?GR9=gPRx_(QsiJP{>880(d2$wF(IOfc*_NOvB*I1eQx6EYrnvj#4&_w)Ml1 zIgp~qrT{#85$eLVFzr#m6 z*(TCoYz3Y`BZMzN7C#Y4pdn;nUzJAlRDgu4dU6DYi2_%CMu8Z*Eac!*Hm~MvcmFKg!ew7%&viqfv1lrb_FmV@L@1- z7pTGA&QEHuD$)<$}zSQ)?CbwTV6sY=jXw)>wM!lgW`3k ujry^J)E?9fY`EBm-c_rhW-=Xr1sDK(4@Ni=^w$Ic0000 literal 0 HcmV?d00001 diff --git a/ShareX.ScreenCaptureLib/Resources/image.png b/ShareX.ScreenCaptureLib/Resources/image.png deleted file mode 100644 index ca65c0226fbd240e7acf3ef4093288f78c9793a6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 547 zcmV+;0^I$HP)3n?!R+3gI7hrg)b#kU#(MCYnMnG2; zA3nY2V-WK2)?@CC?l+c=BV#)+U@?TEY|ld1j8U}$g%J?7gTn(BvIX`|-f(>KmDS~| z^cGjSoObDW(%K4J*lS1oUDXtgz-*>UQ9C;x@Z*=mbnNkN@|jL>NEAlIQA`}iBymEP zq$1pBZF#_*Yd(fOcQEWd!1FwO-zN-1k|ZX}61v?~mcUs=Dj`IXi}Dq^&d(j#l{omj z>L%fmT+&l2m%U;-tvNa>34)+$a&uG}2evaAk3HLUdH>?+KmI`7}m-*H=l`v l;anFkD$}K{2i)dY$e~=%5kfNjlAu0+e2&742#X%+_#&(>u z?~|SL*&L=Kqnq2E-Fa`{>@2HPDvto;4x~(==48)u%+j9LK?z z&0CP%iMLtwO=c_(*=*Sl4V2bCfUwf{eXbno6p*vDxpNeZK%C81!XQL{$Uqpv5&@%N zXLkuVu6rot?LTmZ=7K|}G;m!aa6EV;7j7t~1WbCK$CYDyD~0!O4Xocg!QDH<2?1AN z(?E7*1-g}m)9<0Tw+Gt^Kp4W#6ddgD<4h)lH?K43bxq_83>PnPoL|mh$-1V#{N-VB!N;*}Mt3kJh)VeMIaK-nUu|O?>Jk|)mqJ)4 zKKe&MYnQ3^g;={85ll)5!w~CFHY52`%4j5~E|AlHeCsIPo{VIKW#w}Du}WB;e`&Q^ z?PW4 + + @@ -210,7 +212,6 @@ -