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

Embed font

Browse source
This commit is contained in:
Manfred Karrer 2016-04-04 12:06:59 +02:00
parent 64dc97f1bc
commit 3158f0d386
4 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -46,7 +46,7 @@ public class Log {
rollingPolicy.start(); rollingPolicy.start();
triggeringPolicy = new SizeBasedTriggeringPolicy(); triggeringPolicy = new SizeBasedTriggeringPolicy();
triggeringPolicy.setMaxFileSize("1MB"); triggeringPolicy.setMaxFileSize("10MB");
triggeringPolicy.start(); triggeringPolicy.start();
PatternLayoutEncoder encoder = new PatternLayoutEncoder(); PatternLayoutEncoder encoder = new PatternLayoutEncoder();
@ -60,7 +60,7 @@ public class Log {
appender.start(); appender.start();
logbackLogger = loggerContext.getLogger(org.slf4j.Logger.ROOT_LOGGER_NAME); logbackLogger = loggerContext.getLogger(org.slf4j.Logger.ROOT_LOGGER_NAME);
logbackLogger.setLevel(useDetailedLogging ? Level.TRACE : Level.TRACE); logbackLogger.setLevel(useDetailedLogging ? Level.TRACE : Level.WARN);
logbackLogger.addAppender(appender); logbackLogger.addAppender(appender);
// log errors in separate file // log errors in separate file

6
gui/src/main/java/io/bitsquare/app/BitsquareApp.java
View file

@ -54,6 +54,7 @@ import javafx.scene.input.KeyCombination;
import javafx.scene.input.KeyEvent; import javafx.scene.input.KeyEvent;
import javafx.scene.layout.Pane; import javafx.scene.layout.Pane;
import javafx.scene.layout.StackPane; import javafx.scene.layout.StackPane;
import javafx.scene.text.Font;
import javafx.stage.Modality; import javafx.stage.Modality;
import javafx.stage.Stage; import javafx.stage.Stage;
import javafx.stage.StageStyle; import javafx.stage.StageStyle;
@ -136,6 +137,8 @@ public class BitsquareApp extends Application {
Version.setBtcNetworkId(injector.getInstance(BitsquareEnvironment.class).getBitcoinNetwork().ordinal()); Version.setBtcNetworkId(injector.getInstance(BitsquareEnvironment.class).getBitcoinNetwork().ordinal());
Font.loadFont(BitsquareAppMain.class.getResource("../../../lucida-grande.ttf").toExternalForm(), 12);
Storage.setDatabaseCorruptionHandler((String fileName) -> { Storage.setDatabaseCorruptionHandler((String fileName) -> {
corruptedDatabaseFiles.add(fileName); corruptedDatabaseFiles.add(fileName);
if (mainView != null) if (mainView != null)
@ -203,6 +206,9 @@ public class BitsquareApp extends Application {
// make the UI visible // make the UI visible
primaryStage.show(); primaryStage.show();
Font fon = Font.getDefault();
Font fonds = Font.getDefault();
//showDebugWindow(); //showDebugWindow();
} catch (Throwable throwable) { } catch (Throwable throwable) {
showErrorPopup(throwable, false); showErrorPopup(throwable, false);

2
gui/src/main/java/io/bitsquare/gui/bitsquare.css
View file

@ -23,6 +23,8 @@ bg color of non edit textFields: fafafa
/* Splash */ /* Splash */
.root { .root {
-fx-font-family: Lucida Grande;
-bs-grey: #666666; -bs-grey: #666666;
-bs-bg-grey: #dddddd; -bs-bg-grey: #dddddd;
-bs-light-grey: #cccccc; -bs-light-grey: #cccccc;

1
package/linux/create_32bit_app.sh
View file

@ -34,5 +34,6 @@ rm gui/deploy/LICENSE
mv "gui/deploy/bundles/bitsquare-$fullVersion.deb" "gui/deploy/Bitsquare-32bit-$fullVersion.deb" mv "gui/deploy/bundles/bitsquare-$fullVersion.deb" "gui/deploy/Bitsquare-32bit-$fullVersion.deb"
rmdir gui/deploy/bundles rmdir gui/deploy/bundles
cp "gui/deploy/Bitsquare-32bit-$fullVersion.deb" "/home/bitsquare/Desktop/sf_vm_shared_ubuntu14_32bit/Bitsquare-32bit-$fullVersion.deb" cp "gui/deploy/Bitsquare-32bit-$fullVersion.deb" "/home/bitsquare/Desktop/sf_vm_shared_ubuntu14_32bit/Bitsquare-32bit-$fullVersion.deb"
cp "gui/deploy/Bitsquare-32bit-$fullVersion.deb" "/home/bitsquare/Desktop/Bitsquare-32bit-$fullVersion.deb"
cd package/linux cd package/linux