mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-03-03 10:46:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix wrong sub view selection in DAO view. Only allow DAO view if BTC is basecurrency

Browse source
This commit is contained in:
Manfred Karrer 2017-07-16 01:17:19 +02:00
parent 349ae774a8
commit 46dc82c02d
2 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gui/src/main/java/io/bisq/gui/main/MainView.java
View file

@ -149,6 +149,7 @@ public class MainView extends InitializableView<StackPane, MainViewModel> {
}
// TODO can be removed once DAO is released
if (BisqEnvironment.getBaseCurrencyNetwork().isBitcoin()) {
UserThread.runAfter(() -> {
root.getScene().addEventHandler(KeyEvent.KEY_RELEASED, keyEvent -> {
if (Utilities.isAltOrCtrlPressed(KeyCode.D, keyEvent)) {
@ -157,6 +158,7 @@ public class MainView extends InitializableView<StackPane, MainViewModel> {
}
});
}, 1);
}
HBox leftNavPane = new HBox(marketButton, buyButton, sellButton, portfolioButtonHolder, fundsButton, disputesButtonHolder) {{
setLeftAnchor(this, 10d);

11
gui/src/main/java/io/bisq/gui/main/dao/wallet/BsqWalletView.java
View file

@ -19,7 +19,6 @@ package io.bisq.gui.main.dao.wallet;
import de.jensd.fx.fontawesome.AwesomeDude;
import de.jensd.fx.fontawesome.AwesomeIcon;
import io.bisq.common.UserThread;
import io.bisq.common.app.DevEnv;
import io.bisq.common.locale.Res;
import io.bisq.gui.Navigation;
@ -83,14 +82,11 @@ public class BsqWalletView extends ActivatableViewAndModel {
transactions = new MenuItem(navigation, toggleGroup, Res.get("dao.wallet.menuItem.transactions"), BsqTxView.class, AwesomeIcon.TABLE);
leftVBox.getChildren().addAll(dashboard, send, receive, transactions);
//TODO
// TODO just until DAO is enabled
if (!DevEnv.DAO_ACTIVATED) {
dashboard.setDisable(true);
send.setDisable(true);
transactions.setDisable(true);
UserThread.execute(() -> {
receive.setSelected(true);
});
}
}
@ -108,8 +104,11 @@ public class BsqWalletView extends ActivatableViewAndModel {
if (selectedViewClass == null)
selectedViewClass = BsqDashboardView.class;
loadView(selectedViewClass);
// TODO just until DAO is enabled
if (!DevEnv.DAO_ACTIVATED)
selectedViewClass = BsqReceiveView.class;
loadView(selectedViewClass);
} else if (viewPath.size() == 4 && viewPath.indexOf(BsqWalletView.class) == 2) {
selectedViewClass = viewPath.get(3);
loadView(selectedViewClass);