Skip to content

Commit

Permalink
Merge pull request #69 from rememberber/develop
Browse files Browse the repository at this point in the history 
Develop
  • Loading branch information
@rememberber
rememberber authored Jul 19, 2023
2 parents b375c3b + d145b39 commit b04b769
Show file tree
Hide file tree
Showing 8 changed files with 24 additions and 20 deletions.
10 changes: 5 additions & 5 deletions src/main/java/com/luoboduner/moo/tool/ui/component/QuickNoteSyntaxTextViewer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,15 +90,15 @@ public void keyReleased(KeyEvent arg0) {

@Override
public void keyPressed(KeyEvent evt) {
if (evt.isControlDown() && evt.getKeyCode() == KeyEvent.VK_S) {
if ((evt.isControlDown() || evt.isMetaDown()) && evt.getKeyCode() == KeyEvent.VK_S) {
QuickNoteListener.quickSave(true, true);
} else if (evt.isControlDown() && evt.isShiftDown() && evt.getKeyCode() == KeyEvent.VK_F) {
} else if ((evt.isControlDown() || evt.isMetaDown()) && evt.isShiftDown() && evt.getKeyCode() == KeyEvent.VK_F) {
QuickNoteListener.format();
} else if (evt.isControlDown() && evt.getKeyCode() == KeyEvent.VK_F) {
} else if ((evt.isControlDown() || evt.isMetaDown()) && evt.getKeyCode() == KeyEvent.VK_F) {
QuickNoteListener.showFindPanel();
} else if (evt.isControlDown() && evt.getKeyCode() == KeyEvent.VK_R) {
} else if ((evt.isControlDown() || evt.isMetaDown()) && evt.getKeyCode() == KeyEvent.VK_R) {
QuickNoteListener.showFindPanel();
} else if (evt.isControlDown() && evt.getKeyCode() == KeyEvent.VK_N) {
} else if ((evt.isControlDown() || evt.isMetaDown()) && evt.getKeyCode() == KeyEvent.VK_N) {
QuickNoteListener.newNote();
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/luoboduner/moo/tool/ui/listener/func/CalculatorListener.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ public void keyReleased(KeyEvent arg0) {

@Override
public void keyPressed(KeyEvent evt) {
if (evt.isControlDown() && evt.getKeyCode() == KeyEvent.VK_S) {
if ((evt.isControlDown() || evt.isMetaDown()) && evt.getKeyCode() == KeyEvent.VK_S) {
CalculatorForm.saveContent();
}
}
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/com/luoboduner/moo/tool/ui/listener/func/HostListener.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,13 +82,13 @@ public void keyReleased(KeyEvent arg0) {

@Override
public void keyPressed(KeyEvent evt) {
if (evt.isControlDown() && evt.getKeyCode() == KeyEvent.VK_S) {
if ((evt.isControlDown() || evt.isMetaDown()) && evt.getKeyCode() == KeyEvent.VK_S) {
quickSave(true);
} else if (evt.isControlDown() && evt.getKeyCode() == KeyEvent.VK_N) {
} else if ((evt.isControlDown() || evt.isMetaDown()) && evt.getKeyCode() == KeyEvent.VK_N) {
newHost();
} else if (evt.isControlDown() && evt.getKeyCode() == KeyEvent.VK_F) {
} else if ((evt.isControlDown() || evt.isMetaDown()) && evt.getKeyCode() == KeyEvent.VK_F) {
showFindPanel();
} else if (evt.isControlDown() && evt.getKeyCode() == KeyEvent.VK_R) {
} else if ((evt.isControlDown() || evt.isMetaDown()) && evt.getKeyCode() == KeyEvent.VK_R) {
showFindPanel();
}
}
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/com/luoboduner/moo/tool/ui/listener/func/JsonBeautyListener.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,17 +104,17 @@ public void keyReleased(KeyEvent arg0) {

@Override
public void keyPressed(KeyEvent evt) {
if (evt.isControlDown() && evt.getKeyCode() == KeyEvent.VK_S) {
if ((evt.isControlDown() || evt.isMetaDown()) && evt.getKeyCode() == KeyEvent.VK_S) {
quickSave(true);
} else if (evt.isControlDown() && evt.isShiftDown() && evt.getKeyCode() == KeyEvent.VK_F) {
} else if ((evt.isControlDown() || evt.isMetaDown()) && evt.isShiftDown() && evt.getKeyCode() == KeyEvent.VK_F) {
String jsonText = jsonBeautyForm.getTextArea().getText();
jsonBeautyForm.getTextArea().setText(formatJson(jsonText));
jsonBeautyForm.getTextArea().setCaretPosition(0);
} else if (evt.isControlDown() && evt.getKeyCode() == KeyEvent.VK_F) {
} else if ((evt.isControlDown() || evt.isMetaDown()) && evt.getKeyCode() == KeyEvent.VK_F) {
showFindPanel();
} else if (evt.isControlDown() && evt.getKeyCode() == KeyEvent.VK_R) {
} else if ((evt.isControlDown() || evt.isMetaDown()) && evt.getKeyCode() == KeyEvent.VK_R) {
showFindPanel();
} else if (evt.isControlDown() && evt.getKeyCode() == KeyEvent.VK_N) {
} else if ((evt.isControlDown() || evt.isMetaDown()) && evt.getKeyCode() == KeyEvent.VK_N) {
newJson();
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/luoboduner/moo/tool/ui/listener/func/TimeConvertListener.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ public void keyReleased(KeyEvent arg0) {

@Override
public void keyPressed(KeyEvent evt) {
if (evt.isControlDown() && evt.getKeyCode() == KeyEvent.VK_S) {
if ((evt.isControlDown() || evt.isMetaDown()) && evt.getKeyCode() == KeyEvent.VK_S) {
TimeConvertForm.saveContent();
}
}
Expand Down
6 changes: 5 additions & 1 deletion src/main/java/com/luoboduner/moo/tool/util/ConfigUtil.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,11 @@ public void setBeforeVersion(String beforeVersion) {
}

public String getTheme() {
return setting.getStr("theme", "setting.appearance", "Flat Darcula");
if (SystemUtil.isMacOs()) {
return setting.getStr("theme", "setting.appearance", "Flat macOS Dark");
} else {
return setting.getStr("theme", "setting.appearance", "Flat Darcula");
}
}

public void setTheme(String theme) {
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/luoboduner/moo/tool/util/UndoUtil.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,12 @@ public void keyReleased(KeyEvent arg0) {

@Override
public void keyPressed(KeyEvent evt) {
if (evt.isControlDown() && evt.getKeyCode() == KeyEvent.VK_Z) {
if ((evt.isControlDown() || evt.isMetaDown()) && evt.getKeyCode() == KeyEvent.VK_Z) {
if (undoManager.canUndo()) {
undoManager.undo();
}
}
if (evt.isControlDown() && evt.getKeyCode() == KeyEvent.VK_Y) {
if ((evt.isControlDown() || evt.isMetaDown()) && evt.getKeyCode() == KeyEvent.VK_Y) {
if (undoManager.canRedo()) {
undoManager.redo();
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/version_summary.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@
{
"version": "v1.4.6",
"title": "新增主题，随手记新增更多快捷替换功能，修复二维码生成器的bug",
"log": "● 随手记：新增下划线和驼峰互转，科学计数法和普通数字互转，千分位和普通数字互转，去掉空行等快捷替换功能；ctrl+s时记录log，避免文件内容丢失\n● 二维码：修复某些情况下无法生成二维码的问题\n● 主题：新增Xcode-Dark主题\n\n"
"log": "● 随手记：新增下划线和驼峰互转，科学计数法和普通数字互转，千分位和普通数字互转，去掉空行等快捷替换功能；ctrl+s时记录log，避免文件内容丢失\n● 二维码：修复某些情况下无法生成二维码的问题\n● 主题：新增Flat macOS主题\n\n"
}
]
}

0 comments on commit b04b769

Please sign in to comment.