Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-04-19 15:26:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

Allow sorting in tables

Browse Source
This commit is contained in:
Manfred Karrer 2016-01-28 13:26:57 +01:00
parent fc74c46b3b
commit 87e2119b84
21 changed files with 40 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>io.bitsquare</groupId>
<version>0.3.3</version>
<version>0.3.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
common/src/main/java/io/bitsquare/app/Version.java
View File

@ -24,7 +24,7 @@ public class Version {
private static final Logger log = LoggerFactory.getLogger(Version.class);
// The application versions
public static final String VERSION = "0.3.3";
public static final String VERSION = "0.3.4";
// The version nr. for the objects sent over the network. A change will break the serialization of old objects.
// If objects are used for both network and database the network version is applied.

2
core/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>io.bitsquare</groupId>
<version>0.3.3</version>
<version>0.3.4-SNAPSHOT</version>
</parent>
<artifactId>core</artifactId>

2
gui/pom.xml
View File

@ -22,7 +22,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>io.bitsquare</groupId>
<version>0.3.3</version>
<version>0.3.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

1
gui/src/main/java/io/bitsquare/gui/main/account/content/paymentsaccount/PaymentAccountView.java
View File

@ -100,6 +100,7 @@ public class PaymentAccountView extends ActivatableViewAndModel<GridPane, Paymen
onSelectAccount(paymentAccountsComboBox.getSelectionModel().getSelectedItem());
};
paymentAccountsComboBox.setOnAction(paymentAccountsComboBoxHandler);
paymentAccountsComboBox.setVisibleRowCount(20);
model.getPaymentAccounts().addListener(
(ListChangeListener<PaymentAccount>) c -> paymentAccountsComboBox.setDisable(model.getPaymentAccounts().size() == 0));

8
gui/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesView.fxml
View File

@ -30,10 +30,10 @@
<columns>
<TableColumn text="Trade ID" fx:id="tradeIdColumn" minWidth="80" sortable="false"/>
<TableColumn text="Date/Time" fx:id="dateColumn" minWidth="150"/>
<TableColumn text="Trade amount in BTC" fx:id="amountColumn" minWidth="130" sortable="false"/>
<TableColumn text="Price" fx:id="priceColumn" minWidth="100" sortable="false"/>
<TableColumn text="Trade amount" fx:id="volumeColumn" minWidth="130" sortable="false"/>
<TableColumn text="Trade type" fx:id="directionColumn" minWidth="80" sortable="false"/>
<TableColumn text="Trade amount in BTC" fx:id="amountColumn" minWidth="130"/>
<TableColumn text="Price" fx:id="priceColumn" minWidth="100"/>
<TableColumn text="Trade amount" fx:id="volumeColumn" minWidth="130"/>
<TableColumn text="Trade type" fx:id="directionColumn" minWidth="80"/>
<TableColumn text="State" fx:id="stateColumn" minWidth="80" sortable="false"/>
</columns>
</TableView>

8
gui/src/main/java/io/bitsquare/gui/main/portfolio/failedtrades/FailedTradesView.fxml
View File

@ -30,10 +30,10 @@
<columns>
<TableColumn text="Trade ID" fx:id="tradeIdColumn" minWidth="100" sortable="false"/>
<TableColumn text="Date" fx:id="dateColumn" minWidth="130"/>
<TableColumn text="Trade amount in BTC" fx:id="amountColumn" minWidth="130" sortable="false"/>
<TableColumn text="Price" fx:id="priceColumn" minWidth="100" sortable="false"/>
<TableColumn text="Trade amount in EUR" fx:id="volumeColumn" minWidth="130" sortable="false"/>
<TableColumn text="Trade type" fx:id="directionColumn" minWidth="80" sortable="false"/>
<TableColumn text="Trade amount in BTC" fx:id="amountColumn" minWidth="130"/>
<TableColumn text="Price" fx:id="priceColumn" minWidth="100"/>
<TableColumn text="Trade amount in EUR" fx:id="volumeColumn" minWidth="130"/>
<TableColumn text="Trade type" fx:id="directionColumn" minWidth="80"/>
<TableColumn text="State" fx:id="stateColumn" minWidth="80" sortable="false"/>
</columns>
</TableView>

8
gui/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOffersView.fxml
View File

