mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-24 23:18:17 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merged Scroll pane PR (https://github.com/bitsquare/bitsquare/pull/766, https://github.com/bitsquare/bitsquare/pull/765)

Browse source
This commit is contained in:
Manfred Karrer 2017-03-05 17:46:55 -05:00
commit 795327ed78
9 changed files with 72 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gui/src/main/java/io/bitsquare/gui/main/account/content/altcoinaccounts/AltCoinAccountsView.fxml
View file

@ -21,8 +21,8 @@
<?import javafx.scene.layout.*?> <?import javafx.scene.layout.*?>
<GridPane fx:id="root" fx:controller="io.bitsquare.gui.main.account.content.altcoinaccounts.AltCoinAccountsView" <GridPane fx:id="root" fx:controller="io.bitsquare.gui.main.account.content.altcoinaccounts.AltCoinAccountsView"
hgap="5.0" vgap="5.0" hgap="5.0" vgap="5.0"
AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="20.0"
AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="-10.0" AnchorPane.rightAnchor="25.0" AnchorPane.topAnchor="20.0"
xmlns:fx="http://javafx.com/fxml"> xmlns:fx="http://javafx.com/fxml">
<columnConstraints> <columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" halignment="RIGHT" minWidth="160.0"/> <ColumnConstraints hgrow="SOMETIMES" halignment="RIGHT" minWidth="160.0"/>

4
gui/src/main/java/io/bitsquare/gui/main/account/content/arbitratorselection/ArbitratorSelectionView.fxml
View file

@ -20,8 +20,8 @@
<?import javafx.scene.layout.*?> <?import javafx.scene.layout.*?>
<GridPane fx:id="root" fx:controller="io.bitsquare.gui.main.account.content.arbitratorselection.ArbitratorSelectionView" <GridPane fx:id="root" fx:controller="io.bitsquare.gui.main.account.content.arbitratorselection.ArbitratorSelectionView"
hgap="5.0" vgap="5.0" hgap="5.0" vgap="5.0"
AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="20.0"
AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="-10.0" AnchorPane.rightAnchor="25.0" AnchorPane.topAnchor="20.0"
xmlns:fx="http://javafx.com/fxml"> xmlns:fx="http://javafx.com/fxml">
<columnConstraints> <columnConstraints>

4
gui/src/main/java/io/bitsquare/gui/main/account/content/backup/BackupView.fxml
View file

@ -20,8 +20,8 @@
<?import javafx.scene.layout.*?> <?import javafx.scene.layout.*?>
<GridPane fx:id="root" fx:controller="io.bitsquare.gui.main.account.content.backup.BackupView" <GridPane fx:id="root" fx:controller="io.bitsquare.gui.main.account.content.backup.BackupView"
hgap="5.0" vgap="5.0" hgap="5.0" vgap="5.0"
AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="20.0"
AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="-10.0" AnchorPane.rightAnchor="25.0" AnchorPane.topAnchor="20.0"
xmlns:fx="http://javafx.com/fxml"> xmlns:fx="http://javafx.com/fxml">
<columnConstraints> <columnConstraints>

4
gui/src/main/java/io/bitsquare/gui/main/account/content/fiataccounts/FiatAccountsView.fxml
View file

@ -21,8 +21,8 @@
<?import javafx.scene.layout.*?> <?import javafx.scene.layout.*?>
<GridPane fx:id="root" fx:controller="io.bitsquare.gui.main.account.content.fiataccounts.FiatAccountsView" <GridPane fx:id="root" fx:controller="io.bitsquare.gui.main.account.content.fiataccounts.FiatAccountsView"
hgap="5.0" vgap="5.0" hgap="5.0" vgap="5.0"
AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="20.0"
AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="-10.0" AnchorPane.rightAnchor="25.0" AnchorPane.topAnchor="20.0"
xmlns:fx="http://javafx.com/fxml"> xmlns:fx="http://javafx.com/fxml">
<columnConstraints> <columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" halignment="RIGHT" minWidth="160.0"/> <ColumnConstraints hgrow="SOMETIMES" halignment="RIGHT" minWidth="160.0"/>

4
gui/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordView.fxml
View file

@ -20,8 +20,8 @@
<?import javafx.scene.layout.*?> <?import javafx.scene.layout.*?>
<GridPane fx:id="root" fx:controller="io.bitsquare.gui.main.account.content.password.PasswordView" <GridPane fx:id="root" fx:controller="io.bitsquare.gui.main.account.content.password.PasswordView"
hgap="5.0" vgap="5.0" hgap="5.0" vgap="5.0"
AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="20.0"
AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="-10.0" AnchorPane.rightAnchor="25.0" AnchorPane.topAnchor="20.0"
xmlns:fx="http://javafx.com/fxml"> xmlns:fx="http://javafx.com/fxml">
<columnConstraints> <columnConstraints>

4
gui/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsView.fxml
View file

@ -20,8 +20,8 @@
<?import javafx.scene.layout.*?> <?import javafx.scene.layout.*?>
<GridPane fx:id="root" fx:controller="io.bitsquare.gui.main.account.content.seedwords.SeedWordsView" <GridPane fx:id="root" fx:controller="io.bitsquare.gui.main.account.content.seedwords.SeedWordsView"
hgap="5.0" vgap="5.0" hgap="5.0" vgap="5.0"
AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="20.0"
AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="-10.0" AnchorPane.rightAnchor="25.0" AnchorPane.topAnchor="20.0"
xmlns:fx="http://javafx.com/fxml"> xmlns:fx="http://javafx.com/fxml">
<columnConstraints> <columnConstraints>

56
gui/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsView.fxml
View file

@ -1,31 +1,39 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
~ This file is part of Bitsquare. ~ This file is part of Bitsquare.
~ ~
~ Bitsquare is free software: you can redistribute it and/or modify it ~ 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 ~ 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 ~ the Free Software Foundation, either version 3 of the License, or (at
~ your option) any later version. ~ your option) any later version.
~ ~
~ Bitsquare is distributed in the hope that it will be useful, but WITHOUT ~ Bitsquare is distributed in the hope that it will be useful, but WITHOUT
~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or ~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public ~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
~ License for more details. ~ License for more details.
~ ~
~ You should have received a copy of the GNU Affero General Public License ~ You should have received a copy of the GNU Affero General Public License
~ along with Bitsquare. If not, see <http://www.gnu.org/licenses/>. ~ along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
--> -->
<?import javafx.scene.control.*?>
<?import java.lang.*?>
<?import javafx.scene.layout.*?> <?import javafx.scene.layout.*?>
<AnchorPane fx:id="root" fx:controller="io.bitsquare.gui.main.account.settings.AccountSettingsView"
prefHeight="660.0" prefWidth="1000.0"
xmlns:fx="http://javafx.com/fxml">
<VBox fx:id="leftVBox" spacing="5" prefWidth="240" AnchorPane.bottomAnchor="20" AnchorPane.leftAnchor="15" <AnchorPane fx:id="root" prefHeight="660.0" prefWidth="1000.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="io.bitsquare.gui.main.account.settings.AccountSettingsView">
AnchorPane.topAnchor="20"/> <children>
<AnchorPane fx:id="content" AnchorPane.bottomAnchor="10" AnchorPane.rightAnchor="25" AnchorPane.leftAnchor="290"
AnchorPane.topAnchor="30"/> <VBox fx:id="leftVBox" prefWidth="240" spacing="5" AnchorPane.bottomAnchor="20" AnchorPane.leftAnchor="15" AnchorPane.topAnchor="20" />
<ScrollPane fx:id="scrollPane"
fitToWidth="true" hbarPolicy="NEVER"
AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="270.0"
AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
<content>
<AnchorPane fx:id="content" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" />
</content>
</ScrollPane>
</children>
</AnchorPane> </AnchorPane>

