mirror of
https://github.com/ShareX/ShareX.git
synced 2024-06-28 03:00:22 +12:00
Added screen recording FFmpeg and GIF buttons in capture menu
This commit is contained in:
Jaex
parent
81046ced7e
commit
6a3db1d925
88
ShareX/Forms/MainForm.Designer.cs
generated
88
ShareX/Forms/MainForm.Designer.cs
generated
|
|
@ -45,7 +45,8 @@ private void InitializeComponent()
|
|||
this.tsmiPolygon = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.tsmiFreeHand = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.tsmiLastRegion = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.tsmiScreenRecorder = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.tsmiScreenRecordingFFmpeg = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.tsmiScreenRecordingGIF = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.tsmiAutoCapture = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.tsddbUpload = new System.Windows.Forms.ToolStripDropDownButton();
|
||||
this.tsmiUploadFile = new System.Windows.Forms.ToolStripMenuItem();
|
||||
|
|
@ -173,7 +174,7 @@ private void InitializeComponent()
|
|||
this.tsmiTrayPolygon = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.tsmiTrayFreeHand = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.tsmiTrayLastRegion = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.tsmiTrayScreenRecorder = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.tsmiTrayScreenRecordingGIF = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.tsmiTrayAutoCapture = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.tsmiTrayUpload = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.uploadFileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
|
|
@ -217,6 +218,7 @@ private void InitializeComponent()
|
|||
this.tsmiTrayShow = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.tsmiTrayExit = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.ssToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.screenRecordingFFmpegToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.tsMain.SuspendLayout();
|
||||
((System.ComponentModel.ISupportInitialize)(this.scMain)).BeginInit();
|
||||
this.scMain.Panel1.SuspendLayout();
|
||||
|
|
@ -277,7 +279,8 @@ private void InitializeComponent()
|
|||
this.tsmiPolygon,
|
||||
this.tsmiFreeHand,
|
||||
this.tsmiLastRegion,
|
||||
this.tsmiScreenRecorder,
|
||||
this.tsmiScreenRecordingFFmpeg,
|
||||
this.tsmiScreenRecordingGIF,
|
||||
this.tsmiAutoCapture});
|
||||
this.tsddbCapture.Image = global::ShareX.Properties.Resources.camera;
|
||||
this.tsddbCapture.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
|
||||
|
|
@ -291,7 +294,7 @@ private void InitializeComponent()
|
|||
//
|
||||
this.tsmiFullscreen.Image = global::ShareX.Properties.Resources.layer;
|
||||
this.tsmiFullscreen.Name = "tsmiFullscreen";
|
||||
this.tsmiFullscreen.Size = new System.Drawing.Size(186, 22);
|
||||
this.tsmiFullscreen.Size = new System.Drawing.Size(226, 22);
|
||||
this.tsmiFullscreen.Text = "Fullscreen";
|
||||
this.tsmiFullscreen.Click += new System.EventHandler(this.tsmiFullscreen_Click);
|
||||
//
|
||||
|
|
@ -299,21 +302,21 @@ private void InitializeComponent()
|
|||
//
|
||||
this.tsmiWindow.Image = global::ShareX.Properties.Resources.application_blue;
|
||||
this.tsmiWindow.Name = "tsmiWindow";
|
||||
this.tsmiWindow.Size = new System.Drawing.Size(186, 22);
|
||||
this.tsmiWindow.Size = new System.Drawing.Size(226, 22);
|
||||
this.tsmiWindow.Text = "Window";
|
||||
//
|
||||
// tsmiMonitor
|
||||
//
|
||||
this.tsmiMonitor.Image = global::ShareX.Properties.Resources.monitor;
|
||||
this.tsmiMonitor.Name = "tsmiMonitor";
|
||||
this.tsmiMonitor.Size = new System.Drawing.Size(186, 22);
|
||||
this.tsmiMonitor.Size = new System.Drawing.Size(226, 22);
|
||||
this.tsmiMonitor.Text = "Monitor";
|
||||
//
|
||||
// tsmiRectangle
|
||||
//
|
||||
this.tsmiRectangle.Image = global::ShareX.Properties.Resources.layer_shape;
|
||||
this.tsmiRectangle.Name = "tsmiRectangle";
|
||||
this.tsmiRectangle.Size = new System.Drawing.Size(186, 22);
|
||||
this.tsmiRectangle.Size = new System.Drawing.Size(226, 22);
|
||||
this.tsmiRectangle.Text = "Rectangle";
|
||||
this.tsmiRectangle.Click += new System.EventHandler(this.tsmiRectangle_Click);
|
||||
//
|
||||
|
|
@ -321,7 +324,7 @@ private void InitializeComponent()
|
|||
//
|
||||
this.tsmiWindowRectangle.Image = global::ShareX.Properties.Resources.layers_ungroup;
|
||||
this.tsmiWindowRectangle.Name = "tsmiWindowRectangle";
|
||||
this.tsmiWindowRectangle.Size = new System.Drawing.Size(186, 22);
|
||||
this.tsmiWindowRectangle.Size = new System.Drawing.Size(226, 22);
|
||||
this.tsmiWindowRectangle.Text = "Rectangle (Objects)";
|
||||
this.tsmiWindowRectangle.Click += new System.EventHandler(this.tsmiWindowRectangle_Click);
|
||||
//
|
||||
|
|
@ -329,7 +332,7 @@ private void InitializeComponent()
|
|||
//
|
||||
this.tsmiRectangleAnnotate.Image = global::ShareX.Properties.Resources.layer_pencil;
|
||||
this.tsmiRectangleAnnotate.Name = "tsmiRectangleAnnotate";
|
||||
this.tsmiRectangleAnnotate.Size = new System.Drawing.Size(186, 22);
|
||||
this.tsmiRectangleAnnotate.Size = new System.Drawing.Size(226, 22);
|
||||
this.tsmiRectangleAnnotate.Text = "Rectangle (Annotate)";
|
||||
this.tsmiRectangleAnnotate.Click += new System.EventHandler(this.tsmiRectangleAnnotate_Click);
|
||||
//
|
||||
|
|
@ -337,7 +340,7 @@ private void InitializeComponent()
|
|||
//
|
||||
this.tsmiRectangleLight.Image = global::ShareX.Properties.Resources.Rectangle;
|
||||
this.tsmiRectangleLight.Name = "tsmiRectangleLight";
|
||||
this.tsmiRectangleLight.Size = new System.Drawing.Size(186, 22);
|
||||
this.tsmiRectangleLight.Size = new System.Drawing.Size(226, 22);
|
||||
this.tsmiRectangleLight.Text = "Rectangle (Light)";
|
||||
this.tsmiRectangleLight.Click += new System.EventHandler(this.tsmiRectangleLight_Click);
|
||||
//
|
||||
|
|
@ -345,7 +348,7 @@ private void InitializeComponent()
|
|||
//
|
||||
this.tsmiRoundedRectangle.Image = global::ShareX.Properties.Resources.layer_shape_round;
|
||||
this.tsmiRoundedRectangle.Name = "tsmiRoundedRectangle";
|
||||
this.tsmiRoundedRectangle.Size = new System.Drawing.Size(186, 22);
|
||||
this.tsmiRoundedRectangle.Size = new System.Drawing.Size(226, 22);
|
||||
this.tsmiRoundedRectangle.Text = "Rounded rectangle";
|
||||
this.tsmiRoundedRectangle.Click += new System.EventHandler(this.tsmiRoundedRectangle_Click);
|
||||
//
|
||||
|
|
@ -353,7 +356,7 @@ private void InitializeComponent()
|
|||
//
|
||||
this.tsmiEllipse.Image = global::ShareX.Properties.Resources.layer_shape_ellipse;
|
||||
this.tsmiEllipse.Name = "tsmiEllipse";
|
||||
this.tsmiEllipse.Size = new System.Drawing.Size(186, 22);
|
||||
this.tsmiEllipse.Size = new System.Drawing.Size(226, 22);
|
||||
this.tsmiEllipse.Text = "Ellipse";
|
||||
this.tsmiEllipse.Click += new System.EventHandler(this.tsmiEllipse_Click);
|
||||
//
|
||||
|
|
@ -361,7 +364,7 @@ private void InitializeComponent()
|
|||
//
|
||||
this.tsmiTriangle.Image = global::ShareX.Properties.Resources.Triangle;
|
||||
this.tsmiTriangle.Name = "tsmiTriangle";
|
||||
this.tsmiTriangle.Size = new System.Drawing.Size(186, 22);
|
||||
this.tsmiTriangle.Size = new System.Drawing.Size(226, 22);
|
||||
this.tsmiTriangle.Text = "Triangle";
|
||||
this.tsmiTriangle.Click += new System.EventHandler(this.tsmiTriangle_Click);
|
||||
//
|
||||
|
|
@ -369,7 +372,7 @@ private void InitializeComponent()
|
|||
//
|
||||
this.tsmiDiamond.Image = global::ShareX.Properties.Resources.Diamond;
|
||||
this.tsmiDiamond.Name = "tsmiDiamond";
|
||||
this.tsmiDiamond.Size = new System.Drawing.Size(186, 22);
|
||||
this.tsmiDiamond.Size = new System.Drawing.Size(226, 22);
|
||||
this.tsmiDiamond.Text = "Diamond";
|
||||
this.tsmiDiamond.Click += new System.EventHandler(this.tsmiDiamond_Click);
|
||||
//
|
||||
|
|
@ -377,7 +380,7 @@ private void InitializeComponent()
|
|||
//
|
||||
this.tsmiPolygon.Image = global::ShareX.Properties.Resources.layer_shape_polygon;
|
||||
this.tsmiPolygon.Name = "tsmiPolygon";
|
||||
this.tsmiPolygon.Size = new System.Drawing.Size(186, 22);
|
||||
this.tsmiPolygon.Size = new System.Drawing.Size(226, 22);
|
||||
this.tsmiPolygon.Text = "Polygon";
|
||||
this.tsmiPolygon.Click += new System.EventHandler(this.tsmiPolygon_Click);
|
||||
//
|
||||
|
|
@ -385,7 +388,7 @@ private void InitializeComponent()
|
|||
//
|
||||
this.tsmiFreeHand.Image = global::ShareX.Properties.Resources.layer_shape_curve;
|
||||
this.tsmiFreeHand.Name = "tsmiFreeHand";
|
||||
this.tsmiFreeHand.Size = new System.Drawing.Size(186, 22);
|
||||
this.tsmiFreeHand.Size = new System.Drawing.Size(226, 22);
|
||||
this.tsmiFreeHand.Text = "Freehand";
|
||||
this.tsmiFreeHand.Click += new System.EventHandler(this.tsmiFreeHand_Click);
|
||||
//
|
||||
|
|
@ -393,23 +396,31 @@ private void InitializeComponent()
|
|||
//
|
||||
this.tsmiLastRegion.Image = global::ShareX.Properties.Resources.layers_arrange;
|
||||
this.tsmiLastRegion.Name = "tsmiLastRegion";
|
||||
this.tsmiLastRegion.Size = new System.Drawing.Size(186, 22);
|
||||
this.tsmiLastRegion.Size = new System.Drawing.Size(226, 22);
|
||||
this.tsmiLastRegion.Text = "Last region";
|
||||
this.tsmiLastRegion.Click += new System.EventHandler(this.tsmiLastRegion_Click);
|
||||
//
|
||||
// tsmiScreenRecorder
|
||||
// tsmiScreenRecordingFFmpeg
|
||||
//
|
||||
this.tsmiScreenRecorder.Image = global::ShareX.Properties.Resources.camcorder_image;
|
||||
this.tsmiScreenRecorder.Name = "tsmiScreenRecorder";
|
||||
this.tsmiScreenRecorder.Size = new System.Drawing.Size(186, 22);
|
||||
this.tsmiScreenRecorder.Text = "Screen recording...";
|
||||
this.tsmiScreenRecorder.Click += new System.EventHandler(this.tsmiScreenRecorder_Click);
|
||||
this.tsmiScreenRecordingFFmpeg.Image = global::ShareX.Properties.Resources.film;
|
||||
this.tsmiScreenRecordingFFmpeg.Name = "tsmiScreenRecordingFFmpeg";
|
||||
this.tsmiScreenRecordingFFmpeg.Size = new System.Drawing.Size(226, 22);
|
||||
this.tsmiScreenRecordingFFmpeg.Text = "Screen recording (FFmpeg)...";
|
||||
this.tsmiScreenRecordingFFmpeg.Click += new System.EventHandler(this.tsmiScreenRecordingFFmpeg_Click);
|
||||
//
|
||||
// tsmiScreenRecordingGIF
|
||||
//
|
||||
this.tsmiScreenRecordingGIF.Image = global::ShareX.Properties.Resources.camcorder_image;
|
||||
this.tsmiScreenRecordingGIF.Name = "tsmiScreenRecordingGIF";
|
||||
this.tsmiScreenRecordingGIF.Size = new System.Drawing.Size(226, 22);
|
||||
this.tsmiScreenRecordingGIF.Text = "Screen recording (GIF)...";
|
||||
this.tsmiScreenRecordingGIF.Click += new System.EventHandler(this.tsmiScreenRecordingGIF_Click);
|
||||
//
|
||||
// tsmiAutoCapture
|
||||
//
|
||||
this.tsmiAutoCapture.Image = global::ShareX.Properties.Resources.clock;
|
||||
this.tsmiAutoCapture.Name = "tsmiAutoCapture";
|
||||
this.tsmiAutoCapture.Size = new System.Drawing.Size(186, 22);
|
||||
this.tsmiAutoCapture.Size = new System.Drawing.Size(226, 22);
|
||||
this.tsmiAutoCapture.Text = "Auto capture...";
|
||||
this.tsmiAutoCapture.Click += new System.EventHandler(this.tsmiAutoCapture_Click);
|
||||
//
|
||||
|
|
@ -1410,7 +1421,8 @@ private void InitializeComponent()
|
|||
this.tsmiTrayPolygon,
|
||||
this.tsmiTrayFreeHand,
|
||||
this.tsmiTrayLastRegion,
|
||||
this.tsmiTrayScreenRecorder,
|
||||
this.screenRecordingFFmpegToolStripMenuItem,
|
||||
this.tsmiTrayScreenRecordingGIF,
|
||||
this.tsmiTrayAutoCapture});
|
||||
this.tsmiTrayCapture.Image = global::ShareX.Properties.Resources.camera;
|
||||
this.tsmiTrayCapture.Name = "tsmiTrayCapture";
|
||||
|
|
@ -1528,13 +1540,13 @@ private void InitializeComponent()
|
|||
this.tsmiTrayLastRegion.Text = "Last region";
|
||||
this.tsmiTrayLastRegion.Click += new System.EventHandler(this.tsmiTrayLastRegion_Click);
|
||||
//
|
||||
// tsmiTrayScreenRecorder
|
||||
// tsmiTrayScreenRecordingGIF
|
||||
//
|
||||
this.tsmiTrayScreenRecorder.Image = global::ShareX.Properties.Resources.camcorder_image;
|
||||
this.tsmiTrayScreenRecorder.Name = "tsmiTrayScreenRecorder";
|
||||
this.tsmiTrayScreenRecorder.Size = new System.Drawing.Size(186, 22);
|
||||
this.tsmiTrayScreenRecorder.Text = "Screen recording...";
|
||||
this.tsmiTrayScreenRecorder.Click += new System.EventHandler(this.tsmiScreenRecorder_Click);
|
||||
this.tsmiTrayScreenRecordingGIF.Image = global::ShareX.Properties.Resources.camcorder_image;
|
||||
this.tsmiTrayScreenRecordingGIF.Name = "tsmiTrayScreenRecordingGIF";
|
||||
this.tsmiTrayScreenRecordingGIF.Size = new System.Drawing.Size(226, 22);
|
||||
this.tsmiTrayScreenRecordingGIF.Text = "Screen recording (GIF)...";
|
||||
this.tsmiTrayScreenRecordingGIF.Click += new System.EventHandler(this.tsmiScreenRecordingGIF_Click);
|
||||
//
|
||||
// tsmiTrayAutoCapture
|
||||
//
|
||||
|
|
@ -1881,6 +1893,14 @@ private void InitializeComponent()
|
|||
this.ssToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
|
||||
this.ssToolStripMenuItem.Text = "ss";
|
||||
//
|
||||
// screenRecordingFFmpegToolStripMenuItem
|
||||
//
|
||||
this.screenRecordingFFmpegToolStripMenuItem.Image = global::ShareX.Properties.Resources.film;
|
||||
this.screenRecordingFFmpegToolStripMenuItem.Name = "screenRecordingFFmpegToolStripMenuItem";
|
||||
this.screenRecordingFFmpegToolStripMenuItem.Size = new System.Drawing.Size(226, 22);
|
||||
this.screenRecordingFFmpegToolStripMenuItem.Text = "Screen recording (FFmpeg)...";
|
||||
this.screenRecordingFFmpegToolStripMenuItem.Click += new System.EventHandler(this.tsmiScreenRecordingFFmpeg_Click);
|
||||
//
|
||||
// MainForm
|
||||
//
|
||||
this.AllowDrop = true;
|
||||
|
|
@ -2023,8 +2043,8 @@ private void InitializeComponent()
|
|||
private System.Windows.Forms.ToolStripDropDownButton tsddbTools;
|
||||
private System.Windows.Forms.ToolStripMenuItem tsmiScreenColorPicker;
|
||||
private System.Windows.Forms.ToolStripMenuItem tsmiClearList;
|
||||
private System.Windows.Forms.ToolStripMenuItem tsmiScreenRecorder;
|
||||
private System.Windows.Forms.ToolStripMenuItem tsmiTrayScreenRecorder;
|
||||
private System.Windows.Forms.ToolStripMenuItem tsmiScreenRecordingGIF;
|
||||
private System.Windows.Forms.ToolStripMenuItem tsmiTrayScreenRecordingGIF;
|
||||
private System.Windows.Forms.ToolStripMenuItem tsmiTrayDonate;
|
||||
private System.Windows.Forms.ToolStripMenuItem tsmiHashCheck;
|
||||
private System.Windows.Forms.ToolStripMenuItem tsmiTrayHashCheck;
|
||||
|
|
@ -2104,5 +2124,7 @@ private void InitializeComponent()
|
|||
private System.Windows.Forms.ToolStripMenuItem tsmiEditSelectedFile;
|
||||
private System.Windows.Forms.ToolStripMenuItem tsmiTestURLSharing;
|
||||
private System.Windows.Forms.ToolStripMenuItem tsmiDeleteSelectedFile;
|
||||
private System.Windows.Forms.ToolStripMenuItem tsmiScreenRecordingFFmpeg;
|
||||
private System.Windows.Forms.ToolStripMenuItem screenRecordingFFmpegToolStripMenuItem;
|
||||
}
|
||||
}
|
||||
|
|
@ -842,9 +842,14 @@ private void tsmiTestUploaders_Click(object sender, EventArgs e)
|
|||
}
|
||||
}
|
||||
|
||||
private void tsmiScreenRecorder_Click(object sender, EventArgs e)
|
||||
private void tsmiScreenRecordingFFmpeg_Click(object sender, EventArgs e)
|
||||
{
|
||||
TaskHelpers.DoScreenRecorder();
|
||||
TaskHelpers.DoScreenRecordingFFmpeg();
|
||||
}
|
||||
|
||||
private void tsmiScreenRecordingGIF_Click(object sender, EventArgs e)
|
||||
{
|
||||
TaskHelpers.DoScreenRecordingGIF();
|
||||
}
|
||||
|
||||
private void tsmiAutoCapture_Click(object sender, EventArgs e)
|
||||
|
|
@ -1396,7 +1401,7 @@ private void ExecuteJob(TaskSettings taskSettings, HotkeyType job)
|
|||
CaptureScreenshot(CaptureType.LastRegion, safeTaskSettings, false);
|
||||
break;
|
||||
case HotkeyType.ScreenRecorder:
|
||||
TaskHelpers.DoScreenRecorder(safeTaskSettings);
|
||||
TaskHelpers.DoScreenRecording(safeTaskSettings);
|
||||
break;
|
||||
case HotkeyType.AutoCapture:
|
||||
TaskHelpers.OpenAutoCapture();
|
||||
|
|
|
|||
|
|
@ -257,11 +257,13 @@ private static void Main(string[] args)
|
|||
Application.ThreadException += Application_ThreadException;
|
||||
AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
|
||||
|
||||
Application.SetCompatibleTextRenderingDefault(false);
|
||||
StartTimer = Stopwatch.StartNew();
|
||||
StartTimer = Stopwatch.StartNew(); // For be able to show startup time
|
||||
|
||||
Arguments = args;
|
||||
bool isMultiInstance = CLIHelper.CheckArgs(Arguments, "multi", "m");
|
||||
applicationBase = new ShareXApplicationBase(!isMultiInstance);
|
||||
bool forceMultiInstance = CLIHelper.CheckArgs(Arguments, "multi", "m");
|
||||
|
||||
Application.SetCompatibleTextRenderingDefault(false);
|
||||
applicationBase = new ShareXApplicationBase(!forceMultiInstance);
|
||||
applicationBase.Startup += StartupHandler;
|
||||
applicationBase.StartupNextInstance += StartupNextInstanceHandler;
|
||||
applicationBase.Shutdown += ShutdownHandler;
|
||||
|
|
|
|||
10
ShareX/Properties/Resources.Designer.cs
generated
10
ShareX/Properties/Resources.Designer.cs
generated
|
|
@ -399,6 +399,16 @@ public class Resources {
|
|||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
||||
/// </summary>
|
||||
public static System.Drawing.Bitmap film {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("film", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
||||
/// </summary>
|
||||
|
|
|
|||
|
|
@ -121,9 +121,15 @@
|
|||
<data name="Test" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Test.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="google_plus" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\google_plus.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="layer" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\layer.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="layout_select_content" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\layout-select-content.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="layer_shape_curve" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\layer-shape-curve.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
|
|
@ -151,9 +157,6 @@
|
|||
<data name="Ellipse" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Ellipse.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="exclamation_button" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\exclamation-button.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="cross_button" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\cross-button.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
|
|
@ -172,12 +175,21 @@
|
|||
<data name="folder_open_image" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\folder-open-image.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="pipette" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\pipette.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
<data name="exclamation_button" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\exclamation-button.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="wrench_screwdriver" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\wrench-screwdriver.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="folder_open_document" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\folder-open-document.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="navigation_090_button" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\navigation-090-button.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="application_blue" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\resources\application-blue.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="layers_ungroup" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\layers-ungroup.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
|
|
@ -199,21 +211,9 @@
|
|||
<data name="image_export" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\image-export.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="layout_select_sidebar" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\layout-select-sidebar.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="au" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\au.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="layout_select_content" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\layout-select-content.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="application_network" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\resources\application-network.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="application_task" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\resources\application-task.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Polygon" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Polygon.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
|
|
@ -238,8 +238,8 @@
|
|||
<data name="control_record_yellow" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\control-record-yellow.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="layer_shape_round" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\layer-shape-round.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
<data name="ruler_triangle" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\ruler-triangle.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">
|
||||
<value>..\resources\camcorder--pencil.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
|
|
@ -253,9 +253,6 @@
|
|||
<data name="document_copy" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\document-copy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="ruler_triangle" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\ruler-triangle.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="navigation_000_button" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\navigation-000-button.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
|
|
@ -283,6 +280,9 @@
|
|||
<data name="upload_cloud" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\upload-cloud.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="heart" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\heart.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Rectangle" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Rectangle.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
|
|
@ -322,29 +322,29 @@
|
|||
<data name="Twitter" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Twitter.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="bin" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\bin.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="application_browser" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\resources\application-browser.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="clock" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\clock.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="traffic_cone" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\traffic-cone.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="globe_share" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\globe-share.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="barcode_2d" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\barcode-2d.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="google_plus" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\google_plus.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
<data name="pipette" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\pipette.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="pencil" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\pencil.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="navigation_090_button" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\navigation-090-button.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
<data name="au" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\au.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="layer_pencil" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\layer--pencil.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
|
|
@ -355,19 +355,22 @@
|
|||
<data name="layer_shape_polygon" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\layer-shape-polygon.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="folder_open_document" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\folder-open-document.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
<data name="layer_shape_round" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\layer-shape-round.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="eraser" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\eraser.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="application_blue" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\resources\application-blue.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
<data name="layout_select_sidebar" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\layout-select-sidebar.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="heart" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\heart.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
<data name="traffic_cone" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\traffic-cone.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="bin" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\bin.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
<data name="application_task" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\resources\application-task.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="film" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\film.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
</root>
|
||||
BIN
ShareX/Resources/film.png
Normal file
BIN
ShareX/Resources/film.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 648 B |
|
|
@ -486,6 +486,7 @@
|
|||
<None Include="Resources\layout-select-sidebar.png" />
|
||||
<None Include="Resources\layout-select-content.png" />
|
||||
<None Include="Resources\bin.png" />
|
||||
<None Include="Resources\film.png" />
|
||||
<Content Include="ShareX_Icon.ico" />
|
||||
<None Include="Resources\globe--pencil.png" />
|
||||
<None Include="Resources\camcorder--pencil.png" />
|
||||
|
|
|
|||
|
|
@ -468,7 +468,21 @@ public static void OpenDropWindow()
|
|||
DropForm.GetInstance(Program.Settings.DropSize, Program.Settings.DropOffset, Program.Settings.DropAlignment, Program.Settings.DropOpacity, Program.Settings.DropHoverOpacity).ShowActivate();
|
||||
}
|
||||
|
||||
public static void DoScreenRecorder(TaskSettings taskSettings = null)
|
||||
public static void DoScreenRecordingFFmpeg()
|
||||
{
|
||||
TaskSettings taskSettings = TaskSettings.GetDefaultTaskSettings();
|
||||
taskSettings.CaptureSettings.ScreenRecordOutput = ScreenRecordOutput.FFmpeg;
|
||||
DoScreenRecording(taskSettings);
|
||||
}
|
||||
|
||||
public static void DoScreenRecordingGIF()
|
||||
{
|
||||
TaskSettings taskSettings = TaskSettings.GetDefaultTaskSettings();
|
||||
taskSettings.CaptureSettings.ScreenRecordOutput = ScreenRecordOutput.GIF;
|
||||
DoScreenRecording(taskSettings);
|
||||
}
|
||||
|
||||
public static void DoScreenRecording(TaskSettings taskSettings = null)
|
||||
{
|
||||
if (taskSettings == null) taskSettings = TaskSettings.GetDefaultTaskSettings();
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue