Dave Jarvis' Repositories
git clone https://repo.autonoma.ca/repo/keenwrite.git
Add preference for monospace font, add keyboard bindings
| Author | DaveJarvis <email> |
|---|---|
| Date | 2021-01-01 21:53:44 GMT-0800 |
| Commit | cc2b7340a99e75b46d46de5e757421ee00974375 |
| Parent | 3012516 |
| Delta | 25 lines added, 15 lines removed, 10-line increase |
src/main/resources/com/keenwrite/messages.properties
| workspace.ui.font=Fonts | ||
| -workspace.ui.font.editor.name=Editor Font Name | ||
| +workspace.ui.font.editor=Editor Font | ||
| +workspace.ui.font.editor.name=Name | ||
| workspace.ui.font.editor.name.desc=Text editor font name (sans-serif font recommended). | ||
| -workspace.ui.font.editor.name.title=Name | ||
| -workspace.ui.font.editor.size=Editor Font Size | ||
| -workspace.ui.font.editor.size.desc=Text editor font size. | ||
| +workspace.ui.font.editor.name.title=Family | ||
| +workspace.ui.font.editor.size=Size | ||
| +workspace.ui.font.editor.size.desc=Font size. | ||
| workspace.ui.font.editor.size.title=Points | ||
| -workspace.ui.font.preview.name=Preview Font Name | ||
| +workspace.ui.font.preview=Preview Font | ||
| +workspace.ui.font.preview.name=Name | ||
| workspace.ui.font.preview.name.desc=Preview pane font name (must support ligatures, serif font recommended). | ||
| -workspace.ui.font.preview.name.title=Name | ||
| -workspace.ui.font.preview.size=Preview Font Size | ||
| -workspace.ui.font.preview.size.desc=Preview pane font size. | ||
| +workspace.ui.font.preview.name.title=Family | ||
| +workspace.ui.font.preview.size=Size | ||
| +workspace.ui.font.preview.size.desc=Font size. | ||
| workspace.ui.font.preview.size.title=Points | ||
| +workspace.ui.font.preview.mono.name=Name | ||
| +workspace.ui.font.preview.mono.name.desc=Monospace font name. | ||
| +workspace.ui.font.preview.mono.name.title=Family | ||
| +workspace.ui.font.preview.mono.size=Size | ||
| +workspace.ui.font.preview.mono.size.desc=Monospace font size. | ||
| +workspace.ui.font.preview.mono.size.title=Points | ||
| workspace.language=Language |
src/main/java/com/keenwrite/preferences/SimpleFontControl.java
| buttonCancel.setCancelButton( true ); | ||
| pane.setOnKeyReleased( ( keyEvent ) -> { | ||
| - final var code = keyEvent.getCode(); | ||
| - if( code == ENTER ) { | ||
| - buttonOk.fire(); | ||
| - } | ||
| - else if( code == ESCAPE ) { | ||
| - buttonCancel.fire(); | ||
| + switch( keyEvent.getCode() ) { | ||
| + case ENTER -> buttonOk.fire(); | ||
| + case ESCAPE -> buttonCancel.fire(); | ||
| } | ||
| } ); |
src/main/java/com/keenwrite/preferences/Workspace.java
| public static final Key KEY_UI_FONT_PREVIEW_NAME = key( KEY_UI_FONT_PREVIEW, "name" ); | ||
| public static final Key KEY_UI_FONT_PREVIEW_SIZE = key( KEY_UI_FONT_PREVIEW, "size" ); | ||
| + public static final Key KEY_UI_FONT_PREVIEW_MONO = key( KEY_UI_FONT_PREVIEW, "mono" ); | ||
| + public static final Key KEY_UI_FONT_PREVIEW_MONO_NAME = key( KEY_UI_FONT_PREVIEW_MONO, "name" ); | ||
| + public static final Key KEY_UI_FONT_PREVIEW_MONO_SIZE = key( KEY_UI_FONT_PREVIEW_MONO, "size" ); | ||
| public static final Key KEY_LANGUAGE = key( KEY_ROOT, "language" ); | ||
 | ||
| entry( KEY_UI_FONT_PREVIEW_NAME, new SimpleStringProperty( FONT_NAME_PREVIEW_DEFAULT ) ), | ||
| entry( KEY_UI_FONT_PREVIEW_SIZE, new SimpleDoubleProperty( FONT_SIZE_PREVIEW_DEFAULT ) ), | ||
| - | ||
| + entry( KEY_UI_FONT_PREVIEW_MONO_NAME, new SimpleStringProperty( FONT_NAME_PREVIEW_MONO_NAME_DEFAULT ) ), | ||
| + entry( KEY_UI_FONT_PREVIEW_MONO_SIZE, new SimpleDoubleProperty( FONT_SIZE_PREVIEW_MONO_SIZE_DEFAULT ) ), | ||
| + | ||
| entry( KEY_UI_WINDOW_X, new SimpleDoubleProperty( WINDOW_X_DEFAULT ) ), | ||
| entry( KEY_UI_WINDOW_Y, new SimpleDoubleProperty( WINDOW_Y_DEFAULT ) ), | ||