CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-10-04 04:06:05 +13:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2 from ShareX/master

Browse source 
Update
This commit is contained in:
ovnisoftware 2015-04-08 13:06:08 -04:00
commit 3a5e7e8c0d
15 changed files with 41 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ShareX.HelpersLib/Automate/Functions.cs
View file

@ -25,7 +25,6 @@ You should have received a copy of the GNU General Public License
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading;
using System.Windows.Forms;

5
ShareX.HelpersLib/Automate/ScriptInfo.cs
View file

@ -23,11 +23,6 @@ You should have received a copy of the GNU General Public License
#endregion License Information (GPL v3)
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace ShareX.HelpersLib
{
public class ScriptInfo

9
ShareX.HelpersLib/Properties/Resources.Designer.cs generated
View file

@ -915,6 +915,15 @@ internal static string HotkeyType_RectangleRegion {
}
}
/// <summary>
/// Looks up a localized string similar to Capture rectangle region (Transparent).
/// </summary>
internal static string HotkeyType_RectangleTransparent {
get {
return ResourceManager.GetString("HotkeyType_RectangleTransparent", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Capture rounded rectangle region.
/// </summary>

3
ShareX.HelpersLib/Properties/Resources.resx
View file

@ -631,4 +631,7 @@ Would you like to download and install it?</value>
<data name="HotkeyType_Automate" xml:space="preserve">
<value>Open/Stop Automate tool</value>
</data>
<data name="HotkeyType_RectangleTransparent" xml:space="preserve">
<value>Capture rectangle region (Transparent)</value>
</data>
</root>

5
ShareX.ScreenCaptureLib/Forms/RectangleLight.cs
View file

@ -208,14 +208,13 @@ protected override void OnPaint(PaintEventArgs e)
g.InterpolationMode = InterpolationMode.NearestNeighbor;
g.SmoothingMode = SmoothingMode.HighSpeed;
g.CompositingMode = CompositingMode.SourceCopy;
g.CompositingQuality = CompositingQuality.HighSpeed;
g.FillRectangle(backgroundBrush, ScreenRectangle0Based);
if (isMouseDown)
{
g.CompositingMode = CompositingMode.SourceOver;
g.CompositingQuality = CompositingQuality.HighSpeed;
g.DrawRectangleProper(borderDotPen, SelectionRectangle0Based);
borderDotPen2.DashOffset = (int)(penTimer.Elapsed.TotalMilliseconds / 100) % 10;
g.DrawRectangleProper(borderDotPen, SelectionRectangle0Based);
g.DrawRectangleProper(borderDotPen2, SelectionRectangle0Based);
}
}

9
ShareX.ScreenCaptureLib/Forms/RectangleTransparent.cs
View file

@ -91,6 +91,7 @@ public RectangleTransparent()
gSurface.InterpolationMode = InterpolationMode.NearestNeighbor;
gSurface.SmoothingMode = SmoothingMode.HighSpeed;
gSurface.CompositingMode = CompositingMode.SourceCopy;
gSurface.CompositingQuality = CompositingQuality.HighSpeed;
gSurface.Clear(Color.FromArgb(1, 0, 0, 0));
StartPosition = FormStartPosition.Manual;
@ -192,7 +193,13 @@ private void timer_Tick(object sender, EventArgs e)
PreviousSelectionRectangle = SelectionRectangle;
SelectionRectangle = CaptureHelpers.CreateRectangle(positionOnClick.X, positionOnClick.Y, currentPosition.X, currentPosition.Y);
RefreshSurface();
try
{
RefreshSurface();
}
catch
{
}
}
private void RefreshSurface()

33
ShareX.ScreenCaptureLib/Screencast/FFmpegOptionsForm.ko-KR.resx
View file

@ -212,37 +212,4 @@
<data name="tbMP3_qscale.ToolTip" xml:space="preserve">
<value>범위는 0부터 9까지이며, 낮을수록 더 나은 품질을 제공합니다. 0부터 3까지는 보통 깨끗한 결과를, 기본값인 4는 겉보기에 깨끗한 결과를 내놓으며, 6은 "그럭저럭 볼 만한" 품질의 결과를 내놓습니다.</value>
</data>
<data name="lblVpxCRF.Text" xml:space="preserve">
<value>CRF:</value>
</data>
<data name="btnFFmpegBrowse.Text" xml:space="preserve">
<value>...</value>
</data>
<data name="btnFFmpegHelp.Text" xml:space="preserve">
<value>?</value>
</data>
<data name="gbFFmpegExe.Text" xml:space="preserve">
<value>ffmpeg.exe</value>
</data>
<data name="lblX264CRF.Text" xml:space="preserve">
<value>CRF:</value>
</data>
<data name="tpAAC.Text" xml:space="preserve">
<value>AAC</value>
</data>
<data name="tpMP3.Text" xml:space="preserve">
<value>MP3</value>
</data>
<data name="tpVorbis.Text" xml:space="preserve">
<value>Vorbis</value>
</data>
<data name="tpVpx.Text" xml:space="preserve">
<value>VP8</value>
</data>
<data name="tpX264.Text" xml:space="preserve">
<value>x264</value>
</data>
<data name="tpXvid.Text" xml:space="preserve">
<value>Xvid</value>
</data>
</root>

22
ShareX.ScreenCaptureLib/Screencast/FFmpegOptionsForm.resx
View file

@ -160,7 +160,7 @@
</data>
<data name="lblX264CRF.Text" xml:space="preserve">
<value>CRF:</value>
</data>
<comment>@Invariant</comment></data>
<data name="&gt;&gt;lblX264CRF.Name" xml:space="preserve">
<value>lblX264CRF</value>
</data>
@ -508,7 +508,7 @@ Similarly, for constant quality encoding, you will simply save bitrate by choosi
</data>
<data name="btnFFmpegBrowse.Text" xml:space="preserve">
<value>...</value>
</data>
<comment>@Invariant</comment></data>
<data name="&gt;&gt;btnFFmpegBrowse.Name" xml:space="preserve">
<value>btnFFmpegBrowse</value>
</data>
@ -553,7 +553,7 @@ Similarly, for constant quality encoding, you will simply save bitrate by choosi
</data>
<data name="gbFFmpegExe.Text" xml:space="preserve">
<value>ffmpeg.exe</value>
</data>
<comment>@Invariant</comment></data>
<data name="&gt;&gt;gbFFmpegExe.Name" xml:space="preserve">
<value>gbFFmpegExe</value>
</data>
@ -667,7 +667,7 @@ Similarly, for constant quality encoding, you will simply save bitrate by choosi
</data>
<data name="btnFFmpegHelp.Text" xml:space="preserve">
<value>?</value>
</data>
<comment>@Invariant</comment></data>
<data name="&gt;&gt;btnFFmpegHelp.Name" xml:space="preserve">
<value>btnFFmpegHelp</value>
</data>
@ -742,7 +742,7 @@ Similarly, for constant quality encoding, you will simply save bitrate by choosi
</data>
<data name="tpX264.Text" xml:space="preserve">
<value>x264</value>
</data>
<comment>@Invariant</comment></data>
<data name="&gt;&gt;tpX264.Name" xml:space="preserve">
<value>tpX264</value>
</data>
@ -769,7 +769,7 @@ Similarly, for constant quality encoding, you will simply save bitrate by choosi
</data>
<data name="lblVpxCRF.Text" xml:space="preserve">
<value>CRF:</value>
</data>
<comment>@Invariant</comment></data>
<data name="&gt;&gt;lblVpxCRF.Name" xml:space="preserve">
<value>lblVpxCRF</value>
</data>
@ -793,7 +793,7 @@ Similarly, for constant quality encoding, you will simply save bitrate by choosi
</data>
<data name="tpVpx.Text" xml:space="preserve">
<value>VP8</value>
</data>
<comment>@Invariant</comment></data>
<data name="&gt;&gt;tpVpx.Name" xml:space="preserve">
<value>tpVpx</value>
</data>
@ -817,7 +817,7 @@ Similarly, for constant quality encoding, you will simply save bitrate by choosi
</data>
<data name="tpXvid.Text" xml:space="preserve">
<value>Xvid</value>
</data>
<comment>@Invariant</comment></data>
<data name="&gt;&gt;tpXvid.Name" xml:space="preserve">
<value>tpXvid</value>
</data>
@ -940,7 +940,7 @@ Similarly, for constant quality encoding, you will simply save bitrate by choosi
</data>
<data name="tpAAC.Text" xml:space="preserve">
<value>AAC</value>
</data>
<comment>@Invariant</comment></data>
<data name="&gt;&gt;tpAAC.Name" xml:space="preserve">
<value>tpAAC</value>
</data>
@ -994,7 +994,7 @@ Similarly, for constant quality encoding, you will simply save bitrate by choosi
</data>
<data name="tpVorbis.Text" xml:space="preserve">
<value>Vorbis</value>
</data>
<comment>@Invariant</comment></data>
<data name="&gt;&gt;tpVorbis.Name" xml:space="preserve">
<value>tpVorbis</value>
</data>
@ -1048,7 +1048,7 @@ Similarly, for constant quality encoding, you will simply save bitrate by choosi
</data>
<data name="tpMP3.Text" xml:space="preserve">
<value>MP3</value>
</data>
<comment>@Invariant</comment></data>
<data name="&gt;&gt;tpMP3.Name" xml:space="preserve">
<value>tpMP3</value>
</data>

1
ShareX.UploadersLib/FileUploaders/Lambda.cs
View file

@ -24,7 +24,6 @@ You should have received a copy of the GNU General Public License
#endregion License Information (GPL v3)
using Newtonsoft.Json;
using ShareX.UploadersLib.Properties;
using System.Collections.Generic;
using System.IO;

1
ShareX.UploadersLib/Forms/UploadersConfigForm.Designer.cs generated
View file

@ -1685,6 +1685,7 @@ private void InitializeComponent()
resources.GetString("cbAmazonS3Endpoint.Items1"),
resources.GetString("cbAmazonS3Endpoint.Items2"),
resources.GetString("cbAmazonS3Endpoint.Items3"),
resources.GetString("cbAmazonS3Endpoint.Items9"),
resources.GetString("cbAmazonS3Endpoint.Items4"),
resources.GetString("cbAmazonS3Endpoint.Items5"),
resources.GetString("cbAmazonS3Endpoint.Items6"),

3
ShareX.UploadersLib/Forms/UploadersConfigForm.resx
View file

@ -7298,6 +7298,9 @@ For example, if your bucket is called bucket.example.com then URL will be http:/
<comment>@Invariant</comment></data>
<data name="cbAmazonS3Endpoint.Items8" xml:space="preserve">
<value>https://objects.dreamhost.com/</value>
<comment>@Invariant</comment></data>
<data name="cbAmazonS3Endpoint.Items9" xml:space="preserve">
<value>https://s3-eu-central-1.amazonaws.com/</value>
<comment>@Invariant</comment></data>
<data name="cbAmazonS3Endpoint.Location" type="System.Drawing.Point, System.Drawing">
<value>16, 128</value>

5
ShareX.UploadersLib/URLShorteners/VgdURLShortener.cs
View file

@ -23,11 +23,6 @@ You should have received a copy of the GNU General Public License
#endregion License Information (GPL v3)
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace ShareX.UploadersLib.URLShorteners
{
public class VgdURLShortener : IsgdURLShortener

1
ShareX.UploadersLib/Uploader.cs
View file

@ -34,7 +34,6 @@ You should have received a copy of the GNU General Public License
using System.Net.Cache;
using System.Text;
using System.Web;
using System.Windows.Forms;
namespace ShareX.UploadersLib
{

3
ShareX/Forms/ScreenRecordForm.cs
View file

@ -299,7 +299,8 @@ public void StartRecording(ScreenRecordOutput outputType, TaskSettings taskSetti
{
if (screenRecorder != null)
{
if (taskSettings.CaptureSettings.RunScreencastCLI && !string.IsNullOrEmpty(screenRecorder.CachePath) && File.Exists(screenRecorder.CachePath))
if ((outputType == ScreenRecordOutput.GIF || taskSettings.CaptureSettings.RunScreencastCLI) &&
!string.IsNullOrEmpty(screenRecorder.CachePath) && File.Exists(screenRecorder.CachePath))
{
File.Delete(screenRecorder.CachePath);
}

4
ShareX/Properties/AssemblyInfo.cs
View file

@ -11,5 +11,5 @@
[assembly: AssemblyCulture("")]
[assembly: ComVisible(false)]
[assembly: Guid("82E6AC09-0FEF-4390-AD9F-0DD3F5561EFC")]
[assembly: AssemblyVersion("9.8.0")]
[assembly: AssemblyFileVersion("9.8.0")]
[assembly: AssemblyVersion("9.9.0")]
[assembly: AssemblyFileVersion("9.9.0")]