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

Removed freehand capture hotkey

Browse source
This commit is contained in:
Jaex 2016-08-03 09:32:35 +03:00
parent 3a7510d2a2
commit 6358f04a31
18 changed files with 7 additions and 151 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

@ -1023,24 +1023,6 @@ internal static string HotkeyType_FolderUpload_Category {
}
}
/// <summary>
/// Looks up a localized string similar to Capture freehand region.
/// </summary>
internal static string HotkeyType_FreeHandRegion {
get {
return ResourceManager.GetString("HotkeyType_FreeHandRegion", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Screen capture.
/// </summary>
internal static string HotkeyType_FreeHandRegion_Category {
get {
return ResourceManager.GetString("HotkeyType_FreeHandRegion_Category", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to FTP client.
/// </summary>

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

@ -308,9 +308,6 @@ Dateigröße: {2:n0} / {3:n0} KB</value>
<data name="HotkeyType_FolderUpload" xml:space="preserve">
<value>Ordner hochladen</value>
</data>
<data name="HotkeyType_FreeHandRegion" xml:space="preserve">
<value>Freihandregion aufnehmen</value>
</data>
<data name="HotkeyType_FTPClient" xml:space="preserve">
<value>FTP Gerät</value>
</data>
@ -555,9 +552,6 @@ Möchtest du sie herunterladen und installieren?</value>
<data name="HotkeyType_FolderUpload_Category" xml:space="preserve">
<value>Hochladen</value>
</data>
<data name="HotkeyType_FreeHandRegion_Category" xml:space="preserve">
<value>Bildschirmaufnahme</value>
</data>
<data name="HotkeyType_FTPClient_Category" xml:space="preserve">
<value>Werkzeuge</value>
</data>

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

@ -314,9 +314,6 @@ Tamaño de archivo: {2:n0} / {3:n0} KB</value>
<data name="HotkeyType_FolderUpload" xml:space="preserve">
<value>Carpeta de subir</value>
</data>
<data name="HotkeyType_FreeHandRegion" xml:space="preserve">
<value>Capturar región a mano alzada</value>
</data>
<data name="HotkeyType_FTPClient" xml:space="preserve">
<value>Cliente FTP</value>
</data>

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

@ -308,9 +308,6 @@ Taille du fichier : {2:n0} / {3:n0} Ko</value>
<data name="HotkeyType_FolderUpload" xml:space="preserve">
<value>Mise en ligne d'un dossier</value>
</data>
<data name="HotkeyType_FreeHandRegion" xml:space="preserve">
<value>Capturer une région à main levée</value>
</data>
<data name="HotkeyType_FTPClient" xml:space="preserve">
<value>Client FTP</value>
</data>
@ -555,9 +552,6 @@ Voulez-vous la télécharger et l'installer ?</value>
<data name="HotkeyType_FolderUpload_Category" xml:space="preserve">
<value>Mise en ligne</value>
</data>
<data name="HotkeyType_FreeHandRegion_Category" xml:space="preserve">
<value>Capture d'écran</value>
</data>
<data name="HotkeyType_FTPClient_Category" xml:space="preserve">
<value>Outils</value>
</data>

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

@ -308,9 +308,6 @@ Fájlméret: {2:n0} / {3:n0} KB</value>
<data name="HotkeyType_FolderUpload" xml:space="preserve">
<value>Mappa feltöltése</value>
</data>
<data name="HotkeyType_FreeHandRegion" xml:space="preserve">
<value>Szabadkezi régió képlopás</value>
</data>
<data name="HotkeyType_FTPClient" xml:space="preserve">
<value>FTP kliens</value>
</data>

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

@ -377,9 +377,6 @@
<data name="HotkeyType_FolderUpload" xml:space="preserve">
<value>폴더 업로드</value>
</data>
<data name="HotkeyType_FreeHandRegion" xml:space="preserve">
<value>자유선 영역 촬영</value>
</data>
<data name="HotkeyType_FTPClient" xml:space="preserve">
<value>FTP 클라이언트</value>
</data>

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

@ -308,9 +308,6 @@ Bestandsgrootte: {2:n0} / {3:n0} KB</value>
<data name="HotkeyType_FolderUpload" xml:space="preserve">
<value>Upload map</value>
</data>
<data name="HotkeyType_FreeHandRegion" xml:space="preserve">
<value>Leg getekende regio vast</value>
</data>
<data name="HotkeyType_FTPClient" xml:space="preserve">
<value>FTP programma</value>
</data>
@ -552,9 +549,6 @@ Wil je deze downloaden en installeren?</value>
<data name="HotkeyType_FolderUpload_Category" xml:space="preserve">
<value>Uploaden</value>
</data>
<data name="HotkeyType_FreeHandRegion_Category" xml:space="preserve">
<value>Scherm vastleggen</value>
</data>
<data name="HotkeyType_FTPClient_Category" xml:space="preserve">
<value>Hulpmiddelen</value>
</data>

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

@ -338,9 +338,6 @@ Tamanho do arquivo: {2:n0} / {3:n0} KB</value>
<data name="HotkeyType_FolderUpload" xml:space="preserve">
<value>Upload de pasta</value>
</data>
<data name="HotkeyType_FreeHandRegion" xml:space="preserve">
<value>Capturar região à mão livre</value>
</data>
<data name="HotkeyType_FTPClient" xml:space="preserve">
<value>Cliente FTP</value>
</data>
@ -582,9 +579,6 @@ Você gostaria de baixar e instalar?</value>
<data name="HotkeyType_FolderUpload_Category" xml:space="preserve">
<value>Upload</value>
</data>
<data name="HotkeyType_FreeHandRegion_Category" xml:space="preserve">
<value>Capturar tela</value>
</data>
<data name="HotkeyType_FTPClient_Category" xml:space="preserve">
<value>Ferramentas</value>
</data>

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

@ -414,9 +414,6 @@ File size: {2:n0} / {3:n0} KB</value>
<data name="HotkeyType_FolderUpload" xml:space="preserve">
<value>Upload folder</value>
</data>
<data name="HotkeyType_FreeHandRegion" xml:space="preserve">
<value>Capture freehand region</value>
</data>
<data name="HotkeyType_FTPClient" xml:space="preserve">
<value>FTP client</value>
</data>
@ -661,9 +658,6 @@ Would you like to download and install it?</value>
<data name="HotkeyType_FolderUpload_Category" xml:space="preserve">
<value>Upload</value>
</data>
<data name="HotkeyType_FreeHandRegion_Category" xml:space="preserve">
<value>Screen capture</value>
</data>
<data name="HotkeyType_FTPClient_Category" xml:space="preserve">
<value>Tools</value>
</data>

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

@ -311,9 +311,6 @@
<data name="HotkeyType_FolderUpload" xml:space="preserve">
<value>Загрузка папки</value>
</data>
<data name="HotkeyType_FreeHandRegion" xml:space="preserve">
<value>Захват области произвольной формы</value>
</data>
<data name="HotkeyType_FTPClient" xml:space="preserve">
<value>Клиент FTP</value>
</data>
@ -558,9 +555,6 @@
<data name="HotkeyType_FolderUpload_Category" xml:space="preserve">
<value>Загрузка</value>
</data>
<data name="HotkeyType_FreeHandRegion_Category" xml:space="preserve">
<value>Захват экрана</value>
</data>
<data name="HotkeyType_FTPClient_Category" xml:space="preserve">
<value>Инструменты</value>
</data>

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

@ -392,9 +392,6 @@ Dosya boyutu: {2:n0} / {3:n0} KB</value>
<data name="HotkeyType_FolderUpload" xml:space="preserve">
<value>Dizin yükle</value>
</data>
<data name="HotkeyType_FreeHandRegion" xml:space="preserve">
<value>Serbest bölge yakala</value>
</data>
<data name="HotkeyType_FTPClient" xml:space="preserve">
<value>FTP istemci</value>
</data>
@ -639,9 +636,6 @@ Dosya boyutu: {2:n0} / {3:n0} KB</value>
<data name="HotkeyType_FolderUpload_Category" xml:space="preserve">
<value>Yükle</value>
</data>
<data name="HotkeyType_FreeHandRegion_Category" xml:space="preserve">
<value>Ekran yakalama</value>
</data>
<data name="HotkeyType_FTPClient_Category" xml:space="preserve">
<value>Araçlar</value>
</data>

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

@ -314,9 +314,6 @@ Kích thước tệp: {2:n0} / {3:n0} KB</value>
<data name="HotkeyType_FolderUpload" xml:space="preserve">
<value>Tải lên thư mục</value>
</data>
<data name="HotkeyType_FreeHandRegion" xml:space="preserve">
<value>Chụp lại vùng tạo bằng tay</value>
</data>
<data name="HotkeyType_FTPClient" xml:space="preserve">
<value>Trình FTP</value>
</data>
@ -558,9 +555,6 @@ Bạn có muốn tải về và cài đặt không?</value>
<data name="HotkeyType_FolderUpload_Category" xml:space="preserve">
<value>Tải lên</value>
</data>
<data name="HotkeyType_FreeHandRegion_Category" xml:space="preserve">
<value>Chụp màn hình</value>
</data>
<data name="HotkeyType_FTPClient_Category" xml:space="preserve">
<value>Công cụ</value>
</data>

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

@ -308,9 +308,6 @@
<data name="HotkeyType_FolderUpload" xml:space="preserve">
<value>上传文件夹</value>
</data>
<data name="HotkeyType_FreeHandRegion" xml:space="preserve">
<value>捕捉手绘区域</value>
</data>
<data name="HotkeyType_FTPClient" xml:space="preserve">
<value>FTP客户端</value>
</data>
@ -555,9 +552,6 @@
<data name="HotkeyType_FolderUpload_Category" xml:space="preserve">
<value>上传</value>
</data>
<data name="HotkeyType_FreeHandRegion_Category" xml:space="preserve">
<value>屏幕捕捉</value>
</data>
<data name="HotkeyType_FTPClient_Category" xml:space="preserve">
<value>工具</value>
</data>

12
ShareX.ScreenCaptureLib/Shapes/Region/FreehandRegionShape.cs
View file

@ -58,15 +58,15 @@ public override void OnShapePathRequested(GraphicsPath gp, Rectangle rect)
{
gp.StartFigure();
if (len > 2)
for (int i = 0; i < len - 1; i++)
{
for (int i = 0; i < len - 1; i++)
{
gp.AddLine(points[i], points[i + 1]);
}
gp.AddLine(points[i], points[i + 1]);
}
gp.AddLine(points[len - 1], points[0]);
if (len > 2)
{
gp.AddLine(points[len - 1], points[0]);
}
gp.CloseFigure();
}

2
ShareX/Enums.cs
View file

@ -132,7 +132,6 @@ public enum CaptureType
ActiveWindow,
Rectangle,
Polygon,
Freehand,
CustomRegion,
LastRegion
}
@ -166,7 +165,6 @@ public enum HotkeyType // Localized + Category
RectangleTransparent,
RectangleAnnotate,
PolygonRegion,
FreeHandRegion,
CustomRegion,
LastRegion,
ScrollingCapture,

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

@ -55,7 +55,6 @@ private void InitializeComponent()
this.tsmiRectangleLight = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiRectangleTransparent = 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.tsmiScreenRecordingFFmpeg = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiScreenRecordingGIF = new System.Windows.Forms.ToolStripMenuItem();
@ -176,7 +175,6 @@ private void InitializeComponent()
this.tsmiTrayRectangleLight = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiTrayRectangleTransparent = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiTrayPolygon = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiTrayFreeHand = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiTrayLastRegion = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiTrayScreenRecordingFFmpeg = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiTrayScreenRecordingGIF = new System.Windows.Forms.ToolStripMenuItem();
@ -434,7 +432,6 @@ private void InitializeComponent()
this.tsmiRectangleLight,
this.tsmiRectangleTransparent,
this.tsmiPolygon,
this.tsmiFreeHand,
this.tsmiLastRegion,
this.tsmiScreenRecordingFFmpeg,
this.tsmiScreenRecordingGIF,
@ -494,13 +491,6 @@ private void InitializeComponent()
resources.ApplyResources(this.tsmiPolygon, "tsmiPolygon");
this.tsmiPolygon.Click += new System.EventHandler(this.tsmiPolygon_Click);
//
// tsmiFreeHand
//
this.tsmiFreeHand.Image = global::ShareX.Properties.Resources.layer_shape_curve;
this.tsmiFreeHand.Name = "tsmiFreeHand";
resources.ApplyResources(this.tsmiFreeHand, "tsmiFreeHand");
this.tsmiFreeHand.Click += new System.EventHandler(this.tsmiFreeHand_Click);
//
// tsmiLastRegion
//
this.tsmiLastRegion.Image = global::ShareX.Properties.Resources.layers;
@ -1353,7 +1343,6 @@ private void InitializeComponent()
this.tsmiTrayRectangleLight,
this.tsmiTrayRectangleTransparent,
this.tsmiTrayPolygon,
this.tsmiTrayFreeHand,
this.tsmiTrayLastRegion,
this.tsmiTrayScreenRecordingFFmpeg,
this.tsmiTrayScreenRecordingGIF,
@ -1413,13 +1402,6 @@ private void InitializeComponent()
resources.ApplyResources(this.tsmiTrayPolygon, "tsmiTrayPolygon");
this.tsmiTrayPolygon.Click += new System.EventHandler(this.tsmiTrayPolygon_Click);
//
// tsmiTrayFreeHand
//
this.tsmiTrayFreeHand.Image = global::ShareX.Properties.Resources.layer_shape_curve;
this.tsmiTrayFreeHand.Name = "tsmiTrayFreeHand";
resources.ApplyResources(this.tsmiTrayFreeHand, "tsmiTrayFreeHand");
this.tsmiTrayFreeHand.Click += new System.EventHandler(this.tsmiTrayFreeHand_Click);
//
// tsmiTrayLastRegion
//
this.tsmiTrayLastRegion.Image = global::ShareX.Properties.Resources.layers;
@ -1965,7 +1947,6 @@ private void InitializeComponent()
private System.Windows.Forms.ToolStripMenuItem tsmiFullscreen;
private System.Windows.Forms.ToolStripMenuItem tsmiRectangle;
private System.Windows.Forms.ToolStripMenuItem tsmiPolygon;
private System.Windows.Forms.ToolStripMenuItem tsmiFreeHand;
private System.Windows.Forms.ToolStripMenuItem tsmiWindow;
private System.Windows.Forms.ToolStripMenuItem tsmiTrayHistory;
private System.Windows.Forms.ToolStripMenuItem tsmiTrayAbout;
@ -1975,7 +1956,6 @@ private void InitializeComponent()
private System.Windows.Forms.ToolStripMenuItem tsmiTrayWindow;
private System.Windows.Forms.ToolStripMenuItem tsmiTrayRectangle;
private System.Windows.Forms.ToolStripMenuItem tsmiTrayPolygon;
private System.Windows.Forms.ToolStripMenuItem tsmiTrayFreeHand;
private System.Windows.Forms.ToolStripMenuItem tsmiLastRegion;
private System.Windows.Forms.ToolStripMenuItem tsmiTrayLastRegion;
private HelpersLib.SplitContainerCustomSplitter scMain;

19
ShareX/Forms/MainForm.cs
View file

@ -1843,9 +1843,6 @@ private void ExecuteJob(TaskSettings taskSettings, HotkeyType job)
case HotkeyType.PolygonRegion:
CaptureScreenshot(CaptureType.Polygon, safeTaskSettings, false);
break;
case HotkeyType.FreeHandRegion:
CaptureScreenshot(CaptureType.Freehand, safeTaskSettings, false);
break;
case HotkeyType.CustomRegion:
CaptureScreenshot(CaptureType.CustomRegion, safeTaskSettings, false);
break;
@ -1977,7 +1974,6 @@ public void CaptureScreenshot(CaptureType captureType, TaskSettings taskSettings
break;
case CaptureType.Rectangle:
case CaptureType.Polygon:
case CaptureType.Freehand:
CaptureRegion(captureType, taskSettings, autoHideForm);
break;
case CaptureType.CustomRegion:
@ -2060,7 +2056,7 @@ private void AfterCapture(Image img, CaptureType captureType, TaskSettings taskS
private bool IsRegionCapture(CaptureType captureType)
{
return captureType.HasFlagAny(CaptureType.Rectangle, CaptureType.Polygon, CaptureType.Freehand, CaptureType.LastRegion);
return captureType.HasFlagAny(CaptureType.Rectangle, CaptureType.Polygon, CaptureType.LastRegion);
}
private void CaptureActiveWindow(TaskSettings taskSettings, bool autoHideForm = true)
@ -2147,9 +2143,6 @@ private void CaptureRegion(CaptureType captureType, TaskSettings taskSettings, b
case CaptureType.Polygon:
form = new PolygonRegionForm();
break;
case CaptureType.Freehand:
form = new FreeHandRegionForm();
break;
}
DoCapture(() =>
@ -2451,11 +2444,6 @@ private void tsmiPolygon_Click(object sender, EventArgs e)
CaptureScreenshot(CaptureType.Polygon);
}
private void tsmiFreeHand_Click(object sender, EventArgs e)
{
CaptureScreenshot(CaptureType.Freehand);
}
private void tsmiLastRegion_Click(object sender, EventArgs e)
{
CaptureScreenshot(CaptureType.LastRegion);
@ -2535,11 +2523,6 @@ private void tsmiTrayPolygon_Click(object sender, EventArgs e)
CaptureScreenshot(CaptureType.Polygon, null, false);
}
private void tsmiTrayFreeHand_Click(object sender, EventArgs e)
{
CaptureScreenshot(CaptureType.Freehand, null, false);
}
private void tsmiTrayLastRegion_Click(object sender, EventArgs e)
{
CaptureScreenshot(CaptureType.LastRegion, null, false);

24
ShareX/Forms/MainForm.resx
View file

@ -495,12 +495,6 @@
<data name="tsmiPolygon.Text" xml:space="preserve">
<value>Polygon</value>
</data>
<data name="tsmiFreeHand.Size" type="System.Drawing.Size, System.Drawing">
<value>191, 22</value>
</data>
<data name="tsmiFreeHand.Text" xml:space="preserve">
<value>Freehand</value>
</data>
<data name="tsmiLastRegion.Size" type="System.Drawing.Size, System.Drawing">
<value>191, 22</value>
</data>
@ -1314,12 +1308,6 @@
<data name="tsmiTrayPolygon.Text" xml:space="preserve">
<value>Polygon</value>
</data>
<data name="tsmiTrayFreeHand.Size" type="System.Drawing.Size, System.Drawing">
<value>191, 22</value>
</data>
<data name="tsmiTrayFreeHand.Text" xml:space="preserve">
<value>Freehand</value>
</data>
<data name="tsmiTrayLastRegion.Size" type="System.Drawing.Size, System.Drawing">
<value>191, 22</value>
</data>
@ -1875,12 +1863,6 @@
<data name="&gt;&gt;tsmiPolygon.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;tsmiFreeHand.Name" xml:space="preserve">
<value>tsmiFreeHand</value>
</data>
<data name="&gt;&gt;tsmiFreeHand.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;tsmiLastRegion.Name" xml:space="preserve">
<value>tsmiLastRegion</value>
</data>
@ -2589,12 +2571,6 @@
<data name="&gt;&gt;tsmiTrayPolygon.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;tsmiTrayFreeHand.Name" xml:space="preserve">
<value>tsmiTrayFreeHand</value>
</data>
<data name="&gt;&gt;tsmiTrayFreeHand.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;tsmiTrayLastRegion.Name" xml:space="preserve">
<value>tsmiTrayLastRegion</value>
</data>