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

Merge pull request #6324 from xyzmaker123/dao-governance-fix-menu-button

Browse source 
Updating DAO->Governance menu to indicate vote possible
This commit is contained in:
Christoph Atteneder 2022-09-21 10:10:20 +02:00 • committed by GitHub
commit dc5802930f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
desktop/src/main/java/bisq/desktop/main/dao/governance/GovernanceView.java
View file

@ -46,7 +46,8 @@ import javafx.scene.control.ToggleGroup;
import javafx.scene.layout.AnchorPane;
import javafx.scene.layout.VBox;
import javafx.beans.value.ChangeListener;
import org.fxmisc.easybind.EasyBind;
import org.fxmisc.easybind.Subscription;
import java.util.Arrays;
import java.util.List;
@ -67,7 +68,7 @@ public class GovernanceView extends ActivatableView<AnchorPane, Void> implements
private AnchorPane content;
private Class<? extends View> selectedViewClass;
private ChangeListener<DaoPhase.Phase> phaseChangeListener;
private Subscription phaseChangeSubscription;
private ToggleGroup toggleGroup;
@Inject
@ -89,13 +90,6 @@ public class GovernanceView extends ActivatableView<AnchorPane, Void> implements
loadView(selectedViewClass);
};
phaseChangeListener = (observable, oldValue, newValue) -> {
if (newValue == DaoPhase.Phase.BLIND_VOTE)
open.setLabelText(Res.get("dao.proposal.menuItem.vote"));
else
open.setLabelText(Res.get("dao.proposal.menuItem.browse"));
};
toggleGroup = new ToggleGroup();
List<Class<? extends View>> baseNavPath = Arrays.asList(MainView.class, DaoView.class, GovernanceView.class);
dashboard = new MenuItem(navigation, toggleGroup, Res.get("shared.dashboard"),
@ -113,7 +107,7 @@ public class GovernanceView extends ActivatableView<AnchorPane, Void> implements
@Override
protected void activate() {
if (daoStateService.isParseBlockChainComplete()) {
daoFacade.phaseProperty().addListener(phaseChangeListener);
phaseChangeSubscription = EasyBind.subscribe(daoFacade.phaseProperty(), this::setupOpenMenuButtonText);
} else {
daoStateService.addDaoStateListener(this);
}
@ -142,7 +136,10 @@ public class GovernanceView extends ActivatableView<AnchorPane, Void> implements
@SuppressWarnings("Duplicates")
@Override
protected void deactivate() {
daoFacade.phaseProperty().removeListener(phaseChangeListener);
if (phaseChangeSubscription != null) {
phaseChangeSubscription.unsubscribe();
}
daoStateService.removeDaoStateListener(this);
navigation.removeListener(navigationListener);
@ -160,7 +157,7 @@ public class GovernanceView extends ActivatableView<AnchorPane, Void> implements
@Override
public void onParseBlockChainComplete() {
daoFacade.phaseProperty().addListener(phaseChangeListener);
phaseChangeSubscription = EasyBind.subscribe(daoFacade.phaseProperty(), this::setupOpenMenuButtonText);
}
@ -177,6 +174,14 @@ public class GovernanceView extends ActivatableView<AnchorPane, Void> implements
else if (view instanceof ProposalsView) toggleGroup.selectToggle(open);
else if (view instanceof VoteResultView) toggleGroup.selectToggle(result);
}
private void setupOpenMenuButtonText(DaoPhase.Phase phase) {
if (phase == DaoPhase.Phase.BLIND_VOTE) {
open.setLabelText(Res.get("dao.proposal.menuItem.vote"));
} else {
open.setLabelText(Res.get("dao.proposal.menuItem.browse"));
}
}
}