Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ad9dc83 authored by Vincent Bourgmayer's avatar Vincent Bourgmayer
Browse files

fix log display issue in LoadStep fxml & controller

parent 34eca5b0

src/main/java/ecorp/easy/installer/controllers/stepControllers/LoadStepController.java

+8 −2
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import javafx.geometry.Pos; 
import javafx.scene.control.Button;

import javafx.scene.control.Label;

import javafx.scene.control.ProgressBar;

import javafx.scene.image.ImageView;

import javafx.scene.input.MouseEvent;

import javafx.scene.layout.HBox;

import javafx.scene.layout.VBox;
@@ -45,6 +46,7 @@ public class LoadStepController extends StepController<LoadStep> implements Stop 
    @FXML private ProgressBar taskProgressBar;

    @FXML private Label titleLbl;

    @FXML private VBox instructionsContainer;

    @FXML private ImageView imgView;

    

    private Timeline pbTimeline; //progressBar Timeline

    private CommandRunnerService service;
@@ -57,9 +59,13 @@ public class LoadStepController extends StepController<LoadStep> implements Stop 
    public void initialize(URL url, ResourceBundle rb) {

        super.initialize(url, rb); 



        if(step.getTextContentKeys().isEmpty()){

        instructionsContainer.setManaged(false);

        imgView.setManaged(false);

        /*if(step.getTextContentKeys().isEmpty()){

            instructionsContainer.setVisible(false);

        }

        }*/

        

        

        if(i18n.containsKey(step.getTitleKey())){

            titleLbl.setText(i18n.getString(step.getTitleKey() ) );

        }

src/main/resources/fxml/loadStep.fxml

+2 −2
Original line number Diff line number Diff line
@@ -36,9 +36,9 @@ 
        <HBox fx:id="globalProgressIndicator" spacing="2" minHeight="50.0" alignment="CENTER"/>

        <Label fx:id="titleLbl" wrapText="true" styleClass="subtitle" />

        <ProgressBar fx:id="taskProgressBar" progress="0.0" styleClass="progressBar" minWidth="550"/>

        <HBox spacing="20" alignment="TOP_CENTER" VBox.vgrow="ALWAYS" maxWidth="1000.0" >

        <HBox spacing="20" alignment="TOP_CENTER" VBox.vgrow="ALWAYS" maxWidth="1000.0" maxHeight="515.0">

          <children>

                <VBox fx:id="instructionsContainer" alignment="TOP_CENTER" maxHeight="515.0" maxWidth="1000.0" spacing="15" HBox.hgrow="ALWAYS" >

                <VBox fx:id="instructionsContainer" alignment="TOP_CENTER" maxWidth="1000.0" spacing="15" HBox.hgrow="ALWAYS" >

                </VBox>

                <ImageView fx:id="imgView" preserveRatio="true" smooth="true" fitHeight="515.0">

                </ImageView>