Mirrors/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2025-12-28 07:54:19 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Jaex 2025-09-27 09:13:02 +03:00
commit 36d4e1461f
4 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ShareX.HelpersLib/Properties/Resources.Designer.cs generated
View File

@ -1827,7 +1827,18 @@ namespace ShareX.HelpersLib.Properties {
return ResourceManager.GetString("HotkeyType_StartAutoCapture", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Stop auto capture.
/// </summary>
internal static string HotkeyType_StopAutoCapture
{
get
{
return ResourceManager.GetString("HotkeyType_StopAutoCapture", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Start/Stop screen recording using last region.
/// </summary>
@ -1845,7 +1856,7 @@ namespace ShareX.HelpersLib.Properties {
return ResourceManager.GetString("HotkeyType_StartScreenRecorderGIF", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Stop screen recording.
/// </summary>

3
ShareX.HelpersLib/Properties/Resources.resx
View File

@ -906,6 +906,9 @@ Would you like to download and install it?</value>
<data name="HotkeyType_AutoCapture" xml:space="preserve">
<value>Auto capture</value>
</data>
<data name="HotkeyType_StopAutoCapture" xml:space="preserve">
<value>Stop auto capture</value>
</data>
<data name="ShapeType_DrawingRectangle" xml:space="preserve">
<value>Rectangle (R)</value>
</data>

2
ShareX/Enums.cs
View File

@ -232,6 +232,8 @@ namespace ShareX
AutoCapture,
[Category(EnumExtensions.HotkeyType_Category_ScreenCapture)]
StartAutoCapture,
[Category(EnumExtensions.HotkeyType_Category_ScreenCapture)]
StopAutoCapture,
// Screen record
[Category(EnumExtensions.HotkeyType_Category_ScreenRecord)]
ScreenRecorder,

12
ShareX/TaskHelpers.cs
View File

@ -144,6 +144,9 @@ namespace ShareX
case HotkeyType.StartAutoCapture:
StartAutoCapture(safeTaskSettings);
break;
case HotkeyType.StopAutoCapture:
StopAutoCapture();
break;
// Screen record
case HotkeyType.ScreenRecorder:
StartScreenRecording(ScreenRecordOutput.FFmpeg, ScreenRecordStartMethod.Region, safeTaskSettings);
@ -808,6 +811,14 @@ namespace ShareX
}
}
public static void StopAutoCapture() {
if (AutoCaptureForm.IsRunning)
{
AutoCaptureForm form = AutoCaptureForm.Instance;
form.Execute();
}
}
public static void OpenScreenshotsFolder()
{
string screenshotsFolder = GetScreenshotsFolder();
@ -1921,6 +1932,7 @@ namespace ShareX
case HotkeyType.ScrollingCapture: return Resources.ui_scroll_pane_image;
case HotkeyType.AutoCapture: return Resources.clock;
case HotkeyType.StartAutoCapture: return Resources.clock__arrow;
case HotkeyType.StopAutoCapture: return Resources.clock;
// Screen record
case HotkeyType.ScreenRecorder: return Resources.camcorder_image;
case HotkeyType.ScreenRecorderActiveWindow: return Resources.camcorder__arrow;