Skip to content
Snippets Groups Projects
Commit 86dd5304 authored by Karin Pettersen's avatar Karin Pettersen
Browse files

Styled the application with moelvens color-pallet

parent bc110c39
No related branches found
No related tags found
No related merge requests found
......@@ -20,9 +20,7 @@ public final class Settings {
public static int NUMBER_OF_SECONDS_LIVE_DATA = 60;
// Confidence interval
public static final double CONFIDENCE_INTERVAL = 0.80;
public static final double CONFIDENCE_INTERVAL = 0.95;
// Current sawmill settings;
public static final String PROJECT_ID = "sf-drying-optimization";
......
......@@ -87,6 +87,7 @@ public class CreateSideBar {
RingProgressIndicator ringProgressIndicator = new RingProgressIndicator();
ringProgressIndicator.setRingWidth(100);
ringProgressIndicator.makeIndeterminate();
ringProgressIndicator.setId("progressBar");
class WorkerThread extends Thread{
RingProgressIndicator rpi;
......
......@@ -53,12 +53,9 @@ public class LoginPopup {
Button closeButton = new Button("Close");
Button loginButton = new Button("Login");
getPasswordTextField().clear();
closeButton.setOnAction(event -> window.close());
getPasswordTextField().setOnKeyPressed( event -> {
if( event.getCode() == KeyCode.ENTER ) {
if(loginButtonPressed()){
......
......@@ -4,6 +4,7 @@ import javafx.geometry.Pos;
import javafx.scene.Scene;
import javafx.scene.control.Button;
import javafx.scene.control.Label;
import javafx.scene.input.KeyCode;
import javafx.scene.layout.VBox;
import javafx.scene.text.TextAlignment;
import javafx.stage.Modality;
......@@ -25,6 +26,12 @@ public class NotificationPopUp {
Button close = new Button("Close");
close.setOnAction(event -> window.close());
close.setOnKeyPressed( event -> {
if( event.getCode() == KeyCode.ENTER ) {
window.close();
}
});
VBox layout = new VBox(10);
layout.setAlignment(Pos.CENTER);
layout.getChildren().addAll(messageLabel,close);
......
.circleindicator-container {
circleindicator-color: red;
circleindicator-color: rgba(94, 33, 27, 1);
-fx-padding: 5.0;
-fx-background-color: -fx-background;
}
......
......@@ -3,8 +3,9 @@
-fx-inner-radius: 60.0;
}
.ringindicator-inner-circle {
-fx-opacity: 0.55;
-fx-stroke: circleindicator-color;
-fx-opacity: 1.0;
-fx-stroke: rgba(94, 33, 27, 1);
-fx-stroke-width: 8.0px;
-fx-fill: -fx-background;
}
......@@ -20,6 +21,6 @@
-fx-fill: -fx-background;
}
.indeterminate {
-fx-opacity: 0.55;
-fx-opacity: 1.0;
-fx-stroke: linear-gradient(from 0.0% 0.0% to 70.0% 70.0%, circleindicator-color 70.0%, white 75.0%, white);
}
......@@ -51,6 +51,8 @@
-fx-pref-height: 25;
-fx-font-size: 16;
-fx-font-weight: 200;
-fx-background-color: rgba(12, 76, 81, 1);
-fx-text-fill: white;
-fx-font-family: Arial;
}
......@@ -61,7 +63,11 @@
-fx-pref-height: 25;
-fx-font-size: 20;
-fx-font-family: Arial;
-fx-background-color: rgba(104, 229, 59, 1);
/* -fx-background-color: rgba(104, 229, 59, 1);
*/
-fx-background-color: rgba(12, 76, 81, 1);
-fx-text-fill: white;
}
#sideBarButtonExit {
......@@ -71,7 +77,12 @@
-fx-pref-height: 25;
-fx-font-size: 20;
-fx-font-family: Arial;
/*
-fx-background-color: Red;
-fx-text-fill: white;
*/
-fx-background-color: rgba(94, 33, 27, 1);
-fx-text-fill: white;
}
......
......@@ -10,19 +10,19 @@
}
.default-color0.chart-earlier-data-line{-fx-stroke: black; -fx-opacity: 1.0}
.default-color1.chart-series-line{-fx-stroke: green; -fx-opacity: 1.0}
.default-color2.chart-series-line{-fx-stroke: red; -fx-opacity: 0.1}
.default-color3.chart-earlier-data-line{-fx-stroke: rgba(0,168,355,0.3); -fx-opacity: 0.1}
.default-color4.chart-earlier-data-line{-fx-stroke: rgba(0,168,355,0.3); -fx-opacity: 0.1}
.default-color5.chart-earlier-data-line{-fx-stroke: rgba(0,168,355,0.3); -fx-opacity: 0.1}
.default-color6.chart-earlier-data-line{-fx-stroke: rgba(0,168,355,0.3); -fx-opacity: 0.1}
.default-color7.chart-earlier-data-line{-fx-stroke: rgba(0,168,355,0.3); -fx-opacity: 0.1}
.default-color1.chart-series-line{-fx-stroke: rgba(85,198,229,0.3); -fx-opacity: 1.0}
.default-color2.chart-series-line{-fx-stroke: rgba(94, 33, 27, 1); -fx-opacity: 0.1}
.default-color3.chart-earlier-data-line{-fx-stroke: rgba(12, 76, 81, 1); -fx-opacity: 0.1}
.default-color4.chart-earlier-data-line{-fx-stroke: rgba(12, 76, 81, 1); -fx-opacity: 0.1}
.default-color5.chart-earlier-data-line{-fx-stroke: rgba(12, 76, 81, 1); -fx-opacity: 0.1}
.default-color6.chart-earlier-data-line{-fx-stroke: rgba(12, 76, 81, 1); -fx-opacity: 0.1}
.default-color7.chart-earlier-data-line{-fx-stroke: rgba(12, 76, 81, 1); -fx-opacity: 0.1}
.default-color0.chart-line-symbol{-fx-background-color: black,white;}
.default-color1.chart-line-symbol{-fx-background-color: green,green;}
.default-color2.chart-line-symbol{-fx-background-color: red,red;}
.default-color3.chart-line-symbol{-fx-background-color: rgba(0,168,355,0.3),white;}
.default-color4.chart-line-symbol{-fx-background-color: rgba(0,168,355,0.3),white;}
.default-color5.chart-line-symbol{-fx-background-color: rgba(0,168,355,0.3),white;}
.default-color6.chart-line-symbol{-fx-background-color: rgba(0,168,355,0.3),white;}
.default-color7.chart-line-symbol{-fx-background-color: rgba(0,168,355,0.3),white;}
.default-color1.chart-line-symbol{-fx-background-color: rgba(85,198,229,0.3),rgba(85,198,229,0.3);}
.default-color2.chart-line-symbol{-fx-background-color: rgba(94, 33, 27, 1),rgba(94, 33, 27, 1);}
.default-color3.chart-line-symbol{-fx-background-color: rgba(12, 76, 81, 1),rgba(12, 76, 81, 1);}
.default-color4.chart-line-symbol{-fx-background-color: rgba(12, 76, 81, 1),rgba(12, 76, 81, 1);}
.default-color5.chart-line-symbol{-fx-background-color: rgba(12, 76, 81, 1),rgba(12, 76, 81, 1);}
.default-color6.chart-line-symbol{-fx-background-color: rgba(12, 76, 81, 1),rgba(12, 76, 81, 1);}
.default-color7.chart-line-symbol{-fx-background-color: rgba(12, 76, 81, 1),rgba(12, 76, 81, 1);}
No preview for this file type
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment