Dave Jarvis' Repositories
git clone https://repo.autonoma.ca/repo/keenwrite.git
Fix startup issue, add controls to hide menu, status, and tool bar
| Author | DaveJarvis <email> |
|---|---|
| Date | 2021-01-04 19:00:08 GMT-0800 |
| Commit | 8d278e8d96d16858843b4b5c3b9944a2c6fdd681 |
| Parent | 5ebbbfe |
| Delta | 29 lines added, 229 lines removed, 200-line decrease |
src/main/resources/com/keenwrite/messages.properties
| App.action.view.preview.text=Preview | ||
| +App.action.view.menubar.description=Toggle menu bar | ||
| +App.action.view.menubar.accelerator=Ctrl+F7 | ||
| +App.action.view.menubar.text=Menu bar | ||
| + | ||
| +App.action.view.toolbar.description=Toggle tool bar | ||
| +App.action.view.toolbar.accelerator=Ctrl+Shift+F7 | ||
| +App.action.view.toolbar.text=Tool bar | ||
| + | ||
| +App.action.view.statusbar.description=Toggle status bar | ||
| +App.action.view.statusbar.accelerator=Ctrl+Shift+Alt+F7 | ||
| +App.action.view.statusbar.text=Status bar | ||
| + | ||
| App.action.view.outline.description=Open document outline | ||
| App.action.view.outline.accelerator=F8 |
src/main/java/com/keenwrite/util/ResourceWalker.java
| import java.io.IOException; | ||
| -import java.net.URI; | ||
| import java.net.URISyntaxException; | ||
| +import java.nio.file.FileSystem; | ||
| import java.nio.file.Files; | ||
| import java.nio.file.Path; | ||
| import java.nio.file.Paths; | ||
| import java.util.function.Consumer; | ||
| +import static com.keenwrite.util.ProtocolScheme.JAR; | ||
| +import static com.keenwrite.util.ProtocolScheme.valueFrom; | ||
| import static java.nio.file.FileSystems.getDefault; | ||
| import static java.nio.file.FileSystems.newFileSystem; | ||
 | ||
| */ | ||
| public static void walk( | ||
| - final String directory, final String glob, final Consumer<Path> c ) | ||
| - throws URISyntaxException, IOException { | ||
| + final String directory, final String glob, final Consumer<Path> c ) | ||
| + throws URISyntaxException, IOException { | ||
| final var resource = ResourceWalker.class.getResource( directory ); | ||
| final var matcher = getDefault().getPathMatcher( "glob:" + glob ); | ||
| if( resource != null ) { | ||
| final var uri = resource.toURI(); | ||
| - final var jar = uri.getScheme().equals( "jar" ); | ||
| - final var path = jar ? toFileSystem( uri, directory ) : Paths.get( uri ); | ||
| + final Path path; | ||
| + FileSystem fs = null; | ||
| + | ||
| + if( valueFrom( uri ) == JAR ) { | ||
| + fs = newFileSystem( uri, emptyMap() ); | ||
| + path = fs.getPath( directory ); | ||
| + } | ||
| + else { | ||
| + path = Paths.get( uri ); | ||
| + } | ||
| try( final var walk = Files.walk( path, 10 ) ) { | ||
| for( final var it = walk.iterator(); it.hasNext(); ) { | ||
| final Path p = it.next(); | ||
| if( matcher.matches( p ) ) { | ||
| c.accept( p ); | ||
| } | ||
| } | ||
| + } finally { | ||
| + if( fs != null ) { fs.close(); } | ||
| } | ||
| - } | ||
| - } | ||
| - | ||
| - private static Path toFileSystem( final URI uri, final String directory ) | ||
| - throws IOException { | ||
| - try( final var fs = newFileSystem( uri, emptyMap() ) ) { | ||
| - return fs.getPath( directory ); | ||
| } | ||
| } | ||
src/main/java/com/keenwrite/ui/actions/ApplicationMenuBar.java
| -/* Copyright 2020-2021 White Magic Software, Ltd. -- All rights reserved. */ | ||
| -package com.keenwrite.ui.actions; | ||
| - | ||
| -import javafx.event.ActionEvent; | ||
| -import javafx.event.EventHandler; | ||
| -import javafx.scene.Node; | ||
| -import javafx.scene.control.Menu; | ||
| -import javafx.scene.control.MenuBar; | ||
| -import javafx.scene.control.MenuItem; | ||
| -import javafx.scene.control.ToolBar; | ||
| -import javafx.scene.layout.VBox; | ||
| - | ||
| -import java.util.HashMap; | ||
| -import java.util.Map; | ||
| - | ||
| -import static com.keenwrite.Messages.get; | ||
| - | ||
| -/** | ||
| - * Responsible for wiring all application actions to menus, toolbar buttons, | ||
| - * and keyboard shortcuts. | ||
| - */ | ||
| -public class ApplicationMenuBar { | ||
| - | ||
| - private final Map<String, Action> mMap = new HashMap<>( 64 ); | ||
| - | ||
| - /** | ||
| - * Empty constructor. | ||
| - */ | ||
| - public ApplicationMenuBar() { | ||
| - } | ||
| - | ||
| - /** | ||
| - * Creates the main application affordances. | ||
| - * | ||
| - * @param actions The {@link ApplicationActions} that map user interface | ||
| - * selections to executable code. | ||
| - * @return An instance of {@link Node} that contains the menu and toolbar. | ||
| - */ | ||
| - public Node createMenuBar( final ApplicationActions actions ) { | ||
| - final var SEPARATOR_ACTION = new SeparatorAction(); | ||
| - | ||
| - //@formatter:off | ||
| - final var menuBar = new MenuBar( | ||
| - createMenu( | ||
| - get( "Main.menu.file" ), | ||
| - addAction( "file.new", e -> actions.file‿new() ), | ||
| - addAction( "file.open", e -> actions.file‿open() ), | ||
| - SEPARATOR_ACTION, | ||
| - addAction( "file.close", e -> actions.file‿close() ), | ||
| - addAction( "file.close_all", e -> actions.file‿close_all() ), | ||
| - SEPARATOR_ACTION, | ||
| - addAction( "file.save", e -> actions.file‿save() ), | ||
| - addAction( "file.save_as", e -> actions.file‿save_as() ), | ||
| - addAction( "file.save_all", e -> actions.file‿save_all() ), | ||
| - SEPARATOR_ACTION, | ||
| - addAction( "file.export", e -> {} ) | ||
| - .addSubActions( | ||
| - addAction( "file.export.html_svg", e -> actions.file‿export‿html_svg() ), | ||
| - addAction( "file.export.html_tex", e -> actions.file‿export‿html_tex() ), | ||
| - addAction( "file.export.markdown", e -> actions.file‿export‿markdown() ) | ||
| - ), | ||
| - SEPARATOR_ACTION, | ||
| - addAction( "file.exit", e -> actions.file‿exit() ) | ||
| - ), | ||
| - createMenu( | ||
| - get( "Main.menu.edit" ), | ||
| - SEPARATOR_ACTION, | ||
| - addAction( "edit.undo", e -> actions.edit‿undo() ), | ||
| - addAction( "edit.redo", e -> actions.edit‿redo() ), | ||
| - SEPARATOR_ACTION, | ||
| - addAction( "edit.cut", e -> actions.edit‿cut() ), | ||
| - addAction( "edit.copy", e -> actions.edit‿copy() ), | ||
| - addAction( "edit.paste", e -> actions.edit‿paste() ), | ||
| - addAction( "edit.select_all", e -> actions.edit‿select_all() ), | ||
| - SEPARATOR_ACTION, | ||
| - addAction( "edit.find", e -> actions.edit‿find() ), | ||
| - addAction( "edit.find_next", e -> actions.edit‿find_next() ), | ||
| - addAction( "edit.find_prev", e -> actions.edit‿find_prev() ), | ||
| - SEPARATOR_ACTION, | ||
| - addAction( "edit.preferences", e -> actions.edit‿preferences() ) | ||
| - ), | ||
| - createMenu( | ||
| - get( "Main.menu.format" ), | ||
| - addAction( "format.bold", e -> actions.format‿bold() ), | ||
| - addAction( "format.italic", e -> actions.format‿italic() ), | ||
| - addAction( "format.superscript", e -> actions.format‿superscript() ), | ||
| - addAction( "format.subscript", e -> actions.format‿subscript() ), | ||
| - addAction( "format.strikethrough", e -> actions.format‿strikethrough() ) | ||
| - ), | ||
| - createMenu( | ||
| - get( "Main.menu.insert" ), | ||
| - addAction( "insert.blockquote", e -> actions.insert‿blockquote() ), | ||
| - addAction( "insert.code", e -> actions.insert‿code() ), | ||
| - addAction( "insert.fenced_code_block", e -> actions.insert‿fenced_code_block() ), | ||
| - SEPARATOR_ACTION, | ||
| - addAction( "insert.link", e -> actions.insert‿link() ), | ||
| - addAction( "insert.image", e -> actions.insert‿image() ), | ||
| - SEPARATOR_ACTION, | ||
| - addAction( "insert.heading_1", e -> actions.insert‿heading_1() ), | ||
| - addAction( "insert.heading_2", e -> actions.insert‿heading_2() ), | ||
| - addAction( "insert.heading_3", e -> actions.insert‿heading_3() ), | ||
| - SEPARATOR_ACTION, | ||
| - addAction( "insert.unordered_list", e -> actions.insert‿unordered_list() ), | ||
| - addAction( "insert.ordered_list", e -> actions.insert‿ordered_list() ), | ||
| - addAction( "insert.horizontal_rule", e -> actions.insert‿horizontal_rule() ) | ||
| - ), | ||
| - createMenu( | ||
| - get( "Main.menu.definition" ), | ||
| - addAction( "definition.insert", e -> actions.definition‿autoinsert() ), | ||
| - SEPARATOR_ACTION, | ||
| - addAction( "definition.create", e -> actions.definition‿create() ), | ||
| - addAction( "definition.rename", e -> actions.definition‿rename() ), | ||
| - addAction( "definition.delete", e -> actions.definition‿delete() ) | ||
| - ), | ||
| - createMenu( | ||
| - get( "Main.menu.view" ), | ||
| - addAction( "view.refresh", e -> actions.view‿refresh() ), | ||
| - SEPARATOR_ACTION, | ||
| - addAction( "view.issues", e -> actions.view‿issues() ), | ||
| - addAction( "view.preview", e -> actions.view‿preview() ) | ||
| - ), | ||
| - createMenu( | ||
| - get( "Main.menu.help" ), | ||
| - addAction( "help.about", e -> actions.help‿about() ) | ||
| - ) ); | ||
| - //@formatter:on | ||
| - | ||
| - //@formatter:off | ||
| - final var toolBar = createToolBar( | ||
| - getAction( "file.new" ), | ||
| - getAction( "file.open" ), | ||
| - getAction( "file.save" ), | ||
| - SEPARATOR_ACTION, | ||
| - getAction( "edit.undo" ), | ||
| - getAction( "edit.redo" ), | ||
| - getAction( "edit.cut" ), | ||
| - getAction( "edit.copy" ), | ||
| - getAction( "edit.paste" ), | ||
| - SEPARATOR_ACTION, | ||
| - getAction( "format.bold" ), | ||
| - getAction( "format.italic" ), | ||
| - getAction( "format.superscript" ), | ||
| - getAction( "format.subscript" ), | ||
| - getAction( "insert.blockquote" ), | ||
| - getAction( "insert.code" ), | ||
| - getAction( "insert.fenced_code_block" ), | ||
| - SEPARATOR_ACTION, | ||
| - getAction( "insert.link" ), | ||
| - getAction( "insert.image" ), | ||
| - SEPARATOR_ACTION, | ||
| - getAction( "insert.heading_1" ), | ||
| - SEPARATOR_ACTION, | ||
| - getAction( "insert.unordered_list" ), | ||
| - getAction( "insert.ordered_list" ) | ||
| - ); | ||
| - //@formatter:on | ||
| - | ||
| - return new VBox( menuBar, toolBar ); | ||
| - } | ||
| - | ||
| - /** | ||
| - * Adds a new action to the list of actions. | ||
| - * | ||
| - * @param key The name of the action to register in {@link #mMap}. | ||
| - * @param handler Performs the action upon request. | ||
| - * @return The newly registered action. | ||
| - */ | ||
| - private Action addAction( | ||
| - final String key, final EventHandler<ActionEvent> handler ) { | ||
| - assert key != null; | ||
| - assert handler != null; | ||
| - | ||
| - final var action = Action | ||
| - .builder() | ||
| - .setId( key ) | ||
| - .setHandler( handler ) | ||
| - .build(); | ||
| - | ||
| - mMap.put( key, action ); | ||
| - | ||
| - return action; | ||
| - } | ||
| - | ||
| - private Action getAction( final String key ) { | ||
| - return mMap.get( key ); | ||
| - } | ||
| - | ||
| - public static Menu createMenu( | ||
| - final String text, final MenuAction... actions ) { | ||
| - return new Menu( text, null, createMenuItems( actions ) ); | ||
| - } | ||
| - | ||
| - public static MenuItem[] createMenuItems( final MenuAction... actions ) { | ||
| - final var menuItems = new MenuItem[ actions.length ]; | ||
| - | ||
| - for( var i = 0; i < actions.length; i++ ) { | ||
| - menuItems[ i ] = actions[ i ].createMenuItem(); | ||
| - } | ||
| - | ||
| - return menuItems; | ||
| - } | ||
| - | ||
| - private static ToolBar createToolBar( final MenuAction... actions ) { | ||
| - return new ToolBar( createToolBarButtons( actions ) ); | ||
| - } | ||
| - | ||
| - private static Node[] createToolBarButtons( final MenuAction... actions ) { | ||
| - final var len = actions.length; | ||
| - final var nodes = new Node[ len ]; | ||
| - | ||
| - for( var i = 0; i < len; i++ ) { | ||
| - nodes[ i ] = actions[ i ].createToolBarNode(); | ||
| - } | ||
| - | ||
| - return nodes; | ||
| - } | ||
| -} | ||