diff --git a/src/main/java/ru/nucodelabs/gem/view/controller/main/NoFileScreenController.kt b/src/main/java/ru/nucodelabs/gem/view/controller/main/NoFileScreenController.kt index 54cf5252..979f64d0 100644 --- a/src/main/java/ru/nucodelabs/gem/view/controller/main/NoFileScreenController.kt +++ b/src/main/java/ru/nucodelabs/gem/view/controller/main/NoFileScreenController.kt @@ -11,11 +11,11 @@ import javafx.scene.input.DragEvent import javafx.scene.input.MouseButton import javafx.scene.input.TransferMode import javafx.scene.layout.VBox -import javafx.stage.Stage +import javafx.scene.text.TextFlow import ru.nucodelabs.gem.app.pref.RECENT_FILES -import ru.nucodelabs.gem.view.controller.AbstractController import ru.nucodelabs.gem.view.controller.FileImporter import ru.nucodelabs.gem.view.controller.FileOpener +import ru.nucodelabs.kfx.core.AbstractViewController import ru.nucodelabs.kfx.ext.emptyBinding import java.io.File import java.net.URL @@ -26,19 +26,18 @@ class NoFileScreenController @Inject constructor( private val fileOpenerProvider: Provider, private val fileImporterProvider: Provider, private val preferences: Preferences -) : AbstractController(), FileOpener by fileOpenerProvider.get(), FileImporter by fileImporterProvider.get() { +) : AbstractViewController(), + FileOpener by fileOpenerProvider.get(), + FileImporter by fileImporterProvider.get() { @FXML - private lateinit var recentFiles: ListView + private lateinit var desc: TextFlow @FXML - private lateinit var recentFilesContainer: VBox + private lateinit var recentFiles: ListView @FXML - private lateinit var root: VBox - - override val stage: Stage? - get() = root.scene.window as Stage? + private lateinit var recentFilesContainer: VBox fun visibleProperty(): BooleanProperty = root.visibleProperty() diff --git a/src/main/java/ru/nucodelabs/gem/view/controller/main/UIConstants.kt b/src/main/java/ru/nucodelabs/gem/view/controller/main/UIConstants.kt index 4c6b7587..894bb0b3 100644 --- a/src/main/java/ru/nucodelabs/gem/view/controller/main/UIConstants.kt +++ b/src/main/java/ru/nucodelabs/gem/view/controller/main/UIConstants.kt @@ -3,3 +3,6 @@ package ru.nucodelabs.gem.view.controller.main const val LEFT_AXIS_WIDTH = 65 const val COLOR_AXIS_WIDTH = 70 const val TOP_CHARTS_RIGHT_OFFSET = COLOR_AXIS_WIDTH + 12 + +const val MIN_SIZE = 50 +const val MIN_WIN_SIZE = 500 \ No newline at end of file diff --git a/src/main/resources/ru/nucodelabs/gem/view/controller/charts/LinearModelSection.fxml b/src/main/resources/ru/nucodelabs/gem/view/controller/charts/LinearModelSection.fxml index 88fe08f2..accd65c9 100644 --- a/src/main/resources/ru/nucodelabs/gem/view/controller/charts/LinearModelSection.fxml +++ b/src/main/resources/ru/nucodelabs/gem/view/controller/charts/LinearModelSection.fxml @@ -13,13 +13,18 @@ VBox.vgrow="ALWAYS" fx:controller="ru.nucodelabs.gem.view.controller.charts.ModelSectionController" stylesheets="@ModelSection.css"> + + + - + + + diff --git a/src/main/resources/ru/nucodelabs/gem/view/controller/charts/LogarithmicModelSection.fxml b/src/main/resources/ru/nucodelabs/gem/view/controller/charts/LogarithmicModelSection.fxml index a2f0dc4c..0f6e9ea4 100644 --- a/src/main/resources/ru/nucodelabs/gem/view/controller/charts/LogarithmicModelSection.fxml +++ b/src/main/resources/ru/nucodelabs/gem/view/controller/charts/LogarithmicModelSection.fxml @@ -14,12 +14,18 @@ VBox.vgrow="ALWAYS" fx:controller="ru.nucodelabs.gem.view.controller.charts.ModelSectionController" stylesheets="@ModelSection.css"> + + + + + + diff --git a/src/main/resources/ru/nucodelabs/gem/view/controller/charts/ModelSectionSwitcher.fxml b/src/main/resources/ru/nucodelabs/gem/view/controller/charts/ModelSectionSwitcher.fxml index 215697ef..3c208cb1 100644 --- a/src/main/resources/ru/nucodelabs/gem/view/controller/charts/ModelSectionSwitcher.fxml +++ b/src/main/resources/ru/nucodelabs/gem/view/controller/charts/ModelSectionSwitcher.fxml @@ -1,10 +1,14 @@ + + + + diff --git a/src/main/resources/ru/nucodelabs/gem/view/controller/charts/PseudoSectionSwitcher.fxml b/src/main/resources/ru/nucodelabs/gem/view/controller/charts/PseudoSectionSwitcher.fxml index 70b9823c..32d67dbd 100644 --- a/src/main/resources/ru/nucodelabs/gem/view/controller/charts/PseudoSectionSwitcher.fxml +++ b/src/main/resources/ru/nucodelabs/gem/view/controller/charts/PseudoSectionSwitcher.fxml @@ -1,10 +1,14 @@ + + + + diff --git a/src/main/resources/ru/nucodelabs/gem/view/controller/charts/VesCurves.fxml b/src/main/resources/ru/nucodelabs/gem/view/controller/charts/VesCurves.fxml index 89b04170..12ba5363 100644 --- a/src/main/resources/ru/nucodelabs/gem/view/controller/charts/VesCurves.fxml +++ b/src/main/resources/ru/nucodelabs/gem/view/controller/charts/VesCurves.fxml @@ -15,6 +15,9 @@ VBox.vgrow="ALWAYS" fx:id="root" fx:controller="ru.nucodelabs.gem.view.controller.charts.VesCurvesController"> + + + diff --git a/src/main/resources/ru/nucodelabs/gem/view/controller/main/NoFileScreen.css b/src/main/resources/ru/nucodelabs/gem/view/controller/main/NoFileScreen.css index e1b4917d..04580551 100644 --- a/src/main/resources/ru/nucodelabs/gem/view/controller/main/NoFileScreen.css +++ b/src/main/resources/ru/nucodelabs/gem/view/controller/main/NoFileScreen.css @@ -16,6 +16,14 @@ -fx-font-size: 16; } +.scroll-pane { + -fx-background-color: transparent; +} + +.scroll-pane .viewport { + -fx-background-color: transparent; +} + /*.list-cell {*/ /* -fx-pref-height: 40;*/ /* -fx-font-size: 16;*/ diff --git a/src/main/resources/ru/nucodelabs/gem/view/controller/main/NoFileScreen.fxml b/src/main/resources/ru/nucodelabs/gem/view/controller/main/NoFileScreen.fxml index 5a490172..5ffc4e17 100644 --- a/src/main/resources/ru/nucodelabs/gem/view/controller/main/NoFileScreen.fxml +++ b/src/main/resources/ru/nucodelabs/gem/view/controller/main/NoFileScreen.fxml @@ -4,6 +4,7 @@ +