diff --git a/src/.DS_Store b/src/.DS_Store deleted file mode 100644 index 48299fa3..00000000 Binary files a/src/.DS_Store and /dev/null differ diff --git a/src/main/java/com/sparrowwallet/sparrow/AboutController.java b/src/main/java/com/sparrowwallet/sparrow/AboutController.java new file mode 100644 index 00000000..1b6b8cc9 --- /dev/null +++ b/src/main/java/com/sparrowwallet/sparrow/AboutController.java @@ -0,0 +1,16 @@ +package com.sparrowwallet.sparrow; + +import javafx.event.ActionEvent; +import javafx.stage.Stage; + +public class AboutController { + private Stage stage; + + public void setStage(Stage stage) { + this.stage = stage; + } + + public void close(ActionEvent event) { + stage.close(); + } +} diff --git a/src/main/java/com/sparrowwallet/sparrow/AppController.java b/src/main/java/com/sparrowwallet/sparrow/AppController.java index db9c28a1..ca4d9347 100644 --- a/src/main/java/com/sparrowwallet/sparrow/AppController.java +++ b/src/main/java/com/sparrowwallet/sparrow/AppController.java @@ -38,6 +38,8 @@ import javafx.fxml.FXMLLoader; import javafx.fxml.Initializable; import javafx.geometry.Pos; import javafx.scene.Node; +import javafx.scene.Parent; +import javafx.scene.Scene; import javafx.scene.control.*; import javafx.scene.image.Image; import javafx.scene.image.ImageView; @@ -46,6 +48,7 @@ import javafx.scene.input.TransferMode; import javafx.scene.layout.StackPane; import javafx.stage.FileChooser; import javafx.stage.Stage; +import javafx.stage.StageStyle; import javafx.stage.Window; import javafx.util.Duration; import org.controlsfx.control.Notifications; @@ -334,7 +337,7 @@ public class AppController implements Initializable { MenuToolkit tk = MenuToolkit.toolkit(); MenuItem preferences = new MenuItem("Preferences..."); preferences.setOnAction(this::openPreferences); - Menu defaultApplicationMenu = new Menu("Apple", null, tk.createAboutMenuItem(MainApp.APP_NAME, null), new SeparatorMenuItem(), + Menu defaultApplicationMenu = new Menu("Apple", null, tk.createAboutMenuItem(MainApp.APP_NAME, getAboutStage()), new SeparatorMenuItem(), preferences, new SeparatorMenuItem(), tk.createHideMenuItem(MainApp.APP_NAME), tk.createHideOthersMenuItem(), tk.createUnhideAllMenuItem(), new SeparatorMenuItem(), tk.createQuitMenuItem(MainApp.APP_NAME)); @@ -344,6 +347,27 @@ public class AppController implements Initializable { } } + private Stage getAboutStage() { + try { + FXMLLoader loader = new FXMLLoader(AppController.class.getResource("about.fxml")); + Parent root = loader.load(); + AboutController controller = loader.getController(); + + Stage stage = new Stage(); + stage.setTitle("About Sparrow"); + stage.initStyle(StageStyle.UNDECORATED); + stage.setResizable(false); + stage.setScene(new Scene(root)); + controller.setStage(stage); + + return stage; + } catch(IOException e) { + log.error("Error loading about stage", e); + } + + return null; + } + public void openTransactionFromFile(ActionEvent event) { Stage window = new Stage(); diff --git a/src/main/java/com/sparrowwallet/sparrow/glyphfont/FontAwesome5.java b/src/main/java/com/sparrowwallet/sparrow/glyphfont/FontAwesome5.java index 056dde09..3f9ab3ea 100644 --- a/src/main/java/com/sparrowwallet/sparrow/glyphfont/FontAwesome5.java +++ b/src/main/java/com/sparrowwallet/sparrow/glyphfont/FontAwesome5.java @@ -15,6 +15,7 @@ public class FontAwesome5 extends GlyphFont { * The individual glyphs offered by the FontAwesome5 font. */ public static enum Glyph implements INamedCharacter { + ANGLE_DOUBLE_RIGHT('\uf101'), ARROW_DOWN('\uf063'), ARROW_UP('\uf062'), BTC('\uf15a'), diff --git a/src/main/resources/.DS_Store b/src/main/resources/.DS_Store deleted file mode 100644 index 0bba63f7..00000000 Binary files a/src/main/resources/.DS_Store and /dev/null differ diff --git a/src/main/resources/com/sparrowwallet/sparrow/about.css b/src/main/resources/com/sparrowwallet/sparrow/about.css new file mode 100644 index 00000000..4fa5e74a --- /dev/null +++ b/src/main/resources/com/sparrowwallet/sparrow/about.css @@ -0,0 +1,15 @@ +.title-area { + -fx-background-color: -fx-control-inner-background; + -fx-padding: 10 25 10 25; + -fx-border-width: 0px 0px 1px 0px; + -fx-border-color: #e5e5e6; +} + +.title-label { + -fx-font-size: 20px; +} + +.content-area, .button-area { + -fx-padding: 10 25 25 25; +} + diff --git a/src/main/resources/com/sparrowwallet/sparrow/about.fxml b/src/main/resources/com/sparrowwallet/sparrow/about.fxml new file mode 100644 index 00000000..a6d15f27 --- /dev/null +++ b/src/main/resources/com/sparrowwallet/sparrow/about.fxml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/external/mac/hwi-1.1.2-mac-amd64-signed.zip b/src/main/resources/external/mac/hwi-1.1.2-mac-amd64-signed.zip index ab3ffc06..01d3bac2 100644 Binary files a/src/main/resources/external/mac/hwi-1.1.2-mac-amd64-signed.zip and b/src/main/resources/external/mac/hwi-1.1.2-mac-amd64-signed.zip differ