diff --git a/ScreenCaptureLib/Forms/RectangleRegion.cs b/ScreenCaptureLib/Forms/RectangleRegion.cs
index 1d3dfe6f1..dd292d5d3 100644
--- a/ScreenCaptureLib/Forms/RectangleRegion.cs
+++ b/ScreenCaptureLib/Forms/RectangleRegion.cs
@@ -131,12 +131,13 @@ public override void Prepare()
if (Config != null)
{
AreaManager.WindowCaptureMode |= Config.ForceWindowCapture;
+ AreaManager.IncludeControls |= Config.IncludeControls;
if (AreaManager.WindowCaptureMode)
{
WindowsListAdvanced wla = new WindowsListAdvanced();
wla.IgnoreWindows.Add(Handle);
- wla.IncludeChildWindows = Config.IncludeControls;
+ wla.IncludeChildWindows = AreaManager.IncludeControls;
AreaManager.Windows = wla.GetWindowsRectangleList();
}
}
diff --git a/ScreenCaptureLib/Forms/RegionCapturePreview.Designer.cs b/ScreenCaptureLib/Forms/RegionCapturePreview.Designer.cs
deleted file mode 100644
index a42d35c23..000000000
--- a/ScreenCaptureLib/Forms/RegionCapturePreview.Designer.cs
+++ /dev/null
@@ -1,246 +0,0 @@
-namespace ScreenCaptureLib
-{
- partial class RegionCapturePreview
- {
- ///
- /// Required designer variable.
- ///
- private System.ComponentModel.IContainer components = null;
-
- ///
- /// Clean up any resources being used.
- ///
- /// true if managed resources should be disposed; otherwise, false.
- protected override void Dispose(bool disposing)
- {
- if (disposing && (components != null))
- {
- components.Dispose();
- }
- base.Dispose(disposing);
- }
-
- #region Windows Form Designer generated code
-
- ///
- /// Required method for Designer support - do not modify
- /// the contents of this method with the code editor.
- ///
- private void InitializeComponent()
- {
- System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(RegionCapturePreview));
- this.tsRegionTools = new System.Windows.Forms.ToolStrip();
- this.tsbFullscreen = new System.Windows.Forms.ToolStripButton();
- this.tsbWindowRectangle = new System.Windows.Forms.ToolStripButton();
- this.tsbRectangle = new System.Windows.Forms.ToolStripButton();
- this.tsbRoundedRectangle = new System.Windows.Forms.ToolStripButton();
- this.tsbEllipse = new System.Windows.Forms.ToolStripButton();
- this.tsbTriangle = new System.Windows.Forms.ToolStripButton();
- this.tsbDiamond = new System.Windows.Forms.ToolStripButton();
- this.tsbPolygon = new System.Windows.Forms.ToolStripButton();
- this.tsbFreeHand = new System.Windows.Forms.ToolStripButton();
- this.tsbLastRegion = new System.Windows.Forms.ToolStripButton();
- this.pbResult = new System.Windows.Forms.PictureBox();
- this.pImage = new System.Windows.Forms.Panel();
- this.pgSurfaceConfig = new System.Windows.Forms.PropertyGrid();
- this.btnClipboardCopy = new System.Windows.Forms.Button();
- this.tsRegionTools.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.pbResult)).BeginInit();
- this.pImage.SuspendLayout();
- this.SuspendLayout();
- //
- // tsRegionTools
- //
- this.tsRegionTools.AutoSize = false;
- this.tsRegionTools.Dock = System.Windows.Forms.DockStyle.None;
- this.tsRegionTools.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.tsbFullscreen,
- this.tsbWindowRectangle,
- this.tsbRectangle,
- this.tsbRoundedRectangle,
- this.tsbEllipse,
- this.tsbTriangle,
- this.tsbDiamond,
- this.tsbPolygon,
- this.tsbFreeHand,
- this.tsbLastRegion});
- this.tsRegionTools.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.Table;
- this.tsRegionTools.Location = new System.Drawing.Point(8, 8);
- this.tsRegionTools.Name = "tsRegionTools";
- this.tsRegionTools.Padding = new System.Windows.Forms.Padding(10, 10, 1, 0);
- this.tsRegionTools.ShowItemToolTips = false;
- this.tsRegionTools.Size = new System.Drawing.Size(168, 248);
- this.tsRegionTools.TabIndex = 0;
- this.tsRegionTools.Text = "toolStrip1";
- //
- // tsbFullscreen
- //
- this.tsbFullscreen.Image = ((System.Drawing.Image)(resources.GetObject("tsbFullscreen.Image")));
- this.tsbFullscreen.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.tsbFullscreen.Name = "tsbFullscreen";
- this.tsbFullscreen.Size = new System.Drawing.Size(80, 20);
- this.tsbFullscreen.Text = "Fullscreen";
- this.tsbFullscreen.Click += new System.EventHandler(this.tsbFullscreen_Click);
- //
- // tsbWindowRectangle
- //
- this.tsbWindowRectangle.Image = ((System.Drawing.Image)(resources.GetObject("tsbWindowRectangle.Image")));
- this.tsbWindowRectangle.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.tsbWindowRectangle.Name = "tsbWindowRectangle";
- this.tsbWindowRectangle.Size = new System.Drawing.Size(149, 20);
- this.tsbWindowRectangle.Text = "Window and Rectangle";
- this.tsbWindowRectangle.Click += new System.EventHandler(this.tsbWindowRectangle_Click);
- //
- // tsbRectangle
- //
- this.tsbRectangle.Image = ((System.Drawing.Image)(resources.GetObject("tsbRectangle.Image")));
- this.tsbRectangle.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.tsbRectangle.Name = "tsbRectangle";
- this.tsbRectangle.Size = new System.Drawing.Size(79, 20);
- this.tsbRectangle.Text = "Rectangle";
- this.tsbRectangle.Click += new System.EventHandler(this.tsbRectangle_Click);
- //
- // tsbRoundedRectangle
- //
- this.tsbRoundedRectangle.Image = ((System.Drawing.Image)(resources.GetObject("tsbRoundedRectangle.Image")));
- this.tsbRoundedRectangle.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.tsbRoundedRectangle.Name = "tsbRoundedRectangle";
- this.tsbRoundedRectangle.Size = new System.Drawing.Size(130, 20);
- this.tsbRoundedRectangle.Text = "Rounded Rectangle";
- this.tsbRoundedRectangle.Click += new System.EventHandler(this.tsbRoundedRectangle_Click);
- //
- // tsbEllipse
- //
- this.tsbEllipse.Image = ((System.Drawing.Image)(resources.GetObject("tsbEllipse.Image")));
- this.tsbEllipse.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.tsbEllipse.Name = "tsbEllipse";
- this.tsbEllipse.Size = new System.Drawing.Size(60, 20);
- this.tsbEllipse.Text = "Ellipse";
- this.tsbEllipse.Click += new System.EventHandler(this.tsbEllipse_Click);
- //
- // tsbTriangle
- //
- this.tsbTriangle.Image = ((System.Drawing.Image)(resources.GetObject("tsbTriangle.Image")));
- this.tsbTriangle.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.tsbTriangle.Name = "tsbTriangle";
- this.tsbTriangle.Size = new System.Drawing.Size(70, 20);
- this.tsbTriangle.Text = "Triangle";
- this.tsbTriangle.Click += new System.EventHandler(this.tsbTriangle_Click);
- //
- // tsbDiamond
- //
- this.tsbDiamond.Image = ((System.Drawing.Image)(resources.GetObject("tsbDiamond.Image")));
- this.tsbDiamond.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.tsbDiamond.Name = "tsbDiamond";
- this.tsbDiamond.Size = new System.Drawing.Size(76, 20);
- this.tsbDiamond.Text = "Diamond";
- this.tsbDiamond.Click += new System.EventHandler(this.tsbDiamond_Click);
- //
- // tsbPolygon
- //
- this.tsbPolygon.Image = ((System.Drawing.Image)(resources.GetObject("tsbPolygon.Image")));
- this.tsbPolygon.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.tsbPolygon.Name = "tsbPolygon";
- this.tsbPolygon.Size = new System.Drawing.Size(71, 20);
- this.tsbPolygon.Text = "Polygon";
- this.tsbPolygon.Click += new System.EventHandler(this.tsbPolygon_Click);
- //
- // tsbFreeHand
- //
- this.tsbFreeHand.Image = ((System.Drawing.Image)(resources.GetObject("tsbFreeHand.Image")));
- this.tsbFreeHand.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.tsbFreeHand.Name = "tsbFreeHand";
- this.tsbFreeHand.Size = new System.Drawing.Size(81, 20);
- this.tsbFreeHand.Text = "Free Hand";
- this.tsbFreeHand.Click += new System.EventHandler(this.tsbFreeHand_Click);
- //
- // tsbLastRegion
- //
- this.tsbLastRegion.Image = ((System.Drawing.Image)(resources.GetObject("tsbLastRegion.Image")));
- this.tsbLastRegion.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.tsbLastRegion.Name = "tsbLastRegion";
- this.tsbLastRegion.Size = new System.Drawing.Size(88, 20);
- this.tsbLastRegion.Text = "Last Region";
- this.tsbLastRegion.Click += new System.EventHandler(this.tsbLastRegion_Click);
- //
- // pbResult
- //
- this.pbResult.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- this.pbResult.Location = new System.Drawing.Point(0, 0);
- this.pbResult.Name = "pbResult";
- this.pbResult.Size = new System.Drawing.Size(500, 500);
- this.pbResult.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
- this.pbResult.TabIndex = 1;
- this.pbResult.TabStop = false;
- //
- // pImage
- //
- this.pImage.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
- | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.pImage.AutoScroll = true;
- this.pImage.Controls.Add(this.pbResult);
- this.pImage.Location = new System.Drawing.Point(304, 8);
- this.pImage.Name = "pImage";
- this.pImage.Size = new System.Drawing.Size(536, 632);
- this.pImage.TabIndex = 3;
- //
- // pgSurfaceConfig
- //
- this.pgSurfaceConfig.Location = new System.Drawing.Point(8, 264);
- this.pgSurfaceConfig.Name = "pgSurfaceConfig";
- this.pgSurfaceConfig.PropertySort = System.Windows.Forms.PropertySort.NoSort;
- this.pgSurfaceConfig.Size = new System.Drawing.Size(288, 376);
- this.pgSurfaceConfig.TabIndex = 2;
- this.pgSurfaceConfig.ToolbarVisible = false;
- //
- // btnClipboardCopy
- //
- this.btnClipboardCopy.Location = new System.Drawing.Point(184, 8);
- this.btnClipboardCopy.Name = "btnClipboardCopy";
- this.btnClipboardCopy.Size = new System.Drawing.Size(112, 40);
- this.btnClipboardCopy.TabIndex = 1;
- this.btnClipboardCopy.Text = "Copy image to clipboard";
- this.btnClipboardCopy.UseVisualStyleBackColor = true;
- this.btnClipboardCopy.Click += new System.EventHandler(this.btnClipboardCopy_Click);
- //
- // RegionCapturePreview
- //
- this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
- this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(849, 649);
- this.Controls.Add(this.btnClipboardCopy);
- this.Controls.Add(this.pImage);
- this.Controls.Add(this.pgSurfaceConfig);
- this.Controls.Add(this.tsRegionTools);
- this.Name = "RegionCapturePreview";
- this.Text = "Region Capture";
- this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.RegionCapturePreview_FormClosing);
- this.tsRegionTools.ResumeLayout(false);
- this.tsRegionTools.PerformLayout();
- ((System.ComponentModel.ISupportInitialize)(this.pbResult)).EndInit();
- this.pImage.ResumeLayout(false);
- this.pImage.PerformLayout();
- this.ResumeLayout(false);
-
- }
-
- #endregion
-
- private System.Windows.Forms.ToolStrip tsRegionTools;
- private System.Windows.Forms.ToolStripButton tsbFreeHand;
- private System.Windows.Forms.ToolStripButton tsbEllipse;
- private System.Windows.Forms.ToolStripButton tsbRectangle;
- private System.Windows.Forms.ToolStripButton tsbRoundedRectangle;
- private System.Windows.Forms.ToolStripButton tsbTriangle;
- private System.Windows.Forms.ToolStripButton tsbPolygon;
- private System.Windows.Forms.PictureBox pbResult;
- private System.Windows.Forms.ToolStripButton tsbDiamond;
- private System.Windows.Forms.ToolStripButton tsbFullscreen;
- private System.Windows.Forms.Panel pImage;
- private System.Windows.Forms.Button btnClipboardCopy;
- private System.Windows.Forms.ToolStripButton tsbWindowRectangle;
- private System.Windows.Forms.ToolStripButton tsbLastRegion;
- private System.Windows.Forms.PropertyGrid pgSurfaceConfig;
- }
-}
\ No newline at end of file
diff --git a/ScreenCaptureLib/Forms/RegionCapturePreview.cs b/ScreenCaptureLib/Forms/RegionCapturePreview.cs
deleted file mode 100644
index e4282d313..000000000
--- a/ScreenCaptureLib/Forms/RegionCapturePreview.cs
+++ /dev/null
@@ -1,182 +0,0 @@
-#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 .
-*/
-
-#endregion License Information (GPL v3)
-
-using HelpersLib;
-using System;
-using System.Drawing;
-using System.Windows.Forms;
-
-namespace ScreenCaptureLib
-{
- public partial class RegionCapturePreview : Form
- {
- public Image Result
- {
- get
- {
- return result;
- }
- private set
- {
- result = value;
-
- if (result != null)
- {
- pbResult.Image = result;
- Text = string.Format("Region Capture: {0}x{1}", result.Width, result.Height);
- }
- }
- }
-
- public SurfaceOptions SurfaceConfig { get; set; }
-
- private Image screenshot;
- private Image result;
-
- public RegionCapturePreview()
- : this(new SurfaceOptions())
- {
- }
-
- public RegionCapturePreview(SurfaceOptions surfaceConfig)
- {
- InitializeComponent();
-
- screenshot = Screenshot.CaptureFullscreen();
- SurfaceConfig = surfaceConfig;
- pgSurfaceConfig.SelectedObject = SurfaceConfig;
- }
-
- private void CaptureRegion(Surface surface)
- {
- pbResult.Image = null;
-
- try
- {
- surface.Config = SurfaceConfig;
- surface.SurfaceImage = screenshot;
- surface.Prepare();
- surface.ShowDialog();
-
- if (surface.Result == SurfaceResult.Region)
- {
- Result = surface.GetRegionImage();
- }
- else if (surface.Result == SurfaceResult.Fullscreen)
- {
- Result = screenshot;
- }
- }
- finally
- {
- surface.Dispose();
- }
- }
-
- private void CaptureLastRegion()
- {
- if (Surface.LastRegionFillPath != null)
- {
- Result = ShapeCaptureHelpers.GetRegionImage(screenshot, Surface.LastRegionFillPath, Surface.LastRegionDrawPath, SurfaceConfig);
- }
- else
- {
- CaptureRegion(new RectangleRegion());
- }
- }
-
- private void tsbFullscreen_Click(object sender, EventArgs e)
- {
- Result = screenshot;
- }
-
- private void tsbWindowRectangle_Click(object sender, EventArgs e)
- {
- RectangleRegion rectangleRegion = new RectangleRegion();
- rectangleRegion.AreaManager.WindowCaptureMode = true;
- CaptureRegion(rectangleRegion);
- }
-
- private void tsbRectangle_Click(object sender, EventArgs e)
- {
- CaptureRegion(new RectangleRegion());
- }
-
- private void tsbRoundedRectangle_Click(object sender, EventArgs e)
- {
- CaptureRegion(new RoundedRectangleRegion());
- }
-
- private void tsbEllipse_Click(object sender, EventArgs e)
- {
- CaptureRegion(new EllipseRegion());
- }
-
- private void tsbTriangle_Click(object sender, EventArgs e)
- {
- CaptureRegion(new TriangleRegion());
- }
-
- private void tsbDiamond_Click(object sender, EventArgs e)
- {
- CaptureRegion(new DiamondRegion());
- }
-
- private void tsbPolygon_Click(object sender, EventArgs e)
- {
- CaptureRegion(new PolygonRegion());
- }
-
- private void tsbFreeHand_Click(object sender, EventArgs e)
- {
- CaptureRegion(new FreeHandRegion());
- }
-
- private void tsbLastRegion_Click(object sender, EventArgs e)
- {
- CaptureLastRegion();
- }
-
- private void RegionCapturePreview_FormClosing(object sender, FormClosingEventArgs e)
- {
- if (Result != null)
- {
- DialogResult = DialogResult.OK;
- }
- else
- {
- DialogResult = DialogResult.Cancel;
- }
- }
-
- private void btnClipboardCopy_Click(object sender, EventArgs e)
- {
- if (Result != null)
- {
- ClipboardHelpers.CopyImage(Result);
- }
- }
- }
-}
\ No newline at end of file
diff --git a/ScreenCaptureLib/Forms/RegionCapturePreview.resx b/ScreenCaptureLib/Forms/RegionCapturePreview.resx
deleted file mode 100644
index b2f0bc071..000000000
--- a/ScreenCaptureLib/Forms/RegionCapturePreview.resx
+++ /dev/null
@@ -1,230 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/microsoft-resx
-
-
- 2.0
-
-
- System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- 17, 17
-
-
-
-
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEaSURBVDhPpZHdasJAEIV9WF/Jd+mNFyIIUlor/hTxp0Gk
- WjGaxGwSd2NGzy6jG5N4YQeGgSTfmTkntXrDpf+0Fni1cgKs+EzQ/kaqTM+CQFWds4xUaiB0GKdFAXva
- BTCRZ/0uiAzoBiovYJf9DKeKxMCHUGlw60naHGS1ABfDvkhv4HovabU70XJ7ei7wCGOjARP62SQ0+42r
- BeC5DHb+DDhZxTReRuUCSBuBIaxHeHqFAQ6diPoLUS7AvwqBwTPDeAZ44AjqzQW9T8O8ACa2Y/J2BAbP
- OJtP/pwZsPN9LAqg4d2ztiMweMbZ2MzftQZBuQCaveNX8Xb2zN388vXMZcDh7Xx1887bcXp3cqT2KNDw
- 24d3F3i9XboA/bSEOiL2OBcAAAAASUVORK5CYII=
-
-
-
-
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAD2SURBVDhPzVLZisJAEMzH7i/5Ly4+LIgsCCqIB7KKeAdd
- EmNMYk5LqoeJBjGC+7A2FPVUR/eM8R7zUbHwCnLxs8myM5L0LKIozoSDSPHL6RoPGzCRKccgheMlsN0E
- OycWbPcKBYNb1jXLsNiFwncNKPZOKpVpph1j9Rthvg0xNUNMNif8rBUKBmR9KIrJZejPfOHcgJfmzgc/
- leSNpVKZOFoGIuhOfXQmHtpjhYIBmQcjsza5DN9DV1gMdLremztzXyYzlWnN0RGNgYt674CvrkJuwN15
- OD6VaavqPBJrs7IWU1TrOPhsO6i29leDv0C+8z+OYVwAsdx73hsdYZoAAAAASUVORK5CYII=
-
-
-
-
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEQSURBVDhPxZNbSwJBAIX3x/aX+i9GD0FIEKQg5YUSycxE
- y1y33XVnL578ZhpDuvjggwPnbb/znRnY4Pjn5HSuQ2IL9p2qWqso1zJ5ZZMal70FgB6IV6WitNQyKRXG
- hc2/BRgBgfh4HhWahbnNdOHyZwHWJHM2D07ejcZvRqNXo6dZZvNrATBzsTow1/MGGk4zDSaZ+i8r3Y9d
- fhQwG7OHMWICBOiNUrWHqe4eE5udAh6MOzPbw1gxAgK0Boma/ViNB5edAqbzYNyZ2ZiBuxvYg9e9D5ur
- TmSzLfB2P507MxszMDbAejvS5e1SFy2XbQF35+Gc3U3nzsz2ZmCg82aos0ao2s3iu+CQfP0RRztB8AmT
- TaydC0wRpgAAAABJRU5ErkJggg==
-
-
-
-
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE7SURBVDhPzZJbS8NAEIXzX/UnKf4YHwRRUcRK1Wq1pVpr
- G3pJzD3ZXHqcs0kIwRT62IHztPvNOTO7xmHV8amFfVRdb+roZHPGg11VFFtk+RYqLZCIeJdMhZfOXUVQ
- ZQUiVSCIc3hRDjfM4QRZk2QXTMdYQF8gAraXYe2mWDkplr+ldJOuBqm4hknpZglIyLQV5huF2Vrhe5Vo
- dTbQsMSlKx1NO8WPQNNlgomZYLyIMZqX+teAselcwwurdCP4IcBwFmEwjfDyFWq1GnBhnJmxa5iudCRI
- oD8J8TgO8DAq1WrAbXNhnJmx6Uz4TeCnzxA9Ae/ffdwOfdy8elq6Qf0SfCpG58I4M2PTmTDd7gS8Hni4
- fHZx0XcbmFV/JD4Vt83onJmx6Uz4SmCC5z1Hw62PVBcP9lF1/SDKMP4AhPNmC1XxgMAAAAAASUVORK5C
- YII=
-
-
-
-
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE2SURBVDhPtZFtS8JgFIb3Y/tL/Y4gIuhDUFCIKNKblZVh
- JVli2TY39+J2y7XtQTddn+rA+eDOc933fY7Wv9TO7pe2dTGuL/NwWyVp+rtQLZikCuNUfpDInSeyvcWm
- SB1sQMdfaOouNLFjjX9ifUyjskhVgLhBlDsCAo2+Iw0nkV7GoQaf4UqgDsZ14uAWZyBQfxSqNwyyvnsL
- cpGqwDqMK44G7L7OdTWY6+LZV6fvbwqwM7HX4af33A0QqPXgqdnz1Lj3ygJcm4OxM7ENjCuO7Uc/g866
- M53ezHRy7ZbvgDvRORg7ExtnYFzPb4FmOr50ddRxVjDFD+NOdA7GzsTGOYdz8LDtaL9plwUoPvA/G3ei
- szOxcQY+aNnaa2yBTTGgjTvR2ZnYOJt58by+zMNqF+O/LMtaAuHzdgQfy7+mAAAAAElFTkSuQmCC
-
-
-
-
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADPSURBVDhPtY/LCoJQFEX92H6pr2jUsFEQQUHUIAShHAiS
- YaGm5uv62HHMWzd7qrThDM5grX2O9Nf0+hZoqrV5OgkI5Gkl6SQQYZ5GkrogzYrfBXU4Zjn8MIPtp79J
- REGU5HCDDIcTw85KvgtEmJoJNh0G/ZhANWIoevRZwgX0M51NzQRvjQiyFmKlBu8FYjudTj/T2dTM4Zni
- YyJ7ryVckOX3ds28ns3h8drDaOk+C8R2lhbl73ub3doXm3PZTPBw7mAwtR8ltLSZCu8SSboAnYWHB3Fj
- 2MsAAAAASUVORK5CYII=
-
-
-
-
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADiSURBVDhPtZDrCoJAFIR92F6ptwn6UxAUEUVRWXQhwyJJ
- zMt6yYnRFrqobUED58fCfjNzjvZX1eoWOPfndyIo9bXJIyylbFIEU8k1/WxSBMdJCj+8wvET2G5SblIE
- iygHLSeGeY5gWBF2p/DdpAhmKhMPdg6tTIHFXmC2C7J5Mnk1YDJhpm6OIXRDYLINMFz56C+9bEpbcGfW
- ZjJhpo3WPnq6h87URXviVt+B1bkzazOZcHfuoTW+oDl0ymEpfmB17szaTCbcGCjAUvzIg3Fn1lZKfhUB
- Hqty508i+DOsJk27AfJjkdIO7Gs3AAAAAElFTkSuQmCC
-
-
-
-
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADGSURBVDhPtY/NCoJAFIXtXXul3qZFq9oEQi4spIxKCitJ
- TUfHxpOXURDp5xr0bWYW5zv3XuPvDEdX1N/+kEzQ27uokduwi7qyKkvIokQmFZJMfS7qyiSSFKWP7xu0
- ZaX0RJZIdGWRK4SJlisGdew97QKaTLJ/k/wCgsJ0M619Dgt4lxybU8Y7oYGCQVzgGEi4lbw6CCzcFHPn
- zi+i0M7P4XgC1lbLUzvGxIowNkNeEQXsvYC5TjBbapkltqFwr9Vf8bPIwzCecFtFfbG7ZeoAAAAASUVO
- RK5CYII=
-
-
-
-
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADnSURBVDhPrZLbCoJAEIZ92F6pt+mmi27qoqIQopOIhEmS
- mof1OPG7u4S44Ur9MDC78s3s/KPxN02mPo0JgXHhQkd101BZNVSUTbfIUAEJsqKmhNUUZ5X6FToRxCX5
- UdnmAh0ngO6z6BeQHYbCeeRke3mbC7TvAUzCrGFStc9FRw4yurqMTrfsewGYpYKtOwcPTkamnaoLwG3k
- OiFQLlxAvQ+6Aoju2LPsMBQC5cKFnB179gI+NwzDzHsrpfU5oeUhpoX5ovku6hbBAc7jD5PGYVUwDYZt
- Lwmtjh94tgnVrxgTAvtVhvEG3bAu+JY1oRgAAAAASUVORK5CYII=
-
-
-
-
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEQSURBVDhPxZNbSwJBAIX3x/aX+i9GD0FIEKQg5YUSycxE
- y1y33XVnL578ZhpDuvjggwPnbb/znRnY4Pjn5HSuQ2IL9p2qWqso1zJ5ZZMal70FgB6IV6WitNQyKRXG
- hc2/BRgBgfh4HhWahbnNdOHyZwHWJHM2D07ejcZvRqNXo6dZZvNrATBzsTow1/MGGk4zDSaZ+i8r3Y9d
- fhQwG7OHMWICBOiNUrWHqe4eE5udAh6MOzPbw1gxAgK0Boma/ViNB5edAqbzYNyZ2ZiBuxvYg9e9D5ur
- TmSzLfB2P507MxszMDbAejvS5e1SFy2XbQF35+Gc3U3nzsz2ZmCg82aos0ao2s3iu+CQfP0RRztB8AmT
- TaydC0wRpgAAAABJRU5ErkJggg==
-
-
-
\ No newline at end of file
diff --git a/ScreenCaptureLib/RegionHelpers/AreaManager.cs b/ScreenCaptureLib/RegionHelpers/AreaManager.cs
index b518ef687..a9f3fcda3 100644
--- a/ScreenCaptureLib/RegionHelpers/AreaManager.cs
+++ b/ScreenCaptureLib/RegionHelpers/AreaManager.cs
@@ -98,6 +98,7 @@ public bool IsResizing
public List Windows { get; set; }
public bool WindowCaptureMode { get; set; }
+ public bool IncludeControls { get; set; }
public int MinimumSize { get; set; }
private RectangleRegion surface;
diff --git a/ScreenCaptureLib/ScreenCaptureLib.csproj b/ScreenCaptureLib/ScreenCaptureLib.csproj
index ad34ebb06..aa706ce91 100644
--- a/ScreenCaptureLib/ScreenCaptureLib.csproj
+++ b/ScreenCaptureLib/ScreenCaptureLib.csproj
@@ -71,12 +71,6 @@
Form
-
- Form
-
-
- RegionCapturePreview.cs
-
Form
@@ -136,9 +130,6 @@
-
- RegionCapturePreview.cs
-
ResXFileCodeGenerator
Resources.Designer.cs
diff --git a/ShareX/Forms/MainForm.Designer.cs b/ShareX/Forms/MainForm.Designer.cs
index aedd6ed08..dd58d1784 100644
--- a/ShareX/Forms/MainForm.Designer.cs
+++ b/ShareX/Forms/MainForm.Designer.cs
@@ -30,8 +30,68 @@ private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
this.tsMain = new System.Windows.Forms.ToolStrip();
+ this.tsddbCapture = new System.Windows.Forms.ToolStripDropDownButton();
+ this.tsmiFullscreen = new System.Windows.Forms.ToolStripMenuItem();
+ this.tsmiWindow = new System.Windows.Forms.ToolStripMenuItem();
+ this.tsmiMonitor = new System.Windows.Forms.ToolStripMenuItem();
+ this.tsmiRectangle = new System.Windows.Forms.ToolStripMenuItem();
+ this.tsmiWindowRectangle = new System.Windows.Forms.ToolStripMenuItem();
+ this.tsmiRectangleAnnotate = new System.Windows.Forms.ToolStripMenuItem();
+ this.tsmiRectangleLight = new System.Windows.Forms.ToolStripMenuItem();
+ this.tsmiRoundedRectangle = new System.Windows.Forms.ToolStripMenuItem();
+ this.tsmiEllipse = new System.Windows.Forms.ToolStripMenuItem();
+ this.tsmiTriangle = new System.Windows.Forms.ToolStripMenuItem();
+ this.tsmiDiamond = new System.Windows.Forms.ToolStripMenuItem();
+ 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.tsmiAutoCapture = new System.Windows.Forms.ToolStripMenuItem();
+ this.tsddbUpload = new System.Windows.Forms.ToolStripDropDownButton();
+ this.tsmiUploadFile = new System.Windows.Forms.ToolStripMenuItem();
+ this.tsmiUploadClipboard = new System.Windows.Forms.ToolStripMenuItem();
+ this.tsmiUploadURL = new System.Windows.Forms.ToolStripMenuItem();
+ this.tsmiUploadDragDrop = new System.Windows.Forms.ToolStripMenuItem();
+ this.tsddbWorkflows = new System.Windows.Forms.ToolStripDropDownButton();
+ this.tsddbTools = new System.Windows.Forms.ToolStripDropDownButton();
+ this.tsmiScreenColorPicker = new System.Windows.Forms.ToolStripMenuItem();
+ this.tsmiRuler = new System.Windows.Forms.ToolStripMenuItem();
+ this.tsmiFTPClient = new System.Windows.Forms.ToolStripMenuItem();
+ this.tsmiHashCheck = new System.Windows.Forms.ToolStripMenuItem();
+ this.tsmiIndexFolder = new System.Windows.Forms.ToolStripMenuItem();
+ this.tsmiImageEditor = new System.Windows.Forms.ToolStripMenuItem();
+ this.tsmiImageEffects = new System.Windows.Forms.ToolStripMenuItem();
+ this.tsmiMonitorTest = new System.Windows.Forms.ToolStripMenuItem();
+ this.tsmiDNSChanger = new System.Windows.Forms.ToolStripMenuItem();
+ this.tsmiQRCode = new System.Windows.Forms.ToolStripMenuItem();
+ this.tsmiTweetMessage = new System.Windows.Forms.ToolStripMenuItem();
this.tssMain1 = new System.Windows.Forms.ToolStripSeparator();
+ this.tsddbAfterCaptureTasks = new System.Windows.Forms.ToolStripDropDownButton();
+ this.tsddbAfterUploadTasks = new System.Windows.Forms.ToolStripDropDownButton();
+ this.tsddbDestinations = new System.Windows.Forms.ToolStripDropDownButton();
+ this.tsmiImageUploaders = new System.Windows.Forms.ToolStripMenuItem();
+ this.tsmiTextUploaders = new System.Windows.Forms.ToolStripMenuItem();
+ this.tsmiFileUploaders = new System.Windows.Forms.ToolStripMenuItem();
+ this.tsmiURLShorteners = new System.Windows.Forms.ToolStripMenuItem();
+ this.tsmiSocialServices = new System.Windows.Forms.ToolStripMenuItem();
+ this.tssDestinations1 = new System.Windows.Forms.ToolStripSeparator();
+ this.tsmiDestinationSettings = new System.Windows.Forms.ToolStripMenuItem();
+ this.tsbApplicationSettings = new System.Windows.Forms.ToolStripButton();
+ this.tsbTaskSettings = new System.Windows.Forms.ToolStripButton();
+ this.tsbHotkeySettings = new System.Windows.Forms.ToolStripButton();
this.tssMain2 = new System.Windows.Forms.ToolStripSeparator();
+ this.tsbScreenshotsFolder = new System.Windows.Forms.ToolStripButton();
+ this.tsbHistory = new System.Windows.Forms.ToolStripButton();
+ this.tsbImageHistory = new System.Windows.Forms.ToolStripButton();
+ this.tsddbDebug = new System.Windows.Forms.ToolStripDropDownButton();
+ this.tsmiShowDebugLog = new System.Windows.Forms.ToolStripMenuItem();
+ this.tsmiTestImageUpload = new System.Windows.Forms.ToolStripMenuItem();
+ this.tsmiTestTextUpload = new System.Windows.Forms.ToolStripMenuItem();
+ this.tsmiTestFileUpload = new System.Windows.Forms.ToolStripMenuItem();
+ this.tsmiTestURLShortener = new System.Windows.Forms.ToolStripMenuItem();
+ this.tsmiTestUploaders = new System.Windows.Forms.ToolStripMenuItem();
+ this.tsmiDonate = new System.Windows.Forms.ToolStripButton();
+ this.tsmiAbout = new System.Windows.Forms.ToolStripButton();
this.scMain = new HelpersLib.SplitContainerCustomSplitter();
this.lblDragAndDropTip = new System.Windows.Forms.Label();
this.lblSplitter = new System.Windows.Forms.Label();
@@ -95,77 +155,13 @@ private void InitializeComponent()
this.tsmiImagePreviewAutomatic = new System.Windows.Forms.ToolStripMenuItem();
this.niTray = new System.Windows.Forms.NotifyIcon(this.components);
this.cmsTray = new System.Windows.Forms.ContextMenuStrip(this.components);
- this.tssTray1 = new System.Windows.Forms.ToolStripSeparator();
- this.tssTray2 = new System.Windows.Forms.ToolStripSeparator();
- this.tssTray3 = new System.Windows.Forms.ToolStripSeparator();
- this.ssToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.tsddbCapture = new System.Windows.Forms.ToolStripDropDownButton();
- this.tsmiFullscreen = new System.Windows.Forms.ToolStripMenuItem();
- this.tsmiWindow = new System.Windows.Forms.ToolStripMenuItem();
- this.tsmiMonitor = new System.Windows.Forms.ToolStripMenuItem();
- this.tsmiRectangle = new System.Windows.Forms.ToolStripMenuItem();
- this.tsmiWindowRectangle = new System.Windows.Forms.ToolStripMenuItem();
- this.tsmiRectangleAnnotate = new System.Windows.Forms.ToolStripMenuItem();
- this.tsmiRectangleLight = new System.Windows.Forms.ToolStripMenuItem();
- this.tsmiRoundedRectangle = new System.Windows.Forms.ToolStripMenuItem();
- this.tsmiEllipse = new System.Windows.Forms.ToolStripMenuItem();
- this.tsmiTriangle = new System.Windows.Forms.ToolStripMenuItem();
- this.tsmiDiamond = new System.Windows.Forms.ToolStripMenuItem();
- 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.tsmiAutoCapture = new System.Windows.Forms.ToolStripMenuItem();
- this.tsddbUpload = new System.Windows.Forms.ToolStripDropDownButton();
- this.tsmiUploadFile = new System.Windows.Forms.ToolStripMenuItem();
- this.tsmiUploadClipboard = new System.Windows.Forms.ToolStripMenuItem();
- this.tsmiUploadURL = new System.Windows.Forms.ToolStripMenuItem();
- this.tsmiUploadDragDrop = new System.Windows.Forms.ToolStripMenuItem();
- this.tsddbWorkflows = new System.Windows.Forms.ToolStripDropDownButton();
- this.tsddbTools = new System.Windows.Forms.ToolStripDropDownButton();
- this.tsmiScreenColorPicker = new System.Windows.Forms.ToolStripMenuItem();
- this.tsmiRuler = new System.Windows.Forms.ToolStripMenuItem();
- this.tsmiFTPClient = new System.Windows.Forms.ToolStripMenuItem();
- this.tsmiHashCheck = new System.Windows.Forms.ToolStripMenuItem();
- this.tsmiIndexFolder = new System.Windows.Forms.ToolStripMenuItem();
- this.tsmiImageEditor = new System.Windows.Forms.ToolStripMenuItem();
- this.tsmiImageEffects = new System.Windows.Forms.ToolStripMenuItem();
- this.tsmiMonitorTest = new System.Windows.Forms.ToolStripMenuItem();
- this.tsmiDNSChanger = new System.Windows.Forms.ToolStripMenuItem();
- this.tsmiQRCode = new System.Windows.Forms.ToolStripMenuItem();
- this.tsmiTweetMessage = new System.Windows.Forms.ToolStripMenuItem();
- this.tsddbAfterCaptureTasks = new System.Windows.Forms.ToolStripDropDownButton();
- this.tsddbAfterUploadTasks = new System.Windows.Forms.ToolStripDropDownButton();
- this.tsddbDestinations = new System.Windows.Forms.ToolStripDropDownButton();
- this.tsmiImageUploaders = new System.Windows.Forms.ToolStripMenuItem();
- this.tsmiTextUploaders = new System.Windows.Forms.ToolStripMenuItem();
- this.tsmiFileUploaders = new System.Windows.Forms.ToolStripMenuItem();
- this.tsmiURLShorteners = new System.Windows.Forms.ToolStripMenuItem();
- this.tsmiSocialServices = new System.Windows.Forms.ToolStripMenuItem();
- this.tssDestinations1 = new System.Windows.Forms.ToolStripSeparator();
- this.tsmiDestinationSettings = new System.Windows.Forms.ToolStripMenuItem();
- this.tsbApplicationSettings = new System.Windows.Forms.ToolStripButton();
- this.tsbTaskSettings = new System.Windows.Forms.ToolStripButton();
- this.tsbHotkeySettings = new System.Windows.Forms.ToolStripButton();
- this.tsbScreenshotsFolder = new System.Windows.Forms.ToolStripButton();
- this.tsbHistory = new System.Windows.Forms.ToolStripButton();
- this.tsbImageHistory = new System.Windows.Forms.ToolStripButton();
- this.tsddbDebug = new System.Windows.Forms.ToolStripDropDownButton();
- this.tsmiShowDebugLog = new System.Windows.Forms.ToolStripMenuItem();
- this.tsmiTestImageUpload = new System.Windows.Forms.ToolStripMenuItem();
- this.tsmiTestTextUpload = new System.Windows.Forms.ToolStripMenuItem();
- this.tsmiTestFileUpload = new System.Windows.Forms.ToolStripMenuItem();
- this.tsmiTestURLShortener = new System.Windows.Forms.ToolStripMenuItem();
- this.tsmiTestUploaders = new System.Windows.Forms.ToolStripMenuItem();
- this.tsmiTestShapeCapture = new System.Windows.Forms.ToolStripMenuItem();
- this.tsmiDonate = new System.Windows.Forms.ToolStripButton();
- this.tsmiAbout = new System.Windows.Forms.ToolStripButton();
this.tsmiTrayCapture = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiTrayFullscreen = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiTrayWindow = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiTrayMonitor = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiTrayRectangle = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiTrayWindowRectangle = new System.Windows.Forms.ToolStripMenuItem();
+ this.tsmiTrayRectangleAnnotate = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiTrayRectangleLight = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiTrayRoundedRectangle = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiTrayEllipse = new System.Windows.Forms.ToolStripMenuItem();
@@ -194,6 +190,7 @@ private void InitializeComponent()
this.tsmiTrayDNSChanger = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiTrayQRCode = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiTrayTweetMessage = new System.Windows.Forms.ToolStripMenuItem();
+ this.tssTray1 = new System.Windows.Forms.ToolStripSeparator();
this.tsmiTrayAfterCaptureTasks = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiTrayAfterUploadTasks = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiTrayDestinations = new System.Windows.Forms.ToolStripMenuItem();
@@ -207,14 +204,16 @@ private void InitializeComponent()
this.tsmiTrayApplicationSettings = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiTrayTaskSettings = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiTrayHotkeySettings = new System.Windows.Forms.ToolStripMenuItem();
+ this.tssTray2 = new System.Windows.Forms.ToolStripSeparator();
this.tsmiScreenshotsFolder = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiTrayHistory = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiTrayImageHistory = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiTrayDonate = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiTrayAbout = new System.Windows.Forms.ToolStripMenuItem();
+ this.tssTray3 = new System.Windows.Forms.ToolStripSeparator();
this.tsmiTrayShow = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiTrayExit = new System.Windows.Forms.ToolStripMenuItem();
- this.tsmiTrayRectangleAnnotate = new System.Windows.Forms.ToolStripMenuItem();
+ this.ssToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.tsMain.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.scMain)).BeginInit();
this.scMain.Panel1.SuspendLayout();
@@ -258,18 +257,563 @@ private void InitializeComponent()
this.tsMain.TabIndex = 1;
this.tsMain.TabStop = true;
//
+ // tsddbCapture
+ //
+ this.tsddbCapture.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.tsmiFullscreen,
+ this.tsmiWindow,
+ this.tsmiMonitor,
+ this.tsmiRectangle,
+ this.tsmiWindowRectangle,
+ this.tsmiRectangleAnnotate,
+ this.tsmiRectangleLight,
+ this.tsmiRoundedRectangle,
+ this.tsmiEllipse,
+ this.tsmiTriangle,
+ this.tsmiDiamond,
+ this.tsmiPolygon,
+ this.tsmiFreeHand,
+ this.tsmiLastRegion,
+ this.tsmiScreenRecorder,
+ this.tsmiAutoCapture});
+ this.tsddbCapture.Image = global::ShareX.Properties.Resources.camera;
+ this.tsddbCapture.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
+ this.tsddbCapture.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.tsddbCapture.Name = "tsddbCapture";
+ this.tsddbCapture.Size = new System.Drawing.Size(157, 20);
+ this.tsddbCapture.Text = "Capture";
+ this.tsddbCapture.DropDownOpening += new System.EventHandler(this.tsddbCapture_DropDownOpening);
+ //
+ // tsmiFullscreen
+ //
+ this.tsmiFullscreen.Image = global::ShareX.Properties.Resources.layer;
+ this.tsmiFullscreen.Name = "tsmiFullscreen";
+ this.tsmiFullscreen.Size = new System.Drawing.Size(186, 22);
+ this.tsmiFullscreen.Text = "Fullscreen";
+ this.tsmiFullscreen.Click += new System.EventHandler(this.tsmiFullscreen_Click);
+ //
+ // tsmiWindow
+ //
+ this.tsmiWindow.Image = global::ShareX.Properties.Resources.application_blue;
+ this.tsmiWindow.Name = "tsmiWindow";
+ this.tsmiWindow.Size = new System.Drawing.Size(186, 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.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.Text = "Rectangle";
+ this.tsmiRectangle.Click += new System.EventHandler(this.tsmiRectangle_Click);
+ //
+ // tsmiWindowRectangle
+ //
+ this.tsmiWindowRectangle.Image = global::ShareX.Properties.Resources.layers_ungroup;
+ this.tsmiWindowRectangle.Name = "tsmiWindowRectangle";
+ this.tsmiWindowRectangle.Size = new System.Drawing.Size(186, 22);
+ this.tsmiWindowRectangle.Text = "Rectangle (Objects)";
+ this.tsmiWindowRectangle.Click += new System.EventHandler(this.tsmiWindowRectangle_Click);
+ //
+ // tsmiRectangleAnnotate
+ //
+ this.tsmiRectangleAnnotate.Image = global::ShareX.Properties.Resources.layer_pencil;
+ this.tsmiRectangleAnnotate.Name = "tsmiRectangleAnnotate";
+ this.tsmiRectangleAnnotate.Size = new System.Drawing.Size(186, 22);
+ this.tsmiRectangleAnnotate.Text = "Rectangle (Annotate)";
+ this.tsmiRectangleAnnotate.Click += new System.EventHandler(this.tsmiRectangleAnnotate_Click);
+ //
+ // tsmiRectangleLight
+ //
+ this.tsmiRectangleLight.Image = global::ShareX.Properties.Resources.Rectangle;
+ this.tsmiRectangleLight.Name = "tsmiRectangleLight";
+ this.tsmiRectangleLight.Size = new System.Drawing.Size(186, 22);
+ this.tsmiRectangleLight.Text = "Rectangle (Light)";
+ this.tsmiRectangleLight.Click += new System.EventHandler(this.tsmiRectangleLight_Click);
+ //
+ // tsmiRoundedRectangle
+ //
+ 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.Text = "Rounded rectangle";
+ this.tsmiRoundedRectangle.Click += new System.EventHandler(this.tsmiRoundedRectangle_Click);
+ //
+ // tsmiEllipse
+ //
+ 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.Text = "Ellipse";
+ this.tsmiEllipse.Click += new System.EventHandler(this.tsmiEllipse_Click);
+ //
+ // tsmiTriangle
+ //
+ this.tsmiTriangle.Image = global::ShareX.Properties.Resources.Triangle;
+ this.tsmiTriangle.Name = "tsmiTriangle";
+ this.tsmiTriangle.Size = new System.Drawing.Size(186, 22);
+ this.tsmiTriangle.Text = "Triangle";
+ this.tsmiTriangle.Click += new System.EventHandler(this.tsmiTriangle_Click);
+ //
+ // tsmiDiamond
+ //
+ this.tsmiDiamond.Image = global::ShareX.Properties.Resources.Diamond;
+ this.tsmiDiamond.Name = "tsmiDiamond";
+ this.tsmiDiamond.Size = new System.Drawing.Size(186, 22);
+ this.tsmiDiamond.Text = "Diamond";
+ this.tsmiDiamond.Click += new System.EventHandler(this.tsmiDiamond_Click);
+ //
+ // tsmiPolygon
+ //
+ 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.Text = "Polygon";
+ this.tsmiPolygon.Click += new System.EventHandler(this.tsmiPolygon_Click);
+ //
+ // tsmiFreeHand
+ //
+ 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.Text = "Freehand";
+ this.tsmiFreeHand.Click += new System.EventHandler(this.tsmiFreeHand_Click);
+ //
+ // tsmiLastRegion
+ //
+ this.tsmiLastRegion.Image = global::ShareX.Properties.Resources.layers_arrange;
+ this.tsmiLastRegion.Name = "tsmiLastRegion";
+ this.tsmiLastRegion.Size = new System.Drawing.Size(186, 22);
+ this.tsmiLastRegion.Text = "Last region";
+ this.tsmiLastRegion.Click += new System.EventHandler(this.tsmiLastRegion_Click);
+ //
+ // tsmiScreenRecorder
+ //
+ 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);
+ //
+ // tsmiAutoCapture
+ //
+ this.tsmiAutoCapture.Image = global::ShareX.Properties.Resources.clock;
+ this.tsmiAutoCapture.Name = "tsmiAutoCapture";
+ this.tsmiAutoCapture.Size = new System.Drawing.Size(186, 22);
+ this.tsmiAutoCapture.Text = "Auto capture...";
+ this.tsmiAutoCapture.Click += new System.EventHandler(this.tsmiAutoCapture_Click);
+ //
+ // tsddbUpload
+ //
+ this.tsddbUpload.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.tsmiUploadFile,
+ this.tsmiUploadClipboard,
+ this.tsmiUploadURL,
+ this.tsmiUploadDragDrop});
+ this.tsddbUpload.Image = global::ShareX.Properties.Resources.arrow_090;
+ this.tsddbUpload.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
+ this.tsddbUpload.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.tsddbUpload.Name = "tsddbUpload";
+ this.tsddbUpload.Size = new System.Drawing.Size(157, 20);
+ this.tsddbUpload.Text = "Upload";
+ //
+ // tsmiUploadFile
+ //
+ this.tsmiUploadFile.Image = global::ShareX.Properties.Resources.folder;
+ this.tsmiUploadFile.Name = "tsmiUploadFile";
+ this.tsmiUploadFile.Size = new System.Drawing.Size(203, 22);
+ this.tsmiUploadFile.Text = "Upload file...";
+ this.tsmiUploadFile.Click += new System.EventHandler(this.tsbFileUpload_Click);
+ //
+ // tsmiUploadClipboard
+ //
+ this.tsmiUploadClipboard.Image = global::ShareX.Properties.Resources.clipboard;
+ this.tsmiUploadClipboard.Name = "tsmiUploadClipboard";
+ this.tsmiUploadClipboard.Size = new System.Drawing.Size(203, 22);
+ this.tsmiUploadClipboard.Text = "Upload from clipboard...";
+ this.tsmiUploadClipboard.Click += new System.EventHandler(this.tsbClipboardUpload_Click);
+ //
+ // tsmiUploadURL
+ //
+ this.tsmiUploadURL.Image = global::ShareX.Properties.Resources.drive;
+ this.tsmiUploadURL.Name = "tsmiUploadURL";
+ this.tsmiUploadURL.Size = new System.Drawing.Size(203, 22);
+ this.tsmiUploadURL.Text = "Upload from URL...";
+ this.tsmiUploadURL.Click += new System.EventHandler(this.tsmiUploadURL_Click);
+ //
+ // tsmiUploadDragDrop
+ //
+ this.tsmiUploadDragDrop.Image = global::ShareX.Properties.Resources.inbox;
+ this.tsmiUploadDragDrop.Name = "tsmiUploadDragDrop";
+ this.tsmiUploadDragDrop.Size = new System.Drawing.Size(203, 22);
+ this.tsmiUploadDragDrop.Text = "Drag and drop upload...";
+ this.tsmiUploadDragDrop.Click += new System.EventHandler(this.tsbDragDropUpload_Click);
+ //
+ // tsddbWorkflows
+ //
+ this.tsddbWorkflows.Image = global::ShareX.Properties.Resources.categories;
+ this.tsddbWorkflows.ImageAlign = System.Drawing.ContentAlignment.BottomLeft;
+ this.tsddbWorkflows.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.tsddbWorkflows.Name = "tsddbWorkflows";
+ this.tsddbWorkflows.Size = new System.Drawing.Size(157, 20);
+ this.tsddbWorkflows.Text = "Workflows";
+ //
+ // tsddbTools
+ //
+ this.tsddbTools.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.tsmiScreenColorPicker,
+ this.tsmiRuler,
+ this.tsmiFTPClient,
+ this.tsmiHashCheck,
+ this.tsmiIndexFolder,
+ this.tsmiImageEditor,
+ this.tsmiImageEffects,
+ this.tsmiMonitorTest,
+ this.tsmiDNSChanger,
+ this.tsmiQRCode,
+ this.tsmiTweetMessage});
+ this.tsddbTools.Image = global::ShareX.Properties.Resources.toolbox;
+ this.tsddbTools.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
+ this.tsddbTools.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.tsddbTools.Name = "tsddbTools";
+ this.tsddbTools.Size = new System.Drawing.Size(157, 20);
+ this.tsddbTools.Text = "Tools";
+ //
+ // tsmiScreenColorPicker
+ //
+ this.tsmiScreenColorPicker.Image = global::ShareX.Properties.Resources.color;
+ this.tsmiScreenColorPicker.Name = "tsmiScreenColorPicker";
+ this.tsmiScreenColorPicker.Size = new System.Drawing.Size(183, 22);
+ this.tsmiScreenColorPicker.Text = "Screen color picker...";
+ this.tsmiScreenColorPicker.Click += new System.EventHandler(this.tsmiCursorHelper_Click);
+ //
+ // tsmiRuler
+ //
+ this.tsmiRuler.Image = global::ShareX.Properties.Resources.ruler_triangle;
+ this.tsmiRuler.Name = "tsmiRuler";
+ this.tsmiRuler.Size = new System.Drawing.Size(183, 22);
+ this.tsmiRuler.Text = "Ruler...";
+ this.tsmiRuler.Click += new System.EventHandler(this.tsmiRuler_Click);
+ //
+ // tsmiFTPClient
+ //
+ this.tsmiFTPClient.Image = global::ShareX.Properties.Resources.application_network;
+ this.tsmiFTPClient.Name = "tsmiFTPClient";
+ this.tsmiFTPClient.Size = new System.Drawing.Size(183, 22);
+ this.tsmiFTPClient.Text = "FTP client...";
+ this.tsmiFTPClient.Click += new System.EventHandler(this.tsmiFTPClient_Click);
+ //
+ // tsmiHashCheck
+ //
+ this.tsmiHashCheck.Image = global::ShareX.Properties.Resources.application_task;
+ this.tsmiHashCheck.Name = "tsmiHashCheck";
+ this.tsmiHashCheck.Size = new System.Drawing.Size(183, 22);
+ this.tsmiHashCheck.Text = "Hash check...";
+ this.tsmiHashCheck.Click += new System.EventHandler(this.tsmiHashCheck_Click);
+ //
+ // tsmiIndexFolder
+ //
+ this.tsmiIndexFolder.Image = global::ShareX.Properties.Resources.folder_tree;
+ this.tsmiIndexFolder.Name = "tsmiIndexFolder";
+ this.tsmiIndexFolder.Size = new System.Drawing.Size(183, 22);
+ this.tsmiIndexFolder.Text = "Index folder...";
+ this.tsmiIndexFolder.Click += new System.EventHandler(this.tsmiIndexFolder_Click);
+ //
+ // tsmiImageEditor
+ //
+ this.tsmiImageEditor.Image = global::ShareX.Properties.Resources.Greenshot;
+ this.tsmiImageEditor.Name = "tsmiImageEditor";
+ this.tsmiImageEditor.Size = new System.Drawing.Size(183, 22);
+ this.tsmiImageEditor.Text = "Image editor...";
+ this.tsmiImageEditor.Click += new System.EventHandler(this.tsmiImageEditor_Click);
+ //
+ // tsmiImageEffects
+ //
+ this.tsmiImageEffects.Image = global::ShareX.Properties.Resources.image_saturation;
+ this.tsmiImageEffects.Name = "tsmiImageEffects";
+ this.tsmiImageEffects.Size = new System.Drawing.Size(183, 22);
+ this.tsmiImageEffects.Text = "Image effects...";
+ this.tsmiImageEffects.Click += new System.EventHandler(this.tsmiImageEffects_Click);
+ //
+ // tsmiMonitorTest
+ //
+ this.tsmiMonitorTest.Image = global::ShareX.Properties.Resources.monitor;
+ this.tsmiMonitorTest.Name = "tsmiMonitorTest";
+ this.tsmiMonitorTest.Size = new System.Drawing.Size(183, 22);
+ this.tsmiMonitorTest.Text = "Monitor test...";
+ this.tsmiMonitorTest.Click += new System.EventHandler(this.tsmiMonitorTest_Click);
+ //
+ // tsmiDNSChanger
+ //
+ this.tsmiDNSChanger.Image = global::ShareX.Properties.Resources.network_ip;
+ this.tsmiDNSChanger.Name = "tsmiDNSChanger";
+ this.tsmiDNSChanger.Size = new System.Drawing.Size(183, 22);
+ this.tsmiDNSChanger.Text = "DNS changer...";
+ this.tsmiDNSChanger.Click += new System.EventHandler(this.tsmiDNSChanger_Click);
+ //
+ // tsmiQRCode
+ //
+ this.tsmiQRCode.Image = global::ShareX.Properties.Resources.barcode_2d;
+ this.tsmiQRCode.Name = "tsmiQRCode";
+ this.tsmiQRCode.Size = new System.Drawing.Size(183, 22);
+ this.tsmiQRCode.Text = "QR code...";
+ this.tsmiQRCode.Click += new System.EventHandler(this.tsmiQRCode_Click);
+ //
+ // tsmiTweetMessage
+ //
+ this.tsmiTweetMessage.Image = global::ShareX.Properties.Resources.Twitter;
+ this.tsmiTweetMessage.Name = "tsmiTweetMessage";
+ this.tsmiTweetMessage.Size = new System.Drawing.Size(183, 22);
+ this.tsmiTweetMessage.Text = "Tweet message...";
+ this.tsmiTweetMessage.Click += new System.EventHandler(this.tsmiTweetMessage_Click);
+ //
// tssMain1
//
this.tssMain1.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3);
this.tssMain1.Name = "tssMain1";
this.tssMain1.Size = new System.Drawing.Size(157, 6);
//
+ // tsddbAfterCaptureTasks
+ //
+ this.tsddbAfterCaptureTasks.Image = global::ShareX.Properties.Resources.image_export;
+ this.tsddbAfterCaptureTasks.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
+ this.tsddbAfterCaptureTasks.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.tsddbAfterCaptureTasks.Name = "tsddbAfterCaptureTasks";
+ this.tsddbAfterCaptureTasks.Size = new System.Drawing.Size(157, 20);
+ this.tsddbAfterCaptureTasks.Text = "After capture";
+ //
+ // tsddbAfterUploadTasks
+ //
+ this.tsddbAfterUploadTasks.Image = global::ShareX.Properties.Resources.upload_cloud;
+ this.tsddbAfterUploadTasks.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
+ this.tsddbAfterUploadTasks.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.tsddbAfterUploadTasks.Name = "tsddbAfterUploadTasks";
+ this.tsddbAfterUploadTasks.Size = new System.Drawing.Size(157, 20);
+ this.tsddbAfterUploadTasks.Text = "After upload";
+ //
+ // tsddbDestinations
+ //
+ this.tsddbDestinations.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.tsmiImageUploaders,
+ this.tsmiTextUploaders,
+ this.tsmiFileUploaders,
+ this.tsmiURLShorteners,
+ this.tsmiSocialServices,
+ this.tssDestinations1,
+ this.tsmiDestinationSettings});
+ this.tsddbDestinations.Image = global::ShareX.Properties.Resources.drive_globe;
+ this.tsddbDestinations.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
+ this.tsddbDestinations.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.tsddbDestinations.Name = "tsddbDestinations";
+ this.tsddbDestinations.Size = new System.Drawing.Size(157, 20);
+ this.tsddbDestinations.Text = "Destinations";
+ this.tsddbDestinations.DropDownOpened += new System.EventHandler(this.tsddbDestinations_DropDownOpened);
+ //
+ // tsmiImageUploaders
+ //
+ this.tsmiImageUploaders.Image = global::ShareX.Properties.Resources.image;
+ this.tsmiImageUploaders.Name = "tsmiImageUploaders";
+ this.tsmiImageUploaders.Size = new System.Drawing.Size(212, 22);
+ this.tsmiImageUploaders.Text = "Image uploaders";
+ //
+ // tsmiTextUploaders
+ //
+ this.tsmiTextUploaders.Image = global::ShareX.Properties.Resources.notebook;
+ this.tsmiTextUploaders.Name = "tsmiTextUploaders";
+ this.tsmiTextUploaders.Size = new System.Drawing.Size(212, 22);
+ this.tsmiTextUploaders.Text = "Text uploaders";
+ //
+ // tsmiFileUploaders
+ //
+ this.tsmiFileUploaders.Image = global::ShareX.Properties.Resources.application_block;
+ this.tsmiFileUploaders.Name = "tsmiFileUploaders";
+ this.tsmiFileUploaders.Size = new System.Drawing.Size(212, 22);
+ this.tsmiFileUploaders.Text = "File uploaders";
+ //
+ // tsmiURLShorteners
+ //
+ this.tsmiURLShorteners.Image = global::ShareX.Properties.Resources.edit_scale;
+ this.tsmiURLShorteners.Name = "tsmiURLShorteners";
+ this.tsmiURLShorteners.Size = new System.Drawing.Size(212, 22);
+ this.tsmiURLShorteners.Text = "URL shorteners";
+ //
+ // tsmiSocialServices
+ //
+ this.tsmiSocialServices.Image = global::ShareX.Properties.Resources.globe_share;
+ this.tsmiSocialServices.Name = "tsmiSocialServices";
+ this.tsmiSocialServices.Size = new System.Drawing.Size(212, 22);
+ this.tsmiSocialServices.Text = "Social networking services";
+ //
+ // tssDestinations1
+ //
+ this.tssDestinations1.Name = "tssDestinations1";
+ this.tssDestinations1.Size = new System.Drawing.Size(209, 6);
+ //
+ // tsmiDestinationSettings
+ //
+ this.tsmiDestinationSettings.Image = global::ShareX.Properties.Resources.globe_pencil;
+ this.tsmiDestinationSettings.Name = "tsmiDestinationSettings";
+ this.tsmiDestinationSettings.Size = new System.Drawing.Size(212, 22);
+ this.tsmiDestinationSettings.Text = "Destination settings...";
+ this.tsmiDestinationSettings.Click += new System.EventHandler(this.tsbDestinationSettings_Click);
+ //
+ // tsbApplicationSettings
+ //
+ this.tsbApplicationSettings.Image = global::ShareX.Properties.Resources.wrench_screwdriver;
+ this.tsbApplicationSettings.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
+ this.tsbApplicationSettings.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.tsbApplicationSettings.Name = "tsbApplicationSettings";
+ this.tsbApplicationSettings.Size = new System.Drawing.Size(157, 20);
+ this.tsbApplicationSettings.Text = "Application settings...";
+ this.tsbApplicationSettings.Click += new System.EventHandler(this.tsbApplicationSettings_Click);
+ //
+ // tsbTaskSettings
+ //
+ this.tsbTaskSettings.Image = global::ShareX.Properties.Resources.gear;
+ this.tsbTaskSettings.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
+ this.tsbTaskSettings.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.tsbTaskSettings.Name = "tsbTaskSettings";
+ this.tsbTaskSettings.Size = new System.Drawing.Size(157, 20);
+ this.tsbTaskSettings.Text = "Task settings...";
+ this.tsbTaskSettings.Click += new System.EventHandler(this.tsbTaskSettings_Click);
+ //
+ // tsbHotkeySettings
+ //
+ this.tsbHotkeySettings.Image = global::ShareX.Properties.Resources.keyboard;
+ this.tsbHotkeySettings.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
+ this.tsbHotkeySettings.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.tsbHotkeySettings.Name = "tsbHotkeySettings";
+ this.tsbHotkeySettings.Size = new System.Drawing.Size(157, 20);
+ this.tsbHotkeySettings.Text = "Hotkey settings...";
+ this.tsbHotkeySettings.Click += new System.EventHandler(this.tsbHotkeySettings_Click);
+ //
// tssMain2
//
this.tssMain2.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3);
this.tssMain2.Name = "tssMain2";
this.tssMain2.Size = new System.Drawing.Size(157, 6);
//
+ // tsbScreenshotsFolder
+ //
+ this.tsbScreenshotsFolder.Image = global::ShareX.Properties.Resources.folder_open_image;
+ this.tsbScreenshotsFolder.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
+ this.tsbScreenshotsFolder.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.tsbScreenshotsFolder.Name = "tsbScreenshotsFolder";
+ this.tsbScreenshotsFolder.Size = new System.Drawing.Size(157, 20);
+ this.tsbScreenshotsFolder.Text = "Screenshots folder...";
+ this.tsbScreenshotsFolder.Click += new System.EventHandler(this.tsbScreenshotsFolder_Click);
+ //
+ // tsbHistory
+ //
+ this.tsbHistory.Image = global::ShareX.Properties.Resources.application_blog;
+ this.tsbHistory.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
+ this.tsbHistory.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.tsbHistory.Name = "tsbHistory";
+ this.tsbHistory.Size = new System.Drawing.Size(157, 20);
+ this.tsbHistory.Text = "History...";
+ this.tsbHistory.Click += new System.EventHandler(this.tsbHistory_Click);
+ //
+ // tsbImageHistory
+ //
+ this.tsbImageHistory.Image = global::ShareX.Properties.Resources.application_icon_large;
+ this.tsbImageHistory.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
+ this.tsbImageHistory.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.tsbImageHistory.Name = "tsbImageHistory";
+ this.tsbImageHistory.Size = new System.Drawing.Size(157, 20);
+ this.tsbImageHistory.Text = "Image history...";
+ this.tsbImageHistory.Click += new System.EventHandler(this.tsbImageHistory_Click);
+ //
+ // tsddbDebug
+ //
+ this.tsddbDebug.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.tsmiShowDebugLog,
+ this.tsmiTestImageUpload,
+ this.tsmiTestTextUpload,
+ this.tsmiTestFileUpload,
+ this.tsmiTestURLShortener,
+ this.tsmiTestUploaders});
+ this.tsddbDebug.Image = global::ShareX.Properties.Resources.traffic_cone;
+ this.tsddbDebug.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
+ this.tsddbDebug.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.tsddbDebug.Name = "tsddbDebug";
+ this.tsddbDebug.Size = new System.Drawing.Size(157, 20);
+ this.tsddbDebug.Text = "Debug";
+ //
+ // tsmiShowDebugLog
+ //
+ this.tsmiShowDebugLog.Image = global::ShareX.Properties.Resources.application_monitor;
+ this.tsmiShowDebugLog.Name = "tsmiShowDebugLog";
+ this.tsmiShowDebugLog.Size = new System.Drawing.Size(173, 22);
+ this.tsmiShowDebugLog.Text = "Debug log...";
+ this.tsmiShowDebugLog.Click += new System.EventHandler(this.tsmiShowDebugLog_Click);
+ //
+ // tsmiTestImageUpload
+ //
+ this.tsmiTestImageUpload.Image = global::ShareX.Properties.Resources.image;
+ this.tsmiTestImageUpload.Name = "tsmiTestImageUpload";
+ this.tsmiTestImageUpload.Size = new System.Drawing.Size(173, 22);
+ this.tsmiTestImageUpload.Text = "Test image upload";
+ this.tsmiTestImageUpload.Click += new System.EventHandler(this.tsmiTestImageUpload_Click);
+ //
+ // tsmiTestTextUpload
+ //
+ this.tsmiTestTextUpload.Image = global::ShareX.Properties.Resources.notebook;
+ this.tsmiTestTextUpload.Name = "tsmiTestTextUpload";
+ this.tsmiTestTextUpload.Size = new System.Drawing.Size(173, 22);
+ this.tsmiTestTextUpload.Text = "Test text upload";
+ this.tsmiTestTextUpload.Click += new System.EventHandler(this.tsmiTestTextUpload_Click);
+ //
+ // tsmiTestFileUpload
+ //
+ this.tsmiTestFileUpload.Image = global::ShareX.Properties.Resources.application_block;
+ this.tsmiTestFileUpload.Name = "tsmiTestFileUpload";
+ this.tsmiTestFileUpload.Size = new System.Drawing.Size(173, 22);
+ this.tsmiTestFileUpload.Text = "Test file upload";
+ this.tsmiTestFileUpload.Click += new System.EventHandler(this.tsmiTestFileUpload_Click);
+ //
+ // tsmiTestURLShortener
+ //
+ this.tsmiTestURLShortener.Image = global::ShareX.Properties.Resources.edit_scale;
+ this.tsmiTestURLShortener.Name = "tsmiTestURLShortener";
+ this.tsmiTestURLShortener.Size = new System.Drawing.Size(173, 22);
+ this.tsmiTestURLShortener.Text = "Test URL shortener";
+ this.tsmiTestURLShortener.Click += new System.EventHandler(this.tsmiTestURLShortener_Click);
+ //
+ // tsmiTestUploaders
+ //
+ this.tsmiTestUploaders.Image = global::ShareX.Properties.Resources.application_browser;
+ this.tsmiTestUploaders.Name = "tsmiTestUploaders";
+ this.tsmiTestUploaders.Size = new System.Drawing.Size(173, 22);
+ this.tsmiTestUploaders.Text = "Test uploaders...";
+ this.tsmiTestUploaders.Click += new System.EventHandler(this.tsmiTestUploaders_Click);
+ //
+ // tsmiDonate
+ //
+ this.tsmiDonate.Image = global::ShareX.Properties.Resources.heart;
+ this.tsmiDonate.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
+ this.tsmiDonate.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.tsmiDonate.Name = "tsmiDonate";
+ this.tsmiDonate.Size = new System.Drawing.Size(157, 20);
+ this.tsmiDonate.Text = "Donate...";
+ this.tsmiDonate.Click += new System.EventHandler(this.tsbDonate_Click);
+ //
+ // tsmiAbout
+ //
+ this.tsmiAbout.Image = global::ShareX.Properties.Resources.crown;
+ this.tsmiAbout.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
+ this.tsmiAbout.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.tsmiAbout.Name = "tsmiAbout";
+ this.tsmiAbout.Size = new System.Drawing.Size(157, 20);
+ this.tsmiAbout.Text = "About...";
+ this.tsmiAbout.Click += new System.EventHandler(this.tsbAbout_Click);
+ //
// scMain
//
this.scMain.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -805,582 +1349,7 @@ private void InitializeComponent()
this.tsmiTrayShow,
this.tsmiTrayExit});
this.cmsTray.Name = "cmsTray";
- this.cmsTray.Size = new System.Drawing.Size(189, 418);
- //
- // tssTray1
- //
- this.tssTray1.Name = "tssTray1";
- this.tssTray1.Size = new System.Drawing.Size(185, 6);
- //
- // tssTray2
- //
- this.tssTray2.Name = "tssTray2";
- this.tssTray2.Size = new System.Drawing.Size(185, 6);
- //
- // tssTray3
- //
- this.tssTray3.Name = "tssTray3";
- this.tssTray3.Size = new System.Drawing.Size(185, 6);
- //
- // ssToolStripMenuItem
- //
- this.ssToolStripMenuItem.Name = "ssToolStripMenuItem";
- this.ssToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
- this.ssToolStripMenuItem.Text = "ss";
- //
- // tsddbCapture
- //
- this.tsddbCapture.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.tsmiFullscreen,
- this.tsmiWindow,
- this.tsmiMonitor,
- this.tsmiRectangle,
- this.tsmiWindowRectangle,
- this.tsmiRectangleAnnotate,
- this.tsmiRectangleLight,
- this.tsmiRoundedRectangle,
- this.tsmiEllipse,
- this.tsmiTriangle,
- this.tsmiDiamond,
- this.tsmiPolygon,
- this.tsmiFreeHand,
- this.tsmiLastRegion,
- this.tsmiScreenRecorder,
- this.tsmiAutoCapture});
- this.tsddbCapture.Image = global::ShareX.Properties.Resources.camera;
- this.tsddbCapture.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
- this.tsddbCapture.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.tsddbCapture.Name = "tsddbCapture";
- this.tsddbCapture.Size = new System.Drawing.Size(157, 20);
- this.tsddbCapture.Text = "Capture";
- this.tsddbCapture.DropDownOpening += new System.EventHandler(this.tsddbCapture_DropDownOpening);
- //
- // tsmiFullscreen
- //
- this.tsmiFullscreen.Image = global::ShareX.Properties.Resources.layer;
- this.tsmiFullscreen.Name = "tsmiFullscreen";
- this.tsmiFullscreen.Size = new System.Drawing.Size(186, 22);
- this.tsmiFullscreen.Text = "Fullscreen";
- this.tsmiFullscreen.Click += new System.EventHandler(this.tsmiFullscreen_Click);
- //
- // tsmiWindow
- //
- this.tsmiWindow.Image = global::ShareX.Properties.Resources.application_blue;
- this.tsmiWindow.Name = "tsmiWindow";
- this.tsmiWindow.Size = new System.Drawing.Size(186, 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.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.Text = "Rectangle";
- this.tsmiRectangle.Click += new System.EventHandler(this.tsmiRectangle_Click);
- //
- // tsmiWindowRectangle
- //
- this.tsmiWindowRectangle.Image = global::ShareX.Properties.Resources.layers_ungroup;
- this.tsmiWindowRectangle.Name = "tsmiWindowRectangle";
- this.tsmiWindowRectangle.Size = new System.Drawing.Size(186, 22);
- this.tsmiWindowRectangle.Text = "Rectangle (Window)";
- this.tsmiWindowRectangle.Click += new System.EventHandler(this.tsmiWindowRectangle_Click);
- //
- // tsmiRectangleAnnotate
- //
- this.tsmiRectangleAnnotate.Image = global::ShareX.Properties.Resources.layer_pencil;
- this.tsmiRectangleAnnotate.Name = "tsmiRectangleAnnotate";
- this.tsmiRectangleAnnotate.Size = new System.Drawing.Size(186, 22);
- this.tsmiRectangleAnnotate.Text = "Rectangle (Annotate)";
- this.tsmiRectangleAnnotate.Click += new System.EventHandler(this.tsmiRectangleAnnotate_Click);
- //
- // tsmiRectangleLight
- //
- this.tsmiRectangleLight.Image = global::ShareX.Properties.Resources.Rectangle;
- this.tsmiRectangleLight.Name = "tsmiRectangleLight";
- this.tsmiRectangleLight.Size = new System.Drawing.Size(186, 22);
- this.tsmiRectangleLight.Text = "Rectangle (Light)";
- this.tsmiRectangleLight.Click += new System.EventHandler(this.tsmiRectangleLight_Click);
- //
- // tsmiRoundedRectangle
- //
- 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.Text = "Rounded rectangle";
- this.tsmiRoundedRectangle.Click += new System.EventHandler(this.tsmiRoundedRectangle_Click);
- //
- // tsmiEllipse
- //
- 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.Text = "Ellipse";
- this.tsmiEllipse.Click += new System.EventHandler(this.tsmiEllipse_Click);
- //
- // tsmiTriangle
- //
- this.tsmiTriangle.Image = global::ShareX.Properties.Resources.Triangle;
- this.tsmiTriangle.Name = "tsmiTriangle";
- this.tsmiTriangle.Size = new System.Drawing.Size(186, 22);
- this.tsmiTriangle.Text = "Triangle";
- this.tsmiTriangle.Click += new System.EventHandler(this.tsmiTriangle_Click);
- //
- // tsmiDiamond
- //
- this.tsmiDiamond.Image = global::ShareX.Properties.Resources.Diamond;
- this.tsmiDiamond.Name = "tsmiDiamond";
- this.tsmiDiamond.Size = new System.Drawing.Size(186, 22);
- this.tsmiDiamond.Text = "Diamond";
- this.tsmiDiamond.Click += new System.EventHandler(this.tsmiDiamond_Click);
- //
- // tsmiPolygon
- //
- 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.Text = "Polygon";
- this.tsmiPolygon.Click += new System.EventHandler(this.tsmiPolygon_Click);
- //
- // tsmiFreeHand
- //
- 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.Text = "Freehand";
- this.tsmiFreeHand.Click += new System.EventHandler(this.tsmiFreeHand_Click);
- //
- // tsmiLastRegion
- //
- this.tsmiLastRegion.Image = global::ShareX.Properties.Resources.layers_arrange;
- this.tsmiLastRegion.Name = "tsmiLastRegion";
- this.tsmiLastRegion.Size = new System.Drawing.Size(186, 22);
- this.tsmiLastRegion.Text = "Last region";
- this.tsmiLastRegion.Click += new System.EventHandler(this.tsmiLastRegion_Click);
- //
- // tsmiScreenRecorder
- //
- 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);
- //
- // tsmiAutoCapture
- //
- this.tsmiAutoCapture.Image = global::ShareX.Properties.Resources.clock;
- this.tsmiAutoCapture.Name = "tsmiAutoCapture";
- this.tsmiAutoCapture.Size = new System.Drawing.Size(186, 22);
- this.tsmiAutoCapture.Text = "Auto capture...";
- this.tsmiAutoCapture.Click += new System.EventHandler(this.tsmiAutoCapture_Click);
- //
- // tsddbUpload
- //
- this.tsddbUpload.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.tsmiUploadFile,
- this.tsmiUploadClipboard,
- this.tsmiUploadURL,
- this.tsmiUploadDragDrop});
- this.tsddbUpload.Image = global::ShareX.Properties.Resources.arrow_090;
- this.tsddbUpload.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
- this.tsddbUpload.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.tsddbUpload.Name = "tsddbUpload";
- this.tsddbUpload.Size = new System.Drawing.Size(157, 20);
- this.tsddbUpload.Text = "Upload";
- //
- // tsmiUploadFile
- //
- this.tsmiUploadFile.Image = global::ShareX.Properties.Resources.folder;
- this.tsmiUploadFile.Name = "tsmiUploadFile";
- this.tsmiUploadFile.Size = new System.Drawing.Size(203, 22);
- this.tsmiUploadFile.Text = "Upload file...";
- this.tsmiUploadFile.Click += new System.EventHandler(this.tsbFileUpload_Click);
- //
- // tsmiUploadClipboard
- //
- this.tsmiUploadClipboard.Image = global::ShareX.Properties.Resources.clipboard;
- this.tsmiUploadClipboard.Name = "tsmiUploadClipboard";
- this.tsmiUploadClipboard.Size = new System.Drawing.Size(203, 22);
- this.tsmiUploadClipboard.Text = "Upload from clipboard...";
- this.tsmiUploadClipboard.Click += new System.EventHandler(this.tsbClipboardUpload_Click);
- //
- // tsmiUploadURL
- //
- this.tsmiUploadURL.Image = global::ShareX.Properties.Resources.drive;
- this.tsmiUploadURL.Name = "tsmiUploadURL";
- this.tsmiUploadURL.Size = new System.Drawing.Size(203, 22);
- this.tsmiUploadURL.Text = "Upload from URL...";
- this.tsmiUploadURL.Click += new System.EventHandler(this.tsmiUploadURL_Click);
- //
- // tsmiUploadDragDrop
- //
- this.tsmiUploadDragDrop.Image = global::ShareX.Properties.Resources.inbox;
- this.tsmiUploadDragDrop.Name = "tsmiUploadDragDrop";
- this.tsmiUploadDragDrop.Size = new System.Drawing.Size(203, 22);
- this.tsmiUploadDragDrop.Text = "Drag and drop upload...";
- this.tsmiUploadDragDrop.Click += new System.EventHandler(this.tsbDragDropUpload_Click);
- //
- // tsddbWorkflows
- //
- this.tsddbWorkflows.Image = global::ShareX.Properties.Resources.categories;
- this.tsddbWorkflows.ImageAlign = System.Drawing.ContentAlignment.BottomLeft;
- this.tsddbWorkflows.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.tsddbWorkflows.Name = "tsddbWorkflows";
- this.tsddbWorkflows.Size = new System.Drawing.Size(157, 20);
- this.tsddbWorkflows.Text = "Workflows";
- //
- // tsddbTools
- //
- this.tsddbTools.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.tsmiScreenColorPicker,
- this.tsmiRuler,
- this.tsmiFTPClient,
- this.tsmiHashCheck,
- this.tsmiIndexFolder,
- this.tsmiImageEditor,
- this.tsmiImageEffects,
- this.tsmiMonitorTest,
- this.tsmiDNSChanger,
- this.tsmiQRCode,
- this.tsmiTweetMessage});
- this.tsddbTools.Image = global::ShareX.Properties.Resources.toolbox;
- this.tsddbTools.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
- this.tsddbTools.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.tsddbTools.Name = "tsddbTools";
- this.tsddbTools.Size = new System.Drawing.Size(157, 20);
- this.tsddbTools.Text = "Tools";
- //
- // tsmiScreenColorPicker
- //
- this.tsmiScreenColorPicker.Image = global::ShareX.Properties.Resources.color;
- this.tsmiScreenColorPicker.Name = "tsmiScreenColorPicker";
- this.tsmiScreenColorPicker.Size = new System.Drawing.Size(183, 22);
- this.tsmiScreenColorPicker.Text = "Screen color picker...";
- this.tsmiScreenColorPicker.Click += new System.EventHandler(this.tsmiCursorHelper_Click);
- //
- // tsmiRuler
- //
- this.tsmiRuler.Image = global::ShareX.Properties.Resources.ruler_triangle;
- this.tsmiRuler.Name = "tsmiRuler";
- this.tsmiRuler.Size = new System.Drawing.Size(183, 22);
- this.tsmiRuler.Text = "Ruler...";
- this.tsmiRuler.Click += new System.EventHandler(this.tsmiRuler_Click);
- //
- // tsmiFTPClient
- //
- this.tsmiFTPClient.Image = global::ShareX.Properties.Resources.application_network;
- this.tsmiFTPClient.Name = "tsmiFTPClient";
- this.tsmiFTPClient.Size = new System.Drawing.Size(183, 22);
- this.tsmiFTPClient.Text = "FTP client...";
- this.tsmiFTPClient.Click += new System.EventHandler(this.tsmiFTPClient_Click);
- //
- // tsmiHashCheck
- //
- this.tsmiHashCheck.Image = global::ShareX.Properties.Resources.application_task;
- this.tsmiHashCheck.Name = "tsmiHashCheck";
- this.tsmiHashCheck.Size = new System.Drawing.Size(183, 22);
- this.tsmiHashCheck.Text = "Hash check...";
- this.tsmiHashCheck.Click += new System.EventHandler(this.tsmiHashCheck_Click);
- //
- // tsmiIndexFolder
- //
- this.tsmiIndexFolder.Image = global::ShareX.Properties.Resources.folder_tree;
- this.tsmiIndexFolder.Name = "tsmiIndexFolder";
- this.tsmiIndexFolder.Size = new System.Drawing.Size(183, 22);
- this.tsmiIndexFolder.Text = "Index folder...";
- this.tsmiIndexFolder.Click += new System.EventHandler(this.tsmiIndexFolder_Click);
- //
- // tsmiImageEditor
- //
- this.tsmiImageEditor.Image = global::ShareX.Properties.Resources.Greenshot;
- this.tsmiImageEditor.Name = "tsmiImageEditor";
- this.tsmiImageEditor.Size = new System.Drawing.Size(183, 22);
- this.tsmiImageEditor.Text = "Image editor...";
- this.tsmiImageEditor.Click += new System.EventHandler(this.tsmiImageEditor_Click);
- //
- // tsmiImageEffects
- //
- this.tsmiImageEffects.Image = global::ShareX.Properties.Resources.image_saturation;
- this.tsmiImageEffects.Name = "tsmiImageEffects";
- this.tsmiImageEffects.Size = new System.Drawing.Size(183, 22);
- this.tsmiImageEffects.Text = "Image effects...";
- this.tsmiImageEffects.Click += new System.EventHandler(this.tsmiImageEffects_Click);
- //
- // tsmiMonitorTest
- //
- this.tsmiMonitorTest.Image = global::ShareX.Properties.Resources.monitor;
- this.tsmiMonitorTest.Name = "tsmiMonitorTest";
- this.tsmiMonitorTest.Size = new System.Drawing.Size(183, 22);
- this.tsmiMonitorTest.Text = "Monitor test...";
- this.tsmiMonitorTest.Click += new System.EventHandler(this.tsmiMonitorTest_Click);
- //
- // tsmiDNSChanger
- //
- this.tsmiDNSChanger.Image = global::ShareX.Properties.Resources.network_ip;
- this.tsmiDNSChanger.Name = "tsmiDNSChanger";
- this.tsmiDNSChanger.Size = new System.Drawing.Size(183, 22);
- this.tsmiDNSChanger.Text = "DNS changer...";
- this.tsmiDNSChanger.Click += new System.EventHandler(this.tsmiDNSChanger_Click);
- //
- // tsmiQRCode
- //
- this.tsmiQRCode.Image = global::ShareX.Properties.Resources.barcode_2d;
- this.tsmiQRCode.Name = "tsmiQRCode";
- this.tsmiQRCode.Size = new System.Drawing.Size(183, 22);
- this.tsmiQRCode.Text = "QR code...";
- this.tsmiQRCode.Click += new System.EventHandler(this.tsmiQRCode_Click);
- //
- // tsmiTweetMessage
- //
- this.tsmiTweetMessage.Image = global::ShareX.Properties.Resources.Twitter;
- this.tsmiTweetMessage.Name = "tsmiTweetMessage";
- this.tsmiTweetMessage.Size = new System.Drawing.Size(183, 22);
- this.tsmiTweetMessage.Text = "Tweet message...";
- this.tsmiTweetMessage.Click += new System.EventHandler(this.tsmiTweetMessage_Click);
- //
- // tsddbAfterCaptureTasks
- //
- this.tsddbAfterCaptureTasks.Image = global::ShareX.Properties.Resources.image_export;
- this.tsddbAfterCaptureTasks.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
- this.tsddbAfterCaptureTasks.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.tsddbAfterCaptureTasks.Name = "tsddbAfterCaptureTasks";
- this.tsddbAfterCaptureTasks.Size = new System.Drawing.Size(157, 20);
- this.tsddbAfterCaptureTasks.Text = "After capture";
- //
- // tsddbAfterUploadTasks
- //
- this.tsddbAfterUploadTasks.Image = global::ShareX.Properties.Resources.upload_cloud;
- this.tsddbAfterUploadTasks.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
- this.tsddbAfterUploadTasks.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.tsddbAfterUploadTasks.Name = "tsddbAfterUploadTasks";
- this.tsddbAfterUploadTasks.Size = new System.Drawing.Size(157, 20);
- this.tsddbAfterUploadTasks.Text = "After upload";
- //
- // tsddbDestinations
- //
- this.tsddbDestinations.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.tsmiImageUploaders,
- this.tsmiTextUploaders,
- this.tsmiFileUploaders,
- this.tsmiURLShorteners,
- this.tsmiSocialServices,
- this.tssDestinations1,
- this.tsmiDestinationSettings});
- this.tsddbDestinations.Image = global::ShareX.Properties.Resources.drive_globe;
- this.tsddbDestinations.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
- this.tsddbDestinations.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.tsddbDestinations.Name = "tsddbDestinations";
- this.tsddbDestinations.Size = new System.Drawing.Size(157, 20);
- this.tsddbDestinations.Text = "Destinations";
- this.tsddbDestinations.DropDownOpened += new System.EventHandler(this.tsddbDestinations_DropDownOpened);
- //
- // tsmiImageUploaders
- //
- this.tsmiImageUploaders.Image = global::ShareX.Properties.Resources.image;
- this.tsmiImageUploaders.Name = "tsmiImageUploaders";
- this.tsmiImageUploaders.Size = new System.Drawing.Size(212, 22);
- this.tsmiImageUploaders.Text = "Image uploaders";
- //
- // tsmiTextUploaders
- //
- this.tsmiTextUploaders.Image = global::ShareX.Properties.Resources.notebook;
- this.tsmiTextUploaders.Name = "tsmiTextUploaders";
- this.tsmiTextUploaders.Size = new System.Drawing.Size(212, 22);
- this.tsmiTextUploaders.Text = "Text uploaders";
- //
- // tsmiFileUploaders
- //
- this.tsmiFileUploaders.Image = global::ShareX.Properties.Resources.application_block;
- this.tsmiFileUploaders.Name = "tsmiFileUploaders";
- this.tsmiFileUploaders.Size = new System.Drawing.Size(212, 22);
- this.tsmiFileUploaders.Text = "File uploaders";
- //
- // tsmiURLShorteners
- //
- this.tsmiURLShorteners.Image = global::ShareX.Properties.Resources.edit_scale;
- this.tsmiURLShorteners.Name = "tsmiURLShorteners";
- this.tsmiURLShorteners.Size = new System.Drawing.Size(212, 22);
- this.tsmiURLShorteners.Text = "URL shorteners";
- //
- // tsmiSocialServices
- //
- this.tsmiSocialServices.Image = global::ShareX.Properties.Resources.globe_share;
- this.tsmiSocialServices.Name = "tsmiSocialServices";
- this.tsmiSocialServices.Size = new System.Drawing.Size(212, 22);
- this.tsmiSocialServices.Text = "Social networking services";
- //
- // tssDestinations1
- //
- this.tssDestinations1.Name = "tssDestinations1";
- this.tssDestinations1.Size = new System.Drawing.Size(209, 6);
- //
- // tsmiDestinationSettings
- //
- this.tsmiDestinationSettings.Image = global::ShareX.Properties.Resources.globe_pencil;
- this.tsmiDestinationSettings.Name = "tsmiDestinationSettings";
- this.tsmiDestinationSettings.Size = new System.Drawing.Size(212, 22);
- this.tsmiDestinationSettings.Text = "Destination settings...";
- this.tsmiDestinationSettings.Click += new System.EventHandler(this.tsbDestinationSettings_Click);
- //
- // tsbApplicationSettings
- //
- this.tsbApplicationSettings.Image = global::ShareX.Properties.Resources.wrench_screwdriver;
- this.tsbApplicationSettings.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
- this.tsbApplicationSettings.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.tsbApplicationSettings.Name = "tsbApplicationSettings";
- this.tsbApplicationSettings.Size = new System.Drawing.Size(157, 20);
- this.tsbApplicationSettings.Text = "Application settings...";
- this.tsbApplicationSettings.Click += new System.EventHandler(this.tsbApplicationSettings_Click);
- //
- // tsbTaskSettings
- //
- this.tsbTaskSettings.Image = global::ShareX.Properties.Resources.gear;
- this.tsbTaskSettings.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
- this.tsbTaskSettings.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.tsbTaskSettings.Name = "tsbTaskSettings";
- this.tsbTaskSettings.Size = new System.Drawing.Size(157, 20);
- this.tsbTaskSettings.Text = "Task settings...";
- this.tsbTaskSettings.Click += new System.EventHandler(this.tsbTaskSettings_Click);
- //
- // tsbHotkeySettings
- //
- this.tsbHotkeySettings.Image = global::ShareX.Properties.Resources.keyboard;
- this.tsbHotkeySettings.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
- this.tsbHotkeySettings.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.tsbHotkeySettings.Name = "tsbHotkeySettings";
- this.tsbHotkeySettings.Size = new System.Drawing.Size(157, 20);
- this.tsbHotkeySettings.Text = "Hotkey settings...";
- this.tsbHotkeySettings.Click += new System.EventHandler(this.tsbHotkeySettings_Click);
- //
- // tsbScreenshotsFolder
- //
- this.tsbScreenshotsFolder.Image = global::ShareX.Properties.Resources.folder_open_image;
- this.tsbScreenshotsFolder.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
- this.tsbScreenshotsFolder.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.tsbScreenshotsFolder.Name = "tsbScreenshotsFolder";
- this.tsbScreenshotsFolder.Size = new System.Drawing.Size(157, 20);
- this.tsbScreenshotsFolder.Text = "Screenshots folder...";
- this.tsbScreenshotsFolder.Click += new System.EventHandler(this.tsbScreenshotsFolder_Click);
- //
- // tsbHistory
- //
- this.tsbHistory.Image = global::ShareX.Properties.Resources.application_blog;
- this.tsbHistory.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
- this.tsbHistory.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.tsbHistory.Name = "tsbHistory";
- this.tsbHistory.Size = new System.Drawing.Size(157, 20);
- this.tsbHistory.Text = "History...";
- this.tsbHistory.Click += new System.EventHandler(this.tsbHistory_Click);
- //
- // tsbImageHistory
- //
- this.tsbImageHistory.Image = global::ShareX.Properties.Resources.application_icon_large;
- this.tsbImageHistory.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
- this.tsbImageHistory.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.tsbImageHistory.Name = "tsbImageHistory";
- this.tsbImageHistory.Size = new System.Drawing.Size(157, 20);
- this.tsbImageHistory.Text = "Image history...";
- this.tsbImageHistory.Click += new System.EventHandler(this.tsbImageHistory_Click);
- //
- // tsddbDebug
- //
- this.tsddbDebug.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.tsmiShowDebugLog,
- this.tsmiTestImageUpload,
- this.tsmiTestTextUpload,
- this.tsmiTestFileUpload,
- this.tsmiTestURLShortener,
- this.tsmiTestUploaders,
- this.tsmiTestShapeCapture});
- this.tsddbDebug.Image = global::ShareX.Properties.Resources.traffic_cone;
- this.tsddbDebug.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
- this.tsddbDebug.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.tsddbDebug.Name = "tsddbDebug";
- this.tsddbDebug.Size = new System.Drawing.Size(157, 20);
- this.tsddbDebug.Text = "Debug";
- //
- // tsmiShowDebugLog
- //
- this.tsmiShowDebugLog.Image = global::ShareX.Properties.Resources.application_monitor;
- this.tsmiShowDebugLog.Name = "tsmiShowDebugLog";
- this.tsmiShowDebugLog.Size = new System.Drawing.Size(182, 22);
- this.tsmiShowDebugLog.Text = "Debug log...";
- this.tsmiShowDebugLog.Click += new System.EventHandler(this.tsmiShowDebugLog_Click);
- //
- // tsmiTestImageUpload
- //
- this.tsmiTestImageUpload.Image = global::ShareX.Properties.Resources.image;
- this.tsmiTestImageUpload.Name = "tsmiTestImageUpload";
- this.tsmiTestImageUpload.Size = new System.Drawing.Size(182, 22);
- this.tsmiTestImageUpload.Text = "Test image upload";
- this.tsmiTestImageUpload.Click += new System.EventHandler(this.tsmiTestImageUpload_Click);
- //
- // tsmiTestTextUpload
- //
- this.tsmiTestTextUpload.Image = global::ShareX.Properties.Resources.notebook;
- this.tsmiTestTextUpload.Name = "tsmiTestTextUpload";
- this.tsmiTestTextUpload.Size = new System.Drawing.Size(182, 22);
- this.tsmiTestTextUpload.Text = "Test text upload";
- this.tsmiTestTextUpload.Click += new System.EventHandler(this.tsmiTestTextUpload_Click);
- //
- // tsmiTestFileUpload
- //
- this.tsmiTestFileUpload.Image = global::ShareX.Properties.Resources.application_block;
- this.tsmiTestFileUpload.Name = "tsmiTestFileUpload";
- this.tsmiTestFileUpload.Size = new System.Drawing.Size(182, 22);
- this.tsmiTestFileUpload.Text = "Test file upload";
- this.tsmiTestFileUpload.Click += new System.EventHandler(this.tsmiTestFileUpload_Click);
- //
- // tsmiTestURLShortener
- //
- this.tsmiTestURLShortener.Image = global::ShareX.Properties.Resources.edit_scale;
- this.tsmiTestURLShortener.Name = "tsmiTestURLShortener";
- this.tsmiTestURLShortener.Size = new System.Drawing.Size(182, 22);
- this.tsmiTestURLShortener.Text = "Test URL shortener";
- this.tsmiTestURLShortener.Click += new System.EventHandler(this.tsmiTestURLShortener_Click);
- //
- // tsmiTestUploaders
- //
- this.tsmiTestUploaders.Image = global::ShareX.Properties.Resources.application_browser;
- this.tsmiTestUploaders.Name = "tsmiTestUploaders";
- this.tsmiTestUploaders.Size = new System.Drawing.Size(182, 22);
- this.tsmiTestUploaders.Text = "Test uploaders...";
- this.tsmiTestUploaders.Click += new System.EventHandler(this.tsmiTestUploaders_Click);
- //
- // tsmiTestShapeCapture
- //
- this.tsmiTestShapeCapture.Image = global::ShareX.Properties.Resources.camera;
- this.tsmiTestShapeCapture.Name = "tsmiTestShapeCapture";
- this.tsmiTestShapeCapture.Size = new System.Drawing.Size(182, 22);
- this.tsmiTestShapeCapture.Text = "Test shape capture...";
- this.tsmiTestShapeCapture.Click += new System.EventHandler(this.tsmiTestShapeCapture_Click);
- //
- // tsmiDonate
- //
- this.tsmiDonate.Image = global::ShareX.Properties.Resources.heart;
- this.tsmiDonate.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
- this.tsmiDonate.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.tsmiDonate.Name = "tsmiDonate";
- this.tsmiDonate.Size = new System.Drawing.Size(157, 20);
- this.tsmiDonate.Text = "Donate...";
- this.tsmiDonate.Click += new System.EventHandler(this.tsbDonate_Click);
- //
- // tsmiAbout
- //
- this.tsmiAbout.Image = global::ShareX.Properties.Resources.crown;
- this.tsmiAbout.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
- this.tsmiAbout.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.tsmiAbout.Name = "tsmiAbout";
- this.tsmiAbout.Size = new System.Drawing.Size(157, 20);
- this.tsmiAbout.Text = "About...";
- this.tsmiAbout.Click += new System.EventHandler(this.tsbAbout_Click);
+ this.cmsTray.Size = new System.Drawing.Size(189, 396);
//
// tsmiTrayCapture
//
@@ -1442,9 +1411,17 @@ private void InitializeComponent()
this.tsmiTrayWindowRectangle.Image = global::ShareX.Properties.Resources.layers_ungroup;
this.tsmiTrayWindowRectangle.Name = "tsmiTrayWindowRectangle";
this.tsmiTrayWindowRectangle.Size = new System.Drawing.Size(186, 22);
- this.tsmiTrayWindowRectangle.Text = "Rectangle (Window)";
+ this.tsmiTrayWindowRectangle.Text = "Rectangle (Objects)";
this.tsmiTrayWindowRectangle.Click += new System.EventHandler(this.tsmiTrayWindowRectangle_Click);
//
+ // tsmiTrayRectangleAnnotate
+ //
+ this.tsmiTrayRectangleAnnotate.Image = global::ShareX.Properties.Resources.layer_pencil;
+ this.tsmiTrayRectangleAnnotate.Name = "tsmiTrayRectangleAnnotate";
+ this.tsmiTrayRectangleAnnotate.Size = new System.Drawing.Size(186, 22);
+ this.tsmiTrayRectangleAnnotate.Text = "Rectangle (Annotate)";
+ this.tsmiTrayRectangleAnnotate.Click += new System.EventHandler(this.tsmiTrayRectangleAnnotate_Click);
+ //
// tsmiTrayRectangleLight
//
this.tsmiTrayRectangleLight.Image = global::ShareX.Properties.Resources.Rectangle;
@@ -1683,6 +1660,11 @@ private void InitializeComponent()
this.tsmiTrayTweetMessage.Text = "Tweet message...";
this.tsmiTrayTweetMessage.Click += new System.EventHandler(this.tsmiTweetMessage_Click);
//
+ // tssTray1
+ //
+ this.tssTray1.Name = "tssTray1";
+ this.tssTray1.Size = new System.Drawing.Size(185, 6);
+ //
// tsmiTrayAfterCaptureTasks
//
this.tsmiTrayAfterCaptureTasks.Image = global::ShareX.Properties.Resources.image_export;
@@ -1785,6 +1767,11 @@ private void InitializeComponent()
this.tsmiTrayHotkeySettings.Text = "Hotkey settings...";
this.tsmiTrayHotkeySettings.Click += new System.EventHandler(this.tsbHotkeySettings_Click);
//
+ // tssTray2
+ //
+ this.tssTray2.Name = "tssTray2";
+ this.tssTray2.Size = new System.Drawing.Size(185, 6);
+ //
// tsmiScreenshotsFolder
//
this.tsmiScreenshotsFolder.Image = global::ShareX.Properties.Resources.folder_open_image;
@@ -1825,6 +1812,11 @@ private void InitializeComponent()
this.tsmiTrayAbout.Text = "About...";
this.tsmiTrayAbout.Click += new System.EventHandler(this.tsbAbout_Click);
//
+ // tssTray3
+ //
+ this.tssTray3.Name = "tssTray3";
+ this.tssTray3.Size = new System.Drawing.Size(185, 6);
+ //
// tsmiTrayShow
//
this.tsmiTrayShow.Image = global::ShareX.Properties.Resources.tick_button;
@@ -1841,13 +1833,11 @@ private void InitializeComponent()
this.tsmiTrayExit.Text = "Exit";
this.tsmiTrayExit.Click += new System.EventHandler(this.tsmiTrayExit_Click);
//
- // tsmiTrayRectangleAnnotate
+ // ssToolStripMenuItem
//
- this.tsmiTrayRectangleAnnotate.Image = global::ShareX.Properties.Resources.layer_pencil;
- this.tsmiTrayRectangleAnnotate.Name = "tsmiTrayRectangleAnnotate";
- this.tsmiTrayRectangleAnnotate.Size = new System.Drawing.Size(186, 22);
- this.tsmiTrayRectangleAnnotate.Text = "Rectangle (Annotate)";
- this.tsmiTrayRectangleAnnotate.Click += new System.EventHandler(this.tsmiTrayRectangleAnnotate_Click);
+ this.ssToolStripMenuItem.Name = "ssToolStripMenuItem";
+ this.ssToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.ssToolStripMenuItem.Text = "ss";
//
// MainForm
//
@@ -2006,7 +1996,6 @@ private void InitializeComponent()
private System.Windows.Forms.ToolStripMenuItem tsmiTestFileUpload;
private System.Windows.Forms.ToolStripMenuItem tsmiTestURLShortener;
private System.Windows.Forms.ToolStripMenuItem tsmiTestUploaders;
- private System.Windows.Forms.ToolStripMenuItem tsmiTestShapeCapture;
private System.Windows.Forms.ToolStripSeparator tssCopy5;
private System.Windows.Forms.ToolStripMenuItem tsmiShowDebugLog;
private System.Windows.Forms.ToolStripButton tsbApplicationSettings;
diff --git a/ShareX/Forms/MainForm.cs b/ShareX/Forms/MainForm.cs
index 8436848d0..e5a139230 100644
--- a/ShareX/Forms/MainForm.cs
+++ b/ShareX/Forms/MainForm.cs
@@ -743,11 +743,6 @@ private void tsmiTestUploaders_Click(object sender, EventArgs e)
}
}
- private void tsmiTestShapeCapture_Click(object sender, EventArgs e)
- {
- new RegionCapturePreview(Program.DefaultTaskSettings.CaptureSettings.SurfaceOptions).Show();
- }
-
private void tsmiScreenRecorder_Click(object sender, EventArgs e)
{
TaskHelpers.DoScreenRecorder();
@@ -1568,6 +1563,7 @@ private void CaptureRegion(CaptureType captureType, TaskSettings taskSettings, b
case CaptureType.RectangleWindow:
RectangleRegion rectangleRegion = new RectangleRegion();
rectangleRegion.AreaManager.WindowCaptureMode = true;
+ rectangleRegion.AreaManager.IncludeControls = true;
surface = rectangleRegion;
break;
case CaptureType.RoundedRectangle: