Skip to content

Commit be5c523

Browse files
committed
Merge remote-tracking branch 'origin/main'
2 parents 6091ad8 + 6bb32e4 commit be5c523

File tree

5 files changed

+394
-384
lines changed

5 files changed

+394
-384
lines changed

src/kintsugi3d/builder/javafx/controllers/menubar/ConsoleController.java src/kintsugi3d/builder/javafx/controllers/menubar/LoggerController.java

+2-4
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@
2121
import javafx.fxml.Initializable;
2222
import javafx.scene.control.*;
2323
import javafx.scene.layout.HBox;
24-
import javafx.scene.paint.Color;
25-
import javafx.scene.paint.Paint;
2624
import javafx.util.Callback;
2725
import org.slf4j.Logger;
2826
import org.slf4j.LoggerFactory;
@@ -39,9 +37,9 @@
3937
import java.time.format.DateTimeFormatter;
4038
import java.util.ResourceBundle;
4139

42-
public class ConsoleController implements Initializable
40+
public class LoggerController implements Initializable
4341
{
44-
private static final Logger log = LoggerFactory.getLogger(ConsoleController.class);
42+
private static final Logger log = LoggerFactory.getLogger(LoggerController.class);
4543

4644
@FXML private ToggleButton toggleButtonPause;
4745
@FXML private ToggleButton toggleButtonError;

src/kintsugi3d/builder/javafx/controllers/menubar/MenubarController.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public class MenubarController
8383
private final Flag lightCalibrationWindowOpen = new Flag(false);
8484
private final Flag colorCheckerWindowOpen = new Flag(false);
8585
private final Flag unzipperOpen = new Flag(false);
86-
private final Flag consoleWindowOpen = new Flag(false);
86+
private final Flag loggerWindowOpen = new Flag(false);
8787
private Flag systemSettingsModalOpen = new Flag(false);
8888

8989
private Flag aboutWindowOpen = new Flag(false);
@@ -733,14 +733,14 @@ public void shading_SystemMemory()
733733

734734
public void help_console()
735735
{
736-
if (consoleWindowOpen.get())
736+
if (loggerWindowOpen.get())
737737
{
738738
return;
739739
}
740740

741741
try
742742
{
743-
Stage stage = makeStage("Log", consoleWindowOpen, "fxml/menubar/Console.fxml");
743+
Stage stage = makeStage("Log", loggerWindowOpen, "fxml/menubar/Logger.fxml");
744744
stage.setResizable(true);
745745
stage.initStyle(StageStyle.DECORATED);
746746
stage.show();

src/main/resources/fxml/kintsugiStyling.css

+8
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,14 @@ dialog-pane{
115115
-fx-text-fill: #FFFFFF;
116116
}
117117

118+
.progress-bar{
119+
-fx-accent: #D4AA00; /*color of completed portion (Kintsugi yellow)*/
120+
}
121+
122+
.progress-bar .track{
123+
-fx-background-color: #444444; /*color of incomplete portion*/
124+
}
125+
118126
.split-menu-button {
119127
-fx-base: #272727;
120128
-fx-text-fill: #FFFFFF;

src/main/resources/fxml/menubar/Console.fxml src/main/resources/fxml/menubar/Logger.fxml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
~
1717
-->
1818

19-
<AnchorPane fx:id="root" prefHeight="500.0" prefWidth="600.0" styleClass="anchor-pane" stylesheets="@../kintsugiStyling.css" xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="kintsugi3d.builder.javafx.controllers.menubar.ConsoleController">
19+
<AnchorPane fx:id="root" prefHeight="500.0" prefWidth="600.0" styleClass="anchor-pane" stylesheets="@../kintsugiStyling.css" xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="kintsugi3d.builder.javafx.controllers.menubar.LoggerController">
2020
<ListView fx:id="messageListView" prefHeight="200.0" prefWidth="200.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="50.0" />
2121
<HBox spacing="15.0">
2222
<opaqueInsets>

0 commit comments

Comments
 (0)