Add 2 sub screens for preferences

src/main/java/io/bitsquare/gui/Navigation.java

@@ -165,7 +165,7 @@ public class Navigation {
         PORTFOLIO("/io/bitsquare/gui/main/portfolio/PortfolioView.fxml"),
         FUNDS("/io/bitsquare/gui/main/funds/FundsView.fxml"),
         MSG("/io/bitsquare/gui/main/msg/MsgView.fxml"),
-        SETTINGS("/io/bitsquare/gui/main/settings/SettingsView.fxml"),
+        PREFERENCES("/io/bitsquare/gui/main/settings/PreferencesView.fxml"),
         ACCOUNT("/io/bitsquare/gui/main/account/AccountView.fxml"),
 
 
@@ -187,6 +187,10 @@ public class Navigation {
         WITHDRAWAL("/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.fxml"),
         TRANSACTIONS("/io/bitsquare/gui/main/funds/transactions/TransactionsView.fxml"),
 
+        // preferences
+        APPLICATION_PREFERENCES("/io/bitsquare/gui/main/settings/application/ApplicationPreferencesView.fxml"),
+        NETWORK_PREFERENCES("/io/bitsquare/gui/main/settings/network/NetworkPreferencesView.fxml"),
+
         // account
         ACCOUNT_SETUP("/io/bitsquare/gui/main/account/setup/AccountSetupView.fxml"),
         ACCOUNT_SETTINGS("/io/bitsquare/gui/main/account/settings/AccountSettingsView.fxml"),

src/main/java/io/bitsquare/gui/images.css

@@ -94,12 +94,12 @@
     -fx-image: url("../../../images/nav/msg_active.png");
 }
 
-#image-nav-settings {
-    -fx-image: url("../../../images/nav/settings.png");
+#image-nav-preferences {
+    -fx-image: url("../../../images/nav/preferences.png");
 }
 
-#image-nav-settings-active {
-    -fx-image: url("../../../images/nav/settings_active.png");
+#image-nav-preferences-active {
+    -fx-image: url("../../../images/nav/preferences_active.png");
 }
 
 #image-nav-account {

src/main/java/io/bitsquare/gui/main/MainViewCB.java

