diff --git a/src/main/java/com/luoboduner/moo/tool/ui/component/textviewer/QuickNoteRSyntaxTextViewer.java b/src/main/java/com/luoboduner/moo/tool/ui/component/textviewer/QuickNoteRSyntaxTextViewer.java index 0678895e..2e2ce101 100644 --- a/src/main/java/com/luoboduner/moo/tool/ui/component/textviewer/QuickNoteRSyntaxTextViewer.java +++ b/src/main/java/com/luoboduner/moo/tool/ui/component/textviewer/QuickNoteRSyntaxTextViewer.java @@ -67,7 +67,8 @@ public class QuickNoteRSyntaxTextViewer extends RSyntaxTextArea { public void keyPressed(KeyEvent evt) { if ((evt.isControlDown() || evt.isMetaDown()) && evt.getKeyCode() == KeyEvent.VK_S) { QuickNoteListener.quickSave(true, true); - } else if ((evt.isControlDown() || evt.isMetaDown()) && evt.isShiftDown() && evt.getKeyCode() == KeyEvent.VK_F) { + } else if (((evt.isControlDown() || evt.isMetaDown()) && evt.isShiftDown() && evt.getKeyCode() == KeyEvent.VK_F) + || evt.isMetaDown() && evt.isAltDown() && evt.getKeyCode() == KeyEvent.VK_L) { QuickNoteListener.format(); } else if ((evt.isControlDown() || evt.isMetaDown()) && evt.getKeyCode() == KeyEvent.VK_F) { QuickNoteListener.showFindPanel(); diff --git a/src/main/java/com/luoboduner/moo/tool/ui/dialog/KeyMapDialog.form b/src/main/java/com/luoboduner/moo/tool/ui/dialog/KeyMapDialog.form index c76a41c2..a328dd78 100644 --- a/src/main/java/com/luoboduner/moo/tool/ui/dialog/KeyMapDialog.form +++ b/src/main/java/com/luoboduner/moo/tool/ui/dialog/KeyMapDialog.form @@ -39,7 +39,7 @@ - + @@ -71,7 +71,7 @@ - + diff --git a/src/main/java/com/luoboduner/moo/tool/ui/dialog/KeyMapDialog.java b/src/main/java/com/luoboduner/moo/tool/ui/dialog/KeyMapDialog.java index c0cc0814..3651bb21 100644 --- a/src/main/java/com/luoboduner/moo/tool/ui/dialog/KeyMapDialog.java +++ b/src/main/java/com/luoboduner/moo/tool/ui/dialog/KeyMapDialog.java @@ -80,7 +80,7 @@ public class KeyMapDialog extends JDialog { label2.setText("查找"); panel1.add(label2, new GridConstraints(1, 0, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); final JLabel label3 = new JLabel(); - label3.setText("Json格式化"); + label3.setText("格式化"); panel1.add(label3, new GridConstraints(2, 0, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); final JLabel label4 = new JLabel(); label4.setText("删除选择的行"); @@ -92,7 +92,7 @@ public class KeyMapDialog extends JDialog { label6.setText("Ctrl+F"); panel1.add(label6, new GridConstraints(1, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); final JLabel label7 = new JLabel(); - label7.setText("Ctrl+Shift+F"); + label7.setText("Ctrl+Shift+F或option+command+L"); panel1.add(label7, new GridConstraints(2, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); final JLabel label8 = new JLabel(); label8.setText("Ctrl+D"); diff --git a/src/main/java/com/luoboduner/moo/tool/ui/listener/func/JsonBeautyListener.java b/src/main/java/com/luoboduner/moo/tool/ui/listener/func/JsonBeautyListener.java index 8f246917..f26c7732 100644 --- a/src/main/java/com/luoboduner/moo/tool/ui/listener/func/JsonBeautyListener.java +++ b/src/main/java/com/luoboduner/moo/tool/ui/listener/func/JsonBeautyListener.java @@ -115,7 +115,8 @@ public class JsonBeautyListener { public void keyPressed(KeyEvent evt) { if ((evt.isControlDown() || evt.isMetaDown()) && evt.getKeyCode() == KeyEvent.VK_S) { quickSave(true); - } else if ((evt.isControlDown() || evt.isMetaDown()) && evt.isShiftDown() && evt.getKeyCode() == KeyEvent.VK_F) { + } else if (((evt.isControlDown() || evt.isMetaDown()) && evt.isShiftDown() && evt.getKeyCode() == KeyEvent.VK_F) || + evt.isMetaDown() && evt.isAltDown() && evt.getKeyCode() == KeyEvent.VK_L) { String jsonText = jsonBeautyForm.getTextArea().getText(); jsonBeautyForm.getTextArea().setText(formatJson(jsonText)); jsonBeautyForm.getTextArea().setCaretPosition(0);