Embed font

rharing · Apr 4, 2016 · 3158f0d · 3158f0d
1 parent 64dc97f
commit 3158f0d
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/common/src/main/java/io/bitsquare/app/Log.java b/common/src/main/java/io/bitsquare/app/Log.java
@@ -46,7 +46,7 @@ public static void setup(String fileName, boolean useDetailedLogging) {
         rollingPolicy.start();
 
         triggeringPolicy = new SizeBasedTriggeringPolicy();
-        triggeringPolicy.setMaxFileSize("1MB");
+        triggeringPolicy.setMaxFileSize("10MB");
         triggeringPolicy.start();
 
         PatternLayoutEncoder encoder = new PatternLayoutEncoder();
@@ -60,7 +60,7 @@ public static void setup(String fileName, boolean useDetailedLogging) {
         appender.start();
 
         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);
 
         // log errors in separate file

diff --git a/gui/src/main/java/io/bitsquare/app/BitsquareApp.java b/gui/src/main/java/io/bitsquare/app/BitsquareApp.java
@@ -54,6 +54,7 @@
 import javafx.scene.input.KeyEvent;
 import javafx.scene.layout.Pane;
 import javafx.scene.layout.StackPane;
+import javafx.scene.text.Font;
 import javafx.stage.Modality;
 import javafx.stage.Stage;
 import javafx.stage.StageStyle;
@@ -136,6 +137,8 @@ public void start(Stage primaryStage) throws IOException {
 
             Version.setBtcNetworkId(injector.getInstance(BitsquareEnvironment.class).getBitcoinNetwork().ordinal());
 
+            Font.loadFont(BitsquareAppMain.class.getResource("../../../lucida-grande.ttf").toExternalForm(), 12);
+
             Storage.setDatabaseCorruptionHandler((String fileName) -> {
                 corruptedDatabaseFiles.add(fileName);
                 if (mainView != null)
@@ -203,6 +206,9 @@ else if (Utilities.isWindows())
             // make the UI visible
             primaryStage.show();
 
+            Font fon = Font.getDefault();
+            Font fonds = Font.getDefault();
+
             //showDebugWindow();
         } catch (Throwable throwable) {
             showErrorPopup(throwable, false);

diff --git a/gui/src/main/java/io/bitsquare/gui/bitsquare.css b/gui/src/main/java/io/bitsquare/gui/bitsquare.css
@@ -23,6 +23,8 @@ bg color of non edit textFields: fafafa
 /* Splash */
 
 .root {
+    -fx-font-family: Lucida Grande;
+
     -bs-grey: #666666;
     -bs-bg-grey: #dddddd;
     -bs-light-grey: #cccccc;

diff --git a/package/linux/create_32bit_app.sh b/package/linux/create_32bit_app.sh
@@ -34,5 +34,6 @@ rm gui/deploy/LICENSE
 mv "gui/deploy/bundles/bitsquare-$fullVersion.deb" "gui/deploy/Bitsquare-32bit-$fullVersion.deb"
 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/Bitsquare-32bit-$fullVersion.deb"
 
 cd package/linux