Skip to content

Commit

Permalink
Merge pull request #1896 from HenrikJannsen/improve-active-user-dsiplay
Browse files Browse the repository at this point in the history
Change text of Active users and add tooltip
  • Loading branch information
alvasw authored Mar 23, 2024
2 parents c0fe7fd + 52e7db3 commit 6580a6d
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,15 @@
import bisq.desktop.common.threading.UIScheduler;
import bisq.desktop.common.utils.GridPaneUtil;
import bisq.desktop.common.view.View;
import bisq.desktop.components.controls.BisqTooltip;
import bisq.desktop.main.notification.NotificationPanelView;
import bisq.i18n.Res;
import javafx.geometry.Insets;
import javafx.geometry.Pos;
import javafx.scene.control.Button;
import javafx.scene.control.Label;
import javafx.scene.control.ScrollPane;
import javafx.scene.control.Tooltip;
import javafx.scene.layout.GridPane;
import javafx.scene.layout.HBox;
import javafx.scene.layout.Priority;
Expand Down Expand Up @@ -72,6 +74,9 @@ public DashboardView(DashboardModel model, DashboardController controller) {
Pair<VBox, Label> usersPair = getValueBox(Res.get("dashboard.activeUsers"));
VBox activeUsers = usersPair.getFirst();
activeUsersLabel = usersPair.getSecond();
BisqTooltip tooltip = new BisqTooltip(Res.get("dashboard.activeUsers.tooltip"));
tooltip.setId("large-tooltip");
Tooltip.install(activeUsers, tooltip);

HBox.setMargin(marketPrice, new Insets(0, -100, 0, -30));
HBox hBox = new HBox(16, marketPrice, offersOnline, activeUsers);
Expand Down
7 changes: 7 additions & 0 deletions apps/desktop/desktop/src/main/resources/css/controls.css
Original file line number Diff line number Diff line change
Expand Up @@ -744,6 +744,13 @@
-fx-font-size: 0.85em;
}

#large-tooltip {
-fx-font-size: 1.2em;
-fx-font-family: "IBM Plex Sans Light";
-fx-text-fill: -fx-dark-text-color;
-fx-padding: 0.3em;
}


/*******************************************************************************
* *
Expand Down
3 changes: 2 additions & 1 deletion i18n/src/main/resources/application.properties
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,8 @@ topPanel.wallet.balance=Balance

dashboard.marketPrice=Latest market price
dashboard.offersOnline=Offers online
dashboard.activeUsers=Active users
dashboard.activeUsers=Active user profiles
dashboard.activeUsers.tooltip=Number of active user profiles in last 15 days
dashboard.main.headline=Get your first BTC
dashboard.main.content1=Start trading or browse open offers in the offerbook
dashboard.main.content2=Chat based and guided user interface for trading
Expand Down

0 comments on commit 6580a6d

Please sign in to comment.