Merge branch 'dev' into camsoda

This commit is contained in:
0xboobface 2018-10-31 00:05:58 +01:00
commit a66d4100cf
1 changed files with 7 additions and 3 deletions

View File

@ -20,6 +20,7 @@ import javafx.beans.value.ObservableValue;
import javafx.geometry.HPos; import javafx.geometry.HPos;
import javafx.geometry.Insets; import javafx.geometry.Insets;
import javafx.scene.Node; import javafx.scene.Node;
import javafx.scene.control.Accordion;
import javafx.scene.control.Alert; import javafx.scene.control.Alert;
import javafx.scene.control.Button; import javafx.scene.control.Button;
import javafx.scene.control.CheckBox; import javafx.scene.control.CheckBox;
@ -67,6 +68,7 @@ public class SettingsTab extends Tab implements TabSelectionListener {
private ComboBox<SplitAfterOption> splitAfter; private ComboBox<SplitAfterOption> splitAfter;
private List<Site> sites; private List<Site> sites;
private Label restartLabel; private Label restartLabel;
private Accordion credentialsAccordion = new Accordion();
public SettingsTab(List<Site> sites) { public SettingsTab(List<Site> sites) {
this.sites = sites; this.sites = sites;
@ -113,14 +115,16 @@ public class SettingsTab extends Tab implements TabSelectionListener {
//right side //right side
rightSide.getChildren().add(createSiteSelectionPanel()); rightSide.getChildren().add(createSiteSelectionPanel());
for (Site site : sites) { rightSide.getChildren().add(credentialsAccordion);
for (int i = 0; i < sites.size(); i++) {
Site site = sites.get(i);
Node siteConfig = site.getConfigurationGui(); Node siteConfig = site.getConfigurationGui();
if(siteConfig != null) { if(siteConfig != null) {
TitledPane pane = new TitledPane(site.getName(), siteConfig); TitledPane pane = new TitledPane(site.getName(), siteConfig);
pane.setCollapsible(false); credentialsAccordion.getPanes().add(pane);
rightSide.getChildren().add(pane);
} }
} }
credentialsAccordion.setExpandedPane(credentialsAccordion.getPanes().get(0));
} }
private Node createSiteSelectionPanel() { private Node createSiteSelectionPanel() {