reordered items in "Insert" menu and toolbar

Author: DevCharly

CHANGES.md

@@ -5,6 +5,7 @@ Markdown Writer FX Change Log
 
 - Highlight paragraph in Preview that contain the caret of the editor.
 - Show source positions for CommonMark in Markdown AST view.
+- Reordered items in "Insert" menu and toolbar.
 
 
 ## 0.6

src/main/java/org/markdownwriterfx/MainWindow.java

@@ -179,15 +179,9 @@ private Node createMenuBarAndToolBar() {
 		Action insertStrikethroughAction = new Action(Messages.get("MainWindow.insertStrikethroughAction"), "Shortcut+T", STRIKETHROUGH,
 				e -> getActiveSmartEdit().insertStrikethrough(Messages.get("MainWindow.insertStrikethroughText")),
 				activeFileEditorIsNull);
-		Action insertBlockquoteAction = new Action(Messages.get("MainWindow.insertBlockquoteAction"), "Ctrl+Q", QUOTE_LEFT, // not Shortcut+Q because of conflict on Mac
-				e -> getActiveSmartEdit().surroundSelection("\n\n> ", ""),
-				activeFileEditorIsNull);
 		Action insertCodeAction = new Action(Messages.get("MainWindow.insertCodeAction"), "Shortcut+K", CODE,
 				e -> getActiveSmartEdit().insertInlineCode(Messages.get("MainWindow.insertCodeText")),
 				activeFileEditorIsNull);
-		Action insertFencedCodeBlockAction = new Action(Messages.get("MainWindow.insertFencedCodeBlockAction"), "Shortcut+Shift+K", FILE_CODE_ALT,
-				e -> getActiveSmartEdit().surroundSelection("\n\n```\n", "\n```\n\n", Messages.get("MainWindow.insertFencedCodeBlockText")),
-				activeFileEditorIsNull);
 
 		Action insertLinkAction = new Action(Messages.get("MainWindow.insertLinkAction"), "Shortcut+L", LINK,
 				e -> getActiveSmartEdit().insertLink(),
@@ -196,6 +190,19 @@ private Node createMenuBarAndToolBar() {
 				e -> getActiveSmartEdit().insertImage(),
 				activeFileEditorIsNull);
 
+		Action insertUnorderedListAction = new Action(Messages.get("MainWindow.insertUnorderedListAction"), "Shortcut+U", LIST_UL,
+				e -> getActiveSmartEdit().insertUnorderedList(),
+				activeFileEditorIsNull);
+		Action insertOrderedListAction = new Action(Messages.get("MainWindow.insertOrderedListAction"), "Shortcut+Shift+O", LIST_OL,
+				e -> getActiveSmartEdit().surroundSelection("\n\n1. ", ""),
+				activeFileEditorIsNull);
+		Action insertBlockquoteAction = new Action(Messages.get("MainWindow.insertBlockquoteAction"), "Ctrl+Q", QUOTE_LEFT, // not Shortcut+Q because of conflict on Mac
+				e -> getActiveSmartEdit().surroundSelection("\n\n> ", ""),
+				activeFileEditorIsNull);
+		Action insertFencedCodeBlockAction = new Action(Messages.get("MainWindow.insertFencedCodeBlockAction"), "Shortcut+Shift+K", FILE_CODE_ALT,
+				e -> getActiveSmartEdit().surroundSelection("\n\n```\n", "\n```\n\n", Messages.get("MainWindow.insertFencedCodeBlockText")),
+				activeFileEditorIsNull);
+
 		Action insertHeader1Action = new Action(Messages.get("MainWindow.insertHeader1Action"), "Shortcut+1", HEADER,
 				e -> getActiveSmartEdit().insertHeading(1, Messages.get("MainWindow.insertHeader1Text")),
 				activeFileEditorIsNull);
@@ -215,12 +222,6 @@ private Node createMenuBarAndToolBar() {
 				e -> getActiveSmartEdit().insertHeading(6, Messages.get("MainWindow.insertHeader6Text")),
 				activeFileEditorIsNull);
 
-		Action insertUnorderedListAction = new Action(Messages.get("MainWindow.insertUnorderedListAction"), "Shortcut+U", LIST_UL,
-				e -> getActiveSmartEdit().insertUnorderedList(),
-				activeFileEditorIsNull);
-		Action insertOrderedListAction = new Action(Messages.get("MainWindow.insertOrderedListAction"), "Shortcut+Shift+O", LIST_OL,
-				e -> getActiveSmartEdit().surroundSelection("\n\n1. ", ""),
-				activeFileEditorIsNull);
 		Action insertHorizontalRuleAction = new Action(Messages.get("MainWindow.insertHorizontalRuleAction"), null, null,
 				e -> getActiveSmartEdit().surroundSelection("\n\n---\n\n", ""),
 				activeFileEditorIsNull);
@@ -266,22 +267,23 @@ private Node createMenuBarAndToolBar() {
 				insertBoldAction,
 				insertItalicAction,
 				insertStrikethroughAction,
-				insertBlockquoteAction,
 				insertCodeAction,
-				insertFencedCodeBlockAction,
 				null,
 				insertLinkAction,
 				insertImageAction,
 				null,
+				insertUnorderedListAction,
+				insertOrderedListAction,
+				insertBlockquoteAction,
+				insertFencedCodeBlockAction,
+				null,
 				insertHeader1Action,
 				insertHeader2Action,
 				insertHeader3Action,
 				insertHeader4Action,
 				insertHeader5Action,
 				insertHeader6Action,
 				null,
-				insertUnorderedListAction,
-				insertOrderedListAction,
 				insertHorizontalRuleAction);
 
 		Menu toolsMenu = ActionUtils.createMenu(Messages.get("MainWindow.toolsMenu"),
@@ -305,17 +307,17 @@ private Node createMenuBarAndToolBar() {
 				null,
 				insertBoldAction,
 				insertItalicAction,
-				insertBlockquoteAction,
 				insertCodeAction,
-				insertFencedCodeBlockAction,
 				null,
 				insertLinkAction,
 				insertImageAction,
 				null,
-				insertHeader1Action,
-				null,
 				insertUnorderedListAction,
-				insertOrderedListAction);
+				insertOrderedListAction,
+				insertBlockquoteAction,
+				insertFencedCodeBlockAction,
+				null,
+				insertHeader1Action);
 
 		// horizontal spacer
 		Region spacer = new Region();

src/main/resources/org/markdownwriterfx/messages.properties

@@ -57,13 +57,15 @@ MainWindow.insertItalicAction=Italic
 MainWindow.insertItalicText=emphasized text
 MainWindow.insertStrikethroughAction=Strikethrough
 MainWindow.insertStrikethroughText=strikethrough text
-MainWindow.insertBlockquoteAction=Blockquote
 MainWindow.insertCodeAction=Inline Code
 MainWindow.insertCodeText=code
-MainWindow.insertFencedCodeBlockAction=Fenced Code Block
-MainWindow.insertFencedCodeBlockText=enter code here
 MainWindow.insertLinkAction=Link...
 MainWindow.insertImageAction=Image...
+MainWindow.insertUnorderedListAction=Unordered List
+MainWindow.insertOrderedListAction=Ordered List
+MainWindow.insertBlockquoteAction=Blockquote
+MainWindow.insertFencedCodeBlockAction=Fenced Code Block
+MainWindow.insertFencedCodeBlockText=enter code here
 MainWindow.insertHeader1Action=Header 1
 MainWindow.insertHeader1Text=header 1
 MainWindow.insertHeader2Action=Header 2
@@ -76,8 +78,6 @@ MainWindow.insertHeader5Action=Header 5
 MainWindow.insertHeader5Text=header 5
 MainWindow.insertHeader6Action=Header 6
 MainWindow.insertHeader6Text=header 6
-MainWindow.insertUnorderedListAction=Unordered List
-MainWindow.insertOrderedListAction=Ordered List
 MainWindow.insertHorizontalRuleAction=Horizontal Rule
 
 MainWindow.toolsMenu=Tools