mirror of
https://github.com/ShareX/ShareX.git
synced 2024-09-28 15:31:30 +12:00
Added edit drop down menu to region capture toolbar
This commit is contained in:
parent
c4d7098751
commit
65c2c4106d
15 changed files with 145 additions and 42 deletions
|
@ -374,6 +374,16 @@ internal static System.Drawing.Bitmap layer {
|
|||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
||||
/// </summary>
|
||||
internal static System.Drawing.Bitmap layer__minus {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("layer__minus", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
||||
/// </summary>
|
||||
|
@ -524,6 +534,46 @@ internal static System.Drawing.Bitmap layers {
|
|||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
||||
/// </summary>
|
||||
internal static System.Drawing.Bitmap layers_arrange {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("layers_arrange", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
||||
/// </summary>
|
||||
internal static System.Drawing.Bitmap layers_arrange_back {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("layers_arrange_back", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
||||
/// </summary>
|
||||
internal static System.Drawing.Bitmap layers_stack_arrange {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("layers_stack_arrange", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
||||
/// </summary>
|
||||
internal static System.Drawing.Bitmap layers_stack_arrange_back {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("layers_stack_arrange_back", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
||||
/// </summary>
|
||||
|
@ -992,15 +1042,6 @@ internal static string ShapeManager_CreateContextMenu_Corner_radius_ {
|
|||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Delete all objects.
|
||||
/// </summary>
|
||||
internal static string ShapeManager_CreateContextMenu_Delete_all_objects {
|
||||
get {
|
||||
return ResourceManager.GetString("ShapeManager_CreateContextMenu_Delete_all_objects", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Fill color....
|
||||
/// </summary>
|
||||
|
@ -1192,5 +1233,15 @@ internal static string WebpageCaptureForm_UpdateControls_Stop {
|
|||
return ResourceManager.GetString("WebpageCaptureForm_UpdateControls_Stop", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
||||
/// </summary>
|
||||
internal static System.Drawing.Bitmap wrench_screwdriver {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("wrench_screwdriver", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -266,9 +266,6 @@ Distance : {6:0.00} px / Angle : {7:0.00}°</value>
|
|||
<data name="ShapeManager_CreateContextMenu_Show_tips" xml:space="preserve">
|
||||
<value>Afficher les raccourcis clavier</value>
|
||||
</data>
|
||||
<data name="ShapeManager_CreateContextMenu_Delete_all_objects" xml:space="preserve">
|
||||
<value>Supprimer tous les objets</value>
|
||||
</data>
|
||||
<data name="ShapeManager_CreateContextMenu_Options" xml:space="preserve">
|
||||
<value>Options</value>
|
||||
</data>
|
||||
|
|
|
@ -324,9 +324,6 @@ Distância: {6:0.00} px / Ângulo: {7:0.00}°</value>
|
|||
<data name="ShapeManager_CreateContextMenu_Border_color___" xml:space="preserve">
|
||||
<value>Cor da borda...</value>
|
||||
</data>
|
||||
<data name="ShapeManager_CreateContextMenu_Delete_all_objects" xml:space="preserve">
|
||||
<value>Deletar todos os objetos</value>
|
||||
</data>
|
||||
<data name="RectangleRegionForm_WriteTips__Mouse_wheel__Change_current_tool" xml:space="preserve">
|
||||
<value>[Scroll] Alterar tamanho da lupa</value>
|
||||
</data>
|
||||
|
|
|
@ -357,9 +357,6 @@ Distance: {6:0.00} px / Angle: {7:0.00}°</value>
|
|||
<data name="RectangleRegionForm_WriteTips__Mouse_wheel__Change_current_tool" xml:space="preserve">
|
||||
<value>[Mouse wheel] Change magnifier size</value>
|
||||
</data>
|
||||
<data name="ShapeManager_CreateContextMenu_Delete_all_objects" xml:space="preserve">
|
||||
<value>Delete all objects</value>
|
||||
</data>
|
||||
<data name="ShapeManager_CreateContextMenu_Border_color___" xml:space="preserve">
|
||||
<value>Border color...</value>
|
||||
</data>
|
||||
|
@ -483,4 +480,22 @@ Distance: {6:0.00} px / Angle: {7:0.00}°</value>
|
|||
<data name="layer" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\layer.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="layers_arrange" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\layers-arrange.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="layers_arrange_back" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\layers-arrange-back.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="layers_stack_arrange" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\layers-stack-arrange.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="layers_stack_arrange_back" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\layers-stack-arrange-back.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="layer__minus" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\layer--minus.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="wrench_screwdriver" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\wrench-screwdriver.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
</root>
|
|
@ -332,9 +332,6 @@
|
|||
<data name="ShapeManager_CreateContextMenu_Pixel_size_" xml:space="preserve">
|
||||
<value>Размер пикселя:</value>
|
||||
</data>
|
||||
<data name="ShapeManager_CreateContextMenu_Delete_all_objects" xml:space="preserve">
|
||||
<value>Удалить все объекты</value>
|
||||
</data>
|
||||
<data name="ShapeManager_CreateContextMenu_Corner_radius_" xml:space="preserve">
|
||||
<value>Радиус скругления</value>
|
||||
</data>
|
||||
|
|
|
@ -314,9 +314,6 @@
|
|||
<data name="ShapeManager_CreateContextMenu_Border_color___" xml:space="preserve">
|
||||
<value>边框颜色...</value>
|
||||
</data>
|
||||
<data name="ShapeManager_CreateContextMenu_Delete_all_objects" xml:space="preserve">
|
||||
<value>删除所有对象</value>
|
||||
</data>
|
||||
<data name="RectangleRegionForm_WriteTips__Mouse_wheel__Change_current_tool" xml:space="preserve">
|
||||
<value>[鼠标滚轮] 更改当前工具</value>
|
||||
</data>
|
||||
|
|
BIN
ShareX.ScreenCaptureLib/Resources/layer--minus.png
Normal file
BIN
ShareX.ScreenCaptureLib/Resources/layer--minus.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 518 B |
BIN
ShareX.ScreenCaptureLib/Resources/layers-arrange-back.png
Normal file
BIN
ShareX.ScreenCaptureLib/Resources/layers-arrange-back.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 625 B |
BIN
ShareX.ScreenCaptureLib/Resources/layers-arrange.png
Normal file
BIN
ShareX.ScreenCaptureLib/Resources/layers-arrange.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 620 B |
BIN
ShareX.ScreenCaptureLib/Resources/layers-stack-arrange-back.png
Normal file
BIN
ShareX.ScreenCaptureLib/Resources/layers-stack-arrange-back.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 741 B |
BIN
ShareX.ScreenCaptureLib/Resources/layers-stack-arrange.png
Normal file
BIN
ShareX.ScreenCaptureLib/Resources/layers-stack-arrange.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 730 B |
BIN
ShareX.ScreenCaptureLib/Resources/wrench-screwdriver.png
Normal file
BIN
ShareX.ScreenCaptureLib/Resources/wrench-screwdriver.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 907 B |
|
@ -373,9 +373,6 @@ private void form_KeyDown(object sender, KeyEventArgs e)
|
|||
StartRegionSelection();
|
||||
}
|
||||
break;
|
||||
case Keys.Control | Keys.Z:
|
||||
UndoShape();
|
||||
break;
|
||||
}
|
||||
|
||||
if (!IsCreating)
|
||||
|
@ -427,6 +424,9 @@ private void form_KeyDown(object sender, KeyEventArgs e)
|
|||
case Keys.Control | Keys.V:
|
||||
PasteFromClipboard();
|
||||
break;
|
||||
case Keys.Control | Keys.Z:
|
||||
UndoShape();
|
||||
break;
|
||||
case Keys.Home:
|
||||
MoveCurrentShapeTop();
|
||||
break;
|
||||
|
|
|
@ -40,9 +40,9 @@ internal partial class ShapeManager
|
|||
|
||||
private Form menuForm;
|
||||
private ToolStripEx tsMain;
|
||||
private ToolStripButton tsbBorderColor, tsbFillColor, tsbHighlightColor, tsbUndoObject, tsbDeleteAll;
|
||||
private ToolStripButton tsbBorderColor, tsbFillColor, tsbHighlightColor;
|
||||
private ToolStripDropDownButton tsddbShapeOptions;
|
||||
private ToolStripMenuItem tsmiShadow, tsmiQuickCrop, tsmiRegionCapture;
|
||||
private ToolStripMenuItem tsmiShadow, tsmiUndoObject, tsmiDeleteAll, tsmiQuickCrop, tsmiRegionCapture;
|
||||
private ToolStripLabeledNumericUpDown tslnudBorderSize, tslnudCornerRadius, tslnudBlurRadius, tslnudPixelateSize;
|
||||
private ToolStripLabel tslDragLeft;
|
||||
|
||||
|
@ -243,7 +243,7 @@ private void CreateToolbar()
|
|||
|
||||
#endregion Tools
|
||||
|
||||
#region Selected object
|
||||
#region Shape options
|
||||
|
||||
tsMain.Items.Add(new ToolStripSeparator());
|
||||
|
||||
|
@ -450,19 +450,62 @@ private void CreateToolbar()
|
|||
// In dropdown menu if only last item is visible then menu opens at 0, 0 position on first open, so need to add dummy item to solve this weird bug...
|
||||
tsddbShapeOptions.DropDownItems.Add(new ToolStripSeparator() { Visible = false });
|
||||
|
||||
tsbUndoObject = new ToolStripButton("Undo object");
|
||||
tsbUndoObject.DisplayStyle = ToolStripItemDisplayStyle.Image;
|
||||
tsbUndoObject.Image = Resources.arrow_circle_225_left;
|
||||
tsbUndoObject.MouseDown += (sender, e) => UndoShape();
|
||||
tsMain.Items.Add(tsbUndoObject);
|
||||
#endregion Shape options
|
||||
|
||||
tsbDeleteAll = new ToolStripButton(Resources.ShapeManager_CreateContextMenu_Delete_all_objects);
|
||||
tsbDeleteAll.DisplayStyle = ToolStripItemDisplayStyle.Image;
|
||||
tsbDeleteAll.Image = Resources.eraser;
|
||||
tsbDeleteAll.MouseDown += (sender, e) => DeleteAllShapes();
|
||||
tsMain.Items.Add(tsbDeleteAll);
|
||||
#region Edit
|
||||
|
||||
#endregion Selected object
|
||||
ToolStripDropDownButton tsddbEdit = new ToolStripDropDownButton("Edit");
|
||||
tsddbEdit.DisplayStyle = ToolStripItemDisplayStyle.Image;
|
||||
tsddbEdit.Image = Resources.wrench_screwdriver;
|
||||
tsMain.Items.Add(tsddbEdit);
|
||||
|
||||
tsmiUndoObject = new ToolStripMenuItem("Undo");
|
||||
tsmiUndoObject.Image = Resources.arrow_circle_225_left;
|
||||
tsmiUndoObject.ShortcutKeyDisplayString = "Ctrl+Z";
|
||||
tsmiUndoObject.MouseDown += (sender, e) => UndoShape();
|
||||
tsddbEdit.DropDownItems.Add(tsmiUndoObject);
|
||||
|
||||
tsddbEdit.DropDownItems.Add(new ToolStripSeparator());
|
||||
|
||||
ToolStripMenuItem tsmiDeleteObject = new ToolStripMenuItem("Delete");
|
||||
tsmiDeleteObject.Image = Resources.layer__minus;
|
||||
tsmiDeleteObject.ShortcutKeyDisplayString = "Del";
|
||||
tsmiDeleteObject.MouseDown += (sender, e) => DeleteCurrentShape();
|
||||
tsddbEdit.DropDownItems.Add(tsmiDeleteObject);
|
||||
|
||||
tsmiDeleteAll = new ToolStripMenuItem("Delete all");
|
||||
tsmiDeleteAll.Image = Resources.eraser;
|
||||
tsmiDeleteAll.ShortcutKeyDisplayString = "Ctrl+Shift+Del";
|
||||
tsmiDeleteAll.MouseDown += (sender, e) => DeleteAllShapes();
|
||||
tsddbEdit.DropDownItems.Add(tsmiDeleteAll);
|
||||
|
||||
tsddbEdit.DropDownItems.Add(new ToolStripSeparator());
|
||||
|
||||
ToolStripMenuItem tsmiMoveTop = new ToolStripMenuItem("Bring to front");
|
||||
tsmiMoveTop.Image = Resources.layers_stack_arrange;
|
||||
tsmiMoveTop.ShortcutKeyDisplayString = "Home";
|
||||
tsmiMoveTop.MouseDown += (sender, e) => MoveCurrentShapeTop();
|
||||
tsddbEdit.DropDownItems.Add(tsmiMoveTop);
|
||||
|
||||
ToolStripMenuItem tsmiMoveUp = new ToolStripMenuItem("Bring forward");
|
||||
tsmiMoveUp.Image = Resources.layers_arrange;
|
||||
tsmiMoveUp.ShortcutKeyDisplayString = "Page up";
|
||||
tsmiMoveUp.MouseDown += (sender, e) => MoveCurrentShapeUp();
|
||||
tsddbEdit.DropDownItems.Add(tsmiMoveUp);
|
||||
|
||||
ToolStripMenuItem tsmiMoveDown = new ToolStripMenuItem("Send backward");
|
||||
tsmiMoveDown.Image = Resources.layers_arrange_back;
|
||||
tsmiMoveDown.ShortcutKeyDisplayString = "Page down";
|
||||
tsmiMoveDown.MouseDown += (sender, e) => MoveCurrentShapeDown();
|
||||
tsddbEdit.DropDownItems.Add(tsmiMoveDown);
|
||||
|
||||
ToolStripMenuItem tsmiMoveBottom = new ToolStripMenuItem("Send to back");
|
||||
tsmiMoveBottom.Image = Resources.layers_stack_arrange_back;
|
||||
tsmiMoveBottom.ShortcutKeyDisplayString = "End";
|
||||
tsmiMoveBottom.MouseDown += (sender, e) => MoveCurrentShapeBottom();
|
||||
tsddbEdit.DropDownItems.Add(tsmiMoveBottom);
|
||||
|
||||
#endregion Edit
|
||||
|
||||
#region Capture
|
||||
|
||||
|
@ -927,7 +970,7 @@ private void UpdateMenu()
|
|||
break;
|
||||
}
|
||||
|
||||
tsbUndoObject.Enabled = tsbDeleteAll.Enabled = Shapes.Count > 0;
|
||||
tsmiUndoObject.Enabled = tsmiDeleteAll.Enabled = Shapes.Count > 0;
|
||||
|
||||
switch (shapeType)
|
||||
{
|
||||
|
|
|
@ -163,6 +163,12 @@
|
|||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="Resources\wrench-screwdriver.png" />
|
||||
<None Include="Resources\layers-stack-arrange.png" />
|
||||
<None Include="Resources\layers-stack-arrange-back.png" />
|
||||
<None Include="Resources\layers-arrange-back.png" />
|
||||
<None Include="Resources\layers-arrange.png" />
|
||||
<None Include="Resources\layer--minus.png" />
|
||||
<None Include="Resources\layer.png" />
|
||||
<None Include="Resources\test_32.png" />
|
||||
<None Include="Resources\layers.png" />
|
||||
|
|
Loading…
Reference in a new issue