Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add version number to splash screen, update version in pw dialog to h… #1513

Merged
merged 1 commit into from
Dec 29, 2024
Merged

Add version number to splash screen, update version in pw dialog to h… #1513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions desktop/src/main/java/haveno/desktop/app/HavenoAppMain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,8 +212,8 @@ public PasswordDialog(String errorMessage) {
errorMessageField.setTextFill(Color.color(1, 0, 0));

// Create the version field
Label versionField = new Label(Version.VERSION);
Label versionField = new Label("v" + Version.VERSION);

// Set the dialog content
VBox vbox = new VBox(10);
vbox.getChildren().addAll(new ImageView(ImageUtil.getImageByPath("logo_splash.png")), versionField, passwordField, errorMessageField);
Expand Down
5 changes: 4 additions & 1 deletion desktop/src/main/java/haveno/desktop/main/MainView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import com.google.inject.Inject;
import com.jfoenix.controls.JFXBadge;
import com.jfoenix.controls.JFXComboBox;
import haveno.common.app.Version;
import haveno.common.HavenoException;
import haveno.common.Timer;
import haveno.common.UserThread;
Expand Down Expand Up @@ -510,6 +511,8 @@ private VBox createSplashScreen() {
ImageView logo = new ImageView();
logo.setId(Config.baseCurrencyNetwork() == BaseCurrencyNetwork.XMR_MAINNET ? "image-splash-logo" : "image-splash-testnet-logo");

Label versionLabel = new Label("v" + Version.VERSION);

// createBitcoinInfoBox
xmrSplashInfo = new AutoTooltipLabel();
xmrSplashInfo.textProperty().bind(model.getXmrInfo());
Expand Down Expand Up @@ -621,7 +624,7 @@ private VBox createSplashScreen() {
splashP2PNetworkBox.setPrefHeight(40);
splashP2PNetworkBox.getChildren().addAll(splashP2PNetworkLabel, splashP2PNetworkBusyAnimation, splashP2PNetworkIcon, showTorNetworkSettingsButton);

vBox.getChildren().addAll(logo, blockchainSyncBox, xmrSyncIndicator, splashP2PNetworkBox);
vBox.getChildren().addAll(logo, versionLabel, blockchainSyncBox, xmrSyncIndicator, splashP2PNetworkBox);
return vBox;
}

Expand Down
Loading