diff --git a/ShareX.HelpersLib/Properties/Resources.Designer.cs b/ShareX.HelpersLib/Properties/Resources.Designer.cs
index db1b09c03..2dda79fa1 100644
--- a/ShareX.HelpersLib/Properties/Resources.Designer.cs
+++ b/ShareX.HelpersLib/Properties/Resources.Designer.cs
@@ -1852,15 +1852,6 @@ internal static string RegionCaptureAction_None {
}
}
- ///
- /// Looks up a localized string similar to Open options menu.
- ///
- internal static string RegionCaptureAction_OpenOptionsMenu {
- get {
- return ResourceManager.GetString("RegionCaptureAction_OpenOptionsMenu", resourceCulture);
- }
- }
-
///
/// Looks up a localized string similar to Remove shape.
///
diff --git a/ShareX.HelpersLib/Properties/Resources.pt-BR.resx b/ShareX.HelpersLib/Properties/Resources.pt-BR.resx
index 7f812717b..4b2ef44b3 100644
--- a/ShareX.HelpersLib/Properties/Resources.pt-BR.resx
+++ b/ShareX.HelpersLib/Properties/Resources.pt-BR.resx
@@ -889,9 +889,6 @@ Gostaria de baixá-la?
Região: Retângulo arredondado
-
- Abrir menu de opções
-
Remover forma
diff --git a/ShareX.HelpersLib/Properties/Resources.resx b/ShareX.HelpersLib/Properties/Resources.resx
index 40a1cb1fc..6be2b906d 100644
--- a/ShareX.HelpersLib/Properties/Resources.resx
+++ b/ShareX.HelpersLib/Properties/Resources.resx
@@ -896,9 +896,6 @@ Would you like to download it?
Do nothing
-
- Open options menu
-
Remove shape
diff --git a/ShareX.HelpersLib/Properties/Resources.ru.resx b/ShareX.HelpersLib/Properties/Resources.ru.resx
index 81ca78328..c75c45756 100644
--- a/ShareX.HelpersLib/Properties/Resources.ru.resx
+++ b/ShareX.HelpersLib/Properties/Resources.ru.resx
@@ -862,9 +862,6 @@
Другие
-
- Открыть меню опций
-
Отменить захват
diff --git a/ShareX.HelpersLib/Properties/Resources.zh-CN.resx b/ShareX.HelpersLib/Properties/Resources.zh-CN.resx
index 94cd9f4cd..496537ba4 100644
--- a/ShareX.HelpersLib/Properties/Resources.zh-CN.resx
+++ b/ShareX.HelpersLib/Properties/Resources.zh-CN.resx
@@ -859,9 +859,6 @@
什么都不做
-
- 打开选项菜单
-
删除形状
diff --git a/ShareX.ScreenCaptureLib/Forms/RegionCaptureForm.cs b/ShareX.ScreenCaptureLib/Forms/RegionCaptureForm.cs
index c54d14b54..e7e28b735 100644
--- a/ShareX.ScreenCaptureLib/Forms/RegionCaptureForm.cs
+++ b/ShareX.ScreenCaptureLib/Forms/RegionCaptureForm.cs
@@ -674,16 +674,12 @@ private void WriteTips(StringBuilder sb)
else
{
sb.AppendLine(Resources.RectangleRegion_WriteTips__Hold_Left_click__Start_region_selection);
-
- if (IsAnnotationMode)
- {
- sb.AppendLine(Resources.RectangleRegionForm_WriteTips__Right_click___Menu__Open_options_menu);
- }
+ sb.AppendLine("[Right click] Cancel capture / remove region");
}
sb.AppendLine(Resources.RectangleRegion_WriteTips__Esc__Cancel_capture);
- if (!Config.QuickCrop && ShapeManager.Regions.Length > 0)
+ if (!ShapeManager.IsCreating && !Config.QuickCrop && ShapeManager.Regions.Length > 0)
{
sb.AppendLine(Resources.RectangleRegion_WriteTips__Double_Left_click___Enter__Capture_regions);
}
diff --git a/ShareX.ScreenCaptureLib/Properties/Resources.Designer.cs b/ShareX.ScreenCaptureLib/Properties/Resources.Designer.cs
index 7965237dd..1faadc552 100644
--- a/ShareX.ScreenCaptureLib/Properties/Resources.Designer.cs
+++ b/ShareX.ScreenCaptureLib/Properties/Resources.Designer.cs
@@ -666,7 +666,7 @@ internal static string RectangleRegion_GetRulerText_Ruler_info {
}
///
- /// Looks up a localized string similar to [~] Active monitor capture.
+ /// Looks up a localized string similar to [~] [Mouse X2 click] Active monitor capture.
///
internal static string RectangleRegion_WriteTips_____Active_monitor_capture {
get {
@@ -729,7 +729,7 @@ internal static string RectangleRegion_WriteTips__Double_Left_click___Enter__Cap
}
///
- /// Looks up a localized string similar to [Middle click] [Esc] Cancel capture.
+ /// Looks up a localized string similar to [Esc] Cancel capture.
///
internal static string RectangleRegion_WriteTips__Esc__Cancel_capture {
get {
@@ -738,7 +738,7 @@ internal static string RectangleRegion_WriteTips__Esc__Cancel_capture {
}
///
- /// Looks up a localized string similar to [F1] Hide tips.
+ /// Looks up a localized string similar to [F1] Hide hotkeys.
///
internal static string RectangleRegion_WriteTips__F1__Hide_tips {
get {
@@ -810,7 +810,7 @@ internal static string RectangleRegion_WriteTips__Right_click_on_selection___Del
}
///
- /// Looks up a localized string similar to [Space] [Mouse 5 click] Fullscreen capture.
+ /// Looks up a localized string similar to [Space] [Mouse X1 click] Fullscreen capture.
///
internal static string RectangleRegion_WriteTips__Space__Fullscreen_capture {
get {
@@ -875,16 +875,7 @@ internal static string RectangleRegionForm_WriteTips__Mouse_wheel__Change_curren
}
///
- /// Looks up a localized string similar to [Right click] [Menu] Open options menu.
- ///
- internal static string RectangleRegionForm_WriteTips__Right_click___Menu__Open_options_menu {
- get {
- return ResourceManager.GetString("RectangleRegionForm_WriteTips__Right_click___Menu__Open_options_menu", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to [Tab] [Mouse 4 click] Select last annotation tool.
+ /// Looks up a localized string similar to [Tab] [Mouse middle click] Select last annotation tool.
///
internal static string RectangleRegionForm_WriteTips__Tab___Mouse_4_click__Select_last_annotation_tool {
get {
@@ -893,7 +884,7 @@ internal static string RectangleRegionForm_WriteTips__Tab___Mouse_4_click__Selec
}
///
- /// Looks up a localized string similar to [Tab] [Mouse 4 click] Select last region tool.
+ /// Looks up a localized string similar to [Tab] [Mouse middle click] Select last region tool.
///
internal static string RectangleRegionForm_WriteTips__Tab___Mouse_4_click__Select_last_region_tool {
get {
@@ -982,15 +973,6 @@ internal static string ShapeManager_CreateContextMenu_Capture_monitor {
}
}
- ///
- /// Looks up a localized string similar to Close menu.
- ///
- internal static string ShapeManager_CreateContextMenu_Close_menu {
- get {
- return ResourceManager.GetString("ShapeManager_CreateContextMenu_Close_menu", resourceCulture);
- }
- }
-
///
/// Looks up a localized string similar to Corner radius:.
///
@@ -1127,7 +1109,7 @@ internal static string ShapeManager_CreateContextMenu_Show_screen_wide_crosshair
}
///
- /// Looks up a localized string similar to Show tips.
+ /// Looks up a localized string similar to Show hotkeys.
///
internal static string ShapeManager_CreateContextMenu_Show_tips {
get {
diff --git a/ShareX.ScreenCaptureLib/Properties/Resources.pt-BR.resx b/ShareX.ScreenCaptureLib/Properties/Resources.pt-BR.resx
index eca9bd457..2700bede2 100644
--- a/ShareX.ScreenCaptureLib/Properties/Resources.pt-BR.resx
+++ b/ShareX.ScreenCaptureLib/Properties/Resources.pt-BR.resx
@@ -327,9 +327,6 @@ Distância: {6:0.00} px / Ângulo: {7:0.00}°
Deletar todos os objetos
-
- Fechar menu
-
[Scroll] Alterar tamanho da lupa
@@ -342,7 +339,4 @@ Distância: {6:0.00} px / Ângulo: {7:0.00}°
[Segurar Shift + Setas] Mover cursor mais rápido
-
- [Botão Direito] [Menu] Abrir opções
-
\ No newline at end of file
diff --git a/ShareX.ScreenCaptureLib/Properties/Resources.resx b/ShareX.ScreenCaptureLib/Properties/Resources.resx
index 185e810c4..c51478395 100644
--- a/ShareX.ScreenCaptureLib/Properties/Resources.resx
+++ b/ShareX.ScreenCaptureLib/Properties/Resources.resx
@@ -152,7 +152,7 @@ X: {4} Y: {5}
[Hold Shift] Proportional resizing
- [Space] [Mouse 5 click] Fullscreen capture
+ [Space] [Mouse X1 click] Fullscreen capture
[Ctrl + Mouse wheel] Change pen size
@@ -161,7 +161,7 @@ X: {4} Y: {5}
Capture
- [~] Active monitor capture
+ [~] [Mouse X2 click] Active monitor capture
[Ctrl + C] Copy position and size
@@ -176,7 +176,7 @@ X: {4} Y: {5}
..\Resources\edit-vertical-alignment-top.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
- [F1] Hide tips
+ [F1] Hide hotkeys
..\Resources\edit-alignment.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -313,7 +313,7 @@ Distance: {6:0.00} px / Angle: {7:0.00}°
Region capture
- [Middle click] [Esc] Cancel capture
+ [Esc] Cancel capture
FFmpeg error
@@ -333,9 +333,6 @@ Distance: {6:0.00} px / Angle: {7:0.00}°
..\Resources\counter-reset.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- [Right click] [Menu] Open options menu
-
[Hold Ctrl + Arrow keys] Move region
@@ -352,17 +349,14 @@ Distance: {6:0.00} px / Angle: {7:0.00}°
[Ctrl + Mouse wheel] Change current tool
- [Tab] [Mouse 4 click] Select last annotation tool
+ [Tab] [Mouse middle click] Select last annotation tool
- [Tab] [Mouse 4 click] Select last region tool
+ [Tab] [Mouse middle click] Select last region tool
[Mouse wheel] Change magnifier size
-
- Close menu
-
Delete all objects
@@ -403,7 +397,7 @@ Distance: {6:0.00} px / Angle: {7:0.00}°
Multi region mode
- Show tips
+ Show hotkeys
Show position and size info
diff --git a/ShareX.ScreenCaptureLib/Properties/Resources.ru.resx b/ShareX.ScreenCaptureLib/Properties/Resources.ru.resx
index e6a7dc5a9..a0e19a303 100644
--- a/ShareX.ScreenCaptureLib/Properties/Resources.ru.resx
+++ b/ShareX.ScreenCaptureLib/Properties/Resources.ru.resx
@@ -251,9 +251,6 @@
Высота:
-
- Закрыть меню
-
Цвет рамки...
@@ -272,9 +269,6 @@
Опции
-
- [ПКМ] [Меню] Открыть меню опций
-
Квадратная лупа
diff --git a/ShareX.ScreenCaptureLib/Properties/Resources.tr.resx b/ShareX.ScreenCaptureLib/Properties/Resources.tr.resx
index e5127fbd8..64de1eb11 100644
--- a/ShareX.ScreenCaptureLib/Properties/Resources.tr.resx
+++ b/ShareX.ScreenCaptureLib/Properties/Resources.tr.resx
@@ -162,7 +162,7 @@ Mesafe: {6:0.00} px / Açı: {7:0.00}°
[Çift sol tık] [Enter] Seçili alanları yakala
- [Orta tık] [Esc] Yakalamayı iptal et
+ [Esc] Yakalamayı iptal et
FFmpeg indirme hatası.
@@ -171,7 +171,7 @@ Mesafe: {6:0.00} px / Açı: {7:0.00}°
[Yön tuşları] İmleci hareket ettir
- [~] Aktif monitörü yakala
+ [~] [Fare X2 tık] Aktif monitörü yakala
[Shift basılı tut] Orantısal boyutlandırma
@@ -228,7 +228,7 @@ Mesafe: {6:0.00} px / Açı: {7:0.00}°
[Delete] Alanı sil
- [Space] [Fare 5 tık] Tam ekran yakala
+ [Space] [Fare X1 tık] Tam ekran yakala
[Alt basılı tut] Seçimi önceden ayarlı boyutlara hizala
diff --git a/ShareX.ScreenCaptureLib/Properties/Resources.zh-CN.resx b/ShareX.ScreenCaptureLib/Properties/Resources.zh-CN.resx
index d5d8be04f..87a4fec53 100644
--- a/ShareX.ScreenCaptureLib/Properties/Resources.zh-CN.resx
+++ b/ShareX.ScreenCaptureLib/Properties/Resources.zh-CN.resx
@@ -236,9 +236,6 @@
[Ctrl +鼠标滚轮] 更改画笔大小
-
- [点击右键] [菜单] 打开选项菜单
-
[按住Ctrl + 方向键] 移动区域
@@ -320,9 +317,6 @@
删除所有对象
-
- 关闭菜单
-
[鼠标滚轮] 更改当前工具
diff --git a/ShareX.ScreenCaptureLib/Shapes/ShapeManager.cs b/ShareX.ScreenCaptureLib/Shapes/ShapeManager.cs
index c23bb3833..23d7cfb35 100644
--- a/ShareX.ScreenCaptureLib/Shapes/ShapeManager.cs
+++ b/ShareX.ScreenCaptureLib/Shapes/ShapeManager.cs
@@ -226,7 +226,7 @@ private void form_Shown(object sender, EventArgs e)
{
if (form.IsAnnotationMode)
{
- CreateMenu();
+ CreateToolbar();
}
}
diff --git a/ShareX.ScreenCaptureLib/Shapes/ShapeManagerMenu.cs b/ShareX.ScreenCaptureLib/Shapes/ShapeManagerMenu.cs
index 6e4a0dbfb..efc5102e2 100644
--- a/ShareX.ScreenCaptureLib/Shapes/ShapeManagerMenu.cs
+++ b/ShareX.ScreenCaptureLib/Shapes/ShapeManagerMenu.cs
@@ -46,7 +46,7 @@ internal partial class ShapeManager
private ToolStripLabeledNumericUpDown tslnudBorderSize, tslnudCornerRadius, tslnudBlurRadius, tslnudPixelateSize;
private ToolStripLabel tslDragLeft;
- private void CreateMenu()
+ private void CreateToolbar()
{
menuForm = new Form()
{