@ -30,10 +30,10 @@
<columns>
<TableColumn text="Offer ID" fx:id="offerIdColumn" minWidth="100" sortable="false"/>
<TableColumn text="Date/Time" fx:id="dateColumn" minWidth="130"/>
<TableColumn text="Amount in BTC (Min.)" fx:id="amountColumn" minWidth="130" sortable="false"/>
<TableColumn text="Price" fx:id="priceColumn" minWidth="80" sortable="false"/>
<TableColumn text="Amount (Min.)" fx:id="volumeColumn" minWidth="130" sortable="false"/>
<TableColumn text="Trade type" fx:id="directionColumn" minWidth="70" sortable="false"/>
<TableColumn text="Amount in BTC (Min.)" fx:id="amountColumn" minWidth="130"/>
<TableColumn text="Price" fx:id="priceColumn" minWidth="80"/>
<TableColumn text="Amount (Min.)" fx:id="volumeColumn" minWidth="130"/>
<TableColumn text="Trade type" fx:id="directionColumn" minWidth="70"/>
<TableColumn text="" fx:id="removeItemColumn" minWidth="100" sortable="false"/>
</columns>
</TableView>

8
gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesView.fxml
View File

@ -39,22 +39,22 @@
<PropertyValueFactory property="date"/>
</cellValueFactory>
</TableColumn>
<TableColumn text="Trade amount in BTC" fx:id="tradeAmountColumn" minWidth="130" sortable="false">
<TableColumn text="Trade amount in BTC" fx:id="tradeAmountColumn" minWidth="130">
<cellValueFactory>
<PropertyValueFactory property="tradeAmount"/>
</cellValueFactory>
</TableColumn>
<TableColumn text="Price" fx:id="priceColumn" minWidth="100" sortable="false">
<TableColumn text="Price" fx:id="priceColumn" minWidth="100">
<cellValueFactory>
<PropertyValueFactory property="price"/>
</cellValueFactory>
</TableColumn>
<TableColumn text="Trade amount" fx:id="tradeVolumeColumn" minWidth="130" sortable="false">
<TableColumn text="Trade amount" fx:id="tradeVolumeColumn" minWidth="130">
<cellValueFactory>
<PropertyValueFactory property="tradeVolume"/>
</cellValueFactory>
</TableColumn>
<TableColumn text="Trade type" fx:id="directionColumn" minWidth="80" sortable="false"/>
<TableColumn text="Trade type" fx:id="directionColumn" minWidth="80"/>
</columns>
</TableView>
</VBox>

2
jsocks/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>io.bitsquare</groupId>
<version>0.3.3</version>
<version>0.3.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
jtorctl/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>io.bitsquare</groupId>
<version>0.3.3</version>
<version>0.3.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
jtorproxy/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>io.bitsquare</groupId>
<version>0.3.3</version>
<version>0.3.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
network/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>io.bitsquare</groupId>
<version>0.3.3</version>
<version>0.3.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
network/src/main/java/io/bitsquare/p2p/NodeAddress.java
View File

@ -54,6 +54,6 @@ public class NodeAddress implements Serializable {
@Override
public String toString() {
return getFullAddress() + "\n";
return getFullAddress();
}
}

10
network/src/main/java/io/bitsquare/p2p/peers/PeerExchangeHandshake.java
View File

