Update region capture tips

This commit is contained in:
Jaex 2016-10-31 14:30:05 +03:00
parent 9880f87fc8
commit e2a6e5fba3
14 changed files with 21 additions and 88 deletions

View file

@ -1852,15 +1852,6 @@ internal class Resources {
}
}
/// <summary>
/// Looks up a localized string similar to Open options menu.
/// </summary>
internal static string RegionCaptureAction_OpenOptionsMenu {
get {
return ResourceManager.GetString("RegionCaptureAction_OpenOptionsMenu", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Remove shape.
/// </summary>

View file

@ -889,9 +889,6 @@ Gostaria de baixá-la?</value>
<data name="ShapeType_RegionRoundedRectangle" xml:space="preserve">
<value>Região: Retângulo arredondado</value>
</data>
<data name="RegionCaptureAction_OpenOptionsMenu" xml:space="preserve">
<value>Abrir menu de opções</value>
</data>
<data name="RegionCaptureAction_RemoveShape" xml:space="preserve">
<value>Remover forma</value>
</data>

View file

@ -896,9 +896,6 @@ Would you like to download it?</value>
<data name="RegionCaptureAction_None" xml:space="preserve">
<value>Do nothing</value>
</data>
<data name="RegionCaptureAction_OpenOptionsMenu" xml:space="preserve">
<value>Open options menu</value>
</data>
<data name="RegionCaptureAction_RemoveShape" xml:space="preserve">
<value>Remove shape</value>
</data>

View file

@ -862,9 +862,6 @@
<data name="HotkeyType_OpenMainWindow_Category" xml:space="preserve">
<value>Другие</value>
</data>
<data name="RegionCaptureAction_OpenOptionsMenu" xml:space="preserve">
<value>Открыть меню опций</value>
</data>
<data name="RegionCaptureAction_CancelCapture" xml:space="preserve">
<value>Отменить захват</value>
</data>

View file

@ -859,9 +859,6 @@
<data name="RegionCaptureAction_None" xml:space="preserve">
<value>什么都不做</value>
</data>
<data name="RegionCaptureAction_OpenOptionsMenu" xml:space="preserve">
<value>打开选项菜单</value>
</data>
<data name="RegionCaptureAction_RemoveShape" xml:space="preserve">
<value>删除形状</value>
</data>

View file

@ -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);
}

View file

@ -666,7 +666,7 @@ internal class Resources {
}
/// <summary>
/// Looks up a localized string similar to [~] Active monitor capture.
/// Looks up a localized string similar to [~] [Mouse X2 click] Active monitor capture.
/// </summary>
internal static string RectangleRegion_WriteTips_____Active_monitor_capture {
get {
@ -729,7 +729,7 @@ internal class Resources {
}
/// <summary>
/// Looks up a localized string similar to [Middle click] [Esc] Cancel capture.
/// Looks up a localized string similar to [Esc] Cancel capture.
/// </summary>
internal static string RectangleRegion_WriteTips__Esc__Cancel_capture {
get {
@ -738,7 +738,7 @@ internal class Resources {
}
/// <summary>
/// Looks up a localized string similar to [F1] Hide tips.
/// Looks up a localized string similar to [F1] Hide hotkeys.
/// </summary>
internal static string RectangleRegion_WriteTips__F1__Hide_tips {
get {
@ -810,7 +810,7 @@ internal class Resources {
}
/// <summary>
/// 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.
/// </summary>
internal static string RectangleRegion_WriteTips__Space__Fullscreen_capture {
get {
@ -875,16 +875,7 @@ internal class Resources {
}
/// <summary>
/// Looks up a localized string similar to [Right click] [Menu] Open options menu.
/// </summary>
internal static string RectangleRegionForm_WriteTips__Right_click___Menu__Open_options_menu {
get {
return ResourceManager.GetString("RectangleRegionForm_WriteTips__Right_click___Menu__Open_options_menu", resourceCulture);
}
}
/// <summary>
/// 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.
/// </summary>
internal static string RectangleRegionForm_WriteTips__Tab___Mouse_4_click__Select_last_annotation_tool {
get {
@ -893,7 +884,7 @@ internal class Resources {
}
/// <summary>
/// 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.
/// </summary>
internal static string RectangleRegionForm_WriteTips__Tab___Mouse_4_click__Select_last_region_tool {
get {
@ -982,15 +973,6 @@ internal class Resources {
}
}
/// <summary>
/// Looks up a localized string similar to Close menu.
/// </summary>
internal static string ShapeManager_CreateContextMenu_Close_menu {
get {
return ResourceManager.GetString("ShapeManager_CreateContextMenu_Close_menu", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Corner radius:.
/// </summary>
@ -1127,7 +1109,7 @@ internal class Resources {
}
/// <summary>
/// Looks up a localized string similar to Show tips.
/// Looks up a localized string similar to Show hotkeys.
/// </summary>
internal static string ShapeManager_CreateContextMenu_Show_tips {
get {

View file

@ -327,9 +327,6 @@ Distância: {6:0.00} px / Ângulo: {7:0.00}°</value>
<data name="ShapeManager_CreateContextMenu_Delete_all_objects" xml:space="preserve">
<value>Deletar todos os objetos</value>
</data>
<data name="ShapeManager_CreateContextMenu_Close_menu" xml:space="preserve">
<value>Fechar menu</value>
</data>
<data name="RectangleRegionForm_WriteTips__Mouse_wheel__Change_current_tool" xml:space="preserve">
<value>[Scroll] Alterar tamanho da lupa</value>
</data>
@ -342,7 +339,4 @@ Distância: {6:0.00} px / Ângulo: {7:0.00}°</value>
<data name="RectangleRegionForm_WriteTips__Hold_Shift___Arrow_keys__Move_cursor_position_faster" xml:space="preserve">
<value>[Segurar Shift + Setas] Mover cursor mais rápido</value>
</data>
<data name="RectangleRegionForm_WriteTips__Right_click___Menu__Open_options_menu" xml:space="preserve">
<value>[Botão Direito] [Menu] Abrir opções</value>
</data>
</root>

View file

@ -152,7 +152,7 @@ X: {4} Y: {5}</value>
<value>[Hold Shift] Proportional resizing</value>
</data>
<data name="RectangleRegion_WriteTips__Space__Fullscreen_capture" xml:space="preserve">
<value>[Space] [Mouse 5 click] Fullscreen capture</value>
<value>[Space] [Mouse X1 click] Fullscreen capture</value>
</data>
<data name="RectangleAnnotate_WriteTips__Ctrl___Mouse_wheel__Change_pen_size" xml:space="preserve">
<value>[Ctrl + Mouse wheel] Change pen size</value>
@ -161,7 +161,7 @@ X: {4} Y: {5}</value>
<value>Capture</value>
</data>
<data name="RectangleRegion_WriteTips_____Active_monitor_capture" xml:space="preserve">
<value>[~] Active monitor capture</value>
<value>[~] [Mouse X2 click] Active monitor capture</value>
</data>
<data name="RectangleRegion_WriteTips__Ctrl___C__Copy_position_and_size" xml:space="preserve">
<value>[Ctrl + C] Copy position and size</value>
@ -176,7 +176,7 @@ X: {4} Y: {5}</value>
<value>..\Resources\edit-vertical-alignment-top.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="RectangleRegion_WriteTips__F1__Hide_tips" xml:space="preserve">
<value>[F1] Hide tips</value>
<value>[F1] Hide hotkeys</value>
</data>
<data name="edit_alignment" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\edit-alignment.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@ -313,7 +313,7 @@ Distance: {6:0.00} px / Angle: {7:0.00}°</value>
<value>Region capture</value>
</data>
<data name="RectangleRegion_WriteTips__Esc__Cancel_capture" xml:space="preserve">
<value>[Middle click] [Esc] Cancel capture</value>
<value>[Esc] Cancel capture</value>
</data>
<data name="FFmpegHelper_Record_FFmpeg_error" xml:space="preserve">
<value>FFmpeg error</value>
@ -333,9 +333,6 @@ Distance: {6:0.00} px / Angle: {7:0.00}°</value>
<data name="counter_reset" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\counter-reset.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="RectangleRegionForm_WriteTips__Right_click___Menu__Open_options_menu" xml:space="preserve">
<value>[Right click] [Menu] Open options menu</value>
</data>
<data name="RectangleRegionForm_WriteTips__Hold_Ctrl___Arrow_keys__Move_region" xml:space="preserve">
<value>[Hold Ctrl + Arrow keys] Move region</value>
</data>
@ -352,17 +349,14 @@ Distance: {6:0.00} px / Angle: {7:0.00}°</value>
<value>[Ctrl + Mouse wheel] Change current tool</value>
</data>
<data name="RectangleRegionForm_WriteTips__Tab___Mouse_4_click__Select_last_annotation_tool" xml:space="preserve">
<value>[Tab] [Mouse 4 click] Select last annotation tool</value>
<value>[Tab] [Mouse middle click] Select last annotation tool</value>
</data>
<data name="RectangleRegionForm_WriteTips__Tab___Mouse_4_click__Select_last_region_tool" xml:space="preserve">
<value>[Tab] [Mouse 4 click] Select last region tool</value>
<value>[Tab] [Mouse middle click] Select last region tool</value>
</data>
<data name="RectangleRegionForm_WriteTips__Mouse_wheel__Change_current_tool" xml:space="preserve">
<value>[Mouse wheel] Change magnifier size</value>
</data>
<data name="ShapeManager_CreateContextMenu_Close_menu" xml:space="preserve">
<value>Close menu</value>
</data>
<data name="ShapeManager_CreateContextMenu_Delete_all_objects" xml:space="preserve">
<value>Delete all objects</value>
</data>
@ -403,7 +397,7 @@ Distance: {6:0.00} px / Angle: {7:0.00}°</value>
<value>Multi region mode</value>
</data>
<data name="ShapeManager_CreateContextMenu_Show_tips" xml:space="preserve">
<value>Show tips</value>
<value>Show hotkeys</value>
</data>
<data name="ShapeManager_CreateContextMenu_Show_position_and_size_info" xml:space="preserve">
<value>Show position and size info</value>

View file

@ -251,9 +251,6 @@
<data name="ShapeManager_CreateContextMenu_Height_" xml:space="preserve">
<value>Высота:</value>
</data>
<data name="ShapeManager_CreateContextMenu_Close_menu" xml:space="preserve">
<value>Закрыть меню</value>
</data>
<data name="ShapeManager_CreateContextMenu_Border_color___" xml:space="preserve">
<value>Цвет рамки...</value>
</data>
@ -272,9 +269,6 @@
<data name="ShapeManager_CreateContextMenu_Options" xml:space="preserve">
<value>Опции</value>
</data>
<data name="RectangleRegionForm_WriteTips__Right_click___Menu__Open_options_menu" xml:space="preserve">
<value>[ПКМ] [Меню] Открыть меню опций</value>
</data>
<data name="ShapeManager_CreateContextMenu_Square_shape_magnifier" xml:space="preserve">
<value>Квадратная лупа</value>
</data>

View file

@ -162,7 +162,7 @@ Mesafe: {6:0.00} px / Açı: {7:0.00}°</value>
<value>[Çift sol tık] [Enter] Seçili alanları yakala</value>
</data>
<data name="RectangleRegion_WriteTips__Esc__Cancel_capture" xml:space="preserve">
<value>[Orta tık] [Esc] Yakalamayı iptal et</value>
<value>[Esc] Yakalamayı iptal et</value>
</data>
<data name="FFmpegOptionsForm_DownloaderForm_InstallRequested_Download_of_FFmpeg_failed_" xml:space="preserve">
<value>FFmpeg indirme hatası.</value>
@ -171,7 +171,7 @@ Mesafe: {6:0.00} px / Açı: {7:0.00}°</value>
<value>[Yön tuşları] İmleci hareket ettir</value>
</data>
<data name="RectangleRegion_WriteTips_____Active_monitor_capture" xml:space="preserve">
<value>[~] Aktif monitörü yakala</value>
<value>[~] [Fare X2 tık] Aktif monitörü yakala</value>
</data>
<data name="RectangleRegion_WriteTips__Hold_Shift__Proportional_resizing" xml:space="preserve">
<value>[Shift basılı tut] Orantısal boyutlandırma</value>
@ -228,7 +228,7 @@ Mesafe: {6:0.00} px / Açı: {7:0.00}°</value>
<value>[Delete] Alanı sil</value>
</data>
<data name="RectangleRegion_WriteTips__Space__Fullscreen_capture" xml:space="preserve">
<value>[Space] [Fare 5 tık] Tam ekran yakala</value>
<value>[Space] [Fare X1 tık] Tam ekran yakala</value>
</data>
<data name="RectangleRegion_WriteTips__Hold_Alt__Snap_resizing_to_preset_sizes" xml:space="preserve">
<value>[Alt basılı tut] Seçimi önceden ayarlı boyutlara hizala</value>

View file

@ -236,9 +236,6 @@
<data name="RectangleAnnotate_WriteTips__Ctrl___Mouse_wheel__Change_pen_size" xml:space="preserve">
<value>[Ctrl +鼠标滚轮] 更改画笔大小</value>
</data>
<data name="RectangleRegionForm_WriteTips__Right_click___Menu__Open_options_menu" xml:space="preserve">
<value>[点击右键] [菜单] 打开选项菜单</value>
</data>
<data name="RectangleRegionForm_WriteTips__Hold_Ctrl___Arrow_keys__Move_region" xml:space="preserve">
<value>[按住Ctrl + 方向键] 移动区域</value>
</data>
@ -320,9 +317,6 @@
<data name="ShapeManager_CreateContextMenu_Delete_all_objects" xml:space="preserve">
<value>删除所有对象</value>
</data>
<data name="ShapeManager_CreateContextMenu_Close_menu" xml:space="preserve">
<value>关闭菜单</value>
</data>
<data name="RectangleRegionForm_WriteTips__Mouse_wheel__Change_current_tool" xml:space="preserve">
<value>[鼠标滚轮] 更改当前工具</value>
</data>

View file

@ -226,7 +226,7 @@ private void form_Shown(object sender, EventArgs e)
{
if (form.IsAnnotationMode)
{
CreateMenu();
CreateToolbar();
}
}

View file

@ -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()
{