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

Removed "Rectangle (Annotate)" because now normal region capture can annotate

Browse source
This commit is contained in:
Jaex 2016-05-05 21:43:35 +03:00
parent 1633d4100e
commit 0abcbaa56c
25 changed files with 4 additions and 281 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1311,24 +1311,6 @@ internal class Resources {
}
}
/// <summary>
/// Looks up a localized string similar to Capture region (Annotate).
/// </summary>
internal static string HotkeyType_RectangleAnnotate {
get {
return ResourceManager.GetString("HotkeyType_RectangleAnnotate", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Screen capture.
/// </summary>
internal static string HotkeyType_RectangleAnnotate_Category {
get {
return ResourceManager.GetString("HotkeyType_RectangleAnnotate_Category", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Capture region (Light).
/// </summary>

6
ShareX.HelpersLib/Properties/Resources.de.resx
View file

@ -341,9 +341,6 @@ Dateigröße: {2:n0} / {3:n0} KB</value>
<data name="HotkeyType_QRCode" xml:space="preserve">
<value>QR-Code</value>
</data>
<data name="HotkeyType_RectangleAnnotate" xml:space="preserve">
<value>Region aufnehmen (Notiz)</value>
</data>
<data name="HotkeyType_RectangleLight" xml:space="preserve">
<value>Region aufnehmen (Leicht)</value>
</data>
@ -588,9 +585,6 @@ Möchtest du sie herunterladen und installieren?</value>
<data name="HotkeyType_QRCode_Category" xml:space="preserve">
<value>Werkzeuge</value>
</data>
<data name="HotkeyType_RectangleAnnotate_Category" xml:space="preserve">
<value>Bildschirmaufnahme</value>
</data>
<data name="HotkeyType_RectangleLight_Category" xml:space="preserve">
<value>Bildschirmaufnahme</value>
</data>

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

@ -347,9 +347,6 @@ Tamaño de archivo: {2:n0} / {3:n0} KB</value>
<data name="HotkeyType_QRCode" xml:space="preserve">
<value>QR código</value>
</data>
<data name="HotkeyType_RectangleAnnotate" xml:space="preserve">
<value>Capturar región rectángulo (Anotar)</value>
</data>
<data name="HotkeyType_RectangleLight" xml:space="preserve">
<value>Capturar región rectángulo (ligero)</value>
</data>

6
ShareX.HelpersLib/Properties/Resources.fr.resx
View file

@ -341,9 +341,6 @@ Taille du fichier : {2:n0} / {3:n0} Ko</value>
<data name="HotkeyType_QRCode" xml:space="preserve">
<value>QR code</value>
</data>
<data name="HotkeyType_RectangleAnnotate" xml:space="preserve">
<value>Capturer une région (Annoter)</value>
</data>
<data name="HotkeyType_RectangleLight" xml:space="preserve">
<value>Capturer une région (Simple)</value>
</data>
@ -588,9 +585,6 @@ Voulez-vous la télécharger et l'installer ?</value>
<data name="HotkeyType_QRCode_Category" xml:space="preserve">
<value>Outils</value>
</data>
<data name="HotkeyType_RectangleAnnotate_Category" xml:space="preserve">
<value>Capture d'écran</value>
</data>
<data name="HotkeyType_RectangleLight_Category" xml:space="preserve">
<value>Capture d'écran</value>
</data>

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

@ -341,9 +341,6 @@ Fájlméret: {2:n0} / {3:n0} KB</value>
<data name="HotkeyType_QRCode" xml:space="preserve">
<value>QR kód</value>
</data>
<data name="HotkeyType_RectangleAnnotate" xml:space="preserve">
<value>Téglalap régió képlopás (annotált)</value>
</data>
<data name="HotkeyType_RectangleLight" xml:space="preserve">
<value>Téglalap régió képlopás (finom)</value>
</data>

3
ShareX.HelpersLib/Properties/Resources.ko-KR.resx
View file

@ -410,9 +410,6 @@
<data name="HotkeyType_QRCode" xml:space="preserve">
<value>QR코드</value>
</data>
<data name="HotkeyType_RectangleAnnotate" xml:space="preserve">
<value>직사각형 영역 촬영 (주석 달기)</value>
</data>
<data name="HotkeyType_RectangleLight" xml:space="preserve">
<value>직사각형 영역 촬영 (어둡지 않게)</value>
</data>

6
ShareX.HelpersLib/Properties/Resources.nl-NL.resx
View file

@ -341,9 +341,6 @@ Bestandsgrootte: {2:n0} / {3:n0} KB</value>
<data name="HotkeyType_QRCode" xml:space="preserve">
<value>QR code</value>
</data>
<data name="HotkeyType_RectangleAnnotate" xml:space="preserve">
<value>Leg rechthoekige regio vast (met annotatie)</value>
</data>
<data name="HotkeyType_RectangleLight" xml:space="preserve">
<value>Leg rechthoekige regio vast (Snel)</value>
</data>
@ -585,9 +582,6 @@ Wil je deze downloaden en installeren?</value>
<data name="HotkeyType_QRCode_Category" xml:space="preserve">
<value>Hulpmiddelen</value>
</data>
<data name="HotkeyType_RectangleAnnotate_Category" xml:space="preserve">
<value>Scherm vastleggen</value>
</data>
<data name="HotkeyType_RectangleLight_Category" xml:space="preserve">
<value>Scherm vastleggen</value>
</data>

6
ShareX.HelpersLib/Properties/Resources.pt-BR.resx
View file

@ -371,9 +371,6 @@ Tamanho do arquivo: {2:n0} / {3:n0} KB</value>
<data name="HotkeyType_QRCode" xml:space="preserve">
<value>Código QR</value>
</data>
<data name="HotkeyType_RectangleAnnotate" xml:space="preserve">
<value>Capturar região (anotar)</value>
</data>
<data name="HotkeyType_RectangleLight" xml:space="preserve">
<value>Capturar região (leve)</value>
</data>
@ -615,9 +612,6 @@ Você gostaria de baixar e instalar?</value>
<data name="HotkeyType_QRCode_Category" xml:space="preserve">
<value>Ferramentas</value>
</data>
<data name="HotkeyType_RectangleAnnotate_Category" xml:space="preserve">
<value>Capturar tela</value>
</data>
<data name="HotkeyType_RectangleLight_Category" xml:space="preserve">
<value>Capturar tela</value>
</data>

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

@ -447,9 +447,6 @@ File size: {2:n0} / {3:n0} KB</value>
<data name="HotkeyType_QRCode" xml:space="preserve">
<value>QR code</value>
</data>
<data name="HotkeyType_RectangleAnnotate" xml:space="preserve">
<value>Capture region (Annotate)</value>
</data>
<data name="HotkeyType_RectangleLight" xml:space="preserve">
<value>Capture region (Light)</value>
</data>
@ -694,9 +691,6 @@ Would you like to download and install it?</value>
<data name="HotkeyType_QRCode_Category" xml:space="preserve">
<value>Tools</value>
</data>
<data name="HotkeyType_RectangleAnnotate_Category" xml:space="preserve">
<value>Screen capture</value>
</data>
<data name="HotkeyType_RectangleLight_Category" xml:space="preserve">
<value>Screen capture</value>
</data>

6
ShareX.HelpersLib/Properties/Resources.ru.resx
View file

@ -344,9 +344,6 @@
<data name="HotkeyType_QRCode" xml:space="preserve">
<value>QR код</value>
</data>
<data name="HotkeyType_RectangleAnnotate" xml:space="preserve">
<value>Захват области (Примечания)</value>
</data>
<data name="HotkeyType_RectangleLight" xml:space="preserve">
<value>Захват области (Облегченный)</value>
</data>
@ -591,9 +588,6 @@
<data name="HotkeyType_QRCode_Category" xml:space="preserve">
<value>Инструменты</value>
</data>
<data name="HotkeyType_RectangleAnnotate_Category" xml:space="preserve">
<value>Захват экрана</value>
</data>
<data name="HotkeyType_RectangleLight_Category" xml:space="preserve">
<value>Захват экрана</value>
</data>

6
ShareX.HelpersLib/Properties/Resources.tr.resx
View file

@ -425,9 +425,6 @@ Dosya boyutu: {2:n0} / {3:n0} KB</value>
<data name="HotkeyType_QRCode" xml:space="preserve">
<value>QR kod</value>
</data>
<data name="HotkeyType_RectangleAnnotate" xml:space="preserve">
<value>Bölge yakala (Dipnot)</value>
</data>
<data name="HotkeyType_RectangleLight" xml:space="preserve">
<value>Bölge yakala (Basit)</value>
</data>
@ -672,9 +669,6 @@ Dosya boyutu: {2:n0} / {3:n0} KB</value>
<data name="HotkeyType_QRCode_Category" xml:space="preserve">
<value>Araçlar</value>
</data>
<data name="HotkeyType_RectangleAnnotate_Category" xml:space="preserve">
<value>Ekran yakalama</value>
</data>
<data name="HotkeyType_RectangleLight_Category" xml:space="preserve">
<value>Ekran yakalama</value>
</data>

6
ShareX.HelpersLib/Properties/Resources.vi-VN.resx
View file

@ -347,9 +347,6 @@ Kích thước tệp: {2:n0} / {3:n0} KB</value>
<data name="HotkeyType_QRCode" xml:space="preserve">
<value>Mã QR</value>
</data>
<data name="HotkeyType_RectangleAnnotate" xml:space="preserve">
<value>Chụp theo vùng (Đánh dấu)</value>
</data>
<data name="HotkeyType_RectangleLight" xml:space="preserve">
<value>Chụp theo vùng (Bản nhẹ hơn)</value>
</data>
@ -591,9 +588,6 @@ Bạn có muốn tải về và cài đặt không?</value>
<data name="HotkeyType_QRCode_Category" xml:space="preserve">
<value>Công cụ</value>
</data>
<data name="HotkeyType_RectangleAnnotate_Category" xml:space="preserve">
<value>Chụp màn hình</value>
</data>
<data name="HotkeyType_RectangleLight_Category" xml:space="preserve">
<value>Chụp màn hình</value>
</data>

6
ShareX.HelpersLib/Properties/Resources.zh-CN.resx
View file

@ -341,9 +341,6 @@
<data name="HotkeyType_QRCode" xml:space="preserve">
<value>二维码</value>
</data>
<data name="HotkeyType_RectangleAnnotate" xml:space="preserve">
<value>捕捉矩形区域（画笔）</value>
</data>
<data name="HotkeyType_RectangleLight" xml:space="preserve">
<value>捕捉矩形区域（光）</value>
</data>
@ -588,9 +585,6 @@
<data name="HotkeyType_QRCode_Category" xml:space="preserve">
<value>工具</value>
</data>
<data name="HotkeyType_RectangleAnnotate_Category" xml:space="preserve">
<value>屏幕捕捉</value>
</data>
<data name="HotkeyType_RectangleLight_Category" xml:space="preserve">
<value>屏幕捕捉</value>
</data>

1
ShareX/Enums.cs
View file

@ -160,7 +160,6 @@ public enum HotkeyType // Localized + Category
ActiveWindow,
ActiveMonitor,
RectangleRegion,
RectangleAnnotate,
RectangleLight,
RectangleTransparent,
PolygonRegion,

20
ShareX/Forms/MainForm.Designer.cs generated
View file

@ -49,7 +49,6 @@ private void InitializeComponent()
this.tsmiWindow = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiMonitor = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiRectangle = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiRectangleAnnotate = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiRectangleLight = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiRectangleTransparent = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiPolygon = new System.Windows.Forms.ToolStripMenuItem();
@ -169,7 +168,6 @@ private void InitializeComponent()
this.tsmiTrayWindow = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiTrayMonitor = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiTrayRectangle = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiTrayRectangleAnnotate = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiTrayRectangleLight = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiTrayRectangleTransparent = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiTrayPolygon = new System.Windows.Forms.ToolStripMenuItem();
@ -394,7 +392,6 @@ private void InitializeComponent()
this.tsmiWindow,
this.tsmiMonitor,
this.tsmiRectangle,
this.tsmiRectangleAnnotate,
this.tsmiRectangleLight,
this.tsmiRectangleTransparent,
this.tsmiPolygon,
@ -436,13 +433,6 @@ private void InitializeComponent()
resources.ApplyResources(this.tsmiRectangle, "tsmiRectangle");
this.tsmiRectangle.Click += new System.EventHandler(this.tsmiRectangle_Click);
//
// tsmiRectangleAnnotate
//
this.tsmiRectangleAnnotate.Image = global::ShareX.Properties.Resources.layer_pencil;
this.tsmiRectangleAnnotate.Name = "tsmiRectangleAnnotate";
resources.ApplyResources(this.tsmiRectangleAnnotate, "tsmiRectangleAnnotate");
this.tsmiRectangleAnnotate.Click += new System.EventHandler(this.tsmiRectangleAnnotate_Click);
//
// tsmiRectangleLight
//
this.tsmiRectangleLight.Image = global::ShareX.Properties.Resources.Rectangle;
@ -1303,7 +1293,6 @@ private void InitializeComponent()
this.tsmiTrayWindow,
this.tsmiTrayMonitor,
this.tsmiTrayRectangle,
this.tsmiTrayRectangleAnnotate,
this.tsmiTrayRectangleLight,
this.tsmiTrayRectangleTransparent,
this.tsmiTrayPolygon,
@ -1345,13 +1334,6 @@ private void InitializeComponent()
resources.ApplyResources(this.tsmiTrayRectangle, "tsmiTrayRectangle");
this.tsmiTrayRectangle.Click += new System.EventHandler(this.tsmiTrayRectangle_Click);
//
// tsmiTrayRectangleAnnotate
//
this.tsmiTrayRectangleAnnotate.Image = global::ShareX.Properties.Resources.layer_pencil;
this.tsmiTrayRectangleAnnotate.Name = "tsmiTrayRectangleAnnotate";
resources.ApplyResources(this.tsmiTrayRectangleAnnotate, "tsmiTrayRectangleAnnotate");
this.tsmiTrayRectangleAnnotate.Click += new System.EventHandler(this.tsmiTrayRectangleAnnotate_Click);
//
// tsmiTrayRectangleLight
//
this.tsmiTrayRectangleLight.Image = global::ShareX.Properties.Resources.Rectangle;
@ -2052,8 +2034,6 @@ private void InitializeComponent()
private System.Windows.Forms.ToolStripMenuItem tsmiTrayDestinationSettings;
private System.Windows.Forms.ToolStripMenuItem tsmiShareSelectedURL;
private System.Windows.Forms.ToolStripMenuItem tsmiShortenSelectedURL;
private System.Windows.Forms.ToolStripMenuItem tsmiRectangleAnnotate;
private System.Windows.Forms.ToolStripMenuItem tsmiTrayRectangleAnnotate;
private System.Windows.Forms.ToolStripMenuItem tsmiEditSelectedFile;
private System.Windows.Forms.ToolStripMenuItem tsmiTestURLSharing;
private System.Windows.Forms.ToolStripMenuItem tsmiDeleteSelectedFile;

56
ShareX/Forms/MainForm.cs
View file

@ -1669,7 +1669,7 @@ private void tsmiImagePreviewAutomatic_Click(object sender, EventArgs e)
private delegate Image ScreenCaptureDelegate();
private enum LastRegionCaptureType { Surface, Light, Transparent, Annotate }
private enum LastRegionCaptureType { Surface, Light, Transparent }
private LastRegionCaptureType lastRegionCaptureType = LastRegionCaptureType.Surface;
@ -1770,9 +1770,6 @@ private void ExecuteJob(TaskSettings taskSettings, HotkeyType job)
case HotkeyType.RectangleRegion:
CaptureScreenshot(CaptureType.Rectangle, safeTaskSettings, false);
break;
case HotkeyType.RectangleAnnotate:
CaptureRectangleAnnotate(safeTaskSettings, false);
break;
case HotkeyType.RectangleLight:
CaptureRectangleLight(safeTaskSettings, false);
break;
@ -2167,31 +2164,6 @@ private void CaptureRegion(CaptureType captureType, TaskSettings taskSettings, b
}, captureType, taskSettings, autoHideForm);
}
private void CaptureRectangleAnnotate(TaskSettings taskSettings = null, bool autoHideForm = true)
{
if (taskSettings == null) taskSettings = TaskSettings.GetDefaultTaskSettings();
DoCapture(() =>
{
Image img = null;
using (RectangleAnnotateForm rectangleAnnotate = new RectangleAnnotateForm(taskSettings.CaptureSettingsReference.RectangleAnnotateOptions))
{
if (rectangleAnnotate.ShowDialog() == DialogResult.OK)
{
img = rectangleAnnotate.GetAreaImage();
if (img != null)
{
lastRegionCaptureType = LastRegionCaptureType.Annotate;
}
}
}
return img;
}, CaptureType.Rectangle, taskSettings, autoHideForm);
}
private void CaptureRectangleLight(TaskSettings taskSettings = null, bool autoHideForm = true)
{
if (taskSettings == null) taskSettings = TaskSettings.GetDefaultTaskSettings();
@ -2294,22 +2266,6 @@ private void CaptureLastRegion(TaskSettings taskSettings, bool autoHideForm = tr
CaptureRectangleTransparent(taskSettings, autoHideForm);
}
break;
case LastRegionCaptureType.Annotate:
if (!RectangleAnnotateForm.LastSelectionRectangle0Based.IsEmpty)
{
DoCapture(() =>
{
using (Image screenshot = Screenshot.CaptureFullscreen())
{
return ImageHelpers.CropImage(screenshot, RectangleAnnotateForm.LastSelectionRectangle0Based);
}
}, CaptureType.LastRegion, taskSettings, autoHideForm);
}
else
{
CaptureRectangleAnnotate(taskSettings, autoHideForm);
}
break;
}
}
@ -2407,11 +2363,6 @@ private void tsmiRectangle_Click(object sender, EventArgs e)
CaptureScreenshot(CaptureType.Rectangle);
}
private void tsmiRectangleAnnotate_Click(object sender, EventArgs e)
{
CaptureRectangleAnnotate();
}
private void tsmiRectangleLight_Click(object sender, EventArgs e)
{
CaptureRectangleLight();
@ -2485,11 +2436,6 @@ private void tsmiTrayRectangle_Click(object sender, EventArgs e)
CaptureScreenshot(CaptureType.Rectangle, null, false);
}
private void tsmiTrayRectangleAnnotate_Click(object sender, EventArgs e)
{
CaptureRectangleAnnotate(null, false);
}
private void tsmiTrayRectangleLight_Click(object sender, EventArgs e)
{
CaptureRectangleLight(null, false);

28
ShareX/Forms/MainForm.resx
View file

@ -378,12 +378,6 @@
<data name="tsmiRectangle.Text" xml:space="preserve">
<value>Region</value>
</data>
<data name="tsmiRectangleAnnotate.Size" type="System.Drawing.Size, System.Drawing">
<value>191, 22</value>
</data>
<data name="tsmiRectangleAnnotate.Text" xml:space="preserve">
<value>Region (Annotate)</value>
</data>
<data name="tsmiRectangleLight.Size" type="System.Drawing.Size, System.Drawing">
<value>191, 22</value>
</data>
@ -1191,12 +1185,6 @@
<data name="tsmiTrayRectangle.Text" xml:space="preserve">
<value>Region</value>
</data>
<data name="tsmiTrayRectangleAnnotate.Size" type="System.Drawing.Size, System.Drawing">
<value>191, 22</value>
</data>
<data name="tsmiTrayRectangleAnnotate.Text" xml:space="preserve">
<value>Region (Annotate)</value>
</data>
<data name="tsmiTrayRectangleLight.Size" type="System.Drawing.Size, System.Drawing">
<value>191, 22</value>
</data>
@ -1585,7 +1573,7 @@
<value>Exit</value>
</data>
<data name="cmsTray.Size" type="System.Drawing.Size, System.Drawing">
<value>189, 462</value>
<value>189, 484</value>
</data>
<data name="&gt;&gt;cmsTray.Name" xml:space="preserve">
<value>cmsTray</value>
@ -1752,12 +1740,6 @@
<data name="&gt;&gt;tsmiRectangle.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tsmiRectangleAnnotate.Name" xml:space="preserve">
<value>tsmiRectangleAnnotate</value>
</data>
<data name="&gt;&gt;tsmiRectangleAnnotate.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tsmiRectangleLight.Name" xml:space="preserve">
<value>tsmiRectangleLight</value>
</data>
@ -2460,12 +2442,6 @@
<data name="&gt;&gt;tsmiTrayRectangle.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tsmiTrayRectangleAnnotate.Name" xml:space="preserve">
<value>tsmiTrayRectangleAnnotate</value>
</data>
<data name="&gt;&gt;tsmiTrayRectangleAnnotate.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tsmiTrayRectangleLight.Name" xml:space="preserve">
<value>tsmiTrayRectangleLight</value>
</data>
@ -2866,6 +2842,6 @@
<value>MainForm</value>
</data>
<data name="&gt;&gt;$this.Type" xml:space="preserve">
<value>ShareX.HotkeyForm, ShareX, Version=10.9.1.0, Culture=neutral, PublicKeyToken=null</value>
<value>ShareX.HotkeyForm, ShareX, Version=11.0.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
</root>

22
ShareX/Forms/TaskSettingsForm.Designer.cs generated
View file

@ -141,8 +141,6 @@ private void InitializeComponent()
this.lblGIFFPS = new System.Windows.Forms.Label();
this.tpScrollingCapture = new System.Windows.Forms.TabPage();
this.pgScrollingCapture = new System.Windows.Forms.PropertyGrid();
this.tpRectangleAnnotate = new System.Windows.Forms.TabPage();
this.pgRectangleAnnotate = new System.Windows.Forms.PropertyGrid();
this.tpUpload = new System.Windows.Forms.TabPage();
this.tcUpload = new System.Windows.Forms.TabControl();
this.tpUploadMain = new System.Windows.Forms.TabPage();
@ -229,7 +227,6 @@ private void InitializeComponent()
((System.ComponentModel.ISupportInitialize)(this.nudScreenRecorderStartDelay)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.nudGIFFPS)).BeginInit();
this.tpScrollingCapture.SuspendLayout();
this.tpRectangleAnnotate.SuspendLayout();
this.tpUpload.SuspendLayout();
this.tcUpload.SuspendLayout();
this.tpUploadMain.SuspendLayout();
@ -752,7 +749,6 @@ private void InitializeComponent()
this.tcCapture.Controls.Add(this.tpRegionCapture);
this.tcCapture.Controls.Add(this.tpScreenRecorder);
this.tcCapture.Controls.Add(this.tpScrollingCapture);
this.tcCapture.Controls.Add(this.tpRectangleAnnotate);
resources.ApplyResources(this.tcCapture, "tcCapture");
this.tcCapture.Name = "tcCapture";
this.tcCapture.SelectedIndex = 0;
@ -1207,21 +1203,6 @@ private void InitializeComponent()
this.pgScrollingCapture.PropertySort = System.Windows.Forms.PropertySort.NoSort;
this.pgScrollingCapture.ToolbarVisible = false;
//
// tpRectangleAnnotate
//
this.tpRectangleAnnotate.Controls.Add(this.pgRectangleAnnotate);
resources.ApplyResources(this.tpRectangleAnnotate, "tpRectangleAnnotate");
this.tpRectangleAnnotate.Name = "tpRectangleAnnotate";
this.tpRectangleAnnotate.UseVisualStyleBackColor = true;
//
// pgRectangleAnnotate
//
this.pgRectangleAnnotate.CategoryForeColor = System.Drawing.SystemColors.InactiveCaptionText;
resources.ApplyResources(this.pgRectangleAnnotate, "pgRectangleAnnotate");
this.pgRectangleAnnotate.Name = "pgRectangleAnnotate";
this.pgRectangleAnnotate.PropertySort = System.Windows.Forms.PropertySort.NoSort;
this.pgRectangleAnnotate.ToolbarVisible = false;
//
// tpUpload
//
this.tpUpload.Controls.Add(this.tcUpload);
@ -1678,7 +1659,6 @@ private void InitializeComponent()
((System.ComponentModel.ISupportInitialize)(this.nudScreenRecorderStartDelay)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.nudGIFFPS)).EndInit();
this.tpScrollingCapture.ResumeLayout(false);
this.tpRectangleAnnotate.ResumeLayout(false);
this.tpUpload.ResumeLayout(false);
this.tcUpload.ResumeLayout(false);
this.tpUploadMain.ResumeLayout(false);
@ -1832,8 +1812,6 @@ private void InitializeComponent()
private System.Windows.Forms.Label lblScreenRecordFPS;
private System.Windows.Forms.Label lblScreenRecorderFixedDuration;
private System.Windows.Forms.CheckBox cbClipboardUploadShareURL;
private System.Windows.Forms.TabPage tpRectangleAnnotate;
private System.Windows.Forms.PropertyGrid pgRectangleAnnotate;
private System.Windows.Forms.ColumnHeader chActionsExtensions;
private System.Windows.Forms.Button btnActionsDuplicate;
private System.Windows.Forms.Label lblImageEffectsNote;

6
ShareX/Forms/TaskSettingsForm.cs
View file

@ -211,10 +211,6 @@ public TaskSettingsForm(TaskSettings hotkeySetting, bool isDefault = false)
if (TaskSettings.CaptureSettings.SurfaceOptions == null) TaskSettings.CaptureSettings.SurfaceOptions = new SurfaceOptions();
pgRegionCapture.SelectedObject = TaskSettings.CaptureSettings.SurfaceOptions;
// Capture / Rectangle annotate
if (TaskSettings.CaptureSettings.RectangleAnnotateOptions == null) TaskSettings.CaptureSettings.RectangleAnnotateOptions = new RectangleAnnotateOptions();
pgRectangleAnnotate.SelectedObject = TaskSettings.CaptureSettings.RectangleAnnotateOptions;
// Capture / Screen recorder
nudScreenRecordFPS.SetValue(TaskSettings.CaptureSettings.ScreenRecordFPS);
nudGIFFPS.SetValue(TaskSettings.CaptureSettings.GIFFPS);
@ -326,7 +322,7 @@ private void UpdateDefaultSettingVisibility()
{
panelGeneral.Enabled = !TaskSettings.UseDefaultGeneralSettings;
pImage.Enabled = ((Control)tpEffects).Enabled = ((Control)tpThumbnail).Enabled = !TaskSettings.UseDefaultImageSettings;
pCapture.Enabled = ((Control)tpRegionCapture).Enabled = ((Control)tpScreenRecorder).Enabled = ((Control)tpRectangleAnnotate).Enabled = !TaskSettings.UseDefaultCaptureSettings;
pCapture.Enabled = ((Control)tpRegionCapture).Enabled = ((Control)tpScreenRecorder).Enabled = !TaskSettings.UseDefaultCaptureSettings;
pActions.Enabled = !TaskSettings.UseDefaultActions;
((Control)tpFileNaming).Enabled = ((Control)tpUploadClipboard).Enabled = !TaskSettings.UseDefaultUploadSettings;
((Control)tpIndexer).Enabled = ((Control)tpVideoThumbnailer).Enabled = !TaskSettings.UseDefaultToolsSettings;

51
ShareX/Forms/TaskSettingsForm.resx
View file

@ -2898,57 +2898,6 @@
<data name="&gt;&gt;tpScrollingCapture.ZOrder" xml:space="preserve">
<value>3</value>
</data>
<data name="pgRectangleAnnotate.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
<data name="pgRectangleAnnotate.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 3</value>
</data>
<data name="pgRectangleAnnotate.Size" type="System.Drawing.Size, System.Drawing">
<value>551, 322</value>
</data>
<data name="pgRectangleAnnotate.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="&gt;&gt;pgRectangleAnnotate.Name" xml:space="preserve">
<value>pgRectangleAnnotate</value>
</data>
<data name="&gt;&gt;pgRectangleAnnotate.Type" xml:space="preserve">
<value>System.Windows.Forms.PropertyGrid, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;pgRectangleAnnotate.Parent" xml:space="preserve">
<value>tpRectangleAnnotate</value>
</data>
<data name="&gt;&gt;pgRectangleAnnotate.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="tpRectangleAnnotate.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 22</value>
</data>
<data name="tpRectangleAnnotate.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 3, 3, 3</value>
</data>
<data name="tpRectangleAnnotate.Size" type="System.Drawing.Size, System.Drawing">
<value>557, 328</value>
</data>
<data name="tpRectangleAnnotate.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
</data>
<data name="tpRectangleAnnotate.Text" xml:space="preserve">
<value>Rectangle annotate</value>
</data>
<data name="&gt;&gt;tpRectangleAnnotate.Name" xml:space="preserve">
<value>tpRectangleAnnotate</value>
</data>
<data name="&gt;&gt;tpRectangleAnnotate.Type" xml:space="preserve">
<value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tpRectangleAnnotate.Parent" xml:space="preserve">
<value>tcCapture</value>
</data>
<data name="&gt;&gt;tpRectangleAnnotate.ZOrder" xml:space="preserve">
<value>4</value>
</data>
<data name="tcCapture.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>

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

@ -1124,16 +1124,6 @@ public class Resources {
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
public static System.Drawing.Bitmap layer_pencil {
get {
object obj = ResourceManager.GetObject("layer_pencil", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>

3
ShareX/Properties/Resources.resx
View file

@ -352,9 +352,6 @@ Press yes to open image from clipboard. Alternatively, press no to open image fi
<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>
<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>
</data>
<data name="images_stack" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\images-stack.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>

BIN
ShareX/Resources/layer--pencil.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 677 B

1
ShareX/ShareX.csproj
View file

@ -1219,7 +1219,6 @@
<None Include="Resources\clock.png" />
<None Include="Resources\heart.png" />
<None Include="Resources\crown.png" />
<None Include="Resources\layer--pencil.png" />
<None Include="Resources\globe-share.png" />
<None Include="Resources\document-copy.png" />
<None Include="Resources\image--pencil.png" />

6
ShareX/TaskSettings.cs
View file

@ -343,12 +343,6 @@ public class TaskSettingsCapture
public ScrollingCaptureOptions ScrollingCaptureOptions = new ScrollingCaptureOptions();
#endregion Capture / Scrolling capture
#region Capture / Rectangle annotate
public RectangleAnnotateOptions RectangleAnnotateOptions = new RectangleAnnotateOptions();
#endregion Capture / Rectangle annotate
}
public class TaskSettingsUpload