diff --git a/build.gradle b/build.gradle index 888bcab3..9603137a 100644 --- a/build.gradle +++ b/build.gradle @@ -53,7 +53,7 @@ tasks.withType(AbstractArchiveTask) { } javafx { - version = "18" + version = headless ? "18" : "22" modules = [ 'javafx.controls', 'javafx.fxml', 'javafx.swing', 'javafx.graphics' ] } diff --git a/src/main/java/com/sparrowwallet/sparrow/control/AddressTreeTable.java b/src/main/java/com/sparrowwallet/sparrow/control/AddressTreeTable.java index fbf7f5bc..d3437cb6 100644 --- a/src/main/java/com/sparrowwallet/sparrow/control/AddressTreeTable.java +++ b/src/main/java/com/sparrowwallet/sparrow/control/AddressTreeTable.java @@ -77,7 +77,7 @@ public class AddressTreeTable extends CoinTreeTable { getColumns().forEach(col -> col.setContextMenu(contextMenu)); setEditable(true); - setColumnResizePolicy(TreeTableView.CONSTRAINED_RESIZE_POLICY); + setEqualPreferredColumnWidths(); addressCol.setSortType(TreeTableColumn.SortType.ASCENDING); getSortOrder().add(addressCol); diff --git a/src/main/java/com/sparrowwallet/sparrow/control/CoinTreeTable.java b/src/main/java/com/sparrowwallet/sparrow/control/CoinTreeTable.java index 597062f1..6f1ba858 100644 --- a/src/main/java/com/sparrowwallet/sparrow/control/CoinTreeTable.java +++ b/src/main/java/com/sparrowwallet/sparrow/control/CoinTreeTable.java @@ -31,6 +31,7 @@ public class CoinTreeTable extends TreeTableView { private BitcoinUnit bitcoinUnit; private UnitFormat unitFormat; private CurrencyRate currencyRate; + protected static final double STANDARD_WIDTH = 100.0; public BitcoinUnit getBitcoinUnit() { return bitcoinUnit; @@ -143,4 +144,12 @@ public class CoinTreeTable extends TreeTableView { getSortOrder().add(column); } } + + @SuppressWarnings("deprecation") + protected void setEqualPreferredColumnWidths() { + for(TreeTableColumn column : getColumns()) { + column.setPrefWidth(STANDARD_WIDTH); + } + setColumnResizePolicy(TreeTableView.CONSTRAINED_RESIZE_POLICY); + } } diff --git a/src/main/java/com/sparrowwallet/sparrow/control/EntryCell.java b/src/main/java/com/sparrowwallet/sparrow/control/EntryCell.java index 98465555..07bd82a3 100644 --- a/src/main/java/com/sparrowwallet/sparrow/control/EntryCell.java +++ b/src/main/java/com/sparrowwallet/sparrow/control/EntryCell.java @@ -841,7 +841,7 @@ public class EntryCell extends TreeTableCell implements Confirmati } } else if(entry instanceof WalletSummaryDialog.UnconfirmedEntry) { cell.getStyleClass().add("unconfirmed-row"); - } else if(entry instanceof WalletSummaryDialog.SummaryEntry) { + } else if(entry instanceof WalletSummaryDialog.SummaryEntry || entry instanceof WalletSummaryDialog.AllSummaryEntry) { cell.getStyleClass().add("summary-row"); } } diff --git a/src/main/java/com/sparrowwallet/sparrow/control/SearchWalletDialog.java b/src/main/java/com/sparrowwallet/sparrow/control/SearchWalletDialog.java index d3379a3b..89dcafff 100644 --- a/src/main/java/com/sparrowwallet/sparrow/control/SearchWalletDialog.java +++ b/src/main/java/com/sparrowwallet/sparrow/control/SearchWalletDialog.java @@ -89,7 +89,7 @@ public class SearchWalletDialog extends Dialog { results.setShowRoot(false); results.setPrefWidth(showWallet || showAccount ? 950 : 850); results.setUnitFormat(walletForms.iterator().next().getWallet()); - results.setColumnResizePolicy(TreeTableView.CONSTRAINED_RESIZE_POLICY); + results.setEqualPreferredColumnWidths(); results.setPlaceholder(new Label("No results")); results.setEditable(true); diff --git a/src/main/java/com/sparrowwallet/sparrow/control/TransactionsTreeTable.java b/src/main/java/com/sparrowwallet/sparrow/control/TransactionsTreeTable.java index 5bf37533..dfc9fe71 100644 --- a/src/main/java/com/sparrowwallet/sparrow/control/TransactionsTreeTable.java +++ b/src/main/java/com/sparrowwallet/sparrow/control/TransactionsTreeTable.java @@ -49,7 +49,7 @@ public class TransactionsTreeTable extends CoinTreeTable { setPlaceholder(getDefaultPlaceholder(rootEntry.getWallet())); setEditable(true); - setColumnResizePolicy(TreeTableView.CONSTRAINED_RESIZE_POLICY); + setEqualPreferredColumnWidths(); setSortColumn(0, TreeTableColumn.SortType.DESCENDING); } diff --git a/src/main/java/com/sparrowwallet/sparrow/control/UtxosTreeTable.java b/src/main/java/com/sparrowwallet/sparrow/control/UtxosTreeTable.java index f937e167..918deb82 100644 --- a/src/main/java/com/sparrowwallet/sparrow/control/UtxosTreeTable.java +++ b/src/main/java/com/sparrowwallet/sparrow/control/UtxosTreeTable.java @@ -82,7 +82,7 @@ public class UtxosTreeTable extends CoinTreeTable { setPlaceholder(getDefaultPlaceholder(rootEntry.getWallet())); setEditable(true); - setColumnResizePolicy(TreeTableView.CONSTRAINED_RESIZE_POLICY); + setEqualPreferredColumnWidths(); setSortColumn(getColumns().size() - 1, TreeTableColumn.SortType.DESCENDING); getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE); diff --git a/src/main/java/com/sparrowwallet/sparrow/control/WalletSummaryDialog.java b/src/main/java/com/sparrowwallet/sparrow/control/WalletSummaryDialog.java index ea69bb9b..f93b9612 100644 --- a/src/main/java/com/sparrowwallet/sparrow/control/WalletSummaryDialog.java +++ b/src/main/java/com/sparrowwallet/sparrow/control/WalletSummaryDialog.java @@ -101,7 +101,7 @@ public class WalletSummaryDialog extends Dialog { table.setRoot(rootItem); rootItem.setExpanded(true); - table.setColumnResizePolicy(TreeTableView.CONSTRAINED_RESIZE_POLICY); + table.setEqualPreferredColumnWidths(); table.setPrefWidth(450); VBox vBox = new VBox(); diff --git a/src/main/java/com/sparrowwallet/sparrow/preferences/ServerAliasDialog.java b/src/main/java/com/sparrowwallet/sparrow/preferences/ServerAliasDialog.java index 1e02650a..2e2a90f3 100644 --- a/src/main/java/com/sparrowwallet/sparrow/preferences/ServerAliasDialog.java +++ b/src/main/java/com/sparrowwallet/sparrow/preferences/ServerAliasDialog.java @@ -28,6 +28,7 @@ public class ServerAliasDialog extends Dialog { private final TableView serverTable; private final Button closeButton; + @SuppressWarnings("deprecation") public ServerAliasDialog(ServerType serverType) { this.serverType = serverType; diff --git a/src/main/resources/com/sparrowwallet/sparrow/darktheme.css b/src/main/resources/com/sparrowwallet/sparrow/darktheme.css index f7d1c59c..e4926d22 100644 --- a/src/main/resources/com/sparrowwallet/sparrow/darktheme.css +++ b/src/main/resources/com/sparrowwallet/sparrow/darktheme.css @@ -16,11 +16,6 @@ -fx-prompt-text-fill: gray; } -.titulo{ - -fx-font-weight: bold; - -fx-font-size: 18px; -} - .button{ -fx-focus-traversable: false; } diff --git a/src/main/resources/com/sparrowwallet/sparrow/general.css b/src/main/resources/com/sparrowwallet/sparrow/general.css index bdcaa245..217d9034 100644 --- a/src/main/resources/com/sparrowwallet/sparrow/general.css +++ b/src/main/resources/com/sparrowwallet/sparrow/general.css @@ -36,6 +36,10 @@ -fx-padding: 3 5; } +.form .fieldset .legend, .table-view .column-header, .tree-table-view .column-header, VerticalHeader > Label { + -fx-font-weight: normal; +} + .form .fieldset.header .legend { -fx-padding: 0 0 15px 0; } @@ -247,7 +251,7 @@ } .number-field { - -fx-font-family: 'Helvetica Neue', 'System Regular'; + -fx-font-family: 'Helvetica Neue Regular', 'System Regular'; } VerticalHeader > Label.selected { diff --git a/src/main/resources/com/sparrowwallet/sparrow/paynym/paynym.css b/src/main/resources/com/sparrowwallet/sparrow/paynym/paynym.css index b16f92c1..9ea775eb 100644 --- a/src/main/resources/com/sparrowwallet/sparrow/paynym/paynym.css +++ b/src/main/resources/com/sparrowwallet/sparrow/paynym/paynym.css @@ -50,7 +50,7 @@ } .listview-label { - -fx-font-weight: bold; + -fx-font-weight: normal; -fx-font-size: 1.2em; -fx-padding: 10 0 10 0; } diff --git a/src/main/resources/com/sparrowwallet/sparrow/wallet/addresses.css b/src/main/resources/com/sparrowwallet/sparrow/wallet/addresses.css index 1302e18d..a233fe04 100644 --- a/src/main/resources/com/sparrowwallet/sparrow/wallet/addresses.css +++ b/src/main/resources/com/sparrowwallet/sparrow/wallet/addresses.css @@ -1,5 +1,5 @@ .addresses-treetable-label { - -fx-font-weight: bold; + -fx-font-weight: normal; -fx-font-size: 1.2em; -fx-padding: 10 0 10 0; } diff --git a/src/main/resources/com/sparrowwallet/sparrow/wallet/transactions.css b/src/main/resources/com/sparrowwallet/sparrow/wallet/transactions.css index afbf945e..91837dbe 100644 --- a/src/main/resources/com/sparrowwallet/sparrow/wallet/transactions.css +++ b/src/main/resources/com/sparrowwallet/sparrow/wallet/transactions.css @@ -1,9 +1,3 @@ -.transactions-treetable-label { - -fx-font-weight: bold; - -fx-font-size: 1.2em; - -fx-padding: 10 0 10 0; -} - #balanceChart { -fx-padding: 10 0 0 0; -fx-max-width: 350px; diff --git a/src/main/resources/com/sparrowwallet/sparrow/wallet/utxos.css b/src/main/resources/com/sparrowwallet/sparrow/wallet/utxos.css index 9989d353..6686d8d3 100644 --- a/src/main/resources/com/sparrowwallet/sparrow/wallet/utxos.css +++ b/src/main/resources/com/sparrowwallet/sparrow/wallet/utxos.css @@ -1,9 +1,3 @@ -.utxos-treetable-label { - -fx-font-weight: bold; - -fx-font-size: 1.2em; - -fx-padding: 10 0 10 0; -} - .utxos-treetable .progress-bar > .bar { -fx-padding: 0.6em; }