27
gui/src/main/java/io/bitsquare/gui/main/settings/SettingsView.fxml
View file

@ -17,15 +17,32 @@
~ along with Bitsquare. If not, see <http://www.gnu.org/licenses/>. ~ along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
--> -->
<?import javafx.scene.control.Tab?> <?import javafx.scene.control.*?>
<?import javafx.scene.control.TabPane?>
<?import javafx.scene.layout.AnchorPane?> <?import javafx.scene.layout.AnchorPane?>
<TabPane fx:id="root" fx:controller="io.bitsquare.gui.main.settings.SettingsView" <TabPane fx:id="root" fx:controller="io.bitsquare.gui.main.settings.SettingsView"
AnchorPane.bottomAnchor="0" AnchorPane.leftAnchor="0" AnchorPane.bottomAnchor="0" AnchorPane.leftAnchor="0"
AnchorPane.rightAnchor="0" AnchorPane.topAnchor="0" AnchorPane.rightAnchor="0" AnchorPane.topAnchor="0"
xmlns:fx="http://javafx.com/fxml"> xmlns:fx="http://javafx.com/fxml">
<Tab fx:id="preferencesTab" text="Settings" closable="false"/> <Tab fx:id="preferencesTab" text="Settings" closable="false">
<Tab fx:id="networkSettingsTab" text="Network info" closable="false"/> <content>
<Tab fx:id="aboutTab" text="About" closable="false"/> <ScrollPane fitToWidth="true" hbarPolicy="NEVER"
AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0"
AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"/>
</content>
</Tab>
<Tab fx:id="networkSettingsTab" text="Network info" closable="false">
<content>
<ScrollPane fitToWidth="true" hbarPolicy="NEVER"
AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0"
AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"/>
</content>
</Tab>
<Tab fx:id="aboutTab" text="About" closable="false">
<content>
<ScrollPane fitToWidth="true" hbarPolicy="NEVER"
AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0"
AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"/>
</content>
</Tab>
</TabPane> </TabPane>

7
gui/src/main/java/io/bitsquare/gui/main/settings/SettingsView.java
View file

@ -26,6 +26,7 @@ import io.bitsquare.gui.main.settings.network.NetworkSettingsView;
import io.bitsquare.gui.main.settings.preferences.PreferencesView; import io.bitsquare.gui.main.settings.preferences.PreferencesView;
import javafx.beans.value.ChangeListener; import javafx.beans.value.ChangeListener;
import javafx.fxml.FXML; import javafx.fxml.FXML;
import javafx.scene.control.ScrollPane;
import javafx.scene.control.Tab; import javafx.scene.control.Tab;
import javafx.scene.control.TabPane; import javafx.scene.control.TabPane;
@ -92,7 +93,11 @@ public class SettingsView extends ActivatableViewAndModel<TabPane, Activatable>
else if (view instanceof AboutView) tab = aboutTab; else if (view instanceof AboutView) tab = aboutTab;
else throw new IllegalArgumentException("Navigation to " + viewClass + " is not supported"); else throw new IllegalArgumentException("Navigation to " + viewClass + " is not supported");
tab.setContent(view.getRoot()); if (tab.getContent() != null && tab.getContent() instanceof ScrollPane) {
((ScrollPane) tab.getContent()).setContent(view.getRoot());
} else {
tab.setContent(view.getRoot());
}
root.getSelectionModel().select(tab); root.getSelectionModel().select(tab);
} }
} }