mirror of
https://github.com/sparrowwallet/sparrow.git
synced 2024-11-04 21:36:45 +00:00
add restart in testnet/mainnet menu command
This commit is contained in:
parent
984cabfc03
commit
c981cf32b9
3 changed files with 55 additions and 0 deletions
|
@ -1,5 +1,6 @@
|
||||||
package com.sparrowwallet.sparrow;
|
package com.sparrowwallet.sparrow;
|
||||||
|
|
||||||
|
import com.beust.jcommander.JCommander;
|
||||||
import com.google.common.base.Charsets;
|
import com.google.common.base.Charsets;
|
||||||
import com.google.common.eventbus.Subscribe;
|
import com.google.common.eventbus.Subscribe;
|
||||||
import com.google.common.io.ByteSource;
|
import com.google.common.io.ByteSource;
|
||||||
|
@ -90,6 +91,7 @@ public class AppController implements Initializable {
|
||||||
public static final String LOADING_TRANSACTIONS_MESSAGE = "Loading wallet, select Transactions tab to view...";
|
public static final String LOADING_TRANSACTIONS_MESSAGE = "Loading wallet, select Transactions tab to view...";
|
||||||
public static final String CONNECTION_FAILED_PREFIX = "Connection failed: ";
|
public static final String CONNECTION_FAILED_PREFIX = "Connection failed: ";
|
||||||
public static final String TRYING_ANOTHER_SERVER_MESSAGE = "trying another server...";
|
public static final String TRYING_ANOTHER_SERVER_MESSAGE = "trying another server...";
|
||||||
|
public static final String JPACKAGE_APP_PATH = "jpackage.app-path";
|
||||||
|
|
||||||
@FXML
|
@FXML
|
||||||
private MenuItem saveTransaction;
|
private MenuItem saveTransaction;
|
||||||
|
@ -181,6 +183,9 @@ public class AppController implements Initializable {
|
||||||
private CheckMenuItem preventSleep;
|
private CheckMenuItem preventSleep;
|
||||||
private static final BooleanProperty preventSleepProperty = new SimpleBooleanProperty();
|
private static final BooleanProperty preventSleepProperty = new SimpleBooleanProperty();
|
||||||
|
|
||||||
|
@FXML
|
||||||
|
private MenuItem restart;
|
||||||
|
|
||||||
@FXML
|
@FXML
|
||||||
private StackPane rootStack;
|
private StackPane rootStack;
|
||||||
|
|
||||||
|
@ -334,6 +339,8 @@ public class AppController implements Initializable {
|
||||||
showLoadingLog.selectedProperty().bindBidirectional(showLoadingLogProperty);
|
showLoadingLog.selectedProperty().bindBidirectional(showLoadingLogProperty);
|
||||||
preventSleepProperty.set(Config.get().isPreventSleep());
|
preventSleepProperty.set(Config.get().isPreventSleep());
|
||||||
preventSleep.selectedProperty().bindBidirectional(preventSleepProperty);
|
preventSleep.selectedProperty().bindBidirectional(preventSleepProperty);
|
||||||
|
restart.setText("Restart in " + (Network.get() == Network.MAINNET ? Network.TESTNET.toDisplayString() : Network.MAINNET.toDisplayString()));
|
||||||
|
restart.setVisible(System.getProperty(JPACKAGE_APP_PATH) != null);
|
||||||
|
|
||||||
saveTransaction.setDisable(true);
|
saveTransaction.setDisable(true);
|
||||||
showTransaction.visibleProperty().bind(Bindings.and(saveTransaction.visibleProperty(), saveTransaction.disableProperty().not()));
|
showTransaction.visibleProperty().bind(Bindings.and(saveTransaction.visibleProperty(), saveTransaction.disableProperty().not()));
|
||||||
|
@ -839,6 +846,31 @@ public class AppController implements Initializable {
|
||||||
AppServices.get().setPreventSleep(item.isSelected());
|
AppServices.get().setPreventSleep(item.isSelected());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void restart(ActionEvent event) {
|
||||||
|
if(System.getProperty(JPACKAGE_APP_PATH) == null) {
|
||||||
|
throw new IllegalStateException("Property " + JPACKAGE_APP_PATH + " is not present");
|
||||||
|
}
|
||||||
|
|
||||||
|
Args args = new Args();
|
||||||
|
ProcessHandle.current().info().arguments().ifPresent(argv -> {
|
||||||
|
JCommander jCommander = JCommander.newBuilder().addObject(args).acceptUnknownOptions(true).build();
|
||||||
|
jCommander.parse(argv);
|
||||||
|
});
|
||||||
|
|
||||||
|
args.network = (Network.get() == Network.MAINNET ? Network.TESTNET : Network.MAINNET);
|
||||||
|
|
||||||
|
try {
|
||||||
|
List<String> cmd = new ArrayList<>();
|
||||||
|
cmd.add(System.getProperty(JPACKAGE_APP_PATH));
|
||||||
|
cmd.addAll(args.toParams());
|
||||||
|
final ProcessBuilder builder = new ProcessBuilder(cmd);
|
||||||
|
builder.start();
|
||||||
|
quit(event);
|
||||||
|
} catch(Exception e) {
|
||||||
|
log.error("Error restarting application", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public void openFile(File file) {
|
public void openFile(File file) {
|
||||||
if(isWalletFile(file)) {
|
if(isWalletFile(file)) {
|
||||||
openWalletFile(file, true);
|
openWalletFile(file, true);
|
||||||
|
|
|
@ -4,6 +4,9 @@ import com.beust.jcommander.Parameter;
|
||||||
import com.sparrowwallet.drongo.Network;
|
import com.sparrowwallet.drongo.Network;
|
||||||
import org.slf4j.event.Level;
|
import org.slf4j.event.Level;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
public class Args {
|
public class Args {
|
||||||
@Parameter(names = { "--dir", "-d" }, description = "Path to Sparrow home folder")
|
@Parameter(names = { "--dir", "-d" }, description = "Path to Sparrow home folder")
|
||||||
public String dir;
|
public String dir;
|
||||||
|
@ -16,4 +19,23 @@ public class Args {
|
||||||
|
|
||||||
@Parameter(names = { "--help", "-h" }, description = "Show usage", help = true)
|
@Parameter(names = { "--help", "-h" }, description = "Show usage", help = true)
|
||||||
public boolean help;
|
public boolean help;
|
||||||
|
|
||||||
|
public List<String> toParams() {
|
||||||
|
List<String> params = new ArrayList<>();
|
||||||
|
|
||||||
|
if(dir != null) {
|
||||||
|
params.add("-d");
|
||||||
|
params.add(dir);
|
||||||
|
}
|
||||||
|
if(network != null) {
|
||||||
|
params.add("-n");
|
||||||
|
params.add(network.toString());
|
||||||
|
}
|
||||||
|
if(level != null) {
|
||||||
|
params.add("-l");
|
||||||
|
params.add(level.toString());
|
||||||
|
}
|
||||||
|
|
||||||
|
return params;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -118,6 +118,7 @@
|
||||||
<SeparatorMenuItem />
|
<SeparatorMenuItem />
|
||||||
<MenuItem styleClass="osxHide,windowsHide" mnemonicParsing="false" text="Install Udev Rules" onAction="#installUdevRules"/>
|
<MenuItem styleClass="osxHide,windowsHide" mnemonicParsing="false" text="Install Udev Rules" onAction="#installUdevRules"/>
|
||||||
<CheckMenuItem fx:id="preventSleep" mnemonicParsing="false" text="Prevent Computer Sleep" onAction="#preventSleep"/>
|
<CheckMenuItem fx:id="preventSleep" mnemonicParsing="false" text="Prevent Computer Sleep" onAction="#preventSleep"/>
|
||||||
|
<MenuItem fx:id="restart" mnemonicParsing="false" text="Restart" onAction="#restart" />
|
||||||
</Menu>
|
</Menu>
|
||||||
<Menu fx:id="helpMenu" mnemonicParsing="false" text="Help">
|
<Menu fx:id="helpMenu" mnemonicParsing="false" text="Help">
|
||||||
<MenuItem mnemonicParsing="false" text="Show Introduction" onAction="#showIntroduction"/>
|
<MenuItem mnemonicParsing="false" text="Show Introduction" onAction="#showIntroduction"/>
|
||||||
|
|
Loading…
Reference in a new issue