mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-23 23:06:39 +01:00
Code Issues Projects Releases Packages Wiki Activity

Adapt new tabs style

Browse source
This commit is contained in:
Christoph Atteneder 2018-10-18 16:35:14 +02:00
parent e74ee8ec29
commit dc1f59a49e
No known key found for this signature in database
GPG key ID: CD5DC1C529CDFD3B
21 changed files with 141 additions and 126 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

90
desktop/src/main/java/bisq/desktop/bisq.css
View file

@ -114,6 +114,7 @@ bg color of non edit textFields: fafafa
-bs-rd-font-balance-label: #8E8E8E;
-bs-rd-font-dark-grey: #3c3c3c;
-bs-rd-nav-border: #535353;
-bs-rd-tab-border: #E2E0E0;
-bs-rd-nav-background-dark: #0E0E0E;
-bs-rd-black: #000000; /* 13 usages */
-bs-rd-black-transparent-dark: rgba(0, 0, 0, 0.54);
@ -457,7 +458,6 @@ bg color of non edit textFields: fafafa
.content-pane {
-fx-background-color: linear-gradient(-bs-rd-grey-background 0%, -bs-rd-grey-background-bottom 100%);
/*-fx-background-color: linear-gradient(red 0%, green 100%);*/
}
#footer-pane {
@ -528,7 +528,6 @@ bg color of non edit textFields: fafafa
.nav-button .text {
-fx-font-size: 0.769em;
/*-fx-font-family: "IBM Plex Sans Bold";*/
-fx-font-weight: bold;
-fx-fill: -bs-rd-nav-deselected;
}
@ -887,71 +886,79 @@ textfield */
* *
******************************************************************************/
.tab-pane {
-fx-border-color: -bs-rd-grey-light;
.jfx-tab-pane {
-fx-padding: 0;
-jfx-disable-animation: true;
}
.tab-pane > .tab-header-area > .headers-region > .tab {
-fx-background-insets: 1 2 0 2;
-fx-background-radius: 0 0 0 0;
-fx-padding: 0.083333em 2em 0.0769em 2em; /* 1 6 0.99 6 -fx-padding: 0 30 0 30;*/
.jfx-tab-pane .headers-region .tab .tab-container .tab-close-button {
-fx-background-color: transparent;
-fx-pref-width: 20;
-fx-pref-height: 20;
-fx-min-width: -fx-pref-width;
-fx-max-width: -fx-pref-width;
-fx-min-height: -fx-pref-height;
-fx-max-height: -fx-pref-height;
}
.tab-pane > .tab-header-area > .headers-region > .tab:top {
-fx-background-color: -bs-rd-grey-darker;
.jfx-tab-pane .headers-region .tab .tab-container .tab-close-button .jfx-rippler {
-jfx-rippler-fill: -fx-accent;
}
.tab-pane > .tab-header-area > .headers-region > .tab:right {
-fx-background-color: -bs-rd-grey-darker;
.jfx-tab-pane .headers-region .tab .tab-container .tab-close-button > .jfx-svg-glyph {
-fx-shape: "M810 274l-238 238 238 238-60 60-238-238-238 238-60-60 238-238-238-238 60-60 238 238 238-238z";
-jfx-size: 9;
-fx-background-color: -bs-rd-font-light;
}
.tab-pane > .tab-header-area > .headers-region > .tab:bottom {
-fx-background-color: -bs-rd-grey-darker;
.jfx-tab-pane .headers-region .tab .tab-container .tab-close-button {
-fx-padding: 0 0 2 0;
}
.tab-pane > .tab-header-area > .headers-region > .tab:left {
-fx-background-color: -bs-rd-grey-darker;
.jfx-tab-pane .headers-region .tab:selected .tab-container .tab-close-button > .jfx-svg-glyph {
-fx-background-color: -fx-accent;
}
.tab-pane:focused > .tab-header-area > .headers-region > .tab:selected .focus-indicator {
-fx-border-width: 0, 0;
-fx-border-color: -fx-focus-color, -fx-faint-focus-color;
-fx-border-insets: -4 -4 -6 -5, -2 -2 -5 -3;
-fx-border-radius: 0, 0; /* looks sharper if outer border has a tighter radius (2 instead of 3) */
}
.tab-pane > .tab-header-area > .headers-region > .tab:selected {
.jfx-tab-pane .tab-header-background {
-fx-background-color: -bs-rd-grey-background;
-fx-background-insets: 0 1 0 1;
-fx-border-width: 0 0 1 0;
-fx-border-color: -bs-rd-tab-border;
}
.tab-pane:focused > .tab-header-area > .headers-region > .tab:bottom:selected .focus-indicator {
-fx-border-insets: -6 -5 -4 -4, -5 -3 -2 -2;
.jfx-tab-pane .headers-region .tab-selected-line {
-fx-background-color: -fx-accent;
-fx-pref-height: 1;
}
.tab-pane > .tab-header-area > .tab-header-background {
/* TODO should not be using text-box-border I think? */
-fx-background-color: -bs-rd-grey-background-darker;
}
.tab-pane > .tab-header-area > .headers-region > .tab .tab-label {
.jfx-tab-pane .headers-region .tab .tab-container .tab-label {
-fx-text-fill: -bs-rd-font-light;
-fx-padding: 14;
-fx-font-size: 0.769em;
-fx-font-weight: normal;
}
.tab-pane > .tab-header-area > .headers-region > .tab:selected .tab-label {
-fx-text-fill: -bs-rd-font-dark;
.jfx-tab-pane .depth-container {
-fx-effect: none;
}
.tab-pane:focused {
-fx-background-color: transparent;
.jfx-tab-pane .headers-region .tab:selected .tab-container .tab-label {
-fx-text-fill: -fx-accent;
}
.tab-header-area:focused {
-fx-background-color: transparent;
.jfx-tab-pane .headers-region > .tab > .jfx-rippler {
-jfx-rippler-fill: -fx-accent;
}
.tab:focused {
-fx-background-color: transparent;
.jfx-tab-pane .headers-region .tab:closable {
-fx-border-color: transparent;
-fx-border-width: 0;
-fx-border-style: none;
-fx-border-insets: 0;
-fx-padding: 9;
}
.jfx-tab-pane .headers-region .tab:closable .tab-container .tab-label {
-fx-padding: 5;
}
#form-header-text {
@ -1384,6 +1391,7 @@ textfield */
.grid-pane {
-fx-background-color: -bs-content-bg-grey;
-fx-background-radius: 5;
-fx-effect: null;
-fx-effect: dropshadow(gaussian, -bs-dark-grey, 10, 0, 0, 0);
-fx-background-insets: 10;
}

2
desktop/src/main/java/bisq/desktop/main/MainView.java
View file

@ -286,7 +286,7 @@ public class MainView extends InitializableView<StackPane, MainViewModel> {
getStyleClass().add("content-pane");
setLeftAnchor(this, 0d);
setRightAnchor(this, 0d);
setTopAnchor(this, 60d);
setTopAnchor(this, 57d);
setBottomAnchor(this, 0d);
}};

14
desktop/src/main/java/bisq/desktop/main/account/AccountView.fxml
View file

@ -17,14 +17,14 @@
~ along with Bisq. If not, see <http://www.gnu.org/licenses/>.
-->
<?import com.jfoenix.controls.JFXTabPane?>
<?import javafx.scene.control.Tab?>
<?import javafx.scene.control.TabPane?>
<?import javafx.scene.layout.AnchorPane?>
<TabPane fx:id="root" fx:controller="bisq.desktop.main.account.AccountView"
prefHeight="630.0" prefWidth="1000.0"
AnchorPane.bottomAnchor="0" AnchorPane.leftAnchor="0"
AnchorPane.rightAnchor="0" AnchorPane.topAnchor="0"
xmlns:fx="http://javafx.com/fxml">
<JFXTabPane fx:id="root" fx:controller="bisq.desktop.main.account.AccountView"
prefHeight="630.0" prefWidth="1000.0"
AnchorPane.bottomAnchor="0" AnchorPane.leftAnchor="0"
AnchorPane.rightAnchor="0" AnchorPane.topAnchor="0"
xmlns:fx="http://javafx.com/fxml">
<Tab fx:id="accountSettingsTab" closable="false"/>
</TabPane>
</JFXTabPane>

4
desktop/src/main/java/bisq/desktop/main/account/AccountView.java
View file

@ -86,7 +86,7 @@ public class AccountView extends ActivatableView<TabPane, Void> {
keyEventEventHandler = event -> {
if (Utilities.isAltOrCtrlPressed(KeyCode.R, event) &&
arbitratorRegistrationTab == null) {
arbitratorRegistrationTab = new Tab(Res.get("account.tab.arbitratorRegistration"));
arbitratorRegistrationTab = new Tab(Res.get("account.tab.arbitratorRegistration").toUpperCase());
arbitratorRegistrationTab.setClosable(false);
root.getTabs().add(arbitratorRegistrationTab);
}
@ -150,7 +150,7 @@ public class AccountView extends ActivatableView<TabPane, Void> {
if (view instanceof AccountSettingsView) {
selectedTab = accountSettingsTab;
accountSettingsView = (AccountSettingsView) view;
selectedTab.setText(Res.get("account.tab.account"));
selectedTab.setText(Res.get("account.tab.account").toUpperCase());
if (arbitratorRegistrationTab != null) {
arbitratorRegistrationTab.setDisable(false);
if (arbitratorRegistrationView != null)

12
desktop/src/main/java/bisq/desktop/main/dao/DaoView.fxml
View file

@ -17,10 +17,10 @@
~ along with Bisq. If not, see <http://www.gnu.org/licenses/>.
-->
<?import javafx.scene.control.TabPane?>
<?import com.jfoenix.controls.JFXTabPane?>
<?import javafx.scene.layout.AnchorPane?>
<TabPane fx:id="root" fx:controller="bisq.desktop.main.dao.DaoView"
AnchorPane.bottomAnchor="0" AnchorPane.leftAnchor="0"
AnchorPane.rightAnchor="0" AnchorPane.topAnchor="0"
xmlns:fx="http://javafx.com/fxml">
</TabPane>
<JFXTabPane fx:id="root" fx:controller="bisq.desktop.main.dao.DaoView"
AnchorPane.bottomAnchor="0" AnchorPane.leftAnchor="0"
AnchorPane.rightAnchor="0" AnchorPane.topAnchor="0"
xmlns:fx="http://javafx.com/fxml">
</JFXTabPane>

6
desktop/src/main/java/bisq/desktop/main/dao/DaoView.java
View file

@ -71,9 +71,9 @@ public class DaoView extends ActivatableViewAndModel<TabPane, Activatable> {
@Override
public void initialize() {
bsqWalletTab = new Tab(Res.get("dao.tab.bsqWallet"));
proposalsTab = new Tab(Res.get("dao.tab.proposals"));
bondingTab = new Tab(Res.get("dao.tab.bonding"));
bsqWalletTab = new Tab(Res.get("dao.tab.bsqWallet").toUpperCase());
proposalsTab = new Tab(Res.get("dao.tab.proposals").toUpperCase());
bondingTab = new Tab(Res.get("dao.tab.bonding").toUpperCase());
bsqWalletTab.setClosable(false);
proposalsTab.setClosable(false);

12
desktop/src/main/java/bisq/desktop/main/disputes/DisputesView.fxml
View file

@ -17,14 +17,14 @@
~ along with Bisq. If not, see <http://www.gnu.org/licenses/>.
-->
<?import com.jfoenix.controls.JFXTabPane?>
<?import javafx.scene.control.Tab?>
<?import javafx.scene.control.TabPane?>
<?import javafx.scene.layout.AnchorPane?>
<TabPane fx:id="root" fx:controller="bisq.desktop.main.disputes.DisputesView"
AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0"
AnchorPane.topAnchor="0.0"
xmlns:fx="http://javafx.com/fxml">
<JFXTabPane fx:id="root" fx:controller="bisq.desktop.main.disputes.DisputesView"
AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0"
AnchorPane.topAnchor="0.0"
xmlns:fx="http://javafx.com/fxml">
<Tab fx:id="tradersDisputesTab" closable="false"/>
</TabPane>
</JFXTabPane>

6
desktop/src/main/java/bisq/desktop/main/disputes/DisputesView.java
View file

@ -84,7 +84,7 @@ public class DisputesView extends ActivatableViewAndModel<TabPane, Activatable>
@Override
public void initialize() {
log.debug("initialize ");
tradersDisputesTab.setText(Res.get("support.tab.support"));
tradersDisputesTab.setText(Res.get("support.tab.support").toUpperCase());
navigationListener = viewPath -> {
if (viewPath.size() == 3 && viewPath.indexOf(DisputesView.class) == 1)
loadView(viewPath.tip());
@ -108,10 +108,10 @@ public class DisputesView extends ActivatableViewAndModel<TabPane, Activatable>
.anyMatch(d -> d.getArbitratorPubKeyRing().equals(keyRing.getPubKeyRing()));
if (arbitratorsDisputesTab == null && (isActiveArbitrator || hasDisputesAsArbitrator)) {
arbitratorsDisputesTab = new Tab(Res.get("support.tab.ArbitratorsSupportTickets"));
arbitratorsDisputesTab = new Tab(Res.get("support.tab.ArbitratorsSupportTickets").toUpperCase());
arbitratorsDisputesTab.setClosable(false);
root.getTabs().add(arbitratorsDisputesTab);
tradersDisputesTab.setText(Res.get("support.tab.TradersSupportTickets"));
tradersDisputesTab.setText(Res.get("support.tab.TradersSupportTickets").toUpperCase());
}
}

12
desktop/src/main/java/bisq/desktop/main/funds/FundsView.fxml
View file

@ -16,13 +16,13 @@
~ along with Bisq. If not, see <http://www.gnu.org/licenses/>.
-->
<?import com.jfoenix.controls.JFXTabPane?>
<?import javafx.scene.control.Tab?>
<?import javafx.scene.control.TabPane?>
<?import javafx.scene.layout.AnchorPane?>
<TabPane fx:id="root" fx:controller="bisq.desktop.main.funds.FundsView"
AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0"
AnchorPane.topAnchor="0.0"
xmlns:fx="http://javafx.com/fxml">
<JFXTabPane fx:id="root" fx:controller="bisq.desktop.main.funds.FundsView"
AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0"
AnchorPane.topAnchor="0.0"
xmlns:fx="http://javafx.com/fxml">
<Tab fx:id="depositTab" closable="false"/>
<Tab fx:id="withdrawalTab" closable="false"/>
@ -30,4 +30,4 @@
<Tab fx:id="lockedTab" closable="false"/>
<Tab fx:id="transactionsTab" closable="false"/>
</TabPane>
</JFXTabPane>

10
desktop/src/main/java/bisq/desktop/main/funds/FundsView.java
View file

@ -63,11 +63,11 @@ public class FundsView extends ActivatableViewAndModel<TabPane, Activatable> {
@Override
public void initialize() {
depositTab.setText(Res.get("funds.tab.deposit"));
withdrawalTab.setText(Res.get("funds.tab.withdrawal"));
reservedTab.setText(Res.get("funds.tab.reserved"));
lockedTab.setText(Res.get("funds.tab.locked"));
transactionsTab.setText(Res.get("funds.tab.transactions"));
depositTab.setText(Res.get("funds.tab.deposit").toUpperCase());
withdrawalTab.setText(Res.get("funds.tab.withdrawal").toUpperCase());
reservedTab.setText(Res.get("funds.tab.reserved").toUpperCase());
lockedTab.setText(Res.get("funds.tab.locked").toUpperCase());
transactionsTab.setText(Res.get("funds.tab.transactions").toUpperCase());
navigationListener = viewPath -> {
if (viewPath.size() == 3 && viewPath.indexOf(FundsView.class) == 1)

12
desktop/src/main/java/bisq/desktop/main/market/MarketView.fxml
View file

@ -17,14 +17,14 @@
~ along with Bisq. If not, see <http://www.gnu.org/licenses/>.
-->
<?import com.jfoenix.controls.JFXTabPane?>
<?import javafx.scene.control.ScrollPane?>
<?import javafx.scene.control.Tab?>
<?import javafx.scene.control.TabPane?>
<?import javafx.scene.layout.AnchorPane?>
<TabPane fx:id="root" fx:controller="bisq.desktop.main.market.MarketView"
AnchorPane.bottomAnchor="0" AnchorPane.leftAnchor="0"
AnchorPane.rightAnchor="0" AnchorPane.topAnchor="0"
xmlns:fx="http://javafx.com/fxml">
<JFXTabPane fx:id="root" fx:controller="bisq.desktop.main.market.MarketView"
AnchorPane.bottomAnchor="0" AnchorPane.leftAnchor="0"
AnchorPane.rightAnchor="0" AnchorPane.topAnchor="0"
xmlns:fx="http://javafx.com/fxml">
<Tab fx:id="offerBookTab" closable="false">
<ScrollPane fitToWidth="true" hbarPolicy="NEVER"
@ -37,4 +37,4 @@
AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0"
AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"/>
</Tab>
</TabPane>
</JFXTabPane>

6
desktop/src/main/java/bisq/desktop/main/market/MarketView.java
View file

@ -90,9 +90,9 @@ public class MarketView extends ActivatableViewAndModel<TabPane, Activatable> {
@Override
public void initialize() {
offerBookTab.setText(Res.get("market.tabs.offerBook"));
spreadTab.setText(Res.get("market.tabs.spread"));
tradesTab.setText(Res.get("market.tabs.trades"));
offerBookTab.setText(Res.get("market.tabs.offerBook").toUpperCase());
spreadTab.setText(Res.get("market.tabs.spread").toUpperCase());
tradesTab.setText(Res.get("market.tabs.trades").toUpperCase());
navigationListener = viewPath -> {
if (viewPath.size() == 3 && viewPath.indexOf(MarketView.class) == 1)

5
desktop/src/main/java/bisq/desktop/main/market/offerbook/OfferBookChartView.java
View file

@ -48,6 +48,8 @@ import bisq.common.util.Tuple4;
import javax.inject.Inject;
import javax.inject.Named;
import com.jfoenix.controls.JFXTabPane;
import javafx.scene.chart.AreaChart;
import javafx.scene.chart.NumberAxis;
import javafx.scene.chart.XYChart;
@ -56,7 +58,6 @@ import javafx.scene.control.ComboBox;
import javafx.scene.control.Label;
import javafx.scene.control.SingleSelectionModel;
import javafx.scene.control.Tab;
import javafx.scene.control.TabPane;
import javafx.scene.control.TableCell;
import javafx.scene.control.TableColumn;
import javafx.scene.control.TableView;
@ -181,7 +182,7 @@ public class OfferBookChartView extends ActivatableViewAndModel<VBox, OfferBookC
@Override
protected void activate() {
// root.getParent() is null at initialize
tabPaneSelectionModel = GUIUtil.getParentOfType(root, TabPane.class).getSelectionModel();
tabPaneSelectionModel = GUIUtil.getParentOfType(root, JFXTabPane.class).getSelectionModel();
selectedTabIndexListener = (observable, oldValue, newValue) -> model.setSelectedTabIndex((int) newValue);
model.setSelectedTabIndex(tabPaneSelectionModel.getSelectedIndex());

4
desktop/src/main/java/bisq/desktop/main/market/trades/TradesChartsView.java
View file

@ -44,6 +44,7 @@ import org.bitcoinj.core.Coin;
import javax.inject.Inject;
import com.jfoenix.controls.JFXComboBox;
import com.jfoenix.controls.JFXTabPane;
import javafx.scene.chart.NumberAxis;
import javafx.scene.chart.XYChart;
@ -51,7 +52,6 @@ import javafx.scene.control.ComboBox;
import javafx.scene.control.Label;
import javafx.scene.control.SingleSelectionModel;
import javafx.scene.control.Tab;
import javafx.scene.control.TabPane;
import javafx.scene.control.TableCell;
import javafx.scene.control.TableColumn;
import javafx.scene.control.TableView;
@ -176,7 +176,7 @@ public class TradesChartsView extends ActivatableViewAndModel<VBox, TradesCharts
@Override
protected void activate() {
// root.getParent() is null at initialize
tabPaneSelectionModel = GUIUtil.getParentOfType(root, TabPane.class).getSelectionModel();
tabPaneSelectionModel = GUIUtil.getParentOfType(root, JFXTabPane.class).getSelectionModel();
selectedTabIndexListener = (observable, oldValue, newValue) -> model.setSelectedTabIndex((int) newValue);
model.setSelectedTabIndex(tabPaneSelectionModel.getSelectedIndex());
tabPaneSelectionModel.selectedIndexProperty().addListener(selectedTabIndexListener);

10
desktop/src/main/java/bisq/desktop/main/offer/BuyOfferView.fxml
View file

@ -17,9 +17,9 @@
~ along with Bisq. If not, see <http://www.gnu.org/licenses/>.
-->
<?import javafx.scene.control.TabPane?>
<?import com.jfoenix.controls.JFXTabPane?>
<?import javafx.scene.layout.AnchorPane?>
<TabPane fx:id="root" fx:controller="bisq.desktop.main.offer.BuyOfferView"
AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0"
AnchorPane.topAnchor="0.0"
xmlns:fx="http://javafx.com/fxml"/>
<JFXTabPane fx:id="root" fx:controller="bisq.desktop.main.offer.BuyOfferView"
AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0"
AnchorPane.topAnchor="0.0"
xmlns:fx="http://javafx.com/fxml"/>

9
desktop/src/main/java/bisq/desktop/main/offer/OfferView.java
View file

@ -141,22 +141,23 @@ public abstract class OfferView extends ActivatableView<TabPane, Void> {
}
private String getCreateOfferTabName() {
return Res.get("offerbook.createOffer");
return Res.get("offerbook.createOffer").toUpperCase();
}
private String getTakeOfferTabName() {
return Res.get("offerbook.takeOffer");
return Res.get("offerbook.takeOffer").toUpperCase();
}
private void loadView(Class<? extends View> viewClass) {
TabPane tabPane = root;
tabPane.setTabClosingPolicy(TabPane.TabClosingPolicy.ALL_TABS);
View view;
boolean isBuy = direction == OfferPayload.Direction.BUY;
if (viewClass == OfferBookView.class && offerBookView == null) {
view = viewLoader.load(viewClass);
// Offerbook must not be cached by ViewLoader as we use 2 instances for sell and buy screens.
offerBookTab = new Tab(isBuy ? Res.get("shared.buyBitcoin") : Res.get("shared.sellBitcoin"));
offerBookTab = new Tab(isBuy ? Res.get("shared.buyBitcoin").toUpperCase() : Res.get("shared.sellBitcoin").toUpperCase());
offerBookTab.setClosable(false);
offerBookTab.setContent(view.getRoot());
tabPane.getTabs().add(offerBookTab);
@ -200,6 +201,7 @@ public abstract class OfferView extends ActivatableView<TabPane, Void> {
createOfferView.initWithData(direction, tradeCurrency);
createOfferPane = createOfferView.getRoot();
createOfferTab = new Tab(getCreateOfferTabName());
createOfferTab.setClosable(true);
// close handler from close on create offer action
createOfferView.setCloseHandler(() -> tabPane.getTabs().remove(createOfferTab));
createOfferTab.setContent(createOfferPane);
@ -213,6 +215,7 @@ public abstract class OfferView extends ActivatableView<TabPane, Void> {
takeOfferView.initWithData(offer);
takeOfferPane = ((TakeOfferView) view).getRoot();
takeOfferTab = new Tab(getTakeOfferTabName());
takeOfferTab.setClosable(true);
// close handler from close on take offer action
takeOfferView.setCloseHandler(() -> tabPane.getTabs().remove(takeOfferTab));
takeOfferTab.setContent(takeOfferPane);

10
desktop/src/main/java/bisq/desktop/main/offer/SellOfferView.fxml
View file

@ -17,9 +17,9 @@
~ along with Bisq. If not, see <http://www.gnu.org/licenses/>.
-->
<?import javafx.scene.control.TabPane?>
<?import com.jfoenix.controls.JFXTabPane?>
<?import javafx.scene.layout.AnchorPane?>
<TabPane fx:id="root" fx:controller="bisq.desktop.main.offer.SellOfferView"
AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0"
AnchorPane.topAnchor="0.0"
xmlns:fx="http://javafx.com/fxml"/>
<JFXTabPane fx:id="root" fx:controller="bisq.desktop.main.offer.SellOfferView"
AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0"
AnchorPane.topAnchor="0.0"
xmlns:fx="http://javafx.com/fxml"/>

12
desktop/src/main/java/bisq/desktop/main/portfolio/PortfolioView.fxml
View file

@ -17,16 +17,16 @@
~ along with Bisq. If not, see <http://www.gnu.org/licenses/>.
-->
<?import com.jfoenix.controls.JFXTabPane?>
<?import javafx.scene.control.Tab?>
<?import javafx.scene.control.TabPane?>
<?import javafx.scene.layout.AnchorPane?>
<TabPane fx:id="root" fx:controller="bisq.desktop.main.portfolio.PortfolioView"
AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0"
AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"
xmlns:fx="http://javafx.com/fxml">
<JFXTabPane fx:id="root" fx:controller="bisq.desktop.main.portfolio.PortfolioView"
AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0"
AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"
xmlns:fx="http://javafx.com/fxml">
<Tab fx:id="openOffersTab" closable="false"/>
<Tab fx:id="pendingTradesTab" closable="false"/>
<Tab fx:id="closedTradesTab" closable="false"/>
</TabPane>
</JFXTabPane>

13
desktop/src/main/java/bisq/desktop/main/portfolio/PortfolioView.java
View file

@ -55,7 +55,7 @@ public class PortfolioView extends ActivatableViewAndModel<TabPane, Activatable>
@FXML
Tab openOffersTab, pendingTradesTab, closedTradesTab;
private Tab editOpenOfferTab;
private final Tab failedTradesTab = new Tab(Res.get("portfolio.tab.failed"));
private final Tab failedTradesTab = new Tab(Res.get("portfolio.tab.failed").toUpperCase());
private Tab currentTab;
private Navigation.Listener navigationListener;
private ChangeListener<Tab> tabChangeListener;
@ -78,9 +78,12 @@ public class PortfolioView extends ActivatableViewAndModel<TabPane, Activatable>
@Override
public void initialize() {
openOffersTab.setText(Res.get("portfolio.tab.openOffers"));
pendingTradesTab.setText(Res.get("portfolio.tab.pendingTrades"));
closedTradesTab.setText(Res.get("portfolio.tab.history"));
root.setTabClosingPolicy(TabPane.TabClosingPolicy.ALL_TABS);
failedTradesTab.setClosable(false);
openOffersTab.setText(Res.get("portfolio.tab.openOffers").toUpperCase());
pendingTradesTab.setText(Res.get("portfolio.tab.pendingTrades").toUpperCase());
closedTradesTab.setText(Res.get("portfolio.tab.history").toUpperCase());
navigationListener = viewPath -> {
if (viewPath.size() == 3 && viewPath.indexOf(PortfolioView.class) == 1)
@ -179,7 +182,7 @@ public class PortfolioView extends ActivatableViewAndModel<TabPane, Activatable>
if (editOfferView == null) {
editOfferView = (EditOfferView) view;
editOfferView.applyOpenOffer(openOffer);
editOpenOfferTab = new Tab(Res.get("portfolio.tab.editOpenOffer"));
editOpenOfferTab = new Tab(Res.get("portfolio.tab.editOpenOffer").toUpperCase());
editOfferView.setCloseHandler(() -> {
root.getTabs().remove(editOpenOfferTab);
});

12
desktop/src/main/java/bisq/desktop/main/settings/SettingsView.fxml
View file

@ -17,14 +17,14 @@
~ along with Bisq. If not, see <http://www.gnu.org/licenses/>.
-->
<?import com.jfoenix.controls.JFXTabPane?>
<?import javafx.scene.control.ScrollPane?>
<?import javafx.scene.control.Tab?>
<?import javafx.scene.control.TabPane?>
<?import javafx.scene.layout.AnchorPane?>
<TabPane fx:id="root" fx:controller="bisq.desktop.main.settings.SettingsView"
AnchorPane.bottomAnchor="0" AnchorPane.leftAnchor="0"
AnchorPane.rightAnchor="0" AnchorPane.topAnchor="0"
xmlns:fx="http://javafx.com/fxml">
<JFXTabPane fx:id="root" fx:controller="bisq.desktop.main.settings.SettingsView"
AnchorPane.bottomAnchor="0" AnchorPane.leftAnchor="0"
AnchorPane.rightAnchor="0" AnchorPane.topAnchor="0"
xmlns:fx="http://javafx.com/fxml">
<Tab fx:id="preferencesTab" closable="false">
<ScrollPane fitToWidth="true" hbarPolicy="NEVER"
@ -41,4 +41,4 @@
AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0"
AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"/>
</Tab>
</TabPane>
</JFXTabPane>

6
desktop/src/main/java/bisq/desktop/main/settings/SettingsView.java
View file

@ -58,9 +58,9 @@ public class SettingsView extends ActivatableViewAndModel<TabPane, Activatable>
@Override
public void initialize() {
preferencesTab.setText(Res.get("settings.tab.preferences"));
networkTab.setText(Res.get("settings.tab.network"));
aboutTab.setText(Res.get("settings.tab.about"));
preferencesTab.setText(Res.get("settings.tab.preferences").toUpperCase());
networkTab.setText(Res.get("settings.tab.network").toUpperCase());
aboutTab.setText(Res.get("settings.tab.about").toUpperCase());
navigationListener = viewPath -> {
if (viewPath.size() == 3 && viewPath.indexOf(SettingsView.class) == 1)