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

Remove walletprefix, fix key event listener, v 0.3.2.23-snapshot

Browse Source
This commit is contained in:
Manfred Karrer 2015-12-29 00:36:19 +01:00
parent 4ef1a5e567
commit c2dbd55e77
20 changed files with 27 additions and 27 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.2.2</version>
<version>0.3.2.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

4
common/src/main/java/io/bitsquare/app/Log.java
View File

@ -62,7 +62,9 @@ public class Log {
appender.start();
logbackLogger = loggerContext.getLogger(org.slf4j.Logger.ROOT_LOGGER_NAME);
logbackLogger.setLevel(useDetailedLogging ? Level.TRACE : Level.DEBUG);
//TODO for now use always trace
logbackLogger.setLevel(useDetailedLogging ? Level.TRACE : Level.TRACE);
// logbackLogger.setLevel(useDetailedLogging ? Level.TRACE : Level.DEBUG);
logbackLogger.addAppender(appender);
}

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.2.2";
public static final String VERSION = "0.3.2.3";
// 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.2.2</version>
<version>0.3.2.3-SNAPSHOT</version>
</parent>
<artifactId>core</artifactId>

1
core/src/main/java/io/bitsquare/app/BitsquareEnvironment.java
View File

@ -187,7 +187,6 @@ public class BitsquareEnvironment extends StandardEnvironment {
setProperty(UserAgent.VERSION_KEY, Version.VERSION);
setProperty(WalletService.DIR_KEY, btcNetworkDir);
setProperty(WalletService.PREFIX_KEY, appName);
setProperty(Storage.DIR_KEY, Paths.get(btcNetworkDir, "db").toString());
setProperty(KeyStorage.DIR_KEY, Paths.get(btcNetworkDir, "keys").toString());

1
core/src/main/java/io/bitsquare/btc/BitcoinModule.java
View File

@ -45,7 +45,6 @@ public class BitcoinModule extends AppModule {
File walletDir = new File(env.getRequiredProperty(WalletService.DIR_KEY));
bind(File.class).annotatedWith(named(WalletService.DIR_KEY)).toInstance(walletDir);
bindConstant().annotatedWith(named(WalletService.PREFIX_KEY)).to(env.getRequiredProperty(WalletService.PREFIX_KEY));
bind(AddressEntryList.class).in(Singleton.class);
bind(TradeWalletService.class).in(Singleton.class);

6
core/src/main/java/io/bitsquare/btc/WalletService.java
View File

@ -83,7 +83,6 @@ public class WalletService {
private final AddressEntryList addressEntryList;
private final NetworkParameters params;
private final File walletDir;
private final String walletPrefix;
private final UserAgent userAgent;
private WalletAppKit walletAppKit;
@ -99,7 +98,7 @@ public class WalletService {
@Inject
public WalletService(RegTestHost regTestHost, TradeWalletService tradeWalletService, AddressEntryList addressEntryList, UserAgent userAgent,
@Named(DIR_KEY) File walletDir, @Named(PREFIX_KEY) String walletPrefix, Preferences preferences) {
@Named(DIR_KEY) File walletDir, Preferences preferences) {
this.regTestHost = regTestHost;
this.tradeWalletService = tradeWalletService;
this.addressEntryList = addressEntryList;
@ -110,7 +109,6 @@ public class WalletService {
"Mainnet is not allowed to be used at that stage of development");
this.walletDir = new File(walletDir, "bitcoin");
this.walletPrefix = walletPrefix;
this.userAgent = userAgent;
}
@ -136,7 +134,7 @@ public class WalletService {
);
// If seed is non-null it means we are restoring from backup.
walletAppKit = new WalletAppKit(params, walletDir, walletPrefix) {
walletAppKit = new WalletAppKit(params, walletDir, "Bitsquare") {
@Override
protected void onSetupCompleted() {
// Don't make the user wait for confirmations for now, as the intention is they're sending it

2
gui/pom.xml
View File

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

3
gui/src/main/java/io/bitsquare/app/BitsquareApp.java
View File

@ -48,6 +48,7 @@ import javafx.scene.image.Image;
import javafx.scene.input.KeyCode;
import javafx.scene.input.KeyCodeCombination;
import javafx.scene.input.KeyCombination;
import javafx.scene.input.KeyEvent;
import javafx.scene.layout.Pane;
import javafx.scene.layout.StackPane;
import javafx.stage.Modality;
@ -156,7 +157,7 @@ public class BitsquareApp extends Application {
else
stop();
});
scene.setOnKeyReleased(keyEvent -> {
scene.addEventHandler(KeyEvent.KEY_RELEASED, keyEvent -> {
if (new KeyCodeCombination(KeyCode.W, KeyCombination.SHORTCUT_DOWN).match(keyEvent)) {
if (BitsquareApp.IS_RELEASE_VERSION)
stop(); //systemTray.hideStage(); TODO issues with some linux systems (https://github.com/bitsquare/bitsquare/issues/350)

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

@ -32,6 +32,7 @@ import javafx.scene.control.cell.TextFieldTableCell;
import javafx.scene.input.KeyCode;
import javafx.scene.input.KeyCodeCombination;
import javafx.scene.input.KeyCombination;
import javafx.scene.input.KeyEvent;
import javafx.scene.layout.Priority;
import javafx.scene.layout.VBox;
import javafx.util.Callback;
@ -128,8 +129,8 @@ public class PendingTradesView extends ActivatableViewAndModel<VBox, PendingTrad
}
// we add hidden emergency shortcut to open support ticket
root.getScene().setOnKeyReleased(keyEvent -> {
if (new KeyCodeCombination(KeyCode.O, KeyCombination.SHORTCUT_DOWN).match(keyEvent))
root.getScene().addEventHandler(KeyEvent.KEY_RELEASED, event -> {
if (new KeyCodeCombination(KeyCode.O, KeyCombination.SHORTCUT_DOWN).match(event))
new OpenEmergencyTicketPopup().onOpenTicket(() -> model.dataModel.onOpenSupportTicket()).show();
});
}

2
jsocks/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>io.bitsquare</groupId>
<version>0.3.2.2</version>
<version>0.3.2.3-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.2.2</version>
<version>0.3.2.3-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.2.2</version>
<version>0.3.2.3-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.2.2</version>
<version>0.3.2.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
package/linux/create_app.sh
View File

@ -6,7 +6,7 @@ mkdir -p gui/deploy
set -e
# Edit versions
fullVersion=0.3.2.2
fullVersion=0.3.2.3
# Copy jar file from mac build (1.jar from processed folder) to linux box
# 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.2.2"
fullVersion="0.3.2.3"
mvn clean package -DskipTests -Dmaven.javadoc.skip=true
cp gui/target/shaded.jar gui/deploy/Bitsquare.jar

2
package/windows/Bitsquare.iss
View File

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

8
package/windows/create_app.bat
View File

@ -1,16 +1,16 @@
cd ..\..\
mkdir gui\deploy
:: edit iss file -> AppVersion=0.3.2.2
:: edit iss file -> AppVersion=0.3.2.3
:: Copy gui/deploy.Bitsquare.jar file from mac build to windows
:: edit -> -BappVersion=0.3.2.2 and -srcfiles
:: edit -> -BappVersion=0.3.2.3 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.2.2 -native exe -name Bitsquare -title Bitsquare -vendor Bitsquare -outdir gui\deploy -appclass io.bitsquare.app.BitsquareAppMain -srcfiles "gui\deploy\Bitsquare.jar" -outfile Bitsquare -Bruntime="C:\Program Files\Java\jdk1.8.0_66\jre"
call "C:\Program Files\Java\jdk1.8.0_66\bin\javapackager.exe" -deploy -BappVersion=0.3.2.3 -native exe -name Bitsquare -title Bitsquare -vendor Bitsquare -outdir gui\deploy -appclass io.bitsquare.app.BitsquareAppMain -srcfiles "gui\deploy\Bitsquare.jar" -outfile Bitsquare -Bruntime="C:\Program Files\Java\jdk1.8.0_66\jre"
:: 32 bit build
:: call "C:\Program Files (x86)\Java\jdk1.8.0_66\bin\javapackager.exe" -deploy -BappVersion=0.3.2.2 -native exe -name Bitsquare -title Bitsquare -vendor Bitsquare -outdir gui\deploy -appclass io.bitsquare.app.BitsquareAppMain -srcfiles "gui\deploy\Bitsquare.jar" -outfile Bitsquare -Bruntime="C:\Program Files (x86)\Java\jdk1.8.0_66\jre"
:: call "C:\Program Files (x86)\Java\jdk1.8.0_66\bin\javapackager.exe" -deploy -BappVersion=0.3.2.3 -native exe -name Bitsquare -title Bitsquare -vendor Bitsquare -outdir gui\deploy -appclass io.bitsquare.app.BitsquareAppMain -srcfiles "gui\deploy\Bitsquare.jar" -outfile Bitsquare -Bruntime="C:\Program Files (x86)\Java\jdk1.8.0_66\jre"
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.2.2</version>
<version>0.3.2.3-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.2.2</version>
<version>0.3.2.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>