@ -64,7 +64,6 @@ public class PeerExchangeHandshake implements MessageListener {
}
public void shutDown() {
Log.traceCall();
networkNode.removeMessageListener(this);
stopTimeoutTimer();
}
@ -76,11 +75,12 @@ public class PeerExchangeHandshake implements MessageListener {
public void requestReportedPeers(NodeAddress nodeAddress, List<NodeAddress> remainingNodeAddresses) {
Log.traceCall("nodeAddress=" + nodeAddress);
Log.traceCall("this=" + this);
checkNotNull(networkNode.getNodeAddress(), "My node address must not be null at requestReportedPeers");
checkArgument(timeoutTimer == null, "requestData must not be called twice.");
timeoutTimer = UserThread.runAfter(() -> {
log.info("timeoutTimer called");
log.info("timeoutTimer called on " + this);
peerManager.shutDownConnection(nodeAddress);
shutDown();
listener.onFault("A timeout occurred");
@ -112,10 +112,11 @@ public class PeerExchangeHandshake implements MessageListener {
}
public void onGetPeersRequest(GetPeersRequest message, final Connection connection) {
Log.traceCall("message=" + message);
Log.traceCall("this=" + this);
checkArgument(timeoutTimer == null, "requestData must not be called twice.");
timeoutTimer = UserThread.runAfter(() -> {
log.info("timeoutTimer called");
log.info("timeoutTimer called on " + this);
peerManager.shutDownConnection(connection);
shutDown();
listener.onFault("A timeout occurred");
@ -165,6 +166,7 @@ public class PeerExchangeHandshake implements MessageListener {
public void onMessage(Message message, Connection connection) {
if (message instanceof GetPeersResponse) {
Log.traceCall(message.toString() + " / connection=" + connection);
Log.traceCall("this=" + this);
GetPeersResponse getPeersResponse = (GetPeersResponse) message;
if (getPeersResponse.requestNonce == nonce) {
stopTimeoutTimer();

2
package/linux/create_app.sh
View File

@ -6,7 +6,7 @@ mkdir -p gui/deploy
set -e
# Edit versions
fullVersion=0.3.3
fullVersion=0.3.4
jarFile="/home/mk/Desktop/sf_vm_shared_ubuntu/Bitsquare-$fullVersion.jar"
# Note: fakeroot needs to be installed on linux

2
package/mac/create_app.sh
View File

@ -5,7 +5,7 @@ mkdir -p gui/deploy
set -e
fullVersion="0.3.3"
fullVersion="0.3.4"
mvn clean package -DskipTests -Dmaven.javadoc.skip=true

2
package/windows/Bitsquare.iss
View File

@ -3,7 +3,7 @@
[Setup]
AppId={{bitsquare}}
AppName=Bitsquare
AppVersion=0.3.3
AppVersion=0.3.4
AppVerName=Bitsquare
AppPublisher=Bitsquare
AppComments=Bitsquare

6
package/windows/create_app.bat
View File

@ -1,13 +1,13 @@
cd ..\..\
mkdir gui\deploy
:: edit iss file -> AppVersion=0.3.3
:: edit iss file -> AppVersion=0.3.4
:: Copy gui/deploy.Bitsquare.jar file from mac build to windows
:: edit -> -BappVersion=0.3.3 and -srcfiles
:: edit -> -BappVersion=0.3.4 and -srcfiles
:: 64 bit build
:: Needs Inno Setup 5 or later (http://www.jrsoftware.org/isdl.php)
call "C:\Program Files\Java\jdk1.8.0_66\bin\javapackager.exe" -deploy -BappVersion=0.3.3 -native exe -name Bitsquare -title Bitsquare -vendor Bitsquare -outdir "\\VBOXSVR\vm_shared_windows" -appclass io.bitsquare.app.BitsquareAppMain -srcfiles "\\VBOXSVR\vm_shared_windows\Bitsquare-0.3.3.jar" -outfile Bitsquare -Bruntime="C:\Program Files\Java\jdk1.8.0_66\jre" -BjvmProperties=-Djava.net.preferIPv4Stack=true
call "C:\Program Files\Java\jdk1.8.0_66\bin\javapackager.exe" -deploy -BappVersion=0.3.4 -native exe -name Bitsquare -title Bitsquare -vendor Bitsquare -outdir "\\VBOXSVR\vm_shared_windows" -appclass io.bitsquare.app.BitsquareAppMain -srcfiles "\\VBOXSVR\vm_shared_windows\Bitsquare-0.3.4.jar" -outfile Bitsquare -Bruntime="C:\Program Files\Java\jdk1.8.0_66\jre" -BjvmProperties=-Djava.net.preferIPv4Stack=true
cd package\windows

2
pom.xml
View File

@ -6,7 +6,7 @@
<groupId>io.bitsquare</groupId>
<artifactId>parent</artifactId>
<packaging>pom</packaging>
<version>0.3.3</version>
<version>0.3.4-SNAPSHOT</version>
<description>Bitsquare - The decentralized bitcoin exchange</description>
<url>https://bitsquare.io</url>

2
seednode/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>io.bitsquare</groupId>
<version>0.3.3</version>
<version>0.3.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>