sparrowwallet/sparrow
1
0
Fork 0
mirror of https://github.com/sparrowwallet/sparrow.git synced 2024-12-24 12:46:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rename idlabel #2

Browse source
This commit is contained in:
Craig Raw 2020-04-09 17:53:53 +02:00
parent 9b34c6fa06
commit 30fd16e8d6
7 changed files with 17 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/com/sparrowwallet/sparrow/control/IdLabel.java
View file

@ -2,14 +2,12 @@ package com.sparrowwallet.sparrow.control;
import javafx.scene.text.Font; import javafx.scene.text.Font;
import java.awt.*; public class IdLabel extends CopyableLabel {
public IdLabel() {
public class CopyableIdLabel extends CopyableLabel {
public CopyableIdLabel() {
this(""); this("");
} }
public CopyableIdLabel(String text) { public IdLabel(String text) {
super(text); super(text);
setFont(Font.font("Courier")); setFont(Font.font("Courier"));
} }

4
src/main/java/com/sparrowwallet/sparrow/transaction/HeadersController.java
View file

@ -2,7 +2,7 @@ package com.sparrowwallet.sparrow.transaction;
import com.sparrowwallet.drongo.protocol.Transaction; import com.sparrowwallet.drongo.protocol.Transaction;
import com.sparrowwallet.sparrow.EventManager; import com.sparrowwallet.sparrow.EventManager;
import com.sparrowwallet.sparrow.control.CopyableIdLabel; import com.sparrowwallet.sparrow.control.IdLabel;
import com.sparrowwallet.sparrow.control.CopyableLabel; import com.sparrowwallet.sparrow.control.CopyableLabel;
import javafx.fxml.FXML; import javafx.fxml.FXML;
import javafx.fxml.Initializable; import javafx.fxml.Initializable;
@ -21,7 +21,7 @@ public class HeadersController extends TransactionFormController implements Init
private HeadersForm headersForm; private HeadersForm headersForm;
@FXML @FXML
private CopyableIdLabel id; private IdLabel id;
@FXML @FXML
private Spinner<Integer> version; private Spinner<Integer> version;

7
src/main/java/com/sparrowwallet/sparrow/transaction/InputController.java
View file

@ -6,7 +6,7 @@ import com.sparrowwallet.drongo.crypto.ECKey;
import com.sparrowwallet.drongo.protocol.*; import com.sparrowwallet.drongo.protocol.*;
import com.sparrowwallet.drongo.psbt.PSBTInput; import com.sparrowwallet.drongo.psbt.PSBTInput;
import com.sparrowwallet.sparrow.EventManager; import com.sparrowwallet.sparrow.EventManager;
import com.sparrowwallet.sparrow.control.CopyableIdLabel; import com.sparrowwallet.sparrow.control.IdLabel;
import com.sparrowwallet.sparrow.control.CopyableLabel; import com.sparrowwallet.sparrow.control.CopyableLabel;
import com.sparrowwallet.sparrow.control.RelativeTimelockSpinner; import com.sparrowwallet.sparrow.control.RelativeTimelockSpinner;
import javafx.fxml.FXML; import javafx.fxml.FXML;
@ -24,7 +24,6 @@ import java.time.Instant;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.time.ZoneId; import java.time.ZoneId;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
import java.util.List;
import java.util.ResourceBundle; import java.util.ResourceBundle;
public class InputController extends TransactionFormController implements Initializable { public class InputController extends TransactionFormController implements Initializable {
@ -34,7 +33,7 @@ public class InputController extends TransactionFormController implements Initia
private Fieldset inputFieldset; private Fieldset inputFieldset;
@FXML @FXML
private CopyableIdLabel outpoint; private IdLabel outpoint;
@FXML @FXML
private Button outpointSelect; private Button outpointSelect;
@ -46,7 +45,7 @@ public class InputController extends TransactionFormController implements Initia
private CopyableLabel from; private CopyableLabel from;
@FXML @FXML
private CopyableIdLabel address; private IdLabel address;
@FXML @FXML
private CodeArea scriptSigArea; private CodeArea scriptSigArea;

4
src/main/java/com/sparrowwallet/sparrow/transaction/OutputController.java
View file

@ -3,7 +3,7 @@ package com.sparrowwallet.sparrow.transaction;
import com.sparrowwallet.drongo.address.Address; import com.sparrowwallet.drongo.address.Address;
import com.sparrowwallet.drongo.protocol.NonStandardScriptException; import com.sparrowwallet.drongo.protocol.NonStandardScriptException;
import com.sparrowwallet.drongo.protocol.TransactionOutput; import com.sparrowwallet.drongo.protocol.TransactionOutput;
import com.sparrowwallet.sparrow.control.CopyableIdLabel; import com.sparrowwallet.sparrow.control.IdLabel;
import com.sparrowwallet.sparrow.control.CopyableLabel; import com.sparrowwallet.sparrow.control.CopyableLabel;
import javafx.fxml.FXML; import javafx.fxml.FXML;
import javafx.fxml.Initializable; import javafx.fxml.Initializable;
@ -26,7 +26,7 @@ public class OutputController extends TransactionFormController implements Initi
private CopyableLabel to; private CopyableLabel to;
@FXML @FXML
private CopyableIdLabel address; private IdLabel address;
@FXML @FXML
private CodeArea scriptPubKeyArea; private CodeArea scriptPubKeyArea;

4
src/main/resources/com/sparrowwallet/sparrow/transaction/headers.fxml
View file

@ -12,7 +12,7 @@
<?import tornadofx.control.Field?> <?import tornadofx.control.Field?>
<?import org.controlsfx.control.SegmentedButton?> <?import org.controlsfx.control.SegmentedButton?>
<?import com.sparrowwallet.sparrow.control.CopyableLabel?> <?import com.sparrowwallet.sparrow.control.CopyableLabel?>
<?import com.sparrowwallet.sparrow.control.CopyableIdLabel?> <?import com.sparrowwallet.sparrow.control.IdLabel?>
<GridPane hgap="10.0" prefHeight="350.0" prefWidth="600.0" vgap="10.0" alignment="TOP_CENTER" xmlns="http://javafx.com/javafx/10.0.2-internal" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.sparrowwallet.sparrow.transaction.HeadersController" stylesheets="@headers.css, @../general.css"> <GridPane hgap="10.0" prefHeight="350.0" prefWidth="600.0" vgap="10.0" alignment="TOP_CENTER" xmlns="http://javafx.com/javafx/10.0.2-internal" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.sparrowwallet.sparrow.transaction.HeadersController" stylesheets="@headers.css, @../general.css">
<padding> <padding>
@ -32,7 +32,7 @@
<Form GridPane.columnIndex="0" GridPane.rowIndex="0" GridPane.columnSpan="2"> <Form GridPane.columnIndex="0" GridPane.rowIndex="0" GridPane.columnSpan="2">
<Fieldset text="Transaction" inputGrow="SOMETIMES"> <Fieldset text="Transaction" inputGrow="SOMETIMES">
<Field text="Txid:"> <Field text="Txid:">
<CopyableIdLabel fx:id="id"/> <IdLabel fx:id="id"/>
</Field> </Field>
</Fieldset> </Fieldset>
</Form> </Form>

6
src/main/resources/com/sparrowwallet/sparrow/transaction/input.fxml
View file

@ -13,7 +13,7 @@
<?import org.controlsfx.control.ToggleSwitch?> <?import org.controlsfx.control.ToggleSwitch?>
<?import com.sparrowwallet.sparrow.control.RelativeTimelockSpinner?> <?import com.sparrowwallet.sparrow.control.RelativeTimelockSpinner?>
<?import com.sparrowwallet.sparrow.control.CopyableLabel?> <?import com.sparrowwallet.sparrow.control.CopyableLabel?>
<?import com.sparrowwallet.sparrow.control.CopyableIdLabel?> <?import com.sparrowwallet.sparrow.control.IdLabel?>
<GridPane alignment="TOP_CENTER" hgap="10.0" prefHeight="500.0" prefWidth="620.0" stylesheets="@input.css, @script.css, @../general.css" vgap="10.0" xmlns="http://javafx.com/javafx/10.0.2-internal" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.sparrowwallet.sparrow.transaction.InputController"> <GridPane alignment="TOP_CENTER" hgap="10.0" prefHeight="500.0" prefWidth="620.0" stylesheets="@input.css, @script.css, @../general.css" vgap="10.0" xmlns="http://javafx.com/javafx/10.0.2-internal" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.sparrowwallet.sparrow.transaction.InputController">
<padding> <padding>
@ -32,7 +32,7 @@
<Form GridPane.columnIndex="0" GridPane.columnSpan="2" GridPane.rowIndex="0"> <Form GridPane.columnIndex="0" GridPane.columnSpan="2" GridPane.rowIndex="0">
<Fieldset fx:id="inputFieldset" inputGrow="SOMETIMES" text="Input"> <Fieldset fx:id="inputFieldset" inputGrow="SOMETIMES" text="Input">
<Field text="Outpoint:" styleClass="label-button"> <Field text="Outpoint:" styleClass="label-button">
<CopyableIdLabel fx:id="outpoint" /> <IdLabel fx:id="outpoint" />
<Button fx:id="outpointSelect" maxWidth="25" minWidth="-Infinity" prefWidth="30" text="Ed"> <Button fx:id="outpointSelect" maxWidth="25" minWidth="-Infinity" prefWidth="30" text="Ed">
<graphic> <graphic>
<Glyph fontFamily="FontAwesome" icon="EDIT" prefWidth="15" /> <Glyph fontFamily="FontAwesome" icon="EDIT" prefWidth="15" />
@ -42,7 +42,7 @@
<Field text="Spends:"> <Field text="Spends:">
<CopyableLabel fx:id="spends" /> <CopyableLabel fx:id="spends" />
<CopyableLabel fx:id="from" text="from" /> <CopyableLabel fx:id="from" text="from" />
<CopyableIdLabel fx:id="address" /> <IdLabel fx:id="address" />
</Field> </Field>
</Fieldset> </Fieldset>
</Form> </Form>

4
src/main/resources/com/sparrowwallet/sparrow/transaction/output.fxml
View file

@ -12,7 +12,7 @@
<?import tornadofx.control.Form?> <?import tornadofx.control.Form?>
<?import javafx.geometry.Insets?> <?import javafx.geometry.Insets?>
<?import com.sparrowwallet.sparrow.control.CopyableLabel?> <?import com.sparrowwallet.sparrow.control.CopyableLabel?>
<?import com.sparrowwallet.sparrow.control.CopyableIdLabel?> <?import com.sparrowwallet.sparrow.control.IdLabel?>
<GridPane alignment="TOP_CENTER" hgap="10.0" prefHeight="500.0" prefWidth="600.0" stylesheets="@output.css, @script.css, @../general.css" vgap="10.0" xmlns="http://javafx.com/javafx/10.0.2-internal" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.sparrowwallet.sparrow.transaction.OutputController"> <GridPane alignment="TOP_CENTER" hgap="10.0" prefHeight="500.0" prefWidth="600.0" stylesheets="@output.css, @script.css, @../general.css" vgap="10.0" xmlns="http://javafx.com/javafx/10.0.2-internal" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.sparrowwallet.sparrow.transaction.OutputController">
<padding> <padding>
@ -33,7 +33,7 @@
<Field text="Sends:"> <Field text="Sends:">
<CopyableLabel fx:id="value"/> <CopyableLabel fx:id="value"/>
<CopyableLabel fx:id="to" text="to" /> <CopyableLabel fx:id="to" text="to" />
<CopyableIdLabel fx:id="address" /> <IdLabel fx:id="address" />
</Field> </Field>
</Fieldset> </Fieldset>
</Form> </Form>