@@ -65,7 +65,7 @@ public class MainViewCB extends ViewCB<MainPM> {
     private VBox splashScreen;
     private AnchorPane contentContainer;
     private HBox leftNavPane, rightNavPane;
-    private ToggleButton buyButton, sellButton, homeButton, msgButton, portfolioButton, fundsButton, settingsButton,
+    private ToggleButton buyButton, sellButton, homeButton, msgButton, portfolioButton, fundsButton, preferencesButton,
             accountButton;
     private Pane portfolioButtonButtonPane;
     private Label numPendingTradesLabel;
@@ -207,7 +207,6 @@ public class MainViewCB extends ViewCB<MainPM> {
                 numPendingTradesLabel.setText(String.valueOf(numPendingTrades));
             }
 
-            log.trace("openInfoNotification " + title);
             SystemNotification.openInfoNotification(title, "You got a new trade message.");
         }
         else {
@@ -253,8 +252,8 @@ public class MainViewCB extends ViewCB<MainPM> {
             case PORTFOLIO:
                 portfolioButton.setSelected(true);
                 break;
-            case SETTINGS:
-                settingsButton.setSelected(true);
+            case PREFERENCES:
+                preferencesButton.setSelected(true);
                 break;
             case SELL:
                 sellButton.setSelected(true);
@@ -404,14 +403,13 @@ public class MainViewCB extends ViewCB<MainPM> {
 
         addBankAccountComboBox(rightNavPane);
 
-        settingsButton = addNavButton(rightNavPane, "Preferences", Navigation.Item.SETTINGS);
+        preferencesButton = addNavButton(rightNavPane, "Preferences", Navigation.Item.PREFERENCES);
         accountButton = addNavButton(rightNavPane, "Account", Navigation.Item.ACCOUNT);
 
 
         // for irc demo
         homeButton.setDisable(true);
         msgButton.setDisable(true);
-        settingsButton.setDisable(true);
 
         onMainNavigationAdded();
     }

src/main/java/io/bitsquare/gui/main/settings/PreferencesView.fxml

@@ -17,21 +17,14 @@
   ~ along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
   -->
 
-<?import javafx.geometry.Insets?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
-<TabPane fx:id="root" fx:controller="io.bitsquare.gui.main.settings.SettingsViewCB"
+<TabPane fx:id="root" fx:controller="io.bitsquare.gui.main.settings.PreferencesViewCB"
          AnchorPane.bottomAnchor="0" AnchorPane.leftAnchor="0"
          AnchorPane.rightAnchor="0" AnchorPane.topAnchor="0"
          xmlns:fx="http://javafx.com/fxml">
 
-    <Tab text="Preferences" closable="false">
-        <VBox spacing="20">
-            <padding>
-                <Insets left="20" top="20" right="20"/>
-            </padding>
-            <Label text="Preferences not implemented yet."/>
-        </VBox>
-    </Tab>
+    <Tab fx:id="applicationTab" text="Application preferences" closable="false"/>
+    <Tab fx:id="networkTab" text="Network preferences" closable="false"/>
 
 </TabPane>

src/main/java/io/bitsquare/gui/main/settings/PreferencesViewCB.java

@@ -0,0 +1,150 @@
+/*
+ * This file is part of Bitsquare.
+ *
+ * Bitsquare is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * Bitsquare is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package io.bitsquare.gui.main.settings;
+
+import io.bitsquare.gui.CachedViewCB;
+import io.bitsquare.gui.Navigation;
+import io.bitsquare.gui.ViewCB;
+import io.bitsquare.gui.ViewLoader;
+import io.bitsquare.settings.Settings;
+
+import java.net.URL;
+
+import java.util.ResourceBundle;
+
+import javax.inject.Inject;
+
+import javafx.beans.value.ChangeListener;
+import javafx.fxml.FXML;
+import javafx.fxml.Initializable;
+import javafx.scene.*;
+import javafx.scene.control.*;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class PreferencesViewCB extends CachedViewCB {
+    private static final Logger log = LoggerFactory.getLogger(PreferencesViewCB.class);
+
+    private final Navigation navigation;
+    private Settings settings;
+
+    private Navigation.Listener navigationListener;
+    private ChangeListener<Tab> tabChangeListener;
+
+    @FXML Tab applicationTab, networkTab;
+
+
+    ///////////////////////////////////////////////////////////////////////////////////////////
+    // Constructor
+    ///////////////////////////////////////////////////////////////////////////////////////////
+
+    @Inject
+    PreferencesViewCB(Navigation navigation, Settings settings) {
+        super();
+
+        this.navigation = navigation;
+        this.settings = settings;
+    }
+
+
+    ///////////////////////////////////////////////////////////////////////////////////////////
+    // Lifecycle
+    ///////////////////////////////////////////////////////////////////////////////////////////
+
+    @Override
+    public void initialize(URL url, ResourceBundle rb) {
+        navigationListener = navigationItems -> {
+            if (navigationItems != null && navigationItems.length == 3
+                    && navigationItems[1] == Navigation.Item.PREFERENCES)
+                loadView(navigationItems[2]);
+        };
+
+        tabChangeListener = (ov, oldValue, newValue) -> {
+            if (newValue == applicationTab)
+                navigation.navigationTo(Navigation.Item.MAIN, Navigation.Item.PREFERENCES,
+                        Navigation.Item.APPLICATION_PREFERENCES);
+            else if (newValue == networkTab)
+                navigation.navigationTo(Navigation.Item.MAIN, Navigation.Item.PREFERENCES,
+                        Navigation.Item.NETWORK_PREFERENCES);
+        };
+
+        super.initialize(url, rb);
+    }
+
+    @Override
+    public void activate() {
+        super.activate();
+
+        ((TabPane) root).getSelectionModel().selectedItemProperty().addListener(tabChangeListener);
+        navigation.addListener(navigationListener);
+
+        if (((TabPane) root).getSelectionModel().getSelectedItem() == applicationTab)
+            navigation.navigationTo(Navigation.Item.MAIN,
+                    Navigation.Item.PREFERENCES,
+                    Navigation.Item.APPLICATION_PREFERENCES);
+        else
+            navigation.navigationTo(Navigation.Item.MAIN,
+                    Navigation.Item.PREFERENCES,
+                    Navigation.Item.NETWORK_PREFERENCES);
+    }
+
+    @Override
+    public void deactivate() {
+        super.deactivate();
+
+        ((TabPane) root).getSelectionModel().selectedItemProperty().removeListener(tabChangeListener);
+        navigation.removeListener(navigationListener);
+    }
+
+    @SuppressWarnings("EmptyMethod")
+    @Override
+    public void terminate() {
+        super.terminate();
+    }
+
+
+    ///////////////////////////////////////////////////////////////////////////////////////////
+    // Navigation
+    ///////////////////////////////////////////////////////////////////////////////////////////
+
+    @Override
+    protected Initializable loadView(Navigation.Item navigationItem) {
+        super.loadView(navigationItem);
+
+        final ViewLoader loader = new ViewLoader(navigationItem);
+        Parent view = loader.load();
+        Tab tab = null;
+        switch (navigationItem) {
+            case APPLICATION_PREFERENCES:
+                tab = applicationTab;
+                break;
+            case NETWORK_PREFERENCES:
+                tab = networkTab;
+                break;
+        }
+        tab.setContent(view);
+        ((TabPane) root).getSelectionModel().select(tab);
+        Initializable childController = loader.getController();
+        ((ViewCB) childController).setParent(this);
+
+        return childController;
+    }
+
+}
+

src/main/java/io/bitsquare/gui/main/settings/application/ApplicationPreferencesModel.java

@@ -0,0 +1,84 @@
+/*
+ * This file is part of Bitsquare.
+ *
+ * Bitsquare is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * Bitsquare is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package io.bitsquare.gui.main.settings.application;
+
+import io.bitsquare.gui.UIModel;
+
+import com.google.inject.Inject;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+class ApplicationPreferencesModel extends UIModel {
+    private static final Logger log = LoggerFactory.getLogger(ApplicationPreferencesModel.class);
+
+
+    ///////////////////////////////////////////////////////////////////////////////////////////
+    // Constructor
+    ///////////////////////////////////////////////////////////////////////////////////////////
+
+    @Inject
+    ApplicationPreferencesModel() {
+    }
+
+
+    ///////////////////////////////////////////////////////////////////////////////////////////
+    // Lifecycle
+    ///////////////////////////////////////////////////////////////////////////////////////////
+
+    @Override
+    public void initialize() {
+
+        super.initialize();
+    }
+
+    @Override
+    public void activate() {
+        super.activate();
+
+    }
+
+    @Override
+    public void deactivate() {
+        super.deactivate();
+
+    }
+
+    @SuppressWarnings("EmptyMethod")
+    @Override
+    public void terminate() {
+        super.terminate();
+    }
+
+
+    ///////////////////////////////////////////////////////////////////////////////////////////
+    // Methods
+    ///////////////////////////////////////////////////////////////////////////////////////////
+
+
+    ///////////////////////////////////////////////////////////////////////////////////////////
+    // Getters
+    ///////////////////////////////////////////////////////////////////////////////////////////
+
+
+    ///////////////////////////////////////////////////////////////////////////////////////////
+    // Private
+    ///////////////////////////////////////////////////////////////////////////////////////////
+
+}
+

src/main/java/io/bitsquare/gui/main/settings/application/ApplicationPreferencesPM.java

@@ -15,24 +15,17 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.main.settings;
+package io.bitsquare.gui.main.settings.application;
 
-import io.bitsquare.gui.CachedViewCB;
-import io.bitsquare.gui.Navigation;
+import io.bitsquare.gui.PresentationModel;
 
-import java.net.URL;
-
-import java.util.ResourceBundle;
-
-import javax.inject.Inject;
-
-import javafx.fxml.Initializable;
+import com.google.inject.Inject;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class SettingsViewCB extends CachedViewCB {
-    private static final Logger log = LoggerFactory.getLogger(SettingsViewCB.class);
+public class ApplicationPreferencesPM extends PresentationModel<ApplicationPreferencesModel> {
+    private static final Logger log = LoggerFactory.getLogger(ApplicationPreferencesPM.class);
 
 
     ///////////////////////////////////////////////////////////////////////////////////////////
@@ -40,17 +33,24 @@ public class SettingsViewCB extends CachedViewCB {
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Inject
-    public SettingsViewCB() {
+    ApplicationPreferencesPM(ApplicationPreferencesModel model) {
+        super(model);
     }
 
+
     ///////////////////////////////////////////////////////////////////////////////////////////
     // Lifecycle
     ///////////////////////////////////////////////////////////////////////////////////////////
 
-    @SuppressWarnings("EmptyMethod")
     @Override
-    public void initialize(URL url, ResourceBundle rb) {
-        super.initialize(url, rb);
+    public void initialize() {
+
+        super.initialize();
+    }
+
+    @Override
+    public void activate() {
+        super.activate();
     }
 
     @SuppressWarnings("EmptyMethod")
@@ -59,12 +59,6 @@ public class SettingsViewCB extends CachedViewCB {
         super.deactivate();
     }
 
-    @SuppressWarnings("EmptyMethod")
-    @Override
-    public void activate() {
-        super.activate();
-    }
-
     @SuppressWarnings("EmptyMethod")
     @Override
     public void terminate() {
@@ -73,29 +67,18 @@ public class SettingsViewCB extends CachedViewCB {
 
 
     ///////////////////////////////////////////////////////////////////////////////////////////
-    // Navigation
-    ///////////////////////////////////////////////////////////////////////////////////////////
-
-    @Override
-    protected Initializable loadView(Navigation.Item navigationItem) {
-        return super.loadView(navigationItem);
-    }
-
-
-    ///////////////////////////////////////////////////////////////////////////////////////////
-    // Public Methods
+    // Methods
     ///////////////////////////////////////////////////////////////////////////////////////////
 
 
     ///////////////////////////////////////////////////////////////////////////////////////////
-    // UI handlers
+    // Getters
     ///////////////////////////////////////////////////////////////////////////////////////////
 
 
     ///////////////////////////////////////////////////////////////////////////////////////////
-    // Private methods
+    // Private
     ///////////////////////////////////////////////////////////////////////////////////////////
 
 
 }
-

src/main/java/io/bitsquare/gui/main/settings/application/ApplicationPreferencesView.fxml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  ~ This file is part of Bitsquare.
+  ~
+  ~ Bitsquare is free software: you can redistribute it and/or modify it
+  ~ under the terms of the GNU Affero General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or (at
+  ~ your option) any later version.
+  ~
+  ~ Bitsquare is distributed in the hope that it will be useful, but WITHOUT
+  ~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  ~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+  ~ License for more details.
+  ~
+  ~ You should have received a copy of the GNU Affero General Public License
+  ~ along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<AnchorPane fx:id="root" fx:controller="io.bitsquare.gui.main.settings.application.ApplicationPreferencesViewCB"
+            xmlns:fx="http://javafx.com/fxml">
+
+    <Label text="app"/>
+</AnchorPane>
+

src/main/java/io/bitsquare/gui/main/settings/application/ApplicationPreferencesViewCB.java

@@ -0,0 +1,74 @@
+/*
+ * This file is part of Bitsquare.
+ *
+ * Bitsquare is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * Bitsquare is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package io.bitsquare.gui.main.settings.application;
+
+import io.bitsquare.gui.CachedViewCB;
+
+import java.net.URL;
+
+import java.util.ResourceBundle;
+
+import javax.inject.Inject;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * This UI is not cached as it is normally only needed once.
+ */
+public class ApplicationPreferencesViewCB extends CachedViewCB<ApplicationPreferencesPM> {
+
+    private static final Logger log = LoggerFactory.getLogger(ApplicationPreferencesViewCB.class);
+
+    ///////////////////////////////////////////////////////////////////////////////////////////
+    // Constructor
+    ///////////////////////////////////////////////////////////////////////////////////////////
+
+    @Inject
+    private ApplicationPreferencesViewCB(ApplicationPreferencesPM presentationModel) {
+        super(presentationModel);
+    }
+
+
+    ///////////////////////////////////////////////////////////////////////////////////////////
+    // Lifecycle
+    ///////////////////////////////////////////////////////////////////////////////////////////
+
+    @Override
+    public void initialize(URL url, ResourceBundle rb) {
+
+        super.initialize(url, rb);
+    }
+
+    @Override
+    public void activate() {
+        super.activate();
+
+    }
+
+    @Override
+    public void deactivate() {
+        super.deactivate();
+    }
+
+    @SuppressWarnings("EmptyMethod")
+    @Override
+    public void terminate() {
+        super.terminate();
+    }
+}

src/main/java/io/bitsquare/gui/main/settings/network/NetworkPreferencesModel.java

@@ -0,0 +1,84 @@
+/*
+ * This file is part of Bitsquare.
+ *
+ * Bitsquare is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * Bitsquare is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package io.bitsquare.gui.main.settings.network;
+
+import io.bitsquare.gui.UIModel;
+
+import com.google.inject.Inject;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+class NetworkPreferencesModel extends UIModel {
+    private static final Logger log = LoggerFactory.getLogger(NetworkPreferencesModel.class);
+
+
+    ///////////////////////////////////////////////////////////////////////////////////////////
+    // Constructor
+    ///////////////////////////////////////////////////////////////////////////////////////////
+
+    @Inject
+    NetworkPreferencesModel() {
+    }
+
+
+    ///////////////////////////////////////////////////////////////////////////////////////////
+    // Lifecycle
+    ///////////////////////////////////////////////////////////////////////////////////////////
+
+    @Override
+    public void initialize() {
+
+        super.initialize();
+    }
+
+    @Override
+    public void activate() {
+        super.activate();
+
+    }
+
+    @Override
+    public void deactivate() {
+        super.deactivate();
+
+    }
+
+    @SuppressWarnings("EmptyMethod")
+    @Override
+    public void terminate() {
+        super.terminate();
+    }
+
+
+    ///////////////////////////////////////////////////////////////////////////////////////////
+    // Methods
+    ///////////////////////////////////////////////////////////////////////////////////////////
+
+
+    ///////////////////////////////////////////////////////////////////////////////////////////
+    // Getters
+    ///////////////////////////////////////////////////////////////////////////////////////////
+
+
+    ///////////////////////////////////////////////////////////////////////////////////////////
+    // Private
+    ///////////////////////////////////////////////////////////////////////////////////////////
+
+}
+

src/main/java/io/bitsquare/gui/main/settings/network/NetworkPreferencesPM.java

@@ -0,0 +1,84 @@
+/*
+ * This file is part of Bitsquare.
+ *
+ * Bitsquare is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * Bitsquare is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package io.bitsquare.gui.main.settings.network;
+
+import io.bitsquare.gui.PresentationModel;
+
+import com.google.inject.Inject;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class NetworkPreferencesPM extends PresentationModel<NetworkPreferencesModel> {
+    private static final Logger log = LoggerFactory.getLogger(NetworkPreferencesPM.class);
+
+
+    ///////////////////////////////////////////////////////////////////////////////////////////
+    // Constructor
+    ///////////////////////////////////////////////////////////////////////////////////////////
+
+    @Inject
+    NetworkPreferencesPM(NetworkPreferencesModel model) {
+        super(model);
+    }
+
+
+    ///////////////////////////////////////////////////////////////////////////////////////////
+    // Lifecycle
+    ///////////////////////////////////////////////////////////////////////////////////////////
+
+    @Override
+    public void initialize() {
+
+        super.initialize();
+    }
+
+    @Override
+    public void activate() {
+        super.activate();
+    }
+
+    @SuppressWarnings("EmptyMethod")
+    @Override
+    public void deactivate() {
+        super.deactivate();
+    }
+
+    @SuppressWarnings("EmptyMethod")
+    @Override
+    public void terminate() {
+        super.terminate();
+    }
+
+
+    ///////////////////////////////////////////////////////////////////////////////////////////
+    // Methods
+    ///////////////////////////////////////////////////////////////////////////////////////////
+
+
+    ///////////////////////////////////////////////////////////////////////////////////////////
+    // Getters
+    ///////////////////////////////////////////////////////////////////////////////////////////
+
+
+    ///////////////////////////////////////////////////////////////////////////////////////////
+    // Private
+    ///////////////////////////////////////////////////////////////////////////////////////////
+
+
+}

src/main/java/io/bitsquare/gui/main/settings/network/NetworkPreferencesView.fxml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  ~ This file is part of Bitsquare.
+  ~
+  ~ Bitsquare is free software: you can redistribute it and/or modify it
+  ~ under the terms of the GNU Affero General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or (at
+  ~ your option) any later version.
+  ~
+  ~ Bitsquare is distributed in the hope that it will be useful, but WITHOUT
+  ~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  ~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+  ~ License for more details.
+  ~
+  ~ You should have received a copy of the GNU Affero General Public License
+  ~ along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<AnchorPane fx:id="root" fx:controller="io.bitsquare.gui.main.settings.network.NetworkPreferencesViewCB"
+            xmlns:fx="http://javafx.com/fxml">
+
+    <Label text="net"/>
+</AnchorPane>
+

src/main/java/io/bitsquare/gui/main/settings/network/NetworkPreferencesViewCB.java

@@ -0,0 +1,77 @@
+/*
+ * This file is part of Bitsquare.
+ *
+ * Bitsquare is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * Bitsquare is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package io.bitsquare.gui.main.settings.network;
+
+import io.bitsquare.gui.CachedViewCB;
+
+import java.net.URL;
+
+import java.util.ResourceBundle;
+
+import javax.inject.Inject;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * This UI is not cached as it is normally only needed once.
+ */
+public class NetworkPreferencesViewCB extends CachedViewCB<NetworkPreferencesPM> {
+
+    private static final Logger log = LoggerFactory.getLogger(NetworkPreferencesViewCB.class);
+
+
+    ///////////////////////////////////////////////////////////////////////////////////////////
+    // Constructor
+    ///////////////////////////////////////////////////////////////////////////////////////////
+
+    @Inject
+    private NetworkPreferencesViewCB(NetworkPreferencesPM presentationModel) {
+        super(presentationModel);
+    }
+
+
+    ///////////////////////////////////////////////////////////////////////////////////////////
+    // Lifecycle
+    ///////////////////////////////////////////////////////////////////////////////////////////
+
+    @Override
+    public void initialize(URL url, ResourceBundle rb) {
+
+        super.initialize(url, rb);
+    }
+
+    @Override
+    public void activate() {
+        super.activate();
+
+    }
+
+    @Override
+    public void deactivate() {
+        super.deactivate();
+    }
+
+    @SuppressWarnings("EmptyMethod")
+    @Override
+    public void terminate() {
+        super.terminate();
+    }
+
+}
+

src/main/resources/logback.xml

@@ -25,8 +25,8 @@
 
     <logger name="io.bitsquare" level="TRACE"/>
 
-    <logger name="org.bitcoinj" level="INFO"/>
-    <logger name="net.tomp2p" level="TRACE"/>
+    <logger name="org.bitcoinj" level="TRACE"/>
+    <logger name="net.tomp2p" level="WARN"/>
 
 
     <logger name="net.tomp2p.message.Encoder" level="WARN"/>
@@ -45,6 +45,7 @@
 
     <logger name="org.bitcoinj.core.BitcoinSerializer" level="WARN"/>
     <logger name="org.bitcoinj.core.AbstractBlockChain" level="WARN"/>
+    <logger name="org.bitcoinj.wallet.DeterministicKeyChain" level="WARN"/>
 
     <!--
     <logger name="org.bitcoinj.core.Wallet" level="OFF"/>