mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-19 09:52:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update all combo boxes

Browse Source
This commit is contained in:
Christoph Atteneder 2018-08-23 12:44:30 +02:00
parent 2dfb0de1aa
commit 96cf03ff8d
No known key found for this signature in database
GPG Key ID: CD5DC1C529CDFD3B
5 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
desktop/src/main/java/bisq/desktop/components/paymentmethods/SepaForm.java
View File

@ -40,6 +40,8 @@ import bisq.core.util.validation.InputValidator;
import org.apache.commons.lang3.StringUtils;
import com.jfoenix.controls.JFXComboBox;
import javafx.scene.control.CheckBox;
import javafx.scene.control.ComboBox;
import javafx.scene.control.Label;
@ -130,8 +132,8 @@ public class SepaForm extends PaymentMethodForm {
FormBuilder.addLabel(gridPane, ++gridRow, Res.get("payment.bank.country"));
HBox hBox = new HBox();
hBox.setSpacing(10);
ComboBox<Country> countryComboBox = new ComboBox<>();
currencyComboBox = new ComboBox<>();
ComboBox<Country> countryComboBox = new JFXComboBox<>();
currencyComboBox = new JFXComboBox<>();
currencyTextField = new TextField("");
currencyTextField.setEditable(false);
currencyTextField.setMouseTransparent(true);

6
desktop/src/main/java/bisq/desktop/components/paymentmethods/SepaInstantForm.java
View File

@ -40,6 +40,8 @@ import bisq.core.util.validation.InputValidator;
import org.apache.commons.lang3.StringUtils;
import com.jfoenix.controls.JFXComboBox;
import javafx.scene.control.CheckBox;
import javafx.scene.control.ComboBox;
import javafx.scene.control.Label;
@ -130,8 +132,8 @@ public class SepaInstantForm extends PaymentMethodForm {
FormBuilder.addLabel(gridPane, ++gridRow, Res.get("payment.bank.country"));
HBox hBox = new HBox();
hBox.setSpacing(10);
ComboBox<Country> countryComboBox = new ComboBox<>();
currencyComboBox = new ComboBox<>();
ComboBox<Country> countryComboBox = new JFXComboBox<>();
currencyComboBox = new JFXComboBox<>();
currencyTextField = new TextField("");
currencyTextField.setEditable(false);
currencyTextField.setMouseTransparent(true);

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

@ -43,6 +43,8 @@ import org.bitcoinj.core.Coin;
import javax.inject.Inject;
import com.jfoenix.controls.JFXComboBox;
import javafx.scene.chart.NumberAxis;
import javafx.scene.chart.XYChart;
import javafx.scene.control.ComboBox;
@ -442,7 +444,7 @@ public class TradesChartsView extends ActivatableViewAndModel<VBox, TradesCharts
Label currencyLabel = new AutoTooltipLabel(Res.getWithCol("shared.currency"));
currencyLabel.setPadding(new Insets(0, 4, 0, 0));
currencyComboBox = new ComboBox<>();
currencyComboBox = new JFXComboBox<>();
currencyComboBox.setPromptText(Res.get("list.currency.select"));
currencyComboBox.setConverter(GUIUtil.getCurrencyListItemConverter(Res.get("shared.trade"),
Res.get("shared.trades"),

4
desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookView.java
View File

@ -67,6 +67,8 @@ import javax.inject.Inject;
import de.jensd.fx.glyphs.materialdesignicons.MaterialDesignIcon;
import com.jfoenix.controls.JFXComboBox;
import javafx.scene.Scene;
import javafx.scene.canvas.Canvas;
import javafx.scene.control.Button;
@ -161,7 +163,7 @@ public class OfferBookView extends ActivatableViewAndModel<GridPane, OfferBookVi
currencyComboBox = filterBoxTuple.third;
currencyComboBox.setPromptText(Res.get("list.currency.select"));
paymentMethodComboBox = new ComboBox<>();
paymentMethodComboBox = new JFXComboBox<>();
final Label paymentMethodLabel = new AutoTooltipLabel(Res.getWithCol("offerbook.filterByPaymentMethod"));
paymentMethodLabel.setPadding(new Insets(0, 0, 0, 10));
filterBox.getChildren().addAll(paymentMethodLabel, paymentMethodComboBox);

14
desktop/src/main/java/bisq/desktop/util/FormBuilder.java
View File

@ -48,6 +48,8 @@ import de.jensd.fx.fontawesome.AwesomeIcon;
import de.jensd.fx.glyphs.GlyphIcons;
import de.jensd.fx.glyphs.materialdesignicons.utils.MaterialDesignIconFactory;
import com.jfoenix.controls.JFXComboBox;
import javafx.scene.Node;
import javafx.scene.control.Button;
import javafx.scene.control.CheckBox;
@ -682,7 +684,7 @@ public class FormBuilder {
if (title != null)
label = addLabel(gridPane, rowIndex, title, top);
ComboBox<T> comboBox = new ComboBox<>();
ComboBox<T> comboBox = new JFXComboBox<>();
GridPane.setRowIndex(comboBox, rowIndex);
GridPane.setColumnIndex(comboBox, 1);
GridPane.setMargin(comboBox, new Insets(top, 0, 0, 0));
@ -721,7 +723,7 @@ public class FormBuilder {
hBox.setSpacing(4);
final AutoTooltipLabel label = new AutoTooltipLabel(title);
final ComboBox<T> comboBox = new ComboBox<>();
final ComboBox<T> comboBox = new JFXComboBox<>();
hBox.getChildren().addAll(label, comboBox);
GridPane.setRowIndex(hBox, rowIndex);
@ -747,8 +749,8 @@ public class FormBuilder {
HBox hBox = new HBox();
hBox.setSpacing(10);
ComboBox<T> comboBox1 = new ComboBox<>();
ComboBox<R> comboBox2 = new ComboBox<>();
ComboBox<T> comboBox1 = new JFXComboBox<>();
ComboBox<R> comboBox2 = new JFXComboBox<>();
hBox.getChildren().addAll(comboBox1, comboBox2);
GridPane.setRowIndex(hBox, rowIndex);
@ -783,7 +785,7 @@ public class FormBuilder {
Button button = new AutoTooltipButton(buttonTitle);
button.setDefaultButton(true);
ComboBox<T> comboBox = new ComboBox<>();
ComboBox<T> comboBox = new JFXComboBox<>();
hBox.getChildren().addAll(comboBox, button);
@ -817,7 +819,7 @@ public class FormBuilder {
HBox hBox = new HBox();
hBox.setSpacing(10);
ComboBox<T> comboBox = new ComboBox<>();
ComboBox<T> comboBox = new JFXComboBox<>();
TextField textField = new TextField(textFieldText);
textField.setEditable(false);
textField.setMouseTransparent(true);