sparrowwallet/sparrow
1
0
Fork 0
mirror of https://github.com/sparrowwallet/sparrow.git synced 2024-12-23 20:36:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

quit menu item

Browse source
This commit is contained in:
Craig Raw 2020-06-19 18:17:39 +02:00
parent efba293564
commit d33ccfb672
3 changed files with 28 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/main/java/com/sparrowwallet/sparrow/AppController.java
View file

@ -53,6 +53,8 @@ public class AppController implements Initializable {
public static final String DRAG_OVER_CLASS = "drag-over";
private MainApp application;
@FXML
private MenuItem exportWallet;
@ -96,7 +98,7 @@ public class AppController implements Initializable {
}
void initializeView() {
//setOsxApplicationMenu();
setOsxApplicationMenu();
rootStack.setOnDragOver(event -> {
if(event.getGestureSource() != rootStack && event.getDragboard().hasFiles()) {
@ -201,6 +203,10 @@ public class AppController implements Initializable {
return connectionService;
}
public void setApplication(MainApp application) {
this.application = application;
}
private void setOsxApplicationMenu() {
if(org.controlsfx.tools.Platform.getCurrent().getPlatformId().toLowerCase().equals("mac")) {
MenuToolkit tk = MenuToolkit.toolkit();
@ -347,6 +353,14 @@ public class AppController implements Initializable {
tabs.getTabs().remove(tabs.getSelectionModel().getSelectedItem());
}
public void quit(ActionEvent event) {
try {
application.stop();
} catch (Exception e) {
e.printStackTrace();
}
}
public void showTxHex(ActionEvent event) {
CheckMenuItem item = (CheckMenuItem)event.getSource();
EventManager.get().post(new TransactionTabChangedEvent(tabs.getSelectionModel().getSelectedItem(), item.isSelected()));

10
src/main/java/com/sparrowwallet/sparrow/MainApp.java
View file

@ -19,8 +19,12 @@ import java.util.Optional;
public class MainApp extends Application {
public static final String APP_NAME = "Sparrow";
private Stage mainStage;
@Override
public void start(Stage stage) throws Exception {
this.mainStage = stage;
GlyphFontRegistry.register(new FontAwesome5());
GlyphFontRegistry.register(new FontAwesome5Brands());
@ -42,6 +46,7 @@ public class MainApp extends Application {
FXMLLoader transactionLoader = new FXMLLoader(getClass().getResource("app.fxml"));
Parent root = transactionLoader.load();
AppController appController = transactionLoader.getController();
appController.setApplication(this);
Scene scene = new Scene(root);
scene.getStylesheets().add(getClass().getResource("app.css").toExternalForm());
@ -57,6 +62,11 @@ public class MainApp extends Application {
stage.show();
}
@Override
public void stop() throws Exception {
mainStage.close();
}
public static void main(String[] args) {
launch(args);
}

4
src/main/resources/com/sparrowwallet/sparrow/app.fxml
View file

@ -28,8 +28,10 @@
<MenuItem fx:id="exportWallet" mnemonicParsing="false" text="Export Wallet..." onAction="#exportWallet"/>
<SeparatorMenuItem styleClass="macHide" />
<MenuItem styleClass="macHide" mnemonicParsing="false" text="Preferences..." onAction="#openPreferences"/>
<SeparatorMenuItem />
<MenuItem mnemonicParsing="false" text="Close Tab" onAction="#closeTab"/>
<SeparatorMenuItem styleClass="macHide" />
<MenuItem styleClass="macHide" mnemonicParsing="false" text="Close" onAction="#closeTab"/>
<MenuItem styleClass="macHide" mnemonicParsing="false" text="Quit" onAction="#quit"/>
</items>
</Menu>
<Menu mnemonicParsing="false" text="View">