Change menu item order to match typical HTML ordering (top, right, bottom, left)

This commit is contained in:
Nathan Brown 2023-03-26 11:54:18 -07:00
commit 3850e5b70f

View file

@ -675,6 +675,20 @@ namespace Greenshot.Editor.Drawing
#region Push Out #region Push Out
var pushOutSubmenu = new ToolStripMenuItem(Language.GetString(LangKey.editor_pushout)); var pushOutSubmenu = new ToolStripMenuItem(Language.GetString(LangKey.editor_pushout));
// Top
item = new ToolStripMenuItem(Language.GetString(LangKey.editor_align_top))
{
Image = (Image)EditorFormResources.GetObject("PushOut-Top.Image")
};
item.Click += delegate
{
if (this.Count > 0)
{
PushOut(Direction.TOP, this[0]);
}
};
pushOutSubmenu.DropDownItems.Add(item);
// Right // Right
item = new ToolStripMenuItem(Language.GetString(LangKey.editor_align_right)) item = new ToolStripMenuItem(Language.GetString(LangKey.editor_align_right))
{ {
@ -689,6 +703,20 @@ namespace Greenshot.Editor.Drawing
}; };
pushOutSubmenu.DropDownItems.Add(item); pushOutSubmenu.DropDownItems.Add(item);
// Bottom
item = new ToolStripMenuItem(Language.GetString(LangKey.editor_align_bottom))
{
Image = (Image)EditorFormResources.GetObject("PushOut-Bottom.Image")
};
item.Click += delegate
{
if (this.Count > 0)
{
PushOut(Direction.BOTTOM, this[0]);
}
};
pushOutSubmenu.DropDownItems.Add(item);
// Left // Left
item = new ToolStripMenuItem(Language.GetString(LangKey.editor_align_left)) item = new ToolStripMenuItem(Language.GetString(LangKey.editor_align_left))
{ {
@ -703,34 +731,8 @@ namespace Greenshot.Editor.Drawing
}; };
pushOutSubmenu.DropDownItems.Add(item); pushOutSubmenu.DropDownItems.Add(item);
// Top
item = new ToolStripMenuItem(Language.GetString(LangKey.editor_align_top))
{
Image = (Image)EditorFormResources.GetObject("PushOut-Top.Image")
};
item.Click += delegate
{
if (this.Count > 0)
{
PushOut(Direction.TOP, this[0]);
}
};
pushOutSubmenu.DropDownItems.Add(item);
// Bottom
item = new ToolStripMenuItem(Language.GetString(LangKey.editor_align_bottom))
{
Image = (Image)EditorFormResources.GetObject("PushOut-Bottom.Image")
};
item.Click += delegate
{
if (this.Count > 0)
{
PushOut(Direction.BOTTOM, this[0]);
}
};
pushOutSubmenu.DropDownItems.Add(item);
menu.Items.Add(pushOutSubmenu); menu.Items.Add(pushOutSubmenu);
#endregion Push Out #endregion Push Out
#region Fit #region Fit
@ -775,14 +777,14 @@ namespace Greenshot.Editor.Drawing
#region Snap #region Snap
var snapSubmenu = new ToolStripMenuItem(Language.GetString(LangKey.editor_snap)); var snapSubmenu = new ToolStripMenuItem(Language.GetString(LangKey.editor_snap));
// Snap left // Snap to top
item = new ToolStripMenuItem(Language.GetString(LangKey.editor_align_left)) item = new ToolStripMenuItem(Language.GetString(LangKey.editor_align_top))
{ {
Image = (Image)EditorFormResources.GetObject("Snap-left.Image") Image = (Image)EditorFormResources.GetObject("Snap-top.Image")
}; };
item.Click += delegate item.Click += delegate
{ {
SnapAllToEdge(Direction.LEFT); SnapAllToEdge(Direction.TOP);
}; };
snapSubmenu.DropDownItems.Add(item); snapSubmenu.DropDownItems.Add(item);
@ -797,17 +799,6 @@ namespace Greenshot.Editor.Drawing
}; };
snapSubmenu.DropDownItems.Add(item); snapSubmenu.DropDownItems.Add(item);
// Snap to top
item = new ToolStripMenuItem(Language.GetString(LangKey.editor_align_top))
{
Image = (Image)EditorFormResources.GetObject("Snap-top.Image")
};
item.Click += delegate
{
SnapAllToEdge(Direction.TOP);
};
snapSubmenu.DropDownItems.Add(item);
// Snap to bottom // Snap to bottom
item = new ToolStripMenuItem(Language.GetString(LangKey.editor_align_bottom)) item = new ToolStripMenuItem(Language.GetString(LangKey.editor_align_bottom))
{ {
@ -818,6 +809,18 @@ namespace Greenshot.Editor.Drawing
SnapAllToEdge(Direction.BOTTOM); SnapAllToEdge(Direction.BOTTOM);
}; };
snapSubmenu.DropDownItems.Add(item); snapSubmenu.DropDownItems.Add(item);
// Snap left
item = new ToolStripMenuItem(Language.GetString(LangKey.editor_align_left))
{
Image = (Image)EditorFormResources.GetObject("Snap-left.Image")
};
item.Click += delegate
{
SnapAllToEdge(Direction.LEFT);
};
snapSubmenu.DropDownItems.Add(item);
menu.Items.Add(snapSubmenu); menu.Items.Add(snapSubmenu);
#endregion Snap #endregion Snap