CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-06-30 20:20:34 +12:00
Code Issues Packages Projects Releases Wiki Activity

Removed AsyncBridge library, FFmpeg error window for be able see all output, Replaced ThreadPool with Task.Run

Browse source
This commit is contained in:
Jaex 2014-05-22 04:22:32 +03:00
parent c2f2d48342
commit e1e29f7b6b
32 changed files with 520 additions and 254 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
HelpersLib/CLI/ExternalCLIManager.cs
View file

@ -38,9 +38,6 @@ public abstract class ExternalCLIManager : IDisposable
public event DataReceivedEventHandler OutputDataReceived;
public event DataReceivedEventHandler ErrorDataReceived;
public StringBuilder Output { get; private set; }
public StringBuilder Errors { get; private set; }
private Process process = new Process();
public virtual int Open(string path, string args = null)
@ -49,9 +46,6 @@ public virtual int Open(string path, string args = null)
if (File.Exists(path))
{
Output = new StringBuilder();
Errors = new StringBuilder();
ProcessStartInfo psi = new ProcessStartInfo(path);
psi.UseShellExecute = false;
psi.CreateNoWindow = true;
@ -78,8 +72,6 @@ private void cli_OutputDataReceived(object sender, DataReceivedEventArgs e)
{
if (e.Data != null)
{
Output.AppendLine(e.Data);
if (OutputDataReceived != null)
{
OutputDataReceived(sender, e);
@ -91,8 +83,6 @@ private void cli_ErrorDataReceived(object sender, DataReceivedEventArgs e)
{
if (e.Data != null)
{
Errors.AppendLine(e.Data);
if (ErrorDataReceived != null)
{
ErrorDataReceived(sender, e);

68
HelpersLib/Forms/OutputBox.Designer.cs generated Normal file
View file

@ -0,0 +1,68 @@
namespace HelpersLib
{
partial class OutputBox
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.txtText = new System.Windows.Forms.TextBox();
this.SuspendLayout();
//
// txtText
//
this.txtText.BackColor = System.Drawing.Color.Black;
this.txtText.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.txtText.Dock = System.Windows.Forms.DockStyle.Fill;
this.txtText.Font = new System.Drawing.Font("Lucida Console", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(162)));
this.txtText.ForeColor = System.Drawing.Color.White;
this.txtText.Location = new System.Drawing.Point(0, 0);
this.txtText.Multiline = true;
this.txtText.Name = "txtText";
this.txtText.ScrollBars = System.Windows.Forms.ScrollBars.Both;
this.txtText.Size = new System.Drawing.Size(684, 562);
this.txtText.TabIndex = 0;
//
// OutputBox
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.Black;
this.ClientSize = new System.Drawing.Size(684, 562);
this.Controls.Add(this.txtText);
this.Name = "OutputBox";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "OutputBox";
this.TopMost = true;
this.ResumeLayout(false);
this.PerformLayout();
}
#endregion
private System.Windows.Forms.TextBox txtText;
}
}

48
HelpersLib/Forms/OutputBox.cs Normal file
View file

@ -0,0 +1,48 @@
#region License Information (GPL v3)
/*
ShareX - A program that allows you to take screenshots and share any file type
Copyright (C) 2007-2014 ShareX Developers
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
Optionally you can also view the license at <http://www.gnu.org/licenses/>.
*/
#endregion License Information (GPL v3)
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Windows.Forms;
namespace HelpersLib
{
public partial class OutputBox : Form
{
public OutputBox(string text, string title)
{
InitializeComponent();
Icon = ShareXResources.Icon;
Text = "ShareX - " + title;
txtText.Text = text;
txtText.SelectionStart = txtText.TextLength;
}
}
}

120
HelpersLib/Forms/OutputBox.resx Normal file
View file

@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>

4
HelpersLib/Helpers/Helpers.cs
View file

@ -471,7 +471,7 @@ public static void OpenURL(string url)
{
if (!string.IsNullOrEmpty(url))
{
ThreadPool.QueueUserWorkItem(state =>
Task.Run(() =>
{
try
{
@ -606,7 +606,7 @@ public static object Clone(object obj)
public static void PlaySoundAsync(Stream stream)
{
ThreadPool.QueueUserWorkItem(state =>
Task.Run(() =>
{
using (stream)
using (SoundPlayer soundPlayer = new SoundPlayer(stream))

1
HelpersLib/Helpers/ImageHelpers.cs
View file

@ -64,7 +64,6 @@
using System.Reflection;
using System.Runtime.InteropServices;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace HelpersLib

18
HelpersLib/HelpersLib.csproj
View file

@ -51,10 +51,6 @@
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
</PropertyGroup>
<ItemGroup>
<Reference Include="AsyncBridge.Net35, Version=0.0.0.0, Culture=neutral, PublicKeyToken=b3b1c0202c0d6a87, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\AsyncBridge.Net35.0.2.0\lib\net35-Client\AsyncBridge.Net35.dll</HintPath>
</Reference>
<Reference Include="Gma.QrCodeNet.Encoding">
<HintPath>..\packages\QrCode.Net.0.4.0.0\lib\net35\Gma.QrCodeNet.Encoding.dll</HintPath>
</Reference>
@ -70,10 +66,6 @@
<Reference Include="System.Design" />
<Reference Include="System.Drawing.Design" />
<Reference Include="System.Runtime.Remoting" />
<Reference Include="System.Threading, Version=1.0.2856.102, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\TaskParallelLibrary.1.0.2856.0\lib\Net35\System.Threading.dll</HintPath>
</Reference>
<Reference Include="System.Web" />
<Reference Include="System.Xml.Linq">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
@ -95,6 +87,12 @@
<Compile Include="EncoderProgram.cs" />
<Compile Include="CLI\ExternalCLIManager.cs" />
<Compile Include="FontSafe.cs" />
<Compile Include="Forms\OutputBox.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Forms\OutputBox.Designer.cs">
<DependentUpon>OutputBox.cs</DependentUpon>
</Compile>
<Compile Include="Forms\QRCodeForm.cs">
<SubType>Form</SubType>
</Compile>
@ -117,6 +115,7 @@
<Compile Include="PingHelper.cs" />
<Compile Include="PingResult.cs" />
<Compile Include="ProxyInfo.cs" />
<Compile Include="Task.cs" />
<Compile Include="UITypeEditors\EnumDescriptionConverter.cs" />
<Compile Include="UITypeEditors\DirectoryNameEditor.cs" />
<Compile Include="UITypeEditors\MyColorConverter.cs" />
@ -335,6 +334,9 @@
<EmbeddedResource Include="Forms\MonitorTestForm.resx">
<DependentUpon>MonitorTestForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Forms\OutputBox.resx">
<DependentUpon>OutputBox.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Forms\QRCodeForm.resx">
<DependentUpon>QRCodeForm.cs</DependentUpon>
</EmbeddedResource>

2
HelpersLib/SettingsBase.cs
View file

@ -66,7 +66,7 @@ private void Save()
public void SaveAsync(string filePath)
{
ThreadPool.QueueUserWorkItem(state => Save(filePath));
Task.Run(() => Save(filePath));
}
private void SaveAsync()

41
HelpersLib/Task.cs Normal file
View file

@ -0,0 +1,41 @@
#region License Information (GPL v3)
/*
ShareX - A program that allows you to take screenshots and share any file type
Copyright (C) 2007-2014 ShareX Developers
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
Optionally you can also view the license at <http://www.gnu.org/licenses/>.
*/
#endregion License Information (GPL v3)
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading;
namespace HelpersLib
{
public static class Task
{
public static void Run(Action action)
{
ThreadPool.QueueUserWorkItem(state => action());
}
}
}

2
HelpersLib/packages.config
View file

@ -1,7 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="AsyncBridge.Net35" version="0.2.0" targetFramework="net35" />
<package id="Newtonsoft.Json" version="6.0.3" targetFramework="net35" />
<package id="QrCode.Net" version="0.4.0.0" targetFramework="net35" />
<package id="TaskParallelLibrary" version="1.0.2856.0" targetFramework="net35" />
</packages>

8
HistoryLib/HistoryLib.csproj
View file

@ -45,20 +45,12 @@
<RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
</PropertyGroup>
<ItemGroup>
<Reference Include="AsyncBridge.Net35, Version=0.0.0.0, Culture=neutral, PublicKeyToken=b3b1c0202c0d6a87, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\AsyncBridge.Net35.0.2.0\lib\net35-Client\AsyncBridge.Net35.dll</HintPath>
</Reference>
<Reference Include="ImageListView, Version=11.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\ImageListView.11.0.1\lib\net35\ImageListView.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Drawing" />
<Reference Include="System.Threading, Version=1.0.2856.102, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\TaskParallelLibrary.1.0.2856.0\lib\Net35\System.Threading.dll</HintPath>
</Reference>
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Xml" />

6
HistoryLib/HistoryManager.cs
View file

@ -73,13 +73,11 @@ public List<HistoryItem> GetHistoryItems()
public static void AddHistoryItemAsync(string historyPath, HistoryItem historyItem)
{
WaitCallback thread = state =>
Task.Run(() =>
{
HistoryManager history = new HistoryManager(historyPath);
history.AppendHistoryItem(historyItem);
};
ThreadPool.QueueUserWorkItem(thread);
});
}
}
}

2
HistoryLib/packages.config
View file

@ -1,6 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="AsyncBridge.Net35" version="0.2.0" targetFramework="net35" />
<package id="ImageListView" version="11.0.1" targetFramework="net35" />
<package id="TaskParallelLibrary" version="1.0.2856.0" targetFramework="net35" />
</packages>

4
ScreenCaptureLib/ScreenCaptureLib.csproj
View file

@ -41,10 +41,6 @@
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
</PropertyGroup>
<ItemGroup>
<Reference Include="AsyncBridge.Net35, Version=0.0.0.0, Culture=neutral, PublicKeyToken=b3b1c0202c0d6a87, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\AsyncBridge.Net35.0.2.0\lib\net35-Client\AsyncBridge.Net35.dll</HintPath>
</Reference>
<Reference Include="SevenZipSharp">
<HintPath>..\packages\SevenZipSharp.0.64\lib\SevenZipSharp.dll</HintPath>
</Reference>

20
ScreenCaptureLib/Screencast/FFmpegHelper.cs
View file

@ -42,22 +42,36 @@ public class FFmpegHelper : ExternalCLIManager
public static readonly int libmp3lame_qscale_end = 9;
public static readonly string GDIgrab = "GDI grab";
public StringBuilder Output { get; private set; }
public ScreencastOptions Options { get; private set; }
public FFmpegHelper(ScreencastOptions options)
{
Output = new StringBuilder();
OutputDataReceived += FFmpegHelper_DataReceived;
ErrorDataReceived += FFmpegHelper_DataReceived;
Options = options;
Helpers.CreateDirectoryIfNotExist(Options.OutputPath);
}
private void FFmpegHelper_DataReceived(object sender, DataReceivedEventArgs e)
{
lock (this)
{
if (!string.IsNullOrEmpty(e.Data))
{
Output.AppendLine(e.Data);
}
}
}
public bool Record()
{
int errorCode = Open(Options.FFmpeg.CLIPath, Options.GetFFmpegArgs());
bool result = errorCode == 0;
if (Options.FFmpeg.ShowError && !result)
{
string text = string.Join("\r\n", Errors.ToString().Lines().Where(x => !string.IsNullOrEmpty(x)).TakeLast(10).ToArray());
MessageBox.Show(text, "ShareX - FFmpeg error", MessageBoxButtons.OK, MessageBoxIcon.Error);
new OutputBox(Output.ToString(), "FFmpeg error").ShowDialog();
}
return result;
}
@ -133,7 +147,7 @@ public DirectShowDevices GetDirectShowDevices()
{
string arg = "-list_devices true -f dshow -i dummy";
Open(Options.FFmpeg.CLIPath, arg);
string output = Errors.ToString();
string output = Output.ToString();
string[] lines = output.Lines();
bool isVideo = true;
Regex regex = new Regex("\\[dshow @ \\w+\\] \"(.+)\"", RegexOptions.Compiled | RegexOptions.CultureInvariant);

9
ScreenCaptureLib/Screencast/ImageCache.cs
View file

@ -30,6 +30,7 @@
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
namespace ScreenCaptureLib
@ -39,7 +40,7 @@ public abstract class ImageCache : IDisposable
public bool IsWorking { get; protected set; }
public ScreencastOptions Options { get; set; }
protected Task task;
protected Thread task;
protected BlockingCollection<Image> imageQueue;
public ImageCache()
@ -63,7 +64,7 @@ protected virtual void StartConsumerThread()
{
IsWorking = true;
task = TaskEx.Run(() =>
task = new Thread(() =>
{
try
{
@ -95,6 +96,8 @@ protected virtual void StartConsumerThread()
IsWorking = false;
}
});
task.Start();
}
}
@ -105,7 +108,7 @@ public void Finish()
if (IsWorking)
{
imageQueue.CompleteAdding();
task.Wait();
task.Join();
}
Dispose();

1
ScreenCaptureLib/packages.config
View file

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="AsyncBridge.Net35" version="0.2.0" targetFramework="net35" />
<package id="SevenZipSharp" version="0.64" targetFramework="net35" />
<package id="TaskParallelLibrary" version="1.0.2856.0" targetFramework="net35" />
</packages>

70
ShareX/Forms/MainForm_Capture.cs
View file

@ -32,7 +32,6 @@
using System.Diagnostics;
using System.Drawing;
using System.Threading;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace ShareX
@ -43,7 +42,7 @@ public partial class MainForm
private void InitHotkeys()
{
ThreadPool.QueueUserWorkItem(state =>
Task.Run(() =>
{
if (Program.HotkeysConfig == null)
{
@ -467,54 +466,61 @@ private void CaptureLastRegion(TaskSettings taskSettings, bool autoHideForm = tr
}
}
private async void PrepareCaptureMenuAsync(ToolStripMenuItem tsmiWindow, EventHandler handlerWindow, ToolStripMenuItem tsmiMonitor, EventHandler handlerMonitor)
private void PrepareCaptureMenuAsync(ToolStripMenuItem tsmiWindow, EventHandler handlerWindow, ToolStripMenuItem tsmiMonitor, EventHandler handlerMonitor)
{
tsmiWindow.DropDownItems.Clear();
WindowsList windowsList = new WindowsList();
List<WindowInfo> windows = await TaskEx.Run(() => windowsList.GetVisibleWindowsList());
List<WindowInfo> windows = null;
if (windows != null)
Helpers.AsyncJob(() =>
{
foreach (WindowInfo window in windows)
windows = windowsList.GetVisibleWindowsList();
},
() =>
{
if (windows != null)
{
try
foreach (WindowInfo window in windows)
{
string title = window.Text.Truncate(50);
ToolStripItem tsi = tsmiWindow.DropDownItems.Add(title);
tsi.Tag = window;
tsi.Click += handlerWindow;
using (Icon icon = window.Icon)
try
{
if (icon != null && icon.Width > 0 && icon.Height > 0)
string title = window.Text.Truncate(50);
ToolStripItem tsi = tsmiWindow.DropDownItems.Add(title);
tsi.Tag = window;
tsi.Click += handlerWindow;
using (Icon icon = window.Icon)
{
tsi.Image = icon.ToBitmap();
if (icon != null && icon.Width > 0 && icon.Height > 0)
{
tsi.Image = icon.ToBitmap();
}
}
}
}
catch (Exception e)
{
DebugHelper.WriteException(e);
catch (Exception e)
{
DebugHelper.WriteException(e);
}
}
}
}
tsmiMonitor.DropDownItems.Clear();
tsmiMonitor.DropDownItems.Clear();
Screen[] screens = Screen.AllScreens;
Screen[] screens = Screen.AllScreens;
for (int i = 0; i < screens.Length; i++)
{
Screen screen = screens[i];
string text = string.Format("{0}. {1}x{2}", i + 1, screen.Bounds.Width, screen.Bounds.Height);
ToolStripItem tsi = tsmiMonitor.DropDownItems.Add(text);
tsi.Tag = screen.Bounds;
tsi.Click += handlerMonitor;
}
for (int i = 0; i < screens.Length; i++)
{
Screen screen = screens[i];
string text = string.Format("{0}. {1}x{2}", i + 1, screen.Bounds.Width, screen.Bounds.Height);
ToolStripItem tsi = tsmiMonitor.DropDownItems.Add(text);
tsi.Tag = screen.Bounds;
tsi.Click += handlerMonitor;
}
tsmiWindow.Invalidate();
tsmiMonitor.Invalidate();
tsmiWindow.Invalidate();
tsmiMonitor.Invalidate();
});
}
#region Menu events

173
ShareX/Forms/ScreenRecordForm.cs
View file

@ -30,7 +30,6 @@
using System.Drawing;
using System.IO;
using System.Threading;
using System.Threading.Tasks;
using System.Windows.Forms;
using UploadersLib;
@ -81,7 +80,7 @@ private void SelectRegion()
}
}
public async void StartRecording(TaskSettings TaskSettings)
public void StartRecording(TaskSettings TaskSettings)
{
if (TaskSettings.CaptureSettings.RunScreencastCLI)
{
@ -132,92 +131,90 @@ public async void StartRecording(TaskSettings TaskSettings)
string path = "";
try
{
using (ScreenRegionManager screenRegionManager = new ScreenRegionManager())
{
screenRegionManager.Start(captureRectangle);
ScreenRegionManager screenRegionManager = new ScreenRegionManager();
screenRegionManager.Start(captureRectangle);
await TaskEx.Run(() =>
Helpers.AsyncJob(() =>
{
if (TaskSettings.CaptureSettings.ScreenRecordOutput == ScreenRecordOutput.AVI)
{
path = Path.Combine(TaskSettings.CaptureFolder, TaskHelpers.GetFilename(TaskSettings, "avi"));
}
else if (TaskSettings.CaptureSettings.ScreenRecordOutput == ScreenRecordOutput.FFmpeg)
{
path = Path.Combine(TaskSettings.CaptureFolder, TaskHelpers.GetFilename(TaskSettings, TaskSettings.CaptureSettings.FFmpegOptions.Extension));
}
else
{
path = Program.ScreenRecorderCacheFilePath;
}
ScreencastOptions options = new ScreencastOptions()
{
CaptureArea = captureRectangle,
GIFFPS = TaskSettings.CaptureSettings.GIFFPS,
ScreenRecordFPS = TaskSettings.CaptureSettings.ScreenRecordFPS,
OutputPath = path,
Duration = TaskSettings.CaptureSettings.ScreenRecordFixedDuration ? TaskSettings.CaptureSettings.ScreenRecordDuration : 0,
AVI = TaskSettings.CaptureSettings.AVIOptions,
FFmpeg = TaskSettings.CaptureSettings.FFmpegOptions,
DrawCursor = TaskSettings.CaptureSettings.ShowCursor
};
screenRecorder = new ScreenRecorder(options, captureRectangle, TaskSettings.CaptureSettings.ScreenRecordOutput);
int delay = (int)(TaskSettings.CaptureSettings.ScreenRecordStartDelay * 1000);
if (delay > 0)
{
Thread.Sleep(delay);
}
this.InvokeSafe(() =>
{
screenRegionManager.ChangeColor(Color.FromArgb(0, 255, 0));
TrayIcon.Icon = Resources.control_record.ToIcon();
});
screenRecorder.StartRecording();
if (screenRegionManager != null)
{
this.InvokeSafe(() => screenRegionManager.Dispose());
}
if (screenRecorder != null)
{
TrayIcon.Icon = Resources.camcorder_pencil.ToIcon();
string sourceFilePath = path;
if (TaskSettings.CaptureSettings.ScreenRecordOutput == ScreenRecordOutput.GIF)
{
if (TaskSettings.CaptureSettings.ScreenRecordOutput == ScreenRecordOutput.AVI)
if (TaskSettings.CaptureSettings.RunScreencastCLI)
{
path = Path.Combine(TaskSettings.CaptureFolder, TaskHelpers.GetFilename(TaskSettings, "avi"));
}
else if (TaskSettings.CaptureSettings.ScreenRecordOutput == ScreenRecordOutput.FFmpeg)
{
path = Path.Combine(TaskSettings.CaptureFolder, TaskHelpers.GetFilename(TaskSettings, TaskSettings.CaptureSettings.FFmpegOptions.Extension));
sourceFilePath = Path.ChangeExtension(Program.ScreenRecorderCacheFilePath, "gif");
}
else
{
path = Program.ScreenRecorderCacheFilePath;
sourceFilePath = path = Path.Combine(TaskSettings.CaptureFolder, TaskHelpers.GetFilename(TaskSettings, "gif"));
}
screenRecorder.SaveAsGIF(sourceFilePath, TaskSettings.ImageSettings.ImageGIFQuality);
}
ScreencastOptions options = new ScreencastOptions()
{
CaptureArea = captureRectangle,
GIFFPS = TaskSettings.CaptureSettings.GIFFPS,
ScreenRecordFPS = TaskSettings.CaptureSettings.ScreenRecordFPS,
OutputPath = path,
Duration = TaskSettings.CaptureSettings.ScreenRecordFixedDuration ? TaskSettings.CaptureSettings.ScreenRecordDuration : 0,
AVI = TaskSettings.CaptureSettings.AVIOptions,
FFmpeg = TaskSettings.CaptureSettings.FFmpegOptions,
DrawCursor = TaskSettings.CaptureSettings.ShowCursor
};
screenRecorder = new ScreenRecorder(options, captureRectangle, TaskSettings.CaptureSettings.ScreenRecordOutput);
int delay = (int)(TaskSettings.CaptureSettings.ScreenRecordStartDelay * 1000);
if (delay > 0)
{
Thread.Sleep(delay);
}
screenRegionManager.ChangeColor();
this.InvokeSafe(() => TrayIcon.Icon = Resources.control_record.ToIcon());
screenRecorder.StartRecording();
});
}
if (screenRecorder != null)
{
TrayIcon.Icon = Resources.camcorder__pencil.ToIcon();
await TaskEx.Run(() =>
if (TaskSettings.CaptureSettings.RunScreencastCLI)
{
string sourceFilePath = path;
if (TaskSettings.CaptureSettings.ScreenRecordOutput == ScreenRecordOutput.GIF)
{
if (TaskSettings.CaptureSettings.RunScreencastCLI)
{
sourceFilePath = Path.ChangeExtension(Program.ScreenRecorderCacheFilePath, "gif");
}
else
{
sourceFilePath = path = Path.Combine(TaskSettings.CaptureFolder, TaskHelpers.GetFilename(TaskSettings, "gif"));
}
screenRecorder.SaveAsGIF(sourceFilePath, TaskSettings.ImageSettings.ImageGIFQuality);
}
if (TaskSettings.CaptureSettings.RunScreencastCLI)
{
VideoEncoder encoder = Program.Settings.VideoEncoders[TaskSettings.CaptureSettings.VideoEncoderSelected];
path = Path.Combine(TaskSettings.CaptureFolder, TaskHelpers.GetFilename(TaskSettings, encoder.OutputExtension));
screenRecorder.EncodeUsingCommandLine(encoder, sourceFilePath, path);
}
});
VideoEncoder encoder = Program.Settings.VideoEncoders[TaskSettings.CaptureSettings.VideoEncoderSelected];
path = Path.Combine(TaskSettings.CaptureFolder, TaskHelpers.GetFilename(TaskSettings, encoder.OutputExtension));
screenRecorder.EncodeUsingCommandLine(encoder, sourceFilePath, path);
}
}
}
finally
},
() =>
{
if (screenRecorder != null)
{
if (TaskSettings.CaptureSettings.RunScreencastCLI &&
!string.IsNullOrEmpty(screenRecorder.CachePath) && File.Exists(screenRecorder.CachePath))
if (TaskSettings.CaptureSettings.RunScreencastCLI && !string.IsNullOrEmpty(screenRecorder.CachePath) && File.Exists(screenRecorder.CachePath))
{
File.Delete(screenRecorder.CachePath);
}
@ -230,26 +227,26 @@ public async void StartRecording(TaskSettings TaskSettings)
{
TrayIcon.Visible = false;
}
}
if (!string.IsNullOrEmpty(path) && File.Exists(path))
{
if (TaskSettings.AfterCaptureJob.HasFlag(AfterCaptureTasks.UploadImageToHost))
if (!string.IsNullOrEmpty(path) && File.Exists(path))
{
UploadManager.UploadFile(path, TaskSettings);
}
else
{
if (TaskSettings.AfterCaptureJob.HasFlag(AfterCaptureTasks.CopyFilePathToClipboard))
if (TaskSettings.AfterCaptureJob.HasFlag(AfterCaptureTasks.UploadImageToHost))
{
ClipboardHelpers.CopyText(path);
UploadManager.UploadFile(path, TaskSettings);
}
else
{
if (TaskSettings.AfterCaptureJob.HasFlag(AfterCaptureTasks.CopyFilePathToClipboard))
{
ClipboardHelpers.CopyText(path);
}
TaskHelpers.ShowResultNotifications(path, TaskSettings, path);
TaskHelpers.ShowResultNotifications(path, TaskSettings, path);
}
}
}
IsRecording = false;
IsRecording = false;
});
}
private void DownloaderForm_InstallRequested(string filePath)

2
ShareX/Forms/UploadTestForm.cs
View file

@ -313,7 +313,7 @@ private void openURLToolStripMenuItem_Click(object sender, EventArgs e)
if (task != null && task.Info != null && task.Info.Result != null && !string.IsNullOrEmpty(task.Info.Result.ToString()))
{
ThreadPool.QueueUserWorkItem(x => Process.Start(task.Info.Result.ToString()));
Task.Run(() => Process.Start(task.Info.Result.ToString()));
}
}
}

16
ShareX/Program.cs
View file

@ -32,7 +32,6 @@
using System.Runtime.InteropServices;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using System.Windows.Forms;
using UploadersLib;
@ -317,7 +316,7 @@ private static void Run(string[] args)
SettingsResetEvent = new ManualResetEvent(false);
UploaderSettingsResetEvent = new ManualResetEvent(false);
HotkeySettingsResetEvent = new ManualResetEvent(false);
ThreadPool.QueueUserWorkItem(state => LoadSettings());
Task.Run(() => LoadSettings());
DebugHelper.WriteLine("MainForm init started");
MainForm = new MainForm();
@ -532,11 +531,18 @@ private static void ReloadUploadersConfig(string filePath)
UploadersConfig = UploadersLib.UploadersConfig.Load(filePath);
}
public async static void UploadersConfigSaveAsync()
public static void UploadersConfigSaveAsync()
{
if (uploaderConfigWatcher != null) uploaderConfigWatcher.EnableRaisingEvents = false;
await TaskEx.Run(() => UploadersConfig.Save(Program.UploadersConfigFilePath));
if (uploaderConfigWatcher != null) uploaderConfigWatcher.EnableRaisingEvents = true;
Helpers.AsyncJob(() =>
{
UploadersConfig.Save(Program.UploadersConfigFilePath);
},
() =>
{
if (uploaderConfigWatcher != null) uploaderConfigWatcher.EnableRaisingEvents = true;
});
}
}
}

8
ShareX/Properties/Resources.Designer.cs generated
View file

@ -213,9 +213,9 @@ public class Resources {
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
public static System.Drawing.Bitmap camcorder__pencil {
public static System.Drawing.Bitmap camcorder_image {
get {
object obj = ResourceManager.GetObject("camcorder__pencil", resourceCulture);
object obj = ResourceManager.GetObject("camcorder_image", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
@ -223,9 +223,9 @@ public class Resources {
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
public static System.Drawing.Bitmap camcorder_image {
public static System.Drawing.Bitmap camcorder_pencil {
get {
object obj = ResourceManager.GetObject("camcorder_image", resourceCulture);
object obj = ResourceManager.GetObject("camcorder_pencil", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}

2
ShareX/Properties/Resources.resx
View file

@ -133,7 +133,7 @@
<data name="hammer_pencil" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\hammer--pencil.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="camcorder__pencil" type="System.Resources.ResXFileRef, System.Windows.Forms">
<data name="camcorder_pencil" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\camcorder--pencil.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ru" type="System.Resources.ResXFileRef, System.Windows.Forms">

4
ShareX/ScreenRegionManager.cs
View file

@ -42,11 +42,11 @@ public void Start(Rectangle captureRectangle)
}
}
public void ChangeColor()
public void ChangeColor(Color color)
{
if (regionForm != null)
{
regionForm.InvokeSafe(() => regionForm.ChangeColor(Color.FromArgb(0, 255, 0)));
regionForm.ChangeColor(color);
}
}

6
ShareX/ShareX.csproj
View file

@ -66,9 +66,6 @@
<ApplicationManifest>app.manifest</ApplicationManifest>
</PropertyGroup>
<ItemGroup>
<Reference Include="AsyncBridge.Net35">
<HintPath>..\packages\AsyncBridge.Net35.0.2.0\lib\net35-Client\AsyncBridge.Net35.dll</HintPath>
</Reference>
<Reference Include="MegaApiClient, Version=1.0.4.0, Culture=neutral, PublicKeyToken=0480d311efbeb4e2, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\MegaApiClient.1.0.4\lib\MegaApiClient.dll</HintPath>
@ -83,9 +80,6 @@
</Reference>
<Reference Include="System.Data" />
<Reference Include="System.Design" />
<Reference Include="System.Threading">
<HintPath>..\packages\TaskParallelLibrary.1.0.2856.0\lib\Net35\System.Threading.dll</HintPath>
</Reference>
<Reference Include="System.Xml.Linq">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>

2
ShareX/packages.config
View file

@ -1,7 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="AsyncBridge.Net35" version="0.2.0" targetFramework="net35" />
<package id="MegaApiClient" version="1.0.4" targetFramework="net35" />
<package id="Newtonsoft.Json" version="6.0.3" targetFramework="net35" />
<package id="TaskParallelLibrary" version="1.0.2856.0" targetFramework="net35" />
</packages>

2
UploadersLib/FTPClient/FTPClientForm.cs
View file

@ -554,7 +554,7 @@ private void openURLToolStripMenuItem_Click(object sender, EventArgs e)
FtpItem file = lvFTPList.SelectedItems[0].Tag as FtpItem;
if (file != null && file.ItemType == FtpItemType.File)
{
ThreadPool.QueueUserWorkItem(x => Process.Start(Account.GetUriPath("@" + file.FullPath)));
Task.Run(() => Process.Start(Account.GetUriPath("@" + file.FullPath)));
}
}
}

2
UploadersLib/FileUploaders/FTPUploader.cs
View file

@ -76,7 +76,7 @@ public override void StopUpload()
{
stopUpload = true;
ThreadPool.QueueUserWorkItem(state => ftpClient.StopUpload());
Task.Run(() => ftpClient.StopUpload());
}
}

66
UploadersLib/GUI/DropboxFilesForm.cs
View file

@ -28,7 +28,6 @@
using System.ComponentModel;
using System.IO;
using System.Linq;
using System.Threading.Tasks;
using System.Windows.Forms;
using UploadersLib.FileUploaders;
using UploadersLib.HelperClasses;
@ -60,45 +59,52 @@ public DropboxFilesForm(OAuthInfo oauth, string path, DropboxAccountInfo account
}
}
public async void OpenDirectory(string path)
public void OpenDirectory(string path)
{
lvDropboxFiles.Items.Clear();
DropboxContentInfo contentInfo = await TaskEx.Run(() => dropbox.GetMetadata(path, true));
DropboxContentInfo contentInfo = null;
if (contentInfo != null)
Helpers.AsyncJob(() =>
{
lvDropboxFiles.Tag = contentInfo;
ListViewItem lvi = GetParentFolder(contentInfo.Path);
if (lvi != null)
contentInfo = dropbox.GetMetadata(path, true);
},
() =>
{
if (contentInfo != null)
{
lvDropboxFiles.Items.Add(lvi);
}
lvDropboxFiles.Tag = contentInfo;
foreach (DropboxContentInfo content in contentInfo.Contents.OrderBy(x => !x.Is_dir))
{
string filename = Path.GetFileName(content.Path);
lvi = new ListViewItem(filename);
lvi.SubItems.Add(content.Is_dir ? "" : content.Size);
DateTime modified;
if (DateTime.TryParse(content.Modified, out modified))
ListViewItem lvi = GetParentFolder(contentInfo.Path);
if (lvi != null)
{
lvi.SubItems.Add(modified.ToString());
lvDropboxFiles.Items.Add(lvi);
}
lvi.ImageKey = ilm.AddImage(content.Icon);
lvi.Tag = content;
lvDropboxFiles.Items.Add(lvi);
}
CurrentFolderPath = contentInfo.Path.Trim('/');
Text = "Dropbox - " + CurrentFolderPath;
}
else
{
MessageBox.Show("Path not exist: " + path, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
foreach (DropboxContentInfo content in contentInfo.Contents.OrderBy(x => !x.Is_dir))
{
string filename = Path.GetFileName(content.Path);
lvi = new ListViewItem(filename);
lvi.SubItems.Add(content.Is_dir ? "" : content.Size);
DateTime modified;
if (DateTime.TryParse(content.Modified, out modified))
{
lvi.SubItems.Add(modified.ToString());
}
lvi.ImageKey = ilm.AddImage(content.Icon);
lvi.Tag = content;
lvDropboxFiles.Items.Add(lvi);
}
CurrentFolderPath = contentInfo.Path.Trim('/');
Text = "Dropbox - " + CurrentFolderPath;
}
else
{
MessageBox.Show("Path not exist: " + path, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
});
}
public void RefreshDirectory()

49
UploadersLib/GUI/UploadersConfigFormHelper.cs
View file

@ -33,7 +33,6 @@
using System.Net.NetworkInformation;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using System.Windows.Forms;
using UploadersLib.FileUploaders;
using UploadersLib.Forms;
@ -1500,13 +1499,13 @@ private CustomUploaderItem GetCustomUploaderFromFields()
return item;
}
private async void TestCustomUploader(CustomUploaderType type, CustomUploaderItem item)
private void TestCustomUploader(CustomUploaderType type, CustomUploaderItem item)
{
UploadResult result = null;
txtCustomUploaderLog.ResetText();
await TaskEx.Run(() =>
Helpers.AsyncJob(() =>
{
try
{
@ -1545,31 +1544,33 @@ private async void TestCustomUploader(CustomUploaderType type, CustomUploaderIte
result = new UploadResult();
result.Errors.Add(e.Message);
}
});
if (result != null)
},
() =>
{
if ((type != CustomUploaderType.URL && !string.IsNullOrEmpty(result.URL)) || (type == CustomUploaderType.URL && !string.IsNullOrEmpty(result.ShortenedURL)))
if (result != null)
{
txtCustomUploaderLog.AppendText("URL: " + result + Environment.NewLine);
}
else if (result.IsError)
{
txtCustomUploaderLog.AppendText("Error: " + result.ErrorsToString() + Environment.NewLine);
}
else
{
txtCustomUploaderLog.AppendText("Error: Result is empty." + Environment.NewLine);
if ((type != CustomUploaderType.URL && !string.IsNullOrEmpty(result.URL)) || (type == CustomUploaderType.URL && !string.IsNullOrEmpty(result.ShortenedURL)))
{
txtCustomUploaderLog.AppendText("URL: " + result + Environment.NewLine);
}
else if (result.IsError)
{
txtCustomUploaderLog.AppendText("Error: " + result.ErrorsToString() + Environment.NewLine);
}
else
{
txtCustomUploaderLog.AppendText("Error: Result is empty." + Environment.NewLine);
}
txtCustomUploaderLog.ScrollToCaret();
btnCustomUploaderShowLastResponse.Tag = result.Response;
btnCustomUploaderShowLastResponse.Enabled = !string.IsNullOrEmpty(result.Response);
}
txtCustomUploaderLog.ScrollToCaret();
btnCustomUploaderShowLastResponse.Tag = result.Response;
btnCustomUploaderShowLastResponse.Enabled = !string.IsNullOrEmpty(result.Response);
}
btnCustomUploaderImageUploaderTest.Enabled = btnCustomUploaderTextUploaderTest.Enabled =
btnCustomUploaderFileUploaderTest.Enabled = btnCustomUploaderURLShortenerTest.Enabled = true;
btnCustomUploaderImageUploaderTest.Enabled = btnCustomUploaderTextUploaderTest.Enabled =
btnCustomUploaderFileUploaderTest.Enabled = btnCustomUploaderURLShortenerTest.Enabled = true;
});
}
#endregion Custom uploader

6
UploadersLib/UploadersLib.csproj
View file

@ -99,12 +99,6 @@
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
<Reference Include="System.Xml" />
<Reference Include="AsyncBridge.Net35">
<HintPath>..\packages\AsyncBridge.Net35.0.2.0\lib\net35-Client\AsyncBridge.Net35.dll</HintPath>
</Reference>
<Reference Include="System.Threading">
<HintPath>..\packages\TaskParallelLibrary.1.0.2856.0\lib\Net35\System.Threading.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="APIKeys\APIKeys.cs" />

2
UploadersLib/packages.config
View file

@ -1,8 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="AsyncBridge.Net35" version="0.2.0" targetFramework="net35" />
<package id="MegaApiClient" version="1.0.4" targetFramework="net35" />
<package id="Newtonsoft.Json" version="6.0.3" targetFramework="net35" />
<package id="SSH.NET" version="2014.4.6-beta1" targetFramework="net35" />
<package id="TaskParallelLibrary" version="1.0.2856.0" targetFramework="net35" />
</packages>